gentoo resync : 04.01.2022

3 files changed, 85 insertions, 2 deletions

diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 0251e1ee86fa..05c74c671365 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -7,13 +7,15 @@ DIST pygame-2.0.2.tar.gz 6309459 BLAKE2B 0cb23b4226d8d86f938cba08b67ab3bd847c9e4
 DIST pygame-2.0.3.tar.gz 5804279 BLAKE2B fb58dd57a9288bdff3c0d01389e363968ebddd4b2b0fa92335c825297026c5858da4f73a870f84e0c3c7cf302bd9f4163807c97a348d581658df7e7695fcb4fb SHA512 1d2b4cb1e577f0244c2b92511b8fa0ab7bcd689d04a4451ced41e6d97758ba380d7e681e60abed26c81b96bd49d505cf481c67a466437b3cfdb547e744f22949
 DIST pygame-2.1.0.tar.gz 5790847 BLAKE2B 1d2fc9f8d86ab823008cbb4c7431f44dd17ba5b356ed755a308737eb5a0db3c4033efe3fd4245bd740a33c6f4e5d2816daefc3785c747ef046b8f98aa8f58589 SHA512 b9394bea5dad54760297c75133ca56c99f89781340029f8866b169fcef3a7e12c16d00a18dd95f4fe3c13e393915d5b29b8d547465efb94f84b4875579166f1a
 DIST pygame-2.1.1.tar.gz 10132023 BLAKE2B 41f6beb02ada13208d71375f15e247c785261801f82dfc47dba22a28692b5aea01072e46f2fd281451ce778d5818812c74776bd791d47d465645fdef63ffefec SHA512 eea4be27bbf29cfeb98fb095121341e1366fed1cc1f3c16bb076adbd2f1c8583e51d34b93811259a80ea3e2a3bde83c8144e91cd83a7dde3cf730805c0b99ac3
+DIST pygame-2.1.2.gh.tar.gz 6100415 BLAKE2B 4b81c2f0abc2c2c4732ddb8f8e6d4bffa5169e3d3ee2d9ea2798d294623a9c70e2ff004825030606285124ef1347177b46adc676db450785e8420de45f37db34 SHA512 531cb0371853def7a3ddb8eb0110fbd58acaf1b2351d7518402c9a960baca705bb34da879015e7a6cd5f2f8af98c57e7bc732021a8f62ed9f90cacf068c9c2d6
 EBUILD pygame-1.9.6-r1.ebuild 2293 BLAKE2B 32d2a0539d064892d65ded4f4977c6c1e52f632ddf32d4e138a3a5a1a29a293a5762608e394d236bc0aeee71b041f184f2b05f86760c16d67dc07c0a230b5a16 SHA512 e39987d08942f0cfd5c26f482e28fa2ba39210a4acba7ff7f8b409bffcaeacb8937152e4d4aca1c807d7c4b05d8aa9c2b0a57f54296f9933fdddbf95e094fd71
 EBUILD pygame-2.0.0.ebuild 2073 BLAKE2B 9723b5c5d486de169bd7b8d5e6012eadfced27bedb7e2bb61ebe9cfb73f6e54ba64d6acdc866eee561979ff41edda6d31b337a98c2c15a3328520a91c3eebd07 SHA512 d4615ac5efb8935073c791aa9510a5f61965ff3fb71a8a0b0b2a9d49d99e95e6a2863375665b3e8e2272c4289c44d7e01323c3ecde055018c13e5ceae505167e
 EBUILD pygame-2.0.0_pre10.ebuild 1910 BLAKE2B 8fc8454b4e198d0c8862a7c4338792076799e8a13c82827c062ca1a5a6f3b61d0260b367cdbf8590632600d99ac7fe2d8699b95631417e5ed5bab5e7bfbcded6 SHA512 eda538cb1d14f9f2e88ada1497ac816b12ef27805a3d6d85a37f349e2b3891e82594817ff178d9902e2066b1f595a59915d4d0d42e570534fb132fb81b9619c2
 EBUILD pygame-2.0.1-r1.ebuild 2202 BLAKE2B 6b7ec8d20bc629a07d200958f5a4d09f1330933c60ca0ad191b673ef78e950cc27ba4ff456df4b31f50b3b326f42bd020e38d8801ee9e663ce4fa7acfc7645ca SHA512 8b7298c8b5cf5b6635008caac567d0331d7b614535cef88a5aa6813e2df1d97aded32e112275188924bcd3b6f53d52d7fb3f009c164074d0870d579de4119f87
 EBUILD pygame-2.0.2.ebuild 2082 BLAKE2B a1d8318800491adc2448d4a6bc2d5ebf206ce83ab1d71487b6324c51cc77a73f928af85e1291110dd42905acb03d45d8a102ed01fabc92ac15d5b5e16d98ec26 SHA512 5132770e079ac5bc49336c96cad820181522a5fd44bb16d9f12bebb7318d31cb9fb38c7f3a2282ed94880bd4c4cabaae7d2f515cbe060a55996dd7e705b78bfa
 EBUILD pygame-2.0.3.ebuild 2082 BLAKE2B a1d8318800491adc2448d4a6bc2d5ebf206ce83ab1d71487b6324c51cc77a73f928af85e1291110dd42905acb03d45d8a102ed01fabc92ac15d5b5e16d98ec26 SHA512 5132770e079ac5bc49336c96cad820181522a5fd44bb16d9f12bebb7318d31cb9fb38c7f3a2282ed94880bd4c4cabaae7d2f515cbe060a55996dd7e705b78bfa
-EBUILD pygame-2.1.0.ebuild 2080 BLAKE2B 7f484fc596f39fd9a13b42b7a42cd06ae9f95a81d2aae9c64426feac60eddf3519e3525f9a26d9f62e74a0b051831b7c0a095022d363229595e290bc004e7343 SHA512 5ff63ac7466e9e94745273ca4d5b61ef39301db96ba46758785aea8d191a645d2661425ce2c41d1adac666270e76d694ccbdf0909650ad34bb094f10b570d1c4
+EBUILD pygame-2.1.0.ebuild 2078 BLAKE2B a2cfe59291d311fb0a187501ea6bfa8d81d2c72c3e346c536934fd0274de6a6acfc2ae7e9f6fc47e3502e9b308fa2329aa48065ad74bd18d544343711eb1da1b SHA512 a5da9b56854e441c09e50f214dc1dccfa7375ef66c7da7c56282998c4a2aea498014d8d67b323e8b694960ef6b7cf09abd8e7ce8f42aaa86eac5326fac10e114
 EBUILD pygame-2.1.1.ebuild 2082 BLAKE2B a1d8318800491adc2448d4a6bc2d5ebf206ce83ab1d71487b6324c51cc77a73f928af85e1291110dd42905acb03d45d8a102ed01fabc92ac15d5b5e16d98ec26 SHA512 5132770e079ac5bc49336c96cad820181522a5fd44bb16d9f12bebb7318d31cb9fb38c7f3a2282ed94880bd4c4cabaae7d2f515cbe060a55996dd7e705b78bfa
+EBUILD pygame-2.1.2.ebuild 1954 BLAKE2B 3247977cd4fbb9091a2b7109783056c9b92c0ac1c6dcd63df2da66e9cd472ae9a990be6adea4fe3857f0e692d60b9293d445f5b8c452ad962f446c0ff8aa0366 SHA512 770a5c25e2bf4427bf028515fd0ebda2749a122c165a6cbf11d01cb9dbb5ac9add2f25eb6ce2ddba91add33027e49d68a162c06c5aece91ff09e7c054ed672a8
 EBUILD pygame-9999.ebuild 1739 BLAKE2B b5e8dea0169ba2ebf0bcfc3f7fa9f140b9c6a95fbec59c82442403c89f35f7416888d736c1ef1d98c4f434b83682cacae507037fc33cdeeb3fc570d2c9855983 SHA512 0e378c44353b0165c452561643fee5c9d6622de4e79b1fddd6ad554e1a9fa39bec18c84907a6c2e9868d0c75d1568f0935660c838f2921c7e5ce0df87c157946
 MISC metadata.xml 462 BLAKE2B 398db1c050bbf14a65ac770e980ca91269277ecb00d94457502532ef7c407145cc2438ead46d370d1195331fd3d2f9602ecbb381c9f178240d031d1c665a9324 SHA512 2e95b731a4cb49372e6af00bb059bd179dc167aaac07f412c51970cf27b0fdddda616fb59bbbd62101c1b6f272cc0263123e334df01ebf6d1697ef8b55b62fef
diff --git a/dev-python/pygame/pygame-2.1.0.ebuild b/dev-python/pygame/pygame-2.1.0.ebuild
index 4f01fbdc47f3..105b520dc82d 100644
--- a/dev-python/pygame/pygame-2.1.0.ebuild
+++ b/dev-python/pygame/pygame-2.1.0.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-2.1.2.ebuild b/dev-python/pygame/pygame-2.1.2.ebuild
new file mode 100644
index 000000000000..24fa1072e037
--- /dev/null
+++ b/dev-python/pygame/pygame-2.1.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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 ~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]
+		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
+	)"
+
+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
+	distutils_install_for_testing --via-root
+	script -eqc "${EPYTHON} -m pygame.tests" || 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
+}