| 1 |
commit: bf6ba2fa05581e64b9a63a4e3f77c73f3c6218bb |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 7 19:03:29 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 16:35:27 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf6ba2fa |
| 7 |
|
| 8 |
sci-geosciences/qgis: Switch to PYTHON_MULTI_USEDEP API |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
.../{qgis-3.10.2.ebuild => qgis-3.10.2-r1.ebuild} | 34 ++++++++++++---------- |
| 13 |
sci-geosciences/qgis/qgis-3.4.12.ebuild | 34 ++++++++++++---------- |
| 14 |
sci-geosciences/qgis/qgis-9999.ebuild | 34 ++++++++++++---------- |
| 15 |
3 files changed, 54 insertions(+), 48 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-geosciences/qgis/qgis-3.10.2.ebuild b/sci-geosciences/qgis/qgis-3.10.2-r1.ebuild |
| 18 |
similarity index 84% |
| 19 |
rename from sci-geosciences/qgis/qgis-3.10.2.ebuild |
| 20 |
rename to sci-geosciences/qgis/qgis-3.10.2-r1.ebuild |
| 21 |
index 232d4a5b49c..cc6d86b4b70 100644 |
| 22 |
--- a/sci-geosciences/qgis/qgis-3.10.2.ebuild |
| 23 |
+++ b/sci-geosciences/qgis/qgis-3.10.2-r1.ebuild |
| 24 |
@@ -73,22 +73,24 @@ COMMON_DEPEND=" |
| 25 |
postgres? ( dev-db/postgresql:= ) |
| 26 |
python? ( |
| 27 |
${PYTHON_DEPS} |
| 28 |
- dev-python/future[${PYTHON_USEDEP}] |
| 29 |
- dev-python/httplib2[${PYTHON_USEDEP}] |
| 30 |
- dev-python/jinja[${PYTHON_USEDEP}] |
| 31 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
| 32 |
- dev-python/owslib[${PYTHON_USEDEP}] |
| 33 |
- dev-python/pygments[${PYTHON_USEDEP}] |
| 34 |
- dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}] |
| 35 |
- dev-python/python-dateutil[${PYTHON_USEDEP}] |
| 36 |
- dev-python/pytz[${PYTHON_USEDEP}] |
| 37 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
| 38 |
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}] |
| 39 |
- dev-python/requests[${PYTHON_USEDEP}] |
| 40 |
- dev-python/sip:=[${PYTHON_USEDEP}] |
| 41 |
- dev-python/six[${PYTHON_USEDEP}] |
| 42 |
- >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] |
| 43 |
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) |
| 44 |
+ $(python_gen_cond_dep ' |
| 45 |
+ dev-python/future[${PYTHON_MULTI_USEDEP}] |
| 46 |
+ dev-python/httplib2[${PYTHON_MULTI_USEDEP}] |
| 47 |
+ dev-python/jinja[${PYTHON_MULTI_USEDEP}] |
| 48 |
+ dev-python/markupsafe[${PYTHON_MULTI_USEDEP}] |
| 49 |
+ dev-python/owslib[${PYTHON_MULTI_USEDEP}] |
| 50 |
+ dev-python/pygments[${PYTHON_MULTI_USEDEP}] |
| 51 |
+ dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}] |
| 52 |
+ dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] |
| 53 |
+ dev-python/pytz[${PYTHON_MULTI_USEDEP}] |
| 54 |
+ dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] |
| 55 |
+ >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}] |
| 56 |
+ dev-python/requests[${PYTHON_MULTI_USEDEP}] |
| 57 |
+ dev-python/sip:=[${PYTHON_MULTI_USEDEP}] |
| 58 |
+ dev-python/six[${PYTHON_MULTI_USEDEP}] |
| 59 |
+ >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}] |
| 60 |
+ postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) |
| 61 |
+ ') |
| 62 |
) |
| 63 |
qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) |
| 64 |
webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) |
| 65 |
|
| 66 |
diff --git a/sci-geosciences/qgis/qgis-3.4.12.ebuild b/sci-geosciences/qgis/qgis-3.4.12.ebuild |
| 67 |
index ae1b97d37ba..d5cb18ca5d4 100644 |
| 68 |
--- a/sci-geosciences/qgis/qgis-3.4.12.ebuild |
| 69 |
+++ b/sci-geosciences/qgis/qgis-3.4.12.ebuild |
| 70 |
@@ -71,22 +71,24 @@ COMMON_DEPEND=" |
| 71 |
postgres? ( dev-db/postgresql:= ) |
| 72 |
python? ( |
| 73 |
${PYTHON_DEPS} |
| 74 |
- dev-python/future[${PYTHON_USEDEP}] |
| 75 |
- dev-python/httplib2[${PYTHON_USEDEP}] |
| 76 |
- dev-python/jinja[${PYTHON_USEDEP}] |
| 77 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
| 78 |
- dev-python/owslib[${PYTHON_USEDEP}] |
| 79 |
- dev-python/pygments[${PYTHON_USEDEP}] |
| 80 |
- dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}] |
| 81 |
- dev-python/python-dateutil[${PYTHON_USEDEP}] |
| 82 |
- dev-python/pytz[${PYTHON_USEDEP}] |
| 83 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
| 84 |
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}] |
| 85 |
- dev-python/requests[${PYTHON_USEDEP}] |
| 86 |
- dev-python/sip:=[${PYTHON_USEDEP}] |
| 87 |
- dev-python/six[${PYTHON_USEDEP}] |
| 88 |
- >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] |
| 89 |
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) |
| 90 |
+ $(python_gen_cond_dep ' |
| 91 |
+ dev-python/future[${PYTHON_MULTI_USEDEP}] |
| 92 |
+ dev-python/httplib2[${PYTHON_MULTI_USEDEP}] |
| 93 |
+ dev-python/jinja[${PYTHON_MULTI_USEDEP}] |
| 94 |
+ dev-python/markupsafe[${PYTHON_MULTI_USEDEP}] |
| 95 |
+ dev-python/owslib[${PYTHON_MULTI_USEDEP}] |
| 96 |
+ dev-python/pygments[${PYTHON_MULTI_USEDEP}] |
| 97 |
+ dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}] |
| 98 |
+ dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] |
| 99 |
+ dev-python/pytz[${PYTHON_MULTI_USEDEP}] |
| 100 |
+ dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] |
| 101 |
+ >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}] |
| 102 |
+ dev-python/requests[${PYTHON_MULTI_USEDEP}] |
| 103 |
+ dev-python/sip:=[${PYTHON_MULTI_USEDEP}] |
| 104 |
+ dev-python/six[${PYTHON_MULTI_USEDEP}] |
| 105 |
+ >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}] |
| 106 |
+ postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) |
| 107 |
+ ') |
| 108 |
) |
| 109 |
qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) |
| 110 |
webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) |
| 111 |
|
| 112 |
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild |
| 113 |
index 14ca3c37210..74129055f6b 100644 |
| 114 |
--- a/sci-geosciences/qgis/qgis-9999.ebuild |
| 115 |
+++ b/sci-geosciences/qgis/qgis-9999.ebuild |
| 116 |
@@ -73,22 +73,24 @@ COMMON_DEPEND=" |
| 117 |
postgres? ( dev-db/postgresql:= ) |
| 118 |
python? ( |
| 119 |
${PYTHON_DEPS} |
| 120 |
- dev-python/future[${PYTHON_USEDEP}] |
| 121 |
- dev-python/httplib2[${PYTHON_USEDEP}] |
| 122 |
- dev-python/jinja[${PYTHON_USEDEP}] |
| 123 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
| 124 |
- dev-python/owslib[${PYTHON_USEDEP}] |
| 125 |
- dev-python/pygments[${PYTHON_USEDEP}] |
| 126 |
- dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}] |
| 127 |
- dev-python/python-dateutil[${PYTHON_USEDEP}] |
| 128 |
- dev-python/pytz[${PYTHON_USEDEP}] |
| 129 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
| 130 |
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}] |
| 131 |
- dev-python/requests[${PYTHON_USEDEP}] |
| 132 |
- dev-python/sip:=[${PYTHON_USEDEP}] |
| 133 |
- dev-python/six[${PYTHON_USEDEP}] |
| 134 |
- >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] |
| 135 |
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) |
| 136 |
+ $(python_gen_cond_dep ' |
| 137 |
+ dev-python/future[${PYTHON_MULTI_USEDEP}] |
| 138 |
+ dev-python/httplib2[${PYTHON_MULTI_USEDEP}] |
| 139 |
+ dev-python/jinja[${PYTHON_MULTI_USEDEP}] |
| 140 |
+ dev-python/markupsafe[${PYTHON_MULTI_USEDEP}] |
| 141 |
+ dev-python/owslib[${PYTHON_MULTI_USEDEP}] |
| 142 |
+ dev-python/pygments[${PYTHON_MULTI_USEDEP}] |
| 143 |
+ dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}] |
| 144 |
+ dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] |
| 145 |
+ dev-python/pytz[${PYTHON_MULTI_USEDEP}] |
| 146 |
+ dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] |
| 147 |
+ >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}] |
| 148 |
+ dev-python/requests[${PYTHON_MULTI_USEDEP}] |
| 149 |
+ dev-python/sip:=[${PYTHON_MULTI_USEDEP}] |
| 150 |
+ dev-python/six[${PYTHON_MULTI_USEDEP}] |
| 151 |
+ >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}] |
| 152 |
+ postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) |
| 153 |
+ ') |
| 154 |
) |
| 155 |
qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) |
| 156 |
webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) |
Archives