diff -U3 -r -N /var/portage/x11-wm/fvwm/ChangeLog /var/portage/local/x11-wm/fvwm/ChangeLog --- /var/portage/x11-wm/fvwm/ChangeLog 2011-12-07 08:50:39.000000000 +0100 +++ /var/portage/local/x11-wm/fvwm/ChangeLog 2012-04-15 23:57:56.316606755 +0200 @@ -2,6 +2,11 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.185 2011/12/07 07:50:39 phajdan.jr Exp $ + 15 Apr 2012; Jesús Guerrero fvwm-2.6.4.ebuild: + version bump by Jesús Guerrero, bug 412079 + USE=vanilla is now default + ewarn not to report bugs upstream unless USE=vanilla is set + 07 Dec 2011; Pawel Hajdan jr fvwm-2.6.3.ebuild: x86 stable wrt bug #392411 diff -U3 -r -N /var/portage/x11-wm/fvwm/fvwm-2.6.4.ebuild /var/portage/local/x11-wm/fvwm/fvwm-2.6.4.ebuild --- /var/portage/x11-wm/fvwm/fvwm-2.6.4.ebuild 1970-01-01 01:00:00.000000000 +0100 +++ /var/portage/local/x11-wm/fvwm/fvwm-2.6.4.ebuild 2012-04-15 23:53:45.823280023 +0200 @@ -0,0 +1,165 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.6.3.ebuild,v 1.3 2011/12/07 07:50:39 phajdan.jr Exp $ + +EAPI=2 + +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} + dev-util/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" + 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 || die + + # 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 "ever dare to report bugs at the fvwm-workers list" + ewarn "unless you are also able to reproduce them with a" + ewarn "vanilla build (USE=vanilla)." + fi +} diff -U3 -r -N /var/portage/x11-wm/fvwm/Manifest /var/portage/local/x11-wm/fvwm/Manifest --- /var/portage/x11-wm/fvwm/Manifest 2011-12-07 08:50:46.000000000 +0100 +++ /var/portage/local/x11-wm/fvwm/Manifest 2012-04-15 23:58:00.239939984 +0200 @@ -1,18 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - 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 +DIST fvwm-2.6.3.tar.bz2 464826 RMD160 df5d72644cdbd5268f8ebf5e07855fdbef94be5f SHA1 20a1665c3f8ef420332aae321f62c51dfe6c10f6 SHA256 d4c220ae8782fcfd9ad71b123866a165da6e583c6acc225a3fffa8488ee886f7 +DIST fvwm-2.6.4.tar.bz2 2608895 RMD160 84e5aadbc0a826caba5f5078275dd36b3f69dc8f SHA1 635b803de5af8677c7f5b91a82b450799cfe3ce2 SHA256 ebf217cfcd19559559b330d8e1e8e49422dbfc0bc5340c146de8e7355bdc6f11 EBUILD fvwm-2.6.2.ebuild 4506 RMD160 c3959851e36065c38b598dae3bc83e58f31b20a9 SHA1 ac3aedb421352676c2095b905f7610f156d210b7 SHA256 a829aa8e023692f5612bfe4310ac1f4ee3c26511727ebc4b6eb9e80c93605ae9 EBUILD fvwm-2.6.3.ebuild 4501 RMD160 b34c2d1f590d133f805ce4304620f54434480c7a SHA1 2423f2bbe65aba6746398157af9884168bfe8cc5 SHA256 f6b72345b6313399e51fa9ce20d97130f0ec2d9d84e5294b936e1c4befcb97fa -MISC ChangeLog 28483 RMD160 316eed13b144d783c1475eb2798aefbbe7ea82a2 SHA1 98e4b94bd7b6956a882ab347d53f8076e3e0c03c SHA256 e193e1b46d94cc693863f0ffde3359861db3cc19d39b18db4b5eeceb3223533a -MISC metadata.xml 1030 RMD160 b260d643a074659f85850fa34e70bbd8c75bace1 SHA1 95ca4f850821b546bf56cc053bb800cbfe67c54e SHA256 2bc103425bb6eb407042640f5768da44c559fc1e14cd21b7670a0d7c63f823b0 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEAREKAAYFAk7fGtYACgkQuUQtlDBCeQIOtgCfSksOdwvPXCbSNQ/b+PDlDUMa -zFwAn3lM7E9fwSbyA0xFkICeNGhhXydi -=us4z ------END PGP SIGNATURE----- +EBUILD fvwm-2.6.4.ebuild 4734 RMD160 26b5e5e7e6fa30bfadfdfe3ae27bb1091f4ffc8e SHA1 2f6679a1a091c1c0adcb31c1ab5427af204eee67 SHA256 11f37fac59a4d5669a6cb30635ce4fecc211b7ab0fca25b1db30e58a933a027c +MISC ChangeLog 28693 RMD160 ebbccd2572f82b0d7d777638cbf4e03ec7243734 SHA1 9490a0f7866d1c3ae4c1ae4304b66c9329f9630a SHA256 f981055932acf94a087460659f57e59e387ee6b92f37002a4db6c2ff59233bab +MISC metadata.xml 1110 RMD160 39f9e9b85ed0c925add2988c46716ac9e86f3943 SHA1 df302844bae7b19fb02e0d0ba344d7635c0fec44 SHA256 79f639ded53fac67326040c3a931a7d56db271d46796e7c4d14833747017f0e3 diff -U3 -r -N /var/portage/x11-wm/fvwm/metadata.xml /var/portage/local/x11-wm/fvwm/metadata.xml --- /var/portage/x11-wm/fvwm/metadata.xml 2009-07-08 15:09:19.000000000 +0200 +++ /var/portage/local/x11-wm/fvwm/metadata.xml 2012-04-15 23:55:40.013277013 +0200 @@ -22,5 +22,6 @@ Enable NetPBM support (used by FvwmScript-ScreenDump) Enable rplay support Mouse Gesture support + Build from unpatched sources (as from upstream)