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

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

(Portage version: 2.2.0_alpha77/cvs/Linux x86_64)

2 files changed, 26 insertions, 9 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/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