gentoo auto-resync : 25:03:2023 - 00:48:54

6 files changed, 3 insertions, 227 deletions

diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 0f39cff8f9be..e7b5b1b4870d 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,12 +1,8 @@
-AUX pygame-2.1.2-cython_only.patch 1142 BLAKE2B fd4f8eb6be984aead9cf3988d9f1c820db1b62a17919e7af52c8a7ab03264b13a04f8cd77affc1822c351fd48533fbda6cb53a82ec8869cf924c036a8ba928f9 SHA512 943b22a97313b12344d94f3832e66763b3249925da5de6a9d2ccc4dc405a9dd81b5c53c2f26da7ad406a1928aa6e270a5db8c454c26708a78412956136b844f4
 AUX pygame-2.1.2-libsdl2-2.26-tests.patch 889 BLAKE2B b676d4f591041858492df2cbe087aa051b7ba3dd9d0480d9afdc878412fa6613131f8ab8f78c055f0cdf014627ba42dc9c4118798c81a8365f457225af231282 SHA512 8577b3f39828d65db0b08ed3c59d15a6de26d0f0f1bb085137c4a5a97aa0498cb9572292bca87ae2162316a001f8d9ddf5834626dc0af8162194ae483091d68c
-DIST pygame-2.1.2.gh.tar.gz 6100415 BLAKE2B 4b81c2f0abc2c2c4732ddb8f8e6d4bffa5169e3d3ee2d9ea2798d294623a9c70e2ff004825030606285124ef1347177b46adc676db450785e8420de45f37db34 SHA512 531cb0371853def7a3ddb8eb0110fbd58acaf1b2351d7518402c9a960baca705bb34da879015e7a6cd5f2f8af98c57e7bc732021a8f62ed9f90cacf068c9c2d6
 DIST pygame-2.1.3.gh.tar.gz 6517003 BLAKE2B 9f2062b24ef2e97995207fbf7572a8aa4d3475356e8646356758ad72b0b744fcf911adaa78bb730ed43c95fa23b8ed733a5573882bd83e112ae5e7e6ef099de9 SHA512 28f46826f58f73607b28c1411c6f2b71796cd4f98103df2dd47db842f578fe7f26dac01cb60d1cb00ac9dacfa62c6c3b913a244379ce70bd03265424e29052e6
 DIST pygame-2.2.0.gh.tar.gz 6530469 BLAKE2B 301b8decd7afe7ad44d97b086ad27209a084884993122f0c8d6973e718cb811587aa2e2c34b5e9fc5859410ced4c298b24127b4bf166dbeaa225b5c731c66cb6 SHA512 212e0f6390fa84f4fbcb3051ecb83c324a59d7591fd216a0f17946a581cf01540116162357b41004a387fbd3395e030a5a6d5f804496d84558125f512c9c2617
 DIST pygame-2.3.0.gh.tar.gz 6547956 BLAKE2B 3189dc5dda7e5fc12fe2091af304816d905a24a33f6f43070040b90bd1bac1191fe6fe1a738ccfda49b5d9b472a704962c3b6aa7d8b99bc67e15317a9df06a2b SHA512 ed93cf5f0fac67b8a03f25f514ac71bf9b9a97f4df30efca9e3225396769e7616d3ce1063e6cc6ee3f4e6f1327154a9e0ec4e81b179578118af3a140bb1543bd
-EBUILD pygame-2.1.2-r1.ebuild 2011 BLAKE2B 3d721d8ce7918067e94e2afb583e66d8f8d567b1d01d2b9827f1df5bf3e13e5ccf938bab043982f8d7ab379f36956153fd6ff65fdcb541f7fb2793bb8f83595b SHA512 489fbd4bac984cccb0be03dff55123228dde3002348273c176262eba6350300f5c27234bb60cd0723658ff1ef7964531e3533b8a3f75d2a496016c1752b05de6
-EBUILD pygame-2.1.2-r2.ebuild 2157 BLAKE2B 133a6d73be620e5001376d9d39cc02e1a0e818951359abe732416f44f2c5615affca5313025ac9f6ee8697680c086a2972a7717f23d5ee15730698fcd81497a5 SHA512 bf29df0a51dc388ff81eb88594fb0909ee9e74a28c3a24b8106493cd736de316e69f3653703287a883cd48170f5bc6935d84e5d486b19480bcd8aca132ad1837
-EBUILD pygame-2.1.3.ebuild 1976 BLAKE2B c281ae360bf9baefda90260eb1388e3cc5fb620b56a0e7f5ba26ec99abdb698e1b3cb07656ecb180733c81ea5f9a65f8c9257745e7f0c68ebaa06af862f92a3e SHA512 b345a4da9f283cad585ddcdb269de23a0486c439c50a99861b068aa1254c43055ff81e71f9ca85a1b3f5df683a8b292caf60af7d695f3ff0849372a4d2fdb6fd
+EBUILD pygame-2.1.3.ebuild 1975 BLAKE2B 9d8d7ebb593c89452536e91989833bae2d208a151450f331033e08c9389ad41221f064371d9dd71732f46d059f797185bf94b473164d9525baf6c425e5465674 SHA512 1380ffd43c772136ebf8216ffcf16febdd3d12065792021052f35b2d282130c7fde6dcc09906ccb97eb2247c519c4517b1bf726c5d26cc9d54ae396039fc100c
 EBUILD pygame-2.2.0.ebuild 1916 BLAKE2B be3df976b5bff81721344d9e25613cc44ffc940ac4695329de90dcbf6aaf1e4ff0f89c2be3526dd96243cd0301f27b74df05f534e563ae68c4515349089cd490 SHA512 0519c416542e271dabc59be0491ab5995cfc4adec586ed143fd276abb032674821ec31c45848b741138fd3aced2a3c6e04f4447d55ac16515027e865563388dd
 EBUILD pygame-2.3.0.ebuild 1916 BLAKE2B be3df976b5bff81721344d9e25613cc44ffc940ac4695329de90dcbf6aaf1e4ff0f89c2be3526dd96243cd0301f27b74df05f534e563ae68c4515349089cd490 SHA512 0519c416542e271dabc59be0491ab5995cfc4adec586ed143fd276abb032674821ec31c45848b741138fd3aced2a3c6e04f4447d55ac16515027e865563388dd
-MISC metadata.xml 462 BLAKE2B 398db1c050bbf14a65ac770e980ca91269277ecb00d94457502532ef7c407145cc2438ead46d370d1195331fd3d2f9602ecbb381c9f178240d031d1c665a9324 SHA512 2e95b731a4cb49372e6af00bb059bd179dc167aaac07f412c51970cf27b0fdddda616fb59bbbd62101c1b6f272cc0263123e334df01ebf6d1697ef8b55b62fef
+MISC metadata.xml 363 BLAKE2B a942b91aded22ec850a7b075703ce4037af9f0a61155717ac455f7d2b7779cb6f5f953b2ad8d61d7cc5254307951a20dd3edb9853e21d907e1999f7570a6b821 SHA512 15403754c9b13f9b2d8c5e7615ae0ca9359b5079e22eb5a7049424e414ebbdd8a06f6324c31594636324414e35ca34bec977b7dded9f9ea14027497b5097b060
diff --git a/dev-python/pygame/files/pygame-2.1.2-cython_only.patch b/dev-python/pygame/files/pygame-2.1.2-cython_only.patch
deleted file mode 100644
index 4fb935dcf668..000000000000
--- a/dev-python/pygame/files/pygame-2.1.2-cython_only.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Backport to ease running cythonize, DISTUTILS_ARGS=(cython) resulted in
-reconfigure attempts that failed without PORTMIDI* being exported.
-
-https://github.com/pygame/pygame/commit/4eeffc049cf
-From: Ankith <46915066+ankith26@users.noreply.github.com>
-Date: Fri, 3 Jun 2022 21:27:57 +0530
-Subject: [PATCH] Add cython_only option to setup.py
---- a/setup.py
-+++ b/setup.py
-@@ -209,7 +209,16 @@ def consume_arg(name):
-     cflags += '-mfpu=neon'
-     os.environ['CFLAGS'] = cflags
- 
-+compile_cython = False
-+cython_only = False
- if consume_arg('cython'):
-+    compile_cython = True
-+
-+if consume_arg('cython_only'):
-+    compile_cython = True
-+    cython_only = True
-+
-+if compile_cython:
-     # compile .pyx files
-     # So you can `setup.py cython` or `setup.py cython install`
-     try:
-@@ -280,6 +289,9 @@ def consume_arg(name):
-     for i, kwargs in enumerate(queue):
-         kwargs['progress'] = f'[{i + 1}/{count}] '
-         cythonize_one(**kwargs)
-+    
-+    if cython_only:
-+        sys.exit(0)
- 
- no_compilation = any(x in ['lint', 'format', 'docs'] for x in sys.argv)
- AUTO_CONFIG = not os.path.isfile('Setup') and not no_compilation
diff --git a/dev-python/pygame/metadata.xml b/dev-python/pygame/metadata.xml
index 4ce54800af77..0ac44a30fbe9 100644
--- a/dev-python/pygame/metadata.xml
+++ b/dev-python/pygame/metadata.xml
@@ -5,9 +5,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<use>
-		<flag name="midi">Enable midi support using <pkg>media-libs/portmidi</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="pypi">pygame</remote-id>
 		<remote-id type="github">pygame/pygame</remote-id>
diff --git a/dev-python/pygame/pygame-2.1.2-r1.ebuild b/dev-python/pygame/pygame-2.1.2-r1.ebuild
deleted file mode 100644
index c7b3c066375a..000000000000
--- a/dev-python/pygame/pygame-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for SDL multimedia library"
-HOMEPAGE="https://www.pygame.org/"
-SRC_URI="
-	https://github.com/pygame/pygame/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="examples midi opengl test X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/freetype
-	media-libs/libpng:0=
-	>=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
-	virtual/jpeg
-	midi? ( media-libs/portmidi )
-	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,tiff]
-		media-libs/sdl2-mixer[mp3,vorbis,wav]
-	)"
-# fontconfig used for fc-list
-RDEPEND+="
-	media-libs/fontconfig"
-# util-linux provides script
-BDEPEND="
-	test? (
-		media-libs/fontconfig
-		sys-apps/util-linux
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libsdl2-2.26-tests.patch
-)
-
-src_prepare() {
-	if ! use midi; then
-		rm test/midi_test.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_configure() {
-	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
-		"${EPYTHON}" "${S}"/buildconfig/config.py -auto || die
-
-	# Disable automagic dependency on PortMidi.
-	if ! use midi; then
-		sed -e "s:^pypm :#&:" -i Setup || die "sed failed"
-	fi
-}
-
-python_test() {
-	local -x PYTHONPATH=${BUILD_DIR}/install/lib
-	local -x SDL_VIDEODRIVER=dummy
-	local -x SDL_AUDIODRIVER=disk
-	script -eqc "${EPYTHON} -m pygame.tests -v" || die
-}
-
-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
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pygame/pygame-2.1.2-r2.ebuild b/dev-python/pygame/pygame-2.1.2-r2.ebuild
deleted file mode 100644
index 2ceb169344ba..000000000000
--- a/dev-python/pygame/pygame-2.1.2-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for SDL multimedia library"
-HOMEPAGE="https://www.pygame.org/"
-SRC_URI="
-	https://github.com/pygame/pygame/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="examples midi opengl test X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/freetype
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/sdl2-image
-	media-libs/sdl2-mixer
-	media-libs/sdl2-ttf
-	midi? ( media-libs/portmidi )
-	X? ( media-libs/libsdl2[opengl?,threads,video,X] )
-	!X? ( media-libs/libsdl2[threads] )"
-DEPEND="
-	${RDEPEND}
-	test? (
-		media-libs/sdl2-image[gif,jpeg,png,tiff,webp]
-		media-libs/sdl2-mixer[mp3,vorbis,wav]
-	)"
-# fontconfig used for fc-list
-RDEPEND+="
-	media-libs/fontconfig"
-# util-linux provides script
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		media-libs/fontconfig
-		sys-apps/util-linux
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libsdl2-2.26-tests.patch
-	"${FILESDIR}"/${P}-cython_only.patch
-)
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	if ! use midi; then
-		rm test/midi_test.py || die
-	fi
-}
-
-python_configure() {
-	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
-		"${EPYTHON}" "${S}"/buildconfig/config.py -auto || die
-
-	# Disable automagic dependency on PortMidi.
-	if ! use midi; then
-		sed -e "s:^pypm :#&:" -i Setup || die
-	fi
-}
-
-python_configure_all() {
-	find src_c/cython -name '*.pyx' -exec touch {} + || die
-	"${EPYTHON}" setup.py cython_only || die
-}
-
-python_test() {
-	local -x PYTHONPATH=${BUILD_DIR}/install/lib
-	local -x SDL_VIDEODRIVER=dummy
-	local -x SDL_AUDIODRIVER=disk
-	script -eqc "${EPYTHON} -m pygame.tests -v" || die
-}
-
-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
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pygame/pygame-2.1.3.ebuild b/dev-python/pygame/pygame-2.1.3.ebuild
index 619bb384a172..cb006ada8fc6 100644
--- a/dev-python/pygame/pygame-2.1.3.ebuild
+++ b/dev-python/pygame/pygame-2.1.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="examples opengl test X"
 RESTRICT="!test? ( test )"