| 1 |
commit: 05565df1c7db9a8fe2fa9a7110ff4d70cf56ab63 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 7 14:14:08 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 16:22:08 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05565df1 |
| 7 |
|
| 8 |
games-util/pyfa: Switch to PYTHON_MULTI_USEDEP API |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
games-util/pyfa/pyfa-2.14.1.ebuild | 34 ++++++++++++---------- |
| 13 |
.../{pyfa-2.15.1.ebuild => pyfa-2.15.1-r1.ebuild} | 32 +++++++++++--------- |
| 14 |
games-util/pyfa/pyfa-9999.ebuild | 32 +++++++++++--------- |
| 15 |
3 files changed, 55 insertions(+), 43 deletions(-) |
| 16 |
|
| 17 |
diff --git a/games-util/pyfa/pyfa-2.14.1.ebuild b/games-util/pyfa/pyfa-2.14.1.ebuild |
| 18 |
index e3c4bc18650..51e160ed66c 100644 |
| 19 |
--- a/games-util/pyfa/pyfa-2.14.1.ebuild |
| 20 |
+++ b/games-util/pyfa/pyfa-2.14.1.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2019 Gentoo Authors |
| 23 |
+# Copyright 1999-2020 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI="7" |
| 27 |
@@ -25,21 +25,25 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 28 |
RESTRICT="mirror bindist" |
| 29 |
|
| 30 |
DEPEND=" |
| 31 |
- >=dev-python/cryptography-2.3[${PYTHON_USEDEP}] |
| 32 |
- >=dev-python/logbook-1.0.0[${PYTHON_USEDEP}] |
| 33 |
- >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}] |
| 34 |
- >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}] |
| 35 |
- >=dev-python/wxpython-4.0.4[webkit,${PYTHON_USEDEP}]" |
| 36 |
+ $(python_gen_cond_dep ' |
| 37 |
+ >=dev-python/cryptography-2.3[${PYTHON_MULTI_USEDEP}] |
| 38 |
+ >=dev-python/logbook-1.0.0[${PYTHON_MULTI_USEDEP}] |
| 39 |
+ >=dev-python/pyyaml-5.1[${PYTHON_MULTI_USEDEP}] |
| 40 |
+ >=dev-python/sqlalchemy-1.3.0[${PYTHON_MULTI_USEDEP}] |
| 41 |
+ >=dev-python/wxpython-4.0.4[webkit,${PYTHON_MULTI_USEDEP}] |
| 42 |
+ ')" |
| 43 |
RDEPEND="${DEPEND} |
| 44 |
- >=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}] |
| 45 |
- >=dev-python/markdown2-2.3.0[${PYTHON_USEDEP}] |
| 46 |
- >=dev-python/packaging-16.8[${PYTHON_USEDEP}] |
| 47 |
- dev-python/python-dateutil[${PYTHON_USEDEP}] |
| 48 |
- >=dev-python/requests-2.0.0[${PYTHON_USEDEP}] |
| 49 |
- >=dev-python/roman-2.0.0[${PYTHON_USEDEP}] |
| 50 |
- graph? ( |
| 51 |
- >=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_USEDEP}] |
| 52 |
- dev-python/numpy[${PYTHON_USEDEP}] ) |
| 53 |
+ $(python_gen_cond_dep ' |
| 54 |
+ >=dev-python/beautifulsoup-4.6.0[${PYTHON_MULTI_USEDEP}] |
| 55 |
+ >=dev-python/markdown2-2.3.0[${PYTHON_MULTI_USEDEP}] |
| 56 |
+ >=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}] |
| 57 |
+ dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] |
| 58 |
+ >=dev-python/requests-2.0.0[${PYTHON_MULTI_USEDEP}] |
| 59 |
+ >=dev-python/roman-2.0.0[${PYTHON_MULTI_USEDEP}] |
| 60 |
+ graph? ( |
| 61 |
+ >=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_MULTI_USEDEP}] |
| 62 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] ) |
| 63 |
+ ') |
| 64 |
${PYTHON_DEPS}" |
| 65 |
BDEPEND="app-arch/zip" |
| 66 |
|
| 67 |
|
| 68 |
diff --git a/games-util/pyfa/pyfa-2.15.1.ebuild b/games-util/pyfa/pyfa-2.15.1-r1.ebuild |
| 69 |
similarity index 71% |
| 70 |
rename from games-util/pyfa/pyfa-2.15.1.ebuild |
| 71 |
rename to games-util/pyfa/pyfa-2.15.1-r1.ebuild |
| 72 |
index 68be8d9f02c..5c6b262d499 100644 |
| 73 |
--- a/games-util/pyfa/pyfa-2.15.1.ebuild |
| 74 |
+++ b/games-util/pyfa/pyfa-2.15.1-r1.ebuild |
| 75 |
@@ -1,4 +1,4 @@ |
| 76 |
-# Copyright 1999-2019 Gentoo Authors |
| 77 |
+# Copyright 1999-2020 Gentoo Authors |
| 78 |
# Distributed under the terms of the GNU General Public License v2 |
| 79 |
|
| 80 |
EAPI="7" |
| 81 |
@@ -25,21 +25,25 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 82 |
RESTRICT="mirror bindist" |
| 83 |
|
| 84 |
DEPEND=" |
| 85 |
- >=dev-python/cryptography-2.3[${PYTHON_USEDEP}] |
| 86 |
- >=dev-python/logbook-1.0.0[${PYTHON_USEDEP}] |
| 87 |
- >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}] |
| 88 |
- >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}] |
| 89 |
- >=dev-python/wxpython-4.0.4[webkit,${PYTHON_USEDEP}] |
| 90 |
+ $(python_gen_cond_dep ' |
| 91 |
+ >=dev-python/cryptography-2.3[${PYTHON_MULTI_USEDEP}] |
| 92 |
+ >=dev-python/logbook-1.0.0[${PYTHON_MULTI_USEDEP}] |
| 93 |
+ >=dev-python/pyyaml-5.1[${PYTHON_MULTI_USEDEP}] |
| 94 |
+ >=dev-python/sqlalchemy-1.3.0[${PYTHON_MULTI_USEDEP}] |
| 95 |
+ >=dev-python/wxpython-4.0.4[webkit,${PYTHON_MULTI_USEDEP}] |
| 96 |
+ ') |
| 97 |
${PYTHON_DEPS}" |
| 98 |
RDEPEND="${DEPEND} |
| 99 |
- >=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}] |
| 100 |
- >=dev-python/markdown2-2.3.0[${PYTHON_USEDEP}] |
| 101 |
- >=dev-python/packaging-16.8[${PYTHON_USEDEP}] |
| 102 |
- dev-python/python-dateutil[${PYTHON_USEDEP}] |
| 103 |
- >=dev-python/requests-2.0.0[${PYTHON_USEDEP}] |
| 104 |
- >=dev-python/roman-2.0.0[${PYTHON_USEDEP}] |
| 105 |
- >=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_USEDEP}] |
| 106 |
- dev-python/numpy[${PYTHON_USEDEP}]" |
| 107 |
+ $(python_gen_cond_dep ' |
| 108 |
+ >=dev-python/beautifulsoup-4.6.0[${PYTHON_MULTI_USEDEP}] |
| 109 |
+ >=dev-python/markdown2-2.3.0[${PYTHON_MULTI_USEDEP}] |
| 110 |
+ >=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}] |
| 111 |
+ dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] |
| 112 |
+ >=dev-python/requests-2.0.0[${PYTHON_MULTI_USEDEP}] |
| 113 |
+ >=dev-python/roman-2.0.0[${PYTHON_MULTI_USEDEP}] |
| 114 |
+ >=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_MULTI_USEDEP}] |
| 115 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 116 |
+ ')" |
| 117 |
BDEPEND="app-arch/zip" |
| 118 |
|
| 119 |
PATCHES=( |
| 120 |
|
| 121 |
diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild |
| 122 |
index 68be8d9f02c..5c6b262d499 100644 |
| 123 |
--- a/games-util/pyfa/pyfa-9999.ebuild |
| 124 |
+++ b/games-util/pyfa/pyfa-9999.ebuild |
| 125 |
@@ -1,4 +1,4 @@ |
| 126 |
-# Copyright 1999-2019 Gentoo Authors |
| 127 |
+# Copyright 1999-2020 Gentoo Authors |
| 128 |
# Distributed under the terms of the GNU General Public License v2 |
| 129 |
|
| 130 |
EAPI="7" |
| 131 |
@@ -25,21 +25,25 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 132 |
RESTRICT="mirror bindist" |
| 133 |
|
| 134 |
DEPEND=" |
| 135 |
- >=dev-python/cryptography-2.3[${PYTHON_USEDEP}] |
| 136 |
- >=dev-python/logbook-1.0.0[${PYTHON_USEDEP}] |
| 137 |
- >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}] |
| 138 |
- >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}] |
| 139 |
- >=dev-python/wxpython-4.0.4[webkit,${PYTHON_USEDEP}] |
| 140 |
+ $(python_gen_cond_dep ' |
| 141 |
+ >=dev-python/cryptography-2.3[${PYTHON_MULTI_USEDEP}] |
| 142 |
+ >=dev-python/logbook-1.0.0[${PYTHON_MULTI_USEDEP}] |
| 143 |
+ >=dev-python/pyyaml-5.1[${PYTHON_MULTI_USEDEP}] |
| 144 |
+ >=dev-python/sqlalchemy-1.3.0[${PYTHON_MULTI_USEDEP}] |
| 145 |
+ >=dev-python/wxpython-4.0.4[webkit,${PYTHON_MULTI_USEDEP}] |
| 146 |
+ ') |
| 147 |
${PYTHON_DEPS}" |
| 148 |
RDEPEND="${DEPEND} |
| 149 |
- >=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}] |
| 150 |
- >=dev-python/markdown2-2.3.0[${PYTHON_USEDEP}] |
| 151 |
- >=dev-python/packaging-16.8[${PYTHON_USEDEP}] |
| 152 |
- dev-python/python-dateutil[${PYTHON_USEDEP}] |
| 153 |
- >=dev-python/requests-2.0.0[${PYTHON_USEDEP}] |
| 154 |
- >=dev-python/roman-2.0.0[${PYTHON_USEDEP}] |
| 155 |
- >=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_USEDEP}] |
| 156 |
- dev-python/numpy[${PYTHON_USEDEP}]" |
| 157 |
+ $(python_gen_cond_dep ' |
| 158 |
+ >=dev-python/beautifulsoup-4.6.0[${PYTHON_MULTI_USEDEP}] |
| 159 |
+ >=dev-python/markdown2-2.3.0[${PYTHON_MULTI_USEDEP}] |
| 160 |
+ >=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}] |
| 161 |
+ dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] |
| 162 |
+ >=dev-python/requests-2.0.0[${PYTHON_MULTI_USEDEP}] |
| 163 |
+ >=dev-python/roman-2.0.0[${PYTHON_MULTI_USEDEP}] |
| 164 |
+ >=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_MULTI_USEDEP}] |
| 165 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 166 |
+ ')" |
| 167 |
BDEPEND="app-arch/zip" |
| 168 |
|
| 169 |
PATCHES=( |
Archives