Version bump.

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

2 files changed, 41 insertions, 21 deletions

diff --git a/sys-devel/prelink/ChangeLog b/sys-devel/prelink/ChangeLog
index 3200b8c84307..528da1f40853 100644
--- a/sys-devel/prelink/ChangeLog
+++ b/sys-devel/prelink/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/prelink
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/ChangeLog,v 1.88 2012/07/22 20:37:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/ChangeLog,v 1.89 2012/08/18 06:47:48 dirtyepic Exp $
+
+*prelink-20120628 (18 Aug 2012)
+
+  18 Aug 2012; Ryan Hill <dirtyepic@gentoo.org> -prelink-20100106.ebuild,
+  +prelink-20120628.ebuild:
+  Version bump.
 
   22 Jul 2012; Mike Frysinger <vapier@gentoo.org> prelink-20111012.ebuild:
   Link against pthreads when elfutils is built with USE=threads #427538 by
diff --git a/sys-devel/prelink/prelink-20100106.ebuild b/sys-devel/prelink/prelink-20120628.ebuild
index 1bd1d29c7cba..a9bb4920d776 100644
--- a/sys-devel/prelink/prelink-20100106.ebuild
+++ b/sys-devel/prelink/prelink-20120628.ebuild
@@ -1,22 +1,28 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/prelink-20100106.ebuild,v 1.9 2012/03/18 15:27:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/prelink-20120628.ebuild,v 1.1 2012/08/18 06:47:48 dirtyepic Exp $
 
-# 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
+EAPI="4"
 
-inherit eutils flag-o-matic
+inherit autotools 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"
+
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+#SRC_URI="http://people.redhat.com/jakub/prelink/${P}.tar.bz2"
+
+# if not available on jakub's dev space extract the distfile with rpm2tarbz2 from
+# http://mirrors.kernel.org/fedora/development/rawhide/source/SRPMS/prelink-[ver].src.rpm
+#
+# track http://pkgs.fedoraproject.org/cgit/prelink.git/ for updates
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 -arm ppc ppc64 x86"
+KEYWORDS="~amd64 -arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
-DEPEND=">=dev-libs/elfutils-0.100
+DEPEND=">=dev-libs/elfutils-0.100[static-libs(+)]
 	!dev-libs/libelf
 	>=sys-libs/glibc-2.8"
 RDEPEND="${DEPEND}
@@ -24,27 +30,37 @@ RDEPEND="${DEPEND}
 
 S=${WORKDIR}/${PN}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-20061201-prelink-conf.patch
-	sed -i -e 's:undosyslibs.sh::' testsuite/Makefile.in #254201
+
 	sed -i -e '/^CC=/s: : -Wl,--disable-new-dtags :' testsuite/functions.sh #100147
-	sed -i -e 's:-Wno-pointer-sign::' src/Makefile.in #325269
+	# >=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.am
+
+	# older GCCs don't support this flag
+	sed -i -e 's:-Wno-pointer-sign::' src/Makefile.am #325269
 	append-cflags -Wno-pointer-sign
 	strip-unsupported-flags
-}
 
-src_test() {
-	unset LD_AS_NEEDED #303797
-	emake -j1 check
+	has_version 'dev-libs/elfutils[threads]' && append-ldflags -pthread
+
+	eautoreconf # prevent maintainer mode
+
+	# have to do this after eautoreconf or automake barfs on the trailing
+	# backslash of the previous line
+	sed -i -e 's:undosyslibs.sh::' testsuite/Makefile.in # 254201
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "Install Failed"
+	default
 
 	insinto /etc
-	doins doc/prelink.conf || die
+	doins doc/prelink.conf
 
 	exeinto /etc/cron.daily
 	newexe "${FILESDIR}"/prelink.cron prelink
@@ -55,8 +71,6 @@ src_install() {
 	touch "${D}/var/lib/misc/prelink.quick"
 	touch "${D}/var/lib/misc/prelink.force"
 	touch "${D}/var/log/prelink.log"
-
-	dodoc TODO ChangeLog
 }
 
 pkg_postinst() {