gentoo resync : 15.06.2021

4 files changed, 88 insertions, 74 deletions

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 8560c845901c..115c8263fffd 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,8 +1,6 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af SHA512 abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
-DIST herbstluftwm-0.9.1.tar.gz 432926 BLAKE2B 38f8626f3f8957cae32d71202b03515c26a4e174ce550ed6b31e7e024c3a3095374ad68f5aecc55c608c0a8565063ff39f85596444884557f38ff39043bd1d7d SHA512 c69cc5a77e98e2e0a1c84938394fe97cd985bfedb8bb1e2dceddb0268f30597cdf9b30048aa3618c20ec549f2113b7a6bbbb94f2fbcc578b8f0117bdd8cac85d
-DIST herbstluftwm-0.9.2.tar.gz 448757 BLAKE2B f969e4a02aad11c5bd75ac261c7dd8c9448234a050f82f0cdd9bc29c998c4f6bb496f6e32d20016b06849218952c6a2f993f46aa94c29d011f4ff6865a2197bc SHA512 5426b4d1810f01cf043cf43644d4c65692a5aa207893be484c86eb0eeb96ca6259c86b843146a9eebdf4de988f2d2ed742674907be47262c6029d8aa7ab2265c
+DIST herbstluftwm-0.9.3.tar.gz 497523 BLAKE2B 1936924f86201b6ad6ec33426d366912fd72e2a5e5a4964cafcb40d76624c2a1398c9330cde472343b436d16c9299aba495e1a224c6ea8bb173bbf76b7209cb3 SHA512 73e4193a2d79c452c08b4ac1c8fea1e93b88b07baa0c9006b74a76ed84de578d3234789e3666a9299ef3942695225c9a7f85eb3698a44edb1234f6042dbea47c
 EBUILD herbstluftwm-0.7.2-r1.ebuild 1534 BLAKE2B a88a23d3cdcaf5761198b31112ebeeac213f5e576e3d5e566121713875e1e9b8a78d9c7e63659da6144b6733905f0b2def82761dff36e29400b899670d3c2aec SHA512 8bf19a5fc434271eeafc58a168dd852a8962cd9c8c35ecd2779eb2f195d4fae3942ff7884c96c8177592d4374e4b3bcd63a5c33bee46e73ff5b08b5dd20f0e9f
-EBUILD herbstluftwm-0.9.1.ebuild 1055 BLAKE2B b3d76f81274b4019a10bfee919de68c5c52f391025514dbe0c6ffcadf84e50db7a5173e15d553c86dfd206b594483da32f383b866b81bbd14e58757536f5a769 SHA512 db8fb6e23a86b722c3ea779cffe2a13167330e8be46fc07e770d87361ba76ce4b51c4773966a8730da2f2182eb60605daf5a7a79c82056f872ba1012e97c4e97
-EBUILD herbstluftwm-0.9.2.ebuild 1735 BLAKE2B a5e0199e4253a12cd99788cbd8c5ad26bd2270c0b454e688d3c4e758d18bf693d132f9214d5d13a0f9d88d06976696800724d6327c447073f8be958077ee7cf9 SHA512 c5124e231d7eecf9d0f00260164c61e2469854e93b38d2285e987686ff37806435adac9894abffd5376e9a37e2ec50472385a2ecf2e6093c94060e61cd21b740
-EBUILD herbstluftwm-9999.ebuild 1044 BLAKE2B e65193b1bd6c7b42ba0976b298dd8e2df2bbdf18fb5a623224a2184c897e70db2a14124729fa81753f6fd73105f3dc65711305a94d2de04d5140a127da08744d SHA512 94d9732c9805962a2144d9fa1ac9b4f136f7960cca790b3059a6aa2f76e157eba13ed291d113429e942e1858e8a90e40da76883b9ed5b964ee304e78f0b4e9a8
+EBUILD herbstluftwm-0.9.3.ebuild 2371 BLAKE2B ea74b3fc645e04598d92bad6891be61b71125c14379e752bdd5cd252bce95eef86c1eab5721486496ef86ba43db372b00bfc9e7f8a10f7c10d585a3b8f5b20ba SHA512 5ec164cb648e2aa32c46f441082a766259887542178cea8cbea1d650095e8091793640249c2c80fd2088e54bc7c0384739ab5c2e1a64f455307cca5d5f70d913
+EBUILD herbstluftwm-9999.ebuild 2371 BLAKE2B ea74b3fc645e04598d92bad6891be61b71125c14379e752bdd5cd252bce95eef86c1eab5721486496ef86ba43db372b00bfc9e7f8a10f7c10d585a3b8f5b20ba SHA512 5ec164cb648e2aa32c46f441082a766259887542178cea8cbea1d650095e8091793640249c2c80fd2088e54bc7c0384739ab5c2e1a64f455307cca5d5f70d913
 MISC metadata.xml 565 BLAKE2B 8a6246f89ec1a463c527d2daff5dc31ec574d6d41bc026255fe4a09e4fc5f1d7136df89364ed3bb6bf46a3848ad19f3737261481f4c217c2bf6004e0ad5072f9 SHA512 08a447578d4b0d98efc301024b182e4f1407040b4c37de73fab0e65990e834a38b3ea7dc17f15e96ea8bde5336d45d30d881f9169ccd461763d7d4fd8d098e99
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.1.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.1.ebuild
deleted file mode 100644
index cd6435359276..000000000000
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/"
-SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc examples"
-
-DEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-"
-RDEPEND="
-	${DEPEND}
-	app-shells/bash
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( app-text/asciidoc )
-"
-
-src_prepare() {
-	sed -i \
-		-e '/^install.*LICENSEDIR/d' \
-		-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
-		CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Ensure that 'python3' is in PATH. #765118
-	python_setup
-
-	mycmakeargs=(
-		-DWITH_DOCUMENTATION=$(usex doc)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if ! use examples; then
-		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
-	fi
-}
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.2.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
index 31f1710a7b3e..f374bfa2fc7a 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.2.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_OPTIONAL=1
 
 inherit cmake distutils-r1 toolchain-funcs
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="doc examples python"
+IUSE="+doc python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="
@@ -40,10 +40,16 @@ RDEPEND="
 BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
-	doc? ( app-text/asciidoc )
 "
 
+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})#' \
@@ -80,7 +86,7 @@ src_compile() {
 src_install() {
 	cmake_src_install
 
-	if ! use examples; then
+	if ! use doc; then
 		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
 	fi
 
@@ -90,4 +96,18 @@ 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
 }
diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
index 28d103f5405a..f374bfa2fc7a 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
@@ -3,40 +3,64 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_OPTIONAL=1
 
-inherit cmake git-r3 python-any-r1 toolchain-funcs
+inherit cmake distutils-r1 toolchain-funcs
 
 DESCRIPTION="A manual tiling window manager for X"
 HOMEPAGE="https://herbstluftwm.org/"
-EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm"
+
+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 examples"
+IUSE="+doc python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="
+	media-libs/freetype
 	x11-libs/libX11
 	x11-libs/libXext
+	x11-libs/libXft
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 "
 RDEPEND="
 	${DEPEND}
 	app-shells/bash
+	python? ( ${PYTHON_DEPS} )
 "
 BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
-	doc? ( app-text/asciidoc )
 "
 
+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() {
@@ -49,10 +73,41 @@ src_configure() {
 	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 examples; then
+	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
 }