Version bump (bug #390125 by Matt Summers), fix testsuite breakage from

binutils-2.22 enabling --copy-dt-needed-entries by default.  Remove old.

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

3 files changed, 33 insertions, 16 deletions

diff --git a/sys-devel/prelink/ChangeLog b/sys-devel/prelink/ChangeLog
index 2e76f8e67abb..3c4101449f0d 100644
--- a/sys-devel/prelink/ChangeLog
+++ b/sys-devel/prelink/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/prelink
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/ChangeLog,v 1.80 2011/06/15 03:54:24 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/ChangeLog,v 1.81 2011/11/24 04:49:28 dirtyepic Exp $
+
+*prelink-20111012 (24 Nov 2011)
+
+  24 Nov 2011; Ryan Hill <dirtyepic@gentoo.org> -prelink-20101123.ebuild,
+  +prelink-20111012.ebuild:
+  Version bump (bug #390125 by Matt Summers), fix testsuite breakage from
+  binutils-2.22 enabling --copy-dt-needed-entries by default.  Remove old.
 
 *prelink-20110511 (15 Jun 2011)
 
diff --git a/sys-devel/prelink/Manifest b/sys-devel/prelink/Manifest
index 47f874022d6e..b532ad84ec91 100644
--- a/sys-devel/prelink/Manifest
+++ b/sys-devel/prelink/Manifest
@@ -5,17 +5,17 @@ AUX prelink-20061201-prelink-conf.patch 705 RMD160 ee07c1057df85e41840ba8a45807d
 AUX prelink.confd 1677 RMD160 ccd7324c07917039566f4e58d6f0fc73e70c99d9 SHA1 6c0995685263fd3e867d4e3bce7fefeb17ef221e SHA256 e5db6bcc86a010a50be9134cb440f8366247ee36f1556f97d4f270746eb59dea
 AUX prelink.cron 2424 RMD160 b338a5634cc848e7de3c4987c9ce86f94c253654 SHA1 72b9e589d066eaf0a72a8d2541d9c28787c5c318 SHA256 6258d94475db9f58902c1e13ef0f3abe1422f0c955d6e385455a4c7e8f63957c
 DIST prelink-20100106.tar.bz2 920275 RMD160 991a7497737ff64f250226805c28592a832ac90c SHA1 9d63429d59cf7b56816db7bbe6602188032ffbc1 SHA256 6aea85b672f2689b52a75e36a5e06fdc9b338e8d2935692dbb0fc61c83491125
-DIST prelink-20101123.tar.bz2 923416 RMD160 fbd9069a26eec9b332cd2667a87a47cf1d1dc9f4 SHA1 de04ba2a4af0a3bc38eb435035417b40ef2f9712 SHA256 e76dccf3b2e3bb075a44f1d10ede55a7aa6f7f065e01fd6a9db1318e0c51e71b
 DIST prelink-20110511.tar.bz2 924501 RMD160 ed721def4e73799f4bd15d53f1cd1c45bb4ddcb8 SHA1 aa48d3243fa7ed096448522d2dcd0e9253579cb5 SHA256 038725b6e3125dc163bca6c6bd348958ca117510d6d2603f06431fee59b4e0fe
+DIST prelink-20111012.tar.bz2 926500 RMD160 1c9ca6d5882d502921255c5953f0b4be95474fc8 SHA1 9e8c7059bca48fd6b6d09b5aab0062f5034026cb SHA256 b86df2e6c051176da711a85982b80d87c8ce8e053e04bd0ffb2f9ba817f62aaf
 EBUILD prelink-20100106.ebuild 2035 RMD160 75db5e14e2d4dab09cbc88bbec637d41af06c04a SHA1 8d2f4d62a5176918456803c39cc9bd50096f37a9 SHA256 cb3ffb19b8c714bbd69129fedb8320ccf3ff1de0b3d8063e7df7eaf25556068e
-EBUILD prelink-20101123.ebuild 2145 RMD160 734be43a9a9f5ee0b5ba129483c8ac6b5dd529a2 SHA1 2aedc2a1cf233283a2fd8a118d49bcf22515c66b SHA256 0598cec1e938df4e0797efdeb341bda21e0e7d035fa80d4fc3f2df63242a49bc
 EBUILD prelink-20110511.ebuild 2213 RMD160 1e200db95e50876b92c8308feca575f68d6a260d SHA1 ee5098207de842d73378d6bbbe0db3ee3b9cb94b SHA256 0f5c66e9e2bab3a133149cffa49cc3bfd955fc22e6e1a7c0cf35075fb612749a
-MISC ChangeLog 10480 RMD160 59dfd019f48cb4079f1fabe4c075710b303e059e SHA1 81aae36211c07c0e69fc343cf1ceb40d4e16c3e0 SHA256 be218d90db782c1ebbceeca93737b520beb9c7f88838771a09eec8b447893527
+EBUILD prelink-20111012.ebuild 2454 RMD160 2d33d01afb79ee4cee43ecba5e40315fb1037ad0 SHA1 3ccf8f504d02dfe1434b7b84a9bf1bfe5d655e53 SHA256 8f85fcdcadb0e20d27e3fb4eedc0eec1b6573c10b94aaf4c8689e740ebc9d9fe
+MISC ChangeLog 10765 RMD160 3c7fbc97ef828bb80e88b8e4bed5c09e2673d2b5 SHA1 2901291b45845f6cf578f2faba1b67260e857dee SHA256 4ea94390b17bb3c49e6cef9ad94aff872db518db3bbfc4f0da91468c85880167
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk34Lt0ACgkQiqiDRvmkBmKloQCcDx6DUlK/YCLB6NF6+mgyFnla
-Dh8AoKx9RxXIkjD2nmz58pKsKCTEbudf
-=rUF1
+iEYEARECAAYFAk7NzzwACgkQiqiDRvmkBmLAcQCfZM+9NtAQOhJp5mawkb3S4c57
+mUAAoL6vcnw/hW0n1awxPJcIFBLanRQw
+=4zZG
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/prelink/prelink-20101123.ebuild b/sys-devel/prelink/prelink-20111012.ebuild
index 2bf0ca1688b0..feca8a43535f 100644
--- a/sys-devel/prelink/prelink-20101123.ebuild
+++ b/sys-devel/prelink/prelink-20111012.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/prelink-20101123.ebuild,v 1.1 2010/12/11 06:18:21 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/prelink-20111012.ebuild,v 1.1 2011/11/24 04:49:28 dirtyepic Exp $
 
 EAPI="2"
 
@@ -8,10 +8,15 @@ inherit eutils flag-o-matic
 
 DESCRIPTION="Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times"
 HOMEPAGE="http://people.redhat.com/jakub/prelink"
-#SRC_URI="http://people.redhat.com/jakub/prelink/${P}.tar.bz2"
-# if not on http://people.redhat.com/jakub/prelink/, releases can usually be ripped from
-# http://mirrors.kernel.org/fedora/development/source/SRPMS/prelink-<blah>.src.rpm
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+#SRC_URI="mirror://gentoo/${P}.tar.bz2"
+SRC_URI="http://people.redhat.com/jakub/prelink/${P}.tar.bz2"
+#
+# if not available rip the distfile with rpm2targz from
+# http://mirrors.kernel.org/fedora/development/rawhide/source/SRPMS/prelink-[ver].src.rpm
+
+# track http://pkgs.fedoraproject.org/gitweb/?p=prelink.git;a=summary for
+# version bumps
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -31,10 +36,15 @@ src_prepare() {
 
 	sed -i -e 's:undosyslibs.sh::' testsuite/Makefile.in #254201
 	sed -i -e '/^CC=/s: : -Wl,--disable-new-dtags :' testsuite/functions.sh #100147
+	# >=binutils-2.22 --no-copy-dt-needed-entries is the default
+	# --copy-dt-needed-entries was renamed from --add-needed in 2.21, use the
+	# former so we don't have to bump the dep
+	sed -i \
+		-e '/CCLINK=/s:\(CCLINK="$(CC)\):\1 -Wl,--add-needed :' \
+		-e '/CXXLINK=/s:\(CXXLINK="$(CXX)\):\1 -Wl,--add-needed :' \
+		testsuite/Makefile.in
 
 	# older GCCs don't support this flag
-	# sed it from the Makefile then add it back to CFLAGS so we can use
-	# strip-unsupported-flags
 	sed -i -e 's:-Wno-pointer-sign::' src/Makefile.in #325269
 	append-cflags -Wno-pointer-sign
 	strip-unsupported-flags