summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Ochotnicky <sochotnicky@gentoo.org>2010-10-18 19:38:54 +0000
committerStanislav Ochotnicky <sochotnicky@gentoo.org>2010-10-18 19:38:54 +0000
commit57012b5c681c3b1c6f31cfc8b8129923638d909c (patch)
tree7f60d78a1cbaae5e01eb74134d955e0065ae325b /app-arch
parentStable for HPPA (bug #341405). (diff)
downloadhistorical-57012b5c681c3b1c6f31cfc8b8129923638d909c.tar.gz
historical-57012b5c681c3b1c6f31cfc8b8129923638d909c.tar.bz2
historical-57012b5c681c3b1c6f31cfc8b8129923638d909c.zip
Fix #326665 (build with lua flag enabled failing)
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/rpm/ChangeLog6
-rw-r--r--app-arch/rpm/Manifest10
-rw-r--r--app-arch/rpm/rpm-4.8.1.ebuild6
3 files changed, 15 insertions, 7 deletions
diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index c1a9da42d527..a452ff7a4e51 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-arch/rpm
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.116 2010/09/24 19:35:27 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.117 2010/10/18 19:38:54 sochotnicky Exp $
+
+ 18 Oct 2010; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+ rpm-4.8.1.ebuild:
+ Fix #326665 (build with lua flag enabled failing)
*rpm-4.8.1 (24 Sep 2010)
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index de54d4c68cad..d49d80652cc1 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -22,14 +22,14 @@ EBUILD rpm-4.4.6-r7.ebuild 3161 RMD160 3d7c39878d2efe7e907b15fb5ebb166fbaa95c1a
EBUILD rpm-4.4.7-r4.ebuild 3082 RMD160 3278b88d65de2cd388c0615de267899cff0787de SHA1 3d1d704cfbcd1f72f41027563e4ad2d569058f6e SHA256 badf567156853719f2a9fc72a0b5a3348802c4a9cf9bd5ad0c444d8089045b07
EBUILD rpm-4.4.7-r5.ebuild 3127 RMD160 a888aebf7428e7b57ebd9140902e4e097c054465 SHA1 df1ba8ab2b8afa16e004eeb35b41431a696dd596 SHA256 36ba24b0225d594617116d5a3da5d545507f8e955310f1fe59ff6b3ae65d3c60
EBUILD rpm-4.4.7-r6.ebuild 3213 RMD160 47681414f35dd5b0e6d1d98930095268217a9e1d SHA1 4e6e685f3acd68a96c8a757ec29986f24ac4a439 SHA256 8bf20f8d2d5bf7b2127953af622a5db0bed0df6f9be81308f76dd5068843c8c8
-EBUILD rpm-4.8.1.ebuild 2127 RMD160 d0ebb4426a1da098cbd6d9f5b084001f60913dfc SHA1 5b1679655adebf949dd353050753840af5fd0a08 SHA256 87539640bb3ce926784657915f1a6f4a5c7d2881cbdd1756e2fba271119cdc5f
+EBUILD rpm-4.8.1.ebuild 2263 RMD160 a5ec67b994ce6342f7b008fab1677bfea5103a5c SHA1 bdeb78f7f513da5a1dccfa25f26597f60532fdde SHA256 8642b8b83588208603a88ebb1bc68e0237b39398a461bfc12af05f0b5c2888f5
EBUILD rpm-5.1.6.ebuild 2946 RMD160 bb6bcb6e3487bfbee5b5f702212c2cd25a62131f SHA1 8df0873d6c882ada7e26e620e0eed87401ef46f3 SHA256 0b59bf46c8ed6ab8873a513657413fa59f29f1d4d0df40cc997788e7b3f7607c
-MISC ChangeLog 18175 RMD160 22cd23f89467748e47e01d1eaa246a7f8b002a69 SHA1 d3ba2f43b4078e8e8a642dc8bea06b7bd18211b3 SHA256 96078f0a63dfa16a590492ce6557daa0d54a26ad88c381f3fd84880c08142ca6
+MISC ChangeLog 18309 RMD160 e0544c77923b2413f504bfb20ad3149fd44a2faf SHA1 33738d2a9877d17ffc3417b53ebd80dc1852ebff SHA256 88dfa6ba46db03b805e14598cb3ddf75be5a870270617bdf932dd6796ff1f3c8
MISC metadata.xml 426 RMD160 9904f07a8cb50e88bf9e1ed6480ece557534edf6 SHA1 ae340a63eabf63e06a17ff5d3181e62451216404 SHA256 f1fabe7e5dd678e19daf214328e6e7f4f10be906b72fea76fc08855a73d9847c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAkyc/ZsACgkQB9Uc/HGhZ3zkUACcDZ3t3k4+AhUA3VkxxAUEHSF2
-JD0AnA1/4o4IjJZz6AprljhWbqhLBLPf
-=EUJP
+iEYEARECAAYFAky8omsACgkQB9Uc/HGhZ3wd+ACggE+85njpjPKgX4b7fz05upsx
+ts8An2VRka3b+ZCLkJAVbto6m30rtBw6
+=BIDG
-----END PGP SIGNATURE-----
diff --git a/app-arch/rpm/rpm-4.8.1.ebuild b/app-arch/rpm/rpm-4.8.1.ebuild
index 403066f0caaf..9d415221c4e1 100644
--- a/app-arch/rpm/rpm-4.8.1.ebuild
+++ b/app-arch/rpm/rpm-4.8.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.8.1.ebuild,v 1.1 2010/09/24 19:35:27 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.8.1.ebuild,v 1.2 2010/10/18 19:38:54 sochotnicky Exp $
EAPI=2
@@ -40,6 +40,10 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-autotools.patch
epatch "${FILESDIR}"/${P}-db-path.patch
+ # fix #326665
+ sed -i 's:rpmio/librpmio.la:rpmio/.libs/librpmio.la:' \
+ lib/Makefile.am || die "Patching librpm Makefile.am failed"
+
eautoreconf
}