QA: Fix compilation with --as-needed (bug 246905)

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.29-rc2-00013-gf3b8436 x86_64

4 files changed, 40 insertions, 12 deletions

diff --git a/app-misc/rio500/ChangeLog b/app-misc/rio500/ChangeLog
index 9ac31c3819fe..2c4ca38b7481 100644
--- a/app-misc/rio500/ChangeLog
+++ b/app-misc/rio500/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/rio500
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/rio500/ChangeLog,v 1.13 2007/01/06 00:31:33 kugelfang Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rio500/ChangeLog,v 1.14 2009/01/19 14:29:18 angelos Exp $
+
+  19 Jan 2009; Christoph Mende <angelos@gentoo.org>
+  +files/rio500-0.7-asneeded.patch, rio500-0.7-r2.ebuild:
+  QA: Fix compilation with --as-needed (bug 246905)
 
   06 Jan 2007; Danny van Dyk <kugelfang@gentoo.org> -rio500-0.7-r1.ebuild:
   QA: Removed unused versions.
diff --git a/app-misc/rio500/Manifest b/app-misc/rio500/Manifest
index 2badba0c59fc..d3f54c8c778b 100644
--- a/app-misc/rio500/Manifest
+++ b/app-misc/rio500/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX rio500-0.7-asneeded.patch 348 RMD160 fc7675b5ab0b7f5382b2e6d04afc46b9b34513b5 SHA1 a9a8d7bc6e01f4e6cfd7ff8a248999b1aa1ccbf9 SHA256 d9fefee4683fc6399aef2577b457123968c8a49400f33cb07671ef14a4c9303b
 AUX rio500-0.7_gcc34.patch 402 RMD160 25db4b6f137947ed6493fa6a66490f399ccc8dbb SHA1 5eb684d3681b9da6d8b584aabbedb99cc578dddc SHA256 288b055a0f339475a268bec6578cec23ca833700bf69fc83b9e40754eae96028
 DIST rio500-0.7.tar.gz 169143 RMD160 59f56abb5f5ca16d6a8a7792dd227417bcd66709 SHA1 f22237d3e13222da69d7b7a09f7e27e2aff8e1b8 SHA256 7a678571c70829386c3d4e042e709ae7036c50227c1c7efa8e9d535bef244f5f
-EBUILD rio500-0.7-r2.ebuild 968 RMD160 b053fb8fd87bd55783af6744b23387311ec19f69 SHA1 b72fa267a53409d6fb573f2f93bda55ce1357af4 SHA256 caf0b995b396a6eaf1cfdc1b8df9b8f6d6a65de42ed50584692ae36f68fbd864
-MISC ChangeLog 1853 RMD160 3095f49680b8b11e5eb831deba3183b282711673 SHA1 2303a8cd44a46e759a43200c3acece38e8be8154 SHA256 ea51d35028736d6adcbe6fb0fc03b71473dfc9b51bed460a833371371e5cf3eb
+EBUILD rio500-0.7-r2.ebuild 1032 RMD160 292d048cd29c0bf71c01cf23152fd4ff25e75f61 SHA1 40c63e0dbc3105f2ef7ec19bab4c789161bf52f7 SHA256 a398f92a71a130e2f91b653828faa0d92e27f71f14f08c9f170c3290818955a2
+MISC ChangeLog 2014 RMD160 d7521dbbddcb9dfe90758d169dc430604571dad7 SHA1 6b6f1129907d52677ce0509c7eb66932f7610166 SHA256 d5715207ca4f4cb37b82151b2cfec8634ce91ba874ea84026980e8e93d9df1e2
 MISC metadata.xml 381 RMD160 e670343e1a21fb51bdc40a610cd9b11445d536d0 SHA1 8baa6b49149678a95e4540111fd6e6d1c9f62792 SHA256 150a2654444bea585bfa165279723ddf0d94cafbb05504021950e50bfff6185b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkl0jkcACgkQKhnDs22gwa8XVwCgxVUMllIYlNUENOTd+UjGyt+l
+DBcAn0oogfo3Hc1fZkTMnLKXaogHNWFp
+=1Luo
+-----END PGP SIGNATURE-----
diff --git a/app-misc/rio500/files/rio500-0.7-asneeded.patch b/app-misc/rio500/files/rio500-0.7-asneeded.patch
new file mode 100644
index 000000000000..00f4c3031c44
--- /dev/null
+++ b/app-misc/rio500/files/rio500-0.7-asneeded.patch
@@ -0,0 +1,11 @@
+--- rio500-0.7/src/Makefile.am.orig	2009-01-19 15:23:50.001056143 +0100
++++ rio500-0.7/src/Makefile.am	2009-01-19 15:24:02.394059698 +0100
+@@ -15,7 +15,7 @@
+ 
+ CFLAGS = $(FLAGS1) $(FLAGS2) $(FLAGS3)
+ 
+-LDADD = -L../lib @GLIB_LIBS@ -lrio500 $(EFENCE_LIB)
++LDADD = -L../lib -lrio500 @GLIB_LIBS@ $(EFENCE_LIB)
+ 
+ GETOPT_SOURCES = getopt.c getopt1.c
+ 
diff --git a/app-misc/rio500/rio500-0.7-r2.ebuild b/app-misc/rio500/rio500-0.7-r2.ebuild
index 362319b0102b..e5ddbb975b01 100644
--- a/app-misc/rio500/rio500-0.7-r2.ebuild
+++ b/app-misc/rio500/rio500-0.7-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/rio500/rio500-0.7-r2.ebuild,v 1.9 2006/10/31 12:43:34 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rio500/rio500-0.7-r2.ebuild,v 1.10 2009/01/19 14:29:18 angelos Exp $
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="Command line tools for transfering mp3s to and from a Rio500"
 HOMEPAGE="http://rio500.sourceforge.net/"
@@ -17,8 +17,10 @@ DEPEND="=dev-libs/glib-1.2*"
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"/src/
-	epatch "${FILESDIR}"/${P}_gcc34.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}_gcc34.patch \
+		"${FILESDIR}"/${P}-asneeded.patch
+	eautoreconf
 }
 
 src_compile() {
@@ -26,16 +28,16 @@ src_compile() {
 		--with-fontpath=/usr/share/rio500/ \
 		--with-id3support || die
 #		--with-usbdevfs
-	make || die
+	emake || die
 }
 
 src_install() {
 	einstall \
-		datadir=${D}/usr/share/rio500 || die
+		datadir="${D}"/usr/share/rio500 || die
 
 	#delete /usr/include/getopt.h as it is part of glibc, and shouldn't be
 	#installed with rio500
-	rm ${D}/usr/include/getopt.h 2>/dev/null
+	rm "${D}"/usr/include/getopt.h 2>/dev/null
 
 	dodoc AUTHORS ChangeLog NEWS README TODO
 	dodoc fonts/Readme.txt