revision bump

Package-Manager: portage-2.0.51.22-r3

4 files changed, 228 insertions, 53 deletions

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index e5060658f35d..570906ff7d3e 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/fvwm
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.115 2006/09/19 02:03:02 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.116 2006/10/19 22:06:14 taviso Exp $
+
+*fvwm-2.5.18 (19 Oct 2006)
+
+  19 Oct 2006; Tavis Ormandy <taviso@gentoo.org> +fvwm-2.5.18.ebuild:
+  revision bump
 
   19 Sep 2006; Doug Goldstein <cardoe@gentoo.org> fvwm-2.5.16.ebuild:
   tcltk -> tk USE flag change as per bug #17808
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 09c30019c939..f2f583756de7 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,55 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX README.transluceny 8910 RMD160 417b3416aef5ddd4b13672a2760d3736cac6f900 SHA1 c1cd348840df7774f62f67aa9e1b1e2ea78219de SHA256 0a4b3f143ee0b6fc32098cbd556b25fdc695a980bc8b4cf032b1dad4a4952ddb
-MD5 9e8e5c601353e0933820fc4f2f543c13 files/README.transluceny 8910
-RMD160 417b3416aef5ddd4b13672a2760d3736cac6f900 files/README.transluceny 8910
-SHA256 0a4b3f143ee0b6fc32098cbd556b25fdc695a980bc8b4cf032b1dad4a4952ddb files/README.transluceny 8910
-AUX centerplacement-2.5.10.diff 2431 RMD160 51d22a3adbdf459b79375e23f71816cfb4b34d47 SHA1 8c0b7448666fa2b7d534522518c3eac708fd1e02 SHA256 a53708857b330af65fb5a156a3792965ad3de080617929cceab74ef2bfc4bf83
-MD5 a580b9f394262307f85eae492bbd68d9 files/centerplacement-2.5.10.diff 2431
-RMD160 51d22a3adbdf459b79375e23f71816cfb4b34d47 files/centerplacement-2.5.10.diff 2431
-SHA256 a53708857b330af65fb5a156a3792965ad3de080617929cceab74ef2bfc4bf83 files/centerplacement-2.5.10.diff 2431
-AUX disable-debug-statements.diff 419 RMD160 4a66f7eed0c64580ef58b7ef624857c00686575c SHA1 591f5f0b4e349972878ebc2ade2d75e2e7002881 SHA256 aa7e44928b2b14a5402d12129a28452eadbf5e3c8986ba5d61398991fd2ccede
-MD5 df03a10a40a620ce8f1fab75f9758884 files/disable-debug-statements.diff 419
-RMD160 4a66f7eed0c64580ef58b7ef624857c00686575c files/disable-debug-statements.diff 419
-SHA256 aa7e44928b2b14a5402d12129a28452eadbf5e3c8986ba5d61398991fd2ccede files/disable-debug-statements.diff 419
-AUX fvwm-menu-xlock-xlockmore-compat.diff 550 RMD160 72af6f306e5869581fcd48c84edfe00adea4a5b9 SHA1 0eccf83c3046e3822737c5facb23f547a062bff8 SHA256 5db8bc279f618096b23fed04b70b626c6ff50c104283d5ece505200db1e5a8af
-MD5 d91fb7d2af57653fc93a70e6e1c0a0ea files/fvwm-menu-xlock-xlockmore-compat.diff 550
-RMD160 72af6f306e5869581fcd48c84edfe00adea4a5b9 files/fvwm-menu-xlock-xlockmore-compat.diff 550
-SHA256 5db8bc279f618096b23fed04b70b626c6ff50c104283d5ece505200db1e5a8af files/fvwm-menu-xlock-xlockmore-compat.diff 550
-AUX fvwm-noxbell-grab-fail.diff 360 RMD160 f80b61033650a1145581e980e5ddb4efa498b78b SHA1 a85d12ba5cb2c7e7ee707f565c84053d0d847e09 SHA256 caa52d417736812829ed204522673e1bda42debeb92bca04ca118f358b9d9b07
-MD5 0dc5ddac8cf6767f4a753feef77e6c65 files/fvwm-noxbell-grab-fail.diff 360
-RMD160 f80b61033650a1145581e980e5ddb4efa498b78b files/fvwm-noxbell-grab-fail.diff 360
-SHA256 caa52d417736812829ed204522673e1bda42debeb92bca04ca118f358b9d9b07 files/fvwm-noxbell-grab-fail.diff 360
-AUX fvwm-translucent-menus.diff 12238 RMD160 363a20b92d8136c898ba577de2445b031ee0f814 SHA1 f2a4783e053d91dc5b5a8cd3210a966e1511d321 SHA256 a5b869fd078783c1c4d6ea0da033731bfd029b929b0973c6f7ddf583323fd64c
-MD5 086986f68eeafe8c662ced762dc17fe9 files/fvwm-translucent-menus.diff 12238
-RMD160 363a20b92d8136c898ba577de2445b031ee0f814 files/fvwm-translucent-menus.diff 12238
-SHA256 a5b869fd078783c1c4d6ea0da033731bfd029b929b0973c6f7ddf583323fd64c files/fvwm-translucent-menus.diff 12238
-AUX mini.happy.xpm 425 RMD160 bd6cacbb7838fece51b155b2fd8143c216d27dbd SHA1 80cb4d90e8ea663c20b891d9df0ed120289f66f1 SHA256 aa53d4a7575e40ee7122b62587a880ef9541f9a4c572f7775fbeef34d3d4166e
-MD5 e9263b93f666293d0a1220ea3457efcd files/mini.happy.xpm 425
-RMD160 bd6cacbb7838fece51b155b2fd8143c216d27dbd files/mini.happy.xpm 425
-SHA256 aa53d4a7575e40ee7122b62587a880ef9541f9a4c572f7775fbeef34d3d4166e files/mini.happy.xpm 425
-DIST fvwm-2.5.16-translucent-menus.diff.gz 5022 RMD160 995c1dcd20bd5e4342cb0d2db442ef14490275e6 SHA256 ac57011a3211267ed7893001e6bc381230c2491526231efc2468991a9774f977
-DIST fvwm-2.5.16.tar.bz2 2018815 RMD160 2c0d9c3c1c452d970dbcd4ba4800944714d4c2d4 SHA256 9fb3f38dfd329b3de1cab0b4e500edd7a2d2fbe11357ef0ca11e052e4ee406d9
-EBUILD fvwm-2.5.16.ebuild 6159 RMD160 658af33bac1e80c4668835c55a8bb7bb5632c57c SHA1 0f4910541a82850fec8fd241de12bb0ad81746d6 SHA256 ad2cbe053ef104a72e908b64aa47b406a7b7b5da515a22ad55a943eeebf77812
 MD5 567f2456b8b933cc6971ff7731935a50 fvwm-2.5.16.ebuild 6159
-RMD160 658af33bac1e80c4668835c55a8bb7bb5632c57c fvwm-2.5.16.ebuild 6159
-SHA256 ad2cbe053ef104a72e908b64aa47b406a7b7b5da515a22ad55a943eeebf77812 fvwm-2.5.16.ebuild 6159
-MISC ChangeLog 19365 RMD160 fb103464dfbd9489c12e63e3441ec15677577260 SHA1 f68edf31323023fe94b8a8c71b72f97aad4a6b2f SHA256 e306a90b63e46cda641ac332f0c5b50ee2f71a585430fcf1d112f6323bf0ee14
-MD5 ef6fee2bee3f839995a9eba998b05156 ChangeLog 19365
-RMD160 fb103464dfbd9489c12e63e3441ec15677577260 ChangeLog 19365
-SHA256 e306a90b63e46cda641ac332f0c5b50ee2f71a585430fcf1d112f6323bf0ee14 ChangeLog 19365
-MISC metadata.xml 527 RMD160 e50357d85b1410cf8a00f1afad349ed77b986fd7 SHA1 30ccd6474c2e572a1758202aa2a8b5f8edaf843d SHA256 e22df6337e402284589214f91894a06fd29786e4412ffd70845fe1cf86bb1375
+MD5 f819efc3c9ca2f4dec68977eb702e84d fvwm-2.5.18.ebuild 6165
+MD5 27d098d6c46d28e76190efca9a952603 ChangeLog 19480
 MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527
-RMD160 e50357d85b1410cf8a00f1afad349ed77b986fd7 metadata.xml 527
-SHA256 e22df6337e402284589214f91894a06fd29786e4412ffd70845fe1cf86bb1375 metadata.xml 527
+MD5 d91fb7d2af57653fc93a70e6e1c0a0ea files/fvwm-menu-xlock-xlockmore-compat.diff 550
 MD5 293a9b01b3bbdfc741ac4a6fe86d3a21 files/digest-fvwm-2.5.16 527
-RMD160 aa0272e67f38f6c8db6986ac2b54165e5ce42645 files/digest-fvwm-2.5.16 527
-SHA256 21ea20a2227a9ec115691056fdb382b440de63f2f1552567898dfcc780aadd33 files/digest-fvwm-2.5.16 527
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFD0/OoeSe8B0zEfwRAh3gAJ9TroBcylyIVRNWAWnhjrjIKmiTdwCfRhhz
-eWYrrh9YZC31B8h+0DoChDA=
-=BMng
------END PGP SIGNATURE-----
+MD5 822d2bf81d188a9312b3646d388e978f files/digest-fvwm-2.5.18 146
+MD5 a580b9f394262307f85eae492bbd68d9 files/centerplacement-2.5.10.diff 2431
+MD5 086986f68eeafe8c662ced762dc17fe9 files/fvwm-translucent-menus.diff 12238
+MD5 0dc5ddac8cf6767f4a753feef77e6c65 files/fvwm-noxbell-grab-fail.diff 360
+MD5 9e8e5c601353e0933820fc4f2f543c13 files/README.transluceny 8910
+MD5 e9263b93f666293d0a1220ea3457efcd files/mini.happy.xpm 425
+MD5 df03a10a40a620ce8f1fab75f9758884 files/disable-debug-statements.diff 419
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.18 b/x11-wm/fvwm/files/digest-fvwm-2.5.18
new file mode 100644
index 000000000000..cd4a57d2b328
--- /dev/null
+++ b/x11-wm/fvwm/files/digest-fvwm-2.5.18
@@ -0,0 +1,2 @@
+MD5 d90612ab2bd3a86b2bd23325aa87d3d4 fvwm-2.5.18.tar.bz2 2034340
+MD5 140c3b506c7afb69a3e6ac0b2b56e75b fvwm-2.5.18-translucent-menus.diff.gz 82595
diff --git a/x11-wm/fvwm/fvwm-2.5.18.ebuild b/x11-wm/fvwm/fvwm-2.5.18.ebuild
new file mode 100644
index 000000000000..0c1365c4443f
--- /dev/null
+++ b/x11-wm/fvwm/fvwm-2.5.18.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.18.ebuild,v 1.1 2006/10/19 22:06:14 taviso Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
+HOMEPAGE="http://www.fvwm.org/"
+SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2 mirror://gentoo/fvwm-2.5.18-translucent-menus.diff.gz"
+
+LICENSE="GPL-2 FVWM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bidi debug gtk imlib nls perl png readline rplay stroke tk truetype xinerama"
+
+RDEPEND="readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.3-r1 )
+		gtk? ( =x11-libs/gtk+-1.2*
+				imlib? ( >=media-libs/gdk-pixbuf-0.21.0
+						>=media-libs/imlib-1.9.14-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? ( tk? ( >=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-lang/perl-5.6.1-r10
+		>=sys-libs/zlib-1.1.4-r1
+		sys-apps/debianutils
+		|| ( (
+			x11-libs/libXpm
+			x11-libs/libXft
+			xinerama? ( x11-libs/libXinerama ) )
+		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, worth a dependency?
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig
+		!x11-wm/metisse
+		|| ( (
+			x11-libs/libXrandr
+			x11-proto/xextproto
+			x11-proto/xproto
+			xinerama? ( x11-proto/xineramaproto ) )
+		virtual/x11 )"
+
+src_unpack() {
+	unpack ${A}; export EPATCH_OPTS="-F3 -l"
+
+	# this patch enables fast translucent menus in fvwm. 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 ${WORKDIR}/fvwm-2.5.18-translucent-menus.diff
+
+	# fixing #51287, the fvwm-menu-xlock script is not compatible
+	# with the xlockmore implementation in portage.
+	cd ${S}; epatch ${FILESDIR}/fvwm-menu-xlock-xlockmore-compat.diff
+}
+
+src_compile() {
+	local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs"
+
+
+	# use readline in FvwmConsole.
+	if ! use readline; then
+		myconf="${myconf} --without-readline-library"
+	else
+		myconf="${myconf} --with-readline-library --without-termcap-library"
+	fi
+
+	# 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
+		myconf="${myconf} --without-gnome"
+	fi
+
+	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
+
+	if use xinerama; then
+		myconf="${myconf} --enable-xinerama"
+	else
+		myconf="${myconf} --disable-xinerama"
+	fi
+
+	# bidirectional writing support
+	if use bidi; then
+		myconf="${myconf} --enable-bidi"
+	else
+		myconf="${myconf} --disable-bidi"
+	fi
+
+	# png image support
+	if ! use png; then
+		myconf="${myconf} --without-png-library"
+	fi
+
+	# native language support
+	if use nls; then
+		myconf="${myconf} --enable-nls --enable-iconv"
+	else
+		myconf="${myconf} --disable-nls --disable-iconv"
+	fi
+
+	# support for mouse gestures using libstroke (very very cool)
+	if ! use stroke; then
+		myconf="${myconf} --without-stroke-library"
+	fi
+
+	if use debug; then
+		myconf="${myconf} --enable-debug-msgs --enable-command-log"
+	fi
+
+	# Xft Anti Aliased text support
+	if use truetype; then
+		myconf="${myconf} --enable-xft"
+	else
+		myconf="${myconf} --disable-xft"
+	fi
+
+	# set the local maintainer for fvwm-bug.
+	export FVWM_BUGADDR="taviso@gentoo.org"
+
+	# reccommended by upstream
+	append-flags -fno-strict-aliasing
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	if use perl; then
+
+		local toolkits="gtk tcltk"
+
+		if ! use tk; then
+			# 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/gtk/}
+		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 ${FILESDIR}/README.transluceny
+
+	# fix a couple of symlinks.
+	prepallman
+}
+
+pkg_postinst() {
+	einfo
+	einfo "For information about the changes in this release, please"
+	einfo "refer to the NEWS file."
+	einfo
+}