| 1 |
commit: 5ef378748982f61d00bb60172d661be41ddc5f1c |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 7 09:38:56 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 16:10:47 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ef37874 |
| 7 |
|
| 8 |
app-misc/anki: Switch to PYTHON_MULTI_USEDEP API |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
app-misc/anki/anki-2.1.0_beta25.ebuild | 32 ++++++++++------- |
| 13 |
app-misc/anki/anki-2.1.0_beta27.ebuild | 42 ++++++++++++---------- |
| 14 |
.../{anki-2.1.13.ebuild => anki-2.1.13-r1.ebuild} | 34 ++++++++++-------- |
| 15 |
3 files changed, 63 insertions(+), 45 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-misc/anki/anki-2.1.0_beta25.ebuild b/app-misc/anki/anki-2.1.0_beta25.ebuild |
| 18 |
index 7a709e1e39e..7e5c0bc5b29 100644 |
| 19 |
--- a/app-misc/anki/anki-2.1.0_beta25.ebuild |
| 20 |
+++ b/app-misc/anki/anki-2.1.0_beta25.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=6 |
| 27 |
@@ -23,17 +23,19 @@ RESTRICT="!test? ( test )" |
| 28 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 29 |
|
| 30 |
RDEPEND="${PYTHON_DEPS} |
| 31 |
- dev-python/PyQt5[gui,svg,webkit,${PYTHON_USEDEP}] |
| 32 |
- >=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}] |
| 33 |
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}] |
| 34 |
- dev-python/decorator[${PYTHON_USEDEP}] |
| 35 |
- dev-python/markdown[${PYTHON_USEDEP}] |
| 36 |
- dev-python/requests[${PYTHON_USEDEP}] |
| 37 |
- dev-python/send2trash[${PYTHON_USEDEP}] |
| 38 |
- recording? ( |
| 39 |
- media-sound/lame |
| 40 |
- >=dev-python/pyaudio-0.2.4[${PYTHON_USEDEP}] |
| 41 |
- ) |
| 42 |
+ $(python_gen_cond_dep ' |
| 43 |
+ dev-python/PyQt5[gui,svg,webkit,${PYTHON_MULTI_USEDEP}] |
| 44 |
+ >=dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}] |
| 45 |
+ dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}] |
| 46 |
+ dev-python/decorator[${PYTHON_MULTI_USEDEP}] |
| 47 |
+ dev-python/markdown[${PYTHON_MULTI_USEDEP}] |
| 48 |
+ dev-python/requests[${PYTHON_MULTI_USEDEP}] |
| 49 |
+ dev-python/send2trash[${PYTHON_MULTI_USEDEP}] |
| 50 |
+ recording? ( |
| 51 |
+ media-sound/lame |
| 52 |
+ >=dev-python/pyaudio-0.2.4[${PYTHON_MULTI_USEDEP}] |
| 53 |
+ ) |
| 54 |
+ ') |
| 55 |
sound? ( media-video/mplayer ) |
| 56 |
latex? ( |
| 57 |
app-text/texlive |
| 58 |
@@ -41,7 +43,11 @@ RDEPEND="${PYTHON_DEPS} |
| 59 |
) |
| 60 |
" |
| 61 |
DEPEND="${RDEPEND} |
| 62 |
- test? ( dev-python/nose[${PYTHON_USEDEP}] ) |
| 63 |
+ test? ( |
| 64 |
+ $(python_gen_cond_dep ' |
| 65 |
+ dev-python/nose[${PYTHON_MULTI_USEDEP}] |
| 66 |
+ ') |
| 67 |
+ ) |
| 68 |
" |
| 69 |
|
| 70 |
PATCHES=( "${FILESDIR}"/${P}-web-folder.patch ) |
| 71 |
|
| 72 |
diff --git a/app-misc/anki/anki-2.1.0_beta27.ebuild b/app-misc/anki/anki-2.1.0_beta27.ebuild |
| 73 |
index 341c641fe86..9b0a46164d6 100644 |
| 74 |
--- a/app-misc/anki/anki-2.1.0_beta27.ebuild |
| 75 |
+++ b/app-misc/anki/anki-2.1.0_beta27.ebuild |
| 76 |
@@ -1,4 +1,4 @@ |
| 77 |
-# Copyright 1999-2019 Gentoo Authors |
| 78 |
+# Copyright 1999-2020 Gentoo Authors |
| 79 |
# Distributed under the terms of the GNU General Public License v2 |
| 80 |
|
| 81 |
EAPI=6 |
| 82 |
@@ -23,23 +23,25 @@ RESTRICT="!test? ( test )" |
| 83 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 84 |
|
| 85 |
RDEPEND="${PYTHON_DEPS} |
| 86 |
- || ( |
| 87 |
- ( |
| 88 |
- >=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_USEDEP}] |
| 89 |
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}] |
| 90 |
+ $(python_gen_cond_dep ' |
| 91 |
+ || ( |
| 92 |
+ ( |
| 93 |
+ >=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_MULTI_USEDEP}] |
| 94 |
+ dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}] |
| 95 |
+ ) |
| 96 |
+ <dev-python/PyQt5-5.12[gui,svg,webengine,widgets,${PYTHON_MULTI_USEDEP}] |
| 97 |
) |
| 98 |
- <dev-python/PyQt5-5.12[gui,svg,webengine,widgets,${PYTHON_USEDEP}] |
| 99 |
- ) |
| 100 |
- >=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}] |
| 101 |
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}] |
| 102 |
- dev-python/decorator[${PYTHON_USEDEP}] |
| 103 |
- dev-python/markdown[${PYTHON_USEDEP}] |
| 104 |
- dev-python/requests[${PYTHON_USEDEP}] |
| 105 |
- dev-python/send2trash[${PYTHON_USEDEP}] |
| 106 |
- recording? ( |
| 107 |
- media-sound/lame |
| 108 |
- >=dev-python/pyaudio-0.2.4[${PYTHON_USEDEP}] |
| 109 |
- ) |
| 110 |
+ >=dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}] |
| 111 |
+ dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}] |
| 112 |
+ dev-python/decorator[${PYTHON_MULTI_USEDEP}] |
| 113 |
+ dev-python/markdown[${PYTHON_MULTI_USEDEP}] |
| 114 |
+ dev-python/requests[${PYTHON_MULTI_USEDEP}] |
| 115 |
+ dev-python/send2trash[${PYTHON_MULTI_USEDEP}] |
| 116 |
+ recording? ( |
| 117 |
+ media-sound/lame |
| 118 |
+ >=dev-python/pyaudio-0.2.4[${PYTHON_MULTI_USEDEP}] |
| 119 |
+ ) |
| 120 |
+ ') |
| 121 |
sound? ( media-video/mplayer ) |
| 122 |
latex? ( |
| 123 |
app-text/texlive |
| 124 |
@@ -47,7 +49,11 @@ RDEPEND="${PYTHON_DEPS} |
| 125 |
) |
| 126 |
" |
| 127 |
DEPEND="${RDEPEND} |
| 128 |
- test? ( dev-python/nose[${PYTHON_USEDEP}] ) |
| 129 |
+ test? ( |
| 130 |
+ $(python_gen_cond_dep ' |
| 131 |
+ dev-python/nose[${PYTHON_MULTI_USEDEP}] |
| 132 |
+ ') |
| 133 |
+ ) |
| 134 |
" |
| 135 |
|
| 136 |
PATCHES=( "${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch ) |
| 137 |
|
| 138 |
diff --git a/app-misc/anki/anki-2.1.13.ebuild b/app-misc/anki/anki-2.1.13-r1.ebuild |
| 139 |
similarity index 71% |
| 140 |
rename from app-misc/anki/anki-2.1.13.ebuild |
| 141 |
rename to app-misc/anki/anki-2.1.13-r1.ebuild |
| 142 |
index 15c2f2cdf07..9c1a33eea45 100644 |
| 143 |
--- a/app-misc/anki/anki-2.1.13.ebuild |
| 144 |
+++ b/app-misc/anki/anki-2.1.13-r1.ebuild |
| 145 |
@@ -1,4 +1,4 @@ |
| 146 |
-# Copyright 1999-2019 Gentoo Authors |
| 147 |
+# Copyright 1999-2020 Gentoo Authors |
| 148 |
# Distributed under the terms of the GNU General Public License v2 |
| 149 |
|
| 150 |
EAPI=6 |
| 151 |
@@ -22,19 +22,21 @@ RESTRICT="!test? ( test )" |
| 152 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 153 |
|
| 154 |
RDEPEND="${PYTHON_DEPS} |
| 155 |
- || ( |
| 156 |
- ( |
| 157 |
- >=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_USEDEP}] |
| 158 |
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}] |
| 159 |
+ $(python_gen_cond_dep ' |
| 160 |
+ || ( |
| 161 |
+ ( |
| 162 |
+ >=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_MULTI_USEDEP}] |
| 163 |
+ dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}] |
| 164 |
+ ) |
| 165 |
+ <dev-python/PyQt5-5.12[gui,svg,webengine,widgets,${PYTHON_MULTI_USEDEP}] |
| 166 |
) |
| 167 |
- <dev-python/PyQt5-5.12[gui,svg,webengine,widgets,${PYTHON_USEDEP}] |
| 168 |
- ) |
| 169 |
- >=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}] |
| 170 |
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}] |
| 171 |
- dev-python/decorator[${PYTHON_USEDEP}] |
| 172 |
- dev-python/markdown[${PYTHON_USEDEP}] |
| 173 |
- dev-python/requests[${PYTHON_USEDEP}] |
| 174 |
- dev-python/send2trash[${PYTHON_USEDEP}] |
| 175 |
+ >=dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}] |
| 176 |
+ dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}] |
| 177 |
+ dev-python/decorator[${PYTHON_MULTI_USEDEP}] |
| 178 |
+ dev-python/markdown[${PYTHON_MULTI_USEDEP}] |
| 179 |
+ dev-python/requests[${PYTHON_MULTI_USEDEP}] |
| 180 |
+ dev-python/send2trash[${PYTHON_MULTI_USEDEP}] |
| 181 |
+ ') |
| 182 |
recording? ( media-sound/lame ) |
| 183 |
sound? ( media-video/mpv ) |
| 184 |
latex? ( |
| 185 |
@@ -43,7 +45,11 @@ RDEPEND="${PYTHON_DEPS} |
| 186 |
) |
| 187 |
" |
| 188 |
DEPEND="${RDEPEND} |
| 189 |
- test? ( dev-python/nose[${PYTHON_USEDEP}] ) |
| 190 |
+ test? ( |
| 191 |
+ $(python_gen_cond_dep ' |
| 192 |
+ dev-python/nose[${PYTHON_MULTI_USEDEP}] |
| 193 |
+ ') |
| 194 |
+ ) |
| 195 |
" |
| 196 |
|
| 197 |
PATCHES=( "${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch ) |
Archives