From 9803adec3167bf3bec60009bfe7f0d4753608a8c Mon Sep 17 00:00:00 2001 From: Jeremy Olexa Date: Sat, 1 Oct 2011 03:42:32 +0000 Subject: [PATCH] =?utf8?q?version=20bump=20by=20Jes=C3=BAs=20Guerrero,=20b?= =?utf8?q?ug=20385145?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Package-Manager: portage-2.1.10.20/cvs/Linux x86_64 --- x11-wm/fvwm/ChangeLog | 7 +- x11-wm/fvwm/Manifest | 4 +- x11-wm/fvwm/fvwm-2.6.3.ebuild | 159 ++++++++++++++++++++++++++++++++++ 3 files changed, 168 insertions(+), 2 deletions(-) create mode 100644 x11-wm/fvwm/fvwm-2.6.3.ebuild diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog index 09e18a2f510a..3c407dc3c3bd 100644 --- a/x11-wm/fvwm/ChangeLog +++ b/x11-wm/fvwm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-wm/fvwm # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.178 2011/08/08 15:43:03 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.179 2011/10/01 03:42:32 darkside Exp $ + +*fvwm-2.6.3 (01 Oct 2011) + + 01 Oct 2011; Jeremy Olexa +fvwm-2.6.3.ebuild: + version bump by Jesús Guerrero, bug 385145 *fvwm-2.6.2 (08 Aug 2011) diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest index b729c7fe85ad..a854ea3829e9 100644 --- a/x11-wm/fvwm/Manifest +++ b/x11-wm/fvwm/Manifest @@ -4,8 +4,10 @@ AUX fvwm-2.5.28-libpng14.patch 1515 RMD160 2df72393e96515f90bb53c125f06e57fbf11e DIST fvwm-2.5.28.tar.bz2 2521994 RMD160 6df61b9b6477ff35b1b9d4f915c3241ead1a4fa1 SHA1 26b83b88656faa3d21ab55544269954e534abe08 SHA256 37a90e443b7f9388d6e696f7be37104ab9ba27194a1008d45ea489c0d906d9fb DIST fvwm-2.5.31.tar.bz2 2575660 RMD160 1361aec9b2738f8f00d3a8a2798d6535b41e8c39 SHA1 0a59ac1c17f37dbfb1e042f4df3f86a5eb2d719c SHA256 097abb17e2f13f9c1c42b4be4014a3d901bca8fea2dcd6c554e5ee6c2b598e2a 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.5.28.ebuild 4630 RMD160 6cedc9e822d48b6fbeeebf22cd3a07588336539d SHA1 47787546b9333d991800b1a1dfebdeb3d50c2a07 SHA256 804bbae59f12250aba84a8199bdf954c479d3935142b023a35dca44b68ffef0e EBUILD fvwm-2.5.31.ebuild 4497 RMD160 f591cbf115b02a05b4e11cfda03e278176810eca SHA1 18f227ea463e7ab7d8159d3edbb91e3c3a6ea958 SHA256 fe29e6047f17d0af8313dda7d925e48270d54e46ce38b01e248c69e6494c73de EBUILD fvwm-2.6.2.ebuild 4501 RMD160 cd01da5f925db4e69fbd87fba48fd4e521ac4c18 SHA1 09aa0aa0b9432840656eb48e054d5cdf04c470d6 SHA256 f873e80398db1aa262194f98b1848e0d5d2cd122b105871b7298a5accd42bdc7 -MISC ChangeLog 27588 RMD160 320b69ba76df07f98923222128fee46c410df450 SHA1 11af9c3517a533a0aabea5abed19425ebf46aa77 SHA256 de8868a7b95f5ca7434d252ef8eecc8d9d1a4adbbc6c826606cdce097bc7aeaa +EBUILD fvwm-2.6.3.ebuild 4501 RMD160 4cabd2782d8feeabba37214f4a0c818a45a20deb SHA1 8bfc5f34bad512eaaba0b4d28ab941ef7795a4ef SHA256 fe198df47bf9b544e7da9f5936e7423565cdb1b86f130da631d427b8759b87d3 +MISC ChangeLog 27732 RMD160 a7cdc8da2109bc6a29d53c60bb74414e586ef313 SHA1 7ebed63060e12a89e5a58fe71d13d657f683185d SHA256 4597bde486f28cf028730cc493f13292434db5299754efa80e3c4477bdd0be0e MISC metadata.xml 1030 RMD160 b260d643a074659f85850fa34e70bbd8c75bace1 SHA1 95ca4f850821b546bf56cc053bb800cbfe67c54e SHA256 2bc103425bb6eb407042640f5768da44c559fc1e14cd21b7670a0d7c63f823b0 diff --git a/x11-wm/fvwm/fvwm-2.6.3.ebuild b/x11-wm/fvwm/fvwm-2.6.3.ebuild new file mode 100644 index 000000000000..4ba1c510a674 --- /dev/null +++ b/x11-wm/fvwm/fvwm-2.6.3.ebuild @@ -0,0 +1,159 @@ +# 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.1 2011/10/01 03:42:32 darkside 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. + use vanilla || dodoc "${FILESDIR}"/README.translucency +} -- 2.26.2