Fix linking with --as-needed (bug #295165). Make in parallel too. Build xlisten optionally too.

(Portage version: 2.2_rc54/cvs/Linux i686)

4 files changed, 40 insertions, 5 deletions

diff --git a/x11-wm/musca/ChangeLog b/x11-wm/musca/ChangeLog
index b74328c5d93f..6d5a5c76d1e6 100644
--- a/x11-wm/musca/ChangeLog
+++ b/x11-wm/musca/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/musca
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/ChangeLog,v 1.6 2009/11/04 10:27:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/ChangeLog,v 1.7 2009/11/30 20:46:34 jer Exp $
+
+  30 Nov 2009; Jeroen Roovers <jer@gentoo.org> musca-0.9.24.ebuild,
+  +files/musca-0.9.24-make.patch, metadata.xml:
+  Fix linking with --as-needed (bug #295165). Make in parallel too. Build
+  xlisten optionally too.
 
   04 Nov 2009; Jeroen Roovers <jer@gentoo.org> musca-0.9.24.ebuild:
   Die more often.
diff --git a/x11-wm/musca/files/musca-0.9.24-make.patch b/x11-wm/musca/files/musca-0.9.24-make.patch
new file mode 100644
index 000000000000..371c804b758c
--- /dev/null
+++ b/x11-wm/musca/files/musca-0.9.24-make.patch
@@ -0,0 +1,24 @@
+--- musca-0.9.24/Makefile.orig	2009-11-03 03:20:21.000000000 +0100
++++ musca-0.9.24/Makefile	2009-11-30 21:39:04.000000000 +0100
+@@ -1,9 +1,15 @@
+-CFLAGS?=-Wall -g
++CFLAGS ?= -Wall -g
++INCLUDES = $(shell pkg-config --cflags x11)
++LIBS = $(shell pkg-config --libs x11) -lm
++COMPILE = $(CC) $(CFLAGS) $(INCLUDES) $(LIBS) $(LDFLAGS)
++BIN_DIST = musca apis xlisten
+ 
+-all:
+-	$(CC) $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib -lc -lm -lX11 -o musca musca.c
+-	$(CC) $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib -lc -lm -lX11 -o apis apis.c
+-	$(CC) $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib -lc -lm -lX11 -o xlisten xlisten.c
++all: $(BIN_DIST)
++
++$(BIN_DIST):
++	$(COMPILE) -o $@ $@.c
+ 
+ clean:
+-	rm -f musca apis
++	rm -f $(BIN_DIST)
++
++.PHONY: all clean
diff --git a/x11-wm/musca/metadata.xml b/x11-wm/musca/metadata.xml
index 29af61af0bfd..1e991eb202fd 100644
--- a/x11-wm/musca/metadata.xml
+++ b/x11-wm/musca/metadata.xml
@@ -8,5 +8,6 @@
 </maintainer>
 <use>
 	<flag name="apis">Optionally install the experimental `apis' window manager</flag> 
+	<flag name="xlisten">Optionally install the xlisten utility</flag> 
 </use>
 </pkgmetadata>
diff --git a/x11-wm/musca/musca-0.9.24.ebuild b/x11-wm/musca/musca-0.9.24.ebuild
index a1d7cf0b03fe..4663d8025ba8 100644
--- a/x11-wm/musca/musca-0.9.24.ebuild
+++ b/x11-wm/musca/musca-0.9.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/musca-0.9.24.ebuild,v 1.2 2009/11/04 10:27:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/musca-0.9.24.ebuild,v 1.3 2009/11/30 20:46:34 jer Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ SRC_URI="http://aerosuidae.net/${P}.tgz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="apis"
+IUSE="apis xlisten"
 
 COMMON="x11-libs/libX11"
 DEPEND="${COMMON} sys-apps/sed"
@@ -24,8 +24,13 @@ RDEPEND="
 "
 
 src_prepare() {
-	sed -e 's|$(CFLAGS)|& $(LDFLAGS)|g' -i Makefile
-	use apis || sed -e '/apis/d' -i Makefile
+	epatch "${FILESDIR}"/${P}-make.patch
+
+	local i
+	for i in apis xlisten; do
+		use ${i} || sed -e "s|${i}||g" -i Makefile
+	done
+
 	use savedconfig && restore_config config.h
 }