From e860dfa5acdb67f8e2b8938b005dbaaaaf2c984a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 31 Jan 2023 15:02:11 +0000 Subject: gentoo auto-resync : 31:01:2023 - 15:02:11 --- x11-wm/herbstluftwm/Manifest | 2 +- x11-wm/herbstluftwm/herbstluftwm-0.9.5-r1.ebuild | 146 +++++++++++++++++++++++ x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild | 141 ---------------------- 3 files changed, 147 insertions(+), 142 deletions(-) create mode 100644 x11-wm/herbstluftwm/herbstluftwm-0.9.5-r1.ebuild delete mode 100644 x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild (limited to 'x11-wm/herbstluftwm') diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest index eb126f46e3e2..13c3154e20e2 100644 --- a/x11-wm/herbstluftwm/Manifest +++ b/x11-wm/herbstluftwm/Manifest @@ -1,4 +1,4 @@ DIST herbstluftwm-0.9.5.tar.gz 556773 BLAKE2B db851f02ce249be74f0104dd0b335fb1ed50b4a19e5f7de17cdc34b7eba99ac2f348c5a4a4e0afd2c68576f650029203c735ccb293a60d321769d56f746d6593 SHA512 a85fd1ab16b873f512d6965cc4a93524e3ed4a15079d0d4ee54012e217bd41db3b54729c1b30ee361c34b38799f95bc537099056ba7a5f791bf2be6724bc92c3 -EBUILD herbstluftwm-0.9.5.ebuild 2992 BLAKE2B 72d653974516d0287ed3867ad139eb6dafb3b221369047d6c8574fb1f0048f0edd2f376da19e6153c2d4e344432cd97034233939aee5d3ecf61862e8070f1bd2 SHA512 cafb4c1db100bf654753d55776eefc2e7302a7a65a29cfe85ca881fc62a2a23b651cd108372badfa0d890dbf78a5c337cda69a78dc2897a146ea9d6b22024f64 +EBUILD herbstluftwm-0.9.5-r1.ebuild 3242 BLAKE2B d28d4dd3aabea977348879cef55e1c6dce4424fa495c9b1e9f0d45fb03416c15944d03c0eee0dd160c548fe8d4e7382b68b41569a996b11d7f80a94451639f52 SHA512 d209b8184de9f9bb93fd2f23cddc0f51ec2f69bdcc398e3d5f4d792205f382bca39e0395c02cbcc7105753d1b5ea5cb4a84a3141fcf24deada3f4bbf6e18b367 EBUILD herbstluftwm-9999.ebuild 3406 BLAKE2B 8fbd649e820dfc4aeef6dcf270f8465760acb4d4155e6b3a783a4e6e09e154a02383478cdda776224dc1420d7f45d8365e0614f53315bf05a90e3baeecac2250 SHA512 a0f3e12ac7c1535c0092ab40f36faa42038355f15d3f8651acb182b86118d8efb8935594a31c75cfa350781de63a158d194bedf910721b9e85bdd098138b4613 MISC metadata.xml 337 BLAKE2B 7ef28bc6ce30abb6c2f44524b4dd05a479cd5ca2b98901ffe570b870d0b98f94589cd1d3f197ee7e3fd90f4c73144e1dc44996df8b1b3ec28ce6950578ada74e SHA512 6e7cb80e1870901554ac0c2a4947cceb4e6284ccc84714bb0f42dbfa69cab5b32a8bd34fd384731b9462535d7e80feef606030be3e03babc80828a980050f333 diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r1.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r1.ebuild new file mode 100644 index 000000000000..27636824401a --- /dev/null +++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r1.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_OPTIONAL=1 + +inherit cmake desktop distutils-r1 + +DESCRIPTION="A manual tiling window manager for X" +HOMEPAGE="https://herbstluftwm.org/" + +if [[ "${PV}" == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then + EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm" + inherit git-r3 +else + SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz" + KEYWORDS="amd64 x86" +fi + +LICENSE="BSD-2" +SLOT="0" +IUSE="+doc python test" +RESTRICT="!test? ( test )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +COMMON_DEPEND=" + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXft + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender +" +DEPEND=" + ${COMMON_DEPEND} + test? ( + dev-python/ewmh + dev-python/python-xlib + x11-apps/xsetroot + x11-base/xorg-server[xephyr,xvfb] + x11-misc/xdotool + x11-terms/xterm + ) +" +RDEPEND=" + ${COMMON_DEPEND} + app-shells/bash + python? ( ${PYTHON_DEPS} ) +" +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig +" + +if [[ -n "${EGIT_REPO_URI}" ]]; then + # Herbstluftwm tarballs ship with pre-compiled documentation, only + # if we build from git asciidoc is needed. + BDEPEND+=" doc? ( app-text/asciidoc )" +fi + +src_prepare() { + # Do not install LICENSE and respect CMAKE_INSTALL_DOCDIR. + sed -i \ + -e '/^install.*LICENSEDIR/d' \ + -e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \ + CMakeLists.txt || die + cmake_src_prepare + + if use python; then + pushd "${S}"/python > /dev/null || die + distutils-r1_src_prepare + popd > /dev/null || die + fi +} + +src_configure() { + # Ensure that 'python3' is in PATH. #765118 + python_setup + + local mycmakeargs=( + -DWITH_DOCUMENTATION=$(usex doc) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use python; then + pushd python > /dev/null || die + distutils-r1_src_compile + popd >/dev/null || die + fi +} + +src_install() { + cmake_src_install + + if ! use doc; then + rm -r "${ED}"/usr/share/doc/${PF}/examples || die + fi + + if use python; then + pushd python > /dev/null || die + distutils-r1_src_install + popd > /dev/null || die + fi + + # The man pages exists in src_install either in non-live ebuilds, + # since they are then shipped pre-compiled in herbstluftwm's + # release tarbal. Or they exist in live ebuilds if the 'doc' USE + # flag is enabled. + if [[ "${PV}" != 9999 ]] || use doc; then + local man_pages=( + herbstluftwm.1 + herbstclient.1 + herbstluftwm-tutorial.7 + ) + for man_page in "${man_pages[@]}"; do + doman "doc/${man_page}" + done + fi + + # Do not only install the herbstluftwm.desktop file in xsessions/ but + # also in applications/. This allows herbstluftwm to be used as + # window manager of a Gnome flashback session. + domenu "${ED}"/usr/share/xsessions/herbstluftwm.desktop +} + +distutils_enable_tests pytest + +src_test() { + ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink herbstclient" + ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink herbstluftwm" + + pushd python > /dev/null || die + distutils_install_for_testing + popd > /dev/null || die + + # Ensure PYTHONPATH is exported, see https://bugs.gentoo.org/801658. + export PYTHONPATH + python_test +} diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild deleted file mode 100644 index e732c8be90e1..000000000000 --- a/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild +++ /dev/null @@ -1,141 +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} ) -DISTUTILS_OPTIONAL=1 - -inherit cmake distutils-r1 - -DESCRIPTION="A manual tiling window manager for X" -HOMEPAGE="https://herbstluftwm.org/" - -if [[ "${PV}" == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then - EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm" - inherit git-r3 -else - SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz" - KEYWORDS="amd64 x86" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="+doc python test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -COMMON_DEPEND=" - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender -" -DEPEND=" - ${COMMON_DEPEND} - test? ( - dev-python/ewmh - dev-python/python-xlib - x11-apps/xsetroot - x11-base/xorg-server[xephyr,xvfb] - x11-misc/xdotool - x11-terms/xterm - ) -" -RDEPEND=" - ${COMMON_DEPEND} - app-shells/bash - python? ( ${PYTHON_DEPS} ) -" -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig -" - -if [[ -n "${EGIT_REPO_URI}" ]]; then - # Herbstluftwm tarballs ship with pre-compiled documentation, only - # if we build from git asciidoc is needed. - BDEPEND+=" doc? ( app-text/asciidoc )" -fi - -src_prepare() { - # Do not install LICENSE and respect CMAKE_INSTALL_DOCDIR. - sed -i \ - -e '/^install.*LICENSEDIR/d' \ - -e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \ - CMakeLists.txt || die - cmake_src_prepare - - if use python; then - pushd "${S}"/python > /dev/null || die - distutils-r1_src_prepare - popd > /dev/null || die - fi -} - -src_configure() { - # Ensure that 'python3' is in PATH. #765118 - python_setup - - local mycmakeargs=( - -DWITH_DOCUMENTATION=$(usex doc) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use python; then - pushd python > /dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi -} - -src_install() { - cmake_src_install - - if ! use doc; then - rm -r "${ED}"/usr/share/doc/${PF}/examples || die - fi - - if use python; then - pushd python > /dev/null || die - distutils-r1_src_install - popd > /dev/null || die - fi - - # The man pages exists in src_install either in non-live ebuilds, - # since they are then shipped pre-compiled in herbstluftwm's - # release tarbal. Or they exist in live ebuilds if the 'doc' USE - # flag is enabled. - if [[ "${PV}" != 9999 ]] || use doc; then - local man_pages=( - herbstluftwm.1 - herbstclient.1 - herbstluftwm-tutorial.7 - ) - for man_page in "${man_pages[@]}"; do - doman "doc/${man_page}" - done - fi -} - -distutils_enable_tests pytest - -src_test() { - ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink herbstclient" - ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink herbstluftwm" - - pushd python > /dev/null || die - distutils_install_for_testing - popd > /dev/null || die - - # Ensure PYTHONPATH is exported, see https://bugs.gentoo.org/801658. - export PYTHONPATH - python_test -} -- cgit v1.2.3