From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- x11-wm/herbstluftwm/Manifest | 6 +- x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild | 140 ------------------------- x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild | 141 ++++++++++++++++++++++++++ x11-wm/herbstluftwm/herbstluftwm-9999.ebuild | 18 ++-- 4 files changed, 156 insertions(+), 149 deletions(-) delete mode 100644 x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild create mode 100644 x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild (limited to 'x11-wm/herbstluftwm') diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest index e1cb9b62c74e..bafab0d62a2f 100644 --- a/x11-wm/herbstluftwm/Manifest +++ b/x11-wm/herbstluftwm/Manifest @@ -1,4 +1,4 @@ -DIST herbstluftwm-0.9.3.tar.gz 497523 BLAKE2B 1936924f86201b6ad6ec33426d366912fd72e2a5e5a4964cafcb40d76624c2a1398c9330cde472343b436d16c9299aba495e1a224c6ea8bb173bbf76b7209cb3 SHA512 73e4193a2d79c452c08b4ac1c8fea1e93b88b07baa0c9006b74a76ed84de578d3234789e3666a9299ef3942695225c9a7f85eb3698a44edb1234f6042dbea47c -EBUILD herbstluftwm-0.9.3.ebuild 2982 BLAKE2B e9cbbe5b76e1553cdf2bd3197b93a3e7ad22612b8284c8ef20008bf9fab94f2117879f2f3c529766048f03ba0a22035750a62f5c8d78ab7b2d8e5ddb192bbcfc SHA512 107c2485d18e30abac5801a946cd565700ce90d75057a762ecb4c8a8d503b9c9f011396b6bf746ae90eb7da922ef5b043c915eea57bf348ea386b66b55c53d53 -EBUILD herbstluftwm-9999.ebuild 3262 BLAKE2B 0c6d211c2fa9d0e80b271e5107650a5176fa1bab34f1c948d25fd72f8111409c6d9c6543a1b46bb02ba103c030cc3b28edcd34d2b9e121f2b75072b534d7a7e4 SHA512 2739175752081dc17db123bd089e8f027d17ba1d1fb9a81b836d381976f07aaea194509733d766617b2dd8444992d62a065f5b83a091e0395c1b218c3afc893e +DIST herbstluftwm-0.9.4.tar.gz 549029 BLAKE2B 23f1dbf212c4d0a64f2e2d8442ac7c2465a54a13af74de6c949c4d6eda85fd4e66b73188c526d0968372eb45691ffca43e387c8410691fd134f662e1e8c501b3 SHA512 068438d14b0addcd17a0c0bda1d33ec4aaff08a3c85698a49e9d3dd0c07f91e315f936d73c11b0c159b8735373ea1efe8a572a0976fc327f4aaa6a0f08436e9d +EBUILD herbstluftwm-0.9.4.ebuild 2986 BLAKE2B a2eb901d21217a3960324ddd2eccfcd8e26254ca9e88ac6de266e6e97629ec2cc9f53018d0683620044d348eb348bed2cc5f0f0a4329e815f00fad8dbadab991 SHA512 b7c7900c1f84c4a2e75c61a009d8d504a5f0009b3d1b61ac3a58fd0562b3661468d266975e2fb201143dd9ba6258e11dd51af376b288598a4abfece06a2a8a79 +EBUILD herbstluftwm-9999.ebuild 3400 BLAKE2B ebc8f10a0506aa602092455f0e51b8c1ca3c2a3d4a6c585a6210ffe240b1006b0dcebff3282b8c84eef02605679c86ccfb8900aa4f2c2486a7ca95d0dd39c446 SHA512 0b1be1854a4a331ded3929d4cbb9045a8a690b9da1d916c6cd1a67d12eac9f53c4bc6ae74bbd756d6193f11ad50127362445e2cba1d79dab375ccd7cc0e5456d MISC metadata.xml 337 BLAKE2B 7ef28bc6ce30abb6c2f44524b4dd05a479cd5ca2b98901ffe570b870d0b98f94589cd1d3f197ee7e3fd90f4c73144e1dc44996df8b1b3ec28ce6950578ada74e SHA512 6e7cb80e1870901554ac0c2a4947cceb4e6284ccc84714bb0f42dbfa69cab5b32a8bd34fd384731b9462535d7e80feef606030be3e03babc80828a980050f333 diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild deleted file mode 100644 index fe478ccf2e52..000000000000 --- a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..10} ) -DISTUTILS_OPTIONAL=1 - -inherit cmake distutils-r1 toolchain-funcs - -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=" - media-libs/freetype - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libXrandr -" -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 - - 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 -} diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild new file mode 100644 index 000000000000..d69cb69d2351 --- /dev/null +++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2022 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 + + 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 +} diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild index ed397f906c24..4bb6c21b60f1 100644 --- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild +++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_OPTIONAL=1 -inherit cmake distutils-r1 toolchain-funcs +inherit cmake distutils-r1 DESCRIPTION="A manual tiling window manager for X" HOMEPAGE="https://herbstluftwm.org/" @@ -26,12 +26,13 @@ RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" COMMON_DEPEND=" - media-libs/freetype x11-libs/libX11 x11-libs/libXext + x11-libs/libXfixes x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr + x11-libs/libXrender " DEPEND=" ${COMMON_DEPEND} @@ -70,6 +71,11 @@ src_prepare() { -e '/^install.*LICENSEDIR/d' \ -e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \ CMakeLists.txt || die + + # Do not install MAN pages, we use doman in src_install() for that. + sed -i '/MANDIR/d' \ + doc/CMakeLists.txt || die + cmake_src_prepare if use python; then @@ -123,7 +129,7 @@ src_install() { herbstluftwm-tutorial.7 ) for man_page in "${man_pages[@]}"; do - doman "doc/${man_page}" + doman "${BUILD_DIR}/doc/${man_page}" done fi } -- cgit v1.2.3