gentoo Easter resync : 12.04.2020

3 files changed, 2 insertions, 83 deletions

diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 9a32882a943a..b4f59859d2e5 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,6 +1,4 @@
-DIST pygame-1.9.3.tar.gz 2974541 BLAKE2B 38ba1f85d845cf33202819705ad564168fb3bc7041731d50d8c3f6bf1c55bebf41202f8ae9e4c4ba52cabe7335a9df13d7724104015b49842dc7f7aa7b0bfd19 SHA512 8920c598a97b4ff8602391517f070b67263bacb6330e13ea5d7d5432ee592a7c984fe986837b90a032da3d4e717f9df0cc99f0fb39f1cbde1b4f6a4c132feffe
 DIST pygame-1.9.6.tar.gz 3223131 BLAKE2B a4d04c933fcad244d32bd512ef8717e60ec923f361e9e0296b5c7d57c5949d3434a040d028249c5b8f3c865ac3dcdbb32e6f0b223186678595a8625213ba2a17 SHA512 d923c554203a7c35e37921658cb4c5bf50215ab0ff4d2b869a1ee6b2e2ca31d66ec4bbde4287f5a777838ffe932cd15b993cb0224b86e43d684de61c35acbcd0
-EBUILD pygame-1.9.3.ebuild 1767 BLAKE2B b570549ae6098004f41cc62b74f63deea0af2d030ca5aee4ea5f1dc142300ce9b278e602ede00617e46da594290366181a46e285f211942c8e43f1a55d510c0c SHA512 1206617606a9dda9e90cea1e0dcc6772bca09994e9eef81bebb6d9c40b9c10cf387969888620a815b223dd2ca2850a69c182f060c5db784caaef9a1425683e4e
-EBUILD pygame-1.9.6-r1.ebuild 1747 BLAKE2B a0f79004e34151eddc9d8b63c4601c85d4f7a8131091db595363aafb25628bbf4fcfbbe49ac6914e5e31adb0d2bea102bcf1312cad22d3fb044e83839f9c859e SHA512 76d462569495a3ef582228bf6d0f72cc9d9e29e37ee20b242efa34e87b21e686a9ed96139e5518b61ba4ef9e3e60334000d6f8c6f9a00abd6d8a8ca460207cd8
+EBUILD pygame-1.9.6-r1.ebuild 1754 BLAKE2B 35a6f3a9d3466f6ec3811e970f65fcade67c9b5107b6cefdae31a47eb67e7c12e2447cca350eac031ff1994cfd736537b752cd1e5274cf013f581d15e3ffb15d SHA512 d872a70513c4856c6921d6432c5928793b9eb65af50419f45dd4f61bfeeccaef52b616ff3cb360b6a369cd8a3cc29dcc2d6d5f22ed93dbe40b7a4b2bd023f156
 EBUILD pygame-1.9.6.ebuild 1749 BLAKE2B aa9ee73a935c3862893260e07a84538018a91532cb75405cca4189f5ea4bfe6bdb5928febe1ea13c784c037c2fdf42cd795d9ad334f3456d381ceff9b823d887 SHA512 1a8867dbc40a8e58bf8977f207e43c18d73bd77f1f636279555903fe978609376e55b9ccc1c9491ce7530b1140dc9b6bb39e9a240276bd71ab4eecf214986f74
 MISC metadata.xml 408 BLAKE2B ae371ef164069765d0964da714a83c9898ddc190ac295c5ad5bbb6a3c45db5aa415d84ff21dbaa510e5c9852397e6b6b389684c54b67d83d675afd9b3d9a697e SHA512 a6e06c0bed59d5157166577a2dafa53f28a310c56f251bec36af077a79342c6f954fa63a3fa8d3546ca03cc9358e75eeb1ef04c6e0371e43e0b7bff51ffe35dd
diff --git a/dev-python/pygame/pygame-1.9.3.ebuild b/dev-python/pygame/pygame-1.9.3.ebuild
deleted file mode 100644
index 771b5b844792..000000000000
--- a/dev-python/pygame/pygame-1.9.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
-DISTUTILS_IN_SOURCE_BUILD=1
-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 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[X,video] )
-	!X? ( >=media-libs/libsdl-1.2.5 )"
-RDEPEND="${DEPEND}"
-
-DOCS=( WHATSNEW )
-
-# various module import and data path issues
-RESTRICT=test
-
-python_configure() {
-	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" "${EPYTHON}" 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-1.9.6-r1.ebuild b/dev-python/pygame/pygame-1.9.6-r1.ebuild
index 3fcc368dae0d..93b619f76aef 100644
--- a/dev-python/pygame/pygame-1.9.6-r1.ebuild
+++ b/dev-python/pygame/pygame-1.9.6-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE="doc examples midi X"
 
 DEPEND="dev-python/numpy[${PYTHON_USEDEP}]