gentoo resync : 16.04.2022

4 files changed, 43 insertions, 11 deletions

diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index a2c092a6e9e8..794ea33db33f 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,6 +1,7 @@
+AUX virt-manager-4.0.0-setuptools-61-fix.patch 993 BLAKE2B e129b16cdfb1fb819f4cc8e99b67c28a259de92e62254ddd6d2fd4920ab1713cfb3329d219d692a37b963eff6dedfef36e5e5763ec25d7ce736767d17c52966e SHA512 eb0ec5d9cd73ce35b0c0cc75413e607bb57854a0430ef509acbc438d829ba84dc06441f8b333133c2de7cd423b3110faa0b5012eeff72e594905376b716265fa
 DIST virt-manager-3.2.0.tar.gz 2858909 BLAKE2B 83bd8589fb7d9c855300e06689fdeeeee575e354f9349b5bc63ff1da1a8b578a842f6f60d95a8b8fa53ed007c090d37f706f50fb8dcbcee83c08e27853a150cc SHA512 90cd98fe6b269007cd30f628490c65df440abe39b4925c65dc80667e7d80d059752695353ccf6ac3e2436206da311bc402eda50df31874d82ef8fe115966e1ec
 DIST virt-manager-4.0.0.tar.gz 3096236 BLAKE2B cf6ae282c6a351aab832a06387bf9daf9093c8cce3688cf0597f33d037db875638429a5320ffe28d8d860c83484ba5d6a02a8dc758c98914fa2af483552dede8 SHA512 115dc3feb499bb2f1f6df537bffe150d23b9b568fe8047d43577a138ff9b9180b10259dde3476136cdc85750576da1104e81a8c2f5761b4f2a89852467761f81
 EBUILD virt-manager-3.2.0-r1.ebuild 2566 BLAKE2B 9fdea4cfaa4d6cbe5f9b9000695ebd02c8e2c4d9d4ed0222a90690f977f72de63f997187295b13c110242b016003bf693ac032e2edc59eea2b3ea6fd81436336 SHA512 72f75dd06013f473c8620e726a49dde64b20137d1020f7bab0933c3b79ec515eeeae50b592661eba25a0ad57995b06c780dde7b49fe0407141e8cc8a1c0f25e7
-EBUILD virt-manager-4.0.0.ebuild 2582 BLAKE2B 0d108df21ae9bbf274cffbceb86316c7fcfd08263d19214b8f4719b300137b25d5e2784818b460fd2c8be19f8ef14dde2b4bfd18edd5ade14048d79890ed8b24 SHA512 56723af37f1ce09120182e8948f4d77dc5554df81607c15f781bae62b39d6b2c71e8fc3ebaa40b85a81cda6928deab423d19f5440d8bdacf0ddd6a8945c8cf26
-EBUILD virt-manager-9999.ebuild 2569 BLAKE2B 283f21214824727cc312333de65e679abb1d828529c925bc0974776c0c4359e668e74ac8c7b3cd18c4b25051dabf9a8478246411534e0ce62e356d78d26d206e SHA512 5229ef5b1800803385e62196ce8b1dce9e234802e14653670f7b734098deb6ba81f259075e81a3f65bfec97a4c045beb417d85cb0fbd4019eee426c7c5008a21
+EBUILD virt-manager-4.0.0.ebuild 2609 BLAKE2B 74dde12b583551db6aa611046f482353a9ef777ae390f617fb10484e20e2225984e75ffa055d5c822a9607f4e761b4ce5b781d27ea38287d27c009464a13e706 SHA512 4ff3510f4be3bdd1b124f8ec1349920462f07ca9440f6b0c099cb323b306b75185b44e84156273b03fd4ed5ada735bec876e90d3ead99d2d7eed021778796138
+EBUILD virt-manager-9999.ebuild 2524 BLAKE2B 2ec7855cb1f40cbcfe9fc44268a67f232b363afb02beae4450360863721cb08cbc326df90464bc1541585d536dc4b8f699044788c84101cd8249b7ed956bfccf SHA512 8f07683cb85c6ccf57c76ab1451e5beee44dbb8bae4f4a7416e73359d544f5a191e0fcc45da7ba567db87a18c7b3d322a537cc5fd0f4f0ed5d7ffd79db873849
 MISC metadata.xml 663 BLAKE2B a8a1b7a90bab2c9ea216c0acf8fc26ee70626dcfe6f171c878edc711f6134911f74282fe7f1feb7725ddcd9cf4d650d145cdfe4143d1e844f380ab9d516178c9 SHA512 f1144dba3cc161096d5564da8264c04552b733085d12a9ccce5f4d74c0a73fb528fe89cc4e709539300151b60e70d1e8a318f15b8474982a32da9360a98c520d
diff --git a/app-emulation/virt-manager/files/virt-manager-4.0.0-setuptools-61-fix.patch b/app-emulation/virt-manager/files/virt-manager-4.0.0-setuptools-61-fix.patch
new file mode 100644
index 000000000000..ace16902486c
--- /dev/null
+++ b/app-emulation/virt-manager/files/virt-manager-4.0.0-setuptools-61-fix.patch
@@ -0,0 +1,34 @@
+From c6fc4524d4448259ea85f93f85898b64a4380154 Mon Sep 17 00:00:00 2001
+From: Peter Alfredsen <crabbedhaloablution@icloud.com>
+Date: Tue, 5 Apr 2022 22:04:20 +0200
+Subject: [PATCH] setup: add bits for setuptools-61
+
+Quoting https://github.com/pypa/setuptools/issues/3227
+"Setuptools >= 61, intentionally changes the way packages are built in the
+ sensec that it will try to find files and fail if something is weird.
+
+ Empty packages (like this one), are asked to explicitly add packages=[]
+ to their configuration.
+
+ This intentional change in behaviour is described in
+ https://setuptools.pypa.io/en/latest/history.html#v61-0-0."
+
+Bug: https://bugs.gentoo.org/836645
+Signed-off-by: Peter Alfredsen <crabbedhaloablution@icloud.com>
+---
+ setup.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup.py b/setup.py
+index e95acd39..7e47e7c7 100755
+--- a/setup.py
++++ b/setup.py
+@@ -547,4 +547,5 @@ setuptools.setup(
+     },
+ 
+     distclass=VMMDistribution,
++    packages=[],
+ )
+-- 
+2.35.1
+
diff --git a/app-emulation/virt-manager/virt-manager-4.0.0.ebuild b/app-emulation/virt-manager/virt-manager-4.0.0.ebuild
index fa0f4663c4b9..59336c29fbcc 100644
--- a/app-emulation/virt-manager/virt-manager-4.0.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-4.0.0.ebuild
@@ -54,11 +54,12 @@ DOCS=( README.md NEWS.md )
 
 # Doesn't seem to play nicely in a sandboxed environment.
 RESTRICT="test"
-distutils_enable_tests pytest
 
-src_prepare() {
-	distutils-r1_src_prepare
-}
+PATCHES=(
+	"${FILESDIR}"/virt-manager-4.0.0-setuptools-61-fix.patch
+)
+
+distutils_enable_tests pytest
 
 python_configure() {
 	esetup.py configure --default-graphics=spice
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 0f88e40eceea..b596c743f947 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -50,13 +50,9 @@ RDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}"
 BDEPEND="dev-python/docutils"
 
-distutils_enable_tests pytest
-
 DOCS=( README.md NEWS.md )
 
-src_prepare() {
-	distutils-r1_src_prepare
-}
+distutils_enable_tests pytest
 
 python_configure() {
 	esetup.py configure --default-graphics=spice