gentoo resync : 25.08.2020

5 files changed, 33 insertions, 91 deletions

diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 33d61950cf15..7a08fac61cc0 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,8 +1,7 @@
 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
-EBUILD pygame-1.9.6-r1.ebuild 2117 BLAKE2B d9635c59a2064809e8e8e4a6ffe2f0fecded0b3a8d49439210dbc01aa9f3fadd582fcefab30af5ec9818be34d3269c82f84553a0be94cc22a5d17739dcb98588 SHA512 8aa1b69e1faa035bc37b1ad57bff067f27c51d3ce7bac19a83d3c8c65075c956ee58547287e14c14c3745b3a232ebd0b8c8f845392ff6d4e8100225dc145a825
-EBUILD pygame-1.9.6.ebuild 1764 BLAKE2B c70233d00aed5294fa88da407f836ee06093009855a7165fd735a9f260e4f588339c0e56f9c934f0d74b14d65e703c491c21de481fbceb3402ecedc677e21c5d SHA512 50423f254afef8348078a141e2ceef4e3032343face6695be6d37d815026fc1e99c09c86448636ad29389b174f36560aa9e1ee58269e6a28fb1c01c4a979bc03
-EBUILD pygame-2.0.0_pre10.ebuild 1834 BLAKE2B cc73979a27f3af53130c184958147015db1b769b8f2ddb97dd3921c4aae9e72b65a0f125a246d00df870119020fc6fde1c89f017f7d72ca4de5dc0eec1e19585 SHA512 84b0fb7c2bba04335f33c86cddb4cca6941db0a8a4834bb428389884e3e00423d36161d2fac0d3d5f2b83e72d8d39c26e9354b038af6e895bf8411ad1fe12127
-EBUILD pygame-9999.ebuild 1638 BLAKE2B fe75a0c2d94974980b1b6462c8a3e5bd08b881606a541666ba6642304634d8a688a2dcb746d92854c1e68164b9cc07e904f454bcb87eff7315ae25f8767f72a4 SHA512 d5be31c553fd9bb1f4fab7084ea7553466086a6f4f68322797fc62c573bf562dd055bf9f33cb2deee614061224f39ac8e02343dfbce52c84b4abc204dee058ab
+EBUILD pygame-1.9.6-r1.ebuild 2294 BLAKE2B 1bf372a3814f5d28db059250e0adfd1f039d7d594801b5b319b77e5137c25957658c6db0a963888f5737dc5850e2385fe4819bb711dab7f0fd021bdbb8375cad SHA512 23959b2a00d38297e146d11a803771e0b18a48ef605e0696f008c23c64e134e8a170f79015169de8652c1384440a7648915a44840f5ac6bcc9f1a1b74689e085
+EBUILD pygame-2.0.0_pre10.ebuild 1916 BLAKE2B 48980667d10d35d8ecccab3338f3c6090f25911289a3dda92ecc11b810afdfa297b574c63a4ddd4ca6e4d5c4e688cfe49d1786f2b38865738d81d9582f120f5c SHA512 5d8d2f7679f69ead0f7070be482ddfa68aafe42be4ece4ca902489511211a6603068d4791007fb8ae238c45803dc6286ac90878e5c33f558f74364e74b1fbccb
+EBUILD pygame-9999.ebuild 1720 BLAKE2B c08896002640462a1fa0976d69e4d1e287701d8df12a2c878062ca740138568bcff58e93813d182912a838a5a97701f178f8066030e548de3cbd7fd8ae9d563a SHA512 ac2fde281f74e87da86e1bdbc33c7f3e7c308cac506452014650d0cebc6f6f9a84d011efd6fc98c6fa204d7c148d28b23be85c1da1f0e8e8221a1fd1347175a7
 MISC metadata.xml 408 BLAKE2B ae371ef164069765d0964da714a83c9898ddc190ac295c5ad5bbb6a3c45db5aa415d84ff21dbaa510e5c9852397e6b6b389684c54b67d83d675afd9b3d9a697e SHA512 a6e06c0bed59d5157166577a2dafa53f28a310c56f251bec36af077a79342c6f954fa63a3fa8d3546ca03cc9358e75eeb1ef04c6e0371e43e0b7bff51ffe35dd
diff --git a/dev-python/pygame/pygame-1.9.6-r1.ebuild b/dev-python/pygame/pygame-1.9.6-r1.ebuild
index e47cb5f359bc..6cda47383f18 100644
--- a/dev-python/pygame/pygame-1.9.6-r1.ebuild
+++ b/dev-python/pygame/pygame-1.9.6-r1.ebuild
@@ -12,11 +12,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 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 )"
 
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
 	>=media-libs/sdl-image-1.2.2[png,jpeg]
 	>=media-libs/sdl-mixer-1.2.4
 	>=media-libs/sdl-ttf-2.0.6
@@ -24,10 +24,20 @@ DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
 	midi? ( media-libs/portmidi )
 	X? ( >=media-libs/libsdl-1.2.5[opengl?,video,X] )
 	!X? ( >=media-libs/libsdl-1.2.5 )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	test? (
+		media-libs/sdl-image[gif,png,jpeg]
+		media-libs/sdl-mixer[mp3,vorbis,wav]
+	)"
+# fontconfig used for fc-list
+RDEPEND+="
+	media-libs/fontconfig"
 # util-linux provides script
 BDEPEND="
-	test? ( sys-apps/util-linux )"
+	test? (
+		media-libs/fontconfig
+		sys-apps/util-linux
+	)"
 
 src_prepare() {
 	# segfaults on Xvfb
diff --git a/dev-python/pygame/pygame-1.9.6.ebuild b/dev-python/pygame/pygame-1.9.6.ebuild
deleted file mode 100644
index d02e84e0e696..000000000000
--- a/dev-python/pygame/pygame-1.9.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit flag-o-matic distutils-r1 virtualx
-
-DESCRIPTION="Python bindings for SDL multimedia library"
-HOMEPAGE="http://www.pygame.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~sparc x86"
-IUSE="doc examples midi opengl X"
-
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	>=media-libs/sdl-image-1.2.2[png,jpeg]
-	>=media-libs/sdl-mixer-1.2.4
-	>=media-libs/sdl-ttf-2.0.6
-	>=media-libs/smpeg-0.4.4-r1
-	midi? ( media-libs/portmidi )
-	X? ( >=media-libs/libsdl-1.2.5[opengl?,video,X] )
-	!X? ( >=media-libs/libsdl-1.2.5 )"
-RDEPEND="${DEPEND}"
-
-# various module import and data path issues
-RESTRICT=test
-
-python_configure() {
-	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
-		"${EPYTHON}" "${S}"/buildconfig/config.py -auto
-
-	if ! use X; then
-		sed -e "s:^scrap :#&:" -i Setup || die "sed failed"
-	fi
-
-	# Disable automagic dependency on PortMidi.
-	if ! use midi; then
-		sed -e "s:^pypm :#&:" -i Setup || die "sed failed"
-	fi
-}
-
-python_compile() {
-	if [[ ${EPYTHON} == python2* ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-
-		append-flags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib" virtx "${EPYTHON}" -m pygame.tests
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Bug #497720
-	rm -fr "${D}"$(python_get_sitedir)/pygame/{docs,examples,tests}/ || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use doc; then
-		docinto html
-		dodoc -r docs/*
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-	fi
-}
diff --git a/dev-python/pygame/pygame-2.0.0_pre10.ebuild b/dev-python/pygame/pygame-2.0.0_pre10.ebuild
index e0019d48ec64..f1da10c2c2c8 100644
--- a/dev-python/pygame/pygame-2.0.0_pre10.ebuild
+++ b/dev-python/pygame/pygame-2.0.0_pre10.ebuild
@@ -22,7 +22,7 @@ IUSE="doc examples midi opengl test X"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	>=media-libs/sdl2-image-1.2.2[jpeg,png]
+	>=media-libs/sdl2-image-1.2.2
 	>=media-libs/sdl2-mixer-1.2.4
 	>=media-libs/sdl2-ttf-2.0.6
 	>=media-libs/smpeg2-0.4.4-r1
@@ -34,9 +34,15 @@ DEPEND="${RDEPEND}
 		media-libs/sdl2-image[gif,jpeg,png]
 		media-libs/sdl2-mixer[mp3,vorbis,wav]
 	)"
+# fontconfig used for fc-list
+RDEPEND+="
+	media-libs/fontconfig"
 # util-linux provides script
 BDEPEND="
-	test? ( sys-apps/util-linux )"
+	test? (
+		media-libs/fontconfig
+		sys-apps/util-linux
+	)"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-py39.patch
diff --git a/dev-python/pygame/pygame-9999.ebuild b/dev-python/pygame/pygame-9999.ebuild
index 9a1c6f7040a3..1023f6136c34 100644
--- a/dev-python/pygame/pygame-9999.ebuild
+++ b/dev-python/pygame/pygame-9999.ebuild
@@ -17,7 +17,7 @@ IUSE="doc examples midi opengl test X"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	>=media-libs/sdl2-image-1.2.2[jpeg,png]
+	>=media-libs/sdl2-image-1.2.2
 	>=media-libs/sdl2-mixer-1.2.4
 	>=media-libs/sdl2-ttf-2.0.6
 	>=media-libs/smpeg2-0.4.4-r1
@@ -29,9 +29,15 @@ DEPEND="${RDEPEND}
 		media-libs/sdl2-image[gif,jpeg,png]
 		media-libs/sdl2-mixer[mp3,vorbis,wav]
 	)"
+# fontconfig used for fc-list
+RDEPEND+="
+	media-libs/fontconfig"
 # util-linux provides script
 BDEPEND="
-	test? ( sys-apps/util-linux )"
+	test? (
+		media-libs/fontconfig
+		sys-apps/util-linux
+	)"
 
 python_configure() {
 	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \