Respect LDFLAGS (bug #335807), CC, CFLAGS. Fix USE=-rplay. Do not rebuild in src_install(). Have flex and bison in DEPEND. Replace local path patch with simple sed scripts. Run make depend in src_configure() too so we can have parallel make in src_compile().

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

6 files changed, 126 insertions, 28 deletions

diff --git a/x11-wm/vtwm/ChangeLog b/x11-wm/vtwm/ChangeLog
index 36c55b2a091a..9d74334328ab 100644
--- a/x11-wm/vtwm/ChangeLog
+++ b/x11-wm/vtwm/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-wm/vtwm
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/vtwm/ChangeLog,v 1.10 2007/07/02 10:54:16 coldwind Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/vtwm/ChangeLog,v 1.11 2010/09/17 00:27:45 jer Exp $
+
+*vtwm-5.4.7-r1 (17 Sep 2010)
+
+  17 Sep 2010; Jeroen Roovers <jer@gentoo.org> -vtwm-5.4.7.ebuild,
+  +vtwm-5.4.7-r1.ebuild, +files/vtwm-5.4.7-NO_SOUND_SUPPORT.patch,
+  +files/vtwm-5.4.7-do-not-rm.patch,
+  -files/vtwm-5.4.7-dont-use-local-path.patch:
+  Respect LDFLAGS (bug #335807), CC, CFLAGS. Fix USE=-rplay. Do not rebuild
+  in src_install(). Have flex and bison in DEPEND. Replace local path patch
+  with simple sed scripts. Run make depend in src_configure() too so we can
+  have parallel make in src_compile().
 
 *vtwm-5.4.7 (02 Jul 2007)
 
diff --git a/x11-wm/vtwm/Manifest b/x11-wm/vtwm/Manifest
index 5e7a152831f4..122c1f776831 100644
--- a/x11-wm/vtwm/Manifest
+++ b/x11-wm/vtwm/Manifest
@@ -1,7 +1,8 @@
-AUX vtwm-5.4.7-dont-use-local-path.patch 473 RMD160 a82b92f3047f84534a0961db6ca456a81599e013 SHA1 b4604ada582e087c58bacc65029e18840fb8250a SHA256 efe4adde4a2173e2f3b4ff6868bcfe3339e155c3ed829de02cbef2d7e1db184f
+AUX vtwm-5.4.7-NO_SOUND_SUPPORT.patch 835 RMD160 64bfbad5ab47781cfcf7147d0260090ab42d57c6 SHA1 11e97006b19f9301668c9172e947c236ed101dbe SHA256 f469d7c3ab389b42aaeb8d7dadfbab9c6bba8383ff9b1370643fb254e40772c9
+AUX vtwm-5.4.7-do-not-rm.patch 1039 RMD160 8046b05f73ecbe613ff8c37602512bc4e5f5d22b SHA1 c30358d2110ddab2760c30445b49956921c51961 SHA256 83348d06d90e3e9dc97699bacebf05c1baeba00597df66f7609622b485eebce9
 DIST vtwm-5.4.6a.tar.gz 992488 RMD160 c531de2c3fad4b566329c387cb98833c2a2f101f SHA1 5159d91e1022af399268e43413d9801b757febec SHA256 e31fca6071f82f082d78a816062c32c87aafb25aa2c2419a2ec8a1bfe2e50f71
 DIST vtwm-5.4.7.tar.gz 1021160 RMD160 9ab71147abdbaea9f95a2528595b79a3faf49834 SHA1 6165b4a1f167b50dee0cf0526011fe4ab8123f8c SHA256 c62f692c42420666920a23cd489633e91789b379fed13561321b44d9ffa8c9e9
 EBUILD vtwm-5.4.6a.ebuild 1079 RMD160 944b872327906b2c4e3de437777c01df06be0746 SHA1 41846ddad1008fedf51ca5c8f807295cbac91e8a SHA256 11bc0ec45cc221df3a8d09371145ba076e393714b5696b282914dd45da6c54d7
-EBUILD vtwm-5.4.7.ebuild 1363 RMD160 769679801454cb069bf352a6b7ca79eadc940f8c SHA1 c0aae1040809e03b4f56e0d6c66de9194a4d5ae7 SHA256 6eafb224ca29d1e9a67d5e78207b47e3c326fcbcd745a6bec35f3a48f18638f0
-MISC ChangeLog 1427 RMD160 90ab9727a4af66efbe044952584276df045af36d SHA1 db47b15bec49e5315ad27fb9d4870eee26a7a925 SHA256 51f1c9a5a7ad3172bc71b954c09fa77fb59ab4df5d73ee072188971ff67f55e3
+EBUILD vtwm-5.4.7-r1.ebuild 1721 RMD160 6204496d74734884aac6997980641685a04b8db3 SHA1 17b37ee3c5e2aeccd43ada80f41dd53c7da2df8b SHA256 67f93ab057aaa449ba9b96368c180132731b46ac08cf8ef4b8a445d1010e9656
+MISC ChangeLog 1938 RMD160 7e731123f9e6a701e85232b691c82cd334bdbbcf SHA1 9f1292b52ad98dea8659268a199f468424de7994 SHA256 1404278ee378ba1aac0f8afe7bb08738860361e56803ca6c59efedbdbf7e3171
 MISC metadata.xml 637 RMD160 589ef618b4dfb25d100e73fb144f5336fb2299b4 SHA1 3ecd4c9e6fd2e1c65fc0ed797159287f73c0ab33 SHA256 b4a6f671ba6788b3222755013aab5f1930ec5fb8c124beff75d3f95f8c22b59a
diff --git a/x11-wm/vtwm/files/vtwm-5.4.7-NO_SOUND_SUPPORT.patch b/x11-wm/vtwm/files/vtwm-5.4.7-NO_SOUND_SUPPORT.patch
new file mode 100644
index 000000000000..2006d66519e2
--- /dev/null
+++ b/x11-wm/vtwm/files/vtwm-5.4.7-NO_SOUND_SUPPORT.patch
@@ -0,0 +1,35 @@
+* Remove all traces of sound support, even when Imakefile suggests uncommenting
+* a variable is enough - JeR
+
+--- a/gram.y	2005-05-17 03:19:48.000000000 +0200
++++ b/gram.y	2010-09-17 01:43:51.000000000 +0200
+@@ -339,8 +339,6 @@
+ 		  function
+ 		| ICONS 		{ list = &Scr->IconNames; }
+ 		  icon_list
+-		| SOUNDS
+-		  sound_list
+ 		| COLOR 		{ color = COLOR; }
+ 		  color_list
+                 | SAVECOLOR
+@@ -743,20 +741,6 @@
+ 					}
+ 		;
+ 
+-/* djhjr - 6/22/01 */
+-sound_list	: LB sound_entries RB
+-		;
+-
+-/* djhjr - 6/22/01 */
+-sound_entries	: /* Empty */
+-		| sound_entries sound_entry
+-		;
+-
+-/* djhjr - 8/16/01 */
+-sound_entry	: string string		{ if (Scr->FirstTime) SetSound($1, $2, -1); }
+-		| string string number	{ if (Scr->FirstTime) SetSound($1, $2, $3); }
+-		;
+-
+ /* djhjr - 4/26/99 */
+ applet_list	: LB applet_entries RB
+ 		;
diff --git a/x11-wm/vtwm/files/vtwm-5.4.7-do-not-rm.patch b/x11-wm/vtwm/files/vtwm-5.4.7-do-not-rm.patch
new file mode 100644
index 000000000000..170dd3dd9806
--- /dev/null
+++ b/x11-wm/vtwm/files/vtwm-5.4.7-do-not-rm.patch
@@ -0,0 +1,45 @@
+* Remove all pointless RM calls as this only results in rebuilding in
+* src_install(). -JeR
+
+
+--- a/Imakefile	2005-05-09 14:46:24.000000000 +0200
++++ b/Imakefile	2010-09-17 02:07:22.000000000 +0200
+@@ -128,10 +128,8 @@
+ depend:: lex.c gram.c deftwmrc.c lastmake.c vtwm.man
+ 
+ all::
+-	$(RM) deftwmrc.* lastmake.*
+ 
+ install::
+-	$(RM) deftwmrc.* lastmake.*
+ 	$(MAKE) install.man
+ 
+ clean::
+@@ -144,7 +142,6 @@
+ 	$(MV) y.tab.h gram.h
+ 
+ deftwmrc.c: system.vtwmrc
+-	$(RM) $@
+ 	echo '/* ' >>$@
+ 	echo ' * This file is generated automatically from the default' >>$@
+ 	echo ' * VTWM bindings file system.vtwmrc.'$(SYS_VTWMRC_LOOK)' by the VTWM Makefile.' >>$@
+@@ -155,7 +152,6 @@
+ 	echo '(char *)0 };' >>$@
+ 
+ lastmake.c:
+-	$(RM) $@
+ 	echo '/* ' >>$@
+ 	echo ' * This file is generated automatically by the VTWM Makefile.' >>$@
+ 	echo ' */' >>$@
+@@ -166,11 +162,9 @@
+ 	echo '    "" };' >>$@
+ 
+ system.vtwmrc:
+-	$(RM) $@
+ 	$(CP) $@.$(SYS_VTWMRC_LOOK) $@
+ 
+ vtwm.man:
+-	$(RM) $@
+ 	$(LN) doc/$@ $@
+ 
+ XCOMM Handy for developers to check the man page
diff --git a/x11-wm/vtwm/files/vtwm-5.4.7-dont-use-local-path.patch b/x11-wm/vtwm/files/vtwm-5.4.7-dont-use-local-path.patch
deleted file mode 100644
index 0e7d6542710e..000000000000
--- a/x11-wm/vtwm/files/vtwm-5.4.7-dont-use-local-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- vtwm-5.4.7.orig/Imakefile	2007-07-02 04:16:18.000000000 +0200
-+++ vtwm-5.4.7/Imakefile	2007-07-02 04:26:35.000000000 +0200
-@@ -28,8 +28,7 @@
- XCOMM To omit sound support, uncomment this
- XCOMM NO_SOUND_SUPPORT = -DNO_SOUND_SUPPORT
- XCOMM and comment these
--SOUNDLIB = -L/usr/local/lib -lrplay
--SOUNDINC = -I/usr/local/include
-+SOUNDLIB = -lrplay
- XCOMM (sound is supported only by way of the rplay library)
- 
- XCOMM To omit Internationalization support, uncomment this
diff --git a/x11-wm/vtwm/vtwm-5.4.7.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild
index 2318a0f3cb06..ce34ad02b77e 100644
--- a/x11-wm/vtwm/vtwm-5.4.7.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/vtwm/vtwm-5.4.7.ebuild,v 1.1 2007/07/02 10:54:16 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild,v 1.1 2010/09/17 00:27:45 jer Exp $
 
-inherit eutils
+EAPI="2"
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="one of many TWM descendants and implements a Virtual Desktop"
 HOMEPAGE="http://www.vtwm.org/"
@@ -20,24 +22,40 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	rplay? ( media-sound/rplay )"
 DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
 	x11-misc/imake
 	app-text/rman
 	x11-proto/xproto
 	x11-proto/xextproto"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-dont-use-local-path.patch"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-do-not-rm.patch
+	sed -i Imakefile \
+		-e 's:-L/usr/local/lib::g' \
+		-e 's:-I/usr/local/include::g' \
+		|| die "sed Imakefile"
 	if ! use rplay ; then
-		sed -e "s:^XCOMM\ \(.*NO_SOUND\):\1:" \
-			-e "s:^\(SOUNDLIB.*\):XCOMM\ \1:" -i Imakefile || die "sed failed"
+		sed -i Imakefile \
+			-e 's:^XCOMM\ \(.*NO_SOUND\):\1:' \
+			-e 's:^\(SOUNDLIB.*\):XCOMM\ \1:' \
+			-e 's:sound\..::g' \
+			|| die "sed Imakefile"
+		epatch "${FILESDIR}"/${P}-NO_SOUND_SUPPORT.patch
 	fi
 }
 
-src_compile() {
+src_configure() {
 	xmkmf || die "xmkmf failed"
-	emake -j1 || die "emake failed"
+	emake depend || die "emake depend"
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		CCOPTIONS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" \
+		|| die "emake failed"
 }
 
 src_install() {