From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D9E0015800A for ; Sun, 16 Jul 2023 16:40:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A25BE086A; Sun, 16 Jul 2023 16:40:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E29C7E086A for ; Sun, 16 Jul 2023 16:40:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6889033FE26 for ; Sun, 16 Jul 2023 16:40:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AD051B52 for ; Sun, 16 Jul 2023 16:40:27 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1689525117.1b70343fefee4dd870f4365591c60f98aa299f35.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild x11-wm/herbstluftwm/herbstluftwm-9999.ebuild X-VCS-Directories: x11-wm/herbstluftwm/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 1b70343fefee4dd870f4365591c60f98aa299f35 X-VCS-Branch: master Date: Sun, 16 Jul 2023 16:40:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 086027bc-adc1-47e1-9267-373411d1dddd X-Archives-Hash: b9f61de671edabb28087d8e68b18f172 commit: 1b70343fefee4dd870f4365591c60f98aa299f35 Author: Florian Schmaus gentoo org> AuthorDate: Sun Jul 16 16:31:44 2023 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Sun Jul 16 16:31:57 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b70343f x11-wm/herbstluftwm: switch to DISTUTILS_USE_PEP517 Bug: https://bugs.gentoo.org/910047 Signed-off-by: Florian Schmaus gentoo.org> ...wm-9999.ebuild => herbstluftwm-0.9.5-r2.ebuild} | 41 +++++++++------------- x11-wm/herbstluftwm/herbstluftwm-9999.ebuild | 3 +- 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild similarity index 82% copy from x11-wm/herbstluftwm/herbstluftwm-9999.ebuild copy to x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild index 051f9ba720c9..31baa0f5fafc 100644 --- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild +++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild @@ -4,9 +4,10 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) +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/" @@ -51,15 +52,11 @@ RDEPEND=" python? ( ${PYTHON_DEPS} ) " BDEPEND=" - ${PYTHON_DEPS} + ${DISTUTILS_DEPS} virtual/pkgconfig " if [[ -n "${EGIT_REPO_URI}" ]]; then - # If hlwm is build from VCS, then hlwm-doc.json, which is used in - # the tests, needs to generated by the WITH_DOCUMENTATION option. - REQUIRED_USE+=" test? ( doc )" - # Herbstluftwm tarballs ship with pre-compiled documentation, only # if we build from git asciidoc is needed. BDEPEND+=" doc? ( app-text/asciidoc )" @@ -71,11 +68,6 @@ 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 @@ -129,28 +121,27 @@ 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" - fi - ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink herbstclient" ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink herbstluftwm" - distutils-r1_src_test + 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 051f9ba720c9..7c5b5aaecbda 100644 --- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild +++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild @@ -4,6 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools DISTUTILS_OPTIONAL=1 inherit cmake distutils-r1 @@ -51,7 +52,7 @@ RDEPEND=" python? ( ${PYTHON_DEPS} ) " BDEPEND=" - ${PYTHON_DEPS} + ${DISTUTILS_DEPS} virtual/pkgconfig "