1 |
commit: a2beb97166388041fe909d3edb56aabbcd9006c5 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 16 10:08:08 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 16 10:13:23 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2beb971 |
7 |
|
8 |
dev-python/pygame_sdl2: Permit numpy-python2 package |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
...me_sdl2-6.99.12.4-r2.ebuild => pygame_sdl2-6.99.12.4-r4.ebuild} | 7 ++++++- |
13 |
...me_sdl2-6.99.12.4-r3.ebuild => pygame_sdl2-6.99.12.4-r5.ebuild} | 7 ++++++- |
14 |
.../{pygame_sdl2-7.3.5.ebuild => pygame_sdl2-7.3.5-r1.ebuild} | 7 ++++++- |
15 |
3 files changed, 18 insertions(+), 3 deletions(-) |
16 |
|
17 |
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 |
18 |
similarity index 86% |
19 |
rename from dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild |
20 |
rename to dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r4.ebuild |
21 |
index c667a5816ee..d12730c56f9 100644 |
22 |
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild |
23 |
+++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r4.ebuild |
24 |
@@ -20,7 +20,12 @@ IUSE="" |
25 |
BDEPEND=" |
26 |
dev-python/cython[${PYTHON_USEDEP}]" |
27 |
DEPEND=" |
28 |
- dev-python/numpy[${PYTHON_USEDEP}] |
29 |
+ $(python_gen_cond_dep ' |
30 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
31 |
+ ' -3) |
32 |
+ $(python_gen_cond_dep ' |
33 |
+ dev-python/numpy-python2[${PYTHON_USEDEP}] |
34 |
+ ' -2) |
35 |
media-libs/libpng:0= |
36 |
media-libs/libsdl2:=[video] |
37 |
media-libs/sdl2-image:=[png,jpeg] |
38 |
|
39 |
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 |
40 |
similarity index 86% |
41 |
rename from dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r3.ebuild |
42 |
rename to dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild |
43 |
index 87e4c044469..ea28704a6ea 100644 |
44 |
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r3.ebuild |
45 |
+++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild |
46 |
@@ -20,7 +20,12 @@ IUSE="" |
47 |
BDEPEND=" |
48 |
dev-python/cython[${PYTHON_USEDEP}]" |
49 |
DEPEND=" |
50 |
- dev-python/numpy[${PYTHON_USEDEP}] |
51 |
+ $(python_gen_cond_dep ' |
52 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
53 |
+ ' -3) |
54 |
+ $(python_gen_cond_dep ' |
55 |
+ dev-python/numpy-python2[${PYTHON_USEDEP}] |
56 |
+ ' -2) |
57 |
media-libs/libpng:0= |
58 |
media-libs/libsdl2:=[video] |
59 |
media-libs/sdl2-image:=[png,jpeg] |
60 |
|
61 |
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 |
62 |
similarity index 86% |
63 |
rename from dev-python/pygame_sdl2/pygame_sdl2-7.3.5.ebuild |
64 |
rename to dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild |
65 |
index 652dd7b262b..c5f851750c7 100644 |
66 |
--- a/dev-python/pygame_sdl2/pygame_sdl2-7.3.5.ebuild |
67 |
+++ b/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild |
68 |
@@ -20,7 +20,12 @@ IUSE="" |
69 |
BDEPEND=" |
70 |
dev-python/cython[${PYTHON_USEDEP}]" |
71 |
DEPEND=" |
72 |
- dev-python/numpy[${PYTHON_USEDEP}] |
73 |
+ $(python_gen_cond_dep ' |
74 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
75 |
+ ' -3) |
76 |
+ $(python_gen_cond_dep ' |
77 |
+ dev-python/numpy-python2[${PYTHON_USEDEP}] |
78 |
+ ' -2) |
79 |
media-libs/libpng:0= |
80 |
media-libs/libsdl2:=[video] |
81 |
media-libs/sdl2-image:=[png,jpeg] |