| 1 |
commit: 1db2ae292920e796c4419317db3c4a30a44d8d53 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 9 17:40:45 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 17:40:45 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1db2ae29 |
| 7 |
|
| 8 |
sci-geosciences/qgis: Drop 3.4.12 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.87, Repoman-2.3.20 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
sci-geosciences/qgis/Manifest | 1 - |
| 14 |
.../qgis/files/qgis-2.18.12-cmake-lib-suffix.patch | 11 -- |
| 15 |
.../qgis/files/qgis-3.4.12-qt-5.13.patch | 22 --- |
| 16 |
sci-geosciences/qgis/qgis-3.4.12.ebuild | 218 --------------------- |
| 17 |
4 files changed, 252 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest |
| 20 |
index 0065053e9ae..4716dc2a28a 100644 |
| 21 |
--- a/sci-geosciences/qgis/Manifest |
| 22 |
+++ b/sci-geosciences/qgis/Manifest |
| 23 |
@@ -1,3 +1,2 @@ |
| 24 |
DIST qgis-3.10.2.tar.bz2 101916273 BLAKE2B 4b5d424348609e8fd1822ea9594fb11d30ae060aff15d8d962a1b15a602c1bdf5d8a17976c5a487ded5e5764e7367b8024aa52f9620ba0ec57fb075426a3c9f2 SHA512 d2ba31a8b50e0fec901d89dba6ca8467a9e26033197e78c56caaf7cce6b9bb7a1617a75f8e6275356f921ba9e986611384ab77890a4d7f5911d632e42466bb9f |
| 25 |
-DIST qgis-3.4.12.tar.bz2 74738234 BLAKE2B 7b78dfc447cafb979dd86de2fd6d6a6248ecc5de8d82285ac22d44343bc2887f97574374ff3018da4fd74ed66b7ae55e20916b9fbb3c9d8745c22f0937d6d8b6 SHA512 c932357374b2b6c71188cc53ab8606bc056fac32147d8a267024bbe6787da524ce7b18ac6a166e3d5db1d5ca9f161ff3528e3eaa951cad1f764d98fde65f02a4 |
| 26 |
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d |
| 27 |
|
| 28 |
diff --git a/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch b/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch |
| 29 |
deleted file mode 100644 |
| 30 |
index 5a1e8fcd955..00000000000 |
| 31 |
--- a/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,11 +0,0 @@ |
| 34 |
---- a/cmake/PyQtMacros.cmake 2016-08-26 05:58:37.000000000 -0600 |
| 35 |
-+++ b/cmake/PyQtMacros.cmake 2016-09-21 16:25:55.921411011 -0600 |
| 36 |
-@@ -42,7 +42,7 @@ MACRO(PYQT_WRAP_UI outfiles ) |
| 37 |
- ELSE(WIN32) |
| 38 |
- # TODO osx |
| 39 |
- SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh") |
| 40 |
-- SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib") |
| 41 |
-+ SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}") |
| 42 |
- ENDIF(WIN32) |
| 43 |
- |
| 44 |
- FOREACH(it ${ARGN}) |
| 45 |
|
| 46 |
diff --git a/sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch b/sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch |
| 47 |
deleted file mode 100644 |
| 48 |
index 9edb4427609..00000000000 |
| 49 |
--- a/sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch |
| 50 |
+++ /dev/null |
| 51 |
@@ -1,22 +0,0 @@ |
| 52 |
-From ef8f06330f57882f740cfe7f8f3659b54b1bb1fb Mon Sep 17 00:00:00 2001 |
| 53 |
-From: Matthias Kuhn <matthias@×××××××.ch> |
| 54 |
-Date: Sat, 22 Jun 2019 10:11:31 +0200 |
| 55 |
-Subject: [PATCH] Add missing include |
| 56 |
- |
| 57 |
-Fix https://github.com/qgis/QGIS/issues/30316 |
| 58 |
---- |
| 59 |
- src/analysis/interpolation/qgsinterpolator.h | 1 + |
| 60 |
- 1 file changed, 1 insertion(+) |
| 61 |
- |
| 62 |
-diff --git a/src/analysis/interpolation/qgsinterpolator.h b/src/analysis/interpolation/qgsinterpolator.h |
| 63 |
-index 35343ccdf7f..5d694418299 100644 |
| 64 |
---- a/src/analysis/interpolation/qgsinterpolator.h |
| 65 |
-+++ b/src/analysis/interpolation/qgsinterpolator.h |
| 66 |
-@@ -19,6 +19,7 @@ |
| 67 |
- #define QGSINTERPOLATOR_H |
| 68 |
- |
| 69 |
- #include <QVector> |
| 70 |
-+#include <QList> |
| 71 |
- #include "qgis_sip.h" |
| 72 |
- #include "qgis_analysis.h" |
| 73 |
- |
| 74 |
|
| 75 |
diff --git a/sci-geosciences/qgis/qgis-3.4.12.ebuild b/sci-geosciences/qgis/qgis-3.4.12.ebuild |
| 76 |
deleted file mode 100644 |
| 77 |
index d5cb18ca5d4..00000000000 |
| 78 |
--- a/sci-geosciences/qgis/qgis-3.4.12.ebuild |
| 79 |
+++ /dev/null |
| 80 |
@@ -1,218 +0,0 @@ |
| 81 |
-# Copyright 1999-2020 Gentoo Authors |
| 82 |
-# Distributed under the terms of the GNU General Public License v2 |
| 83 |
- |
| 84 |
-EAPI=7 |
| 85 |
- |
| 86 |
-PYTHON_COMPAT=( python3_6 ) |
| 87 |
-PYTHON_REQ_USE="sqlite" |
| 88 |
-QT_MIN_VER="5.9.4" |
| 89 |
- |
| 90 |
-if [[ ${PV} = *9999 ]]; then |
| 91 |
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" |
| 92 |
- inherit git-r3 |
| 93 |
-else |
| 94 |
- SRC_URI="https://qgis.org/downloads/${P}.tar.bz2 |
| 95 |
- examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" |
| 96 |
- KEYWORDS="amd64 x86" |
| 97 |
-fi |
| 98 |
-inherit cmake-utils desktop python-single-r1 qmake-utils xdg |
| 99 |
- |
| 100 |
-DESCRIPTION="User friendly Geographic Information System" |
| 101 |
-HOMEPAGE="https://www.qgis.org/" |
| 102 |
- |
| 103 |
-LICENSE="GPL-2+ GPL-3+" |
| 104 |
-SLOT="0" |
| 105 |
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit" |
| 106 |
- |
| 107 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" |
| 108 |
- |
| 109 |
-BDEPEND=" |
| 110 |
- >=dev-qt/linguist-tools-${QT_MIN_VER}:5 |
| 111 |
- sys-devel/bison |
| 112 |
- sys-devel/flex |
| 113 |
-" |
| 114 |
-COMMON_DEPEND=" |
| 115 |
- app-crypt/qca:2[qt5(+),ssl] |
| 116 |
- >=dev-db/spatialite-4.2.0 |
| 117 |
- dev-db/sqlite:3 |
| 118 |
- dev-libs/expat |
| 119 |
- dev-libs/libzip:= |
| 120 |
- dev-libs/qtkeychain[qt5(+)] |
| 121 |
- >=dev-qt/designer-${QT_MIN_VER}:5 |
| 122 |
- >=dev-qt/qtconcurrent-${QT_MIN_VER}:5 |
| 123 |
- >=dev-qt/qtcore-${QT_MIN_VER}:5 |
| 124 |
- >=dev-qt/qtgui-${QT_MIN_VER}:5 |
| 125 |
- >=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl] |
| 126 |
- >=dev-qt/qtpositioning-${QT_MIN_VER}:5 |
| 127 |
- >=dev-qt/qtprintsupport-${QT_MIN_VER}:5 |
| 128 |
- >=dev-qt/qtserialport-${QT_MIN_VER}:5 |
| 129 |
- >=dev-qt/qtsvg-${QT_MIN_VER}:5 |
| 130 |
- >=dev-qt/qtsql-${QT_MIN_VER}:5 |
| 131 |
- >=dev-qt/qtwidgets-${QT_MIN_VER}:5 |
| 132 |
- >=dev-qt/qtxml-${QT_MIN_VER}:5 |
| 133 |
- >=sci-libs/gdal-2.2.3:=[geos] |
| 134 |
- sci-libs/geos |
| 135 |
- sci-libs/libspatialindex:= |
| 136 |
- sci-libs/proj:= |
| 137 |
- >=x11-libs/qscintilla-2.10.1:=[qt5(+)] |
| 138 |
- >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] |
| 139 |
- 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 ) |
| 140 |
- georeferencer? ( sci-libs/gsl:= ) |
| 141 |
- grass? ( =sci-geosciences/grass-7*:= ) |
| 142 |
- hdf5? ( sci-libs/hdf5:= ) |
| 143 |
- mapserver? ( dev-libs/fcgi ) |
| 144 |
- netcdf? ( sci-libs/netcdf:= ) |
| 145 |
- opencl? ( virtual/opencl ) |
| 146 |
- oracle? ( |
| 147 |
- dev-db/oracle-instantclient:= |
| 148 |
- sci-libs/gdal:=[oracle] |
| 149 |
- ) |
| 150 |
- polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) |
| 151 |
- postgres? ( dev-db/postgresql:= ) |
| 152 |
- python? ( |
| 153 |
- ${PYTHON_DEPS} |
| 154 |
- $(python_gen_cond_dep ' |
| 155 |
- dev-python/future[${PYTHON_MULTI_USEDEP}] |
| 156 |
- dev-python/httplib2[${PYTHON_MULTI_USEDEP}] |
| 157 |
- dev-python/jinja[${PYTHON_MULTI_USEDEP}] |
| 158 |
- dev-python/markupsafe[${PYTHON_MULTI_USEDEP}] |
| 159 |
- dev-python/owslib[${PYTHON_MULTI_USEDEP}] |
| 160 |
- dev-python/pygments[${PYTHON_MULTI_USEDEP}] |
| 161 |
- dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}] |
| 162 |
- dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] |
| 163 |
- dev-python/pytz[${PYTHON_MULTI_USEDEP}] |
| 164 |
- dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] |
| 165 |
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}] |
| 166 |
- dev-python/requests[${PYTHON_MULTI_USEDEP}] |
| 167 |
- dev-python/sip:=[${PYTHON_MULTI_USEDEP}] |
| 168 |
- dev-python/six[${PYTHON_MULTI_USEDEP}] |
| 169 |
- >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}] |
| 170 |
- postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) |
| 171 |
- ') |
| 172 |
- ) |
| 173 |
- qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) |
| 174 |
- webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) |
| 175 |
-" |
| 176 |
-DEPEND="${COMMON_DEPEND} |
| 177 |
- >=dev-qt/qttest-${QT_MIN_VER}:5 |
| 178 |
- >=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5 |
| 179 |
- python? ( ${PYTHON_DEPS} ) |
| 180 |
-" |
| 181 |
-RDEPEND="${COMMON_DEPEND} |
| 182 |
- sci-geosciences/gpsbabel |
| 183 |
-" |
| 184 |
- |
| 185 |
-# Disabling test suite because upstream disallow running from install path |
| 186 |
-RESTRICT="test" |
| 187 |
- |
| 188 |
-PATCHES=( |
| 189 |
- # git master |
| 190 |
- "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch" |
| 191 |
- "${FILESDIR}/${P}-qt-5.13.patch" |
| 192 |
- # TODO upstream |
| 193 |
- "${FILESDIR}/${PN}-3.4.7-featuresummary.patch" |
| 194 |
- "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch" |
| 195 |
-) |
| 196 |
- |
| 197 |
-pkg_setup() { |
| 198 |
- python-single-r1_pkg_setup |
| 199 |
-} |
| 200 |
- |
| 201 |
-src_prepare() { |
| 202 |
- cmake-utils_src_prepare |
| 203 |
- |
| 204 |
- sed -e "/FIND_PACKAGE(QtQmlTools/s/ REQUIRED//" \ |
| 205 |
- -i CMakeLists.txt || die # TODO fixed in master |
| 206 |
-} |
| 207 |
- |
| 208 |
-src_configure() { |
| 209 |
- local mycmakeargs=( |
| 210 |
- -DQGIS_MANUAL_SUBDIR=share/man/ |
| 211 |
- -DQGIS_LIB_SUBDIR=$(get_libdir) |
| 212 |
- -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis |
| 213 |
- -DQWT_INCLUDE_DIR=/usr/include/qwt6 |
| 214 |
- -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so |
| 215 |
- -DPEDANTIC=OFF |
| 216 |
- -DUSE_CCACHE=OFF |
| 217 |
- -DWITH_APIDOC=OFF |
| 218 |
- -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 |
| 219 |
- -DWITH_QSPATIALITE=ON |
| 220 |
- -DENABLE_TESTS=OFF |
| 221 |
- -DWITH_3D=$(usex 3d) |
| 222 |
- -DWITH_GEOREFERENCER=$(usex georeferencer) |
| 223 |
- -DWITH_GRASS7=$(usex grass) |
| 224 |
- $(cmake-utils_use_find_package hdf5 HDF5) |
| 225 |
- -DWITH_SERVER=$(usex mapserver) |
| 226 |
- $(cmake-utils_use_find_package netcdf NetCDF) |
| 227 |
- -DUSE_OPENCL=$(usex opencl) |
| 228 |
- -DWITH_ORACLE=$(usex oracle) |
| 229 |
- -DWITH_QWTPOLAR=$(usex polar) |
| 230 |
- -DWITH_POSTGRESQL=$(usex postgres) |
| 231 |
- -DWITH_BINDINGS=$(usex python) |
| 232 |
- -DWITH_CUSTOM_WIDGETS=$(usex python) |
| 233 |
- -DWITH_QUICK=$(usex qml) |
| 234 |
- -DWITH_QTWEBKIT=$(usex webkit) |
| 235 |
- ) |
| 236 |
- |
| 237 |
- if use grass; then |
| 238 |
- mycmakeargs+=( |
| 239 |
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70 |
| 240 |
- ) |
| 241 |
- fi |
| 242 |
- |
| 243 |
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) |
| 244 |
- |
| 245 |
- # bugs 612956, 648726 |
| 246 |
- addpredict /dev/dri/renderD128 |
| 247 |
- addpredict /dev/dri/renderD129 |
| 248 |
- |
| 249 |
- cmake-utils_src_configure |
| 250 |
-} |
| 251 |
- |
| 252 |
-src_install() { |
| 253 |
- cmake-utils_src_install |
| 254 |
- |
| 255 |
- newmenu linux/org.qgis.qgis.desktop.in org.qgis.qgis.desktop |
| 256 |
- |
| 257 |
- local size type |
| 258 |
- for size in 16 22 24 32 48 64 96 128 256; do |
| 259 |
- newicon -s ${size} linux/icons/${PN}-icon${size}x${size}.png ${PN}.png |
| 260 |
- newicon -c mimetypes -s ${size} linux/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png |
| 261 |
- for type in qgs qml qlr qpt; do |
| 262 |
- newicon -c mimetypes -s ${size} linux/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png |
| 263 |
- done |
| 264 |
- done |
| 265 |
- newicon -s scalable images/icons/qgis_icon.svg qgis.svg |
| 266 |
- |
| 267 |
- insinto /usr/share/mime/packages |
| 268 |
- doins debian/qgis.xml |
| 269 |
- |
| 270 |
- if use examples; then |
| 271 |
- docinto examples |
| 272 |
- dodoc -r "${WORKDIR}"/qgis_sample_data/. |
| 273 |
- docompress -x /usr/share/doc/${PF}/examples |
| 274 |
- fi |
| 275 |
- |
| 276 |
- if use python; then |
| 277 |
- python_optimize "${ED}"/usr/share/qgis/python |
| 278 |
- fi |
| 279 |
- |
| 280 |
- if use grass; then |
| 281 |
- python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts |
| 282 |
- fi |
| 283 |
-} |
| 284 |
- |
| 285 |
-pkg_postinst() { |
| 286 |
- if use postgres; then |
| 287 |
- elog "If you don't intend to use an external PostGIS server" |
| 288 |
- elog "you should install:" |
| 289 |
- elog " dev-db/postgis" |
| 290 |
- elif use python; then |
| 291 |
- elog "Support of PostgreSQL is disabled." |
| 292 |
- elog "But some installed python-plugins import the psycopg2 module." |
| 293 |
- elog "If you do not need these plugins just disable them" |
| 294 |
- elog "in the Plugins menu, else you need to set USE=\"postgres\"" |
| 295 |
- fi |
| 296 |
- |
| 297 |
- xdg_pkg_postinst |
| 298 |
-} |
Archives