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 27EA6158090 for ; Mon, 30 May 2022 07:20:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C3CFE095D; Mon, 30 May 2022 07:20:21 +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 51604E095D for ; Mon, 30 May 2022 07:20:21 +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 4FA8E3418DE for ; Mon, 30 May 2022 07:20:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B034B4A2 for ; Mon, 30 May 2022 07:20:18 +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: <1653895197.99c231296b5f352d271f274cc7c9a3043ae441af.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-9999.ebuild X-VCS-Directories: x11-wm/herbstluftwm/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 99c231296b5f352d271f274cc7c9a3043ae441af X-VCS-Branch: master Date: Mon, 30 May 2022 07:20:18 +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: 6aaf702c-ae49-4272-99cd-c95da0aa40d6 X-Archives-Hash: 42837b06926e9a2ca84a2732edcc842e commit: 99c231296b5f352d271f274cc7c9a3043ae441af Author: Florian Schmaus gentoo org> AuthorDate: Mon May 30 07:16:02 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Mon May 30 07:19:57 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99c23129 x11-wm/herbstluftwm: update EAPI 7 -> 8 and adjustments Signed-off-by: Florian Schmaus gentoo.org> x11-wm/herbstluftwm/herbstluftwm-9999.ebuild | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) 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 }