diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
commit | 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch) | |
tree | e1810a4b135afce04b34862ef0fab2bfaeb8aeca /dev-python/pygame | |
parent | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff) |
gentoo resync : 15.01.2020
Diffstat (limited to 'dev-python/pygame')
-rw-r--r-- | dev-python/pygame/Manifest | 8 | ||||
-rw-r--r-- | dev-python/pygame/files/pygame-1.9.2_pre20120101-import-bdist.patch | 49 | ||||
-rw-r--r-- | dev-python/pygame/pygame-1.9.3.ebuild | 4 | ||||
-rw-r--r-- | dev-python/pygame/pygame-1.9.6-r1.ebuild (renamed from dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild) | 45 | ||||
-rw-r--r-- | dev-python/pygame/pygame-1.9.6.ebuild | 4 |
5 files changed, 25 insertions, 85 deletions
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest index 8dec8801f0fd..e0ff9aae4170 100644 --- a/dev-python/pygame/Manifest +++ b/dev-python/pygame/Manifest @@ -1,8 +1,6 @@ -AUX pygame-1.9.2_pre20120101-import-bdist.patch 1609 BLAKE2B 976556f860aa1d9be39a1cc56b0a771850aa6afad4acbf45103ac50f69da3b63f365eb3a3d94402c33233a45fd9adf74bec87e7c40c5e5c58f0b982b9a7d62a5 SHA512 d40d0141ac44d8081e51ec94c72123b7f59b8328569d5d590b8c54c3b33b1088e8ecbf56f80c2ba11a01c735421e5836d3f06b390da564f03448a6482d2fd319 -DIST pygame-1.9.2_pre20120101.tar.xz 2263028 BLAKE2B 401b7cdc32cfc6b960e8a686236d0a310d840b4a41211b602f6fe137f80f3bb358daa5e25758c4e152ab41e50c3864c183a0b6f36176e3dec12db80449e126e1 SHA512 1e82cf720da28d4e4213f6b7a029ab4c9dd592c3155f3d11da8272a7d81d28c54f93402383fa5fa4a4e8863dfc039062838d0317cfedde30a4455e52ce680576 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.2_pre20120101-r2.ebuild 1906 BLAKE2B 3fa9594ef85169af76d135a47866d9ec23690c49e0915bb17c95bcf894f79e14fd8705f4d4c8ba5bce107649d74456493ca602814f4cb6b2c2862db12412cafe SHA512 93afbe080e69e19f4faa037afc4648b7a1c1fee5962d7498109bcf1709e89e562f5793fe90224c297356fee8c8d3f6bccd5532658d4538ef25b6a7a7fd3dd718 -EBUILD pygame-1.9.3.ebuild 1771 BLAKE2B 769e0442f92383d7c1faf8b589ead937f3db0d6f74b4adf5d3f0c1ae1813ad269dbb6c3eee5bf9938fb359d1ba111b0e57e1110cac4eb9b474c497d8b9c672cd SHA512 4be846496eef065d4f565365ea7002b818788a48622892cdfd1bac3ce67f7429a222f238fa5a8d8e111ef540c16cabc64de2d836ab84fb935afa841333c65044 -EBUILD pygame-1.9.6.ebuild 1756 BLAKE2B 40a7ff3948167a9757b69d0673fcd51a05dd3ff4465aa00e46053b684af7d4d0ba9cf21395ed61c4f69d2bd172093e462711664081ba6636776a4b45703f01de SHA512 f7e261f97588db22d5598becb2a2e4c7278157c485a19a649563562785d12f3364fc5ba12889714c2a5afddfeb61209ddb54970e97a330d3aa57056c9e2585cc +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.ebuild 1752 BLAKE2B 1f3904140b1f87ec546e7cd9fd2a1d54371b225067db5f28b5b9be39e1ad3c95ae98979776bc1ed835e87e55c1035572166790197aa06a614539d4af68edcae2 SHA512 3b86bbf21e86375fe258ef5e22550516059d288e4f1f209817e40e0aebe6138c1ad556cc2a2c3ae6de8e2ccce7091f45dc63621f7428d7cf0ed0d8370b770290 MISC metadata.xml 408 BLAKE2B ae371ef164069765d0964da714a83c9898ddc190ac295c5ad5bbb6a3c45db5aa415d84ff21dbaa510e5c9852397e6b6b389684c54b67d83d675afd9b3d9a697e SHA512 a6e06c0bed59d5157166577a2dafa53f28a310c56f251bec36af077a79342c6f954fa63a3fa8d3546ca03cc9358e75eeb1ef04c6e0371e43e0b7bff51ffe35dd 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 deleted file mode 100644 index f587401ab25d..000000000000 --- a/dev-python/pygame/files/pygame-1.9.2_pre20120101-import-bdist.patch +++ /dev/null @@ -1,49 +0,0 @@ -From f5ee3952769d698d7d03ae61a9c70f2ec4d85874 Mon Sep 17 00:00:00 2001 -From: "Markus (root)" <mo@wurzel.org> -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.3.ebuild b/dev-python/pygame/pygame-1.9.3.ebuild index 60b8c9f71b9b..771b5b844792 100644 --- a/dev-python/pygame/pygame-1.9.3.ebuild +++ b/dev-python/pygame/pygame-1.9.3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) +PYTHON_COMPAT=( python{2_7,3_6} ) DISTUTILS_IN_SOURCE_BUILD=1 inherit flag-o-matic distutils-r1 virtualx diff --git a/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild b/dev-python/pygame/pygame-1.9.6-r1.ebuild index 1b94bebedc20..3fcc368dae0d 100644 --- a/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild +++ b/dev-python/pygame/pygame-1.9.6-r1.ebuild @@ -1,55 +1,45 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_5} ) -DISTUTILS_IN_SOURCE_BUILD=1 +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) + inherit flag-o-matic distutils-r1 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 +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 X" +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}" -if [[ "${PV}" != *_pre* ]]; then - S="${WORKDIR}/${P}release" -fi - -PATCHES=( - # Workaround bug #516434 - "${FILESDIR}"/${P}-import-bdist.patch -) - -DOCS=( WHATSNEW ) +# various module import and data path issues +RESTRICT=test python_configure() { - "${EPYTHON}" config.py -auto + PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \ + "${EPYTHON}" "${S}"/buildconfig/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 + if ! use midi; then + sed -e "s:^pypm :#&:" -i Setup || die "sed failed" + fi } python_compile() { @@ -63,7 +53,7 @@ python_compile() { } python_test() { - VIRTUALX_COMMAND="${PYTHON}" virtualmake run_tests.py + PYTHONPATH="${BUILD_DIR}/lib" virtx "${EPYTHON}" -m pygame.tests } python_install() { @@ -77,7 +67,8 @@ python_install_all() { distutils-r1_python_install_all if use doc; then - dohtml -r docs/* + docinto html + dodoc -r docs/* fi if use examples; then diff --git a/dev-python/pygame/pygame-1.9.6.ebuild b/dev-python/pygame/pygame-1.9.6.ebuild index 5dc353c70510..f553a53417bd 100644 --- a/dev-python/pygame/pygame-1.9.6.ebuild +++ b/dev-python/pygame/pygame-1.9.6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) +PYTHON_COMPAT=( python{2_7,3_6,3_7} ) inherit flag-o-matic distutils-r1 virtualx |