1 |
commit: 33c5cee52e810bae6a3a10da0555c7caf6ecf613 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 7 14:55:34 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 9 16:26:27 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33c5cee5 |
7 |
|
8 |
kde-apps/kajongg: Switch to PYTHON_MULTI_USEDEP API |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
.../kajongg/{kajongg-19.08.3.ebuild => kajongg-19.08.3-r1.ebuild} | 8 +++++--- |
13 |
.../kajongg/{kajongg-19.12.2.ebuild => kajongg-19.12.2-r1.ebuild} | 6 ++++-- |
14 |
2 files changed, 9 insertions(+), 5 deletions(-) |
15 |
|
16 |
diff --git a/kde-apps/kajongg/kajongg-19.08.3.ebuild b/kde-apps/kajongg/kajongg-19.08.3-r1.ebuild |
17 |
similarity index 86% |
18 |
rename from kde-apps/kajongg/kajongg-19.08.3.ebuild |
19 |
rename to kde-apps/kajongg/kajongg-19.08.3-r1.ebuild |
20 |
index 2265010c57f..4beb7921dde 100644 |
21 |
--- a/kde-apps/kajongg/kajongg-19.08.3.ebuild |
22 |
+++ b/kde-apps/kajongg/kajongg-19.08.3-r1.ebuild |
23 |
@@ -1,4 +1,4 @@ |
24 |
-# Copyright 1999-2019 Gentoo Authors |
25 |
+# Copyright 1999-2020 Gentoo Authors |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
EAPI=7 |
29 |
@@ -27,8 +27,10 @@ DEPEND="${PYTHON_DEPS} |
30 |
>=dev-qt/qtsvg-${QTMIN}:5 |
31 |
>=dev-qt/qtwidgets-${QTMIN}:5 |
32 |
dev-db/sqlite:3 |
33 |
- dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}] |
34 |
- >=dev-python/twisted-16.6.0[${PYTHON_USEDEP}] |
35 |
+ $(python_gen_cond_dep ' |
36 |
+ dev-python/PyQt5[gui,svg,widgets,${PYTHON_MULTI_USEDEP}] |
37 |
+ >=dev-python/twisted-16.6.0[${PYTHON_MULTI_USEDEP}] |
38 |
+ ') |
39 |
" |
40 |
RDEPEND="${DEPEND} |
41 |
>=kde-apps/libkmahjongg-${PVCUT}:5 |
42 |
|
43 |
diff --git a/kde-apps/kajongg/kajongg-19.12.2.ebuild b/kde-apps/kajongg/kajongg-19.12.2-r1.ebuild |
44 |
similarity index 89% |
45 |
rename from kde-apps/kajongg/kajongg-19.12.2.ebuild |
46 |
rename to kde-apps/kajongg/kajongg-19.12.2-r1.ebuild |
47 |
index 68eaab914c1..2e18c791a78 100644 |
48 |
--- a/kde-apps/kajongg/kajongg-19.12.2.ebuild |
49 |
+++ b/kde-apps/kajongg/kajongg-19.12.2-r1.ebuild |
50 |
@@ -28,8 +28,10 @@ DEPEND="${PYTHON_DEPS} |
51 |
>=dev-qt/qtsvg-${QTMIN}:5 |
52 |
>=dev-qt/qtwidgets-${QTMIN}:5 |
53 |
dev-db/sqlite:3 |
54 |
- dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}] |
55 |
- >=dev-python/twisted-16.6.0[${PYTHON_USEDEP}] |
56 |
+ $(python_gen_cond_dep ' |
57 |
+ dev-python/PyQt5[gui,svg,widgets,${PYTHON_MULTI_USEDEP}] |
58 |
+ >=dev-python/twisted-16.6.0[${PYTHON_MULTI_USEDEP}] |
59 |
+ ') |
60 |
" |
61 |
RDEPEND="${DEPEND} |
62 |
>=kde-apps/libkmahjongg-${PVCUT}:5 |