commit: 61528be38033e37ac115cedaf6944ede3ca3dff3 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Mar 24 19:45:29 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Mar 24 19:48:48 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61528be3
dev-python/pygame: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/pygame/Manifest | 1 - .../pygame/files/pygame-2.1.2-cython_only.patch | 36 -------- dev-python/pygame/metadata.xml | 3 - dev-python/pygame/pygame-2.1.2-r1.ebuild | 86 -------------------- dev-python/pygame/pygame-2.1.2-r2.ebuild | 95 ---------------------- 5 files changed, 221 deletions(-) diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest index d515591df4bd..0e08cc3cb687 100644 --- a/dev-python/pygame/Manifest +++ b/dev-python/pygame/Manifest @@ -1,4 +1,3 @@ -DIST pygame-2.1.2.gh.tar.gz 6100415 BLAKE2B 4b81c2f0abc2c2c4732ddb8f8e6d4bffa5169e3d3ee2d9ea2798d294623a9c70e2ff004825030606285124ef1347177b46adc676db450785e8420de45f37db34 SHA512 531cb0371853def7a3ddb8eb0110fbd58acaf1b2351d7518402c9a960baca705bb34da879015e7a6cd5f2f8af98c57e7bc732021a8f62ed9f90cacf068c9c2d6 DIST pygame-2.1.3.gh.tar.gz 6517003 BLAKE2B 9f2062b24ef2e97995207fbf7572a8aa4d3475356e8646356758ad72b0b744fcf911adaa78bb730ed43c95fa23b8ed733a5573882bd83e112ae5e7e6ef099de9 SHA512 28f46826f58f73607b28c1411c6f2b71796cd4f98103df2dd47db842f578fe7f26dac01cb60d1cb00ac9dacfa62c6c3b913a244379ce70bd03265424e29052e6 DIST pygame-2.2.0.gh.tar.gz 6530469 BLAKE2B 301b8decd7afe7ad44d97b086ad27209a084884993122f0c8d6973e718cb811587aa2e2c34b5e9fc5859410ced4c298b24127b4bf166dbeaa225b5c731c66cb6 SHA512 212e0f6390fa84f4fbcb3051ecb83c324a59d7591fd216a0f17946a581cf01540116162357b41004a387fbd3395e030a5a6d5f804496d84558125f512c9c2617 DIST pygame-2.3.0.gh.tar.gz 6547956 BLAKE2B 3189dc5dda7e5fc12fe2091af304816d905a24a33f6f43070040b90bd1bac1191fe6fe1a738ccfda49b5d9b472a704962c3b6aa7d8b99bc67e15317a9df06a2b SHA512 ed93cf5f0fac67b8a03f25f514ac71bf9b9a97f4df30efca9e3225396769e7616d3ce1063e6cc6ee3f4e6f1327154a9e0ec4e81b179578118af3a140bb1543bd diff --git a/dev-python/pygame/files/pygame-2.1.2-cython_only.patch b/dev-python/pygame/files/pygame-2.1.2-cython_only.patch deleted file mode 100644 index 4fb935dcf668..000000000000 --- a/dev-python/pygame/files/pygame-2.1.2-cython_only.patch +++ /dev/null @@ -1,36 +0,0 @@ -Backport to ease running cythonize, DISTUTILS_ARGS=(cython) resulted in -reconfigure attempts that failed without PORTMIDI* being exported. - -https://github.com/pygame/pygame/commit/4eeffc049cf -From: Ankith <46915066+ankit...@users.noreply.github.com> -Date: Fri, 3 Jun 2022 21:27:57 +0530 -Subject: [PATCH] Add cython_only option to setup.py ---- a/setup.py -+++ b/setup.py -@@ -209,7 +209,16 @@ def consume_arg(name): - cflags += '-mfpu=neon' - os.environ['CFLAGS'] = cflags - -+compile_cython = False -+cython_only = False - if consume_arg('cython'): -+ compile_cython = True -+ -+if consume_arg('cython_only'): -+ compile_cython = True -+ cython_only = True -+ -+if compile_cython: - # compile .pyx files - # So you can `setup.py cython` or `setup.py cython install` - try: -@@ -280,6 +289,9 @@ def consume_arg(name): - for i, kwargs in enumerate(queue): - kwargs['progress'] = f'[{i + 1}/{count}] ' - cythonize_one(**kwargs) -+ -+ if cython_only: -+ sys.exit(0) - - no_compilation = any(x in ['lint', 'format', 'docs'] for x in sys.argv) - AUTO_CONFIG = not os.path.isfile('Setup') and not no_compilation diff --git a/dev-python/pygame/metadata.xml b/dev-python/pygame/metadata.xml index 4ce54800af77..0ac44a30fbe9 100644 --- a/dev-python/pygame/metadata.xml +++ b/dev-python/pygame/metadata.xml @@ -5,9 +5,6 @@ <email>pyt...@gentoo.org</email> <name>Python</name> </maintainer> - <use> - <flag name="midi">Enable midi support using <pkg>media-libs/portmidi</pkg></flag> - </use> <upstream> <remote-id type="pypi">pygame</remote-id> <remote-id type="github">pygame/pygame</remote-id> diff --git a/dev-python/pygame/pygame-2.1.2-r1.ebuild b/dev-python/pygame/pygame-2.1.2-r1.ebuild deleted file mode 100644 index c7b3c066375a..000000000000 --- a/dev-python/pygame/pygame-2.1.2-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..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 ~riscv 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,tiff] - 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 - )" - -PATCHES=( - "${FILESDIR}"/${P}-libsdl2-2.26-tests.patch -) - -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 - script -eqc "${EPYTHON} -m pygame.tests -v" || 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 -} diff --git a/dev-python/pygame/pygame-2.1.2-r2.ebuild b/dev-python/pygame/pygame-2.1.2-r2.ebuild deleted file mode 100644 index 2ceb169344ba..000000000000 --- a/dev-python/pygame/pygame-2.1.2-r2.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) - -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 ~riscv ~sparc ~x86" -IUSE="examples midi opengl test X" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] - media-libs/freetype - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/sdl2-image - media-libs/sdl2-mixer - media-libs/sdl2-ttf - midi? ( media-libs/portmidi ) - X? ( media-libs/libsdl2[opengl?,threads,video,X] ) - !X? ( media-libs/libsdl2[threads] )" -DEPEND=" - ${RDEPEND} - test? ( - media-libs/sdl2-image[gif,jpeg,png,tiff,webp] - media-libs/sdl2-mixer[mp3,vorbis,wav] - )" -# fontconfig used for fc-list -RDEPEND+=" - media-libs/fontconfig" -# util-linux provides script -BDEPEND=" - dev-python/cython[${PYTHON_USEDEP}] - test? ( - media-libs/fontconfig - sys-apps/util-linux - )" - -PATCHES=( - "${FILESDIR}"/${P}-libsdl2-2.26-tests.patch - "${FILESDIR}"/${P}-cython_only.patch -) - -src_prepare() { - distutils-r1_src_prepare - - if ! use midi; then - rm test/midi_test.py || die - fi -} - -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 - fi -} - -python_configure_all() { - find src_c/cython -name '*.pyx' -exec touch {} + || die - "${EPYTHON}" setup.py cython_only || die -} - -python_test() { - local -x PYTHONPATH=${BUILD_DIR}/install/lib - local -x SDL_VIDEODRIVER=dummy - local -x SDL_AUDIODRIVER=disk - script -eqc "${EPYTHON} -m pygame.tests -v" || 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 -}
