Fix building with -Wl,--as-needed wrt #320795 by Kacper Kowalik.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 43 insertions, 19 deletions

diff --git a/x11-plugins/wmauda/ChangeLog b/x11-plugins/wmauda/ChangeLog
index 0cc254aa508a..ab1fcbbc036e 100644
--- a/x11-plugins/wmauda/ChangeLog
+++ b/x11-plugins/wmauda/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmauda
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmauda/ChangeLog,v 1.14 2009/08/16 09:15:27 betelgeuse Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmauda/ChangeLog,v 1.15 2010/06/20 17:05:34 ssuominen Exp $
+
+  20 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> wmauda-0.7.ebuild,
+  +files/wmauda-0.7-asneeded.patch:
+  Fix building with -Wl,--as-needed wrt #320795 by Kacper Kowalik.
 
   16 Aug 2009; Petteri Räty <betelgeuse@gentoo.org> wmauda-0.7.ebuild:
   Raise audacious dependency to >=1.5 so we can drop the built_with_use
diff --git a/x11-plugins/wmauda/Manifest b/x11-plugins/wmauda/Manifest
index b61a8e714707..495694b97872 100644
--- a/x11-plugins/wmauda/Manifest
+++ b/x11-plugins/wmauda/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX wmauda-0.7-asneeded.patch 764 RMD160 c3fb71070c0d798d966fef07057f478fd3be1589 SHA1 06ff867f5f3fec39cfb1869e4c31e51257ea26a2 SHA256 1315b04ca066617cdecd4ecd30619edc0bf7da2dabca485b3448b893ab37ffaa
 DIST wmauda-0.7.tar.gz 18328 RMD160 d326bc901d6f854c97bd0492713672f991888ae3 SHA1 3ef084dea0afae96002cbf8b8aa77b4458d99a14 SHA256 947855691ad144ef9776b687be6fc7f84bb9dedc85a5c005150e2f4dcfdbe5a1
-EBUILD wmauda-0.7.ebuild 801 RMD160 2cc7196ee399cd06afa0327683f490f9392cc36a SHA1 1fcd48c2a4532deca2d9ce2e7123aa14eb99f14a SHA256 7cc8b03a7028484fac1d257ac2042683f91fd324256ce9e4dce6cdbddd33b487
-MISC ChangeLog 2202 RMD160 03f9ee0397e0c30df87160d725e65a196ae36475 SHA1 5df50054c9a3a0c79c86ea64b644f1a9d776dfb3 SHA256 94d34a37f9458cbf85a024eb837d313e6bdede55791fc00743093926236b99ec
+EBUILD wmauda-0.7.ebuild 826 RMD160 301e8056fde6500dad83dab09a9361356b36bd91 SHA1 5e9a06dd334dd6708cee357687c739488a95b15c SHA256 5fa7b4be43a796ffdabef6d74870e59ea8bdb9a3a706cb1a6bad4a8c689ba230
+MISC ChangeLog 2378 RMD160 46586f7499409c658d1f9227bf98609ef937612d SHA1 b19855b54ebc1acdab5e24899486345aa49a7731 SHA256 e43754a95cdbdd61a702496e2b1b317a4c7056591bc18d3045793ce1983f8db8
 MISC metadata.xml 167 RMD160 407c7d2b252afa7f63c4743fedf94da43b716623 SHA1 f42c260c0a7ce58db5124a80e8f65e9d570294b2 SHA256 0b161d83e9e7cad5a69cc5c2a23a5ba0fcac0d20751516b605dc232d9a2e7284
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqHzioACgkQcxLzpIGCsLQZwgCePEuN44iKvyz+msY6shGvk81O
-lFgAnRBAP2G0kYT3MOdY7nrlgIDdm2iV
-=cewB
------END PGP SIGNATURE-----
diff --git a/x11-plugins/wmauda/files/wmauda-0.7-asneeded.patch b/x11-plugins/wmauda/files/wmauda-0.7-asneeded.patch
new file mode 100644
index 000000000000..e9aaabb13332
--- /dev/null
+++ b/x11-plugins/wmauda/files/wmauda-0.7-asneeded.patch
@@ -0,0 +1,24 @@
+Fixing build with as-needed, respecting LDFLAGS
+
+http://bugs.gentoo.org/show_bug.cgi?id=320795
+
+--- Makefile
++++ Makefile
+@@ -7,14 +7,14 @@
+ PIXMAP_DIR	:= $(PREFIX)/share/pixmaps
+ MANPAGE_DIR	:= $(PREFIX)/share/man/man1
+ 
+-CFLAGS 	+= $(shell pkg-config audacious --cflags) $(shell pkg-config dbus-1 --cflags)
+-LIBS 	:= $(shell pkg-config audacious --libs)   $(shell pkg-config dbus-1 --libs)
++CFLAGS 	+= $(shell pkg-config audclient --cflags) $(shell pkg-config dbus-1 --cflags)
++LIBS 	:= $(shell pkg-config audclient --libs)   $(shell pkg-config dbus-1 --libs)
+ 
+ OBJS 	= wmauda.o
+ HEADERS = config.h dock-master.xpm
+ 
+ wmauda:	$(OBJS) $(HEADERS)
+-	$(CC) -o wmauda $(OBJS) $(CFLAGS) $(LIBS)
++	$(CC) $(LDFLAGS) -o wmauda $(OBJS) $(CFLAGS) $(LIBS)
+ 
+ all:	wmauda
+ 
diff --git a/x11-plugins/wmauda/wmauda-0.7.ebuild b/x11-plugins/wmauda/wmauda-0.7.ebuild
index 459a8e4f5605..88b02602e071 100644
--- a/x11-plugins/wmauda/wmauda-0.7.ebuild
+++ b/x11-plugins/wmauda/wmauda-0.7.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmauda/wmauda-0.7.ebuild,v 1.6 2009/08/16 09:15:27 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmauda/wmauda-0.7.ebuild,v 1.7 2010/06/20 17:05:34 ssuominen Exp $
 
+EAPI=2
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Dockable applet for WindowMaker that controls Audacious."
@@ -15,18 +16,22 @@ IUSE=""
 
 RDEPEND="dev-libs/dbus-glib
 	x11-libs/libX11
-	>=x11-libs/gtk+-2
+	x11-libs/gtk+:2
 	>=media-sound/audacious-1.5"
 DEPEND="${RDEPEND}
 	x11-proto/xproto
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+}
+
 src_compile() {
 	tc-export CC
-	emake || die "emake failed."
+	emake || die
 }
 
 src_install () {
-	emake DESTDIR="${D}" PREFIX="/usr" install || die "emake install failed."
+	emake DESTDIR="${D}" PREFIX="/usr" install || die
 	dodoc AUTHORS README
 }