From aac155cbcde7b8fb16f5b7cbb41a6759520bea74 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sun, 26 May 2019 17:00:22 +0200 Subject: dev-python/pygame_sdl2: [QA] Fix virtual/jpeg SLOT * Don't use the binary compatibility slot for a source package. Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: David Seifert --- .../pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild | 29 +++++++-------- .../pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild | 42 ++++++++++++++++++++++ .../pygame_sdl2/pygame_sdl2-6.99.12.4.ebuild | 39 -------------------- .../pygame_sdl2/pygame_sdl2-6.99.6-r1.ebuild | 29 --------------- .../pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild | 29 +++++++++++++++ 5 files changed, 83 insertions(+), 85 deletions(-) create mode 100644 dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild delete mode 100644 dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4.ebuild delete mode 100644 dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r1.ebuild create mode 100644 dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild (limited to 'dev-python/pygame_sdl2') diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild index 2c7b47dbd37e..dc01aea24405 100644 --- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild +++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=6 PYTHON_COMPAT=( python{2_7,3_5,3_6} ) inherit distutils-r1 @@ -14,31 +14,26 @@ SRC_URI="http://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz" LICENSE="LGPL-2.1 ZLIB" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" -BDEPEND=" - dev-python/cython[${PYTHON_USEDEP}] -" -DEPEND=" +RDEPEND=" dev-python/numpy[${PYTHON_USEDEP}] - 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:62 -" -RDEPEND="${DEPEND}" + media-libs/libpng:0= + media-libs/libsdl2:=[video] + media-libs/sdl2-image:=[png,jpeg] + media-libs/sdl2-mixer:= + media-libs/sdl2-ttf:= + virtual/jpeg:0" +DEPEND="${RDEPEND} + dev-python/cython[${PYTHON_USEDEP}]" 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 "${S}"/gen{,3} || die + rm -r gen{,3} || die distutils-r1_python_prepare_all } diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild new file mode 100644 index 000000000000..8f6ab7706900 --- /dev/null +++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{2_7,3_5,3_6} ) +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="http://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=" + dev-python/numpy[${PYTHON_USEDEP}] + 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-6.99.12.4.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4.ebuild deleted file mode 100644 index 372e1a7f714a..000000000000 --- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) -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="http://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz" - -LICENSE="LGPL-2.1 ZLIB" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="dev-python/numpy[${PYTHON_USEDEP}] - media-libs/libpng:0 - media-libs/libsdl2[video] - media-libs/sdl2-image[png,jpeg] - media-libs/sdl2-mixer - media-libs/sdl2-ttf - virtual/jpeg:62 -" -DEPEND="${RDEPEND} - dev-python/cython[${PYTHON_USEDEP}]" - -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 "${S}"/gen{,3} || die - distutils-r1_python_prepare_all -} diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r1.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r1.ebuild deleted file mode 100644 index fbf4027ae86e..000000000000 --- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) -inherit distutils-r1 - -DESCRIPTION="Reimplementation of portions of the pygame API using SDL2" -HOMEPAGE="https://github.com/renpy/pygame_sdl2" -SRC_URI="http://www.renpy.org/dl/${PV}/pygame_sdl2-for-renpy-${PV}.tar.bz2" - -LICENSE="LGPL-2.1 ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-python/numpy[${PYTHON_USEDEP}] - media-libs/libpng:0 - media-libs/libsdl2[video] - media-libs/sdl2-image[png,jpeg] - media-libs/sdl2-mixer - media-libs/sdl2-ttf - virtual/jpeg:62 -" -DEPEND="${RDEPEND} - dev-python/cython[${PYTHON_USEDEP}]" - -S=${WORKDIR}/pygame-sdl2-for-renpy-${PV} diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild new file mode 100644 index 000000000000..8312566925b3 --- /dev/null +++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_5,3_6} ) +inherit distutils-r1 + +DESCRIPTION="Reimplementation of portions of the pygame API using SDL2" +HOMEPAGE="https://github.com/renpy/pygame_sdl2" +SRC_URI="http://www.renpy.org/dl/${PV}/pygame_sdl2-for-renpy-${PV}.tar.bz2" + +LICENSE="LGPL-2.1 ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + dev-python/numpy[${PYTHON_USEDEP}] + media-libs/libpng:0= + media-libs/libsdl2:=[video] + media-libs/sdl2-image:=[png,jpeg] + media-libs/sdl2-mixer:= + media-libs/sdl2-ttf:= + virtual/jpeg:0" +DEPEND="${RDEPEND} + dev-python/cython[${PYTHON_USEDEP}]" + +S=${WORKDIR}/pygame-sdl2-for-renpy-${PV} -- cgit v1.2.3-65-gdbad