new release

7 files changed, 77 insertions, 48 deletions

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index 75270698c1c2..8c90266b19a0 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/fvwm
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.12 2003/02/13 17:31:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.13 2003/07/03 18:38:54 taviso Exp $
+
+  03 Jul 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.4.7-r1.ebuild:
+  new release, now includes rplay support.
 
 *fvwm-2.4.15 (13 Feb 2003)
 
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 21ebb80a3fb1..845e888a7f65 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,8 +1,7 @@
 MD5 ed461756b79f840ed23c7146d1d44108 fvwm-2.4.15.ebuild 1169
-MD5 5875c78cd42cfbb73c0818f6427aa037 fvwm-2.4.7-r1.ebuild 965
 MD5 640cc8cf1c7b29a974fed717d4460794 fvwm-2.4.14.ebuild 1102
-MD5 ed461756b79f840ed23c7146d1d44108 fvwm-2.4.16.ebuild 1169
-MD5 da524108491a47fb0fc5458685ea0eaf ChangeLog 2391
+MD5 cf7f8f14ad7ba52dac79090d0ea5b4e6 fvwm-2.4.16.ebuild 1174
+MD5 38a43dd33ebe0a656861d765bb27510b ChangeLog 2504
 MD5 beaa1ad08ff661a32c25d1a51c879a8d metadata.xml 450
 MD5 ccd8378d86941cb17669e64ca88949c1 fvwm-2.4.8.ebuild 1146
 MD5 282c809ddaa59071830b6c8dd9b0a3a1 files/fvwm2 25
@@ -10,4 +9,3 @@ MD5 e2d56ea8f3ef5adb43df89bc81a22f76 files/digest-fvwm-2.4.14 65
 MD5 ac6ac4f5a5680845a1fd79e5ac48f019 files/digest-fvwm-2.4.15 64
 MD5 40725b9b9496d374f5f1a763618781ea files/digest-fvwm-2.4.16 65
 MD5 88a5b60b496d1f4a8fe1b0c3710da7f9 files/digest-fvwm-2.4.8 134
-MD5 2e12a9b042caf101731a06ee97c2f0bf files/digest-fvwm-2.4.7-r1 118
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.4.16 b/x11-wm/fvwm/files/digest-fvwm-2.4.16
new file mode 100644
index 000000000000..39c73fc10cd2
--- /dev/null
+++ b/x11-wm/fvwm/files/digest-fvwm-2.4.16
@@ -0,0 +1 @@
+MD5 f63ea14b61a1aeb670f8d9b8ff20a29f fvwm-2.4.16.tar.bz2 1375565
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.4.7-r1 b/x11-wm/fvwm/files/digest-fvwm-2.4.7-r1
deleted file mode 100644
index 5f7f95223758..000000000000
--- a/x11-wm/fvwm/files/digest-fvwm-2.4.7-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 57a5b11d57d551aef2c5ae385eb31050 fvwm-2.4.7.tar.bz2 1322700
-MD5 6eb8083a4f5468bf5685002266c1efc0 fvwm-patch 17761
diff --git a/x11-wm/fvwm/fvwm-2.4.16.ebuild b/x11-wm/fvwm/fvwm-2.4.16.ebuild
new file mode 100644
index 000000000000..691f90c7632c
--- /dev/null
+++ b/x11-wm/fvwm/fvwm-2.4.16.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.4.16.ebuild,v 1.1 2003/07/03 18:38:55 taviso Exp $
+
+inherit gnuconfig
+
+IUSE="ncurses gtk gnome"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="an extremely powerful ICCCM-compliant multiple virtual desktop window manager"
+SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2"
+HOMEPAGE="http://www.fvwm.org/"
+
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha"
+LICENSE="GPL-2 FVWM"
+
+RDEPEND="media-sound/rplay
+		>=dev-libs/libstroke-0.4
+		gtk? ( =x11-libs/gtk+-1.2* )
+		gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
+		ncurses? ( >=sys-libs/readline-4.1 )"
+DEPEND="${RDEPEND} sys-devel/automake"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	use alpha && gnuconfig_update
+}
+
+src_compile() {
+	local myconf
+
+	use gnome \
+		&& myconf="--with-gnome" \
+		|| myconf="--without-gnome" \
+
+	automake
+
+	econf \
+		--enable-multibyte \
+		--libexecdir=/usr/lib \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install () {
+	einstall || die
+	
+	echo "#!/bin/bash" > fvwm2
+	echo "/usr/bin/fvwm2" >> fvwm2
+
+	exeinto /etc/X11/Sessions
+	doexe fvwm2
+
+}
+
diff --git a/x11-wm/fvwm/fvwm-2.4.7-r1.ebuild b/x11-wm/fvwm/fvwm-2.4.7-r1.ebuild
deleted file mode 100644
index 36718439d888..000000000000
--- a/x11-wm/fvwm/fvwm-2.4.7-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.4.7-r1.ebuild,v 1.10 2003/03/27 11:45:24 seemant Exp $
-
-IUSE="ncurses gtk gnome"
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="an extremely powerful ICCCM-compliant multiple virtual desktop window manager"
-HOMEPAGE="http://www.fvwm.org/"
-SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2
-	http://www.igs.net/~tril/fvwm/configs/fvwm-patch"
-
-SLOT="0"
-LICENSE="GPL-2 FVWM"
-KEYWORDS="x86 sparc"
-
-DEPEND=">=dev-libs/libstroke-0.4
-	gtk? ( =x11-libs/gtk+-1.2* )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
-	ncurses? ( >=sys-libs/readline-4.1 )"
-
-src_unpack() {
-	
-	unpack ${P}.tar.bz2
-	cd ${S}
-	patch -p0 < ${DISTDIR}/${PN}-patch
-}
-
-src_compile() {
-
-	econf `use_with gnome` || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	
-	exeinto /etc/X11/Sessions
-	doexe $FILESDIR/fvwm2
-}
diff --git a/x11-wm/fvwm/metadata.xml b/x11-wm/fvwm/metadata.xml
new file mode 100644
index 000000000000..44daac2bbd50
--- /dev/null
+++ b/x11-wm/fvwm/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>taviso@gentoo.org</email>
+  <name>Tavis Ormandy</name>
+</maintainer>
+<longdescription>
+FVWM 2 is an extremely powerful, fully ICCCM-1.1 compliant window manager requiring relatively little memory and providing an awesomely configurable environment.
+</longdescription>
+</pkgmetadata>