1 |
commit: c234acc551591776f4d0d1a582e4fe21655b7cde |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 17 18:17:02 2021 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 17 18:17:02 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c234acc5 |
7 |
|
8 |
sci-geosciences/qgis: PYTHON_MULTI_USEDEP -> PYTHON_USEDEP |
9 |
|
10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
11 |
|
12 |
sci-geosciences/qgis/qgis-3.18.3.ebuild | 32 +++++++++++++------------- |
13 |
sci-geosciences/qgis/qgis-3.20.0-r1.ebuild | 36 +++++++++++++++--------------- |
14 |
sci-geosciences/qgis/qgis-9999.ebuild | 36 +++++++++++++++--------------- |
15 |
3 files changed, 52 insertions(+), 52 deletions(-) |
16 |
|
17 |
diff --git a/sci-geosciences/qgis/qgis-3.18.3.ebuild b/sci-geosciences/qgis/qgis-3.18.3.ebuild |
18 |
index 7e4e3237f9f..d8e8430113f 100644 |
19 |
--- a/sci-geosciences/qgis/qgis-3.18.3.ebuild |
20 |
+++ b/sci-geosciences/qgis/qgis-3.18.3.ebuild |
21 |
@@ -3,7 +3,7 @@ |
22 |
|
23 |
EAPI=7 |
24 |
|
25 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
26 |
+PYTHON_COMPAT=( python3_{8,9} ) |
27 |
PYTHON_REQ_USE="sqlite" |
28 |
|
29 |
if [[ ${PV} = *9999 ]]; then |
30 |
@@ -73,21 +73,21 @@ COMMON_DEPEND=" |
31 |
python? ( |
32 |
${PYTHON_DEPS} |
33 |
$(python_gen_cond_dep ' |
34 |
- dev-python/httplib2[${PYTHON_MULTI_USEDEP}] |
35 |
- dev-python/jinja[${PYTHON_MULTI_USEDEP}] |
36 |
- dev-python/markupsafe[${PYTHON_MULTI_USEDEP}] |
37 |
- dev-python/owslib[${PYTHON_MULTI_USEDEP}] |
38 |
- dev-python/pygments[${PYTHON_MULTI_USEDEP}] |
39 |
- dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}] |
40 |
- dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] |
41 |
- dev-python/pytz[${PYTHON_MULTI_USEDEP}] |
42 |
- dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] |
43 |
- >=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}] |
44 |
- dev-python/requests[${PYTHON_MULTI_USEDEP}] |
45 |
- <dev-python/sip-5:=[${PYTHON_MULTI_USEDEP}] |
46 |
- dev-python/six[${PYTHON_MULTI_USEDEP}] |
47 |
- >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}] |
48 |
- postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) |
49 |
+ dev-python/httplib2[${PYTHON_USEDEP}] |
50 |
+ dev-python/jinja[${PYTHON_USEDEP}] |
51 |
+ dev-python/markupsafe[${PYTHON_USEDEP}] |
52 |
+ dev-python/owslib[${PYTHON_USEDEP}] |
53 |
+ dev-python/pygments[${PYTHON_USEDEP}] |
54 |
+ dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_USEDEP}] |
55 |
+ dev-python/python-dateutil[${PYTHON_USEDEP}] |
56 |
+ dev-python/pytz[${PYTHON_USEDEP}] |
57 |
+ dev-python/pyyaml[${PYTHON_USEDEP}] |
58 |
+ >=dev-python/qscintilla-python-2.10.3[${PYTHON_USEDEP}] |
59 |
+ dev-python/requests[${PYTHON_USEDEP}] |
60 |
+ <dev-python/sip-5:=[${PYTHON_USEDEP}] |
61 |
+ dev-python/six[${PYTHON_USEDEP}] |
62 |
+ >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] |
63 |
+ postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) |
64 |
') |
65 |
) |
66 |
qml? ( dev-qt/qtdeclarative:5 ) |
67 |
|
68 |
diff --git a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild |
69 |
index d7f5ec4633f..5c5913d97ad 100644 |
70 |
--- a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild |
71 |
+++ b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild |
72 |
@@ -3,7 +3,7 @@ |
73 |
|
74 |
EAPI=7 |
75 |
|
76 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
77 |
+PYTHON_COMPAT=( python3_{8,9} ) |
78 |
PYTHON_REQ_USE="sqlite" |
79 |
|
80 |
if [[ ${PV} = *9999* ]]; then |
81 |
@@ -72,23 +72,23 @@ COMMON_DEPEND=" |
82 |
python? ( |
83 |
${PYTHON_DEPS} |
84 |
$(python_gen_cond_dep ' |
85 |
- dev-python/future[${PYTHON_MULTI_USEDEP}] |
86 |
- dev-python/httplib2[${PYTHON_MULTI_USEDEP}] |
87 |
- dev-python/jinja[${PYTHON_MULTI_USEDEP}] |
88 |
- dev-python/markupsafe[${PYTHON_MULTI_USEDEP}] |
89 |
- dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
90 |
- dev-python/owslib[${PYTHON_MULTI_USEDEP}] |
91 |
- dev-python/pygments[${PYTHON_MULTI_USEDEP}] |
92 |
- dev-python/PyQt5[designer,network,sql,svg,${PYTHON_MULTI_USEDEP}] |
93 |
- dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] |
94 |
- dev-python/pytz[${PYTHON_MULTI_USEDEP}] |
95 |
- dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] |
96 |
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}] |
97 |
- dev-python/requests[${PYTHON_MULTI_USEDEP}] |
98 |
- <dev-python/sip-5:=[${PYTHON_MULTI_USEDEP}] |
99 |
- dev-python/six[${PYTHON_MULTI_USEDEP}] |
100 |
- >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}] |
101 |
- postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) |
102 |
+ dev-python/future[${PYTHON_USEDEP}] |
103 |
+ dev-python/httplib2[${PYTHON_USEDEP}] |
104 |
+ dev-python/jinja[${PYTHON_USEDEP}] |
105 |
+ dev-python/markupsafe[${PYTHON_USEDEP}] |
106 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
107 |
+ dev-python/owslib[${PYTHON_USEDEP}] |
108 |
+ dev-python/pygments[${PYTHON_USEDEP}] |
109 |
+ dev-python/PyQt5[designer,network,sql,svg,${PYTHON_USEDEP}] |
110 |
+ dev-python/python-dateutil[${PYTHON_USEDEP}] |
111 |
+ dev-python/pytz[${PYTHON_USEDEP}] |
112 |
+ dev-python/pyyaml[${PYTHON_USEDEP}] |
113 |
+ >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}] |
114 |
+ dev-python/requests[${PYTHON_USEDEP}] |
115 |
+ <dev-python/sip-5:=[${PYTHON_USEDEP}] |
116 |
+ dev-python/six[${PYTHON_USEDEP}] |
117 |
+ >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] |
118 |
+ postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) |
119 |
') |
120 |
) |
121 |
qml? ( dev-qt/qtdeclarative:5 ) |
122 |
|
123 |
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild |
124 |
index d7f5ec4633f..5c5913d97ad 100644 |
125 |
--- a/sci-geosciences/qgis/qgis-9999.ebuild |
126 |
+++ b/sci-geosciences/qgis/qgis-9999.ebuild |
127 |
@@ -3,7 +3,7 @@ |
128 |
|
129 |
EAPI=7 |
130 |
|
131 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
132 |
+PYTHON_COMPAT=( python3_{8,9} ) |
133 |
PYTHON_REQ_USE="sqlite" |
134 |
|
135 |
if [[ ${PV} = *9999* ]]; then |
136 |
@@ -72,23 +72,23 @@ COMMON_DEPEND=" |
137 |
python? ( |
138 |
${PYTHON_DEPS} |
139 |
$(python_gen_cond_dep ' |
140 |
- dev-python/future[${PYTHON_MULTI_USEDEP}] |
141 |
- dev-python/httplib2[${PYTHON_MULTI_USEDEP}] |
142 |
- dev-python/jinja[${PYTHON_MULTI_USEDEP}] |
143 |
- dev-python/markupsafe[${PYTHON_MULTI_USEDEP}] |
144 |
- dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
145 |
- dev-python/owslib[${PYTHON_MULTI_USEDEP}] |
146 |
- dev-python/pygments[${PYTHON_MULTI_USEDEP}] |
147 |
- dev-python/PyQt5[designer,network,sql,svg,${PYTHON_MULTI_USEDEP}] |
148 |
- dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] |
149 |
- dev-python/pytz[${PYTHON_MULTI_USEDEP}] |
150 |
- dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] |
151 |
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}] |
152 |
- dev-python/requests[${PYTHON_MULTI_USEDEP}] |
153 |
- <dev-python/sip-5:=[${PYTHON_MULTI_USEDEP}] |
154 |
- dev-python/six[${PYTHON_MULTI_USEDEP}] |
155 |
- >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}] |
156 |
- postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) |
157 |
+ dev-python/future[${PYTHON_USEDEP}] |
158 |
+ dev-python/httplib2[${PYTHON_USEDEP}] |
159 |
+ dev-python/jinja[${PYTHON_USEDEP}] |
160 |
+ dev-python/markupsafe[${PYTHON_USEDEP}] |
161 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
162 |
+ dev-python/owslib[${PYTHON_USEDEP}] |
163 |
+ dev-python/pygments[${PYTHON_USEDEP}] |
164 |
+ dev-python/PyQt5[designer,network,sql,svg,${PYTHON_USEDEP}] |
165 |
+ dev-python/python-dateutil[${PYTHON_USEDEP}] |
166 |
+ dev-python/pytz[${PYTHON_USEDEP}] |
167 |
+ dev-python/pyyaml[${PYTHON_USEDEP}] |
168 |
+ >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}] |
169 |
+ dev-python/requests[${PYTHON_USEDEP}] |
170 |
+ <dev-python/sip-5:=[${PYTHON_USEDEP}] |
171 |
+ dev-python/six[${PYTHON_USEDEP}] |
172 |
+ >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] |
173 |
+ postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) |
174 |
') |
175 |
) |
176 |
qml? ( dev-qt/qtdeclarative:5 ) |