gentoo resync : 25.11.2020

4 files changed, 13 insertions, 11 deletions

diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index a49a374f6a31..73307463b4fa 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,9 +1,9 @@
 AUX pygame-2.0.0_pre10-py39.patch 1174 BLAKE2B dda7880b7a57e62612f072ed25c9c661ca63665d94d3a8fd9bcb2d95683da80d215067e63925eb65d98b4bf13c53845b7093011da42c4403c65bb95253a6fecf SHA512 91900ab98546a5339fcf4d204e3d049de9ad9bcc929dd75fc39629d873532d9e486f35ba0236e74185e1b7298016cc419c5ca1d463af80ee7f425244b7f51ade
 DIST pygame-1.9.6.tar.gz 3223131 BLAKE2B a4d04c933fcad244d32bd512ef8717e60ec923f361e9e0296b5c7d57c5949d3434a040d028249c5b8f3c865ac3dcdbb32e6f0b223186678595a8625213ba2a17 SHA512 d923c554203a7c35e37921658cb4c5bf50215ab0ff4d2b869a1ee6b2e2ca31d66ec4bbde4287f5a777838ffe932cd15b993cb0224b86e43d684de61c35acbcd0
 DIST pygame-2.0.0.dev10.tar.gz 5567274 BLAKE2B 7d78f260318cfabeb33f1073ae210f890d2f772e3ef302f243cca67724c6012355644ba60d4cae6de72db6dd61d320177deff6ee83dd355ec4cc33e841b565f7 SHA512 4cee7599fd8a6d31ddd66bfaad3bbb67cb167c1ae339f37e83322d810fea8746e81a191c224a0eeb6cc43a64bf1730ff0886c82f1a4f642e2e656ca9a837bf9e
-DIST pygame-2.0.0.dev12.tar.gz 5598471 BLAKE2B 339e96ed7f01070c3aa4b31b587a793b43b99ac476d72a431dff09d98b95ef48c6b0d4faa20301e6db43cb2b35b13245253d86859c16d2befbd3795f8ed48b7f SHA512 f732056b3c8377326caf1d6ded6c59e8665de2ab2f6233d6d95dcc26137d67d180f8c5dc92fc22578ec5ce0ecf5a1de5080c62355d15035ab248d518cd75180f
+DIST pygame-2.0.0.tar.gz 5522621 BLAKE2B 49773979af53595d3ff2db1a18e4bcd217e26db3ec28d6129d2a588f23a1bd5326fa79fab32c25aa796738cde0e68f5741bee58f62432e86f89cd49ee17a8f14 SHA512 3f65924d0e1d2863b84118a4e468b521a289e2cf174405c6f3ee2b2a2ed399cde7f9f310d57c4166351f84caaea02dd7408ee852dbcee7c205bb2955b6078fda
 EBUILD pygame-1.9.6-r1.ebuild 2294 BLAKE2B 1bf372a3814f5d28db059250e0adfd1f039d7d594801b5b319b77e5137c25957658c6db0a963888f5737dc5850e2385fe4819bb711dab7f0fd021bdbb8375cad SHA512 23959b2a00d38297e146d11a803771e0b18a48ef605e0696f008c23c64e134e8a170f79015169de8652c1384440a7648915a44840f5ac6bcc9f1a1b74689e085
-EBUILD pygame-2.0.0_pre10.ebuild 1915 BLAKE2B 7e072dd3f1f5df48f53694e4d008b19b029e510aec1cba87c9da37a646f702e4e4ff8612f37eb0cc0e5eae9a18bd63c65e3055173eb891706b7ea03b41688e97 SHA512 db2c8170f17c35e18a098a88c23085e575abe70607bf65dd0966148b2cc218abb77333bfc65852bc367d22b8d071ad66eb13ecc12436fdbd338e8a909e2007e9
-EBUILD pygame-2.0.0_pre12.ebuild 1993 BLAKE2B 7d03da256caa54c1a6c653d36b18b4f2109a844c5b70300de5820f44746b1061309c33186521019cab3db6f611bf8f7384ca50f32be69ec5d7088cd7552b889a SHA512 d6fd335dee453927ffa70ba7c43cf72bccd7a520b112afe498cdd50390982966aa885a8d81a5c90586eaa580ec0856924568fed08193ee3dfb2c3e97430261ec
-EBUILD pygame-9999.ebuild 1720 BLAKE2B c08896002640462a1fa0976d69e4d1e287701d8df12a2c878062ca740138568bcff58e93813d182912a838a5a97701f178f8066030e548de3cbd7fd8ae9d563a SHA512 ac2fde281f74e87da86e1bdbc33c7f3e7c308cac506452014650d0cebc6f6f9a84d011efd6fc98c6fa204d7c148d28b23be85c1da1f0e8e8221a1fd1347175a7
+EBUILD pygame-2.0.0.ebuild 2078 BLAKE2B 335022c652d050e93984fd7e1ec83d86bcc5c981915883b994dbc7186573f92e4cfe6a47e5674792b200bf36976eb4a1d4c1a3ce311d01a1df8e26c44d0826b8 SHA512 62634815ce97906a8742fec6c8e3b1d444e8253899712e444e3a521d68198cb6eb97df57cead16a0042773fe3ce42b8d3f8d8608dcdfd244a58393576ac4b8a6
+EBUILD pygame-2.0.0_pre10.ebuild 1911 BLAKE2B 1b9feec06c2cad0101e9a966dc9f52d3ea1e879cb425c021ec637e2dbc8f2cb8226d573bd99bd7616d0dedf99a3dc982c405effbd55a271f63c84f23f538d923 SHA512 e08204ab6ec0f7072b175d384c8fe2609e1e488b9b6215d0f4604431f619fc6d6d6e7f21aebdac3b206e9d8f92394b9dbf4fdcf0bf07764d9df7e412938302ce
+EBUILD pygame-9999.ebuild 1737 BLAKE2B c854247d528ccf4aaee3c348d16ee9148d2de2624080e80e233d947249719b1d3f16d0898703a1579b725fabc369679a2a3e113da4ce6af9f64fdf2d7dd983e7 SHA512 c3ff68bc1c97aff762c5b66507f1ae159476a55cc9b7395841c462769109a105bc961cac9e5f7284223d169c0afbbdd305a533b06ecf2966e7c0c07b4833096d
 MISC metadata.xml 408 BLAKE2B ae371ef164069765d0964da714a83c9898ddc190ac295c5ad5bbb6a3c45db5aa415d84ff21dbaa510e5c9852397e6b6b389684c54b67d83d675afd9b3d9a697e SHA512 a6e06c0bed59d5157166577a2dafa53f28a310c56f251bec36af077a79342c6f954fa63a3fa8d3546ca03cc9358e75eeb1ef04c6e0371e43e0b7bff51ffe35dd
diff --git a/dev-python/pygame/pygame-2.0.0_pre12.ebuild b/dev-python/pygame/pygame-2.0.0.ebuild
index 1db3ee0e3d01..a43bd4b42236 100644
--- a/dev-python/pygame/pygame-2.0.0_pre12.ebuild
+++ b/dev-python/pygame/pygame-2.0.0.ebuild
@@ -28,8 +28,8 @@ RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
 	>=media-libs/sdl2-ttf-2.0.6
 	>=media-libs/smpeg2-0.4.4-r1
 	midi? ( media-libs/portmidi )
-	X? ( >=media-libs/libsdl2-1.2.5[opengl?,video,X] )
-	!X? ( >=media-libs/libsdl2-1.2.5 )"
+	X? ( >=media-libs/libsdl2-1.2.5[opengl?,threads,video,X] )
+	!X? ( >=media-libs/libsdl2-1.2.5[threads] )"
 DEPEND="${RDEPEND}
 	test? (
 		media-libs/sdl2-image[gif,jpeg,png]
@@ -63,10 +63,12 @@ python_configure() {
 }
 
 python_test() {
-	local -x PYTHONPATH=
+	local -x PYTHONPATH=${BUILD_DIR}/install/lib
 	local -x SDL_VIDEODRIVER=dummy
 	local -x SDL_AUDIODRIVER=disk
-	distutils_install_for_testing
+	esetup.py install \
+		--root="${BUILD_DIR}"/install \
+		--install-lib=lib
 	script -eqc "${EPYTHON} -m pygame.tests" || die
 }
 
diff --git a/dev-python/pygame/pygame-2.0.0_pre10.ebuild b/dev-python/pygame/pygame-2.0.0_pre10.ebuild
index 914133a5646c..490902c9494e 100644
--- a/dev-python/pygame/pygame-2.0.0_pre10.ebuild
+++ b/dev-python/pygame/pygame-2.0.0_pre10.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="doc examples midi opengl test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygame/pygame-9999.ebuild b/dev-python/pygame/pygame-9999.ebuild
index 1023f6136c34..8a3845153d1d 100644
--- a/dev-python/pygame/pygame-9999.ebuild
+++ b/dev-python/pygame/pygame-9999.ebuild
@@ -22,8 +22,8 @@ RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
 	>=media-libs/sdl2-ttf-2.0.6
 	>=media-libs/smpeg2-0.4.4-r1
 	midi? ( media-libs/portmidi )
-	X? ( >=media-libs/libsdl2-1.2.5[opengl?,video,X] )
-	!X? ( >=media-libs/libsdl2-1.2.5 )"
+	X? ( >=media-libs/libsdl2-1.2.5[opengl?,threads,video,X] )
+	!X? ( >=media-libs/libsdl2-1.2.5[threads] )"
 DEPEND="${RDEPEND}
 	test? (
 		media-libs/sdl2-image[gif,jpeg,png]