[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

[Joonas Niilola]

commit:     ecf6dc462918697e92f9e21d37b681aa2be275aa
Author:     Florian Schmaus <flo <AT> geekplace <DOT> eu>
AuthorDate: Tue Jan 12 18:56:44 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jan 28 07:36:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecf6dc46

x11-wm/herbstluftwm: fix python-exec[-native-symlinks], add 0.9.1

Closes: https://bugs.gentoo.org/765118
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Florian Schmaus <flo <AT> geekplace.eu>
Closes: https://github.com/gentoo/gentoo/pull/19045
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 x11-wm/herbstluftwm/Manifest                                 |  2 +-
 .../{herbstluftwm-0.9.0.ebuild => herbstluftwm-0.9.1.ebuild} | 12 +++++++++---
 x11-wm/herbstluftwm/herbstluftwm-9999.ebuild                 | 12 +++++++++---
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 086357fa5b0..f311a69b334 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,2 +1,2 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af SHA512 abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
-DIST herbstluftwm-0.9.0.tar.gz 406897 BLAKE2B 06a2d6f303e1cf3990ae5247104952936e374b39ec4be316885718a94741f21c868f084ac7c3d4854d3e2870c26b4037153f3f18bffdb7458e56b3039eb4f1e1 SHA512 a9d4486729a65c8eb87b0d36f0cc28349f670abee82e20c9649e1348298ca5e73f9b349921007d555d620327cc09dab4c24e9c76dd971afc7f4de98b9408d925
+DIST herbstluftwm-0.9.1.tar.gz 432926 BLAKE2B 38f8626f3f8957cae32d71202b03515c26a4e174ce550ed6b31e7e024c3a3095374ad68f5aecc55c608c0a8565063ff39f85596444884557f38ff39043bd1d7d SHA512 c69cc5a77e98e2e0a1c84938394fe97cd985bfedb8bb1e2dceddb0268f30597cdf9b30048aa3618c20ec549f2113b7a6bbbb94f2fbcc578b8f0117bdd8cac85d

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.1.ebuild
similarity index 81%
rename from x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild
rename to x11-wm/herbstluftwm/herbstluftwm-0.9.1.ebuild
index c2dc9d85fed..cd643535927 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.1.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake toolchain-funcs
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit cmake python-any-r1 toolchain-funcs
 
 DESCRIPTION="A manual tiling window manager for X"
 HOMEPAGE="https://herbstluftwm.org/"
@@ -24,6 +27,7 @@ RDEPEND="
 	app-shells/bash
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	virtual/pkgconfig
 	doc? ( app-text/asciidoc )
 "
@@ -37,10 +41,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# Ensure that 'python3' is in PATH. #765118
+	python_setup
+
 	mycmakeargs=(
 		-DWITH_DOCUMENTATION=$(usex doc)
 	)
-
 	cmake_src_configure
 }
 

diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
index 383fa9d17ea..28d103f5405 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 toolchain-funcs cmake
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit cmake git-r3 python-any-r1 toolchain-funcs
 
 DESCRIPTION="A manual tiling window manager for X"
 HOMEPAGE="https://herbstluftwm.org/"
@@ -23,6 +26,7 @@ RDEPEND="
 	app-shells/bash
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	virtual/pkgconfig
 	doc? ( app-text/asciidoc )
 "
@@ -36,10 +40,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# Ensure that 'python3' is in PATH. #765118
+	python_setup
+
 	mycmakeargs=(
 		-DWITH_DOCUMENTATION=$(usex doc)
 	)
-
 	cmake_src_configure
 }