1 |
commit: 00f77af5ca55b979e14e1466648e57e6ca67ea10 |
2 |
Author: José de Paula Rodrigues <espinafre <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri May 28 20:54:12 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 19 00:03:37 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00f77af5 |
7 |
|
8 |
sci-geosciences/qgis: fixes for paths, adds PDAL option |
9 |
|
10 |
Closes: https://bugs.gentoo.org/693074 |
11 |
Signed-off-by: José de Paula Rodrigues <espinafre <AT> gmail.com> |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
sci-geosciences/qgis/qgis-9999.ebuild | 87 +++++++++++++++++------------------ |
15 |
1 file changed, 42 insertions(+), 45 deletions(-) |
16 |
|
17 |
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild |
18 |
index b1e1845009f..60ed73da843 100644 |
19 |
--- a/sci-geosciences/qgis/qgis-9999.ebuild |
20 |
+++ b/sci-geosciences/qgis/qgis-9999.ebuild |
21 |
@@ -1,10 +1,11 @@ |
22 |
-# Copyright 1999-2021 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 |
|
28 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
29 |
+PYTHON_COMPAT=( python3_{7,8,9,10} ) |
30 |
PYTHON_REQ_USE="sqlite" |
31 |
+QT_MIN_VER="5.9.4" |
32 |
|
33 |
if [[ ${PV} = *9999 ]]; then |
34 |
EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" |
35 |
@@ -17,48 +18,47 @@ fi |
36 |
inherit cmake desktop python-single-r1 qmake-utils xdg |
37 |
|
38 |
DESCRIPTION="User friendly Geographic Information System" |
39 |
-HOMEPAGE="https://www.qgis.org/en/site/" |
40 |
+HOMEPAGE="https://www.qgis.org/" |
41 |
|
42 |
LICENSE="GPL-2+ GPL-3+" |
43 |
SLOT="0" |
44 |
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml" |
45 |
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit" |
46 |
|
47 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" |
48 |
|
49 |
-BDEPEND="${PYTHON_DEPS} |
50 |
- dev-qt/linguist-tools:5 |
51 |
+BDEPEND=" |
52 |
+ ${PYTHON_DEPS} |
53 |
+ >=dev-qt/linguist-tools-${QT_MIN_VER}:5 |
54 |
sys-devel/bison |
55 |
sys-devel/flex |
56 |
" |
57 |
COMMON_DEPEND=" |
58 |
- >=app-crypt/qca-2.3.0:2[ssl] |
59 |
+ app-crypt/qca:2[qt5(+),ssl] |
60 |
>=dev-db/spatialite-4.2.0 |
61 |
dev-db/sqlite:3 |
62 |
dev-libs/expat |
63 |
dev-libs/libzip:= |
64 |
- dev-libs/protobuf:= |
65 |
- dev-libs/qtkeychain:= |
66 |
- dev-qt/designer:5 |
67 |
- dev-qt/qtconcurrent:5 |
68 |
- dev-qt/qtcore:5 |
69 |
- dev-qt/qtgui:5 |
70 |
- dev-qt/qtnetwork:5[ssl] |
71 |
- dev-qt/qtpositioning:5 |
72 |
- dev-qt/qtprintsupport:5 |
73 |
- dev-qt/qtserialport:5 |
74 |
- dev-qt/qtsql:5 |
75 |
- dev-qt/qtsvg:5 |
76 |
- dev-qt/qtwidgets:5 |
77 |
- dev-qt/qtxml:5 |
78 |
+ dev-libs/qtkeychain[qt5(+)] |
79 |
+ >=dev-qt/designer-${QT_MIN_VER}:5 |
80 |
+ >=dev-qt/qtconcurrent-${QT_MIN_VER}:5 |
81 |
+ >=dev-qt/qtcore-${QT_MIN_VER}:5 |
82 |
+ >=dev-qt/qtgui-${QT_MIN_VER}:5 |
83 |
+ >=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl] |
84 |
+ >=dev-qt/qtpositioning-${QT_MIN_VER}:5 |
85 |
+ >=dev-qt/qtprintsupport-${QT_MIN_VER}:5 |
86 |
+ >=dev-qt/qtserialport-${QT_MIN_VER}:5 |
87 |
+ >=dev-qt/qtsvg-${QT_MIN_VER}:5 |
88 |
+ >=dev-qt/qtsql-${QT_MIN_VER}:5 |
89 |
+ >=dev-qt/qtwidgets-${QT_MIN_VER}:5 |
90 |
+ >=dev-qt/qtxml-${QT_MIN_VER}:5 |
91 |
media-gfx/exiv2:= |
92 |
>=sci-libs/gdal-3.0.4:=[geos] |
93 |
sci-libs/geos |
94 |
sci-libs/libspatialindex:= |
95 |
- >=sci-libs/proj-6.3.1:= |
96 |
- sys-libs/zlib |
97 |
- >=x11-libs/qscintilla-2.10.3:= |
98 |
- >=x11-libs/qwt-6.1.3-r2:6=[svg] |
99 |
- 3d? ( dev-qt/qt3d:5 ) |
100 |
+ >=sci-libs/proj-4.9.3:= |
101 |
+ >=x11-libs/qscintilla-2.10.1:=[qt5(+)] |
102 |
+ >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] |
103 |
+ 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 ) |
104 |
georeferencer? ( sci-libs/gsl:= ) |
105 |
grass? ( =sci-geosciences/grass-7*:= ) |
106 |
hdf5? ( sci-libs/hdf5:= ) |
107 |
@@ -69,21 +69,23 @@ COMMON_DEPEND=" |
108 |
dev-db/oracle-instantclient:= |
109 |
sci-libs/gdal:=[oracle] |
110 |
) |
111 |
- polar? ( >=x11-libs/qwtpolar-1.1.1-r2 ) |
112 |
+ polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) |
113 |
postgres? ( dev-db/postgresql:= ) |
114 |
python? ( |
115 |
${PYTHON_DEPS} |
116 |
$(python_gen_cond_dep ' |
117 |
+ dev-python/future[${PYTHON_MULTI_USEDEP}] |
118 |
dev-python/httplib2[${PYTHON_MULTI_USEDEP}] |
119 |
dev-python/jinja[${PYTHON_MULTI_USEDEP}] |
120 |
dev-python/markupsafe[${PYTHON_MULTI_USEDEP}] |
121 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
122 |
dev-python/owslib[${PYTHON_MULTI_USEDEP}] |
123 |
dev-python/pygments[${PYTHON_MULTI_USEDEP}] |
124 |
- dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}] |
125 |
+ dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}] |
126 |
dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] |
127 |
dev-python/pytz[${PYTHON_MULTI_USEDEP}] |
128 |
dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] |
129 |
- >=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}] |
130 |
+ >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}] |
131 |
dev-python/requests[${PYTHON_MULTI_USEDEP}] |
132 |
<dev-python/sip-5:=[${PYTHON_MULTI_USEDEP}] |
133 |
dev-python/six[${PYTHON_MULTI_USEDEP}] |
134 |
@@ -91,10 +93,12 @@ COMMON_DEPEND=" |
135 |
postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) |
136 |
') |
137 |
) |
138 |
- qml? ( dev-qt/qtdeclarative:5 ) |
139 |
+ qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) |
140 |
+ webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20200309-r1:5 ) |
141 |
" |
142 |
DEPEND="${COMMON_DEPEND} |
143 |
- dev-qt/qttest:5 |
144 |
+ >=dev-qt/qttest-${QT_MIN_VER}:5 |
145 |
+ python? ( ${PYTHON_DEPS} ) |
146 |
" |
147 |
RDEPEND="${COMMON_DEPEND} |
148 |
sci-geosciences/gpsbabel |
149 |
@@ -103,22 +107,12 @@ RDEPEND="${COMMON_DEPEND} |
150 |
# Disabling test suite because upstream disallow running from install path |
151 |
RESTRICT="test" |
152 |
|
153 |
-PATCHES=( |
154 |
- # git master |
155 |
- "${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch" |
156 |
- # TODO upstream |
157 |
- "${FILESDIR}/${PN}-3.16.1-featuresummary.patch" |
158 |
- "${FILESDIR}/${PN}-3.16.1-default-qmldir.patch" |
159 |
-) |
160 |
- |
161 |
pkg_setup() { |
162 |
python-single-r1_pkg_setup |
163 |
} |
164 |
|
165 |
src_prepare() { |
166 |
cmake_src_prepare |
167 |
- sed -e "/QtWebKit.*.py/d" \ |
168 |
- -i python/PyQt/CMakeLists.txt || die |
169 |
} |
170 |
|
171 |
src_configure() { |
172 |
@@ -149,13 +143,16 @@ src_configure() { |
173 |
-DWITH_BINDINGS=$(usex python) |
174 |
-DWITH_CUSTOM_WIDGETS=$(usex python) |
175 |
-DWITH_QUICK=$(usex qml) |
176 |
- -DWITH_QTWEBKIT=OFF |
177 |
+ -DWITH_QTWEBKIT=$(usex webkit) |
178 |
) |
179 |
|
180 |
if use grass; then |
181 |
- mycmakeargs+=( |
182 |
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass78 |
183 |
- ) |
184 |
+ readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)" |
185 |
+ readarray -d'.' -t v <<<"${f[2]}" |
186 |
+ grassdir="grass${v[0]}${v[1]}" |
187 |
+ |
188 |
+ GRASSDIR=/usr/$(get_libdir)/${grassdir} |
189 |
+ mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} ) |
190 |
fi |
191 |
|
192 |
use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) |