devel version

4 files changed, 70 insertions, 4 deletions

diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 5faaf008e6d7..3e95454c0f3d 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,6 +1,6 @@
-MD5 03af3efe2e95321980edeefa2c28ae18 fvwm-2.4.15.ebuild 1167
+MD5 616d23339ff772ad286c142eee37efc8 fvwm-2.4.15.ebuild 1167
 MD5 640cc8cf1c7b29a974fed717d4460794 fvwm-2.4.14.ebuild 1102
-MD5 13a5c5581c70daff9c8835973185b2cf fvwm-2.5.7.ebuild 1349
+MD5 e6ef8eae15ebbfd5864e7c42e1221241 fvwm-2.5.7.ebuild 1426
 MD5 3a9940048e42d2b4075c5b4625433727 fvwm-2.4.16.ebuild 1336
 MD5 5ec980bd370c0f186da26c7f804ad42a ChangeLog 2664
 MD5 beaa1ad08ff661a32c25d1a51c879a8d metadata.xml 450
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.7 b/x11-wm/fvwm/files/digest-fvwm-2.5.7
new file mode 100644
index 000000000000..9d162eb4a040
--- /dev/null
+++ b/x11-wm/fvwm/files/digest-fvwm-2.5.7
@@ -0,0 +1 @@
+MD5 5dfcf70560779ed845261c5044652c81 fvwm-2.5.7.tar.bz2 1711869
diff --git a/x11-wm/fvwm/fvwm-2.4.15.ebuild b/x11-wm/fvwm/fvwm-2.4.15.ebuild
index e1ddaafd1a9d..f7066767ae19 100644
--- a/x11-wm/fvwm/fvwm-2.4.15.ebuild
+++ b/x11-wm/fvwm/fvwm-2.4.15.ebuild
@@ -1,6 +1,6 @@
 # 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.15.ebuild,v 1.2 2003/02/13 20:19:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.4.15.ebuild,v 1.3 2003/07/30 14:18:13 taviso Exp $
 
 inherit gnuconfig
 
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="x86 ~sparc ~ppc alpha"
 LICENSE="GPL-2 FVWM"
 
 RDEPEND=">=dev-libs/libstroke-0.4
diff --git a/x11-wm/fvwm/fvwm-2.5.7.ebuild b/x11-wm/fvwm/fvwm-2.5.7.ebuild
new file mode 100644
index 000000000000..141c82e6f72b
--- /dev/null
+++ b/x11-wm/fvwm/fvwm-2.5.7.ebuild
@@ -0,0 +1,65 @@
+# 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.5.7.ebuild,v 1.1 2003/07/30 14:18:13 taviso Exp $
+
+inherit gnuconfig
+
+IUSE="ncurses gtk gnome oss"
+
+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 -alpha"
+LICENSE="GPL-2 FVWM"
+
+RDEPEND="oss? ( 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" \
+	
+	use oss \
+		&& myconf="--with-rplay" \
+		|| myconf="--without-rplay"
+
+	# CFLAGS containing comma will break this, so change it for !
+	sed -i 's#\x27s,xCFLAGSx,$(CFLAGS),\x27#\x27s!xCFLAGSx!$(CFLAGS)!\x27#' \
+		${S}/utils/Makefile.am
+
+	automake
+
+	econf \
+		--enable-multibyte \
+		--libexecdir=/usr/lib \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	
+	echo "#!/bin/bash" > fvwm2
+	echo "/usr/bin/fvwm2" >> fvwm2
+
+	exeinto /etc/X11/Sessions
+	doexe fvwm2
+}
+