Added patch to fix compilation with --as-needed. Closes bug #248652.

Some ebuild QA fixing.
Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.24-tuxonice-r9 i686

4 files changed, 46 insertions, 8 deletions

diff --git a/x11-plugins/wsoundserver/ChangeLog b/x11-plugins/wsoundserver/ChangeLog
index d2ee3df0f414..0e14358a04c0 100644
--- a/x11-plugins/wsoundserver/ChangeLog
+++ b/x11-plugins/wsoundserver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/wsoundserver
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wsoundserver/ChangeLog,v 1.5 2007/02/06 02:06:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wsoundserver/ChangeLog,v 1.6 2009/01/19 16:21:08 s4t4n Exp $
+
+  19 Jan 2009; Michele Noberasco <s4t4n@gentoo.org>
+  wsoundserver-0.4.1.ebuild, +files/wsoundserver-0.4.1-as-needed.patch:
+  Added patch to fix compilation with --as-needed. Closes bug #248652.
+  Some ebuild QA fixing.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wsoundserver/Manifest b/x11-plugins/wsoundserver/Manifest
index e661f8f2b3bc..5e0d4ca470b8 100644
--- a/x11-plugins/wsoundserver/Manifest
+++ b/x11-plugins/wsoundserver/Manifest
@@ -1,5 +1,6 @@
 AUX WSoundServer.xpm 12956 RMD160 2ac26a915625e5c8a910ad18bdb79e278b9781b0 SHA1 e0845ca0772c37ae52594d678dc49ef0890d1589 SHA256 50c8e8de67c78fe80bf2c6588c3643567484f690bee1dc27af4dcd71ff5d89d5
+AUX wsoundserver-0.4.1-as-needed.patch 780 RMD160 2b26a7c9a1209a70eb2b109db0aeb12045b5aebd SHA1 f7cbf8311bafa9b5e2b062df788eb9996d5aeac2 SHA256 da59731b7da041460dcbaee6b6b8296028f4739e9936a94e1af2497d751ff17a
 DIST WSoundServer-0.4.1-new.tar.gz 427676 RMD160 83b2b1dca322be5ba7ca627e49160b4fdb5793c3 SHA1 72347d560f199f41ee2f9f4c4fe67927799de56d SHA256 8653564da3a4ddd29b3521b14ff6d7f34edfe0eaa0f9359a87852ec5dcca58af
-EBUILD wsoundserver-0.4.1.ebuild 1273 RMD160 1fdeff2b3597ee7e51be39aa2c70070e7f7daece SHA1 96dc24097250dc5d7808a191be337f15f4e7c7b4 SHA256 c4a8d4793a24c6e47ee09c79fb24e1a98f7f905c13341d5c219bc4f8e18a4b7f
-MISC ChangeLog 783 RMD160 7d50d6f30a5ad0140c22dfdc81b94a6812e7a9a6 SHA1 5c6de80ceefdbd7eeead4fc471763dcd8f7b252c SHA256 5c9fa70d452384578e452151062483702547f8e81a01ac52284863bc898c3de7
+EBUILD wsoundserver-0.4.1.ebuild 1390 RMD160 c7d76ad2aa696222643cd90f4803c5daba256d89 SHA1 162006753e61075ed134f63e2bb5fcc79f37674d SHA256 51bbd5ab05ad430d2d6c91d18a8af43adab7f021e6c157918ac17f91c7c86942
+MISC ChangeLog 1000 RMD160 e20534b592807185c00932a581d06af3d99e54dd SHA1 2a000e612736f24f37bd77a35e1ed1ba41a04f32 SHA256 5881b7b8c3f2b731f64bd9d8f36d89b4492deefecde011b1e5d6ad1cc10269b4
 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
diff --git a/x11-plugins/wsoundserver/files/wsoundserver-0.4.1-as-needed.patch b/x11-plugins/wsoundserver/files/wsoundserver-0.4.1-as-needed.patch
new file mode 100644
index 000000000000..7439b3211b28
--- /dev/null
+++ b/x11-plugins/wsoundserver/files/wsoundserver-0.4.1-as-needed.patch
@@ -0,0 +1,22 @@
+--- configure.in	2009-01-19 16:58:55.000000000 +0100
++++ configure.in.new	2009-01-19 16:58:44.000000000 +0100
+@@ -212,6 +212,7 @@
+     AC_DEFINE(DRIVER_ESD)
+     driver="DRIVER_ESD"
+ else
++    AM_CONDITIONAL(HAVE_ESD,test "x$enable_esd" = xyes)
+     echo "---------------------------------------------------------------------"
+     echo "--- Checking to see which audio header files your system uses.";
+     echo "--- Most of these checks should fail. Do not be alarmed.";
+
+--- wslib/Makefile.am	2009-01-19 17:07:10.000000000 +0100
++++ wslib/Makefile.am.new	2009-01-19 17:07:28.000000000 +0100
+@@ -40,7 +40,7 @@
+ LIBLIST = libwsound.la libwsoundeffect.la -L../wseffectlib/ @LIBRARY_SEARCH_PATH@ @XLIBS@
+ 
+ 
+-libwsound_la_LIBADD =
++libwsound_la_LIBADD = @XLIBS@
+ 
+ CLEANFILES = 
+ 
diff --git a/x11-plugins/wsoundserver/wsoundserver-0.4.1.ebuild b/x11-plugins/wsoundserver/wsoundserver-0.4.1.ebuild
index db9206f7e469..99d5bdc9e749 100644
--- a/x11-plugins/wsoundserver/wsoundserver-0.4.1.ebuild
+++ b/x11-plugins/wsoundserver/wsoundserver-0.4.1.ebuild
@@ -1,6 +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/x11-plugins/wsoundserver/wsoundserver-0.4.1.ebuild,v 1.5 2007/07/11 20:39:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wsoundserver/wsoundserver-0.4.1.ebuild,v 1.6 2009/01/19 16:21:08 s4t4n Exp $
+
+inherit autotools eutils
 
 MY_P="${P/wsoundserver/WSoundServer}-new"
 S="${WORKDIR}/${MY_P}"
@@ -23,24 +25,32 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~ppc x86"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+
+	eautoreconf
+}
+
 src_compile() {
 	local myconf="--prefix=/usr --with-x --sysconfdir=/etc/X11"
 
 	myconf="${myconf} `use_enable esd`"
 
-	cd ${S}
+	cd "${S}"
 	emake clean >/dev/null 2>&1
 	econf || die "configure failed"
 	emake || die "make failed"
 }
 
 src_install() {
-	cd ${S}
 	einstall sysconfdir=/etc/X11 || die "make install failed"
 	dodoc AUTHORS ChangeLog README
 
 	insinto /usr/share/WindowMaker/Pixmaps
-	doins ${FILESDIR}/WSoundServer.xpm
+	doins "${FILESDIR}/WSoundServer.xpm"
 }
 
 pkg_postinst() {