update install phase, fix based on patch by C. Mayo wrt to bug #497720 by C. Myao, patch rm old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

5 files changed, 17 insertions, 178 deletions

diff --git a/dev-python/pygame/ChangeLog b/dev-python/pygame/ChangeLog
index 23379663733e..2daa9e92157b 100644
--- a/dev-python/pygame/ChangeLog
+++ b/dev-python/pygame/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pygame
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/ChangeLog,v 1.100 2013/09/05 18:46:31 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/ChangeLog,v 1.101 2014/03/27 03:19:12 idella4 Exp $
+
+  27 Mar 2014; Ian Delaney <idella4@gentoo.org> -pygame-1.9.2_pre3082.ebuild,
+  -pygame-1.9.2_pre3203.ebuild, pygame-1.9.2_pre20120101-r2.ebuild:
+  update install phase, fix based on patch by C. Mayo wrt to bug #497720 by C.
+  Myao, patch rm old
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org>
   pygame-1.9.2_pre20120101-r2.ebuild:
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 64e2071de3b1..802603dccc70 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -2,30 +2,14 @@
 Hash: SHA256
 
 DIST pygame-1.9.2_pre20120101.tar.xz 2263028 SHA256 86d386a84a29387e98f6650edbd7fffe5b800115b69e6b15b2588c13eae56335 SHA512 1e82cf720da28d4e4213f6b7a029ab4c9dd592c3155f3d11da8272a7d81d28c54f93402383fa5fa4a4e8863dfc039062838d0317cfedde30a4455e52ce680576 WHIRLPOOL 437555ba4816e42bb745ad5ce13b7f164d5a1ff467cd7193327856b98047eeb56c1d1043c2cc75c6a0ca71ea96240df75b1dc544122034c7e4628c544f8d9486
-DIST pygame-1.9.2_pre3082.tar.xz 1970680 SHA256 477783e906f96656f694b798aa07ecdb9a63c3cb77fefa4dbceeb28ee1daa1fb SHA512 5e3cb080542e4f0baf6f032bfda77b105abd3093201e913f3b692730eee3eb2318150d4185d4eb2c4e79cd7895b2893ba6d51c26bdf9027b7490dfaa71d62da1 WHIRLPOOL d64ae79a97db36921284d32a09dfbafdcbaf6295a26f5f0154d1197a9597a55f62fa0ffcd71a9658ad51b64dd995d211ac84a1e34a4818b85443d88c11e0228a
-DIST pygame-1.9.2_pre3203.tar.xz 2184128 SHA256 f0b1742d8ddf82ac2c73c0f1ad7f8c000d2a3325798eaa7abb2b6f76a55abf62 SHA512 84debcd088578bc075a76f6c58d46c6bb841bf4be890085c140c256dfca850f8fba5412534cd563bbc92b923f3875ccca788d574971e145117d95c000e0dd092 WHIRLPOOL 6b2a8092c9aed3365b3903c0884bcedf2baf51ab09b48a5f51093176de84f9cf92ac06c4e3e93e4f215ea967c35d51747d63ca85db378c361ceec3f09c442968
 EBUILD pygame-1.9.2_pre20120101-r1.ebuild 2015 SHA256 9451c62c0f625c1b0eebb52eca6638879694491a0c734379b7e7907626cdaaa3 SHA512 012a7a45ed796cca1c167b7f2df71223b83852315b1e0af8ea076971f65767e59eb70cbbbad698f1b7df131677ddb787504af3ad72d99b25564f2a4fb6e5b229 WHIRLPOOL ea349b2a258d9c4d9236674ab26ffb9d4ea8038372cbc58cbabec67a904ccb1551e0685119bdc0b2583ca74a41286bdfc2202b50174bdc44a69a917cdd87cff3
-EBUILD pygame-1.9.2_pre20120101-r2.ebuild 1985 SHA256 14d1c3aae256bef211601417025cd0ab8b1d183fb86695c2bfd439561e315900 SHA512 2526d9080b38a33e371818e341548cad703a230aab2219fd70a8ceb7259b1b0c455382e4355bdd82ccb2acf6870b24a12b293fe4f7350e6138c0187ec8fc1045 WHIRLPOOL 1a457f9ee34d1e7d98118cf4c73c095d6cc1bb820b612cbb74fa55042ca0ac6f66eff8f7242703be1ae433e207c0e4c8bb283b5641d926979279c1b43881c097
-EBUILD pygame-1.9.2_pre3082.ebuild 1795 SHA256 c84e9dfa3fab899a018c0cb7327b02cd0af9835ed9ae653f270ca7cdd9531f61 SHA512 ecca83bbda705d857e9f7a3a71b3c5f19207de1f19427aad3461730f9e0cacddde4f716875b7a06571fdb0b7b4b304a6bd812ee8ee06a7d228354e5951406231 WHIRLPOOL 1d8e131b65b81a4bf381e965dfe91ff84a13d7d95af42ea39374e7c79caa6a3b3027113d440ccaee66b09530798d1b96477b54a3ac971f224dee546678d137c4
-EBUILD pygame-1.9.2_pre3203.ebuild 1962 SHA256 f0f14992bd2a78ce9425906462a58239ef712b44d03db08453e6c060aaf1b5ad SHA512 4a8f4f775d86dc5744c4615c6eb05b69987a0674e3cc14b79ff294e2cd6b43015a2d2242e5483e4fa5da2e49eec8bf784edc1838746803847b4fe801845a8432 WHIRLPOOL 3faadaf2529441fce02a9b5dcd89a312d829b1aef4f809fd6c0d261fd7410efa5df533c1f35c07bdd41bfbd473793d49c5f717c030b179c0640c21e35b67dae4
-MISC ChangeLog 13420 SHA256 372219a9245169ceca57e1bb5cb8fd2fb2aa28a3716f6107d9728e66c9887eb6 SHA512 76bbeb4451094398dc15da4728dd1472f34317ed303bffd920d51dd182cf87d4c7bfe20765e18dbe950f585d949f26bfe2ee42b80f0a915a1f3648d7a515edf7 WHIRLPOOL 39d952e0c37564d9735e01ab3b1931339b9d2964128cd5e06deafa3ac5edadd8bb45600c73666ed0b6b29e217021eee9471c98ea68a9aacc6b6968266162efcf
+EBUILD pygame-1.9.2_pre20120101-r2.ebuild 1974 SHA256 fafc850fcd54d1a9bb18e6ae0e67921bfc41a15e18526c7a2cd910c539cb6cb0 SHA512 7d1aa5c6c66159d73918c29a2e5203ae03d5aba55865bb12773b8d9dbca59e57001d84177988e8a17a271be4dbfb1f79c8b7f2d3af957382422738d4e6186f8c WHIRLPOOL e2529d949cc23fb6417d3e415ce9173b714b0f9f5be1af41d7773912484fe79d06432d39f7cdb8234f90d6ed698c78de0c8aaaf9ea105e365bfa98c260cd5f89
+MISC ChangeLog 13668 SHA256 d95cd0f813aac0030cb5f874e9efc5c90d0301d4ea97f6bf5a340a8cb78ef7ef SHA512 34dd6305f60b27c52ddcdde23fad152eb5fbc0f53529d41e6b1a528861021b5e68e39f86f7810893089d7b29481c11a1ddddd138438a52fec62e0bd46fbebc11 WHIRLPOOL 80bee6dbbbdf3cb541f009be3e01391790e3123ad4dc9fc871f6e1e4c78065b8b916905fda973a407e1b0ffc7c039c7f2f37859d8368da092caa183c8fbd758e
 MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKNKdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO12IP/RyGAoYNs7r94RC4MOf4nqyM
-ypcT1BXSQuz9EBT8xaomPNFbNf468aGwlvCaS1Uq0bqXrcvGpWxcI8H6jpRixe38
-3bEB4LH6/6oXya6o3i6D7lRLvn+494DvCun01YEEdhoyVJo7pBQzYoKYlhGquRI+
-jFK5mxHnCu81rdDm9kLZYlsf6WiVSSSDvMHZBulAUAKUMtgQ5ch6EwxEunGvSMPH
-G9Bm2yStVU7v6CmZX5zp0gDoOd3nZR0RvTJ6Bz+j9loQe902YFuFeVYG11js1iHK
-9mtY4z1BrTXphMqFOS/8yGmON3T8CCaCSNdEIPVtbGeBOcUe1qiJGxo1LOuCoCX9
-ATSJjNgUS7aF6/9Ly4zbijzm9n3gH8yeXbptW7w8KKM42/cIfkoYEe3JgUhkjE4z
-wyAhQFOAl+ueXeZwoePS40X7POm05CpOEZA0x9k02j+PvdlBLuuO1GAnyN9xpJ8e
-DorYQdNJpO/D19taJClyGQb3brdA2Bv9Q0GuwHUG9eZDhbehtsp59Qif4UNsPn1X
-VdkbcvmYJZd1uuFom6psReblikkf1cJDkSSa1uwELgbfiWaaQavrUL688Qig/l49
-uLPGXGzFISbIuWmivN58P4D7NrRqN/MkSRNItqNLceezLmF5uyFa9YqkuyM/EPRF
-SQ3nPlfyqzjqZP9BaFwX
-=gDSR
+iEYEAREIAAYFAlMzlwcACgkQso7CE7gHKw1WRwCgt4Rq+WAgRVCWQ7RgiIhWPpqa
+EYUAn3nj4aDoPt2Ey/N5jzYel5dxSN4L
+=Fu0W
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild b/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild
index c72326916ac5..df8d1eaf2b8c 100644
--- a/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild
+++ b/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild,v 1.9 2013/09/05 18:46:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild,v 1.10 2014/03/27 03:19:12 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -65,8 +65,8 @@ python_test() {
 python_install() {
 	distutils-r1_python_install
 
-	rm -fr "${D}$(python_get_sitedir)/pygame/examples"
-	rm -fr "${D}$(python_get_sitedir)/pygame/tests"
+	# Bug #497720
+	rm -fr "${D}"$(python_get_sitedir)/pygame/{docs,examples,tests}/ || die
 }
 
 python_install_all() {
diff --git a/dev-python/pygame/pygame-1.9.2_pre3082.ebuild b/dev-python/pygame/pygame-1.9.2_pre3082.ebuild
deleted file mode 100644
index 2c999c4d1f85..000000000000
--- a/dev-python/pygame/pygame-1.9.2_pre3082.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.9.2_pre3082.ebuild,v 1.8 2012/02/20 14:27:51 patrick Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython"
-PYTHON_TESTS_RESTRICTED_ABIS="3.*"
-
-inherit distutils virtualx
-
-DESCRIPTION="Python bindings for SDL multimedia library"
-HOMEPAGE="http://www.pygame.org/"
-if [[ "${PV}" == *_pre* ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-else
-	SRC_URI="http://www.pygame.org/ftp/pygame-${PV}release.tar.gz"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc sparc x86 ~x86-fbsd"
-IUSE="doc examples X"
-
-DEPEND="dev-python/numpy
-	>=media-libs/libsdl-1.2.5[X?]
-	>=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"
-RDEPEND="${DEPEND}"
-
-if [[ "${PV}" != *_pre* ]]; then
-	S="${WORKDIR}/${P}release"
-fi
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="WHATSNEW"
-
-src_configure() {
-	"$(PYTHON -f)" config.py -auto
-
-	if ! use X; then
-		sed -e "s:^scrap :#&:" -i Setup || die "sed failed"
-	fi
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" run_tests.py
-	}
-	VIRTUALX_COMMAND="python_execute_function" virtualmake testing
-}
-
-src_install() {
-	distutils_src_install
-
-	delete_examples_and_tests() {
-		rm -fr "${ED}$(python_get_sitedir)/pygame/examples"
-		rm -fr "${ED}$(python_get_sitedir)/pygame/tests"
-	}
-	python_execute_function -q delete_examples_and_tests
-
-	if use doc; then
-		dohtml -r docs/* || die "Installation of documentation failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/* || die "Installation of examples failed"
-	fi
-}
diff --git a/dev-python/pygame/pygame-1.9.2_pre3203.ebuild b/dev-python/pygame/pygame-1.9.2_pre3203.ebuild
deleted file mode 100644
index d8ba2113dfef..000000000000
--- a/dev-python/pygame/pygame-1.9.2_pre3203.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.9.2_pre3203.ebuild,v 1.3 2012/02/20 14:27:51 patrick Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-**"
-PYTHON_TESTS_RESTRICTED_ABIS="3.*"
-PYTHON_TESTS_FAILURES_TOLERANT_ABIS="*"
-
-inherit distutils virtualx
-
-DESCRIPTION="Python bindings for SDL multimedia library"
-HOMEPAGE="http://www.pygame.org/"
-if [[ "${PV}" == *_pre* ]]; then
-	SRC_URI="http://people.apache.org/~Arfrever/gentoo/${P}.tar.xz"
-else
-	SRC_URI="http://www.pygame.org/ftp/pygame-${PV}release.tar.gz"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="doc examples X"
-
-DEPEND="dev-python/numpy
-	>=media-libs/libsdl-1.2.5[X?]
-	>=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"
-RDEPEND="${DEPEND}"
-
-if [[ "${PV}" != *_pre* ]]; then
-	S="${WORKDIR}/${P}release"
-fi
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="WHATSNEW"
-
-src_configure() {
-	"$(PYTHON -f)" config.py -auto
-
-	if ! use X; then
-		sed -e "s:^scrap :#&:" -i Setup || die "sed failed"
-	fi
-
-	# Automagic dep on portmidi, bug 383927.
-	sed -e "s:^pypm :#&:" -i Setup || die
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" run_tests.py
-	}
-	VIRTUALX_COMMAND="python_execute_function" virtualmake testing
-}
-
-src_install() {
-	distutils_src_install
-
-	delete_examples_and_tests() {
-		rm -fr "${ED}$(python_get_sitedir)/pygame/examples"
-		rm -fr "${ED}$(python_get_sitedir)/pygame/tests"
-	}
-	python_execute_function -q delete_examples_and_tests
-
-	if use doc; then
-		dohtml -r docs/* || die "Installation of documentation failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/* || die "Installation of examples failed"
-	fi
-}