two new use flags.

4 files changed, 306 insertions, 3 deletions

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index c32c6f824bec..6537647a8baa 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,23 @@
 # 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.25 2003/09/01 10:42:57 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.26 2003/09/01 13:29:23 taviso Exp $
+
+*fvwm-2.5.7-r2 (01 Sep 2003)
+
+  01 Sep 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.7-r2.ebuild:
+  Three new USE flags, 
+  	noxpm - Disable support for XPM Images, for people who 
+  		only use png images, or prefer solid colour/gradiant/etc.
+  	nosm - Disable session management support, for users who 
+  		never use session managers (xsm, for example)
+  	truetype - Allows users to toggle Xft support.
+  Adding /usr/share/icons/fvwm to the default ImagePath.
+  Some minor tweaks to the toolkit options, so that -gtk also removes gtk2
+  support, as reccommended.
+  
+  The new USE flags mean only XRender, SHM and Shaped Windows are left to 
+  the configure script to decide, which i suspect everybody will want unless
+  support isnt available, which the configure script will deduce automatically.
 
   01 Sep 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.7-r1.ebuild:
   gtk2 wasnt in IUSE.
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 5c45b7b9bf49..e711116c1740 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,9 +1,9 @@
-MD5 2e6ded6c030afa1bca8ebd2db6650da9 fvwm-2.5.7-r2.ebuild 8185
+MD5 61ae46040e22703b6d55b62e4525a3e1 fvwm-2.5.7-r2.ebuild 8778
 MD5 c2eeb0a9ce5240f426cdfa121e0fe84f fvwm-2.4.16-r1.ebuild 4020
 MD5 b44ca250c8b822f0bfeb5f11d7824f78 fvwm-2.5.7-r1.ebuild 7876
 MD5 7e8dad745798db4e98817ffb0925bf4a fvwm-2.5.7.ebuild 5591
 MD5 9b68cbbbdaba95b23665ea98c695e57d fvwm-2.4.16.ebuild 1334
-MD5 884d1ef50b0f33b92577fb83db4ca3b9 ChangeLog 4408
+MD5 a6bb559ee1f49a82ba88cffd634119e6 ChangeLog 5211
 MD5 beaa1ad08ff661a32c25d1a51c879a8d metadata.xml 450
 MD5 ccd8378d86941cb17669e64ca88949c1 fvwm-2.4.8.ebuild 1146
 MD5 40725b9b9496d374f5f1a763618781ea files/digest-fvwm-2.4.16 65
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.7-r2 b/x11-wm/fvwm/files/digest-fvwm-2.5.7-r2
new file mode 100644
index 000000000000..e0c28c2def09
--- /dev/null
+++ b/x11-wm/fvwm/files/digest-fvwm-2.5.7-r2
@@ -0,0 +1,3 @@
+MD5 5dfcf70560779ed845261c5044652c81 fvwm-2.5.7.tar.bz2 1711869
+MD5 5d28a9854094868d1f3c8b94a49d73e4 FvwmTabs 26535
+MD5 acd198b7fb148851b24466f3ca53c61f fvwmtabrc 5778
diff --git a/x11-wm/fvwm/fvwm-2.5.7-r2.ebuild b/x11-wm/fvwm/fvwm-2.5.7-r2.ebuild
new file mode 100644
index 000000000000..778813e37ab4
--- /dev/null
+++ b/x11-wm/fvwm/fvwm-2.5.7-r2.ebuild
@@ -0,0 +1,283 @@
+# 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.1 2003/09/01 13:29:23 taviso Exp $
+
+inherit gnuconfig
+
+IUSE="readline truetype ncurses gtk stroke gnome rplay xinerama cjk perl nls png bidi imlib tcltk debug gtk2 noxpm nosm"
+
+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? ( http://users.tpg.com.au/users/scottie7/FvwmTabs 
+				http://users.tpg.com.au/users/scottie7/fvwmtabrc )"
+HOMEPAGE="http://www.fvwm.org/"
+
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~sparc"
+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-lang/perl-5.6.1-r10	
+		>=media-libs/netpbm-9.12-r4
+		>=dev-libs/expat-1.95.6-r1
+		>=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?
+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 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/share/icons/fvwm:/usr/include/X11/bitmaps:/usr/include/X11/pixmaps"
+
+	# ImagePath should include /usr/share/icons/fvwm by default.
+
+	# 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
+
+	# 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.
+	einfo "Fixing Xft detection, please wait..."
+ 	(	einfo "	Running aclocal..."
+		aclocal
+		einfo "	Running autoheader..."
+		autoheader
+		einfo "	Running automake..."
+		automake --add-missing
+		einfo "	Running autoreconf..."
+		autoreconf ) 2>/dev/null
+	einfo "Fixed."
+	
+	# 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 ${DISTDIR}/FvwmTabs
+			dodoc ${DISTDIR}/fvwmtabrc
+		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
+	
+	# 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
+
+	prepallman
+}
+
+pkg_postinst() {
+	# FIXME: remove this blurb in a future release..
+	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 perl 		|| ewarn "	FVWM Perl bindings [perl]"
+	use tcltk		|| ewarn "	FVWM Perl-tk support, including FvwmTabs [perl tcltk]"
+	use nls			|| ewarn "	Native Language Support [nls]"
+	use png			|| ewarn "	PNG Support [png]"
+	use bidi		|| ewarn "	Bidirectional Language Support [bidi]"
+	use rplay		|| ewarn "	RPlay Support in FvwmEvent [rplay]"
+	use gtk			|| ewarn "	FvwmGTK (gtk+ support) [gtk]"
+	use imlib		|| ewarn "	FvwmGTK (GDK image support) [imlib]"
+	use truetype	|| ewarn "	Xft Anti Aliased text support [truetype]"
+	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
+	use perl && use tcltk && {
+		einfo "The FvwmTabs module has been installed (USE=\"perl tcltk\")."
+		einfo "For more information, visit"
+		einfo "http://users.tpg.com.au/users/scottie7/fvwmtabs.html"
+		einfo
+		einfo "The fvwmtabrc has been installed into /usr/share/doc/${PF}"
+	}
+}