clean up some old ebuilds, make sure FvwmGtk gets a man page. #

7 files changed, 11 insertions, 628 deletions

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index 07e60f7933ec..8652fffa3cc1 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/fvwm
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.61 2004/03/02 14:50:52 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.62 2004/03/16 20:20:36 taviso Exp $
+
+  16 Mar 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.9.ebuild:
+  ensure FvwmGtk gets a man page.
+  clean up some old ebuilds.
 
 *fvwm-2.5.9 (02 Mar 2004)
 
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 0274e0e9e279..164eed49d27a 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,12 +1,10 @@
 MD5 b83bf23f1c96084b79765739613430ac fvwm-2.5.7-r5.ebuild 8757
 MD5 76fde55c6ffece27a13fd976d5fb51b6 fvwm-2.5.8-r4.ebuild 10169
 MD5 babbec50812f1dd2af1b76b9afa837af fvwm-2.4.17.ebuild 3961
-MD5 a52e679cbc4958400b382099353e03f7 fvwm-2.5.8-r3.ebuild 10167
 MD5 175ef9160684ed93b20ffcfc478b058b fvwm-2.5.8-r5.ebuild 10414
-MD5 87c65ee57a0be0601ebc7391f66e59fa fvwm-2.5.9.ebuild 9316
-MD5 71d93c796e6a57d28f2b0ddab2e71a84 ChangeLog 11482
+MD5 60dad7fdef9011540156e68d2ed1f8c4 fvwm-2.5.9.ebuild 9409
+MD5 f91c96915ce3f1d9b19100e24a93fcf6 ChangeLog 11614
 MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527
-MD5 6a0ba650b7f07dc1e6e94ea256a8ec94 fvwm-2.5.8-r2.ebuild 9684
 MD5 e2ceb5d855c5406a09d82442196efad8 files/README.transluceny.gz 5788
 MD5 7e00938e8f20ffaa22e1c5672666c027 files/fvwm-2.5.8-iconfile.diff 791
 MD5 e5701841190ad529d5577c8da69d5006 files/fvwmtabs-insecure-tmp-handling.diff 2350
@@ -24,8 +22,6 @@ MD5 2bdb17132f9d7f352002a1fbace7fca1 files/acinclude.m4 61423
 MD5 df03a10a40a620ce8f1fab75f9758884 files/disable-debug-statements.diff 419
 MD5 386c07fa21d42bd8cbe743e3632de418 files/digest-fvwm-2.5.9 127
 MD5 e52e1c9212c856d5de29c603678dc52e files/digest-fvwm-2.5.7-r5 127
-MD5 ebe3c015c02ef069b110e30f3e84cf49 files/digest-fvwm-2.5.8-r2 127
-MD5 ebe3c015c02ef069b110e30f3e84cf49 files/digest-fvwm-2.5.8-r3 127
 MD5 c3ea3b9a8c5d7700913a795096e0b51a files/digest-fvwm-2.5.8-r4 127
 MD5 c3ea3b9a8c5d7700913a795096e0b51a files/digest-fvwm-2.5.8-r5 127
 MD5 97373a30210df0b93c59e2aac76d17e0 files/fvwm-2.5.8-undermouse.diff 2534
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.8-r2 b/x11-wm/fvwm/files/digest-fvwm-2.5.8-r2
deleted file mode 100644
index 3ad7e1a9fea0..000000000000
--- a/x11-wm/fvwm/files/digest-fvwm-2.5.8-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c702d873d124a475f95c45432b8bd7d7 fvwm-2.5.8.tar.bz2 1778920
-MD5 a714fc47fe53c079905aee4037653579 FvwmTabs-2.6.tar.gz 24345
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.8-r3 b/x11-wm/fvwm/files/digest-fvwm-2.5.8-r3
deleted file mode 100644
index 3ad7e1a9fea0..000000000000
--- a/x11-wm/fvwm/files/digest-fvwm-2.5.8-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c702d873d124a475f95c45432b8bd7d7 fvwm-2.5.8.tar.bz2 1778920
-MD5 a714fc47fe53c079905aee4037653579 FvwmTabs-2.6.tar.gz 24345
diff --git a/x11-wm/fvwm/fvwm-2.5.8-r2.ebuild b/x11-wm/fvwm/fvwm-2.5.8-r2.ebuild
deleted file mode 100644
index 12a3716124ef..000000000000
--- a/x11-wm/fvwm/fvwm-2.5.8-r2.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2004 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.8-r2.ebuild,v 1.7 2004/01/13 12:19:03 taviso Exp $
-
-inherit eutils flag-o-matic
-
-IUSE="readline truetype ncurses gtk stroke gnome rplay xinerama perl nls png bidi imlib tcltk debug gtk2"
-
-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.6.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.52 ) )
-		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
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${P}
-
-src_unpack() {
-	unpack ${A}
-
-	# this patch enables fast translucent menus in fvwm..yummy! this is a 
-	# minor tweak of a patch posted to fvwm-user mailing list by Olivier 
-	# Chapuis in <20030827135125.GA6370@snoopy.folie>.
-	cd ${S}; epatch ${FILESDIR}/fvwm-translucent-menus.diff.gz
-
-	# according to a post to fvwm-workers mailing list, Mikhael Goikhman
-	# planned on disabling these debug statements before the release, but
-	# never got around to it.
-	cd ${S}; epatch ${FILESDIR}/disable-debug-statements.diff
-
-	# FvwmTabs uses /tmp/.fvwmtabs.state for storing state files by default, 
-	# this probably isnt a good idea security wise, allowing someone to do 
-	# damage with symlinks. It will also break if multiple users try using 
-	# the same location simultaneously...probably should use File::Temp, but 
-	# moving it into ~/.fvwmtabs.state will do for now.
-	if use perl; then
-		cd ${WORKDIR}; epatch ${FILESDIR}/fvwmtabs-insecure-tmp-handling.diff
-
-		# I'll supply a default icon for FvwmTabs, this removes the need for
-		# installing an iconset, this one comes from the fvwm_icons package.
-		ebegin "	Setting default icon for FvwmTabs"
-			sed -i 's#/usr/share/icons/mini/mini-happy.xpm#/usr/share/fvwm/mini-happy.xpm#g' \
-				FvwmTabs FvwmTabs.1 fvwmtabrc
-		eend $?
-	fi
-
-	# this patch from cvs, regarding a message sent to the fvwm-workers 
-	# mailing list in <20031111234845.A12314@deepblue.milkyway.com.au>, 
-	# perllib applications were getting destroyed before the ON_EXIT 
-	# handler could be invoked.
-	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.8-perllib-disconnect.diff
-
-	# files with \n in them make fvwm-menu-directory misbehave.
-	cd ${S}/bin; epatch ${FILESDIR}/fvwm-2.5.8-fvwm-menu-directory-security.diff
-
-	# build fails on alpha with certain options without this.
-	use alpha && append-flags -fPIC
-}
-
-src_compile() {
-	local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs"
-
-	# 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
-
-	# since fvwm-2.5.8 GTK support can be diabled with --disable-gtk, previously
-	# we had to hide the includes/libs during configure. this is still the case
-	# for GDK image suport _with_ gtk, unfortunately.
-	# FvwmGtk can be built as a gnome application, or a Gtk+ application.
-	if ! use gtk; then
-		myconf="${myconf} --disable-gtk --without-gnome"
-	else
-		if ! use imlib; then
-			einfo "ATTN: You can safely ignore any imlib related configure errors."
-			myconf="${myconf} --with-imlib-prefix=${T}"
-		fi
-		if ! use gnome; then
-			myconf="${myconf} --without-gnome"
-		else
-			myconf="${myconf} --with-gnome"
-		fi
-	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.
-	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
-
-	# 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"
-		append-flags -DCR_DETECT_MOTION_METHOD_DEBUG
-	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?
-	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?)
-	if use noxpm; then
-		myconf="${myconf} --without-xpm-library"
-	fi
-
-	# set the local maintainer for fvwm-bug.
-	export FVWM_BUGADDR="taviso@gentoo.org"
-
-	econf ${myconf} || 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
-			doman ${WORKDIR}/FvwmTabs.1
-
-			# install default drag and drop icon.
-			insinto /usr/share/fvwm
-			newins ${FILESDIR}/mini.happy.xpm mini-happy.xpm
-		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
-
-	# neat utility for testing fvwm behaviour on applications setting various 
-	# hints, creates a simple black window with configurable hints set. 
-	if use debug; then
-		dobin ${S}/tests/hints/hints_test
-		newdoc ${S}/tests/hints/README README.hints
-	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
-
-	dodoc ${FILESDIR}/README.transluceny.gz
-
-	# 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.8-r3.ebuild b/x11-wm/fvwm/fvwm-2.5.8-r3.ebuild
deleted file mode 100644
index 5849925fee86..000000000000
--- a/x11-wm/fvwm/fvwm-2.5.8-r3.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2004 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.8-r3.ebuild,v 1.5 2004/02/08 19:41:51 taviso Exp $
-
-inherit eutils flag-o-matic
-
-IUSE="readline truetype ncurses gtk stroke gnome rplay xinerama perl nls png bidi imlib tcltk debug gtk2"
-
-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.6.tar.gz )"
-HOMEPAGE="http://www.fvwm.org/"
-
-SLOT="0"
-KEYWORDS="x86 alpha ~amd64"
-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.52 ) )
-		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
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${P}
-
-src_unpack() {
-	unpack ${A}
-
-	# this patch enables fast translucent menus in fvwm..yummy! this is a 
-	# minor tweak of a patch posted to fvwm-user mailing list by Olivier 
-	# Chapuis in <20030827135125.GA6370@snoopy.folie>.
-	cd ${S}; epatch ${FILESDIR}/fvwm-translucent-menus.diff.gz
-
-	# according to a post to fvwm-workers mailing list, Mikhael Goikhman
-	# planned on disabling these debug statements before the release, but
-	# never got around to it.
-	cd ${S}; epatch ${FILESDIR}/disable-debug-statements.diff
-
-	# FvwmTabs uses /tmp/.fvwmtabs.state for storing state files by default, 
-	# this probably isnt a good idea security wise, allowing someone to do 
-	# damage with symlinks. It will also break if multiple users try using 
-	# the same location simultaneously...probably should use File::Temp, but 
-	# moving it into ~/.fvwmtabs.state will do for now.
-	if use perl; then
-		cd ${WORKDIR}; epatch ${FILESDIR}/fvwmtabs-insecure-tmp-handling.diff
-
-		# I'll supply a default icon for FvwmTabs, this removes the need for
-		# installing an iconset, this one comes from the fvwm_icons package.
-		ebegin "	Setting default icon for FvwmTabs"
-			sed -i 's#/usr/share/icons/mini/mini-happy.xpm#/usr/share/fvwm/mini-happy.xpm#g' \
-				FvwmTabs FvwmTabs.1 fvwmtabrc
-		eend $?
-	fi
-
-	# this patch from cvs, regarding a message sent to the fvwm-workers 
-	# mailing list in <20031111234845.A12314@deepblue.milkyway.com.au>, 
-	# perllib applications were getting destroyed before the ON_EXIT 
-	# handler could be invoked.
-	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.8-perllib-disconnect.diff
-
-	# files with \n in them make fvwm-menu-directory misbehave.
-	cd ${S}/bin; epatch ${FILESDIR}/fvwm-2.5.8-fvwm-menu-directory-security.diff
-
-	# add a nice new placement policy, UnderMousePlacement.
-	# cd ${S}; epatch ${FILESDIR}/fvwm-2.5.8-undermouse.diff
-
-	# this patch adds an 'ShowOnlyIcons Never' option to FvwmIconMan.
-	cd ${S}; epatch ${FILESDIR}/fvwm-iconman.diff
-
-	# if you disable the start button in FvwmTaskBar, margins may get ignored.
-	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.8-taskbar-margins.diff
-
-	# FvwmScript-Quit wont reboot the computer
-	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.8-FvwmScript-Quit-reboot.diff
-
-	# build fails on alpha with certain options without this.
-	use alpha && append-flags -fPIC
-}
-
-src_compile() {
-	local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs"
-
-	# 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
-
-	# since fvwm-2.5.8 GTK support can be diabled with --disable-gtk, previously
-	# we had to hide the includes/libs during configure. this is still the case
-	# for GDK image suport _with_ gtk, unfortunately.
-	# FvwmGtk can be built as a gnome application, or a Gtk+ application.
-	if ! use gtk; then
-		myconf="${myconf} --disable-gtk --without-gnome"
-	else
-		if ! use imlib; then
-			einfo "ATTN: You can safely ignore any imlib related configure errors."
-			myconf="${myconf} --with-imlib-prefix=${T}"
-		fi
-		if ! use gnome; then
-			myconf="${myconf} --without-gnome"
-		else
-			myconf="${myconf} --with-gnome"
-		fi
-	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.
-	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
-
-	# 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"
-		append-flags -DCR_DETECT_MOTION_METHOD_DEBUG
-	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?
-	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?)
-	if use noxpm; then
-		myconf="${myconf} --without-xpm-library"
-	fi
-
-	# set the local maintainer for fvwm-bug.
-	export FVWM_BUGADDR="taviso@gentoo.org"
-
-	econf ${myconf} || 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
-			doman ${WORKDIR}/FvwmTabs.1
-
-			# install default drag and drop icon.
-			insinto /usr/share/fvwm
-			newins ${FILESDIR}/mini.happy.xpm mini-happy.xpm
-		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
-
-	# neat utility for testing fvwm behaviour on applications setting various 
-	# hints, creates a simple black window with configurable hints set. 
-	if use debug; then
-		dobin ${S}/tests/hints/hints_test
-		newdoc ${S}/tests/hints/README README.hints
-	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
-
-	dodoc ${FILESDIR}/README.transluceny.gz
-
-	# 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.9.ebuild b/x11-wm/fvwm/fvwm-2.5.9.ebuild
index 49d9a1d974e7..1e4dd0c03e01 100644
--- a/x11-wm/fvwm/fvwm-2.5.9.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.9.ebuild,v 1.1 2004/03/02 14:50:52 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.9.ebuild,v 1.2 2004/03/16 20:20:36 taviso Exp $
 
 inherit eutils flag-o-matic
 
@@ -276,6 +276,9 @@ src_install() {
 
 	dodoc ${FILESDIR}/README.transluceny.gz
 
+	# make sure FvwmGtk man page is installed
+	use gtk && doman ${S}/modules/FvwmGtk/FvwmGtk.1
+
 	# fix a couple of symlinks.
 	prepallman
 }