From: Pacho Ramos Date: Sat, 28 Feb 2015 18:06:10 +0000 (+0000) Subject: Workaround bug #516434 until a better fix is found (thanks to Markus Oehme), drop... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2e0777fffecf4f76c8bcb8d49d0e06aecf046c4e;p=gentoo.git Workaround bug #516434 until a better fix is found (thanks to Markus Oehme), drop old. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4 --- diff --git a/dev-python/pygame/ChangeLog b/dev-python/pygame/ChangeLog index 9e92069b9dd8..019b0be3626b 100644 --- a/dev-python/pygame/ChangeLog +++ b/dev-python/pygame/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-python/pygame -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/ChangeLog,v 1.103 2014/11/24 15:03:26 pacho Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/ChangeLog,v 1.104 2015/02/28 18:06:08 pacho Exp $ + + 28 Feb 2015; Pacho Ramos + +files/pygame-1.9.2_pre20120101-import-bdist.patch, + -pygame-1.9.2_pre20120101-r1.ebuild, pygame-1.9.2_pre20120101-r2.ebuild: + Workaround bug #516434 until a better fix is found (thanks to Markus Oehme), + drop old. 24 Nov 2014; Pacho Ramos pygame-1.9.2_pre20120101-r2.ebuild: diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest index 84b0bb1ff9f8..a5d4db05555e 100644 --- a/dev-python/pygame/Manifest +++ b/dev-python/pygame/Manifest @@ -1,15 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX pygame-1.9.2_pre20120101-import-bdist.patch 1609 SHA256 398af19e4907fea3ff528e22e03878daf635143fda3be6cbb959c163ca4c8b04 SHA512 d40d0141ac44d8081e51ec94c72123b7f59b8328569d5d590b8c54c3b33b1088e8ecbf56f80c2ba11a01c735421e5836d3f06b390da564f03448a6482d2fd319 WHIRLPOOL 68f6d7743079b3b6b3261ff05fe169fe599dbe59b84a8616d965b74490db2bd0533f8235f71d629f828b030525290449c8653dd1d2bcaea767a0efb415aff3a4 DIST pygame-1.9.2_pre20120101.tar.xz 2263028 SHA256 86d386a84a29387e98f6650edbd7fffe5b800115b69e6b15b2588c13eae56335 SHA512 1e82cf720da28d4e4213f6b7a029ab4c9dd592c3155f3d11da8272a7d81d28c54f93402383fa5fa4a4e8863dfc039062838d0317cfedde30a4455e52ce680576 WHIRLPOOL 437555ba4816e42bb745ad5ce13b7f164d5a1ff467cd7193327856b98047eeb56c1d1043c2cc75c6a0ca71ea96240df75b1dc544122034c7e4628c544f8d9486 -EBUILD pygame-1.9.2_pre20120101-r1.ebuild 2015 SHA256 9451c62c0f625c1b0eebb52eca6638879694491a0c734379b7e7907626cdaaa3 SHA512 012a7a45ed796cca1c167b7f2df71223b83852315b1e0af8ea076971f65767e59eb70cbbbad698f1b7df131677ddb787504af3ad72d99b25564f2a4fb6e5b229 WHIRLPOOL ea349b2a258d9c4d9236674ab26ffb9d4ea8038372cbc58cbabec67a904ccb1551e0685119bdc0b2583ca74a41286bdfc2202b50174bdc44a69a917cdd87cff3 -EBUILD pygame-1.9.2_pre20120101-r2.ebuild 1976 SHA256 1705b0d3adc7a722b2e1c45ee9b5e38484f0b753d5f82a10c18fdf4434704ba4 SHA512 9585682e00d9ceac9a62559e15b2eb017c3080fcf20a5a21165b320f8d120b4221adc7d25eb5f7f1397e768693e653dd832c0c87e562e54ae7db7af844a6156e WHIRLPOOL a0b72e3cde7624cf2edf15ca14b4fae430a4371d4b114cfa78478df715d8e0ef79f4b5a027c77d0c825cfb71b968e0870a62aab011b90747ce307f59728c7fac -MISC ChangeLog 13774 SHA256 f8f673c510163683dc32c683b73b75113a9b70d8dd6f8ebd638a433ac4f6e47a SHA512 6c8cd5c87193e5b4755f722104968827fdb9d0a028e4d382728bf03f28620cc5ca78fa41a87530da9ad5f75bb58d3c419867ecfdff69ea0aadfe67a083fe898e WHIRLPOOL d8910fab49d9fbe73638870f3377189cd6b17861d958975e61512a456f29290e67b3aabf6a3988c30c376171f99d0aa82fcabe56acbe5b94567d5148fd46c693 +EBUILD pygame-1.9.2_pre20120101-r2.ebuild 2054 SHA256 bda7f46be7eb24ab59b6bf37674830c370745c2f1e209f2c9601b6e0eeceb94b SHA512 e5d6edbfa2191a16d46f072d5bbfbf2f1493b6c2ba17f63ff30609a74452e469a13d638c7d8f9208796df87da85aa8ce7d1b327bc3f69dbb20ffc718a94f157e WHIRLPOOL 0a895463f4d44591c422688921563b17bc1737af5d8b7c1abf6731689f028147770bbc4d3696940d3941904f0b90b5f0412e6b3da6d17450297e833740926375 +MISC ChangeLog 14041 SHA256 b782b847e180b5100fb86d370384f99bd665a6a3496b3e73dc75af5715e2367f SHA512 aa3c025097b20537e70b77bfe4eabab91d990b408899a988c1d1233443bdfae24f1907eb296db8d58d899d0f39d26769375886a8b029e9404baa13eec007d468 WHIRLPOOL d404bedc83a2850f1898062787e5e8294d88638b5a61b32846770bf5471e6ffb60b674761af3215b4b0b2f9ab84b43576bfdb278c0a9d1d02b093336a13fbe7b MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlRzSL8ACgkQCaWpQKGI+9S/8gCfTVmtR7iiR/oKei+Jyz0BVMyq -YFEAnjUdJlOKWgB1KNn0nKTI6q4VZVEB -=y2Om +iEYEAREIAAYFAlTyA5EACgkQCaWpQKGI+9QHZgCggayrxj7NnN/6dThlKgOLYd7X +Vr0AnRPHjfCNzkByekGD/Xo/YW14XgJu +=3/vy -----END PGP SIGNATURE----- diff --git a/dev-python/pygame/files/pygame-1.9.2_pre20120101-import-bdist.patch b/dev-python/pygame/files/pygame-1.9.2_pre20120101-import-bdist.patch new file mode 100644 index 000000000000..f587401ab25d --- /dev/null +++ b/dev-python/pygame/files/pygame-1.9.2_pre20120101-import-bdist.patch @@ -0,0 +1,49 @@ +From f5ee3952769d698d7d03ae61a9c70f2ec4d85874 Mon Sep 17 00:00:00 2001 +From: "Markus (root)" +Date: Sun, 19 Oct 2014 16:56:41 +0200 +Subject: [PATCH] This fails with a TypeError, but offers no functionality. + +--- + pygame-1.9.2_pre20120101-python3_3/setup.py | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/pygame-1.9.2_pre20120101-python3_3/setup.py b/pygame-1.9.2_pre20120101-python3_3/setup.py +index ecee5d1..b913f18 100644 +--- a/pygame-1.9.2_pre20120101-python3_3/setup.py ++++ b/pygame-1.9.2_pre20120101-python3_3/setup.py +@@ -99,19 +99,19 @@ if "-setuptools" in sys.argv: + sys.argv.remove ("-setuptools") + + +-# NOTE: the bdist_mpkg_support is for darwin. +-try: +- import bdist_mpkg_support +- from setuptools import setup, Extension +-except ImportError: +- pass +-else: +- EXTRAS.update({ +- 'options': bdist_mpkg_support.options, +- 'setup_requires': ['bdist_mpkg>=0.4.2'], +- #'install_requires': ['pyobjc'], +- #'dependency_links': ['http://rene.f0o.com/~rene/stuff/macosx/'] +- }) ++# # NOTE: the bdist_mpkg_support is for darwin. ++# try: ++# import bdist_mpkg_support ++# from setuptools import setup, Extension ++# except ImportError: ++# pass ++# else: ++# EXTRAS.update({ ++# 'options': bdist_mpkg_support.options, ++# 'setup_requires': ['bdist_mpkg>=0.4.2'], ++# #'install_requires': ['pyobjc'], ++# #'dependency_links': ['http://rene.f0o.com/~rene/stuff/macosx/'] ++# }) + + #headers to install + headers = glob.glob(os.path.join('src', '*.h')) +-- +2.1.2 + diff --git a/dev-python/pygame/pygame-1.9.2_pre20120101-r1.ebuild b/dev-python/pygame/pygame-1.9.2_pre20120101-r1.ebuild deleted file mode 100644 index c9d27d27a554..000000000000 --- a/dev-python/pygame/pygame-1.9.2_pre20120101-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2013 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-r1.ebuild,v 1.7 2013/01/01 19:29:29 hasufell Exp $ - -EAPI="4" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-**" -PYTHON_TESTS_RESTRICTED_ABIS="3.1" -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/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 - X? ( >=media-libs/libsdl-1.2.5[X,video] ) - !X? ( >=media-libs/libsdl-1.2.5 )" -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 - - # Disable automagic dependency on PortMidi. - sed -e "s:^pypm :#&:" -i Setup || die "sed failed" - - sed -i -e "s/import _camera/from pygame &/g" lib/camera.py || die #415593 -} - -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/* - fi - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins -r examples/* - fi -} 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 0b2463f1e065..2a753443af5d 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-2014 Gentoo Foundation +# Copyright 1999-2015 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.11 2014/11/24 15:03:26 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild,v 1.12 2015/02/28 18:06:08 pacho Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} ) @@ -33,6 +33,11 @@ if [[ "${PV}" != *_pre* ]]; then S="${WORKDIR}/${P}release" fi +PATCHES=( + # Workaround bug #516434 + "${FILESDIR}"/${P}-import-bdist.patch +) + DOCS=( WHATSNEW ) python_configure() {