gentoo auto-resync : 12:01:2023 - 11:46:19

3 files changed, 138 insertions, 11 deletions

diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index f4434f9e5d56..8d5da28c46bb 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -2,6 +2,7 @@ AUX qtile-session-r1 1860 BLAKE2B fb9345d3acc5e0fc5694065f12e2759e02aebc765925cb
 DIST qtile-0.21.0.tar.gz 475428 BLAKE2B 8c63eb8776fb6feab30c7ee2a19e6f28df6715fc18b09c63b89de6bf2129cd3c5c516d0c9efc946f24590fa8afc6e87c704c8e3b7094d0843b5b6e34df57ca18 SHA512 b7c5fc478180413e263445316ac9560c1d22668194415c3e4edae5c672f4b317fd978083dc9a985f0d145aeaaa55ffab0017e83af963f30d8b36f9963e12b079
 DIST qtile-0.22.1.tar.gz 488969 BLAKE2B 3b2fce587ae39570997b503cb386314160dbefa39b1ef65dc2ff5bc2f1167251224a0f298ef8e374d0d4c034d1e5012251f96b92ce5cb74d7fd93320e14ff8bf SHA512 944ec27b5d227154624fa2a15a0840b748307a1e79ab52ccf3384763111459b3c4d26b4677f8e2ea51634206dc6d1e32e057e057db917b3705ce583d83a8056d
 EBUILD qtile-0.21.0-r1.ebuild 1720 BLAKE2B 5a3363e7524aba05e336fd1e85095e8caf0892650f2de66de602d89a110fd67cb54af5773471cabece918edbba9473985d9b46617513b62388d8c00f803ab682 SHA512 e991b148f2a1df35c0ccf693176d8aa61d42f502362916866dc2c655862fb56b40a4e73c3c75dd5589078d25824e05a273eaacf206ee5b9011093d7c8225474a
+EBUILD qtile-0.22.1-r1.ebuild 2449 BLAKE2B eb7cb527954e1c2fba6c0dfae8b908fcdc8db3cdeeec9b3b86e24230d25722eb786e15cb5abef5cac86aae476aa36eededabdf75b615d21c704be08a504ddedf SHA512 669d606ae2d5b3c46b6593fb86ea2700e414fc62ae9752f2b75f9cc0249b25f9b817f945ff33a52091d94d5bfe0c8bdd10f92291229d88f65c801b8875406879
 EBUILD qtile-0.22.1.ebuild 1829 BLAKE2B 9629484e8a7ce1da5e8c6baa389f2ee0d2fcaf05a8d315b02641f657f8e780f3ffb68894c514d157be0d1a9293287f56902018ff1a3473b12a18db32ec68d0b9 SHA512 d684229208da58ce28ff948ce1c9c77e3a55091505a0589852d9e47f32a9b2fcf5c7ed044c8d8651b416a47948142c8ff521a9e26fc3e36f5d9e1d53804be444
-EBUILD qtile-9999.ebuild 1829 BLAKE2B 9629484e8a7ce1da5e8c6baa389f2ee0d2fcaf05a8d315b02641f657f8e780f3ffb68894c514d157be0d1a9293287f56902018ff1a3473b12a18db32ec68d0b9 SHA512 d684229208da58ce28ff948ce1c9c77e3a55091505a0589852d9e47f32a9b2fcf5c7ed044c8d8651b416a47948142c8ff521a9e26fc3e36f5d9e1d53804be444
+EBUILD qtile-9999.ebuild 2295 BLAKE2B 7ce0c79b5aecad8e70b7f01faac5360d2bf7772d038762c316f36566b42f199638ade9a84f9f352dae44d0a32f851fe4f4f91494edc9b14039c518c3f8c06d5a SHA512 0c822aabef4ab7e136d8d376816265ea83cec77c2e8f513cff8f70ec1487bfc8ba0363cd2a67eb8acad8c098363003ef80f4d30dee555bec01c608562379512f
 MISC metadata.xml 367 BLAKE2B ade5efce70fa9a9968ae51933aae07bc5c91e25b64a9c3389236cb20a9b84b74ebf3b812c015ceec8dd2866740c2d8145844a6b2bc8d3416e9cb9c3cadde7890 SHA512 eabc2f763c0cfbf034a9b9781f605333101278fbd064dbc17409408f3fe0c0fe7192e44a987400e9573c523783ddac8e38506b1c3ab64ddef24091bda1697b4e
diff --git a/x11-wm/qtile/qtile-0.22.1-r1.ebuild b/x11-wm/qtile/qtile-0.22.1-r1.ebuild
new file mode 100644
index 000000000000..aa215b329fef
--- /dev/null
+++ b/x11-wm/qtile/qtile-0.22.1-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
+HOMEPAGE="http://qtile.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/qtile/qtile.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="pulseaudio wayland"
+
+RDEPEND="
+	>=dev-python/cairocffi-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.1.0[${PYTHON_USEDEP}]
+	dev-python/dbus-next[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/xcffib-0.10.1[${PYTHON_USEDEP}]
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/libnotify[introspection]
+	x11-libs/pango
+	pulseaudio? (
+		media-sound/pulseaudio
+	)
+	wayland? (
+		dev-python/pywlroots[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		media-gfx/imagemagick[X]
+		x11-base/xorg-server[xephyr]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Can't find built qtile like migrate
+	test/test_qtile_cmd.py::test_qtile_cmd
+	test/test_qtile_cmd.py::test_display_kb
+)
+
+EPYTEST_IGNORE=(
+	# Tries to find binary and fails; not worth running anyway?
+	test/test_migrate.py
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Avoid automagic dependency on libpulse
+	if ! use pulseaudio ; then
+		sed -i -e "s/call('libpulse', '--libs')/raise PkgConfigError/" setup.py || die
+
+		# TODO: use this sed for next release after 0.22.1, quoting changed
+		# sed -i -e 's/call("libpulse", "--libs")/throw PkgConfigError/' setup.py || die
+	fi
+
+	# Avoid automagic dependency on pywlroots
+	if ! use wayland ; then
+		sed -i -e 's/import wlroots.ffi_build/raise ImportError/' setup.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# Force usage of built module
+	rm -rf "${S}"/libqtile || die
+
+	epytest --backend=x11 $(usev wayland '--backend=wayland') || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGELOG README.rst )
+	distutils-r1_python_install_all
+
+	insinto /usr/share/xsessions
+	doins resources/qtile.desktop
+
+	insinto /usr/share/wayland-sessions
+	doins resources/qtile-wayland.desktop
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session-r1 ${PN}
+}
diff --git a/x11-wm/qtile/qtile-9999.ebuild b/x11-wm/qtile/qtile-9999.ebuild
index 11d0d1fd538d..9c06ef2a1275 100644
--- a/x11-wm/qtile/qtile-9999.ebuild
+++ b/x11-wm/qtile/qtile-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1 virtualx
 
@@ -16,29 +16,37 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/qtile/qtile.git"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~riscv ~x86"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="MIT"
 SLOT="0"
+IUSE="pulseaudio wayland"
 
-RDEPEND=">=dev-python/cairocffi-0.9.0[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/cairocffi-0.9.0[${PYTHON_USEDEP}]
 	>=dev-python/cffi-1.1.0[${PYTHON_USEDEP}]
 	dev-python/dbus-next[${PYTHON_USEDEP}]
 	dev-python/pygobject[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
 	>=dev-python/xcffib-0.10.1[${PYTHON_USEDEP}]
-	media-sound/pulseaudio
 	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libnotify[introspection]
-	x11-libs/pango"
+	x11-libs/pango
+	pulseaudio? (
+		media-sound/pulseaudio
+	)
+	wayland? (
+		dev-python/pywlroots[${PYTHON_USEDEP}]
+	)
+"
 BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		media-gfx/imagemagick[X]
 		x11-base/xorg-server[xephyr]
-	)"
+	)
+"
 
 EPYTEST_DESELECT=(
 	# Can't find built qtile like migrate
@@ -53,6 +61,20 @@ EPYTEST_IGNORE=(
 
 distutils_enable_tests pytest
 
+python_prepare_all() {
+	# Avoid automagic dependency on libpulse
+	if ! use pulseaudio ; then
+		sed -i -e 's/call("libpulse", "--libs")/throw PkgConfigError/' setup.py || die
+	fi
+
+	# Avoid automagic dependency on pywlroots
+	if ! use wayland ; then
+		sed -i -e 's/import wlroots.ffi_build/raise ImportError/' setup.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
 src_test() {
 	virtx distutils-r1_src_test
 }
@@ -61,7 +83,7 @@ python_test() {
 	# Force usage of built module
 	rm -rf "${S}"/libqtile || die
 
-	epytest || die "Tests failed with ${EPYTHON}"
+	epytest --backend=x11 $(usev wayland '--backend=wayland') || die "Tests failed with ${EPYTHON}"
 }
 
 python_install_all() {