new version

(Portage version: 2.0.51.22-r3)

7 files changed, 245 insertions, 28 deletions

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index eb97f60f8113..919c9cc74fb8 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.102 2006/01/03 23:39:49 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.103 2006/01/15 17:40:34 taviso Exp $
+
+*fvwm-2.5.15 (15 Jan 2006)
+
+  15 Jan 2006; Tavis Ormandy <taviso@gentoo.org> +fvwm-2.5.15.ebuild:
+  new release
 
   04 Jan 2006; Karol Wojtaszek <sekretarz@gentoo.org> fvwm-2.5.14-r1.ebuild:
   Add modular X dependencies, bug #115591
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 8e7c553544db..71741dfb6bdc 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,28 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 cfc37d7eb6be1a5a71178973ca1a2e3f fvwm-2.5.13-r1.ebuild 7864
+MD5 d4ad99d2edb49ee23de8acb401f8ba0c fvwm-2.5.12.ebuild 8960
+MD5 64c4054742fdadf488d0c5fc7ebb0912 fvwm-2.5.14-r1.ebuild 7784
 MD5 1a5aa390eedf6f2399171dce74118878 ChangeLog 17806
+MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527
+MD5 64c4054742fdadf488d0c5fc7ebb0912 fvwm-2.5.15.ebuild 7784
+MD5 ba8d61baf42b7f21be2488b3581ff51d fvwm-2.4.18.ebuild 2956
+MD5 d91fb7d2af57653fc93a70e6e1c0a0ea files/fvwm-menu-xlock-xlockmore-compat.diff 550
 MD5 e2ceb5d855c5406a09d82442196efad8 files/README.transluceny.gz 5788
-MD5 a580b9f394262307f85eae492bbd68d9 files/centerplacement-2.5.10.diff 2431
 MD5 7d84c8175928d331e6d7b253679f5654 files/digest-fvwm-2.4.18 65
 MD5 c8fa1c05cdae43bd53f68942d684f23a files/digest-fvwm-2.5.12 209
+MD5 ccad08e5b3ca9159a063c2505f77ffd3 files/digest-fvwm-2.5.15 209
+MD5 a580b9f394262307f85eae492bbd68d9 files/centerplacement-2.5.10.diff 2431
+MD5 38cb0131791d07053b5d90bf21d1993f files/fvwm-translucent-menus.diff.gz 3582
+MD5 0dc5ddac8cf6767f4a753feef77e6c65 files/fvwm-noxbell-grab-fail.diff 360
+MD5 20d3c9bb419ce71c80fd25fd85364a45 files/fvwm-64bit-fixes.diff.gz 12220
 MD5 326a3b450dd43ec75b78fd0058026a3b files/digest-fvwm-2.5.13-r1 209
 MD5 f3538419cf078abb6adb941ee864fbd2 files/digest-fvwm-2.5.14-r1 209
-MD5 df03a10a40a620ce8f1fab75f9758884 files/disable-debug-statements.diff 419
-MD5 20d3c9bb419ce71c80fd25fd85364a45 files/fvwm-64bit-fixes.diff.gz 12220
-MD5 d91fb7d2af57653fc93a70e6e1c0a0ea files/fvwm-menu-xlock-xlockmore-compat.diff 550
-MD5 0dc5ddac8cf6767f4a753feef77e6c65 files/fvwm-noxbell-grab-fail.diff 360
-MD5 38cb0131791d07053b5d90bf21d1993f files/fvwm-translucent-menus.diff.gz 3582
 MD5 e9263b93f666293d0a1220ea3457efcd files/mini.happy.xpm 425
-MD5 ba8d61baf42b7f21be2488b3581ff51d fvwm-2.4.18.ebuild 2956
-MD5 d4ad99d2edb49ee23de8acb401f8ba0c fvwm-2.5.12.ebuild 8960
-MD5 cfc37d7eb6be1a5a71178973ca1a2e3f fvwm-2.5.13-r1.ebuild 7864
-MD5 64c4054742fdadf488d0c5fc7ebb0912 fvwm-2.5.14-r1.ebuild 7784
-MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDuxl/Z/iYVBmujdURAv8dAKCuVPTXArGDZ8TayNpr71vbTLeahwCdHX23
-lxhFnb3vnDZmdn8vLHKafZA=
-=oHPt
------END PGP SIGNATURE-----
+MD5 df03a10a40a620ce8f1fab75f9758884 files/disable-debug-statements.diff 419
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.15 b/x11-wm/fvwm/files/digest-fvwm-2.5.15
new file mode 100644
index 000000000000..f8c7d9265c28
--- /dev/null
+++ b/x11-wm/fvwm/files/digest-fvwm-2.5.15
@@ -0,0 +1,2 @@
+MD5 4c006037037498af26cc0728b1012abc fvwm-2.5.15.tar.bz2 2018412
+MD5 b71f32fa911b052668328813102173a7 fvwm-2.5.14-translucent-menus.diff.gz 3408
diff --git a/x11-wm/fvwm/fvwm-2.4.18.ebuild b/x11-wm/fvwm/fvwm-2.4.18.ebuild
index d826eba404a8..9be51f4339b7 100644
--- a/x11-wm/fvwm/fvwm-2.4.18.ebuild
+++ b/x11-wm/fvwm/fvwm-2.4.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.4.18.ebuild,v 1.9 2005/07/07 03:04:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.4.18.ebuild,v 1.10 2006/01/15 17:40:34 taviso Exp $
 
 inherit gnuconfig
 
diff --git a/x11-wm/fvwm/fvwm-2.5.12.ebuild b/x11-wm/fvwm/fvwm-2.5.12.ebuild
index 93a4e00be61c..714011fb7a2e 100644
--- a/x11-wm/fvwm/fvwm-2.5.12.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.12.ebuild,v 1.14 2005/06/06 16:45:59 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.12.ebuild,v 1.15 2006/01/15 17:40:34 taviso Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/x11-wm/fvwm/fvwm-2.5.13-r1.ebuild b/x11-wm/fvwm/fvwm-2.5.13-r1.ebuild
index 9ee2802eb69e..5da3585e03c9 100644
--- a/x11-wm/fvwm/fvwm-2.5.13-r1.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.13-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.13-r1.ebuild,v 1.1 2005/07/19 12:19:29 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.13-r1.ebuild,v 1.2 2006/01/15 17:40:34 taviso Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/x11-wm/fvwm/fvwm-2.5.15.ebuild b/x11-wm/fvwm/fvwm-2.5.15.ebuild
new file mode 100644
index 000000000000..9066d4a5ccbe
--- /dev/null
+++ b/x11-wm/fvwm/fvwm-2.5.15.ebuild
@@ -0,0 +1,218 @@
+# 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.15.ebuild,v 1.1 2006/01/15 17:40:34 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.14-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 tcltk 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? ( 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-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 )"
+
+SFT=${WORKDIR}/FvwmTabs-v3-4
+
+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.14-translucent-menus.diff
+
+	# FvwmTabs pod not included in dist
+	sed -i -e 's/\(.*pod.*\)/#\1/g' ${S}/modules/FvwmTabs/Makefile.am || die
+
+	# 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
+
+	# remove XBell when grab fails.
+	cd ${S}; epatch ${FILESDIR}/fvwm-noxbell-grab-fail.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"
+
+	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 tcltk; 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.gz
+
+	# fix a couple of symlinks.
+	prepallman
+}
+
+pkg_postinst() {
+	echo
+	einfo "For information about the changes in this release, please"
+	einfo "refer to the NEWS file."
+	echo
+}