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

Package-Manager: portage-2.2_rc54/cvs/Linux i686

5 files changed, 44 insertions, 8 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/Manifest b/x11-wm/musca/Manifest
index 893de62b58ac..72bb335ca3ed 100644
--- a/x11-wm/musca/Manifest
+++ b/x11-wm/musca/Manifest
@@ -1,7 +1,8 @@
 AUX musca-0.9.23-flags.patch 380 RMD160 656acafc2a19778223b6f50f3f7b9501883c6b1a SHA1 dd0d7ea02c4d04ef56f906226a267364e39e73d8 SHA256 48f09df1b48f17f417f3e45111ee4af369ea84500a2a0fa386fd52a400cc4c0c
+AUX musca-0.9.24-make.patch 760 RMD160 1cd79b49fc9a844c6445fe7c4e11b78c398b2238 SHA1 60891a533485a4d1f5e610a0492f9764b26d3725 SHA256 51e3ffcae420fb33d4ae67a9445c0882446a0ced9a1a4c76e9fae20c8d321901
 DIST musca-0.9.23.tgz 55140 RMD160 132c8cb9433a18a0b192bf82332d5d217c3b333e SHA1 056c89d38e66675cc4d3880ec9709f25ea386216 SHA256 9c12cda518d34998afff7d379ce4dd5b0520b837082c44a166e8d6a9c3cf507f
 DIST musca-0.9.24.tgz 81210 RMD160 599e6539455b94d05a48485ad28f4b28ca7d73e1 SHA1 a74d27a352b76dccf09792a00e50ba3c05b9929b SHA256 c34e37e2df5075a61f8d5268786ab8115816af95c46e063c50f7f1c500527301
 EBUILD musca-0.9.23.ebuild 879 RMD160 7b7a62c44dd5ec7b88982355d11c548a30d05499 SHA1 45e02e31463769e73d927217d0c9631af9c42b96 SHA256 51b9447b889e8585e24510c25047c788e28188d59b179a764af9124218be6f5e
-EBUILD musca-0.9.24.ebuild 1088 RMD160 68f76cb25aa4e8d5f7db394c053fb05af9b9cb25 SHA1 0d228d9c942a5c90ac6b1f895e5678fd9a808dfd SHA256 2a8b504866729bd1637d9ccbfa1c55922f376aa530364c171533e871a8f836b6
-MISC ChangeLog 880 RMD160 4c7778f97bc5b10e638ccd8426035a1f8be48a0f SHA1 7755cf9d686917fbe4d653bffeae9bb4c321dbf7 SHA256 65c9446500993966af48d84ff7bdadde7209c82bc90ede04a09fc801f1e855f7
-MISC metadata.xml 345 RMD160 0415b5193c5216d58ec28f4579db872ee2a12c89 SHA1 9416aab4deae3a6c485df578c0999c36ffd321c8 SHA256 32ac260d3b7ad31723c59c231dd95f28d6c206d790ba926f9b75d1a543ae72ad
+EBUILD musca-0.9.24.ebuild 1132 RMD160 41fff6953a221284ca3bf4103968241e924783ec SHA1 0194205c8d4952fa508fc0016b30176af5140ca6 SHA256 625a3380fb6ea0f3c783603e8518bc8bf930d8f89908517cef7dae6ac10d89f0
+MISC ChangeLog 1097 RMD160 01d8fbe9a19d82dae3476fb7cbc1bc32fb77cb70 SHA1 c4481fa1a1978d01d9ca69608c5ce79e48f7d623 SHA256 89b51cc8b6fe0e44229fb880cad8734c1a2f2512f41534b0f72b7bb51c9cb8fe
+MISC metadata.xml 414 RMD160 48e7824340a745d8c0d30296aed143911bda4068 SHA1 c80f5d6a4342fe357f5e6be384bc9787b2d92243 SHA256 1c3fb26b847decbd35600a421d2ed11a494454cc463281c4d989f8341efb6029
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
 }