versoin bump

Package-Manager: portage-2.1.2.2

4 files changed, 193 insertions, 9 deletions

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index 42c1945ca973..2d13ca613148 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/fvwm
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.139 2007/02/22 05:48:36 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.140 2007/03/23 19:29:55 taviso Exp $
+
+*fvwm-2.5.21 (23 Mar 2007)
+
+  23 Mar 2007; Tavis Ormandy <taviso@gentoo.org> +fvwm-2.5.21.ebuild:
+  version bump
 
   22 Feb 2007; David Shakaryan <omp@gentoo.org> fvwm-2.5.18-r1.ebuild,
   fvwm-2.5.19.ebuild:
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index a85d9570f406..bc1c904992c8 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -17,6 +17,8 @@ DIST fvwm-2.5.18-translucent-menus.diff.gz 82595 RMD160 175e2dc93ca4e265a5022655
 DIST fvwm-2.5.18.tar.bz2 2034340 RMD160 68bd7a5d3e1c5fb3776de0fbda75414d9e7ad54b SHA1 b7ef45dfe3975deab38dd9ae306c5fd280f307c6 SHA256 8489b32ad488d91898d9be0ff4ec4697590feee66f10de88301511efc617e9c5
 DIST fvwm-2.5.19-translucent-menus.diff.gz 5203 RMD160 637f1fb2597b0b8046b3f55c95b5c8826caaf753 SHA1 39ea5b122c8e2ccd252b36b4a807760e8ea34609 SHA256 64e71d288569b09233397b8e340c5641f6fc488bd6f97813e3b3aaebe385b24a
 DIST fvwm-2.5.19.tar.bz2 1990433 RMD160 75aabb54a9a66db21a16a339bbc4359b484b58de SHA1 b35da6ba6acb2f7bccd84da2ca95e49af2d7dd75 SHA256 b298c8de6ff64f45a6bddd456b3db3608522cd488e69435c60447e92617d4422
+DIST fvwm-2.5.21-translucent-menus.diff.gz 5144 RMD160 5211216b76bf68e23c5cb339d26da6cb33ff3181 SHA1 ac086d1b4f01d8dc07671edc1cf7e0a03ab32212 SHA256 415a1c1d311cb7d58281a4359ec05a03caebaf8960c88442112dfde33986d408
+DIST fvwm-2.5.21.tar.bz2 2062532 RMD160 4025f6c75c0919bffdaa9acbc7a4d987617d098b SHA1 a66746c38d392da826b0c6f880b486c1064ee734 SHA256 5549a3ad693f9ab523653738e493e95418626a6d2fd52465ce200ae4116b8800
 EBUILD fvwm-2.5.18-r1.ebuild 5360 RMD160 0fe1e975b10a5ec8b492b2e51a2f788df5047a27 SHA1 c34fdbca02c0ce77d2331803b5a9121245b6d516 SHA256 9b7e963fe6be831f014b4ef3371fbbeab96a467894a60f2dd4086e3765fe7a38
 MD5 3be756ddea2c42f4876693c8e30e0a86 fvwm-2.5.18-r1.ebuild 5360
 RMD160 0fe1e975b10a5ec8b492b2e51a2f788df5047a27 fvwm-2.5.18-r1.ebuild 5360
@@ -25,10 +27,14 @@ EBUILD fvwm-2.5.19.ebuild 5324 RMD160 c5eb50661ee22c51ef901a789c32df3015e2dbe5 S
 MD5 d0fde15a1e01c9c55d7635dfbc937676 fvwm-2.5.19.ebuild 5324
 RMD160 c5eb50661ee22c51ef901a789c32df3015e2dbe5 fvwm-2.5.19.ebuild 5324
 SHA256 8fe4e51279043e51f0a484b38c0c8c6fe7a028ca0a32de2601fad51e70045e4d fvwm-2.5.19.ebuild 5324
-MISC ChangeLog 22403 RMD160 2847724290a325506505b61d48f4debfb7db0596 SHA1 3b2856fbfdede175bb599aa51e315de912bebe88 SHA256 0afe9a9b73428440d3ce8c1f33584aac456bda0adeaa693d32b1a8870b2ff6fe
-MD5 a3854b428b3029632e5172f273b21423 ChangeLog 22403
-RMD160 2847724290a325506505b61d48f4debfb7db0596 ChangeLog 22403
-SHA256 0afe9a9b73428440d3ce8c1f33584aac456bda0adeaa693d32b1a8870b2ff6fe ChangeLog 22403
+EBUILD fvwm-2.5.21.ebuild 5186 RMD160 ff5ce7d2292b7a9803eeb6d7b2793598c39a9810 SHA1 e9e0e6b29aa03244197dfe800e4c24eeb622faa2 SHA256 0e0620898a2fe5b2b6a9caad56e20d7db23b95e6c73d59b015a19c4ff6b7706b
+MD5 7bc39cca459d94165cdf40c35147ab97 fvwm-2.5.21.ebuild 5186
+RMD160 ff5ce7d2292b7a9803eeb6d7b2793598c39a9810 fvwm-2.5.21.ebuild 5186
+SHA256 0e0620898a2fe5b2b6a9caad56e20d7db23b95e6c73d59b015a19c4ff6b7706b fvwm-2.5.21.ebuild 5186
+MISC ChangeLog 22520 RMD160 1d6ac143a286d73a792b129ddaf65f70024b49d2 SHA1 d7f0863e0b92e05c9a6c0d0e0b47a8b85f69050e SHA256 823a82c31cd00c21e87ead9045df842a8b898c0e13cb6d78a9e9eb51ce741db2
+MD5 3a041b682bbf6890220a391ead1c9650 ChangeLog 22520
+RMD160 1d6ac143a286d73a792b129ddaf65f70024b49d2 ChangeLog 22520
+SHA256 823a82c31cd00c21e87ead9045df842a8b898c0e13cb6d78a9e9eb51ce741db2 ChangeLog 22520
 MISC metadata.xml 527 RMD160 e50357d85b1410cf8a00f1afad349ed77b986fd7 SHA1 30ccd6474c2e572a1758202aa2a8b5f8edaf843d SHA256 e22df6337e402284589214f91894a06fd29786e4412ffd70845fe1cf86bb1375
 MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527
 RMD160 e50357d85b1410cf8a00f1afad349ed77b986fd7 metadata.xml 527
@@ -39,10 +45,13 @@ SHA256 15f65ff835712c3942c2d073dd95abe0d5739ac281be5b31bd598f9bff97e5fc files/di
 MD5 92361e1a13b578341dc56efebe350919 files/digest-fvwm-2.5.19 527
 RMD160 ee489b8d7e000f752d6780e64ace567a19334d2a files/digest-fvwm-2.5.19 527
 SHA256 605e1c4e7b87a1dde283aa0c5d577360663b398b2b65ebc108462a0913d4d288 files/digest-fvwm-2.5.19 527
+MD5 8f153f336454728914d0329eac7d31fa files/digest-fvwm-2.5.21 527
+RMD160 498eede3b0e655ac7cf9b89419c95ed93c43e819 files/digest-fvwm-2.5.21 527
+SHA256 e31053fe34342c267ca0b20f74c7b7afa18a6d2fcdca75286246241020644884 files/digest-fvwm-2.5.21 527
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF3S6+vSApE0uP4UsRAvdhAJ42vvoFTQ4Mhr1UR27WMKNPUEsX0wCfQcZ7
-1a0coJkdAghPds8QUmaVKG4=
-=a076
+iQBVAwUBRgQq1NommWwmkP1xAQKqjAH/bUZaQjSSI8tBTtgAF+PgPB0ne90fV+aD
+Wp1JooNFF6kWrToxkNmKx4Z2N8zumDMY3ux7nH+pde7mEAA9DZcgQg==
+=dtNG
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.21 b/x11-wm/fvwm/files/digest-fvwm-2.5.21
new file mode 100644
index 000000000000..704de8b03f81
--- /dev/null
+++ b/x11-wm/fvwm/files/digest-fvwm-2.5.21
@@ -0,0 +1,6 @@
+MD5 f5eb76c96e97e73bb44e8a0934e47543 fvwm-2.5.21-translucent-menus.diff.gz 5144
+RMD160 5211216b76bf68e23c5cb339d26da6cb33ff3181 fvwm-2.5.21-translucent-menus.diff.gz 5144
+SHA256 415a1c1d311cb7d58281a4359ec05a03caebaf8960c88442112dfde33986d408 fvwm-2.5.21-translucent-menus.diff.gz 5144
+MD5 c11efef91420e686d54f772e7162e879 fvwm-2.5.21.tar.bz2 2062532
+RMD160 4025f6c75c0919bffdaa9acbc7a4d987617d098b fvwm-2.5.21.tar.bz2 2062532
+SHA256 5549a3ad693f9ab523653738e493e95418626a6d2fd52465ce200ae4116b8800 fvwm-2.5.21.tar.bz2 2062532
diff --git a/x11-wm/fvwm/fvwm-2.5.21.ebuild b/x11-wm/fvwm/fvwm-2.5.21.ebuild
new file mode 100644
index 000000000000..0d0218e73ee2
--- /dev/null
+++ b/x11-wm/fvwm/fvwm-2.5.21.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.21.ebuild,v 1.1 2007/03/23 19:29:55 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.21-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 sys-libs/ncurses )
+		gtk? ( =x11-libs/gtk+-1.2* imlib? ( media-libs/imlib ) )
+		rplay? ( media-sound/rplay )
+		bidi? ( dev-libs/fribidi )
+		png? ( media-libs/libpng )
+		stroke? ( dev-libs/libstroke )
+		perl? ( tk? (
+					dev-lang/tk
+					dev-perl/perl-tk
+					>=dev-perl/X11-Protocol-0.56 ) )
+		truetype? ( virtual/xft media-libs/fontconfig )
+		userland_GNU? ( sys-apps/debianutils )
+		dev-lang/perl
+		sys-libs/zlib
+		|| ( (
+			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-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.21-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-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
+
+	# set the local maintainer for fvwm-bug.
+	export FVWM_BUGADDR="taviso@gentoo.org"
+
+	# reccommended by upstream
+	append-flags -fno-strict-aliasing
+
+	# signed chars are required
+	if use ppc; then
+		append-flags -fsigned-char
+	fi
+
+	econf ${myconf} `use_enable truetype xft` \
+					`use_with stroke stroke-library` \
+					`use_enable nls` \
+					`use_enable nls iconv` \
+					`use_enable png png-library` \
+					`use_enable bidi` \
+					`use_enable xinerama` \
+					`use_enable debug debug-msgs` \
+					`use_enable debug command-log` \
+					`use_enable perl perllib` \
+					`use_with readline readline-library` \
+					`use_with rplay rplay-library` || 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.
+	rm -f ${D}/usr/bin/fvwm-convert-2.6 ${D}/usr/share/man/man1/fvwm-convert-2.6.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
+}
+
+pkg_postinst() {
+	einfo
+	einfo "For information about the changes in this release, please"
+	einfo "refer to the NEWS file."
+	einfo
+}