The Last Version Bump. Thanks to Alexander Skwar. bug #155084

(Portage version: 2.1.2.7)

6 files changed, 104 insertions, 27 deletions

diff --git a/x11-wm/vtwm/ChangeLog b/x11-wm/vtwm/ChangeLog
index bd6461d74609..36c55b2a091a 100644
--- a/x11-wm/vtwm/ChangeLog
+++ b/x11-wm/vtwm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/vtwm
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/vtwm/ChangeLog,v 1.9 2006/08/13 20:10:58 pvdabeel Exp $
+# 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 $
+
+*vtwm-5.4.7 (02 Jul 2007)
+
+  02 Jul 2007; Santiago M. Mola <coldwind@gentoo.org>
+  +files/vtwm-5.4.7-dont-use-local-path.patch, metadata.xml,
+  vtwm-5.4.6a.ebuild, +vtwm-5.4.7.ebuild:
+  The Last Version Bump. Thanks to Alexander Skwar. bug #155084
 
   13 Aug 2006; Pieter Van den Abeele <pvdabeel@gentoo.org> vtwm-5.4.6a.ebuild:
   Force Makeopts -j1
diff --git a/x11-wm/vtwm/files/digest-vtwm-5.4.7 b/x11-wm/vtwm/files/digest-vtwm-5.4.7
new file mode 100644
index 000000000000..0c4acf7c0816
--- /dev/null
+++ b/x11-wm/vtwm/files/digest-vtwm-5.4.7
@@ -0,0 +1,3 @@
+MD5 707f8d93b19b46fb3d036053be66288b vtwm-5.4.7.tar.gz 1021160
+RMD160 9ab71147abdbaea9f95a2528595b79a3faf49834 vtwm-5.4.7.tar.gz 1021160
+SHA256 c62f692c42420666920a23cd489633e91789b379fed13561321b44d9ffa8c9e9 vtwm-5.4.7.tar.gz 1021160
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
new file mode 100644
index 000000000000..0e7d6542710e
--- /dev/null
+++ b/x11-wm/vtwm/files/vtwm-5.4.7-dont-use-local-path.patch
@@ -0,0 +1,12 @@
+--- 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/metadata.xml b/x11-wm/vtwm/metadata.xml
index 3f6c9f82a007..73b1ce869dc9 100644
--- a/x11-wm/vtwm/metadata.xml
+++ b/x11-wm/vtwm/metadata.xml
@@ -2,4 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>desktop-wm</herd>
+<longdescription>VTWM, one of many TWM descendants, implements a Virtual
+  Desktop, meaning that what is currently on screen is just a portion of a
+  larger workspace. What portion of the virtual desktop that is displayed,
+  and whatever windows might be visible within it, are simple
+  point-and-click operations within a scaled representation of the
+  workspace.</longdescription>
 </pkgmetadata>
diff --git a/x11-wm/vtwm/vtwm-5.4.6a.ebuild b/x11-wm/vtwm/vtwm-5.4.6a.ebuild
index 17676bd9202a..1018d2faf484 100644
--- a/x11-wm/vtwm/vtwm-5.4.6a.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.6a.ebuild
@@ -1,30 +1,26 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/vtwm/vtwm-5.4.6a.ebuild,v 1.11 2006/08/13 20:10:58 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/vtwm/vtwm-5.4.6a.ebuild,v 1.12 2007/07/02 10:54:16 coldwind Exp $
 
-IUSE=""
-
-DESCRIPTION="VTWM, one of many TWM descendants and implements a Virtual Desktop"
-HOMEPAGE="http://www.visi.com/~hawkeyd/vtwm.html"
+DESCRIPTION="one of many TWM descendants and implements a Virtual Desktop"
+HOMEPAGE="http://www.vtwm.org/"
 SRC_URI="ftp://ftp.visi.com/users/hawkeyd/X/${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="x86 alpha ppc sparc"
+KEYWORDS="alpha ppc sparc x86"
+IUSE=""
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-misc/imake
-		app-text/rman
-		x11-proto/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-misc/imake
+	app-text/rman
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_compile() {
 	xmkmf || die "xmkmf failed"
@@ -32,17 +28,15 @@ src_compile() {
 }
 
 src_install() {
-	cp ${FILESDIR}/vtwmrc system.vtwmrc
 	make BINDIR=/usr/bin \
 		LIBDIR=/etc/X11 \
 		MANPATH=/usr/share/man \
-		DESTDIR=${D} install || die "make install failed"
+		DESTDIR="${D}" install || die "make install failed"
 
 	echo "#!/bin/sh" > vtwm
 	echo "xsetroot -cursor_name left_ptr &" >> vtwm
 	echo "/usr/bin/vtwm" >> vtwm
 	exeinto /etc/X11/Sessions
-	doexe vtwm
-	cd doc
-	dodoc 4.6.* CHANGELOG BUGS DEVELOPERS HISTORY SOUND WISHLIST
+	doexe vtwm || die
+	dodoc doc/{4.6.*,CHANGELOG,BUGS,DEVELOPERS,HISTORY,SOUND,WISHLIST} || die
 }
diff --git a/x11-wm/vtwm/vtwm-5.4.7.ebuild b/x11-wm/vtwm/vtwm-5.4.7.ebuild
new file mode 100644
index 000000000000..2318a0f3cb06
--- /dev/null
+++ b/x11-wm/vtwm/vtwm-5.4.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 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 $
+
+inherit eutils
+
+DESCRIPTION="one of many TWM descendants and implements a Virtual Desktop"
+HOMEPAGE="http://www.vtwm.org/"
+SRC_URI="http://www.vtwm.org/downloads/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~ppc ~sparc ~x86"
+IUSE="rplay"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm
+	rplay? ( media-sound/rplay )"
+DEPEND="${RDEPEND}
+	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"
+	if ! use rplay ; then
+		sed -e "s:^XCOMM\ \(.*NO_SOUND\):\1:" \
+			-e "s:^\(SOUNDLIB.*\):XCOMM\ \1:" -i Imakefile || die "sed failed"
+	fi
+}
+
+src_compile() {
+	xmkmf || die "xmkmf failed"
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	emake BINDIR=/usr/bin \
+		LIBDIR=/etc/X11 \
+		MANPATH=/usr/share/man \
+		DESTDIR="${D}" install || die "emake install failed"
+
+	echo "#!/bin/sh" > vtwm
+	echo "xsetroot -cursor_name left_ptr &" >> vtwm
+	echo "/usr/bin/vtwm" >> vtwm
+	exeinto /etc/X11/Sessions
+	doexe vtwm || die
+	dodoc doc/{4.7.*,CHANGELOG,BUGS,DEVELOPERS,HISTORY,SOUND,WISHLIST} || die
+}