| 1 |
commit: 467d0110a069cac15eb5bf460c64118fb5baafa6 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 22 16:14:37 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 22 22:53:58 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=467d0110 |
| 7 |
|
| 8 |
sci-geosciences/qgis: Drop 3.16.1 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
sci-geosciences/qgis/Manifest | 1 - |
| 14 |
.../files/qgis-3.16.1-find-qt5linguisttools.patch | 27 --- |
| 15 |
sci-geosciences/qgis/qgis-3.16.1.ebuild | 207 --------------------- |
| 16 |
3 files changed, 235 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest |
| 19 |
index eab8f63ecd9..123680b6b75 100644 |
| 20 |
--- a/sci-geosciences/qgis/Manifest |
| 21 |
+++ b/sci-geosciences/qgis/Manifest |
| 22 |
@@ -1,4 +1,3 @@ |
| 23 |
DIST qgis-3.16.0.tar.bz2 113238659 BLAKE2B 42bdf8d0d69b28c20aa0decd79883c3b83d2ff9aa9d7633866b6c7d624ad20cb602beeca0e22585077c3d0ceba791e51b81ba221bc305c9bd2ebff71a4ea4bd4 SHA512 c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10 |
| 24 |
-DIST qgis-3.16.1.tar.bz2 113943328 BLAKE2B 0c0f9c0a038e87d7f16e66a00cd6844db27b9238ef4f42cf2504a5e498843d4f93bde42542cf7bedcc7f58303daa4fdc7d9cb9e1954958a0de29e294e502a461 SHA512 2df53731468b734c95ad32cd8ecc930dd113b1084c4d3971aba2aaf58b473dc8e0dd204d979b74ee79d443cd95e4f91c51d071eb645254142a76d7a4d0bc3dc8 |
| 25 |
DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6 SHA512 93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033 |
| 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-3.16.1-find-qt5linguisttools.patch b/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch |
| 29 |
deleted file mode 100644 |
| 30 |
index 01f60269439..00000000000 |
| 31 |
--- a/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,27 +0,0 @@ |
| 34 |
-From db2fee6c199a34507e5742b2360d594a5bf67b18 Mon Sep 17 00:00:00 2001 |
| 35 |
-From: Andreas Sturmlechner <asturm@g.o> |
| 36 |
-Date: Mon, 23 Nov 2020 22:04:50 +0100 |
| 37 |
-Subject: [PATCH] Fix Qt5LinguistTools detection/lrelease binary location |
| 38 |
- |
| 39 |
-Correctly find the Qt5 module that provides the path to Qt5-based lrelease. |
| 40 |
-Available since >= Qt-5.3.1 which is well below the current minimum for QGIS. |
| 41 |
- |
| 42 |
-Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
| 43 |
---- |
| 44 |
- i18n/CMakeLists.txt | 3 ++- |
| 45 |
- 1 file changed, 2 insertions(+), 1 deletion(-) |
| 46 |
- |
| 47 |
-diff --git a/i18n/CMakeLists.txt b/i18n/CMakeLists.txt |
| 48 |
-index a836e5cae5..7d7f79da89 100644 |
| 49 |
---- a/i18n/CMakeLists.txt |
| 50 |
-+++ b/i18n/CMakeLists.txt |
| 51 |
-@@ -1,4 +1,5 @@ |
| 52 |
--find_program(QT_LRELEASE_EXECUTABLE NAMES lrelease-qt5 lrelease) |
| 53 |
-+find_package(Qt5LinguistTools REQUIRED) |
| 54 |
-+set(QT_LRELEASE_EXECUTABLE Qt5::lrelease) |
| 55 |
- |
| 56 |
- macro(ADD_TRANSLATION_FILES _sources ) |
| 57 |
- foreach (_current_FILE ${ARGN}) |
| 58 |
--- |
| 59 |
-2.29.2 |
| 60 |
- |
| 61 |
|
| 62 |
diff --git a/sci-geosciences/qgis/qgis-3.16.1.ebuild b/sci-geosciences/qgis/qgis-3.16.1.ebuild |
| 63 |
deleted file mode 100644 |
| 64 |
index 2bc3ef993a9..00000000000 |
| 65 |
--- a/sci-geosciences/qgis/qgis-3.16.1.ebuild |
| 66 |
+++ /dev/null |
| 67 |
@@ -1,207 +0,0 @@ |
| 68 |
-# Copyright 1999-2020 Gentoo Authors |
| 69 |
-# Distributed under the terms of the GNU General Public License v2 |
| 70 |
- |
| 71 |
-EAPI=7 |
| 72 |
- |
| 73 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
| 74 |
-PYTHON_REQ_USE="sqlite" |
| 75 |
- |
| 76 |
-if [[ ${PV} = *9999 ]]; then |
| 77 |
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" |
| 78 |
- inherit git-r3 |
| 79 |
-else |
| 80 |
- SRC_URI="https://qgis.org/downloads/${P}.tar.bz2 |
| 81 |
- examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" |
| 82 |
- KEYWORDS="~amd64 ~x86" |
| 83 |
-fi |
| 84 |
-inherit cmake desktop python-single-r1 qmake-utils xdg |
| 85 |
- |
| 86 |
-DESCRIPTION="User friendly Geographic Information System" |
| 87 |
-HOMEPAGE="https://www.qgis.org/en/site/" |
| 88 |
- |
| 89 |
-LICENSE="GPL-2+ GPL-3+" |
| 90 |
-SLOT="0" |
| 91 |
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml" |
| 92 |
- |
| 93 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" |
| 94 |
- |
| 95 |
-BDEPEND="${PYTHON_DEPS} |
| 96 |
- dev-qt/linguist-tools:5 |
| 97 |
- sys-devel/bison |
| 98 |
- sys-devel/flex |
| 99 |
-" |
| 100 |
-COMMON_DEPEND=" |
| 101 |
- >=app-crypt/qca-2.3.0:2[ssl] |
| 102 |
- >=dev-db/spatialite-4.2.0 |
| 103 |
- dev-db/sqlite:3 |
| 104 |
- dev-libs/expat |
| 105 |
- dev-libs/libzip:= |
| 106 |
- dev-libs/protobuf:= |
| 107 |
- dev-libs/qtkeychain:= |
| 108 |
- dev-qt/designer:5 |
| 109 |
- dev-qt/qtconcurrent:5 |
| 110 |
- dev-qt/qtcore:5 |
| 111 |
- dev-qt/qtgui:5 |
| 112 |
- dev-qt/qtnetwork:5[ssl] |
| 113 |
- dev-qt/qtpositioning:5 |
| 114 |
- dev-qt/qtprintsupport:5 |
| 115 |
- dev-qt/qtserialport:5 |
| 116 |
- dev-qt/qtsql:5 |
| 117 |
- dev-qt/qtsvg:5 |
| 118 |
- dev-qt/qtwidgets:5 |
| 119 |
- dev-qt/qtxml:5 |
| 120 |
- media-gfx/exiv2:= |
| 121 |
- >=sci-libs/gdal-3.0.4:=[geos] |
| 122 |
- sci-libs/geos |
| 123 |
- sci-libs/libspatialindex:= |
| 124 |
- >=sci-libs/proj-6.3.1:= |
| 125 |
- sys-libs/zlib |
| 126 |
- >=x11-libs/qscintilla-2.10.3:= |
| 127 |
- >=x11-libs/qwt-6.1.3-r2:6=[svg] |
| 128 |
- 3d? ( dev-qt/qt3d:5 ) |
| 129 |
- georeferencer? ( sci-libs/gsl:= ) |
| 130 |
- grass? ( =sci-geosciences/grass-7*:= ) |
| 131 |
- hdf5? ( sci-libs/hdf5:= ) |
| 132 |
- mapserver? ( dev-libs/fcgi ) |
| 133 |
- netcdf? ( sci-libs/netcdf:= ) |
| 134 |
- opencl? ( virtual/opencl ) |
| 135 |
- oracle? ( |
| 136 |
- dev-db/oracle-instantclient:= |
| 137 |
- sci-libs/gdal:=[oracle] |
| 138 |
- ) |
| 139 |
- polar? ( >=x11-libs/qwtpolar-1.1.1-r2 ) |
| 140 |
- postgres? ( dev-db/postgresql:= ) |
| 141 |
- python? ( |
| 142 |
- ${PYTHON_DEPS} |
| 143 |
- $(python_gen_cond_dep ' |
| 144 |
- dev-python/httplib2[${PYTHON_MULTI_USEDEP}] |
| 145 |
- dev-python/jinja[${PYTHON_MULTI_USEDEP}] |
| 146 |
- dev-python/markupsafe[${PYTHON_MULTI_USEDEP}] |
| 147 |
- dev-python/owslib[${PYTHON_MULTI_USEDEP}] |
| 148 |
- dev-python/pygments[${PYTHON_MULTI_USEDEP}] |
| 149 |
- dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}] |
| 150 |
- dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] |
| 151 |
- dev-python/pytz[${PYTHON_MULTI_USEDEP}] |
| 152 |
- dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] |
| 153 |
- >=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}] |
| 154 |
- dev-python/requests[${PYTHON_MULTI_USEDEP}] |
| 155 |
- dev-python/sip:=[${PYTHON_MULTI_USEDEP}] |
| 156 |
- dev-python/six[${PYTHON_MULTI_USEDEP}] |
| 157 |
- >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}] |
| 158 |
- postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) |
| 159 |
- ') |
| 160 |
- ) |
| 161 |
- qml? ( dev-qt/qtdeclarative:5 ) |
| 162 |
-" |
| 163 |
-DEPEND="${COMMON_DEPEND} |
| 164 |
- dev-qt/qttest:5 |
| 165 |
-" |
| 166 |
-RDEPEND="${COMMON_DEPEND} |
| 167 |
- sci-geosciences/gpsbabel |
| 168 |
-" |
| 169 |
- |
| 170 |
-# Disabling test suite because upstream disallow running from install path |
| 171 |
-RESTRICT="test" |
| 172 |
- |
| 173 |
-PATCHES=( |
| 174 |
- # git master |
| 175 |
- "${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch" |
| 176 |
- # TODO upstream |
| 177 |
- "${FILESDIR}/${P}-featuresummary.patch" |
| 178 |
- "${FILESDIR}/${P}-default-qmldir.patch" |
| 179 |
- "${FILESDIR}/${P}-find-qt5linguisttools.patch" |
| 180 |
-) |
| 181 |
- |
| 182 |
-pkg_setup() { |
| 183 |
- python-single-r1_pkg_setup |
| 184 |
-} |
| 185 |
- |
| 186 |
-src_prepare() { |
| 187 |
- cmake_src_prepare |
| 188 |
- sed -e "/QtWebKit.*.py/d" \ |
| 189 |
- -i python/PyQt/CMakeLists.txt || die |
| 190 |
-} |
| 191 |
- |
| 192 |
-src_configure() { |
| 193 |
- local mycmakeargs=( |
| 194 |
- -DQGIS_MANUAL_SUBDIR=share/man/ |
| 195 |
- -DQGIS_LIB_SUBDIR=$(get_libdir) |
| 196 |
- -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis |
| 197 |
- -DQWT_INCLUDE_DIR=/usr/include/qwt6 |
| 198 |
- -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so |
| 199 |
- -DPEDANTIC=OFF |
| 200 |
- -DUSE_CCACHE=OFF |
| 201 |
- -DWITH_ANALYSIS=ON |
| 202 |
- -DWITH_APIDOC=OFF |
| 203 |
- -DWITH_GUI=ON |
| 204 |
- -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 |
| 205 |
- -DWITH_QSPATIALITE=ON |
| 206 |
- -DENABLE_TESTS=OFF |
| 207 |
- -DWITH_3D=$(usex 3d) |
| 208 |
- -DWITH_GEOREFERENCER=$(usex georeferencer) |
| 209 |
- -DWITH_GRASS7=$(usex grass) |
| 210 |
- $(cmake_use_find_package hdf5 HDF5) |
| 211 |
- -DWITH_SERVER=$(usex mapserver) |
| 212 |
- $(cmake_use_find_package netcdf NetCDF) |
| 213 |
- -DUSE_OPENCL=$(usex opencl) |
| 214 |
- -DWITH_ORACLE=$(usex oracle) |
| 215 |
- -DWITH_QWTPOLAR=$(usex polar) |
| 216 |
- -DWITH_POSTGRESQL=$(usex postgres) |
| 217 |
- -DWITH_BINDINGS=$(usex python) |
| 218 |
- -DWITH_CUSTOM_WIDGETS=$(usex python) |
| 219 |
- -DWITH_QUICK=$(usex qml) |
| 220 |
- -DWITH_QTWEBKIT=OFF |
| 221 |
- ) |
| 222 |
- |
| 223 |
- if use grass; then |
| 224 |
- mycmakeargs+=( |
| 225 |
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70 |
| 226 |
- ) |
| 227 |
- fi |
| 228 |
- |
| 229 |
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) || |
| 230 |
- mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973 |
| 231 |
- |
| 232 |
- # bugs 612956, 648726 |
| 233 |
- addpredict /dev/dri/renderD128 |
| 234 |
- addpredict /dev/dri/renderD129 |
| 235 |
- |
| 236 |
- cmake_src_configure |
| 237 |
-} |
| 238 |
- |
| 239 |
-src_install() { |
| 240 |
- cmake_src_install |
| 241 |
- |
| 242 |
- insinto /usr/share/mime/packages |
| 243 |
- doins debian/qgis.xml |
| 244 |
- |
| 245 |
- if use examples; then |
| 246 |
- docinto examples |
| 247 |
- dodoc -r "${WORKDIR}"/qgis_sample_data/. |
| 248 |
- docompress -x /usr/share/doc/${PF}/examples |
| 249 |
- fi |
| 250 |
- |
| 251 |
- if use python; then |
| 252 |
- python_optimize |
| 253 |
- python_optimize "${ED}"/usr/share/qgis/python |
| 254 |
- fi |
| 255 |
- |
| 256 |
- if use grass; then |
| 257 |
- python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts |
| 258 |
- fi |
| 259 |
-} |
| 260 |
- |
| 261 |
-pkg_postinst() { |
| 262 |
- if use postgres; then |
| 263 |
- elog "If you don't intend to use an external PostGIS server" |
| 264 |
- elog "you should install:" |
| 265 |
- elog " dev-db/postgis" |
| 266 |
- elif use python; then |
| 267 |
- elog "Support of PostgreSQL is disabled." |
| 268 |
- elog "But some installed python-plugins import the psycopg2 module." |
| 269 |
- elog "If you do not need these plugins just disable them" |
| 270 |
- elog "in the Plugins menu, else you need to set USE=\"postgres\"" |
| 271 |
- fi |
| 272 |
- |
| 273 |
- xdg_pkg_postinst |
| 274 |
-} |
Archives