version bump

4 files changed, 328 insertions, 2 deletions

diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index fce4645b0a66..01b6324bc287 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,15 +1,16 @@
 MD5 e79bd2fa2e46e650aabaa16754e25583 fvwm-2.5.7-r5.ebuild 8757
 MD5 50d28dc5e95e4c595d28698c95b2e035 fvwm-2.5.8.ebuild 9137
-MD5 bd1e9d6bb3e47dbe00a78450c4babec7 fvwm-2.5.8-r1.ebuild 9134
+MD5 07d3383d6f54e1b2d851835fec5abce4 fvwm-2.5.8-r1.ebuild 9565
 MD5 b893f78193652b275ce5d276ac38af29 fvwm-2.4.17.ebuild 3961
 MD5 8fa93269e89c39d61e797e46a91b2872 fvwm-2.5.7-r3.ebuild 8726
-MD5 a3663b67114af0af40f4bd9fb2cfe69c ChangeLog 9092
+MD5 3d341ba4a190848bdb6d43e2d3ef8643 ChangeLog 9291
 MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527
 MD5 e2ceb5d855c5406a09d82442196efad8 files/README.transluceny.gz 5788
 MD5 e5701841190ad529d5577c8da69d5006 files/fvwmtabs-insecure-tmp-handling.diff 2350
 MD5 b2af3c1c8fe4f142e2b8debbb5c59a94 files/digest-fvwm-2.4.17 65
 MD5 38cb0131791d07053b5d90bf21d1993f files/fvwm-translucent-menus.diff.gz 3582
 MD5 977c11b7ca7c17cff7a14d1d4a0136f4 files/fvwm-2.5.8-perllib-disconnect.diff 1179
+MD5 e9263b93f666293d0a1220ea3457efcd files/mini.happy.xpm 425
 MD5 2bdb17132f9d7f352002a1fbace7fca1 files/acinclude.m4 61423
 MD5 df03a10a40a620ce8f1fab75f9758884 files/disable-debug-statements.diff 419
 MD5 719ab11e70adb34bdf0a3fa0541b3ca6 files/digest-fvwm-2.5.8 127
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.8-r1 b/x11-wm/fvwm/files/digest-fvwm-2.5.8-r1
new file mode 100644
index 000000000000..6f176154a839
--- /dev/null
+++ b/x11-wm/fvwm/files/digest-fvwm-2.5.8-r1
@@ -0,0 +1,2 @@
+MD5 c702d873d124a475f95c45432b8bd7d7 fvwm-2.5.8.tar.bz2 1778920
+MD5 6a0d0c6bac2173dfb4474b4c0665f170 FvwmTabs-2.5.tar.gz 24243
diff --git a/x11-wm/fvwm/files/mini.happy.xpm b/x11-wm/fvwm/files/mini.happy.xpm
new file mode 100644
index 000000000000..63ec60588217
--- /dev/null
+++ b/x11-wm/fvwm/files/mini.happy.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * mini-happy_xpm[] = {
+"16 16 3 1",
+" 	c None s None",
+".	c black",
+"X	c yellow",
+"                ",
+"      .....     ",
+"    ..XXXXX..   ",
+"   .XXXXXXXXX.  ",
+"   .XX..X..XX.  ",
+"  .XXX..X..XXX. ",
+"  .XXX..X..XXX. ",
+"  .XXXXXXXXXXX. ",
+"  .XXXXXXXXXXX. ",
+"  .XX.XXXXX.XX. ",
+"   .XX.....XX.  ",
+"   .XXX...XXX.  ",
+"    ..XXXXX..   ",
+"      .....     ",
+"                ",
+"                "};
diff --git a/x11-wm/fvwm/fvwm-2.5.8-r1.ebuild b/x11-wm/fvwm/fvwm-2.5.8-r1.ebuild
new file mode 100644
index 000000000000..8971423c67bb
--- /dev/null
+++ b/x11-wm/fvwm/fvwm-2.5.8-r1.ebuild
@@ -0,0 +1,301 @@
+# 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.8-r1.ebuild,v 1.1 2003/11/13 13:19:48 taviso Exp $
+
+inherit eutils flag-o-matic
+
+IUSE="readline truetype ncurses gtk stroke gnome rplay xinerama 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.5.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
+	sys-devel/automake
+	sys-devel/autoconf
+	dev-util/pkgconfig"
+
+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 include a default icon for FvwmTabs, this removes the dependency 
+		# on fvwm_icons.
+		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 README.fvwmtabs 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
+
+	# 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"
+	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
+
+			# drag and drop icon, this removes dependancy on fvwm_icons.
+			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. 
+	# maybe useful for developers...
+	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
+}