gentoo resync : 16.09.2020

4 files changed, 17 insertions, 101 deletions

diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index 39546ec45d4d..480e417dd0f3 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -1,7 +1,6 @@
 AUX qtile-session 1854 BLAKE2B 260c39642f805f9b94e59ab25d9e8d6e53abcb9fbed76f33434fdd2ccd65dc24c71b7ea654ced6393404656f2f26d96dc45a2b7e580190da408a396e76af2897 SHA512 4d7418316f6baeaa28b254f341c74641004bd58444c425f626c92e44bff046ec108d128a9e91c10daae75b222c5758e8f0e8a5e3b778b2af36409f4d4b778cbe
 DIST qtile-0.15.1.tar.gz 522233 BLAKE2B cb5c35ab6b2e22d36c2ef69a3d6367033440a25a1c06dad5c4d455b67aa1ddf2c639451e051abcd40b5a76e93250a54271408bbe09008b44a5ebf0a520b3eb2e SHA512 57dfeeea212346c14b922303b5d2fd950292383a1da3be6bf5ca0880bedaa3adb7ffc121df617cf763fcd1208c44e34a7ba128a1f2a6e8d3042dd6906ece7e20
-DIST qtile-0.16.0.tar.gz 543646 BLAKE2B d0d2ae1bf44e08c7a40601fee0643fb387807546ebee5ab6f6756d7651be22fff75034227226fe978042b33594158b5493ca6203ecab92434418219a423a5817 SHA512 c8f712fcf48f166be0782560541d02959809f5c7d6ee209e3bf0b12325309521be79eab81e4f17f5111fb9426601ac5445db0bb3dc8330e9b426fa1031e95065
-EBUILD qtile-0.15.1.ebuild 1524 BLAKE2B 5b0a5da5aeb221f0a3003913476e91716e6e992e258315c1363a49a0fbf313cdd5c897c974aa1814e205e6eee4de0860b3e89725cae5d6322d85121dda5fc9d6 SHA512 6472d1237ac9a1f47c1ee08c924cbcae018acaa6ee0f4e7d69de725eb31a964d39a67f6ab8bb58756e31ab25d964b4332ab851ca96ce56850691ba63a562e40d
-EBUILD qtile-0.16.0.ebuild 1524 BLAKE2B 5b0a5da5aeb221f0a3003913476e91716e6e992e258315c1363a49a0fbf313cdd5c897c974aa1814e205e6eee4de0860b3e89725cae5d6322d85121dda5fc9d6 SHA512 6472d1237ac9a1f47c1ee08c924cbcae018acaa6ee0f4e7d69de725eb31a964d39a67f6ab8bb58756e31ab25d964b4332ab851ca96ce56850691ba63a562e40d
-EBUILD qtile-9999.ebuild 1577 BLAKE2B 7f082e34f42d2bcf6e355c71be6076263cdbb7b6060819dfbf22e9b311e09c4f772630a290ea176e9a7c178796610e7cbef7ca0d67867a07d2502435888681af SHA512 44b510b6405c03808052311b557c7f27bc799715063cc589d5d1344d7a2735220ec542778353e97e3b892d5b8c394b747d5764521a8d1fdaa225e733144d43ae
+DIST qtile-0.16.1.tar.gz 324668 BLAKE2B 1f75f5dbcab6180dcf778e28108e70b6dd01105fa275aadf4a53d96ab84f3b759cb8553bcf3de2011b0990d61adc9269663afa32b83d1aa9c052b00ef9e89358 SHA512 aea42f7f6799a88b586167a57f5b5ab6f1c5bb663dec352d15eb47ce0d37fb23c31d1631cab8178c71be5ae714ec12c35a350377383dba1749a98cd45c22515b
+EBUILD qtile-0.15.1.ebuild 1523 BLAKE2B a365fa9d927e72c0356b3982d455b0cd2aa98c5afa3c5e8f653220d5f761025f8675f72a8d54e8562b721eaddf908b8f07a52d07fd4d5ec03376b8c3a8048e0a SHA512 5ea08eaa0a396ac9157d1e0ba592290e3348264bf61dda1c2f33d2484a02bb14d555fc27e18542d13c40b4b652b69a520b75c4b651f0efa450c8eb8122c18771
+EBUILD qtile-0.16.1.ebuild 1054 BLAKE2B a742ac4720950a0006ecc72ce4b0be81339062e842c87375632c778c4cf5e3713d363f3db61454ee0eb097b033a7785c1057ce67dc6ca648267acd5eb288a2a8 SHA512 2c70f99244911102f5a82344a47ff51b789546f30f1264be661441b1a8bc4e85842a0da20db9a41fcdae3277e64d3e5cf95b1754ba58ffa09a2c9100794a78d6
 MISC metadata.xml 323 BLAKE2B e89bf065a17c1ae7499e749e1b2e0af729cb64cdadc6c2ad8b06d34290ae0afca0da51802e3b855c24c9ecd23e78bae8ba9ba89e3a7f464bcf88b90622a9a442 SHA512 33be266eccb74e19b4bc89ff482e44b3542543b3f693d00bb37f1e3cd08e2465632050119d2722410d23de278bb6b1a52e2769441ca3456d3c116ef890a99a7b
diff --git a/x11-wm/qtile/qtile-0.15.1.ebuild b/x11-wm/qtile/qtile-0.15.1.ebuild
index dae1095c6247..afcf3b32b6e2 100644
--- a/x11-wm/qtile/qtile-0.15.1.ebuild
+++ b/x11-wm/qtile/qtile-0.15.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/qtile/qtile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
diff --git a/x11-wm/qtile/qtile-0.16.0.ebuild b/x11-wm/qtile/qtile-0.16.1.ebuild
index dae1095c6247..87156d77f39d 100644
--- a/x11-wm/qtile/qtile-0.16.0.ebuild
+++ b/x11-wm/qtile/qtile-0.16.1.ebuild
@@ -2,54 +2,37 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
 
-inherit distutils-r1 virtualx
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+PYTHON_COMPAT=( python3_{7,8} )
 
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/qtile/qtile.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/qtile/qtile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
+inherit distutils-r1
 
 DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
 HOMEPAGE="http://qtile.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="test"
-# docs require sphinxcontrib-blockdiag and sphinxcontrib-seqdiag
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="test"
+
+# requires internet and specific
+# pulseaudio settings
 
 RDEPEND="
 	x11-libs/cairo[X,xcb(+)]
 	x11-libs/pango
 	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	>=dev-python/cairocffi-0.9.0[${PYTHON_USEDEP}]
 	>=dev-python/cffi-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
 	>=dev-python/xcffib-0.8.1[${PYTHON_USEDEP}]
+	media-sound/pulseaudio
 "
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/xvfbwrapper[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xephyr]
-		x11-apps/xeyes
-		x11-apps/xcalc
-		x11-apps/xclock
-	)
-"
-
-# display retry backoff slowness and failures
-RESTRICT="test"
-
-python_test() {
-	# force usage of built module
-	rm -rf "${S}"/libqtile || die
-	PYTHONPATH="${BUILD_DIR}/lib" py.test -v "${S}"/test || die "tests failed under ${EPYTHON}"
-}
 
 python_install_all() {
 	local DOCS=( CHANGELOG README.rst )
diff --git a/x11-wm/qtile/qtile-9999.ebuild b/x11-wm/qtile/qtile-9999.ebuild
deleted file mode 100644
index 1115fc9d170d..000000000000
--- a/x11-wm/qtile/qtile-9999.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1 virtualx
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/qtile/qtile.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/qtile/qtile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
-HOMEPAGE="http://qtile.org/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-# docs require sphinxcontrib-blockdiag and sphinxcontrib-seqdiag
-
-RDEPEND="
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/pango
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cairocffi-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/cffi-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/xcffib-0.8.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/xvfbwrapper[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xephyr]
-		x11-apps/xeyes
-		x11-apps/xcalc
-		x11-apps/xclock
-	)
-"
-
-# display retry backoff slowness and failures
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.12.0-tests.patch )
-
-python_test() {
-	# force usage of built module
-	rm -rf "${S}"/libqtile || die
-	PYTHONPATH="${BUILD_DIR}/lib" py.test -v "${S}"/test || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGELOG README.rst )
-	distutils-r1_python_install_all
-
-	insinto /usr/share/xsessions
-	doins resources/qtile.desktop
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN}
-}