commit: c3c482496c66f18c4d964cc93fb5e50f6aaa2fb1 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Oct 17 09:15:23 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Oct 17 09:20:32 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3c48249
dev-python/pygame_sdl2: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/pygame_sdl2/Manifest | 1 - .../files/pygame_sdl2-6.99.12.4-mixer.patch | 43 -------------------- .../pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild | 46 ---------------------- dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild | 44 --------------------- 4 files changed, 134 deletions(-) diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest index 4b8f875fd5c..2c1ae61b091 100644 --- a/dev-python/pygame_sdl2/Manifest +++ b/dev-python/pygame_sdl2/Manifest @@ -1,2 +1 @@ -DIST pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz 2294620 BLAKE2B 14da5e955ca6b9f6a08be1a3ae929db63e358c53b7a05a16cda73d6e3625a7d522dd5dfc972be978f330f26bb30dc70f4657501cd5e5a6d44c1f6b81eebe3fa4 SHA512 eacce553d6729b937c13420d826f2fe327bc7aba499a06bea7f1ceedba3327a9456c023878290ace39e1a8e417f54957345b8b78500ffc9ed3d2ec9952397754 DIST pygame_sdl2-2.1.0-for-renpy-7.3.5.tar.gz 2678274 BLAKE2B 537e63a7e4755f6fea20f4ceec065272b83879958a0a794780b8976877aa083a2a9bc1b8b4a4592accaeb59dbeeac480d75965291ddbff324aea5c90d7dbcfc0 SHA512 b58a57d70efdfcea066735e3681047bec4fc89a9b75e423f5f889cd29f89a25bd0b96fcbca17578958b677e44858aafc9c6b17aad54dae640640bb7eb54cddbd diff --git a/dev-python/pygame_sdl2/files/pygame_sdl2-6.99.12.4-mixer.patch b/dev-python/pygame_sdl2/files/pygame_sdl2-6.99.12.4-mixer.patch deleted file mode 100644 index 1c3964afaa9..00000000000 --- a/dev-python/pygame_sdl2/files/pygame_sdl2-6.99.12.4-mixer.patch +++ /dev/null @@ -1,43 +0,0 @@ -From ced6051f4a4559a725804cc58c079e1efea0a573 Mon Sep 17 00:00:00 2001 -From: Markus Koschany <[email protected]> -Date: Sat, 11 Nov 2017 23:00:25 +0100 -Subject: [PATCH] Fix build failure due to the removal of MIX_INIT_MODPLUG and - the replacement of - -MIX_INIT_FLUIDSYNTH with MIX_INIT_MID. ---- - include/sdl2_mixer.pxd | 3 +-- - src/pygame_sdl2/mixer.pyx | 4 ++-- - 2 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/include/sdl2_mixer.pxd b/include/sdl2_mixer.pxd -index 0cea395..4bb0187 100644 ---- a/include/sdl2_mixer.pxd -+++ b/include/sdl2_mixer.pxd -@@ -18,10 +18,9 @@ cdef extern from "SDL_mixer.h" nogil: - ctypedef enum MIX_InitFlags: - MIX_INIT_FLAC - MIX_INIT_MOD -- MIX_INIT_MODPLUG - MIX_INIT_MP3 - MIX_INIT_OGG -- MIX_INIT_FLUIDSYNTH -+ MIX_INIT_MID - - int Mix_Init(int flags) - void Mix_Quit() -diff --git a/src/pygame_sdl2/mixer.pyx b/src/pygame_sdl2/mixer.pyx -index 3c5e185..bea5cbf 100644 ---- a/src/pygame_sdl2/mixer.pyx -+++ b/src/pygame_sdl2/mixer.pyx -@@ -81,8 +81,8 @@ def init(frequency=22050, size=MIX_DEFAULT_FORMAT, channels=2, buffer=4096): - if get_init() is not None: - return - -- for flag in (MIX_INIT_FLAC, MIX_INIT_MOD, MIX_INIT_MODPLUG, -- MIX_INIT_MP3, MIX_INIT_OGG, MIX_INIT_FLUIDSYNTH): -+ for flag in (MIX_INIT_FLAC, MIX_INIT_MOD, -+ MIX_INIT_MP3, MIX_INIT_OGG, MIX_INIT_MID): - - if Mix_Init(flag) != flag: - errors.append("{}\n".format(SDL_GetError())) diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild deleted file mode 100644 index 8040d7a0a1f..00000000000 --- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_7,3_8} ) -inherit distutils-r1 - -PYSDL="${PN}-2.1.0" - -DESCRIPTION="Reimplementation of portions of the pygame API using SDL2" -HOMEPAGE="https://github.com/renpy/pygame_sdl2"; -SRC_URI="https://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"; - -LICENSE="LGPL-2.1 ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -BDEPEND=" - dev-python/cython[${PYTHON_USEDEP}]" -DEPEND=" - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - ' -3) - $(python_gen_cond_dep ' - dev-python/numpy-python2[${PYTHON_USEDEP}] - ' -2) - media-libs/libpng:0= - media-libs/libsdl2:=[video] - media-libs/sdl2-image:=[png,jpeg] - >=media-libs/sdl2-mixer-2.0.2:= - media-libs/sdl2-ttf:= - virtual/jpeg:0" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${PYSDL}-for-renpy-${PV} - -PATCHES=( "${FILESDIR}/pygame_sdl2-6.99.12.4-mixer.patch" ) - -# PyGame distribution for this version has some pregenerated files; -# we need to remove them -python_prepare_all() { - rm -r gen{,3} || die - distutils-r1_python_prepare_all -} diff --git a/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild deleted file mode 100644 index 4c3cac2456c..00000000000 --- a/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit distutils-r1 - -PYSDL="${PN}-2.1.0" - -DESCRIPTION="Reimplementation of portions of the pygame API using SDL2" -HOMEPAGE="https://github.com/renpy/pygame_sdl2"; -SRC_URI="https://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"; - -LICENSE="LGPL-2.1 ZLIB" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -BDEPEND=" - dev-python/cython[${PYTHON_USEDEP}]" -DEPEND=" - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - ' -3) - $(python_gen_cond_dep ' - dev-python/numpy-python2[${PYTHON_USEDEP}] - ' -2) - media-libs/libpng:0= - media-libs/libsdl2:=[video] - media-libs/sdl2-image:=[png,jpeg] - >=media-libs/sdl2-mixer-2.0.2:= - media-libs/sdl2-ttf:= - virtual/jpeg:0" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${PYSDL}-for-renpy-${PV} - -# PyGame distribution for this version has some pregenerated files; -# we need to remove them -python_prepare_all() { - rm -r gen{,3} || die - distutils-r1_python_prepare_all -}
