gentoo resync : 25.08.2020

3 files changed, 11 insertions, 61 deletions

diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index bf32aca0df4c..2034efc66551 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,8 +1,6 @@
-DIST libvirt-python-6.0.0.tar.gz 196791 BLAKE2B 8fa524d76277fc0278158205f25da8a4331c732a7cbdbe7d9ef9c697b8d5758d8f4182ac749212f4b7c147cde5648fa8cd245cbe0ae809e9079ef654def3c4a1 SHA512 1d64bdb430d099c6e72259e49d99aa985b9ba745c543d3a12ad614c48e1334a3607e093d93612c34e8ec3990e880f3d66fd33199605f2ec9a419193bbb839d58
-DIST libvirt-python-6.1.0.tar.gz 196848 BLAKE2B 352cd4da292ffbe41fa7d06e862204507c89f8e5a7a2951a1a6e22b66d8c27b6a7394071bcf6eb025b00b7dba40a655c02f56f4c38278ba4bb0848f174642881 SHA512 a7994e21cbd5aa9c16aa4baa0e314ab3d71b15692e50da8f243994aee7393cc4dd2a27b39def87599ecfc32764980c71069ce4c904edc379219bd76a6344ce1e
 DIST libvirt-python-6.2.0.tar.gz 196971 BLAKE2B e11c82bd98c62072c14992c485339337bcc3639bbd56154185834c145f76984ced9f09f7f05c302609ce6629a8d13db77debd6f3d85e8fdb00c818bbe51cc552 SHA512 91f6940f60670221c914ee7ffc8d89a74222bcacbbf1afd5f679479f1e1bcec563f297a8e8359d6f51a1eee29162e39e2a276f5277fcec551d50f112e304a947
-EBUILD libvirt-python-6.0.0.ebuild 1005 BLAKE2B ef89689b51f250889f2cee6f0f5e60a1f698bccd1ae96f215ac386bef810e0533c304ffd6ce4eefea340396718cee118ddf2a03013e48f2e98645380e4d1217b SHA512 0559486c4d0ba13a61b480a6004bec296ffc6690926b6db7b06181a461717f8c62031c8d4434751642be914402ca75551956c4f906df76383483c1bc640fa37e
-EBUILD libvirt-python-6.1.0.ebuild 998 BLAKE2B 63b3df35fa4f1f70d41b853f67a2fc80a70306cabace4798b3036f2a643279c85b698dc0235122c1fc4e39aaa815454953d0368bdd1ba94317cb525c74b1d6e4 SHA512 9254a199c59e397e632b558da9c28ffb6f85190561eb7968156eb10ba5b8820dcb271e2fbd8c423e230fe0e50160033826c02b730ba430ba1cb502ba8f98fdb4
+DIST libvirt-python-6.5.0.tar.gz 198753 BLAKE2B 90951af538c664f5da20cfced6b81dc2b06d36e723b3c41a0b2763bf0d73d3036d7e84a2db57f20fa2bd1ede8fb01c45dad9e5097a9f6008579dae319f825898 SHA512 a69c75b615f674bbb89fdb3e5cfc3dddfde68adffd0599e9d03f1552bb765823dc003859fe713ac0a324835c61f909bd43518571ddde8f99c37bee2416f094eb
 EBUILD libvirt-python-6.2.0.ebuild 1005 BLAKE2B ef89689b51f250889f2cee6f0f5e60a1f698bccd1ae96f215ac386bef810e0533c304ffd6ce4eefea340396718cee118ddf2a03013e48f2e98645380e4d1217b SHA512 0559486c4d0ba13a61b480a6004bec296ffc6690926b6db7b06181a461717f8c62031c8d4434751642be914402ca75551956c4f906df76383483c1bc640fa37e
+EBUILD libvirt-python-6.5.0.ebuild 996 BLAKE2B 7d9d1ab02b9cc5caa4a85a1c42978a0dec3ccbd9059cdc1fa144f9f0ecf4d88e4924df803d9233ce0208522080b778ba806d491165505f830fd7b0794955a3bc SHA512 82fbf61c5652263fe0e2297b68c6393b283f3b647c097df1ce2328a41f126926dd3bdb5e7c42c11b0c952d21c412299952c5176ab53408714c0d9923b0818bed
 EBUILD libvirt-python-9999.ebuild 1001 BLAKE2B 727bfa4e64601efefa1a16aa24ee29091a8cc8060563c32e06a3bfd93c5dc6cd938d05973523f5666cc823017d18b7816079706ef4dd45ce6219dd3b4a055da6 SHA512 e56bb3138bcbb68a8b98dc5f134b6bbb319aff2d6a21bf63676c85c153e3a75072a9ca9db2a798beb2691e958e2a0d08e038549f1c8fcff719770d3df0872e0c
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-6.0.0.ebuild b/dev-python/libvirt-python/libvirt-python-6.0.0.ebuild
deleted file mode 100644
index 4f6663eb583d..000000000000
--- a/dev-python/libvirt-python/libvirt-python-6.0.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	SRC_URI=""
-	KEYWORDS="amd64 x86"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libvirt-python/libvirt-python-6.1.0.ebuild b/dev-python/libvirt-python/libvirt-python-6.5.0.ebuild
index bb55c2b9c375..d6867cec6ffc 100644
--- a/dev-python/libvirt-python/libvirt-python-6.1.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-6.5.0.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
+
+DISTUTILS_USE_SETUPTOOLS=no
 
 MY_P="${P/_rc/-rc}"
 
@@ -12,8 +14,6 @@ inherit distutils-r1
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	SRC_URI=""
-	KEYWORDS=""
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
@@ -29,14 +29,13 @@ SLOT="0"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
+DEPEND="virtual/pkgconfig"
+BDEPEND="test? (
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+)"
 
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests setup.py
 
 python_install_all() {
 	if use examples; then