Version bump, also include a default on vanilla USE and patch to increase maximum mouse buttons number when that USE is off, also include epatch_user as requested, please see bugs #411811 (by avx) and #412079 (also by Jesús Guerrero).

Package-Manager: portage-2.1.11.24/cvs/Linux x86_64

3 files changed, 198 insertions, 9 deletions

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index 6ae59fbc3358..e85816b828f3 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/fvwm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.187 2012/05/29 19:09:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.188 2012/10/07 13:49:32 pacho Exp $
+
+*fvwm-2.6.5 (07 Oct 2012)
+
+  07 Oct 2012; Pacho Ramos <pacho@gentoo.org> +fvwm-2.6.5.ebuild:
+  Version bump, also include a default on vanilla USE and patch to increase
+  maximum mouse buttons number when that USE is off, also include epatch_user as
+  requested, please see bugs #411811 (by avx) and #412079 (also by Jesús
+  Guerrero).
 
   29 May 2012; Brent Baude <ranger@gentoo.org> fvwm-2.6.2.ebuild:
   Marking fvwm-2.6.2 ppc for bug 416213
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 33392573edef..6354feea37b3 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,8 +1,20 @@
-AUX README.translucency 3723 RMD160 f09c9cb205731ae97781dd8a59a9b1633851ef36 SHA1 d41ac01641797012ec9673d5233421d89914fb91 SHA256 099c57f9f323ba44e03b9edcfc17da7da08b0438dd5be3c6830f283030e75fe6
-AUX fvwm-2.5.27-translucent-menus.diff 15765 RMD160 5629e1fcd6d41e7c9f5cfa0a62204d33d83d5c6f SHA1 2ff0c394e1e393cab8249efeeddf917d07a7ba78 SHA256 ad59f0aa1b73fb128143bf5a390185289c296e0d31a4e6e6ca5f046f414752cf
-DIST fvwm-2.6.2.tar.bz2 2599652 RMD160 66ae6c9f9ac2d0ba6489f58d03ceceea8219aa57 SHA1 522e1fac1101de7825e792ba36bb956216f40fda SHA256 1df8a856c06518b7af4e6709928c35a4cc97b18bad5232ffa889640e54794148
-DIST fvwm-2.6.3.tar.bz2 2605294 RMD160 850f906ceaab88a383f01ec00489bd42a8b1374e SHA1 7a04dae0e4a17f4d908589e704b48246b7c05e39 SHA256 8299b8f8d712f95305e51d8e416e3788e35805adcc0bb2e5bcb6cc33db126152
-EBUILD fvwm-2.6.2.ebuild 4504 RMD160 e55731bb83fedbf0818281ec583f8246ec0e8ff4 SHA1 958bed4e72f0edfec1784deb6d7f720e65e1d4aa SHA256 698a15ab15d577430721267820cc6f5873f53bf6c5dd05270ca653fd3ee86dad
-EBUILD fvwm-2.6.3.ebuild 4496 RMD160 d7abc40a616ebb58d328df0e9c46362fbdfb82a6 SHA1 1f0d810ccd50fd52e8f8bbeda3274703a0d37db2 SHA256 286198af2c0afde55129c73dc6aa42014572f0195c4ca60bd8b6e01adf623121
-MISC ChangeLog 28718 RMD160 468d6d1de6332db6ef62f557da9abf7eaa9c8f86 SHA1 260a420b57d7447515298b046f6f5945cc628007 SHA256 d5a0d9dfaceac92606c59ab0d63faac5121b26343e202b69c0e2ef22344add67
-MISC metadata.xml 1030 RMD160 b260d643a074659f85850fa34e70bbd8c75bace1 SHA1 95ca4f850821b546bf56cc053bb800cbfe67c54e SHA256 2bc103425bb6eb407042640f5768da44c559fc1e14cd21b7670a0d7c63f823b0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX README.translucency 3723 SHA256 099c57f9f323ba44e03b9edcfc17da7da08b0438dd5be3c6830f283030e75fe6 SHA512 a64ef5147e52e07d4cec8a2f3ebd1340827d0139031ef7ddaf27fc144fcc58858c3ec40eee854034423f853b2c7bdd813f66236c8a9679977084f4a2176a8ffa WHIRLPOOL a7d04082474adba36ca85703b177ac1b9df12646018a76b31409f7bf94a380bb63c1d79b826546ec754ff644c9677273038c36da14f4c91d48cb74cc773694f4
+AUX fvwm-2.5.27-translucent-menus.diff 15765 SHA256 ad59f0aa1b73fb128143bf5a390185289c296e0d31a4e6e6ca5f046f414752cf SHA512 92f78b624ea2bfddb88f825f40930a0a7e4bb1d284276e62985f189cd5b72ee8a92131f7d2a91efdbf508fc8ef002f5b4168188b12b0e23e28fb1ebec471969d WHIRLPOOL 6a2b6cedf94c070a53401b94a66877514f81ce6924cac9bf66d56baeb5e4ed410d258bea5f129f48582290fe55cc513e766064f284d85eab0c4329a162e358db
+DIST fvwm-2.6.2.tar.bz2 2599652 SHA256 1df8a856c06518b7af4e6709928c35a4cc97b18bad5232ffa889640e54794148
+DIST fvwm-2.6.3.tar.bz2 2605294 SHA256 8299b8f8d712f95305e51d8e416e3788e35805adcc0bb2e5bcb6cc33db126152
+DIST fvwm-2.6.5.tar.bz2 2582655 SHA256 21549995c53906be5533746a1cf61b1ecf8dd8ef6816a0b20615d45ff78b48cf SHA512 a1b8cf5a5124b939441834a2fb44c885c579939e4099cf2c8178ea2c4261258df4e565068593699f9446e363135a2666c9288c1bce551a6cf5c6c79287104698 WHIRLPOOL 65ff02fb9f0c9ac5803a77be5b61621393ebb0a772acd32370c7796340726cbe3bfc125a56852272ec4fe619031bf12cb7fb8bc7ed1852b3addffaa355221e68
+EBUILD fvwm-2.6.2.ebuild 4504 SHA256 698a15ab15d577430721267820cc6f5873f53bf6c5dd05270ca653fd3ee86dad SHA512 997e93ceee5cb749a52d99af5365c786bc5493425133d2d69dfedca781259152aa7f5b9d2fbbb81dc5dbb54b6253eb22dff0f890215f6aaffa4607baa74fa122 WHIRLPOOL 90ac5f5f9e4ad105ef6f284e3ab31b1263ba07b05b46791f60a95c4995d5c41200c6b350aaf108dbf3f25dbf07edf461db04d7ffe8314c365899525a3738bab3
+EBUILD fvwm-2.6.3.ebuild 4496 SHA256 286198af2c0afde55129c73dc6aa42014572f0195c4ca60bd8b6e01adf623121 SHA512 70de9169b71af5dc0c7743ea3206b5bc00a7e54756be41e9c5d3e15701e3dbea82e30ff0eef5bea34e9ed72736fb7c1d4836becaa6dff70a720a7fb451738ac9 WHIRLPOOL cd2a22ce7efcbfc1126f2e6c71d6183100591ab98f57736af6f791c86213d71a9c4090a1f851e3fe5ba4ad7c067db4698ebe50a337ae95c51c32680ea0cfda92
+EBUILD fvwm-2.6.5.ebuild 4876 SHA256 661efa28e1378e9726e8af28222b9d7ab36e3a4145420dd16d13e8eccf9016d4 SHA512 158a1935ee739dea7679b6527a1432e69b12a61f4e291f3332eb0d86d3c18d640138c85ed37f8b714d01d7b96eddd8d3deba0f80a522816d27604c0d2630a670 WHIRLPOOL ab8cfcd3809d586617d2e3092eb74537873c804effffd6bf315d10662e5f56a547a13145786e775d6bfc150cd51b34a7182431c4ea15eafcec29bdabe7ca0df2
+MISC ChangeLog 29055 SHA256 4c4ce9ae1ab50aa50be6235d51921dd7918c73219ab77a78b7684ae3e0cd494d SHA512 eeef4cbfd9442cd843a1d6d0d50eb2019639be57b55e75ccbfe6ded457271431d6f2b64be215577672ce77c16a4bb7902ade28ecfca6d47fdc7b9a9b4cdcaac2 WHIRLPOOL 3fdcbb64d0b1cebea970f47b3472e6476dbe2b84eeacfe84c1afef5c11c13881b19f7f122b6a64c20880f5ad300ace5f72515d44ab96bcac56e00706d1f4f9e2
+MISC metadata.xml 1030 SHA256 2bc103425bb6eb407042640f5768da44c559fc1e14cd21b7670a0d7c63f823b0 SHA512 0b41cc8484cd64f8683e681ac627534dc291590a0166182c406c36cc58bde0ea1a0e90db4691e74f3b1864e8a24cd04607e5e33b610d3717089581e2cb5361f1 WHIRLPOOL 8cee93fa3fac0293af05db8b359f8c6102598f43dd5e8aa8a0155b73b74e0b1f2134f641ff6ac61678c684f995f6e92fac522e32cbb4141ca09ff06f12720e13
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlBxiG0ACgkQCaWpQKGI+9SVdACaA6WUcMZde6+wllU466JkIEwe
+L+wAnRDBQbc1IWa0dl63SrXnc54RqSIQ
+=sQ2N
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/fvwm/fvwm-2.6.5.ebuild b/x11-wm/fvwm/fvwm-2.6.5.ebuild
new file mode 100644
index 000000000000..92cd14b80cd5
--- /dev/null
+++ b/x11-wm/fvwm/fvwm-2.6.5.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.6.5.ebuild,v 1.1 2012/10/07 13:49:32 pacho Exp $
+
+EAPI=4
+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"
+
+LICENSE="GPL-2 FVWM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="bidi debug doc gtk2-perl netpbm nls perl png readline rplay stroke svg tk truetype +vanilla xinerama lock"
+
+COMMON_DEPEND="
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcursor
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	bidi? ( dev-libs/fribidi )
+	png? ( media-libs/libpng )
+	readline? (
+		sys-libs/ncurses
+		sys-libs/readline
+	)
+	stroke? ( dev-libs/libstroke )
+	svg? ( gnome-base/librsvg )
+	truetype? (
+		media-libs/fontconfig
+		x11-libs/libXft
+	)
+	xinerama? (
+		x11-proto/xineramaproto
+		x11-libs/libXinerama
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	gtk2-perl? ( dev-perl/gtk2-perl )
+	perl? ( tk? (
+			dev-lang/tk
+			dev-perl/perl-tk
+			>=dev-perl/X11-Protocol-0.56
+		)
+	)
+	rplay? ( media-sound/rplay )
+	lock? ( x11-misc/xlockmore )
+	userland_GNU? ( sys-apps/debianutils )
+	!x86-fbsd? ( netpbm? ( media-libs/netpbm ) )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	doc? ( dev-libs/libxslt )
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+src_prepare() {
+	if ! use vanilla; then
+		# Enables fast translucent menus; patch from fvwm-user mailing list.
+		epatch "${FILESDIR}/${PN}-2.5.27-translucent-menus.diff"
+
+		# Allow more mouse buttons, bug #411811
+		epatch "${FILESDIR}/${PN}-2.6.5-mouse-buttons.patch"
+
+		# Apply user-provided patches to the source tree, bug #411811
+		epatch_user
+	fi
+}
+
+src_configure() {
+	local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs --without-gnome"
+
+	# Non-upstream email where bugs should be sent; used in fvwm-bug.
+	export FVWM_BUGADDR="desktop-wm@gentoo.org"
+
+	# Recommended by upstream.
+	append-flags -fno-strict-aliasing
+
+	# Signed chars are required.
+	use ppc && append-flags -fsigned-char
+
+	myconf="${myconf} --disable-gtk"
+
+	use readline && myconf="${myconf} --without-termcap-library"
+
+	econf ${myconf} \
+		$(use_enable bidi) \
+		$(use_enable debug debug-msgs) \
+		$(use_enable debug command-log) \
+		$(use_enable doc htmldoc) \
+		$(use_enable nls) \
+		$(use_enable nls iconv) \
+		$(use_enable perl perllib) \
+		$(use_with png png-library) \
+		$(use_with readline readline-library) \
+		$(use_with rplay rplay-library) \
+		$(use_with stroke stroke-library) \
+		$(use_enable svg rsvg) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		--docdir="/usr/share/doc/${P}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${P}" install
+
+	# These are always removed, because gentoo doesn't have anymore
+	# a dev-perl/gtk-perl package, so, these modules are pointless.
+	rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm"
+	find "${D}" -name '*FvwmGtkDebug*' -exec rm -f '{}' \; 2>/dev/null
+
+	if ! use lock; then
+		find "${D}" -name '*fvwm-menu-xlock' -exec rm -f '{}' \; 2>/dev/null
+	fi
+
+	if use perl; then
+		if ! use tk; then
+			rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm"
+			if ! use gtk2-perl; then # no tk and no gtk2 bindings
+				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
+		fi
+
+		# Now, the Gtk2.pm file, it will require dev-perl/gtk2-perl
+		# so it implies gtk2 as well. That's why we need another use flag.
+		if ! use gtk2-perl; then
+			rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm"
+		fi
+	else
+		# Completely wipe it if ! use perl
+		rm -rf "${D}/usr/bin/fvwm-perllib" \
+			"${D}/usr/share/man/man1/fvwm-perllib.1"
+	fi
+
+	# Utility for testing FVWM behaviour by creating a simple window with
+	# configurable hints.
+	if use debug; then
+		dobin "${S}/tests/hints/hints_test"
+		newdoc "${S}/tests/hints/README" README.hints
+	fi
+
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/fvwm" > "${D}/etc/X11/Sessions/${PN}" || die
+	fperms a+x /etc/X11/Sessions/${PN} || die
+
+	dodoc AUTHORS ChangeLog NEWS README \
+		docs/{ANNOUNCE,BUGS,COMMANDS,CONVENTIONS} \
+		docs/{DEVELOPERS,error_codes,FAQ,TODO,fvwm.lsm}
+
+	# README file for translucent menus patch.
+	if ! use vanilla; then
+		dodoc "${FILESDIR}"/README.translucency
+		ewarn "You are using a patched build, so, please, don't"
+		ewarn "report bugs at the fvwm-workers list unless you are"
+		ewarn "also able to reproduce them with a vanilla build (USE=vanilla)."
+	fi
+}