From a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Apr 2018 20:02:04 +0100 Subject: gentoo resync : 28.04.2018 --- x11-wm/fvwm/Manifest | 2 +- x11-wm/fvwm/fvwm-2.6.5-r1.ebuild | 172 --------------------------------------- x11-wm/fvwm/fvwm-2.6.5-r2.ebuild | 169 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 170 insertions(+), 173 deletions(-) delete mode 100644 x11-wm/fvwm/fvwm-2.6.5-r1.ebuild create mode 100644 x11-wm/fvwm/fvwm-2.6.5-r2.ebuild (limited to 'x11-wm/fvwm') diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest index daf2e8f51cc1..4a30e035be4f 100644 --- a/x11-wm/fvwm/Manifest +++ b/x11-wm/fvwm/Manifest @@ -3,5 +3,5 @@ AUX fvwm-2.5.27-translucent-menus.diff 15765 BLAKE2B 85623d5d671d97842ffe819ddfa AUX fvwm-2.6.5-ar.patch 1077 BLAKE2B ebd3226a706087c7e7f7935a9862c59e628551e19be66d110441075839484b6bb26667104090258267b3e484c6fc0b0650349488902d216f3cf841c23e45b59e SHA512 fc66ee5c79b96860705d72b18aab3f8c8f8ad84fead47c4f8f944474a6bfbe0569ee08aa51e8a4d7982541eecd5c302499f99ebf8568f4b4fb1c9e2369233e45 AUX fvwm-2.6.5-mouse-buttons.patch 519 BLAKE2B 23b31933e9dcc456d73be15573226017fc213da59156040136ff447b208b45691fca00b5d16cdaf57ab8411e2834d759b3bb7e53550b13ec72de4b7f70486abb SHA512 d28a9724697859ca7beac1cc2813c12413654e1c0749297c34fb0ef8bbf97369ac8039d2a82ec673d885b39e1544259b70cecf292639caa9ff99c1b42d34c196 DIST fvwm-2.6.5.tar.bz2 2582655 BLAKE2B 02c6f3124c0bb2ffe5dd25c218e4137977030ee6e96c7d20517e10dc93b85b295d941c700786f53231045b1b76e6d069b0387942ccf55b8543b0efe9ae303520 SHA512 a1b8cf5a5124b939441834a2fb44c885c579939e4099cf2c8178ea2c4261258df4e565068593699f9446e363135a2666c9288c1bce551a6cf5c6c79287104698 -EBUILD fvwm-2.6.5-r1.ebuild 4840 BLAKE2B 44e4c8e28121b004c2a43c3e75816a4256881afab01eead66f0dc3fba05ca285d9fe536e9b94cd86c9d02485abf38cfd5f539a056665b95c2f3856e68297c99f SHA512 6330e511bac5e014fc3170a74d001cf9c1afea7b8c17fe0981ee2f42e59dd99fd8758c54d096b5655e1b3b698f5daf315e1853bd083b5fcaeb12a4e458eb3181 +EBUILD fvwm-2.6.5-r2.ebuild 4811 BLAKE2B 05828fa21464a072c6d383ebbea9abcd148ef1cecb42d8c561d8fde19e151e093f4b572302d66c2c0a5892bdcfe9018a34728ad0cda423da3d3fc0e2488ce429 SHA512 44991b5b512d6b449ddf3aa61a6f463c865db0c916f77f38da91282665622769a3ece2b12066c8f018a51e14a3ddeeedef2fafe188117ea054ca8eee06987380 MISC metadata.xml 765 BLAKE2B 003f88ef882dda6da8b314975c8f40ea450faff79e086f962946e3634ec8722dc8b0d821692d8daa4d80ac6025d9b7e21827e64ccca3407ea60a79c12d752b3f SHA512 0feb8344498792784c3d640455316527855b7d37f1e6d3109776bec2749b48819bcc6b88f55b214d6675eab671add82e9338c52817cf4e0b25a20ae390519581 diff --git a/x11-wm/fvwm/fvwm-2.6.5-r1.ebuild b/x11-wm/fvwm/fvwm-2.6.5-r1.ebuild deleted file mode 100644 index 202190bfb62f..000000000000 --- a/x11-wm/fvwm/fvwm-2.6.5-r1.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools 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:0= ) - readline? ( - sys-libs/ncurses:0= - sys-libs/readline:0= - ) - 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? ( tk? ( - dev-lang/tk - dev-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 - - epatch "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528 - eautoreconf -} - -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 - # 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 -} diff --git a/x11-wm/fvwm/fvwm-2.6.5-r2.ebuild b/x11-wm/fvwm/fvwm-2.6.5-r2.ebuild new file mode 100644 index 000000000000..c25e8794bf6c --- /dev/null +++ b/x11-wm/fvwm/fvwm-2.6.5-r2.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit autotools 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:0= ) + readline? ( + sys-libs/ncurses:0= + sys-libs/readline:0= + ) + stroke? ( dev-libs/libstroke ) + svg? ( gnome-base/librsvg ) + truetype? ( + media-libs/fontconfig + x11-libs/libXft + ) + xinerama? ( x11-libs/libXinerama ) +" +RDEPEND="${COMMON_DEPEND} + dev-lang/perl + gtk2-perl? ( dev-perl/Gtk2 ) + perl? ( tk? ( + dev-lang/tk + dev-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 + + epatch "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528 + eautoreconf +} + +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 + # 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 +} -- cgit v1.2.3