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().

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

5 files changed, 122 insertions, 25 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/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() {