commit: a2beb97166388041fe909d3edb56aabbcd9006c5 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Sep 16 10:08:08 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Sep 16 10:13:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2beb971
dev-python/pygame_sdl2: Permit numpy-python2 package Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> ...me_sdl2-6.99.12.4-r2.ebuild => pygame_sdl2-6.99.12.4-r4.ebuild} | 7 ++++++- ...me_sdl2-6.99.12.4-r3.ebuild => pygame_sdl2-6.99.12.4-r5.ebuild} | 7 ++++++- .../{pygame_sdl2-7.3.5.ebuild => pygame_sdl2-7.3.5-r1.ebuild} | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) 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-r4.ebuild similarity index 86% rename from dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild rename to dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r4.ebuild index c667a5816ee..d12730c56f9 100644 --- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild +++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r4.ebuild @@ -20,7 +20,12 @@ IUSE="" BDEPEND=" dev-python/cython[${PYTHON_USEDEP}]" DEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] + $(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] diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r3.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild similarity index 86% rename from dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r3.ebuild rename to dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild index 87e4c044469..ea28704a6ea 100644 --- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r3.ebuild +++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild @@ -20,7 +20,12 @@ IUSE="" BDEPEND=" dev-python/cython[${PYTHON_USEDEP}]" DEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] + $(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] diff --git a/dev-python/pygame_sdl2/pygame_sdl2-7.3.5.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild similarity index 86% rename from dev-python/pygame_sdl2/pygame_sdl2-7.3.5.ebuild rename to dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild index 652dd7b262b..c5f851750c7 100644 --- a/dev-python/pygame_sdl2/pygame_sdl2-7.3.5.ebuild +++ b/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild @@ -20,7 +20,12 @@ IUSE="" BDEPEND=" dev-python/cython[${PYTHON_USEDEP}]" DEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] + $(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]