gentoo Easter resync : 12.04.2020

5 files changed, 20 insertions, 83 deletions

diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index 13ad4af743aa..6e8a523c5189 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,9 +1,8 @@
 AUX defs 273 BLAKE2B 5e1883f4d09a438b14d11ecb943b1f9ac9d9d0cdbc10bab7dfeb7ad19adfa38adc26bd42a0e4d857e1e00bb95d5de8af2538136b173ef70f4b3b25c88641a678 SHA512 4a51870b0b4de46995eeb2e74487e79eb6bd55fd8c0c736176655b22ff7737957cf16b7f86455bf6e9ae724dc773cd90d5d021c296985b93fbb25da01ac4c211
-DIST python-xlib-0.15rc1.tar.gz 188750 BLAKE2B e35a1904975a6f5bbeb5ab5215f8ffaf87052b51a649c1c25455ef8039d5643e51195a801024b3717df930c486a126f0a055822b15b2f01d207b6a17fe01d5ba SHA512 e27f56e0d76fac534e6754b1e64316636b49859eb6c9ceef5952c8b42cf53bc798a705fa54c283c896324d9a23778beec583cb62984a6a43b024643a70f3fe3a
-DIST python-xlib-0.19.tar.bz2 188359 BLAKE2B ce7555b05ea84c5b74dcaa8457bfd1d8cd73d2c74e5a5a08e984fbe56ddb1036c26ecf669c67434eac31f7ff4aab723c5fe5672114cfa83f4693eb72835558b6 SHA512 070807eed50ce9a17926c36686dac5c143deff0b687a2967afade1a2f776d42ffbea0bbfad3a7480118ba7b1cf5ac0bb64978fdd3ca125c1df651af456dba5be
 DIST python-xlib-0.23.tar.bz2 172744 BLAKE2B 81ded38baaa93da53ffede91f8b0579328e3cdae35b8a3436b8e0651d54c03f4972f3af621e3e17023fa50e57ce90d62cda7b59e459e0d883c8264a513c7d09a SHA512 5e97000e59459cc0e8f21f9c9ee525a064b316e1cbd6d1a5bdaed9edb178ffd124216c27b4a9f365471416e2548b4f7947bf1ebc9f75fe0c2266f37e7134a6c1
-EBUILD python-xlib-0.15_rc1-r2.ebuild 910 BLAKE2B c5c697fb808dbb54f71fc8f968c5787bc538d3f3b87d7de84dd2d5ce00ea3f301ab25f9f869db9d12df57308a0df45e183c22f4107422831393dc5d5e1227548 SHA512 69cfb63dafa449c02e9aff8ee4ff962dbe52af72788b83d56b19f2ee10d9ccb0623effd4074db3ba60c085aa11e2e41e5bc7c8a1bc7a1b38bf34c7762e1730de
-EBUILD python-xlib-0.19.ebuild 1060 BLAKE2B f1296058ff70b80d7c6ffdce6818beb94998aaca1f42e16ba8fc8da17113cbec03079afc06ffb7c190bbf93ca0550319cfd6b495fcccdb88c02bd9ded26bafd2 SHA512 f10946db46ae1ad6a705b7498ca1d35aff8ce4a994fc524c075da392dc4662958a8b0e6731481c699b0a42358d8354011c7aa1653756b5457efc920029a487da
-EBUILD python-xlib-0.23-r1.ebuild 933 BLAKE2B de6b586df14a53eec123b17eb622de1e101915f545523b55660fdfc477cd081063825cdfd384a0c448174035859de061962d2672be5616c7f983924c4414ba1c SHA512 cd7bac717034a4f3e66d5fe6fa0f9113d7051879ea4d25d214356fc995eef5fa89e045f7c0e5f887e5489e73af9653ef46c4f73b8a63d2c1225b16fcdfe3fca5
-EBUILD python-xlib-0.23.ebuild 929 BLAKE2B bf0d8cd3453650c80c228cd36b7a051f8c3efc014cec2de6706d892004b4160e38b0c6cd2b691f80ed7f959a2280cf3ddd086b6d24d6849418dfd48e20bd26e2 SHA512 1fa9c12e4579f57b81d9742519585ce24d2c15b565f30d4c24fad20957ee9a2c0d3123909796ce8156267ec06b9e57e21eaaa7a228967e1a46929442fd31a2f4
+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
 MISC metadata.xml 384 BLAKE2B 625028de31c0d62262d9b7bfda98f2978ee17e9c52890086e6d68bfe23810f8729e03814666d3ffc2a8118813740a94bdef706a391ab908444f1475723a3c319 SHA512 43a2e7161edf8d2a527f35cbc8e590655df487f699e570dc542ab0b3f25b4c577599fa43a09efb4f8f3f67bd6a964acc8b446aa810ffbb2ea7f6dc9ab0f2ebd4
diff --git a/dev-python/python-xlib/python-xlib-0.15_rc1-r2.ebuild b/dev-python/python-xlib/python-xlib-0.15_rc1-r2.ebuild
deleted file mode 100644
index 3c77f997b4ac..000000000000
--- a/dev-python/python-xlib/python-xlib-0.15_rc1-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P="${P/_/}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A fully functional X client library for Python, written in Python"
-HOMEPAGE="http://python-xlib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
-IUSE="doc"
-
-python_prepare_all() {
-	sed -e 's:make:$(MAKE):g' -i doc/Makefile || die
-	cp -r "${FILESDIR}"/defs doc/src/ || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-		VARTEXFONTS="${T}"/fonts emake html
-	fi
-}
-
-python_test() {
-	cd test || die
-
-	local t
-	for t in *.py; do
-		"${PYTHON}" "${t}" || die
-	done
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-xlib/python-xlib-0.23-r1.ebuild b/dev-python/python-xlib/python-xlib-0.23-r1.ebuild
index bbc92c151cf4..e72e8fd47cec 100644
--- a/dev-python/python-xlib/python-xlib-0.23-r1.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.23-r1.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}]"
diff --git a/dev-python/python-xlib/python-xlib-0.23.ebuild b/dev-python/python-xlib/python-xlib-0.26.ebuild
index 873077481d53..8b9838d1974b 100644
--- a/dev-python/python-xlib/python-xlib-0.23.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.26.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1 virtualx
 
@@ -23,6 +23,8 @@ DEPEND="${RDEPEND}
 
 # DISTUTILS_IN_SOURCE_BUILD=1
 
+distutils_enable_tests unittest
+
 python_compile_all() {
 	use doc && emake -C doc/info
 }
@@ -31,10 +33,6 @@ 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.19.ebuild b/dev-python/python-xlib/python-xlib-0.27.ebuild
index 463754e79620..8b9838d1974b 100644
--- a/dev-python/python-xlib/python-xlib-0.19.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.27.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
-inherit distutils-r1
+inherit distutils-r1 virtualx
 
 DESCRIPTION="A fully functional X client library for Python, written in Python"
 HOMEPAGE="https://github.com/python-xlib/python-xlib"
@@ -18,34 +18,22 @@ IUSE="doc"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	doc? ( sys-apps/texinfo )"
 
 # DISTUTILS_IN_SOURCE_BUILD=1
 
-python_prepare_all() {
-	sed -e 's:make:$(MAKE):g' -i doc/Makefile || die
-	cp -r "${FILESDIR}"/defs doc/src/ || die
-
-	distutils-r1_python_prepare_all
-}
+distutils_enable_tests unittest
 
 python_compile_all() {
-	if use doc; then
-		cd doc || die
-		VARTEXFONTS="${T}"/fonts emake html
-	fi
+	use doc && emake -C doc/info
 }
 
-python_test() {
-	cd test || die
-
-	local t
-	for t in *.py; do
-		"${EPYTHON}" "${t}" || die
-	done
+src_test() {
+	virtx distutils-r1_src_test
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
+	use doc && doinfo doc/info/*.info
 	distutils-r1_python_install_all
 }