Merge branch 'edge' into next

4 files changed, 2 insertions, 86 deletions

diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index 6e8a523c5189..a33b92e7e6b0 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,8 +1,4 @@
 AUX defs 273 BLAKE2B 5e1883f4d09a438b14d11ecb943b1f9ac9d9d0cdbc10bab7dfeb7ad19adfa38adc26bd42a0e4d857e1e00bb95d5de8af2538136b173ef70f4b3b25c88641a678 SHA512 4a51870b0b4de46995eeb2e74487e79eb6bd55fd8c0c736176655b22ff7737957cf16b7f86455bf6e9ae724dc773cd90d5d021c296985b93fbb25da01ac4c211
-DIST python-xlib-0.23.tar.bz2 172744 BLAKE2B 81ded38baaa93da53ffede91f8b0579328e3cdae35b8a3436b8e0651d54c03f4972f3af621e3e17023fa50e57ce90d62cda7b59e459e0d883c8264a513c7d09a SHA512 5e97000e59459cc0e8f21f9c9ee525a064b316e1cbd6d1a5bdaed9edb178ffd124216c27b4a9f365471416e2548b4f7947bf1ebc9f75fe0c2266f37e7134a6c1
-DIST python-xlib-0.26.tar.bz2 207058 BLAKE2B ff9562ca55233bb9ec6fbff19e1e7f4dcd39aa0f497c1aeccc21d50ccdecf8bddb7a6d556679fa133cb1721c7d1ebd41081325739d0f505571928ac74749bc42 SHA512 1f012861e657094323126f6065da4ff743728253625929676fc39ed8d2673e38b9f39f4be8ed2350c6d41a25a184a68489866c9a5edf07c87d62382651e6f884
 DIST python-xlib-0.27.tar.bz2 207119 BLAKE2B f34f5df34a64557d66f216bd03fb79b22364faab86e82761f43bf7c7cc0af744f6fa9a10b7a39fa42072c8ee0f25cebe3a8324471ecbb41dc3f33ed339875942 SHA512 6a25e796a2c522185e4df027bce8f423432dcbb5c4f74b96eb56e3d0e6e3a5be7570a872e479bbd556ef07b437043f7d97cdb2c21a0bb408e1cded44d2d9fa8f
-EBUILD python-xlib-0.23-r1.ebuild 930 BLAKE2B fa2ee98f3e3f000a4dbe7556fe0848510cd267ecd8f6d8ca26c1746af4828ee297b9cf3acfe70fbbfc81c61bea6cbda29cab355881e42cb488efbeee83ffceed SHA512 fae6e115cda6d98978a48372456f73e8bd106c25b2bc8cdebb997936495e3d4bf6c60c29e64dc870bf0e1a292d7797d16aee131d63ee71f4c993021a0a635319
-EBUILD python-xlib-0.26.ebuild 875 BLAKE2B 860df289b6ee2b9cfb35aef46c7b8ce1c14db97350ccfcdc7c9392d6c1afb430cf7e0443cfe4bddb11bf24e586612816a9a19306b7bd9d1abf1a00b86d5d7c31 SHA512 68fd66e011cf1eed14caca72c5fc0d5277ddb27c38dccd2133dc408b6782f8756fc03beea8dd6b3e1b093bb28d8743861d76987445905a7212765069b19f9fe6
-EBUILD python-xlib-0.27.ebuild 875 BLAKE2B 860df289b6ee2b9cfb35aef46c7b8ce1c14db97350ccfcdc7c9392d6c1afb430cf7e0443cfe4bddb11bf24e586612816a9a19306b7bd9d1abf1a00b86d5d7c31 SHA512 68fd66e011cf1eed14caca72c5fc0d5277ddb27c38dccd2133dc408b6782f8756fc03beea8dd6b3e1b093bb28d8743861d76987445905a7212765069b19f9fe6
+EBUILD python-xlib-0.27.ebuild 872 BLAKE2B b0f89b9e907a4c1063d7b050a96eb2add4edaf84715872c4e7e43a9717d4b589d77c7fb825301b847441eeeb7545c96137f562eec91c86b622321159762946ee SHA512 42b5f01ab1c4d6a2cf74c04baa2ed90282202d2398d4e241d107cda6a309a70ca4d6c354b6cdc3d3bf78659a068f020fda4dc386a4262f0b66c0a4d878024738
 MISC metadata.xml 384 BLAKE2B 625028de31c0d62262d9b7bfda98f2978ee17e9c52890086e6d68bfe23810f8729e03814666d3ffc2a8118813740a94bdef706a391ab908444f1475723a3c319 SHA512 43a2e7161edf8d2a527f35cbc8e590655df487f699e570dc542ab0b3f25b4c577599fa43a09efb4f8f3f67bd6a964acc8b446aa810ffbb2ea7f6dc9ab0f2ebd4
diff --git a/dev-python/python-xlib/python-xlib-0.23-r1.ebuild b/dev-python/python-xlib/python-xlib-0.23-r1.ebuild
deleted file mode 100644
index e72e8fd47cec..000000000000
--- a/dev-python/python-xlib/python-xlib-0.23-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="A fully functional X client library for Python, written in Python"
-HOMEPAGE="https://github.com/python-xlib/python-xlib"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
-IUSE="doc"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? ( sys-apps/texinfo )"
-
-# DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C doc/info
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && doinfo doc/info/*.info
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-xlib/python-xlib-0.26.ebuild b/dev-python/python-xlib/python-xlib-0.26.ebuild
deleted file mode 100644
index 8b9838d1974b..000000000000
--- a/dev-python/python-xlib/python-xlib-0.26.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="A fully functional X client library for Python, written in Python"
-HOMEPAGE="https://github.com/python-xlib/python-xlib"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? ( sys-apps/texinfo )"
-
-# DISTUTILS_IN_SOURCE_BUILD=1
-
-distutils_enable_tests unittest
-
-python_compile_all() {
-	use doc && emake -C doc/info
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_install_all() {
-	use doc && doinfo doc/info/*.info
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-xlib/python-xlib-0.27.ebuild b/dev-python/python-xlib/python-xlib-0.27.ebuild
index 8b9838d1974b..65044eed3df5 100644
--- a/dev-python/python-xlib/python-xlib-0.27.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.27.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 IUSE="doc"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"