QA: Fixed compilation with --as-needed (bug 246858)

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

4 files changed, 30 insertions, 13 deletions

diff --git a/app-arch/pure-sfv/ChangeLog b/app-arch/pure-sfv/ChangeLog
index 25883c61a270..ac7f75344540 100644
--- a/app-arch/pure-sfv/ChangeLog
+++ b/app-arch/pure-sfv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/pure-sfv
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pure-sfv/ChangeLog,v 1.12 2008/10/27 18:17:08 flameeyes Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pure-sfv/ChangeLog,v 1.13 2009/01/03 17:39:34 angelos Exp $
+
+  03 Jan 2009; Christoph Mende <angelos@gentoo.org>
+  +files/pure-sfv-0.3-asneeded.patch, pure-sfv-0.3.ebuild:
+  QA: Fixed compilation with --as-needed (bug 246858)
 
   27 Oct 2008; Diego Pettenò <flameeyes@gentoo.org> pure-sfv-0.3.ebuild:
   Fix typo.
diff --git a/app-arch/pure-sfv/Manifest b/app-arch/pure-sfv/Manifest
index 9c2021664d67..f8ab0f6a7630 100644
--- a/app-arch/pure-sfv/Manifest
+++ b/app-arch/pure-sfv/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX pure-sfv-0.3-asneeded.patch 381 RMD160 92dec5abef4ad21b3a8106aca6b411e6a30f612a SHA1 9418bd2cde50437d59f17f927ad661019e423307 SHA256 2f4b866323adc478859adc69ba91b24c3f201600c55e5d33932c3ac9f17c9d3c
 DIST pure-sfv_0.3_src.tar.gz 79069 RMD160 df680ea823a79e737c249035ec25cb5da9bd2957 SHA1 cdd3a10288bc9cac9182e1187c8183a08ba632bd SHA256 b5dc97e96656dbe397439c85b0b8ecebddd9d350a09a7485c653ff9210989321
-EBUILD pure-sfv-0.3.ebuild 751 RMD160 3870e5b667feee8b7bbab814cac6cf493f1b3f8c SHA1 3451399c412548116d762ff39ad175ee9dbff803 SHA256 6bc1233bc54083726b25e64b46dc0560f8de403e1c5188fdcab1331546e9dd88
-MISC ChangeLog 1199 RMD160 4bef96709e67037892ce375c3da7b2f028c46961 SHA1 e7d3cb7710c762a3a27bfac5ba651c1226555dd0 SHA256 5d5b77f751bd7684bd6b6b378dce4e3d8d5f7caf7cce9dd5092071a971dbdcc7
+EBUILD pure-sfv-0.3.ebuild 814 RMD160 5ea112bda5d811c551f2f2e6d3418b20c6d56fb4 SHA1 ecf83091e207d9e641e9db2729914b76aee538c5 SHA256 f6498033e1a783dbf40c93b331d1b930a20345406113d3dd4dc6cc754c13d09a
+MISC ChangeLog 1363 RMD160 b2f55ef0e07af0df0894ca4bae1825ec96c150c8 SHA1 f0159fdd498398156241fb177d90be5d53b116df SHA256 8aaae364593a85692f2b08d7b97b63ea729e3c63800ceab1faa01cbb9572f165
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkGg5YACgkQ/ejvha5XGaOaDgCeO7l3EbLMHnUyvaQEj9BD7LyG
-hl0AniYaX97uBKTBQz0yHyEtKKJg6nvy
-=Krsk
+iEYEARECAAYFAklfouAACgkQKhnDs22gwa9nzgCgiiw8GMb5LIJCmhQNsOqnafI7
+z9oAniYFZmOB7oNSYeoiq8m9Q2B5a+CN
+=IPU1
 -----END PGP SIGNATURE-----
diff --git a/app-arch/pure-sfv/files/pure-sfv-0.3-asneeded.patch b/app-arch/pure-sfv/files/pure-sfv-0.3-asneeded.patch
new file mode 100644
index 000000000000..50160a6d34c5
--- /dev/null
+++ b/app-arch/pure-sfv/files/pure-sfv-0.3-asneeded.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig	2009-01-03 18:36:24.349399478 +0100
++++ Makefile	2009-01-03 18:36:37.218398964 +0100
+@@ -65,7 +65,7 @@
+ OBJ = ${SRCS:%.c=%.o}
+ 
+ pure-sfv: $(OBJ)
+-	$(CC) -lm -DVERSION=\"$(VERSION)\" $(CFLAGS) -o $(PROG) $(OBJ)
++	$(CC) -DVERSION=\"$(VERSION)\" $(CFLAGS) -o $(PROG) $(OBJ) -lm
+ 
+ PURIFY_OPTIONS=-follow-child-processes=yes -always-use-cache-dir=yes
+ PURIFY=purify
diff --git a/app-arch/pure-sfv/pure-sfv-0.3.ebuild b/app-arch/pure-sfv/pure-sfv-0.3.ebuild
index fe7a338fafa8..4621d052bfef 100644
--- a/app-arch/pure-sfv/pure-sfv-0.3.ebuild
+++ b/app-arch/pure-sfv/pure-sfv-0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pure-sfv/pure-sfv-0.3.ebuild,v 1.15 2008/10/27 18:17:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pure-sfv/pure-sfv-0.3.ebuild,v 1.16 2009/01/03 17:39:34 angelos Exp $
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="utility to test and create .sfv files and create .par files"
 HOMEPAGE="http://pure-sfv.sourceforge.net/"
@@ -16,12 +16,13 @@ RESTRICT="test"
 
 DEPEND=""
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	sed -i 's:-O2 -g::;s:-Werror::' Makefile
+	sed -i -e "s:-Werror -O2 -g::" Makefile
+	epatch "${FILESDIR}"/${P}-asneeded.patch
 }
 
 src_compile() {
@@ -29,6 +30,6 @@ src_compile() {
 }
 
 src_install() {
-	dobin pure-sfv || die
+	dobin pure-sfv || die "dobin failed"
 	dodoc ReadMe.txt
 }