2.5.7 stable

12 files changed, 21 insertions, 558 deletions

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index 49141f54eec5..253707a65313 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,19 @@
 # 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.34 2003/10/11 10:14:58 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.35 2003/10/13 17:17:05 taviso Exp $
+
+  13 Oct 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.4.16-r1.ebuild,
+  fvwm-2.4.16.ebuild, fvwm-2.4.17.ebuild, fvwm-2.4.8.ebuild,
+  fvwm-2.5.7-r2.ebuild, fvwm-2.5.7-r3.ebuild:
+  
+  marking 2.5.7-r3 stable, it is a release from the development branch, but has
+  proven stable in practice and has some important internationalisation 
+  features (among other things) missing from the stable branch.
+
+  2.4.17 is also stable, and will be maintained in portage for those who 
+  prefer it.
+
+  removing stale ebuilds.
 
 *fvwm-2.5.7-r3 (11 Oct 2003)
 
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index c77ea19b604e..69ebe6f78e32 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,15 +1,7 @@
-MD5 a1a06ddef006c9b8e5eb1091390833c7 fvwm-2.5.7-r2.ebuild 8724
-MD5 a524c723b6488b657f8cd3d624684308 fvwm-2.4.17.ebuild 3952
-MD5 d751280d0c04415e343dc8290536eb01 fvwm-2.4.16-r1.ebuild 4006
-MD5 5b6363450ad810f8ee1cdafb487a1189 fvwm-2.4.16.ebuild 1335
-MD5 5ef812484c4e2fe981129d25c1824d4b fvwm-2.5.7-r3.ebuild 8729
-MD5 466f872195ae37578a087a3f467123f6 ChangeLog 7013
+MD5 b893f78193652b275ce5d276ac38af29 fvwm-2.4.17.ebuild 3961
+MD5 8fa93269e89c39d61e797e46a91b2872 fvwm-2.5.7-r3.ebuild 8726
+MD5 75d63b7bc54425f0799d84bc24004127 ChangeLog 7528
 MD5 ff13b9d8138fc41b3c9ebfa8665cb6db metadata.xml 524
-MD5 ccd8378d86941cb17669e64ca88949c1 fvwm-2.4.8.ebuild 1146
-MD5 40725b9b9496d374f5f1a763618781ea files/digest-fvwm-2.4.16 65
 MD5 b2af3c1c8fe4f142e2b8debbb5c59a94 files/digest-fvwm-2.4.17 65
-MD5 40725b9b9496d374f5f1a763618781ea files/digest-fvwm-2.4.16-r1 65
 MD5 2bdb17132f9d7f352002a1fbace7fca1 files/acinclude.m4 61423
-MD5 88a5b60b496d1f4a8fe1b0c3710da7f9 files/digest-fvwm-2.4.8 134
-MD5 d4c4e9118234447416e8e9905cb06c3f files/digest-fvwm-2.5.7-r2 127
 MD5 c8242a4b3b74d0643d5040c1c06cf4b0 files/digest-fvwm-2.5.7-r3 127
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.4.16 b/x11-wm/fvwm/files/digest-fvwm-2.4.16
deleted file mode 100644
index 39c73fc10cd2..000000000000
--- a/x11-wm/fvwm/files/digest-fvwm-2.4.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f63ea14b61a1aeb670f8d9b8ff20a29f fvwm-2.4.16.tar.bz2 1375565
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.4.16-r1 b/x11-wm/fvwm/files/digest-fvwm-2.4.16-r1
deleted file mode 100644
index 39c73fc10cd2..000000000000
--- a/x11-wm/fvwm/files/digest-fvwm-2.4.16-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f63ea14b61a1aeb670f8d9b8ff20a29f fvwm-2.4.16.tar.bz2 1375565
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.4.8 b/x11-wm/fvwm/files/digest-fvwm-2.4.8
deleted file mode 100644
index a96ef4507450..000000000000
--- a/x11-wm/fvwm/files/digest-fvwm-2.4.8
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 68e7a6fd2d793a01ce3131ef5508b60d fvwm-2.4.8.tar.bz2 1328350
-MD5 ed9432c2c98b62166d84b5ea9666a12d fvwm-2.4.8-gentoo-diff.bz2 83491
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.7-r2 b/x11-wm/fvwm/files/digest-fvwm-2.5.7-r2
deleted file mode 100644
index 63983238cca2..000000000000
--- a/x11-wm/fvwm/files/digest-fvwm-2.5.7-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5dfcf70560779ed845261c5044652c81 fvwm-2.5.7.tar.bz2 1711869
-MD5 8849851c9231c65530c9ff32d56792ae FvwmTabs-2.0.tar.gz 12870
diff --git a/x11-wm/fvwm/fvwm-2.4.16-r1.ebuild b/x11-wm/fvwm/fvwm-2.4.16-r1.ebuild
deleted file mode 100644
index 9489ea50fb96..000000000000
--- a/x11-wm/fvwm/fvwm-2.4.16-r1.ebuild
+++ /dev/null
@@ -1,136 +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.16-r1.ebuild,v 1.3 2003/09/05 00:56:25 msterret Exp $
-
-inherit gnuconfig
-
-IUSE="readline ncurses gtk stroke gnome rplay xinerama cjk imlib"
-
-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="readline? ( >=sys-libs/readline-4.1
-				ncurses? ( >=sys-libs/ncurses-5.3-r1 )
-				!ncurses? ( >=sys-libs/libtermcap-compat-1.2.3 ) )
-		gtk? ( =x11-libs/gtk+-1.2*
-				imlib? ( >=media-libs/gdk-pixbuf-0.21.0
-						>=media-libs/imlib-1.9.14-r1 ) )
-		gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
-		rplay? ( >=media-sound/rplay-3.3.2 )
-		stroke? ( >=dev-libs/libstroke-0.4 )
-		>=dev-lang/perl-5.8.0
-		virtual/x11"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	use alpha && gnuconfig_update
-
-	# 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
-}
-
-src_compile() {
-	local myconf="--libexecdir=/usr/lib"
-
-	# use readline in FvwmConsole.
-	if ! use readline; then
-		myconf="${myconf} --without-readline-library"
-	else
-		myconf="${myconf} --with-readline-library"
-
-		# choose ncurses or termcap.
-		if use ncurses; then
-			myconf="${myconf} --without-termcap-library"
-		else
-			myconf="${myconf} --without-ncurses-library"
-		fi
-	fi
-
-	# fvwm configure doesnt provide a way to disable gtk support if the
-	# required libraries are found, this hides them from the script.
-	if ! use gtk; then
-		myconf="${myconf} --with-gtk-prefix=${T} --with-imlib-prefix=${T}"
-	else
-		if ! use imlib; then
-			myconf="${myconf} --with-imlib-prefix=${T}"
-		fi
-	fi
-
-	# link with the gnome libraries, for better integration with the gnome desktop.
-	if use gnome; then
-		myconf="${myconf} --with-gnome"
-	else
-		myconf="${myconf} --without-gnome"
-	fi
-
-	# rplay is a cool, but little used way of playing sounds over a network
-	# Fvwm support is pretty good.
-	if ! use rplay; then
-		myconf="${myconf} --without-rplay-library"
-	fi
-
-	# xinerama support for those who have multi-headed machines.
-	if use xinerama; then
-		myconf="${myconf} --enable-xinerama"
-	else
-		myconf="${myconf} --disable-xinerama"
-	fi
-
-	# multibyte character support, chinese/japanese/korean/etc.
-	if use cjk; then
-		myconf="${myconf} --enable-multibyte"
-	else
-		myconf="${myconf} --disable-multibyte"
-	fi
-
-	# support for mouse gestures using libstroke (very very cool)
-	if ! use stroke; then
-		myconf="${myconf} --without-stroke-library"
-	fi
-
-	# must specify PKG_CONFIG or Xft detection bombs.
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	echo "#!/bin/bash" > fvwm2
-	echo "exec /usr/bin/fvwm2" >> fvwm2
-
-	exeinto /etc/X11/Sessions
-	doexe fvwm2
-
-	dodoc AUTHORS ChangeLog COPYING README NEWS docs/ANNOUNCE docs/BUGS \
-	docs/DEVELOPERS docs/FAQ docs/error_codes docs/color_combos docs/TODO \
-	docs/fvwm.lsm
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "The following features that you did not request are now"
-	ewarn "controlled via USE flags:"
-	use readline	|| ewarn "	Readline support in FvwmConsole [readline]"
-	use ncurses		|| ewarn "	Ncurses support in FvwmConsole [ncurses]"
-	use stroke		|| ewarn "	Mouse Gestures [stroke]"
-	use xinerama	|| ewarn "	Xinerama Support [xinerama]"
-	use cjk			|| ewarn "	Multibyte Character Support [cjk]"
-	use rplay		|| ewarn "	RPlay Support in FvwmEvent [rplay]"
-	use gtk			|| ewarn "	FvwmGTK (gtk+ support) [gtk]"
-	use imlib		|| ewarn "	FvwmGTK (GDK image support) [imlib]"
-	ewarn
-	ewarn "If you require any of the features listed above, you should remerge"
-	ewarn "FVWM with the appropriate USE flags. Use this command to see the flags"
-	ewarn "available:"
-	ewarn "	$ emerge -pv fvwm"
-	ewarn
-}
diff --git a/x11-wm/fvwm/fvwm-2.4.16.ebuild b/x11-wm/fvwm/fvwm-2.4.16.ebuild
deleted file mode 100644
index 8c6c738aca80..000000000000
--- a/x11-wm/fvwm/fvwm-2.4.16.ebuild
+++ /dev/null
@@ -1,62 +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.16.ebuild,v 1.4 2003/09/05 00:56:25 msterret 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" \
-
-	# CFLAGS containing comma will break this.
-	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
-
-}
-
diff --git a/x11-wm/fvwm/fvwm-2.4.17.ebuild b/x11-wm/fvwm/fvwm-2.4.17.ebuild
index 108d3e38d429..864261ce8c7b 100644
--- a/x11-wm/fvwm/fvwm-2.4.17.ebuild
+++ b/x11-wm/fvwm/fvwm-2.4.17.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.17.ebuild,v 1.1 2003/10/11 10:14:58 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.4.17.ebuild,v 1.2 2003/10/13 17:17:05 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 ~alpha"
+KEYWORDS="x86 alpha ~ppc sparc"
 LICENSE="GPL-2 FVWM"
 
 RDEPEND="readline? ( >=sys-libs/readline-4.1
diff --git a/x11-wm/fvwm/fvwm-2.4.8.ebuild b/x11-wm/fvwm/fvwm-2.4.8.ebuild
deleted file mode 100644
index 5afa27cbf781..000000000000
--- a/x11-wm/fvwm/fvwm-2.4.8.ebuild
+++ /dev/null
@@ -1,54 +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.8.ebuild,v 1.6 2003/02/13 17:49:03 vapier Exp $
-
-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
-	mirror://gentoo/${P}-gentoo-diff.bz2"
-HOMEPAGE="http://www.fvwm.org/"
-
-SLOT="0"
-KEYWORDS="x86 sparc "
-LICENSE="GPL-2 FVWM"
-
-RDEPEND=">=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}
-	patch -p0 < ${P}-gentoo-diff || die
-}
-
-src_compile() {
-	local myconf
-
-	use gnome \
-		&& myconf="--with-gnome" \
-		|| myconf="--without-gnome" \
-
-	automake
-
-	econf \
-		--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
-}
diff --git a/x11-wm/fvwm/fvwm-2.5.7-r2.ebuild b/x11-wm/fvwm/fvwm-2.5.7-r2.ebuild
deleted file mode 100644
index cad8675e2b03..000000000000
--- a/x11-wm/fvwm/fvwm-2.5.7-r2.ebuild
+++ /dev/null
@@ -1,284 +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.5.7-r2.ebuild,v 1.16 2003/10/07 12:02:19 taviso Exp $
-
-inherit gnuconfig
-
-IUSE="readline truetype ncurses gtk stroke gnome rplay xinerama cjk perl nls png bidi imlib tcltk debug gtk2"
-
-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
-		perl? ( mirror://gentoo/FvwmTabs-2.0.tar.gz )"
-HOMEPAGE="http://www.fvwm.org/"
-
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha"
-LICENSE="GPL-2 FVWM"
-
-RDEPEND="readline? ( >=sys-libs/readline-4.1
-				ncurses? ( >=sys-libs/ncurses-5.3-r1 )
-				!ncurses? ( >=sys-libs/libtermcap-compat-1.2.3 ) )
-		gtk? ( =x11-libs/gtk+-1.2*
-				imlib? ( >=media-libs/gdk-pixbuf-0.21.0
-						>=media-libs/imlib-1.9.14-r1 ) )
-		gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
-		rplay? ( >=media-sound/rplay-3.3.2 )
-		bidi? ( >=dev-libs/fribidi-0.10.4 )
-		png? ( >=media-libs/libpng-1.0.12-r2 )
-		stroke? ( >=dev-libs/libstroke-0.4 )
-		perl? ( tcltk? ( >=dev-lang/tk-8.3.4
-						>=dev-perl/perl-tk-800.024-r2
-						>=dev-perl/X11-Protocol-0.51 ) )
-		truetype? ( virtual/xft
-					>=media-libs/fontconfig-2.1-r1
-					>=dev-libs/expat-1.95.6-r1 )
-		!noxpm? ( >=media-libs/netpbm-9.12-r4 )
-		>=dev-lang/perl-5.6.1-r10
-		>=sys-libs/zlib-1.1.4-r1
-		virtual/x11"
-# XXX:	gtk2 perl bindings require dev-perl/gtk2-perl, worth a dependency?
-# XXX:	gtk perl bindings require dev-perl/gtk-perl, worth a dependency?
-# XXX:	netpbm is used by FvwmScript-ScreenDump...im assuming anyone with 
-# 	`use noxpm` will not want them.
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	sys-devel/automake
-	sys-devel/autoconf
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-
-	use alpha && gnuconfig_update
-
-	# CFLAGS containing comma (eg -mfpmath=sse,387) will break this, so change it for !
-	sed -i 's#\x27s,xCFLAGSx,$(CFLAGS),\x27#\x27s!xCFLAGSx!$(CFLAGS)!\x27#' ${S}/utils/Makefile.am
-
-	# Xft detection is totally b0rked if using pkg-config, this update from cvs.
-	cp ${FILESDIR}/acinclude.m4 ${S}/acinclude.m4
-}
-
-src_compile() {
-	local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm"
-
-	# ImagePath should include /usr/share/icons/fvwm (x11-themes/fvwm_icons)
-	#
-	# Another iconset for fvwm, wm-icons, includes configurations and user
-	# configuration utilities to make them easy to use with fvwm, no need
-	# to put them in the default ImagePath.
-
-	# use readline in FvwmConsole.
-	if ! use readline; then
-		myconf="${myconf} --without-readline-library"
-	else
-		myconf="${myconf} --with-readline-library"
-
-		# choose ncurses or termcap.
-		if use ncurses; then
-			myconf="${myconf} --without-termcap-library"
-		else
-			myconf="${myconf} --without-ncurses-library"
-		fi
-	fi
-
-	# fvwm configure doesnt provide a way to disable gtk support if the
-	# required libraries are found, this hides them from the script.
-	# Print a message indicating the errors are normal.
-	if ! use gtk; then
-		einfo "ATTN: You can safely ignore any gtk related configure errors."
-		einfo "ATTN: You can safely ignore any imlib related configure errors."
-		myconf="${myconf} --with-gtk-prefix=${T} --with-imlib-prefix=${T}"
-	else
-		if ! use imlib; then
-			einfo "ATTN: You can safely ignore any imlib related configure errors."
-			myconf="${myconf} --with-imlib-prefix=${T}"
-		fi
-	fi
-
-	# link with the gnome libraries, for better integration with the gnome desktop.
-	if use gnome; then
-		myconf="${myconf} --with-gnome"
-	else
-		myconf="${myconf} --without-gnome"
-	fi
-
-	# rplay is a cool, but little used way of playing sounds over a network
-	# Fvwm support is pretty good.
-	if ! use rplay; then
-		myconf="${myconf} --without-rplay-library"
-	fi
-
-	# Install perl bindings for FvwmPerl.
-	if use perl; then
-		myconf="${myconf} --enable-perllib"
-	else
-		myconf="${myconf} --disable-perllib"
-	fi
-
-	# xinerama support for those who have multi-headed machines.
-	if use xinerama; then
-		myconf="${myconf} --enable-xinerama"
-	else
-		myconf="${myconf} --disable-xinerama"
-	fi
-
-	# multibyte character support, chinese/japanese/korean/etc.
-	if use cjk; then
-		myconf="${myconf} --enable-multibyte"
-	else
-		myconf="${myconf} --disable-multibyte"
-	fi
-
-	# bidirectional writing support, eg hebrew
-	if use bidi; then
-		myconf="${myconf} --enable-bidi"
-	else
-		myconf="${myconf} --disable-bidi"
-	fi
-
-	# png image support (very nice in fvwm)
-	if ! use png; then
-		myconf="${myconf} --without-png-library"
-	fi
-
-	# native language support
-	if use nls; then
-		myconf="${myconf} --enable-nls"
-	else
-		myconf="${myconf} --disable-nls"
-	fi
-
-	# support for mouse gestures using libstroke (very very cool)
-	if ! use stroke; then
-		myconf="${myconf} --without-stroke-library"
-	fi
-
-	# more verbosity for module developers/hackers/etc.
-	if use debug; then
-		myconf="${myconf} --enable-debug-msgs --enable-command-log"
-	fi
-
-	# Xft Anti Aliased text support (yummy eye candy)
-	if use truetype; then
-		myconf="${myconf} --enable-xft"
-	else
-		myconf="${myconf} --disable-xft"
-	fi
-
-	# disable xsm protocol (session management) support?
-	# `nosm` instead of `sm` as some people dont check USE flags
-	if use nosm; then
-		myconf="${myconf} --disable-sm"
-	else
-		myconf="${myconf} --enable-sm"
-	fi
-
-	# disable xpm support? (maybe you only use png in your themes, or just solid colour?)
-	# `noxpm` instead of `xpm`, as most people will want this.
-	if use noxpm; then
-		myconf="${myconf} --without-xpm-library"
-	fi
-
-	# Xft detection is broken in this release, the fix is in cvs
-	# which ive installed here, rerun automake to sort the problem.
-	# This is only nescessary if `truetype` is required.
-	if use truetype; then
-		einfo "Fixing Xft detection, please wait..."
-		(	ebegin "	Running aclocal"
-			aclocal; eend $?
-			ebegin "	Running autoheader"
-			autoheader; eend $?
-			ebegin "	Running automake"
-			automake --add-missing; eend $?
-			ebegin "	Running autoreconf"
-			autoreconf; eend $?	) 2>/dev/null
-		einfo "Fixed."
-	fi
-
-	# must specify PKG_CONFIG or Xft detection bombs.
-	econf ${myconf} PKG_CONFIG=/usr/bin/pkg-config || die
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	if use perl; then
-
-		local toolkits="gtk2 gtk tcltk"
-
-		if use tcltk; then
-			# Install the very cool FvwmTabs module
-			# http://users.tpg.com.au/users/scottie7/FvwmTabs
-			einfo "Installing FvwmTabs module..."
-
-			exeinto /usr/lib/fvwm/${PV}/
-			doexe ${WORKDIR}/FvwmTabs
-			dodoc ${WORKDIR}/fvwmtabrc ${WORKDIR}/README.fvwmtabs
-		else
-			# Remove the Tk bindings (requires perl-tk)
-			rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm
-			toolkits=${toolkits/tcltk/}
-		fi
-		if ! use gtk; then
-			# Remove gtk bindings (requires gtk-perl/gtk2-perl)
-			rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm \
-				${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm
-			toolkits=${toolkits/gtk2/}
-			toolkits=${toolkits/gtk/}
-		else
-			if ! use gtk2; then
-				# Just remove the gtk2 bindings (requires gtk2-perl)
-				rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm
-				toolkits=${toolkits/gtk2/}
-			fi
-		fi
-		toolkits=${toolkits// /}
-		if ! test "${toolkits}"; then
-			# No perl toolkit bindings wanted, remove the unneeded files
-			# and empty directories.
-			rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm
-			find ${D}/usr/share/fvwm/perllib -depth -type d -exec rmdir {} \; 2>/dev/null
-		fi
-	else
-		# Remove useless script if perllib isnt required.
-		rm -rf ${D}/usr/bin/fvwm-perllib ${D}/usr/share/man/man1/fvwm-perllib.1
-	fi
-
-	# fvwm-convert-2.6 is just a stub, contains no code - remove it for now.
-	# fvwm-convert-2.2 has a man page, but the script is no longer distributed.
-	rm -f ${D}/usr/bin/fvwm-convert-2.6 ${D}/usr/share/man/man1/fvwm-convert-2.6.1
-	rm -f ${D}/usr/share/man/man1/fvwm-convert-2.2.1
-
-	# ive included `exec` to save a few bytes of memory.
-	echo "#!/bin/bash" > fvwm2
-	echo "exec /usr/bin/fvwm2" >> fvwm2
-
-	exeinto /etc/X11/Sessions
-	doexe fvwm2
-
-	dodoc AUTHORS ChangeLog COPYING README NEWS docs/ANNOUNCE docs/BUGS \
-	docs/COMMANDS docs/DEVELOPERS docs/FAQ docs/error_codes docs/TODO \
-	docs/fvwm.lsm
-
-	dodoc utils/fvwm_make_directory_menu.sh  utils/fvwm_make_browse_menu.sh \
-	utils/quantize_pixmaps utils/xselection.c
-
-	# fix a couple of symlinks.
-	prepallman
-}
-
-pkg_postinst() {
-	if use perl; then
-		if use tcltk; then
-			einfo "By setting the perl and tcltk USE flags, you have elected to"
-			einfo "install the FvwmTabs module, a configurable tabbing system"
-			einfo "for FVWM. You can read more about FvwmTabs here:"
-			einfo
-			einfo "	http://users.tpg.com.au/users/scottie7/fvwmtabs.html"
-			einfo
-		fi
-	fi
-}
diff --git a/x11-wm/fvwm/fvwm-2.5.7-r3.ebuild b/x11-wm/fvwm/fvwm-2.5.7-r3.ebuild
index ba7bb2e83508..522a7bdb42f9 100644
--- a/x11-wm/fvwm/fvwm-2.5.7-r3.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.7-r3.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.5.7-r3.ebuild,v 1.1 2003/10/11 10:14:58 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.7-r3.ebuild,v 1.2 2003/10/13 17:17:05 taviso Exp $
 
 inherit gnuconfig
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2
 HOMEPAGE="http://www.fvwm.org/"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha"
+KEYWORDS="x86 sparc alpha"
 LICENSE="GPL-2 FVWM"
 
 RDEPEND="readline? ( >=sys-libs/readline-4.1