From eccb70a7f91b2d22582587f26d1a28bb31408b45 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 18 May 2019 00:10:51 +0100 Subject: gentoo resync : 18.05.2019 --- x11-wm/fvwm/Manifest | 6 +- x11-wm/fvwm/files/fvwm-2.6.8-perl528.patch | 15 +++ x11-wm/fvwm/fvwm-2.6.5-r2.ebuild | 168 ---------------------------- x11-wm/fvwm/fvwm-2.6.5-r3.ebuild | 169 +++++++++++++++++++++++++++++ x11-wm/fvwm/fvwm-2.6.8-r1.ebuild | 155 -------------------------- x11-wm/fvwm/fvwm-2.6.8-r2.ebuild | 158 +++++++++++++++++++++++++++ x11-wm/fvwm/fvwm-2.6.8.ebuild | 152 -------------------------- 7 files changed, 345 insertions(+), 478 deletions(-) create mode 100644 x11-wm/fvwm/files/fvwm-2.6.8-perl528.patch delete mode 100644 x11-wm/fvwm/fvwm-2.6.5-r2.ebuild create mode 100644 x11-wm/fvwm/fvwm-2.6.5-r3.ebuild delete mode 100644 x11-wm/fvwm/fvwm-2.6.8-r1.ebuild create mode 100644 x11-wm/fvwm/fvwm-2.6.8-r2.ebuild delete mode 100644 x11-wm/fvwm/fvwm-2.6.8.ebuild (limited to 'x11-wm/fvwm') diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest index 6220cc7eb8b5..b2c5e834ab49 100644 --- a/x11-wm/fvwm/Manifest +++ b/x11-wm/fvwm/Manifest @@ -2,9 +2,9 @@ AUX README.translucency 3723 BLAKE2B aae37e9dbdf8f7b730b6947d55f0e286c1269d5cacc AUX fvwm-2.5.27-translucent-menus.diff 15765 BLAKE2B 85623d5d671d97842ffe819ddfa1045b91ef76101ccf8cc6fdf4854c1675b397715977efafb174e340c487bafed12677a1cacb83e201424a9fed43bdfa7f8475 SHA512 92f78b624ea2bfddb88f825f40930a0a7e4bb1d284276e62985f189cd5b72ee8a92131f7d2a91efdbf508fc8ef002f5b4168188b12b0e23e28fb1ebec471969d 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 +AUX fvwm-2.6.8-perl528.patch 515 BLAKE2B 44df7b8aef71d85c3aefefb40ab45b9e6227ef6a13aaab60cec8956db669013b4ee4dc869216972e1a443d1f69e6550e7f80dc81cdf8b7642d6c49ae46793b2a SHA512 ab35b8aef3c6d8a07f1e03290c209736ee892729d98fece3d0134fd9994f8c57bdd5703492b405a6eb52cfcd67cd9cd72c16bc25a729a46560eb6e21f2d7918f DIST fvwm-2.6.5.tar.bz2 2582655 BLAKE2B 02c6f3124c0bb2ffe5dd25c218e4137977030ee6e96c7d20517e10dc93b85b295d941c700786f53231045b1b76e6d069b0387942ccf55b8543b0efe9ae303520 SHA512 a1b8cf5a5124b939441834a2fb44c885c579939e4099cf2c8178ea2c4261258df4e565068593699f9446e363135a2666c9288c1bce551a6cf5c6c79287104698 DIST fvwm-2.6.8.tar.gz 3915662 BLAKE2B 0b71182c5c0b5a07314fde8a673efe46712b92484e1164cd6357ad2e36e557dd822bf6c25d201092953ec10200bb0f93846af6cde0d701c65c81a4086de64652 SHA512 12e0def0a1d565c1c44356b48b4e516b7be4f51f13f91d9f8b89364ae106f6d7773e12fd17c71b6f0569c64fb3a5374c036c118cb76f739a63b1e17b5dfba287 -EBUILD fvwm-2.6.5-r2.ebuild 4793 BLAKE2B 10d28f244881fd41ba3ec89b36b25cffad5bb33daf609cfabe8f159a61307c4704c4652906a330c4df8f185497a3b5d288b2938707b8477683ae4abcc349ffcf SHA512 f30727158ce0f7962963396efe10c8b860516ef7413e9a10da1247d850f8ab3b2968860f1b7b45e5041fe045a6c51597c8bfd16575856c7e3d8665ffd0c43da5 -EBUILD fvwm-2.6.8-r1.ebuild 4081 BLAKE2B 49cb162bd5f249f556043369657e895c4e7a39759936e223531b873539effe9690d7e23b1a9937abba673f65878264b80b39568e56a53d65592b4a255d83f561 SHA512 cf138e0c8477d0166b8b9695c218e277d52ed1ed80b1d07bbe0071014dc1fb7b4018026c86de03302afdc6709645a47d149f247dbc9820d91c50889ff6103053 -EBUILD fvwm-2.6.8.ebuild 4030 BLAKE2B 34e314c8d5eec26e851bc6590b33814ab9d7cc4902a000c92f782133f48fdae50c67916cb93f39adf26cb73b5e767ff4c2479abdb9fef634b629ebf488e99877 SHA512 03e7d5d30383bd81c533a642d92fc78d8ce5e1ed9db11859c5c3c24b8b035e1eb2343dade1cb5d87500e87ab568aff4713dec8b0fc0c3e72bc1e9bfcef867f9e +EBUILD fvwm-2.6.5-r3.ebuild 4846 BLAKE2B 69d879a5d907e4f6b449fb4e5ff1b43a7cf136b68f7fa4e7f05b3e424183c74185630f11537db583653850c9d557ca75350e4017aa3431ae5a8735dddc2915e6 SHA512 600da4d0d08b08a6775a6ed2cbc2c4aeb8024bfe0973b8cdd2d434bd2fbf340a0b4f179d41206baf5c632590832bd94c66515a316cd5af5385d966904f84248a +EBUILD fvwm-2.6.8-r2.ebuild 4155 BLAKE2B 314c6982645449e98021bc7c9a6830f41d3ce2b60a5ad33147b985c3e668ba6a07878b12c15be803b100f3e002dc80a9c985ed5c805aed196bdfb12ccd110f62 SHA512 28795e230d8ce1038c639e538821d214ba4e90d351a1d21ee74e3ad4117a2345984995d3227a50d4a43aa081dc8e4f8f32203e2d91f553ae475df2172acf488e MISC metadata.xml 765 BLAKE2B 003f88ef882dda6da8b314975c8f40ea450faff79e086f962946e3634ec8722dc8b0d821692d8daa4d80ac6025d9b7e21827e64ccca3407ea60a79c12d752b3f SHA512 0feb8344498792784c3d640455316527855b7d37f1e6d3109776bec2749b48819bcc6b88f55b214d6675eab671add82e9338c52817cf4e0b25a20ae390519581 diff --git a/x11-wm/fvwm/files/fvwm-2.6.8-perl528.patch b/x11-wm/fvwm/files/fvwm-2.6.8-perl528.patch new file mode 100644 index 000000000000..5735fb1f89b7 --- /dev/null +++ b/x11-wm/fvwm/files/fvwm-2.6.8-perl528.patch @@ -0,0 +1,15 @@ +--- modules/FvwmPerl/FvwmPerl.in 2018-04-28 07:46:28.000000000 -0400 ++++ modules/FvwmPerl/FvwmPerl.in 2019-01-06 20:44:59.035950968 -0500 +@@ -319,11 +319,11 @@ + $FVWM_DATADIR = $FVWM_DATADIR || $module->site_data_dir; + $FVWM_USERDIR = $FVWM_USERDIR || $module->user_data_dir; + } + + # perl code substitution first +- $$text_ref =~ s/\Q$quote1\E { ( .*? ) } \Q$quote2\E/ ++ $$text_ref =~ s/\Q$quote1\E \{ ( .*? ) \} \Q$quote2\E/ + my $result = eval " + no strict; + package PreprocessNamespace; + $1 + "; diff --git a/x11-wm/fvwm/fvwm-2.6.5-r2.ebuild b/x11-wm/fvwm/fvwm-2.6.5-r2.ebuild deleted file mode 100644 index 9f65b7d88423..000000000000 --- a/x11-wm/fvwm/fvwm-2.6.5-r2.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2018 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 - x11-base/xorg-proto - doc? ( dev-libs/libxslt ) -" - -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-r3.ebuild b/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild new file mode 100644 index 000000000000..9cb180c1f0c3 --- /dev/null +++ b/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2019 Gentoo Authors +# 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 + x11-base/xorg-proto + doc? ( dev-libs/libxslt ) +" + +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 + epatch "${FILESDIR}/${PN}-2.6.8-perl528.patch" #674742 + 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.8-r1.ebuild b/x11-wm/fvwm/fvwm-2.6.8-r1.ebuild deleted file mode 100644 index ffbb42db076a..000000000000 --- a/x11-wm/fvwm/fvwm-2.6.8-r1.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic desktop - -DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager" -HOMEPAGE="http://www.fvwm.org/" -SRC_URI="https://github.com/fvwmorg/fvwm/releases/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-2 FVWM" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="bidi debug doc 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 - virtual/libiconv - bidi? ( dev-libs/fribidi ) - nls? ( virtual/libintl ) - 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 - 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 - x11-base/xorg-proto - doc? ( dev-libs/libxslt ) -" - -src_prepare() { - if ! use vanilla; then - # Enables fast translucent menus; patch from fvwm-user mailing list. - eapply -p0 "${FILESDIR}/${PN}-2.5.27-translucent-menus.diff" - - # Allow more mouse buttons, bug #411811 - eapply -p0 "${FILESDIR}/${PN}-2.6.5-mouse-buttons.patch" - fi - - eapply -p0 "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528 - - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --libexecdir="${EPREFIX}"/usr/$(get_libdir) - --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm - --enable-iconv - --enable-package-subdirs - --docdir="/usr/share/doc/${P}" - $(use_enable bidi) - $(use_enable debug debug-msgs) - $(use_enable debug command-log) - $(use_enable doc htmldoc) - $(use_enable nls) - $(use_enable perl perllib) - $(use_enable png) - $(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) - ) - - # Non-upstream email where bugs should be sent; used in fvwm-bug. - export FVWM_BUGADDR="maintainer-needed@gentoo.org" - - # Recommended by upstream, reference ???? - append-flags -fno-strict-aliasing - - # Signed chars are required. - use ppc && append-flags -fsigned-char - - use readline && myeconfargs+=( --without-termcap-library ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - make_session_desktop fvwm /usr/bin/fvwm - - 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 "${D}"/usr/share/fvwm/perllib/FVWM/Module/Tk.pm || die - rm "${D}"/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm || die - find "${D}"/usr/share/fvwm/perllib -depth -type d -exec rmdir '{}' \; 2>/dev/null - fi - else - # Completely wipe it if ! use perl - rm -r "${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 docs/{COMMANDS,DEVELOPERS.md} - - # 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.8-r2.ebuild b/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild new file mode 100644 index 000000000000..02edbfa8a8f9 --- /dev/null +++ b/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools flag-o-matic desktop + +DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager" +HOMEPAGE="http://www.fvwm.org/" +SRC_URI="https://github.com/fvwmorg/fvwm/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-2 FVWM" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="bidi debug doc 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 + virtual/libiconv + bidi? ( dev-libs/fribidi ) + nls? ( virtual/libintl ) + 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 + 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 + x11-base/xorg-proto + doc? ( dev-libs/libxslt ) +" + +src_prepare() { + if ! use vanilla; then + # Enables fast translucent menus; patch from fvwm-user mailing list. + eapply -p0 "${FILESDIR}/${PN}-2.5.27-translucent-menus.diff" + + # Allow more mouse buttons, bug #411811 + eapply -p0 "${FILESDIR}/${PN}-2.6.5-mouse-buttons.patch" + fi + + eapply -p0 "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528 + + # Fix for Perl 5.28 + eapply -p0 "${FILESDIR}/${PN}-2.6.8-perl528.patch" + + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + --libexecdir="${EPREFIX}"/usr/$(get_libdir) + --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm + --enable-iconv + --enable-package-subdirs + --docdir="/usr/share/doc/${P}" + $(use_enable bidi) + $(use_enable debug debug-msgs) + $(use_enable debug command-log) + $(use_enable doc htmldoc) + $(use_enable nls) + $(use_enable perl perllib) + $(use_enable png) + $(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) + ) + + # Non-upstream email where bugs should be sent; used in fvwm-bug. + export FVWM_BUGADDR="maintainer-needed@gentoo.org" + + # Recommended by upstream, reference ???? + append-flags -fno-strict-aliasing + + # Signed chars are required. + use ppc && append-flags -fsigned-char + + use readline && myeconfargs+=( --without-termcap-library ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + make_session_desktop fvwm /usr/bin/fvwm + + 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 "${D}"/usr/share/fvwm/perllib/FVWM/Module/Tk.pm || die + rm "${D}"/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm || die + find "${D}"/usr/share/fvwm/perllib -depth -type d -exec rmdir '{}' \; 2>/dev/null + fi + else + # Completely wipe it if ! use perl + rm -r "${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 docs/{COMMANDS,DEVELOPERS.md} + + # 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.8.ebuild b/x11-wm/fvwm/fvwm-2.6.8.ebuild deleted file mode 100644 index b6a281cf445b..000000000000 --- a/x11-wm/fvwm/fvwm-2.6.8.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools flag-o-matic desktop - -DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager" -HOMEPAGE="http://www.fvwm.org/" -SRC_URI="https://github.com/fvwmorg/fvwm/releases/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-2 FVWM" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="bidi debug doc 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 - 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 - x11-base/xorg-proto - doc? ( dev-libs/libxslt ) -" - -src_prepare() { - if ! use vanilla; then - # Enables fast translucent menus; patch from fvwm-user mailing list. - eapply -p0 "${FILESDIR}/${PN}-2.5.27-translucent-menus.diff" - - # Allow more mouse buttons, bug #411811 - eapply -p0 "${FILESDIR}/${PN}-2.6.5-mouse-buttons.patch" - fi - - eapply -p0 "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528 - eapply_user - eautoreconf -} - -src_configure() { - local myeconfargs=( - --libexecdir="${EPREFIX}"/usr/$(get_libdir) - --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm - --enable-package-subdirs - --docdir="/usr/share/doc/${P}" - $(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_enable png) - $(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) - ) - - # 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 - - use readline && myeconfargs+=( --without-termcap-library ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - make_session_desktop fvwm /usr/bin/fvwm - - 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 "${D}"/usr/share/fvwm/perllib/FVWM/Module/Tk.pm || die - rm "${D}"/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm || die - find "${D}"/usr/share/fvwm/perllib -depth -type d -exec rmdir '{}' \; 2>/dev/null - fi - else - # Completely wipe it if ! use perl - rm -r "${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 docs/{COMMANDS,DEVELOPERS.md} - - # 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