From 267b3b848468a603048b181330ee73cf0bd99c44 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Mar 2024 07:00:36 +0000 Subject: gentoo auto-resync : 22:03:2024 - 07:00:36 --- x11-wm/Manifest.gz | Bin 9157 -> 9155 bytes x11-wm/fvwm/Manifest | 2 +- x11-wm/fvwm/fvwm-2.7.0-r2.ebuild | 171 ------------------------------- x11-wm/fvwm/fvwm-2.7.0-r3.ebuild | 170 +++++++++++++++++++++++++++++++ x11-wm/fvwm3/Manifest | 6 +- x11-wm/fvwm3/fvwm3-1.0.8.ebuild | 172 ------------------------------- x11-wm/fvwm3/fvwm3-1.0.9-r1.ebuild | 202 ++++++++++++++++++++++++++++++++++++ x11-wm/fvwm3/fvwm3-1.0.9.ebuild | 203 ------------------------------------- x11-wm/fvwm3/fvwm3-9999.ebuild | 3 +- 9 files changed, 376 insertions(+), 553 deletions(-) delete mode 100644 x11-wm/fvwm/fvwm-2.7.0-r2.ebuild create mode 100644 x11-wm/fvwm/fvwm-2.7.0-r3.ebuild delete mode 100644 x11-wm/fvwm3/fvwm3-1.0.8.ebuild create mode 100644 x11-wm/fvwm3/fvwm3-1.0.9-r1.ebuild delete mode 100644 x11-wm/fvwm3/fvwm3-1.0.9.ebuild (limited to 'x11-wm') diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz index 0993efbbe358..add5aa431722 100644 Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest index 31c6284f3621..0fc6e45a5b27 100644 --- a/x11-wm/fvwm/Manifest +++ b/x11-wm/fvwm/Manifest @@ -9,6 +9,6 @@ DIST fvwm-2.6.9.tar.gz 3942859 BLAKE2B 8faf2d420d96049ab0528a6c6a5dc6ed8ee9449f8 DIST fvwm-2.7.0.tar.gz 3933529 BLAKE2B b4be7083c2946cb2a0c48673271d490a49aba5aec8407169bedc5a35f55fe8cd2724a9f6570c5e7ea110652c04956570c874256f96fa5d920a2a1ede152c0c25 SHA512 fc9076c3f07f36b0b2c7c4d2bdf7bb1a711000e39316e327173548bc99dc2b8a29b591e3644e1492f87603b576cd4a3f58ecbdd84a4384d294417b3c56c81808 EBUILD fvwm-2.6.9.ebuild 4034 BLAKE2B 603b739468c0c94f41348b62014245fd465da01622079f0bbaa68f4f3c736bce79b716ad8a3d7d6787bcbf3245340827e6308f7a5e0948afaffc0c2566676a5b SHA512 2e30f69354c6070e8b47992435a8368bc636d50498cb90f4413328703b79c9f69d5e633df9c6056c2ef7e019db1d9e020e14bf0d2e6f254c1a96c94912a440f5 EBUILD fvwm-2.7.0-r1.ebuild 4207 BLAKE2B 9e5688558de8d59148f64192efb7af939b57196573fae988288aea1c7d083e9192e8abd659d580cf919166531218be5d1ad228501cefa347d808b0b0820341bd SHA512 45917c0c96c62574f88e8f8a95084a81df67360432e16a1f6edae99b297895108bf3b6ff42bdd350bf934a01d55e919ec3ecfc8254b94e769d0ccd8052fbcc79 -EBUILD fvwm-2.7.0-r2.ebuild 4206 BLAKE2B 278d410a18128eb3b377e4cfaf349b87380004b9e106835041f7f32921dae4b9ef7c3a97106375a5ff0dcbb9029480d78b0cbbd48469222598d8a117d60ff00c SHA512 0336a51e76ea913d6a0ba7ce9e9eeb67909f9a7e7f3dce5727529a279b3d580e308b067a6e2b0ac50e67cab9a24c76bba53badad7e48082cfb1ce4d38f575188 +EBUILD fvwm-2.7.0-r3.ebuild 4184 BLAKE2B 690924c7dcf481213605972cd6f49093524a80a47f7ddd9823753fb0321c385bc9c428800101c9c89286c93f480430ae518484afe8ff44b45a01359c7a1a55a2 SHA512 5e0138ba5ed8c09cc2c0f29c8b2135ed2a19de8a1dbf1051ec9d9790bd27c692385ef3f1cb183cc2654da3715f7af91210ada97b269bb9f3542fa882e6d9da9a EBUILD fvwm-2.7.0.ebuild 4256 BLAKE2B b88389581da14df1c3328b439068d619ce071d1a847d7259babe787e65a9e2851b310795aa1c93b6ecec766f515ad0792b33747358fb04979b82a2a2a60c87d1 SHA512 3f5956ae078e98839a50f09aa70a43e6f732a7fb7a3749032a43166fd57405f7f9363e12315d3c03ce81d3098495906f8f8ba1b72b2089a9e3201b4a02c8645a MISC metadata.xml 736 BLAKE2B c9ff0661b5a87747a83a9d0f88f2a994e23e9e741e669fab4bd42351f74eb9dd8d55ae7d9a56d3a865eef344484a489f08359cc0e44874787fed0538f977c159 SHA512 5b06fe1d24d811fe7c408f38849c06360a5e59d98e5076214cdf041f95f5ed5ae4b625331337ce7c0d00db62fd4db6ca78f6cb2902409f340ba47d8204ab5692 diff --git a/x11-wm/fvwm/fvwm-2.7.0-r2.ebuild b/x11-wm/fvwm/fvwm-2.7.0-r2.ebuild deleted file mode 100644 index 8f75a2f03ab7..000000000000 --- a/x11-wm/fvwm/fvwm-2.7.0-r2.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit autotools flag-o-matic python-single-r1 desktop - -DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager" -HOMEPAGE="https://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 ~riscv ~sparc ~x86" -IUSE="bidi debug doc netpbm nls perl png readline stroke svg tk truetype +vanilla xinerama lock" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -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 - $(python_gen_cond_dep ' - dev-python/pyxdg[${PYTHON_USEDEP}] - ') - 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} - ${PYTHON_DEPS} - dev-lang/perl - sys-apps/debianutils - perl? ( tk? ( - dev-lang/tk - dev-perl/Tk - >=dev-perl/X11-Protocol-0.56 - ) - ) - lock? ( x11-misc/xlockmore ) - netpbm? ( media-libs/netpbm ) -" -DEPEND="${COMMON_DEPEND} - x11-base/xorg-proto -" -BDEPEND=" - dev-lang/perl - dev-libs/libxslt - virtual/pkgconfig -" - -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 "${FILESDIR}"/fvwm-2.7.0-c99.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 - --enable-mandoc - --without-rplay-library - $(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 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 ) - - export ac_cv_path_PYTHON="${PYTHON}" - - 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 - - exeinto /etc/X11/Sessions - newexe - ${PN} <<-EOF - #!/bin/sh - ${PN} - EOF - - 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.7.0-r3.ebuild b/x11-wm/fvwm/fvwm-2.7.0-r3.ebuild new file mode 100644 index 000000000000..db5ff1d5566a --- /dev/null +++ b/x11-wm/fvwm/fvwm-2.7.0-r3.ebuild @@ -0,0 +1,170 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit autotools flag-o-matic python-single-r1 desktop + +DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager" +HOMEPAGE="https://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 ~riscv ~sparc ~x86" +IUSE="bidi debug doc netpbm nls perl png readline stroke svg tk truetype +vanilla xinerama lock" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +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 + $(python_gen_cond_dep ' + dev-python/pyxdg[${PYTHON_USEDEP}] + ') + 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} + ${PYTHON_DEPS} + dev-lang/perl + perl? ( tk? ( + dev-lang/tk + dev-perl/Tk + >=dev-perl/X11-Protocol-0.56 + ) + ) + lock? ( x11-misc/xlockmore ) + netpbm? ( media-libs/netpbm ) +" +DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto +" +BDEPEND=" + dev-lang/perl + dev-libs/libxslt + virtual/pkgconfig +" + +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 "${FILESDIR}"/fvwm-2.7.0-c99.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 + --enable-mandoc + --without-rplay-library + $(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 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 ) + + export ac_cv_path_PYTHON="${PYTHON}" + + 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 + + exeinto /etc/X11/Sessions + newexe - ${PN} <<-EOF + #!/bin/sh + ${PN} + EOF + + 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/fvwm3/Manifest b/x11-wm/fvwm3/Manifest index 38e2e2a9d447..bbf12639244d 100644 --- a/x11-wm/fvwm3/Manifest +++ b/x11-wm/fvwm3/Manifest @@ -1,8 +1,6 @@ AUX fvwm3-1.0.8-implicit-function-decl-configure.patch 471 BLAKE2B eb0eb437a35497f0d7584bc66c5969189fa2f75b48b7acf730656c0ecfce78f456a9771094431dc7e06e8b0d3d65fde473581660822406315a7491fd8288c21b SHA512 8164aa4fd4307a962d6030f44667789523a383e1eb83aae15aace762e6594351f00e368d2474cd86e39a637825c2696e773c9952bb65de934a624e726ec61069 -DIST fvwm3-1.0.8.tar.gz 5644021 BLAKE2B c2a0a4953f556f86128452c8b42d8f86e2a02c9314cca17688987a51ed91bb3ecccf29e77f2b01c7ed444b54f45e402859ed1cce39714ad6d47860f639509b80 SHA512 fef69b6d97b3533e6722b48336aa8904b399c42437c4adcab756edf55cf839126002255dfa268bf7159d3bb9caf4d44c43a9217c9df5dc6224cef8461ecf2c34 DIST fvwm3-1.0.9-docs.tar.xz 234884 BLAKE2B f52da9eb2486f7a212ead77ccc190c57076e1d3c73a3997c3a94edcf60dbc72ec5d410a8df1d621ff18b346741b1c94b3f87170db68c3067caa3295782a9bb61 SHA512 e6c33b09b7bac32bd61f1bd2c0216e2c99fef3f0b51b52b229093c25a437828e4bece382284d0c1f0bbbaf5b7459f2c391dfc1d2fa4ba80be22f09094e976b03 DIST fvwm3-1.0.9.tar.gz 4525552 BLAKE2B cb58181adb42f5b8d491c6413277eb1f4a5d89637d9c6bb323223925c719d808e84ed0f72a1d0ffc822ddb8295ebf2bb89c2351ebd591916b50ebc69728e59fa SHA512 de71d74b76da8e0cf1560d51ef916857e3f825b272d786d9b6b93aef9a82c399f580b9b941a47aff1f327b097d12e1ce05860924e792206e4150ff19a5c39ee3 -EBUILD fvwm3-1.0.8.ebuild 4099 BLAKE2B 54a80b1be91ab0ec12a745bdc9cd3c00b88562e8d7536ddd41ded261711b839012c67b501a9f743c9996e05441ec42fa16c7bc6fcc5c41e183dddb0173d99768 SHA512 5e422151abd092bfa974cba365bf9586502f3cae214387525b41237510bb57dcf0103283b3e4fb8310d05eb2dec0e943a0d743ba196f8134bd584947ee03c03f -EBUILD fvwm3-1.0.9.ebuild 4830 BLAKE2B 7d8c95e882f5079a2eff608b9a96371ba818ecdccd454de6c46c3b7621baabb297a4986f65bfca0e5e7685c83010e192e5c609e7c5ebc3ace6aecadb7a6ce38e SHA512 032c47726c5b79c288b64d18d2a9d89ece0735084cedf8f6ebfe70d104278ca03507f505cc8431102853e1b92718195c1af549892658400ed4186d035990a406 -EBUILD fvwm3-9999.ebuild 4853 BLAKE2B 22d3af6ec7b163d399f9115706e42d6ddbcf9868ca2293582ffe6c76cac875ea14ed62bba1e406d401a087d7e6e072d2410b2e2f7f2a0bb209a53ebbaa765d5c SHA512 48f31ee6dece2dada7886f22e2d228346095c1bef6f946770fbc63a1d6964248d8a8a8d8907cc1c274b1a78c475ee6f1ba6304898c087cc26a2bf421e626a2d7 +EBUILD fvwm3-1.0.9-r1.ebuild 4808 BLAKE2B 522e96330ee3730704e2544ab34a71816b5616e8565790cabacbb3a0ccfbebcf09d7b0e74acd289b1d092c9e828e58d995d6986257d32db55b58310b6aea866e SHA512 9a10669c760d02ac45339259c8d4c836dcb3cfcfaf368363838ba16bf415afc83bb20db326999d4a45c237771b0c617691d3639292517475b45961fe37174380 +EBUILD fvwm3-9999.ebuild 4831 BLAKE2B 56523fea4709d1472435de0020c8b79e6ff40c48e98077f03732cb6d0457bab3abbfc2d70efa8ddf6b7c7983796202852d62b32d5779eeb99e9dc0e1ce8edcc4 SHA512 59f40c3451d667e547767904ccbd9da4723fc61f20f7789904d083f4068f042489ff80d482202362550e3c8ccb800d54c4ff9590a2dc389ca0cab2f68998f084 MISC metadata.xml 1012 BLAKE2B 5c5d08f16521594e1425ca8efbe5162c72ce6aff0557c0c79f1e2717dfc77ba855f90c493b45ff361d2e75f00b17e549b6853ee660c77c57cdeadce1df223f32 SHA512 a53bdde33366823f867bcff8b6c90e3cae6e0808945278fd02928502fd38df9d699fa4ace2fe66c1524e74d256242202a2b3139deb1331b67ac72f2fd0e9608f diff --git a/x11-wm/fvwm3/fvwm3-1.0.8.ebuild b/x11-wm/fvwm3/fvwm3-1.0.8.ebuild deleted file mode 100644 index 3cbbc80a0860..000000000000 --- a/x11-wm/fvwm3/fvwm3-1.0.8.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -GO_OPTIONAL=1 -inherit autotools desktop flag-o-matic go-module python-single-r1 toolchain-funcs - -DESCRIPTION="A multiple large virtual desktop window manager derived from fvwm" -HOMEPAGE="https://www.fvwm.org/" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/fvwmorg/fvwm3.git" - EGIT_BRANCH="main" -else - SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~riscv" -fi - -LICENSE="GPL-2+ FVWM - go? ( Apache-2.0 BSD MIT )" -SLOT="0" -IUSE="bidi debug doc +go netpbm nls perl readline stroke svg tk lock" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE}" - -DOCS=( NEWS ) - -if [[ ${PV} == 9999 ]]; then - DOCS+=( - dev-docs/COMMANDS - dev-docs/DEVELOPERS.md - dev-docs/INSTALL.md - dev-docs/PARSING.md - dev-docs/TODO.md - dev-docs/NEW-COMMANDS.md - ) -fi - -BDEPEND=" - virtual/pkgconfig - doc? ( dev-libs/libxslt - dev-ruby/asciidoctor ) - app-arch/unzip - go? ( >=dev-lang/go-1.14 ) -" - -RDEPEND="${PYTHON_DEPS} - ${COMMON_DEPEND} - !x11-wm/fvwm - dev-lang/perl - dev-libs/glib:2 - dev-libs/libevent:= - media-libs/fontconfig - media-libs/libpng:= - sys-apps/debianutils - 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/libXft - x11-libs/libXpm - x11-libs/libXrandr - x11-libs/libXrender - bidi? ( dev-libs/fribidi ) - lock? ( x11-misc/xlockmore ) - netpbm? ( media-libs/netpbm ) - perl? ( tk? ( - dev-lang/tk - dev-perl/Tk - >=dev-perl/X11-Protocol-0.56 - ) - ) - readline? ( - sys-libs/ncurses:= - sys-libs/readline:= - ) - stroke? ( dev-libs/libstroke ) - svg? ( - gnome-base/librsvg:2 - x11-libs/cairo - )" - -DEPEND="${COMMON_DEPEND} - x11-base/xorg-proto" - -PATCHES=( - "${FILESDIR}/${P}-implicit-function-decl-configure.patch" -) - -src_prepare() { - default - use go && ( sed -e 's/GOFLAGS=-ldflags="-s -w"/GOFLAGS=/' \ - -i bin/FvwmPrompt/Makefile.am || die ) - - eautoreconf -} - -src_configure() { - # Non-upstream email where bugs should be sent; used in fvwm-bug. - export FVWM_BUGADDR="desktop-wm@nogentoo.org" - - # Recommended by upstream for release. Doesn't really matter for live ebuilds. - append-flags -fno-strict-aliasing - - # Signed chars are required. - for arch in arm arm64 ppc ppc64; do - use $arch && append-flags -fsigned-chars - done - - local myconf=( - --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm - --enable-package-subdirs - $(use_enable bidi) - $(use_enable doc mandoc) - $(use_enable go golang) - $(use_enable nls) - $(use_enable nls iconv) - $(use_enable perl perllib) - $(use_with readline readline-library) - $(use_enable svg rsvg) - --enable-png - ) - - use readline && myconf+=( --without-termcap-library ) - - econf "${myconf[@]}" -} - -src_compile() { - PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)" - if [[ ${PV} == *9999 ]]; then - use doc && emake -C doc - fi -} - -src_install() { - emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" datarootdir="/usr/share" install - - exeinto /etc/X11/Sessions - newexe - ${PN} <<-EOF - #!/bin/sh - ${PN} - EOF - - python_scriptinto "/usr/bin" - python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop" - einstalldocs - - make_session_desktop fvwm3 /usr/bin/fvwm3 -} - -pkg_postinst() { - if use go; then - ewarn "FvwmPrompt has been installed, it provides the functionality of both FvwmCommand and FvwmConsole." - ewarn "For compatibility with the existing fvwm2 configurations, the ebuild will install a FvwmCommand wrapper." - ewarn "If you need FvwmConsole, install ${PN} with USE=\"-go\";" - ewarn "however FvwmPrompt and FvwmCommand will not be installed." - else - ewarn "FvwmConsole has been installed, but FvwmCommand and FvwmPrompt are no longer included in this ebuild." - ewarn "If you need FvwmPrompt or FvwmCommand, install ${PN} with USE=\"go\"." - ewarn "In that case, FvwmPrompt will replace FvwmConsole and provide the same functionality in a more flexible way." - fi -} diff --git a/x11-wm/fvwm3/fvwm3-1.0.9-r1.ebuild b/x11-wm/fvwm3/fvwm3-1.0.9-r1.ebuild new file mode 100644 index 000000000000..104d32825e4e --- /dev/null +++ b/x11-wm/fvwm3/fvwm3-1.0.9-r1.ebuild @@ -0,0 +1,202 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Doc generation requires pulls in asciidoc/ruby, we'll prebuild docs +# for release ebuilds. +# Scripting for this is in sam-gentoo-scripts. +: ${FVWM3_DOCS_PREBUILT:=1} + +PYTHON_COMPAT=( python3_{10..12} ) +GO_OPTIONAL=1 +inherit autotools desktop flag-o-matic go-module python-single-r1 toolchain-funcs + +DESCRIPTION="A multiple large virtual desktop window manager derived from fvwm" +HOMEPAGE="https://www.fvwm.org/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/fvwmorg/fvwm3.git" + EGIT_BRANCH="main" +else + SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz" + if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then + SRC_URI+=" https://deps.gentoo.zip/x11-wm/fvwm3/${P}-docs.tar.xz" + fi + KEYWORDS="~amd64 ~riscv" +fi + +LICENSE="GPL-2+ FVWM + go? ( Apache-2.0 BSD MIT )" +SLOT="0" +IUSE="bidi debug +go netpbm nls perl readline stroke svg tk lock" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE}" + +DOCS=( NEWS ) + +if [[ ${PV} == 9999 ]]; then + DOCS+=( + dev-docs/COMMANDS + dev-docs/DEVELOPERS.md + dev-docs/INSTALL.md + dev-docs/PARSING.md + dev-docs/TODO.md + dev-docs/NEW-COMMANDS.md + ) +fi + +BDEPEND=" + virtual/pkgconfig + app-arch/unzip + go? ( >=dev-lang/go-1.14 ) +" + +if [[ ${FVWM3_DOCS_PREBUILT} == 0 ]]; then + BDEPEND+=" + dev-libs/libxslt + dev-ruby/asciidoctor + " +fi + +RDEPEND="${PYTHON_DEPS} + ${COMMON_DEPEND} + !x11-wm/fvwm + dev-lang/perl + dev-libs/glib:2 + dev-libs/libevent:= + media-libs/fontconfig + media-libs/libpng:= + 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/libXft + x11-libs/libXpm + x11-libs/libXrandr + x11-libs/libXrender + bidi? ( dev-libs/fribidi ) + lock? ( x11-misc/xlockmore ) + netpbm? ( media-libs/netpbm ) + perl? ( tk? ( + dev-lang/tk + dev-perl/Tk + >=dev-perl/X11-Protocol-0.56 + ) + ) + readline? ( + sys-libs/ncurses:= + sys-libs/readline:= + ) + stroke? ( dev-libs/libstroke ) + svg? ( + gnome-base/librsvg:2 + x11-libs/cairo + )" + +DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto" + +src_prepare() { + default + use go && ( sed -e 's/GOFLAGS=-ldflags="-s -w"/GOFLAGS=/' \ + -i bin/FvwmPrompt/Makefile.am || die ) + + eautoreconf +} + +src_configure() { + # Non-upstream email where bugs should be sent; used in fvwm-bug. + export FVWM_BUGADDR="desktop-wm@nogentoo.org" + + # Recommended by upstream for release. Doesn't really matter for live ebuilds. + append-flags -fno-strict-aliasing + + # Signed chars are required. + for arch in arm arm64 ppc ppc64; do + use $arch && append-flags -fsigned-chars + done + + local myconf=( + --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm + --enable-package-subdirs + $(use_enable bidi) + $(use_enable go golang) + $(use_enable nls) + $(use_enable nls iconv) + $(use_enable perl perllib) + $(use_with readline readline-library) + $(use_enable svg rsvg) + --enable-png + ) + + if [[ ${FVWM3_DOCS_PREBUILT} == 0 ]]; then + myconf+=( + --enable-mandoc + --enable-htmldoc + ) + else + # Probably not required, but let's be safe + myconf+=( + --disable-mandoc + --disable-htmldoc + ) + fi + + use readline && myconf+=( --without-termcap-library ) + + econf "${myconf[@]}" +} + +src_compile() { + PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)" +} + +src_install() { + # Since we're manually handling docs installation, let's do that first + # and then install the rest of the files via emake + local HTML_DOCS + if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]] ; then + doman "${WORKDIR}"/${P}-docs/man/**/*.[0-8] + HTML_DOCS="${WORKDIR}"/${P}-docs/html/* + else + HTML_DOCS="${S}"/doc/*.html + doman "${S}"/doc/*.[0-8] + fi + + einstalldocs + + emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" datarootdir="/usr/share" install + + exeinto /etc/X11/Sessions + newexe - ${PN} <<-EOF + #!/bin/sh + ${PN} + EOF + + python_scriptinto "/usr/bin" + python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop" + + make_session_desktop fvwm3 /usr/bin/fvwm3 + +} + +pkg_postinst() { + if use go; then + ewarn "FvwmPrompt has been installed, it provides the functionality of both FvwmCommand and FvwmConsole." + ewarn "For compatibility with the existing fvwm2 configurations, the ebuild will install a FvwmCommand wrapper." + ewarn "If you need FvwmConsole, install ${PN} with USE=\"-go\";" + ewarn "however FvwmPrompt and FvwmCommand will not be installed." + else + ewarn "FvwmConsole has been installed, but FvwmCommand and FvwmPrompt are no longer included in this ebuild." + ewarn "If you need FvwmPrompt or FvwmCommand, install ${PN} with USE=\"go\"." + ewarn "In that case, FvwmPrompt will replace FvwmConsole and provide the same functionality in a more flexible way." + fi +} diff --git a/x11-wm/fvwm3/fvwm3-1.0.9.ebuild b/x11-wm/fvwm3/fvwm3-1.0.9.ebuild deleted file mode 100644 index e6dec376c0e9..000000000000 --- a/x11-wm/fvwm3/fvwm3-1.0.9.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Doc generation requires pulls in asciidoc/ruby, we'll prebuild docs -# for release ebuilds. -# Scripting for this is in sam-gentoo-scripts. -: ${FVWM3_DOCS_PREBUILT:=1} - -PYTHON_COMPAT=( python3_{10..12} ) -GO_OPTIONAL=1 -inherit autotools desktop flag-o-matic go-module python-single-r1 toolchain-funcs - -DESCRIPTION="A multiple large virtual desktop window manager derived from fvwm" -HOMEPAGE="https://www.fvwm.org/" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/fvwmorg/fvwm3.git" - EGIT_BRANCH="main" -else - SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz" - if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then - SRC_URI+=" https://deps.gentoo.zip/x11-wm/fvwm3/${P}-docs.tar.xz" - fi - KEYWORDS="~amd64 ~riscv" -fi - -LICENSE="GPL-2+ FVWM - go? ( Apache-2.0 BSD MIT )" -SLOT="0" -IUSE="bidi debug +go netpbm nls perl readline stroke svg tk lock" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE}" - -DOCS=( NEWS ) - -if [[ ${PV} == 9999 ]]; then - DOCS+=( - dev-docs/COMMANDS - dev-docs/DEVELOPERS.md - dev-docs/INSTALL.md - dev-docs/PARSING.md - dev-docs/TODO.md - dev-docs/NEW-COMMANDS.md - ) -fi - -BDEPEND=" - virtual/pkgconfig - app-arch/unzip - go? ( >=dev-lang/go-1.14 ) -" - -if [[ ${FVWM3_DOCS_PREBUILT} == 0 ]]; then - BDEPEND+=" - dev-libs/libxslt - dev-ruby/asciidoctor - " -fi - -RDEPEND="${PYTHON_DEPS} - ${COMMON_DEPEND} - !x11-wm/fvwm - dev-lang/perl - dev-libs/glib:2 - dev-libs/libevent:= - media-libs/fontconfig - media-libs/libpng:= - sys-apps/debianutils - 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/libXft - x11-libs/libXpm - x11-libs/libXrandr - x11-libs/libXrender - bidi? ( dev-libs/fribidi ) - lock? ( x11-misc/xlockmore ) - netpbm? ( media-libs/netpbm ) - perl? ( tk? ( - dev-lang/tk - dev-perl/Tk - >=dev-perl/X11-Protocol-0.56 - ) - ) - readline? ( - sys-libs/ncurses:= - sys-libs/readline:= - ) - stroke? ( dev-libs/libstroke ) - svg? ( - gnome-base/librsvg:2 - x11-libs/cairo - )" - -DEPEND="${COMMON_DEPEND} - x11-base/xorg-proto" - -src_prepare() { - default - use go && ( sed -e 's/GOFLAGS=-ldflags="-s -w"/GOFLAGS=/' \ - -i bin/FvwmPrompt/Makefile.am || die ) - - eautoreconf -} - -src_configure() { - # Non-upstream email where bugs should be sent; used in fvwm-bug. - export FVWM_BUGADDR="desktop-wm@nogentoo.org" - - # Recommended by upstream for release. Doesn't really matter for live ebuilds. - append-flags -fno-strict-aliasing - - # Signed chars are required. - for arch in arm arm64 ppc ppc64; do - use $arch && append-flags -fsigned-chars - done - - local myconf=( - --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm - --enable-package-subdirs - $(use_enable bidi) - $(use_enable go golang) - $(use_enable nls) - $(use_enable nls iconv) - $(use_enable perl perllib) - $(use_with readline readline-library) - $(use_enable svg rsvg) - --enable-png - ) - - if [[ ${FVWM3_DOCS_PREBUILT} == 0 ]]; then - myconf+=( - --enable-mandoc - --enable-htmldoc - ) - else - # Probably not required, but let's be safe - myconf+=( - --disable-mandoc - --disable-htmldoc - ) - fi - - use readline && myconf+=( --without-termcap-library ) - - econf "${myconf[@]}" -} - -src_compile() { - PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)" -} - -src_install() { - # Since we're manually handling docs installation, let's do that first - # and then install the rest of the files via emake - local HTML_DOCS - if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]] ; then - doman "${WORKDIR}"/${P}-docs/man/**/*.[0-8] - HTML_DOCS="${WORKDIR}"/${P}-docs/html/* - else - HTML_DOCS="${S}"/doc/*.html - doman "${S}"/doc/*.[0-8] - fi - - einstalldocs - - emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" datarootdir="/usr/share" install - - exeinto /etc/X11/Sessions - newexe - ${PN} <<-EOF - #!/bin/sh - ${PN} - EOF - - python_scriptinto "/usr/bin" - python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop" - - make_session_desktop fvwm3 /usr/bin/fvwm3 - -} - -pkg_postinst() { - if use go; then - ewarn "FvwmPrompt has been installed, it provides the functionality of both FvwmCommand and FvwmConsole." - ewarn "For compatibility with the existing fvwm2 configurations, the ebuild will install a FvwmCommand wrapper." - ewarn "If you need FvwmConsole, install ${PN} with USE=\"-go\";" - ewarn "however FvwmPrompt and FvwmCommand will not be installed." - else - ewarn "FvwmConsole has been installed, but FvwmCommand and FvwmPrompt are no longer included in this ebuild." - ewarn "If you need FvwmPrompt or FvwmCommand, install ${PN} with USE=\"go\"." - ewarn "In that case, FvwmPrompt will replace FvwmConsole and provide the same functionality in a more flexible way." - fi -} diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild index fac3fd55cbca..d076b13c7a75 100644 --- a/x11-wm/fvwm3/fvwm3-9999.ebuild +++ b/x11-wm/fvwm3/fvwm3-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -69,7 +69,6 @@ RDEPEND="${PYTHON_DEPS} dev-libs/libevent:= media-libs/fontconfig media-libs/libpng:= - sys-apps/debianutils sys-libs/zlib x11-libs/libICE x11-libs/libSM -- cgit v1.2.3