gentoo resync : 03.11.2021

3 files changed, 21 insertions, 3 deletions

diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index ed7de699b5f3..9993bab68be1 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,11 +1,12 @@
 AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4b05f1463f8a6e332fffb2510b791a04fb9ad99ce7caba761b313fe2252c8d44893faa6ccef0d29 SHA512 2f8a79f6eea330ac9a6927c6cce29f9232c3c0650436f3f4c459d324bd5054a4ad82786d926e5e4c7384e74cb84d1fbb387c25b0b4c27fdb9514d526cbe02f9b
 AUX spice-gtk-0.37-adjust-to-window-scaling.patch 5257 BLAKE2B a60692c0e08cfed4933cdfe15378c428d4bd006b6f91412f5071519d9027efe95b94ecd3baf4ebabd7143d358433cccc7335ea41a9a5fb9ed280e63664c04d01 SHA512 13afe7b894954d25635c2fc146b6386eb3973c151363067ec0762f95a349bf6d2d26005521214db07fd2a69ce9e994c9d25b92d0b80882c015b8313bb2016328
+AUX spice-gtk-0.39-fix-finding-pyparsing.patch 634 BLAKE2B 232f39c0762c23553952e3f84018622b01f51ea2e1967b83f1016cf9e096e798d914e044598dcf6c41359dc95116152409918d7be800fe686dbdaa2d711ce30b SHA512 54140731f5005d2ccbd41358f499be6dfcdf909606c894c3707f686ba80898595484f2509857608c54d60908dbbb1ef4309ae0673f47d1594eb7b543db39fb45
 DIST spice-gtk-0.37.tar.bz2 1303111 BLAKE2B cf4b6664ac86d126cf14f1a31b1df93079e15fc0a0af69bfaf61cb84284daa7b6b8cb2a2ee3345f6a475838ffc0fb2a2b0bdd61301e2c1479fb5f5e0c28babbe SHA512 a0a20bc6f25337d86e57fe1fc9586c4cc84457fc8c38cdcc5a728990a69018da0fca3ab5aa63349786b5a7508c82b716c94803eefb3495cffb7df4526db2d029
 DIST spice-gtk-0.38.tar.xz 796112 BLAKE2B c1542b5b76f9e23ffd1910273f358f656198829b1f615c6a8e0931a79d14920132c861facd534f4cf05f03c4f64a50f628f7daa93be581d5ac815f224b81fe16 SHA512 27b44ac9f0cee2737ce03bb3f47c62fc0ee2402c291c49fc56cffc4ccb63e2cab001a68ba865a6375d82cb38444408d59c68469783ee4279fa818d8682e902f3
 DIST spice-gtk-0.39.tar.xz 845528 BLAKE2B c886c4c9f0e51d7f2bf6dbfe574f1a2bcab249f863cb7da1f009410572cdaa7a35ef98fc370a7e74f7e490ad3bfe8ffa832601f8bb0b0894b90ec1de76495ce9 SHA512 ff0f3ca6b10a2c415f2fa8d61464c5710aaa2a46c2c83909f146fa45f01151e756d9c3d79cb162dd3d0c1279b6ef55a67fc5c1266af2cb5b46ac1eaa0254c8d2
 EBUILD spice-gtk-0.37-r3.ebuild 3674 BLAKE2B 84da9538eeff7eab47f2939ebfbd973e86d6f643590757fa8411998de0b328b090d0a681f32b896ff91f35805b9284009eec7e3d242039d8eab224e05667b92a SHA512 e8e1e7f9b6c148e0affe9d47ed661ce51790c73d30113f697598795b51fd89adc412e45c521e8f4ebe868254bad2c54c7b60eb5462ef8bc7c4ae99729a33f542
 EBUILD spice-gtk-0.38-r2.ebuild 2919 BLAKE2B d6117db4bcbbb8d77594c317ddb960ca75c78946e3a1d3bd1eb486c26f9bfbec35d1c25d71eaee0e6d09e0566061b5cd67834fc0e2343a1f7de1ea91ea796630 SHA512 089bcfe5ce85ec0d4644e04ac99d9c74173798516f2b9452193c285adaf469ad143053677eae86a4d0f05434d4af7fdab4b8e261b3a2c27436c8778d91fbd320
 EBUILD spice-gtk-0.38-r3.ebuild 3319 BLAKE2B 1b7912c86dad9cbed13e7e2d5f2608e271abb39045653a3a9e50bf1b38cfe9fa322629bdee75c2d93bec6041d3108d4850603f29779057e13a098593d25a9f28 SHA512 aa18468381279926d959966b0dd801635f9238e5922971d3e60088a85e0e389d13b9629df9b8cb704d6a6709ae7220f3c1a53a561992ac9ae183c5ad860d2c3d
-EBUILD spice-gtk-0.39-r1.ebuild 3147 BLAKE2B 70c395c5452215cd0cf1abd86722dd9d802f05a5d65283174d7d0a55b5a2bb26626792f4635a3d0b88f1b8ffb6372f1905449546082705642723bed37ea09b16 SHA512 808d81542347c4a7ac0105f2efd478c667613f0e1bf08e13aae536cf00094e9a4e2e2a565a76ce7771bfb59cc84352e6779912bee49b05a5ef38c691c6d50c3f
+EBUILD spice-gtk-0.39-r1.ebuild 3220 BLAKE2B 478d061fbec387c56fdaae65c693201f19b9c92103072d9160893162c6e1ae20a52426565957749fbb7a4e365368f2678101d9bc8c0b4873c672c6e48c1f2bf8 SHA512 b9a4129b5538950a2ee08d1716753dde9df0f1b1bdb6635e07169e00686697a6b91b93275ac520e01f6441ee2bd51943d574a349d6f44106f6067b417d9fab9c
 EBUILD spice-gtk-9999.ebuild 3172 BLAKE2B 6793e6ddcfa8938f80b1696477e3e9f40efab36ea72bf2dc9755dcc825fc3b97ea4a79e34e132c2f18aa6c314546c0536b55aca8839f58e961b4be4e98574df7 SHA512 b39b46062bd7d3b24188ed78150403a64a6248f13293524f8588e956d01fa99d9f4d47cf98ee7b9b2c07e75ff504ddb3902c349d0d42a39f904b29be6e371449
 MISC metadata.xml 786 BLAKE2B 92848ffe7209398af8bb17b6ec7017474aac7abfd9b2d1babdf9724c909ab364c53d23115d46c7cfc316ac2014c56d89a80590924e5fa31302b9a9016783e30d SHA512 1de921c89ecdeeaf601d8a362f025ed636a4125152a5042e51ca7c54c1b0dbe479566ad9528913c24209ac4c22c94c7b8a927bf6e352ea8223c65408af3a7dfa
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.39-fix-finding-pyparsing.patch b/net-misc/spice-gtk/files/spice-gtk-0.39-fix-finding-pyparsing.patch
new file mode 100644
index 000000000000..9a3cdd090063
--- /dev/null
+++ b/net-misc/spice-gtk/files/spice-gtk-0.39-fix-finding-pyparsing.patch
@@ -0,0 +1,13 @@
+https://gitlab.freedesktop.org/spice/spice-common/-/issues/5
+https://bugs.gentoo.org/820074
+--- a/subprojects/spice-common/meson.build
++++ b/subprojects/spice-common/meson.build
+@@ -132,7 +132,7 @@ if spice_common_generate_client_code or spice_common_generate_server_code
+   if get_option('python-checks')
+     foreach module : ['six', 'pyparsing']
+       message('Checking for python module @0@'.format(module))
+-      cmd = run_command(python, '-m', module)
++      cmd = run_command(python, '-c', 'import @0@'.format(module))
+       if cmd.returncode() != 0
+         error('Python module @0@ not found'.format(module))
+       endif
diff --git a/net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild
index 7005e220e2e1..08fdbf6d9fa4 100644
--- a/net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild
@@ -79,9 +79,13 @@ BDEPEND="
 	')
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.39-fix-finding-pyparsing.patch
+)
+
 python_check_deps() {
-	has_version "dev-python/six[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/pyparsing[${PYTHON_USEDEP}]"
+	has_version -b "dev-python/six[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
 }
 
 src_prepare() {