From ba32ac7204934e0c69e1cc7529edce6efdbeb265 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 4 Apr 2024 02:14:42 +0100 Subject: gentoo auto-resync : 04:04:2024 - 02:14:41 --- x11-wm/herbstluftwm/Manifest | 4 ++-- x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild | 17 +++++++--------- x11-wm/herbstluftwm/herbstluftwm-9999.ebuild | 26 ++++++++++++------------ 3 files changed, 22 insertions(+), 25 deletions(-) (limited to 'x11-wm/herbstluftwm') diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest index a1a0f7eaee60..aeda404d4d1e 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-r2.ebuild 3277 BLAKE2B 1e345557ebea6b5e2a07b118ab8b42bbd0dbc1664fc006f21a2a4b9567f10e3ff418f46fad0283dda3c8b65e8fcdbffa8e48f1ebc1e8a7762b597402c3e7fe38 SHA512 f2c4eb41d66774f7d0e9c3ad9b071a7d0cc7417b52beeb4568d1fa842499597a531e4fb5219963be8e9d2d0eab208f38defeaf90a5afb23d15ff277cf368ade8 -EBUILD herbstluftwm-9999.ebuild 3441 BLAKE2B 7d3d428d9d58ec30c1fd4fc978849b2e61c06dcc4e4a92a17a718ae8271e44f9be261596189231bc35979f190d0cc0e5dcce660bb7c3f1d04bd0ead6847ce5f4 SHA512 eef931f1d2ecc3b84892c3605ef597e5fc4092b805c3326be003700cfccf4fac2d61fdcf32ba224eba2948d81b5f5d64044dfd293bbc16bea3e6406a7bf709be +EBUILD herbstluftwm-0.9.5-r2.ebuild 3129 BLAKE2B 801cbd28dc490f4b1b2d544366de59025bb05b628455a8385f9ee8d3dad7bf4356afcf0b1ceb7d35ac298127e7af35599695cecd33e95193d40edbb68a2aa2e0 SHA512 2d46ccb585c1d3928f3851586483847774df44cfad11460c3ae910c013dcc8d3e31f9d6903148f4dd304fc9ba00818e4968b2cecd9aa46ada59a1bc0dec94f4f +EBUILD herbstluftwm-9999.ebuild 3564 BLAKE2B 2552a4c51bd03a5942c02afe7b80a93e172b3696ab9c18727bc5c2d366c220ce211cd670cfbca7434f6a6f382820efe1948445769f0ad1dc4ad7cebdc3ad75fe SHA512 3325cffdbd92cb2878ddc767631b43ff7d7a0a2281567246dc8e232b35989966c468fcd3ca311c7ada05321cd80ddc1338512c6db73cdeef8236059d4aa68981 MISC metadata.xml 337 BLAKE2B 7ef28bc6ce30abb6c2f44524b4dd05a479cd5ca2b98901ffe570b870d0b98f94589cd1d3f197ee7e3fd90f4c73144e1dc44996df8b1b3ec28ce6950578ada74e SHA512 6e7cb80e1870901554ac0c2a4947cceb4e6284ccc84714bb0f42dbfa69cab5b32a8bd34fd384731b9462535d7e80feef606030be3e03babc80828a980050f333 diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild index 83a22e20d0e4..ceda002ab268 100644 --- a/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild +++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) DISTUTILS_USE_PEP517=setuptools DISTUTILS_OPTIONAL=1 @@ -24,7 +24,10 @@ LICENSE="BSD-2" SLOT="0" IUSE="+doc python test" RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + test? ( python ) +" COMMON_DEPEND=" x11-libs/libX11 @@ -137,11 +140,5 @@ 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 + distutils-r1_src_test } diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild index 7c5b5aaecbda..f9a7de769844 100644 --- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild +++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) DISTUTILS_USE_PEP517=setuptools DISTUTILS_OPTIONAL=1 -inherit cmake distutils-r1 +inherit cmake desktop distutils-r1 DESCRIPTION="A manual tiling window manager for X" HOMEPAGE="https://herbstluftwm.org/" @@ -24,7 +24,10 @@ LICENSE="BSD-2" SLOT="0" IUSE="+doc python test" RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + test? ( python ) +" COMMON_DEPEND=" x11-libs/libX11 @@ -130,21 +133,18 @@ src_install() { herbstluftwm-tutorial.7 ) for man_page in "${man_pages[@]}"; do - doman "${BUILD_DIR}/doc/${man_page}" + 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 -python_test() { - pushd python > /dev/null || die - distutils_install_for_testing - popd > /dev/null || die - - distutils-r1_python_test -} - src_test() { if [[ -n "${EGIT_REPO_URI}" ]]; then ln -s "${BUILD_DIR}/doc/hlwm-doc.json" "doc/hlwm-doc.json" || die "Could not symlink hlwm-doc.json" -- cgit v1.2.3