gentoo auto-resync : 24:12:2022 - 14:02:21

8 files changed, 166 insertions, 15 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index e1687737e44a..f9b6edcece7d 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index bc11a852cb96..661b9a89c2e9 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,5 +1,5 @@
 DIST muffin-5.2.1.tar.gz 5197177 BLAKE2B 9703a2e2c5ef75c7d4da3e201b60033a7ba549d94106df33aa9b89d0029f52c06fb4be00dd4c4d996bb083a790635a8227c8ff729dc43940f70b679e1b46924d SHA512 fa88a88f77a1cb84c2159fac8ab3ed38ae1054d3a01bb100aa264e8b91493a744da6e83ffad9190f0f7a07bd26022fea12d13a60e213d57f289685fba1810eb6
-DIST muffin-5.6.0.tar.gz 4516015 BLAKE2B 19136768b7060186db9228bcfc01b4f5f94a3e66222cf21ad07d67ada415fd7bcf40fa13b0f4f292a2468671ce9ff15e24fa39553009109a557ffc1bbb8080b3 SHA512 9d36ac4f9e9ee91c2712c51b7a7ec0223ddb3178739b6b2e644d54e425420ceb99bd72e5da129d2f8a42c5693eba144a4b0713bc550f09339a3d15136d0953dd
+DIST muffin-5.6.2.tar.gz 4517162 BLAKE2B 95d4599f59838e1b281683ddcfb06eb152274482991ae2eea4e5c47056072df5714fc187967bdd58342ce660e3874c606de29f0e9f089d5b8511f116e703aca4 SHA512 14f71e15cedc7956f50a6b84d78ffcd1d20dba194206dd0df68147bcf60d2143eccaa1b23bf70675f4017cadd03698b6f79abedb754a04be20d73bbdbe724458
 EBUILD muffin-5.2.1.ebuild 2519 BLAKE2B 04d0035a5f5988c5367e3c423b8332524913b72b2c794deefc2de617756c4c45a3401948336e851bb46c2a2756afc0faf2f3104d961fd44870c608147b964532 SHA512 af5a8cba8a4f780a5081346e8d521f735ad461c1a473f5e0b384ed1fcf3dcf98942ae787e74292b9ca558485c2ea6b25255e8715aa9c0686accfe6d6c8b05847
-EBUILD muffin-5.6.0.ebuild 3111 BLAKE2B 4f04c032c628d28b0a53a895315c3e362ec49978cd48bd93e624e3dc588bababfd654d0da474542e2a708c2a2fc83ce0f7c5bc4ca851d7c0c33eacfe0ab3eca5 SHA512 d8f995a41554337d4b45c58ee4ad2e576feed92852b3caa14f6e24c3f25bb2deb76813f8f3d312ad54452b6380afc32357f90f633ccede4d438b8e08ec85c106
+EBUILD muffin-5.6.2.ebuild 3062 BLAKE2B 9828baab10bfcc531fe257a88a62b32458d787a599ba19fbe7132d6386b7863eb94d2ddbe48101e4c81f5abfa5c2ed30a33daa8d71aaddd67d297410ab1054d2 SHA512 12eab46399ac42503df58656cea9f13a61e2a3048378df75d5228633ed5ecd7db1976cf9fe3775c1ce6d9ce024b9f89cff4be78213ec33296c3bba85572159a9
 MISC metadata.xml 611 BLAKE2B 550f115a51852c3e1dfcb9f84bd84c6c24fcfa7b90ca3772ed1e7e315a7b112c035e17a34e029e794922012eee3163759fc6105af29e0dfd1767183c4779005c SHA512 3211657912916ca3a207f46159d436839e9a82594cdad574dc02c64b19654f801e082284d56c4dceddd8cdbb8be424f0b4be37b010f3130551dfe12df2928ecf
diff --git a/x11-wm/muffin/muffin-5.6.0.ebuild b/x11-wm/muffin/muffin-5.6.2.ebuild
index 85ef3c165c15..c73c457aa4de 100644
--- a/x11-wm/muffin/muffin-5.6.0.ebuild
+++ b/x11-wm/muffin/muffin-5.6.2.ebuild
@@ -42,10 +42,7 @@ COMDEPEND="
 	x11-libs/libXinerama
 	x11-libs/libXau
 	x11-libs/libICE
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2[introspection?]
-		>=dev-libs/atk-2.5.3[introspection?]
-	)
+	>=app-accessibility/at-spi2-core-2.46.0:2[introspection?]
 	>=media-libs/libcanberra-0.26
 	sys-apps/dbus
 	media-libs/libglvnd[X]
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index e64fefcc32df..f4434f9e5d56 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -1,5 +1,7 @@
 AUX qtile-session-r1 1860 BLAKE2B fb9345d3acc5e0fc5694065f12e2759e02aebc765925cb0ffcb1a776ec82e959503d8a8039238e4e48a5045a3118f2e37201a88d5255fd0a0782d2f8291d8a77 SHA512 41b37ba034b5dd7f3126142d2cfc5cf8986b521fc419d47e420582fc8b516df87249bd8e14c12d77691b93205ec3cd1249bfa040ef0691e0751c669f742570ee
-AUX qtile.desktop 121 BLAKE2B c8c22d15951fb0f7fb26eccf8b67d051ab0c9990f65e9924a81c2bb3399b082ce82d69a342716ab0e8bffc6316e7a2fcbb2b1303bad05ed3d10d8f7e43717457 SHA512 e2e94c60c7c7be992fcfda88e43c298aa2356c9d7553870fdcd384f464d1dd5ec28c46a171d4717ca1cd00abda160fa3b5270bf0acf9fa90b93ee2041afc6d3a
 DIST qtile-0.21.0.tar.gz 475428 BLAKE2B 8c63eb8776fb6feab30c7ee2a19e6f28df6715fc18b09c63b89de6bf2129cd3c5c516d0c9efc946f24590fa8afc6e87c704c8e3b7094d0843b5b6e34df57ca18 SHA512 b7c5fc478180413e263445316ac9560c1d22668194415c3e4edae5c672f4b317fd978083dc9a985f0d145aeaaa55ffab0017e83af963f30d8b36f9963e12b079
-EBUILD qtile-0.21.0-r1.ebuild 1716 BLAKE2B ee58920cc167ff9997f17fcbd30e6d3f0d516d5a49c9826dd903e82d055fb0db379cd8ab6512b9936e88bdaf911a9f097656882ea850ebfc9e9d19a0098aaa5c SHA512 147cd2dc7c9049d2e9ca7e29f5bab099287c30400b8a2de46bae0b00225a1313ea99961bf22429c97c61f08a575a378fc5db2a21c0cf3bde9c882cd6dc842443
+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.ebuild 1829 BLAKE2B 9629484e8a7ce1da5e8c6baa389f2ee0d2fcaf05a8d315b02641f657f8e780f3ffb68894c514d157be0d1a9293287f56902018ff1a3473b12a18db32ec68d0b9 SHA512 d684229208da58ce28ff948ce1c9c77e3a55091505a0589852d9e47f32a9b2fcf5c7ed044c8d8651b416a47948142c8ff521a9e26fc3e36f5d9e1d53804be444
+EBUILD qtile-9999.ebuild 1829 BLAKE2B 9629484e8a7ce1da5e8c6baa389f2ee0d2fcaf05a8d315b02641f657f8e780f3ffb68894c514d157be0d1a9293287f56902018ff1a3473b12a18db32ec68d0b9 SHA512 d684229208da58ce28ff948ce1c9c77e3a55091505a0589852d9e47f32a9b2fcf5c7ed044c8d8651b416a47948142c8ff521a9e26fc3e36f5d9e1d53804be444
 MISC metadata.xml 367 BLAKE2B ade5efce70fa9a9968ae51933aae07bc5c91e25b64a9c3389236cb20a9b84b74ebf3b812c015ceec8dd2866740c2d8145844a6b2bc8d3416e9cb9c3cadde7890 SHA512 eabc2f763c0cfbf034a9b9781f605333101278fbd064dbc17409408f3fe0c0fe7192e44a987400e9573c523783ddac8e38506b1c3ab64ddef24091bda1697b4e
diff --git a/x11-wm/qtile/files/qtile.desktop b/x11-wm/qtile/files/qtile.desktop
deleted file mode 100644
index 5b00f85a88c0..000000000000
--- a/x11-wm/qtile/files/qtile.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=Qtile
-Comment=Qtile Wayland Session
-Exec=qtile start -b wayland
-Type=Application
-Keywords=wm;tiling
diff --git a/x11-wm/qtile/qtile-0.21.0-r1.ebuild b/x11-wm/qtile/qtile-0.21.0-r1.ebuild
index 4bdd86e614c8..139993950102 100644
--- a/x11-wm/qtile/qtile-0.21.0-r1.ebuild
+++ b/x11-wm/qtile/qtile-0.21.0-r1.ebuild
@@ -66,7 +66,7 @@ python_install_all() {
 	doins resources/qtile.desktop
 
 	insinto /usr/share/wayland-sessions
-	doins "${FILESDIR}"/qtile.desktop
+	doins resources/qtile-wayland.desktop
 
 	exeinto /etc/X11/Sessions
 	newexe "${FILESDIR}"/${PN}-session-r1 ${PN}
diff --git a/x11-wm/qtile/qtile-0.22.1.ebuild b/x11-wm/qtile/qtile-0.22.1.ebuild
new file mode 100644
index 000000000000..11d0d1fd538d
--- /dev/null
+++ b/x11-wm/qtile/qtile-0.22.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+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 ~riscv ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+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"
+BDEPEND="
+	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
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# Force usage of built module
+	rm -rf "${S}"/libqtile || die
+
+	epytest || 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
new file mode 100644
index 000000000000..11d0d1fd538d
--- /dev/null
+++ b/x11-wm/qtile/qtile-9999.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+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 ~riscv ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+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"
+BDEPEND="
+	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
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# Force usage of built module
+	rm -rf "${S}"/libqtile || die
+
+	epytest || 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}
+}