* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/
@ 2015-12-30 17:41 Amy Winston
0 siblings, 0 replies; 21+ messages in thread
From: Amy Winston @ 2015-12-30 17:41 UTC (permalink / raw
To: gentoo-commits
commit: 708c92eebcf3a3db223ccfdf49e36099e9ef72c4
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 30 17:28:32 2015 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 17:40:20 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=708c92ee
sci-geosciences/qgis: build failure repaired bug #482644.
Package-Manager: portage-2.2.24
sci-geosciences/qgis/files/qgis-1.8.0-private.patch | 10 ++++++++++
sci-geosciences/qgis/qgis-1.8.0.ebuild | 1 +
2 files changed, 11 insertions(+)
diff --git a/sci-geosciences/qgis/files/qgis-1.8.0-private.patch b/sci-geosciences/qgis/files/qgis-1.8.0-private.patch
new file mode 100644
index 0000000..59c3ca7
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-1.8.0-private.patch
@@ -0,0 +1,10 @@
+--- a/src/core/qgsmaplayerregistry.h 2015-12-30 15:06:17.199889612 +0100
++++ b/src/core/qgsmaplayerregistry.h 2015-12-30 15:05:50.159890061 +0100
+@@ -173,6 +173,7 @@
+ /** debugging member
+ invoked when a connect() is made to this object
+ */
++ public:
+ void connectNotify( const char * signal );
+
+
diff --git a/sci-geosciences/qgis/qgis-1.8.0.ebuild b/sci-geosciences/qgis/qgis-1.8.0.ebuild
index 3b0c77d..92bf057 100644
--- a/sci-geosciences/qgis/qgis-1.8.0.ebuild
+++ b/sci-geosciences/qgis/qgis-1.8.0.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.7.0-avoid-deprecated-pyqtconfig.patch"
"${FILESDIR}/${PN}-1.8.0-no-python-pyc.patch"
"${FILESDIR}/${PN}-1.8.0-redrawning.patch"
+ "${FILESDIR}/${PN}-1.8.0-private.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/
@ 2015-12-30 17:41 Amy Winston
0 siblings, 0 replies; 21+ messages in thread
From: Amy Winston @ 2015-12-30 17:41 UTC (permalink / raw
To: gentoo-commits
commit: 8e7a83f6a9ced57763e54189ed25e0b96eb9bff3
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 30 17:25:53 2015 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 17:40:18 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e7a83f6
sci-geosciences/qgis: ui redraw repaired bug #462742.
Package-Manager: portage-2.2.24
sci-geosciences/qgis/files/qgis-1.8.0-redrawning.patch | 10 ++++++++++
sci-geosciences/qgis/qgis-1.8.0.ebuild | 1 +
2 files changed, 11 insertions(+)
diff --git a/sci-geosciences/qgis/files/qgis-1.8.0-redrawning.patch b/sci-geosciences/qgis/files/qgis-1.8.0-redrawning.patch
new file mode 100644
index 0000000..b58ec55
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-1.8.0-redrawning.patch
@@ -0,0 +1,10 @@
+--- a/src/gui/qgsmaptoolpan.cpp 2012-06-12 21:28:18.000000000 +0200
++++ b/src/gui/qgsmaptoolpan.cpp 2015-12-30 15:55:02.679840978 +0100
+@@ -39,6 +39,7 @@
+ mDragging = true;
+ // move map and other canvas items
+ mCanvas->panAction( e );
++ mCanvas->refresh();
+ }
+ }
+
diff --git a/sci-geosciences/qgis/qgis-1.8.0.ebuild b/sci-geosciences/qgis/qgis-1.8.0.ebuild
index 5d9d726..3b0c77d 100644
--- a/sci-geosciences/qgis/qgis-1.8.0.ebuild
+++ b/sci-geosciences/qgis/qgis-1.8.0.ebuild
@@ -53,6 +53,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-1.7.0-avoid-deprecated-pyqtconfig.patch"
"${FILESDIR}/${PN}-1.8.0-no-python-pyc.patch"
+ "${FILESDIR}/${PN}-1.8.0-redrawning.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/
@ 2015-12-30 19:59 Amy Winston
0 siblings, 0 replies; 21+ messages in thread
From: Amy Winston @ 2015-12-30 19:59 UTC (permalink / raw
To: gentoo-commits
commit: 6255ee73b3b2a4c898f6f93342345db6d09297f0
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 30 19:56:58 2015 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 19:56:58 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6255ee73
sci-geosciences/qgis: 2.12.2 version bump bug #570142.
Package-Manager: portage-2.2.24
sci-geosciences/qgis/Manifest | 1 +
.../qgis/files/qgis-2.12.0-no-pyqtconfig.patch | 23 +++
sci-geosciences/qgis/qgis-2.12.2.ebuild | 172 +++++++++++++++++++++
3 files changed, 196 insertions(+)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index c354b3e..b4c9e3b 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
DIST qgis-1.8.0.tar.bz2 29997204 SHA256 700be4f81c4a6b6335a0217a6c476328c0ea02543d579a06dc1aaf60201303ab SHA512 475c2087164b325bd6efe49bdca9e5eb563645ea556c34f644cff00fd6bcc0585e9e39daa2e62f0a706db58bc1551af786fc2cb6c17ad90f5734ebea5044e57c WHIRLPOOL ef1fc2832bd20398afdee9eb4c1e81baa3c8c792acc76c0b609a74ae0d61301b00f105221fa27b74b26c68fd8b5d849ea7612e960a8684b885cb8f31d0c71a1c
DIST qgis-2.12.1.tar.bz2 69088412 SHA256 96b9bb6ef62ec042b938e4b3112cc8e2e96caad36d6615b484ad757a65e80429 SHA512 647ad827f6b139a301a5fd1387333842d0187390db1906a37713b41a24bd97e37624ba2b1b500b473132d17e0d856efd0a033b2159930d005c9f74845547958e WHIRLPOOL 05895935df656937b3a1848a07eee8ee96692a8a34d30515d143b2f08cd652640b5116a81025e822497cc26d0e6f6347a6344657272a4c6c6de5d128792b98ad
+DIST qgis-2.12.2.tar.bz2 69110973 SHA256 5fd0e944497d663d836d30670874a80c2e0ae8214d014d08f11e0d2dac2b4931 SHA512 75681f99af713439157df573bea009fc6972e4d869ecd44857101051fda35baae09504426fc726ba0c8d833eb2bf69a4de3f9d6b75e25fb4fde620a8bfce8fd1 WHIRLPOOL 4d9cffb7a861c92a4640b2a156dbb02865c5218c057e48ab8e2ff2ccbb334bb8a42b48c00b517ace279ca9638047037043ceb44cda56e22eec9b045a82ab346f
DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5
diff --git a/sci-geosciences/qgis/files/qgis-2.12.0-no-pyqtconfig.patch b/sci-geosciences/qgis/files/qgis-2.12.0-no-pyqtconfig.patch
new file mode 100644
index 0000000..24fe7bf
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-2.12.0-no-pyqtconfig.patch
@@ -0,0 +1,23 @@
+diff -ur qgis-2.12.0.orig/python/console/console.py qgis-2.12.0/python/console/console.py
+--- qgis-2.12.0.orig/python/console/console.py
++++ qgis-2.12.0/python/console/console.py
+@@ -25,7 +25,6 @@
+ QSplitter, QTreeWidget, QAction, QFileDialog, QCheckBox, QSizePolicy, QMenu, QGridLayout, QApplication, \
+ QDesktopServices
+ from PyQt4.QtGui import QVBoxLayout
+-from PyQt4 import pyqtconfig
+ from qgis.utils import iface
+ from console_sci import ShellScintilla
+ from console_output import ShellOutputScintilla
+@@ -482,10 +481,7 @@
+ self.lineEditFind = QgsFilterLineEdit()
+ placeHolderTxt = QCoreApplication.translate("PythonConsole", "Enter text to find...")
+
+- if pyqtconfig.Configuration().qt_version >= 0x40700:
+- self.lineEditFind.setPlaceholderText(placeHolderTxt)
+- else:
+- self.lineEditFind.setToolTip(placeHolderTxt)
++ self.lineEditFind.setPlaceholderText(placeHolderTxt)
+ self.findNextButton = QToolButton()
+ self.findNextButton.setEnabled(False)
+ toolTipfindNext = QCoreApplication.translate("PythonConsole", "Find Next")
diff --git a/sci-geosciences/qgis/qgis-2.12.2.ebuild b/sci-geosciences/qgis/qgis-2.12.2.ebuild
new file mode 100644
index 0000000..4d017ca
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-2.12.2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils multilib gnome2-utils cmake-utils python-single-r1
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="http://www.qgis.org/"
+SRC_URI="
+ http://qgis.org/downloads/qgis-${PV}.tar.bz2
+ examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples grass gsl mapserver postgres python test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ mapserver? ( python )"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-libs/expat
+ sci-geosciences/gpsbabel
+ >=sci-libs/gdal-1.6.1[geos,python?,${PYTHON_USEDEP}]
+ sci-libs/geos
+ gsl? ( sci-libs/gsl )
+ sci-libs/libspatialindex
+ sci-libs/proj
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qtsvg:4
+ dev-qt/qtsql:4
+ dev-qt/qtwebkit:4
+ dev-qt/designer:4
+ x11-libs/qscintilla
+ || (
+ ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
+ ( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
+ )
+ grass? ( || ( >=sci-geosciences/grass-7.0.0 ) )
+ mapserver? ( dev-libs/fcgi )
+ postgres? ( dev-db/postgresql:* )
+ python? (
+ dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
+ dev-python/sip[${PYTHON_USEDEP}]
+ dev-python/qscintilla-python[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/markupsafe[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+ ${PYTHON_DEPS}
+ )
+ dev-db/sqlite:3
+ dev-db/spatialite
+ app-crypt/qca:2[qt4,openssl]
+"
+
+DEPEND="${RDEPEND}
+ sys-devel/bison
+ sys-devel/flex"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.12.0-no-pyqtconfig.patch"
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ "-DQGIS_MANUAL_SUBDIR=/share/man/"
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DQGIS_LIB_SUBDIR=$(get_libdir)"
+ "-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis"
+ "-DWITH_INTERNAL_DATEUTIL=OFF"
+ "-DWITH_INTERNAL_HTTPLIB2=OFF"
+ "-DWITH_INTERNAL_JINJA2=OFF"
+ "-DWITH_INTERNAL_MARKUPSAFE=OFF"
+ "-DWITH_INTERNAL_PYGMENTS=OFF"
+ "-DWITH_INTERNAL_PYTZ=OFF"
+ "-DWITH_INTERNAL_QWTPOLAR=OFF"
+ "-DWITH_INTERNAL_SIX=OFF"
+ "-DPEDANTIC=OFF"
+ "-DWITH_APIDOC=OFF"
+ "-DWITH_SPATIALITE=ON"
+ "-DWITH_INTERNAL_SPATIALITE=OFF"
+ $(cmake-utils_use_with postgres POSTGRESQL)
+ $(cmake-utils_use_with grass GRASS)
+ $(cmake-utils_use_with mapserver SERVER)
+ $(cmake-utils_use_with python BINDINGS)
+ $(cmake-utils_use python BINDINGS_GLOBAL_INSTALL)
+ $(cmake-utils_use_with python PYSPATIALITE)
+ $(cmake-utils_use_with gsl GSL)
+ $(cmake-utils_use_enable test TESTS)
+ $(usex grass "-DGRASS_PREFIX=/usr/" "")
+ )
+
+ if has_version '>=x11-libs/qwtpolar-1' && has_version 'x11-libs/qwt:5' ; then
+ elog "Both >=x11-libs/qwtpolar-1 and x11-libs/qwt:5 installed. Force build with qwt6"
+ if has_version '>=x11-libs/qwt-6.1.2' ; then
+ mycmakeargs+=(
+ "-DQWT_INCLUDE_DIR=/usr/include/qwt6"
+ "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so"
+ )
+ else
+ mycmakeargs+=(
+ "-DQWT_INCLUDE_DIR=/usr/include/qwt6"
+ "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6.so"
+ )
+ fi
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ dodoc BUGS ChangeLog CODING
+
+ newicon -s 128 images/icons/qgis-icon.png qgis.png
+ make_desktop_entry qgis "QGIS " qgis
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins -r "${WORKDIR}"/qgis_sample_data/*
+ fi
+
+ python_optimize "${D}"/usr/share/qgis/python \
+ "${D}"/$(python_get_sitedir)/qgis \
+ "${D}"/$(python_get_sitedir)/pyspatialite
+
+ if use grass; then
+ python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
+ python_optimize "${D}"/usr/share/qgis/grass/scripts
+ fi
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ if use postgres; then
+ elog "If you don't intend to use an external PostGIS server"
+ elog "you should install:"
+ elog " dev-db/postgis"
+ else
+ if use python ; then
+ elog "Support of PostgreSQL is disabled."
+ elog "But some installed python-plugins needs import psycopg2 module."
+ elog "If you do not need this modules just disable them in main menu."
+ elog "Or you need to set USE=postgres"
+ fi
+ fi
+
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/
@ 2017-01-15 13:34 David Seifert
0 siblings, 0 replies; 21+ messages in thread
From: David Seifert @ 2017-01-15 13:34 UTC (permalink / raw
To: gentoo-commits
commit: 7dfbb552448ee0fe07d1e40fe0eddb390c169200
Author: Chris Mayo <aklhfex <AT> gmail <DOT> com>
AuthorDate: Sun Jan 15 11:56:49 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 13:24:39 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dfbb552
sci-geosciences/qgis: Version bump 2.18.3
- Use system dev-python/pyyaml and dev-python/future
- Fix GRASS plugin error on first load, finding installed GRASS
Package-Manager: portage-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/3483
sci-geosciences/qgis/Manifest | 1 +
.../qgis/files/qgis-2.18.3-app-icon.patch | 13 ++
sci-geosciences/qgis/qgis-2.18.3.ebuild | 192 +++++++++++++++++++++
3 files changed, 206 insertions(+)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index b7bd640..87ad6ae 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
DIST qgis-1.8.0.tar.bz2 29997204 SHA256 700be4f81c4a6b6335a0217a6c476328c0ea02543d579a06dc1aaf60201303ab SHA512 475c2087164b325bd6efe49bdca9e5eb563645ea556c34f644cff00fd6bcc0585e9e39daa2e62f0a706db58bc1551af786fc2cb6c17ad90f5734ebea5044e57c WHIRLPOOL ef1fc2832bd20398afdee9eb4c1e81baa3c8c792acc76c0b609a74ae0d61301b00f105221fa27b74b26c68fd8b5d849ea7612e960a8684b885cb8f31d0c71a1c
DIST qgis-2.14.5.tar.bz2 74336261 SHA256 acc1bc1b1c838503e072b3c80de075185f6059d75bb8a686da7a6ab9264b514d SHA512 d493c83a96eeea2e52199c9a8812989ea89c3357e2f984fdc92f0a05b240770f7ed2d77b1bdbb0e57975c37916acbd6cc4115db5fe11f63897957e8baf6a5586 WHIRLPOOL 3cecafad597ae793acd97648987bb130f17bfc8392cde5fd55f093f54786312a2389cdc754c67b47eb0b9512dc981f95cd85cc5dbaaf178c674a477273e83927
DIST qgis-2.18.2.tar.bz2 83593908 SHA256 e218ecc2c0b983a95bba0dc46788661e803cf870f5740cbcfaa1ea39a71f02a0 SHA512 b78bc4f109015f943fa019f0c03208496626d8eae1887eddf975f5fdf81f455db47428b8051a3d02ae46e0482bd7c955871b7d5ead5a70205f6525f085dcbf7f WHIRLPOOL 97629355706241f84152142793881cbd973a269b3fdf5aa9786b4c0d49af7d26c089461638472a977d1a649f6881599467579706837f1ab69e7be3e5cae96cfb
+DIST qgis-2.18.3.tar.bz2 83508061 SHA256 743f4f22f8a17b1fd0ae575ed4da1d20ab1fe06561564d097b75c21fddf9b394 SHA512 6d2256cf85ebc1f1ddd3636f8a48284de95c42e3adb26e780b4847208c5ead80dd6a44c1a11d263bcc15bfbd7337d62d10b738ad8a7076382dbe4c4a011ff6fc WHIRLPOOL d342b3d0dd211c63f49e9b3292a585e6fd64d5837cd9bf4fe7bb53a9bd437220d7f5274b012d2732196bd5425388fa9a985fc5d342be5aee9e7fd0d008ca9c48
DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5
diff --git a/sci-geosciences/qgis/files/qgis-2.18.3-app-icon.patch b/sci-geosciences/qgis/files/qgis-2.18.3-app-icon.patch
new file mode 100644
index 00000000..88db963
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-2.18.3-app-icon.patch
@@ -0,0 +1,13 @@
+diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
+index 4cdb07e..76ffc09 100644
+--- a/src/core/qgsapplication.cpp
++++ b/src/core/qgsapplication.cpp
+@@ -396,7 +396,7 @@ QString QgsApplication::activeThemePath()
+
+ QString QgsApplication::appIconPath()
+ {
+- return QString( "qgis-icon-60x60.png" );
++ return iconsPath() + QStringLiteral( "qgis-icon-60x60.png" );
+ }
+
+ QString QgsApplication::iconPath( const QString& iconFile )
diff --git a/sci-geosciences/qgis/qgis-2.18.3.ebuild b/sci-geosciences/qgis/qgis-2.18.3.ebuild
new file mode 100644
index 00000000..67371af
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-2.18.3.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit cmake-utils eutils fdo-mime gnome2-utils python-single-r1
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="http://www.qgis.org/"
+SRC_URI="
+ http://qgis.org/downloads/qgis-${PV}.tar.bz2
+ examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples georeferencer grass mapserver oracle postgres python"
+
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ mapserver? ( python )"
+
+RDEPEND="
+ app-crypt/qca:2[qt4,ssl]
+ >=dev-db/spatialite-4.1.0
+ dev-db/sqlite:3
+ dev-libs/expat
+ dev-libs/qjson
+ dev-qt/designer:4
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qtscript:4
+ dev-qt/qtsvg:4
+ dev-qt/qtsql:4
+ dev-qt/qtwebkit:4
+ sci-geosciences/gpsbabel
+ >=sci-libs/gdal-1.6.1:=[geos,oracle?,python?,${PYTHON_USEDEP}]
+ sci-libs/geos
+ sci-libs/libspatialindex:=
+ sci-libs/proj
+ x11-libs/qscintilla:=[qt4(-)]
+ || (
+ ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
+ ( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
+ )
+ georeferencer? ( sci-libs/gsl:= )
+ grass? ( >=sci-geosciences/grass-7.0.0:= )
+ mapserver? ( dev-libs/fcgi )
+ oracle? ( dev-db/oracle-instantclient:= )
+ postgres? ( dev-db/postgresql:= )
+ python? (
+ dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
+ <dev-python/sip-4.19:=[${PYTHON_USEDEP}]
+ dev-python/qscintilla-python[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/future[${PYTHON_USEDEP}]
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/markupsafe[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+ ${PYTHON_DEPS}
+ )
+"
+
+DEPEND="${RDEPEND}
+ sys-devel/bison
+ sys-devel/flex"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${P}-app-icon.patch )
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ cd src/plugins || die
+ use georeferencer || cmake_comment_add_subdirectory "georeferencer"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DQGIS_MANUAL_SUBDIR=/share/man/
+ -DBUILD_SHARED_LIBS=ON
+ -DQGIS_LIB_SUBDIR=$(get_libdir)
+ -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
+ -DWITH_INTERNAL_DATEUTIL=OFF
+ -DWITH_INTERNAL_FUTURE=OFF
+ -DWITH_INTERNAL_HTTPLIB2=OFF
+ -DWITH_INTERNAL_JINJA2=OFF
+ -DWITH_INTERNAL_MARKUPSAFE=OFF
+ -DWITH_INTERNAL_PYGMENTS=OFF
+ -DWITH_INTERNAL_PYTZ=OFF
+ -DWITH_INTERNAL_QWTPOLAR=OFF
+ -DWITH_INTERNAL_SIX=OFF
+ -DWITH_INTERNAL_YAML=OFF
+ -DPEDANTIC=OFF
+ -DWITH_APIDOC=OFF
+ -DWITH_QSPATIALITE=ON
+ -DENABLE_TESTS=OFF
+ -DWITH_BINDINGS="$(usex python)"
+ -DWITH_GRASS7="$(usex grass)"
+ -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+ -DWITH_ORACLE="$(usex oracle)"
+ -DWITH_POSTGRESQL="$(usex postgres)"
+ -DWITH_PYSPATIALITE="$(usex python)"
+ -DWITH_SERVER="$(usex mapserver)"
+ )
+
+ if has_version '>=x11-libs/qwtpolar-1' && has_version 'x11-libs/qwt:5' ; then
+ elog "Both >=x11-libs/qwtpolar-1 and x11-libs/qwt:5 installed. Force build with qwt6"
+ mycmakeargs+=( "-DQWT_INCLUDE_DIR=/usr/include/qwt6" )
+ if has_version '>=x11-libs/qwt-6.1.2' ; then
+ mycmakeargs+=( "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so" )
+ else
+ mycmakeargs+=( "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6.so" )
+ fi
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ domenu debian/qgis.desktop
+
+ local size type
+ for size in 16 22 24 32 48 64 96 128 256; do
+ newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
+ newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+ for type in qgs qml qlr qpt; do
+ newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+ done
+ done
+ newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+ insinto /usr/share/mime/packages
+ doins debian/qgis.xml
+
+ if use examples; then
+ docinto examples
+ dodoc -r "${WORKDIR}"/qgis_sample_data/.
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ python_optimize "${ED%/}"/usr/share/qgis/python
+
+ if use grass; then
+ python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+ fi
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ if use postgres; then
+ elog "If you don't intend to use an external PostGIS server"
+ elog "you should install:"
+ elog " dev-db/postgis"
+ elif use python; then
+ elog "Support of PostgreSQL is disabled."
+ elog "But some installed python-plugins import the psycopg2 module."
+ elog "If you do not need these plugins just disable them"
+ elog "in the Plugins menu, else you need to set USE=\"postgres\""
+ fi
+
+ gnome2_icon_cache_update
+ fdo-mime_mime_database_update
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ fdo-mime_mime_database_update
+ fdo-mime_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/
@ 2017-03-02 19:39 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-03-02 19:39 UTC (permalink / raw
To: gentoo-commits
commit: 6516010356d81151671b063357aff47bca18b86c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 1 19:08:55 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 2 19:39:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65160103
sci-geosciences/qgis: Drop old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4099
sci-geosciences/qgis/Manifest | 3 -
.../qgis-1.7.0-avoid-deprecated-pyqtconfig.patch | 53 ------
.../qgis/files/qgis-1.8.0-no-python-pyc.patch | 54 ------
.../qgis/files/qgis-1.8.0-private.patch | 10 --
.../qgis/files/qgis-1.8.0-redrawning.patch | 10 --
sci-geosciences/qgis/metadata.xml | 2 -
sci-geosciences/qgis/qgis-1.8.0.ebuild | 115 -------------
sci-geosciences/qgis/qgis-2.14.5-r1.ebuild | 172 -------------------
sci-geosciences/qgis/qgis-2.18.2-r3.ebuild | 186 ---------------------
9 files changed, 605 deletions(-)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 5ea73676a83..f8b2f462316 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,6 +1,3 @@
-DIST qgis-1.8.0.tar.bz2 29997204 SHA256 700be4f81c4a6b6335a0217a6c476328c0ea02543d579a06dc1aaf60201303ab SHA512 475c2087164b325bd6efe49bdca9e5eb563645ea556c34f644cff00fd6bcc0585e9e39daa2e62f0a706db58bc1551af786fc2cb6c17ad90f5734ebea5044e57c WHIRLPOOL ef1fc2832bd20398afdee9eb4c1e81baa3c8c792acc76c0b609a74ae0d61301b00f105221fa27b74b26c68fd8b5d849ea7612e960a8684b885cb8f31d0c71a1c
-DIST qgis-2.14.5.tar.bz2 74336261 SHA256 acc1bc1b1c838503e072b3c80de075185f6059d75bb8a686da7a6ab9264b514d SHA512 d493c83a96eeea2e52199c9a8812989ea89c3357e2f984fdc92f0a05b240770f7ed2d77b1bdbb0e57975c37916acbd6cc4115db5fe11f63897957e8baf6a5586 WHIRLPOOL 3cecafad597ae793acd97648987bb130f17bfc8392cde5fd55f093f54786312a2389cdc754c67b47eb0b9512dc981f95cd85cc5dbaaf178c674a477273e83927
-DIST qgis-2.18.2.tar.bz2 83593908 SHA256 e218ecc2c0b983a95bba0dc46788661e803cf870f5740cbcfaa1ea39a71f02a0 SHA512 b78bc4f109015f943fa019f0c03208496626d8eae1887eddf975f5fdf81f455db47428b8051a3d02ae46e0482bd7c955871b7d5ead5a70205f6525f085dcbf7f WHIRLPOOL 97629355706241f84152142793881cbd973a269b3fdf5aa9786b4c0d49af7d26c089461638472a977d1a649f6881599467579706837f1ab69e7be3e5cae96cfb
DIST qgis-2.18.3.tar.bz2 83508061 SHA256 743f4f22f8a17b1fd0ae575ed4da1d20ab1fe06561564d097b75c21fddf9b394 SHA512 6d2256cf85ebc1f1ddd3636f8a48284de95c42e3adb26e780b4847208c5ead80dd6a44c1a11d263bcc15bfbd7337d62d10b738ad8a7076382dbe4c4a011ff6fc WHIRLPOOL d342b3d0dd211c63f49e9b3292a585e6fd64d5837cd9bf4fe7bb53a9bd437220d7f5274b012d2732196bd5425388fa9a985fc5d342be5aee9e7fd0d008ca9c48
DIST qgis-2.18.4.tar.bz2 85419060 SHA256 737827fd4c63c859a0ea7badd36ebcba970ca7c0a8feda4b10c0de0ed52546e8 SHA512 3938fbc1f87990a08411ba8f793d7900f10eaea1824a5a9d2217ca0dea1a8b0849ec91c41be50dc65f590713391bb613429bf48f9ea0ffaaba876dde35b98fc7 WHIRLPOOL 4dfb9a304c193de3f276871cafe3f0683764d5e7fdc5015e8f3d76c9f46072c01758e87097e0db69657b38da3f5908b41293319d909b5c69b5d23f98ba473b54
DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5
diff --git a/sci-geosciences/qgis/files/qgis-1.7.0-avoid-deprecated-pyqtconfig.patch b/sci-geosciences/qgis/files/qgis-1.7.0-avoid-deprecated-pyqtconfig.patch
deleted file mode 100644
index 65cabb2afe7..00000000000
--- a/sci-geosciences/qgis/files/qgis-1.7.0-avoid-deprecated-pyqtconfig.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Avoid relying on the deprecated pyqtconfig module.
-
-When PyQt4 is configured using configure-ng.py then no pyqtconfig module
-will be built, causing the automatic detection in the QGIS build system to
-fail.
-
-This change tries to work around the problem by extracting or guessing all
-the relevant settings. It should work reasonably well for a default
-configuration of PyQt, but may fail if PyQt overrides the defaults from sip.
-All may break if SIP v5 is used, since that version apparently won't contain
-a sipconfig module any more. But we'll tackle that once we get there.
-
-References:
-* https://bugs.gentoo.org/show_bug.cgi?id=525700
-
-2014-10-21 Martin von Gagern
-
-Index: qgis-2.4.0/cmake/FindPyQt.py
-===================================================================
---- qgis-2.4.0.orig/cmake/FindPyQt.py
-+++ qgis-2.4.0/cmake/FindPyQt.py
-@@ -30,9 +30,29 @@
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
--import PyQt4.pyqtconfig
-+try:
-+ import PyQt4.pyqtconfig
-+ pyqtcfg = PyQt4.pyqtconfig.Configuration()
-+except ImportError:
-+ import PyQt4.QtCore
-+ import sipconfig # won't work for SIP v5
-+ import os.path
-+ cfg = sipconfig.Configuration()
-+ sip_dir = cfg.default_sip_dir
-+ for p in (os.path.join(sip_dir, "PyQt4"), sip_dir):
-+ if os.path.exists(os.path.join(p, "QtCore", "QtCoremod.sip")):
-+ sip_dir = p
-+ break
-+ cfg = {
-+ 'pyqt_version': PyQt4.QtCore.PYQT_VERSION,
-+ 'pyqt_version_str': PyQt4.QtCore.PYQT_VERSION_STR,
-+ 'pyqt_sip_flags': PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags'],
-+ 'pyqt_mod_dir': cfg.default_mod_dir,
-+ 'pyqt_sip_dir': sip_dir,
-+ 'pyqt_bin_dir': cfg.default_bin_dir,
-+ }
-+ pyqtcfg = sipconfig.Configuration([cfg])
-
--pyqtcfg = PyQt4.pyqtconfig.Configuration()
- print("pyqt_version:%06.0x" % pyqtcfg.pyqt_version)
- print("pyqt_version_num:%d" % pyqtcfg.pyqt_version)
- print("pyqt_version_str:%s" % pyqtcfg.pyqt_version_str)
diff --git a/sci-geosciences/qgis/files/qgis-1.8.0-no-python-pyc.patch b/sci-geosciences/qgis/files/qgis-1.8.0-no-python-pyc.patch
deleted file mode 100644
index ec3e1c2dccf..00000000000
--- a/sci-geosciences/qgis/files/qgis-1.8.0-no-python-pyc.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- cmake/PythonMacros.cmake
-+++ cmake/PythonMacros.cmake
-@@ -22,40 +22,4 @@
- # Install the source file.
- INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR})
-
-- # Byte compile and install the .pyc file.
-- GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
-- GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
-- GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
-- GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
--
-- if(WIN32)
-- string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
-- endif(WIN32)
--
-- SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
-- SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
--
-- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
--
-- SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
--
-- GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
-- IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself.
-- ADD_CUSTOM_COMMAND(
-- TARGET compile_python_files
-- COMMAND ${CMAKE_COMMAND} -E echo ${message}
-- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
-- DEPENDS ${_absfilename}
-- )
-- ELSE(_abs_bin_py STREQUAL ${_absfilename})
-- ADD_CUSTOM_COMMAND(
-- TARGET compile_python_files
-- COMMAND ${CMAKE_COMMAND} -E echo ${message}
-- COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
-- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
-- DEPENDS ${_absfilename}
-- )
-- ENDIF(_abs_bin_py STREQUAL ${_absfilename})
--
-- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
- ENDMACRO(PYTHON_INSTALL)
---- python/CMakeLists.txt
-+++ python/CMakeLists.txt
-@@ -102,8 +102,6 @@
-
- SET (QGIS_PYTHON_DIR ${PYTHON_SITE_PACKAGES_DIR}/qgis)
-
--ADD_CUSTOM_TARGET(compile_python_files ALL)
--
- ADD_CUSTOM_COMMAND(TARGET compile_python_files
- POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E make_directory ${QGIS_PYTHON_OUTPUT_DIRECTORY}
diff --git a/sci-geosciences/qgis/files/qgis-1.8.0-private.patch b/sci-geosciences/qgis/files/qgis-1.8.0-private.patch
deleted file mode 100644
index 59c3ca76939..00000000000
--- a/sci-geosciences/qgis/files/qgis-1.8.0-private.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/core/qgsmaplayerregistry.h 2015-12-30 15:06:17.199889612 +0100
-+++ b/src/core/qgsmaplayerregistry.h 2015-12-30 15:05:50.159890061 +0100
-@@ -173,6 +173,7 @@
- /** debugging member
- invoked when a connect() is made to this object
- */
-+ public:
- void connectNotify( const char * signal );
-
-
diff --git a/sci-geosciences/qgis/files/qgis-1.8.0-redrawning.patch b/sci-geosciences/qgis/files/qgis-1.8.0-redrawning.patch
deleted file mode 100644
index b58ec55f164..00000000000
--- a/sci-geosciences/qgis/files/qgis-1.8.0-redrawning.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/gui/qgsmaptoolpan.cpp 2012-06-12 21:28:18.000000000 +0200
-+++ b/src/gui/qgsmaptoolpan.cpp 2015-12-30 15:55:02.679840978 +0100
-@@ -39,6 +39,7 @@
- mDragging = true;
- // move map and other canvas items
- mCanvas->panAction( e );
-+ mCanvas->refresh();
- }
- }
-
diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index dca8b5f01bb..fc606b878cf 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -14,8 +14,6 @@
tracks from your GPS.
</longdescription>
<use>
- <flag name="bundled-libs">Use internal copy of <pkg>x11-libs/qwtpolar</pkg></flag>
- <flag name="spatialite">Enable Spatial DBMS over sqlite <pkg>dev-db/spatialite</pkg></flag>
<flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
<flag name="mapserver">Determines whether mapserver should be built</flag>
<flag name="georeferencer">Determines whether georeferencer plugin should be built</flag>
diff --git a/sci-geosciences/qgis/qgis-1.8.0.ebuild b/sci-geosciences/qgis/qgis-1.8.0.ebuild
deleted file mode 100644
index bff71e7dc8b..00000000000
--- a/sci-geosciences/qgis/qgis-1.8.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils gnome2-utils multilib cmake-utils python-single-r1
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
- examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bundled-libs examples gsl postgres python spatialite test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-libs/expat
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtsvg:4
- dev-qt/qtsql:4
- dev-qt/qtwebkit:4
- sci-geosciences/gpsbabel
- >=sci-libs/gdal-1.6.1[geos,python?]
- sci-libs/geos
- sci-libs/libspatialindex
- sci-libs/proj
- x11-libs/qwt:5[svg]
- !bundled-libs? ( <x11-libs/qwtpolar-1 )
- gsl? ( sci-libs/gsl )
- postgres? ( >=dev-db/postgresql-8.4:= )
- python? (
- dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
- dev-python/sip:=[${PYTHON_USEDEP}]
- )
- spatialite? (
- dev-db/sqlite:3
- dev-db/spatialite
- )"
-DEPEND="${RDEPEND}
- sys-devel/bison
- sys-devel/flex"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.7.0-avoid-deprecated-pyqtconfig.patch"
- "${FILESDIR}/${PN}-1.8.0-no-python-pyc.patch"
- "${FILESDIR}/${PN}-1.8.0-redrawning.patch"
- "${FILESDIR}/${PN}-1.8.0-private.patch"
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DQGIS_MANUAL_SUBDIR=/share/man/"
- "-DBUILD_SHARED_LIBS=ON"
- "-DQGIS_LIB_SUBDIR=$(get_libdir)"
- "-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis"
- "-DWITH_INTERNAL_SPATIALITE=OFF"
- "-DWITH_INTERNAL_QWTPOLAR=$(usex bundled-libs "ON" "OFF")"
- "-DPEDANTIC=OFF"
- "-DWITH_APIDOC=OFF"
- "-DWITH_GRASS=OFF"
- $(cmake-utils_use_with postgres POSTGRESQL)
- $(cmake-utils_use_with python BINDINGS)
- $(cmake-utils_use python BINDINGS_GLOBAL_INSTALL)
- $(cmake-utils_use_with spatialite SPATIALITE)
- $(cmake-utils_use_enable test TESTS)
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- dodoc BUGS ChangeLog CODING README
-
- newicon -s 128 images/icons/qgis-icon.png qgis.png
- make_desktop_entry qgis "Quantum GIS " qgis
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins -r "${WORKDIR}"/qgis_sample_data/*
- fi
-
- python_optimize "${D}"/usr/share/qgis/python/plugins \
- "${D}"/$(python_get_sitedir)/qgis
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- fi
-
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild b/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild
deleted file mode 100644
index 94aabb570fc..00000000000
--- a/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils gnome2-utils cmake-utils python-single-r1
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-SRC_URI="
- http://qgis.org/downloads/qgis-${PV}.tar.bz2
- examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples grass gsl mapserver oracle postgres python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- mapserver? ( python )"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-libs/expat
- sci-geosciences/gpsbabel
- >=sci-libs/gdal-1.6.1:=[geos,python?,${PYTHON_USEDEP}]
- sci-libs/geos
- gsl? ( sci-libs/gsl:= )
- sci-libs/libspatialindex:=
- sci-libs/proj
- dev-qt/designer:4
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtscript:4
- dev-qt/qtsvg:4
- dev-qt/qtsql:4
- dev-qt/qtwebkit:4
- x11-libs/qscintilla:=[qt4(-)]
- || (
- ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] )
- ( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
- )
- grass? ( || ( >=sci-geosciences/grass-7.0.0:= ) )
- mapserver? ( dev-libs/fcgi )
- oracle? ( dev-db/oracle-instantclient:= )
- postgres? ( dev-db/postgresql:= )
- python? (
- dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- ${PYTHON_DEPS}
- )
- dev-db/sqlite:3
- dev-db/spatialite
- app-crypt/qca:2[qt4,ssl]
-"
-
-DEPEND="${RDEPEND}
- sys-devel/bison
- sys-devel/flex"
-
-DOCS=( BUGS ChangeLog NEWS )
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DQGIS_MANUAL_SUBDIR=/share/man/"
- "-DBUILD_SHARED_LIBS=ON"
- "-DQGIS_LIB_SUBDIR=$(get_libdir)"
- "-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis"
- "-DWITH_INTERNAL_DATEUTIL=OFF"
- "-DWITH_INTERNAL_HTTPLIB2=OFF"
- "-DWITH_INTERNAL_JINJA2=OFF"
- "-DWITH_INTERNAL_MARKUPSAFE=OFF"
- "-DWITH_INTERNAL_PYGMENTS=OFF"
- "-DWITH_INTERNAL_PYTZ=OFF"
- "-DWITH_INTERNAL_QWTPOLAR=OFF"
- "-DWITH_INTERNAL_SIX=OFF"
- "-DPEDANTIC=OFF"
- "-DWITH_APIDOC=OFF"
- "-WITH_QSPATIALITE=ON"
- -DENABLE_TESTS=no
- -DWITH_BINDINGS="$(usex python)"
- -DWITH_GRASS7="$(usex grass)"
- $(usex grass "-DGRASS_PREFIX=/usr/" "")
- -DWITH_GSL="$(usex gsl)"
- -DWITH_ORACLE="$(usex oracle)"
- -DWITH_POSTGRESQL="$(usex postgres)"
- -DWITH_PYSPATIALITE="$(usex python)"
- -DWITH_SERVER="$(usex mapserver)"
- )
-
- if has_version '>=x11-libs/qwtpolar-1' && has_version 'x11-libs/qwt:5' ; then
- elog "Both >=x11-libs/qwtpolar-1 and x11-libs/qwt:5 installed. Force build with qwt6"
- if has_version '>=x11-libs/qwt-6.1.2' ; then
- mycmakeargs+=(
- "-DQWT_INCLUDE_DIR=/usr/include/qwt6"
- "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so"
- )
- else
- mycmakeargs+=(
- "-DQWT_INCLUDE_DIR=/usr/include/qwt6"
- "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6.so"
- )
- fi
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- newicon -s 128 images/icons/qgis-icon.png qgis.png
- make_desktop_entry qgis "QGIS " qgis
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins -r "${WORKDIR}"/qgis_sample_data/*
- fi
-
- python_optimize "${D}"/usr/share/qgis/python \
- "${D}"/$(python_get_sitedir)/qgis \
- "${D}"/$(python_get_sitedir)/pyspatialite
-
- if use grass; then
- python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
- python_optimize "${D}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- else
- if use python ; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins needs import psycopg2 module."
- elog "If you do not need this modules just disable them in main menu."
- elog "Or you need to set USE=postgres"
- fi
- fi
-
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild b/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild
deleted file mode 100644
index 8d2ae3b3ff5..00000000000
--- a/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils fdo-mime gnome2-utils cmake-utils python-single-r1
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-SRC_URI="
- http://qgis.org/downloads/qgis-${PV}.tar.bz2
- examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples georeferencer grass mapserver oracle postgres python"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- mapserver? ( python )"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-libs/expat
- sci-geosciences/gpsbabel
- >=sci-libs/gdal-1.6.1:=[geos,oracle?,python?,${PYTHON_USEDEP}]
- sci-libs/geos
- sci-libs/libspatialindex:=
- sci-libs/proj
- dev-libs/qjson
- dev-qt/designer:4
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtscript:4
- dev-qt/qtsvg:4
- dev-qt/qtsql:4
- dev-qt/qtwebkit:4
- x11-libs/qscintilla:=[qt4(-)]
- || (
- ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] )
- ( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
- )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( || ( >=sci-geosciences/grass-7.0.0:= ) )
- mapserver? ( dev-libs/fcgi )
- oracle? ( dev-db/oracle-instantclient:= )
- postgres? ( dev-db/postgresql:= )
- python? (
- dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
- <dev-python/sip-4.19:=[${PYTHON_USEDEP}]
- dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- ${PYTHON_DEPS}
- )
- dev-db/sqlite:3
- >=dev-db/spatialite-4.1.0
- app-crypt/qca:2[qt4,ssl]
-"
-
-DEPEND="${RDEPEND}
- sys-devel/bison
- sys-devel/flex"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- cd src/plugins || die
- use georeferencer || cmake_comment_add_subdirectory "georeferencer"
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQGIS_MANUAL_SUBDIR=/share/man/
- -DBUILD_SHARED_LIBS=ON
- -DQGIS_LIB_SUBDIR=$(get_libdir)
- -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
- -DWITH_INTERNAL_DATEUTIL=OFF
- -DWITH_INTERNAL_HTTPLIB2=OFF
- -DWITH_INTERNAL_JINJA2=OFF
- -DWITH_INTERNAL_MARKUPSAFE=OFF
- -DWITH_INTERNAL_PYGMENTS=OFF
- -DWITH_INTERNAL_PYTZ=OFF
- -DWITH_INTERNAL_QWTPOLAR=OFF
- -DWITH_INTERNAL_SIX=OFF
- -DPEDANTIC=OFF
- -DWITH_APIDOC=OFF
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=OFF
- -DWITH_BINDINGS="$(usex python)"
- -DWITH_GRASS7="$(usex grass)"
- $(usex grass "-DGRASS_PREFIX=/usr/" "")
- -DWITH_ORACLE="$(usex oracle)"
- -DWITH_POSTGRESQL="$(usex postgres)"
- -DWITH_PYSPATIALITE="$(usex python)"
- -DWITH_SERVER="$(usex mapserver)"
- )
-
- if has_version '>=x11-libs/qwtpolar-1' && has_version 'x11-libs/qwt:5' ; then
- elog "Both >=x11-libs/qwtpolar-1 and x11-libs/qwt:5 installed. Force build with qwt6"
- mycmakeargs+=( "-DQWT_INCLUDE_DIR=/usr/include/qwt6" )
- if has_version '>=x11-libs/qwt-6.1.2' ; then
- mycmakeargs+=( "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so" )
- else
- mycmakeargs+=( "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6.so" )
- fi
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- domenu debian/qgis.desktop
-
- local size type
- for size in 16 22 24 32 48 64 96 128 256; do
- newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
- newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
- for type in qgs qml qlr qpt; do
- newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
- done
- done
- newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docompress -x /usr/share/doc/${PF}/examples
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- fi
-
- python_optimize "${D}"/usr/share/qgis/python
-
- if use grass; then
- python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
-
- gnome2_icon_cache_update
- fdo-mime_mime_database_update
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- fdo-mime_mime_database_update
- fdo-mime_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/
@ 2017-03-18 0:09 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-03-18 0:09 UTC (permalink / raw
To: gentoo-commits
commit: d9559d0f7308301041970ffedc15eb5f2e36b405
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 17 22:14:10 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 00:07:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9559d0f
sci-geosciences/qgis: Fix build w/ sip-4.19.1, qscintilla-2.10
Silence cmake warnings.
Gentoo-bug: 612924
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../qgis/files/qgis-2.18.3-qscintilla-2.10.patch | 24 ++++++++++
.../qgis/files/qgis-2.18.3-sip-4.19.1.patch | 42 +++++++++++++++++
sci-geosciences/qgis/qgis-2.18.3-r1.ebuild | 2 +
sci-geosciences/qgis/qgis-2.18.4.ebuild | 52 ++++++++++++++--------
4 files changed, 102 insertions(+), 18 deletions(-)
diff --git a/sci-geosciences/qgis/files/qgis-2.18.3-qscintilla-2.10.patch b/sci-geosciences/qgis/files/qgis-2.18.3-qscintilla-2.10.patch
new file mode 100644
index 00000000000..fb714654579
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-2.18.3-qscintilla-2.10.patch
@@ -0,0 +1,24 @@
+From 30577386cbe0ee9a5509e7f6f54df2c1194153ee Mon Sep 17 00:00:00 2001
+From: Larry Shaffer <lshaffer@boundlessgeo.com>
+Date: Thu, 2 Mar 2017 15:00:18 -0700
+Subject: [PATCH] Followup to dfe268f; update QScintilla new lib name in 2.10
+ for Qt4
+
+[ci skip]
+---
+ cmake/FindQScintilla.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/FindQScintilla.cmake b/cmake/FindQScintilla.cmake
+index 7f97624..2f87e4c 100644
+--- a/cmake/FindQScintilla.cmake
++++ b/cmake/FindQScintilla.cmake
+@@ -36,7 +36,7 @@ ELSE(EXISTS QSCINTILLA_VERSION_STR)
+ if(ENABLE_QT5)
+ set(QSCINTILLA_LIBRARY_NAMES qscintilla2-qt5 qscintilla2_qt5 libqt5scintilla2 libqscintilla2-qt5 qt5scintilla2 libqscintilla2-qt5.dylib)
+ else(ENABLE_QT5)
+- set(QSCINTILLA_LIBRARY_NAMES qscintilla2 libqscintilla2 libqscintilla2.dylib)
++ set(QSCINTILLA_LIBRARY_NAMES qscintilla2 qscintilla2_qt4 libqscintilla2 libqscintilla2.dylib)
+ endif(ENABLE_QT5)
+
+ find_library(QSCINTILLA_LIBRARY
diff --git a/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.1.patch b/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.1.patch
new file mode 100644
index 00000000000..ff8989227f6
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.1.patch
@@ -0,0 +1,42 @@
+From 85a0db24f32351f6096cd8282f03ad5c2f4e6ef5 Mon Sep 17 00:00:00 2001
+From: Sandro Mani <manisandro@gmail.com>
+Date: Wed, 1 Mar 2017 16:12:38 +0100
+Subject: [PATCH] Fix build against recent sip/PyQt4:
+
+qgsfiledownloader.sip:33:0:
+src/gui/qgsfiledownloader.h:94:5: error: overriding non-deleted function 'virtual QgsFileDownloader::~QgsFileDownloader()'
+
+RuntimeError: qgis._core cannot import type 'QList<QVariant>' from PyQt4.QtCore
+---
+ python/core/core.sip | 1 +
+ src/gui/qgsfiledownloader.h | 4 +++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/python/core/core.sip b/python/core/core.sip
+index 8f0b6af..41f5450 100644
+--- a/python/core/core.sip
++++ b/python/core/core.sip
+@@ -3,6 +3,7 @@
+
+ %Feature QT5_SUPPORT
+
++%Import QtCore/QtCoremod.sip
+ %Import QtXml/QtXmlmod.sip
+ %Import QtNetwork/QtNetworkmod.sip
+ %Import QtSql/QtSqlmod.sip
+diff --git a/src/gui/qgsfiledownloader.h b/src/gui/qgsfiledownloader.h
+index c9276f7..841e4b6 100644
+--- a/src/gui/qgsfiledownloader.h
++++ b/src/gui/qgsfiledownloader.h
+@@ -90,8 +90,10 @@ class GUI_EXPORT QgsFileDownloader : public QObject
+ void onSslErrors( QNetworkReply *reply, const QList<QSslError> &errors );
+ #endif
+
+- private:
++ protected:
+ ~QgsFileDownloader();
++
++ private:
+ /**
+ * Abort current request and show an error if the instance has GUI
+ * notifications enabled.
diff --git a/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild b/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild
index 463a3b19ca1..81e16bdc05f 100644
--- a/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild
@@ -84,6 +84,8 @@ PATCHES=(
"${FILESDIR}"/${P}-app-icon.patch
"${FILESDIR}"/${P}-webkit.patch
"${FILESDIR}"/${P}-sip-4.19.patch
+ "${FILESDIR}"/${P}-qscintilla-2.10.patch
+ "${FILESDIR}"/${P}-sip-4.19.1.patch
)
pkg_setup() {
diff --git a/sci-geosciences/qgis/qgis-2.18.4.ebuild b/sci-geosciences/qgis/qgis-2.18.4.ebuild
index 5cc7c2eb878..4a1f1c1c736 100644
--- a/sci-geosciences/qgis/qgis-2.18.4.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.4.ebuild
@@ -34,8 +34,8 @@ COMMON_DEPEND="
dev-qt/qtcore:4
dev-qt/qtgui:4
dev-qt/qtscript:4
- dev-qt/qtsvg:4
dev-qt/qtsql:4
+ dev-qt/qtsvg:4
sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
sci-libs/geos
sci-libs/libspatialindex:=
@@ -80,6 +80,11 @@ RDEPEND="${COMMON_DEPEND}
# Disabling test suite because upstream disallow running from install path
RESTRICT="test"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.18.3-qscintilla-2.10.patch
+ "${FILESDIR}"/${PN}-2.18.3-sip-4.19.1.patch
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
@@ -99,30 +104,41 @@ src_configure() {
-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
-DQWT_INCLUDE_DIR=/usr/include/qwt6
-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so
- -DWITH_INTERNAL_DATEUTIL=OFF
- -DWITH_INTERNAL_FUTURE=OFF
- -DWITH_INTERNAL_HTTPLIB2=OFF
- -DWITH_INTERNAL_JINJA2=OFF
- -DWITH_INTERNAL_MARKUPSAFE=OFF
- -DWITH_INTERNAL_PYGMENTS=OFF
- -DWITH_INTERNAL_PYTZ=OFF
-DWITH_INTERNAL_QWTPOLAR=OFF
- -DWITH_INTERNAL_SIX=OFF
- -DWITH_INTERNAL_YAML=OFF
-DPEDANTIC=OFF
-DWITH_APIDOC=OFF
-DWITH_QSPATIALITE=ON
-DENABLE_TESTS=OFF
- -DWITH_BINDINGS="$(usex python)"
- -DWITH_GRASS7="$(usex grass)"
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
- -DWITH_ORACLE="$(usex oracle)"
- -DWITH_POSTGRESQL="$(usex postgres)"
- -DWITH_PYSPATIALITE="$(usex python)"
- -DWITH_SERVER="$(usex mapserver)"
- -DWITH_QTWEBKIT="$(usex webkit)"
+ -DWITH_GRASS=$(usex grass)
+ -DWITH_SERVER=$(usex mapserver)
+ -DWITH_ORACLE=$(usex oracle)
+ -DWITH_POSTGRESQL=$(usex postgres)
+ -DWITH_BINDINGS=$(usex python)
+ -DWITH_QTWEBKIT=$(usex webkit)
)
+ if use grass; then
+ mycmakeargs+=(
+ -DWITH_GRASS7=ON
+ -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+ )
+ fi
+
+ if use python; then
+ mycmakeargs+=(
+ -DWITH_PYSPATIALITE=ON
+ -DWITH_INTERNAL_DATEUTIL=OFF
+ -DWITH_INTERNAL_FUTURE=OFF
+ -DWITH_INTERNAL_HTTPLIB2=OFF
+ -DWITH_INTERNAL_JINJA2=OFF
+ -DWITH_INTERNAL_MARKUPSAFE=OFF
+ -DWITH_INTERNAL_PYGMENTS=OFF
+ -DWITH_INTERNAL_PYTZ=OFF
+ -DWITH_INTERNAL_SIX=OFF
+ -DWITH_INTERNAL_YAML=OFF
+ )
+ fi
+
cmake-utils_src_configure
}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/
@ 2017-04-09 21:34 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-04-09 21:34 UTC (permalink / raw
To: gentoo-commits
commit: 5b09b9c76aad244071b118857a3306f983dbcf37
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 9 21:22:11 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 9 21:34:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b09b9c7
sci-geosciences/qgis: Fix USE=python
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../qgis/files/qgis-2.18.6-python.patch | 25 ++++++++++++++++++++++
sci-geosciences/qgis/qgis-2.18.6.ebuild | 5 ++++-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/sci-geosciences/qgis/files/qgis-2.18.6-python.patch b/sci-geosciences/qgis/files/qgis-2.18.6-python.patch
new file mode 100644
index 00000000000..b8a812d3e4f
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-2.18.6-python.patch
@@ -0,0 +1,25 @@
+commit 13d8e30bbe0ee17fff32a3eba90cd217d277e5ac
+Author: Marco Bernasocchi <marco@opengis.ch>
+Date: Wed Dec 7 19:08:24 2016 +1300
+
+ fix 2.18 build with Qt5 by executing pyuic
+
+diff --git a/scripts/pyuic-wrapper.sh b/scripts/pyuic-wrapper.sh
+index d6fb497a84..aa146b31bb 100755
+--- a/scripts/pyuic-wrapper.sh
++++ b/scripts/pyuic-wrapper.sh
+@@ -15,12 +15,12 @@
+ ###########################################################################
+
+
+-PYUIC4=$1
++PYUIC=$1
+ LD_LIBRARY_PATH=$2:$LD_LIBRARY_PATH
+ PYTHONPATH=$3:$PYTHONPATH
+ PYTHON=$4
+ shift 4
+
+ export LD_LIBRARY_PATH PYTHONPATH
+-
++$PYUIC $@
+ exec $PYTHON $(dirname $0)/pyuic-wrapper.py $@
diff --git a/sci-geosciences/qgis/qgis-2.18.6.ebuild b/sci-geosciences/qgis/qgis-2.18.6.ebuild
index 42c6a19e4aa..53dee9ff00e 100644
--- a/sci-geosciences/qgis/qgis-2.18.6.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.6.ebuild
@@ -90,7 +90,10 @@ RDEPEND="${COMMON_DEPEND}
# Disabling test suite because upstream disallow running from install path
RESTRICT="test"
-PATCHES=( "${FILESDIR}/${P}-featuresummary.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-featuresummary.patch"
+ "${FILESDIR}/${P}-python.patch"
+)
pkg_setup() {
use python && python-single-r1_pkg_setup
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/
@ 2018-05-29 14:26 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2018-05-29 14:26 UTC (permalink / raw
To: gentoo-commits
commit: cc051bc7852a76dbd12ebc49010583df6abf6a2c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 29 14:26:21 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 29 14:26:21 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc051bc7
sci-geosciences/qgis: Drop 3.0.1
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sci-geosciences/qgis/Manifest | 1 -
.../qgis/files/qgis-3.0.1-check-constraints.patch | 237 ---------------------
.../qgis/files/qgis-3.0.1-qt-5.11.patch | 199 -----------------
sci-geosciences/qgis/qgis-3.0.1.ebuild | 222 -------------------
4 files changed, 659 deletions(-)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 83c6586a07c..d81dfa8c495 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
-DIST qgis-3.0.1.tar.bz2 94217493 BLAKE2B 9f3b9e9d76dfac574cbe7c9b95f0dc59fb9ad74ddd5c5a420931107200b1ba6641e2b74cff681ecec8cdab777cda69c0e698fa952bc28cd79c761f4636f62f00 SHA512 c07fc9b033fa043e38098d226dac69ea35890109c45ccc4c47017e0af2d3fbed4b1a71b3fd7dc76fea3eb43fbcdbfb660df50d779da8c43f68a4402b239f8f75
DIST qgis-3.0.2.tar.bz2 94483208 BLAKE2B 198587a8440bf6d1dff6d08e706f1c0972088f8f90df4def27a0066f659e4273be35687ad0f35b4f3dcd7fb60e30ead74093541c69ddbd456bcbbcbae4c99c76 SHA512 4eec027f81ee693293e87d3c16b7b210ebd66f35a2884dc4662b5a3359b18cfd8a11919132ab88489456121eab36f8e5a9c20afcb34fa9dbe54673d838fc2be1
DIST qgis-3.0.3.tar.bz2 94462631 BLAKE2B 047f4d8852b7572dc94b9c04ec9c81e53bab2ed63a7a490682b7c557ae1b21fcc3257e751cc794d368dc4124c20c008ffdc7f1f4b79af2faea78774dc6ef430c SHA512 67f46f1acacd6688984b0c13aa5880e2f31d85b5a28ebf12830d33f198c2e5983887a8c85036b8be59edf3836ba7d38985f58433f53d3164c2ffb4a6db94d046
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/files/qgis-3.0.1-check-constraints.patch b/sci-geosciences/qgis/files/qgis-3.0.1-check-constraints.patch
deleted file mode 100644
index c07cd554dbf..00000000000
--- a/sci-geosciences/qgis/files/qgis-3.0.1-check-constraints.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-From f07389b421065d40abe9b5355c8e329229f792d9 Mon Sep 17 00:00:00 2001
-From: Denis Rouzaud <denis.rouzaud@gmail.com>
-Date: Sat, 24 Mar 2018 18:30:45 +0100
-Subject: [PATCH] fix constraints not checked when they should be (#6550)
- (#6599)
-
----
- python/gui/qgsattributeform.sip.in | 15 ++++++++++++++-
- src/gui/attributetable/qgsdualview.cpp | 9 ++++++---
- src/gui/attributetable/qgsdualview.h | 2 +-
- src/gui/qgsattributeform.cpp | 21 +++++++++++++++------
- src/gui/qgsattributeform.h | 14 +++++++++++++-
- tests/src/gui/testqgsattributeform.cpp | 14 +++++++-------
- 6 files changed, 56 insertions(+), 19 deletions(-)
-
-diff --git a/python/gui/qgsattributeform.sip.in b/python/gui/qgsattributeform.sip.in
-index 8b489dd3089..45deba11a31 100644
---- a/python/gui/qgsattributeform.sip.in
-+++ b/python/gui/qgsattributeform.sip.in
-@@ -139,12 +139,25 @@ on all attribute widgets.
-
- signals:
-
-- void attributeChanged( const QString &attribute, const QVariant &value );
-+ void attributeChanged( const QString &attribute, const QVariant &value );
- %Docstring
- Notifies about changes of attributes
-
- :param attribute: The name of the attribute that changed.
- :param value: The new value of the attribute.
-+
-+.. deprecated:: since 3.0
-+%End
-+
-+ void widgetValueChanged( const QString &attribute, const QVariant &value, bool attributeChanged );
-+%Docstring
-+Notifies about changes of attributes
-+
-+:param attribute: The name of the attribute that changed.
-+:param value: The new value of the attribute.
-+:param attributeChanged: If true, it corresponds to an actual change of the feature attribute
-+
-+.. versionadded:: 3.0.1
- %End
-
-
-diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp
-index d7ccfa1a8a1..2c640036a02 100644
---- a/src/gui/attributetable/qgsdualview.cpp
-+++ b/src/gui/attributetable/qgsdualview.cpp
-@@ -98,7 +98,7 @@ void QgsDualView::init( QgsVectorLayer *layer, QgsMapCanvas *mapCanvas, const Qg
- mAttributeEditor->layout()->addWidget( mAttributeForm );
- }
-
-- connect( mAttributeForm, &QgsAttributeForm::attributeChanged, this, &QgsDualView::featureFormAttributeChanged );
-+ connect( mAttributeForm, &QgsAttributeForm::widgetValueChanged, this, &QgsDualView::featureFormAttributeChanged );
- connect( mAttributeForm, &QgsAttributeForm::modeChanged, this, &QgsDualView::formModeChanged );
- connect( mMasterModel, &QgsAttributeTableModel::modelChanged, mAttributeForm, &QgsAttributeForm::refreshFeature );
- connect( mAttributeForm, &QgsAttributeForm::filterExpressionSet, this, &QgsDualView::filterExpressionSet );
-@@ -880,9 +880,12 @@ void QgsDualView::extentChanged()
- emit filterChanged();
- }
-
--void QgsDualView::featureFormAttributeChanged()
-+void QgsDualView::featureFormAttributeChanged( const QString &attribute, const QVariant &value, bool attributeChanged )
- {
-- mFeatureList->setCurrentFeatureEdited( true );
-+ Q_UNUSED( attribute );
-+ Q_UNUSED( value );
-+ if ( attributeChanged )
-+ mFeatureList->setCurrentFeatureEdited( true );
- }
-
- void QgsDualView::setFilteredFeatures( const QgsFeatureIds &filteredFeatures )
-diff --git a/src/gui/attributetable/qgsdualview.h b/src/gui/attributetable/qgsdualview.h
-index 73cb420f44b..264adbacb29 100644
---- a/src/gui/attributetable/qgsdualview.h
-+++ b/src/gui/attributetable/qgsdualview.h
-@@ -327,7 +327,7 @@ class GUI_EXPORT QgsDualView : public QStackedWidget, private Ui::QgsDualViewBas
- * Will forward this signal to the feature list to visually represent
- * that there has been an edit event.
- */
-- void featureFormAttributeChanged();
-+ void featureFormAttributeChanged( const QString &attribute, const QVariant &value, bool attributeChanged );
-
- /**
- * Will be called periodically, when loading layers from slow data providers.
-diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
-index df1e98282f6..7a707c6fd7d 100644
---- a/src/gui/qgsattributeform.cpp
-+++ b/src/gui/qgsattributeform.cpp
-@@ -240,6 +240,7 @@ void QgsAttributeForm::changeAttribute( const QString &field, const QVariant &va
-
- void QgsAttributeForm::setFeature( const QgsFeature &feature )
- {
-+ mIsSettingFeature = true;
- mFeature = feature;
-
- switch ( mMode )
-@@ -266,6 +267,7 @@ void QgsAttributeForm::setFeature( const QgsFeature &feature )
- break;
- }
- }
-+ mIsSettingFeature = false;
- }
-
- bool QgsAttributeForm::saveEdits()
-@@ -692,11 +694,7 @@ void QgsAttributeForm::onAttributeChanged( const QVariant &value )
- QgsEditorWidgetWrapper *eww = qobject_cast<QgsEditorWidgetWrapper *>( sender() );
- Q_ASSERT( eww );
-
-- const QVariant oldValue = mFeature.attribute( eww->fieldIdx() );
--
-- // Safety check, if we receive the same value again, no reason to do anything
-- if ( oldValue == value && oldValue.isNull() == value.isNull() )
-- return;
-+ bool signalEmitted = false;
-
- if ( mValuesInitialized )
- mDirty = true;
-@@ -707,7 +705,12 @@ void QgsAttributeForm::onAttributeChanged( const QVariant &value )
- case IdentifyMode:
- case AddFeatureMode:
- {
-+ Q_NOWARN_DEPRECATED_PUSH
- emit attributeChanged( eww->field().name(), value );
-+ Q_NOWARN_DEPRECATED_PUSH
-+ emit widgetValueChanged( eww->field().name(), value, !mIsSettingFeature );
-+
-+ signalEmitted = true;
-
- updateJoinedFields( *eww );
-
-@@ -739,7 +742,13 @@ void QgsAttributeForm::onAttributeChanged( const QVariant &value )
-
- updateConstraints( eww );
-
-- emit attributeChanged( eww->field().name(), value );
-+ if ( !signalEmitted )
-+ {
-+ Q_NOWARN_DEPRECATED_PUSH
-+ emit attributeChanged( eww->field().name(), value );
-+ Q_NOWARN_DEPRECATED_PUSH
-+ emit widgetValueChanged( eww->field().name(), value, !mIsSettingFeature );
-+ }
- }
-
- void QgsAttributeForm::updateAllConstraints()
-diff --git a/src/gui/qgsattributeform.h b/src/gui/qgsattributeform.h
-index 6102825b286..41f16cd8614 100644
---- a/src/gui/qgsattributeform.h
-+++ b/src/gui/qgsattributeform.h
-@@ -178,8 +178,19 @@ class GUI_EXPORT QgsAttributeForm : public QWidget
- *
- * \param attribute The name of the attribute that changed.
- * \param value The new value of the attribute.
-+ * \deprecated since 3.0
- */
-- void attributeChanged( const QString &attribute, const QVariant &value );
-+ Q_DECL_DEPRECATED void attributeChanged( const QString &attribute, const QVariant &value );
-+
-+ /**
-+ * Notifies about changes of attributes
-+ *
-+ * \param attribute The name of the attribute that changed.
-+ * \param value The new value of the attribute.
-+ * \param attributeChanged If true, it corresponds to an actual change of the feature attribute
-+ * \since QGIS 3.0.1
-+ */
-+ void widgetValueChanged( const QString &attribute, const QVariant &value, bool attributeChanged );
-
- /**
- * Will be emitted before the feature is saved. Use this signal to perform sanity checks.
-@@ -367,6 +378,7 @@ class GUI_EXPORT QgsAttributeForm : public QWidget
- QMap<const QgsVectorLayerJoinInfo *, QgsFeature> mJoinedFeatures;
- bool mValuesInitialized = false;
- bool mDirty = false;
-+ bool mIsSettingFeature = false;
-
- struct ContainerInformation
- {
-diff --git a/tests/src/gui/testqgsattributeform.cpp b/tests/src/gui/testqgsattributeform.cpp
-index d4629cb0762..9b6d5c46444 100644
---- a/tests/src/gui/testqgsattributeform.cpp
-+++ b/tests/src/gui/testqgsattributeform.cpp
-@@ -111,24 +111,24 @@ void TestQgsAttributeForm::testFieldConstraint()
- // build a form for this feature
- QgsAttributeForm form2( layer );
- form2.setFeature( ft );
-- QSignalSpy spy( &form2, SIGNAL( attributeChanged( QString, QVariant ) ) );
-+ QSignalSpy spy( &form2, SIGNAL( widgetValueChanged( QString, QVariant, bool ) ) );
- ww = qobject_cast<QgsEditorWidgetWrapper *>( form2.mWidgets[0] );
-
- // set value to 1
- ww->setValue( 1 );
-- QCOMPARE( spy.count(), 2 );
-+ QCOMPARE( spy.count(), 1 );
- QCOMPARE( constraintsLabel( &form2, ww )->text(), validLabel );
-
- // set value to null
- spy.clear();
- ww->setValue( QVariant() );
-- QCOMPARE( spy.count(), 2 );
-+ QCOMPARE( spy.count(), 1 );
- QCOMPARE( constraintsLabel( &form2, ww )->text(), invalidLabel );
-
- // set value to 1
- spy.clear();
- ww->setValue( 1 );
-- QCOMPARE( spy.count(), 2 );
-+ QCOMPARE( spy.count(), 1 );
- QCOMPARE( constraintsLabel( &form2, ww )->text(), validLabel );
-
- // set a soft constraint
-@@ -205,11 +205,11 @@ void TestQgsAttributeForm::testFieldMultiConstraints()
- ww1 = qobject_cast<QgsEditorWidgetWrapper *>( form2.mWidgets[1] );
- ww2 = qobject_cast<QgsEditorWidgetWrapper *>( form2.mWidgets[2] );
- ww3 = qobject_cast<QgsEditorWidgetWrapper *>( form2.mWidgets[3] );
-- QSignalSpy spy2( &form2, SIGNAL( attributeChanged( QString, QVariant ) ) );
-+ QSignalSpy spy2( &form2, SIGNAL( widgetValueChanged( QString, QVariant, bool ) ) );
-
- // change value
- ww0->setValue( 2 ); // update col0
-- QCOMPARE( spy2.count(), 2 );
-+ QCOMPARE( spy2.count(), 1 );
-
- QCOMPARE( constraintsLabel( &form2, ww0 )->text(), inv ); // 2 < ( 1 + 2 )
- QCOMPARE( constraintsLabel( &form2, ww1 )->text(), QString() );
-@@ -219,7 +219,7 @@ void TestQgsAttributeForm::testFieldMultiConstraints()
- // change value
- spy2.clear();
- ww0->setValue( 1 ); // update col0
-- QCOMPARE( spy2.count(), 2 );
-+ QCOMPARE( spy2.count(), 1 );
-
- QCOMPARE( constraintsLabel( &form2, ww0 )->text(), val ); // 1 < ( 1 + 2 )
- QCOMPARE( constraintsLabel( &form2, ww1 )->text(), QString() );
diff --git a/sci-geosciences/qgis/files/qgis-3.0.1-qt-5.11.patch b/sci-geosciences/qgis/files/qgis-3.0.1-qt-5.11.patch
deleted file mode 100644
index c78c0dec3bb..00000000000
--- a/sci-geosciences/qgis/files/qgis-3.0.1-qt-5.11.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-From 0a903118389029fd25fbf4eddd20f60c8856ab4e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Wed, 28 Mar 2018 20:48:58 +0200
-Subject: [PATCH] Fix build with Qt-5.11 (missing headers)
-
----
- src/app/layout/qgslayoutpolylinewidget.cpp | 2 ++
- src/app/layout/qgslayoutscalebarwidget.cpp | 1 +
- src/app/layout/qgslayoutscalebarwidget.h | 2 ++
- src/app/qgslabelinggui.cpp | 2 ++
- src/app/qgsrulebasedlabelingwidget.cpp | 1 +
- src/gui/layout/qgslayoutitemwidget.cpp | 2 ++
- src/gui/layout/qgslayoutnewitempropertiesdialog.cpp | 2 ++
- src/gui/qgscompoundcolorwidget.cpp | 1 +
- src/gui/qgsextentgroupbox.cpp | 1 +
- src/gui/qgsgradientcolorrampdialog.cpp | 1 +
- src/gui/qgsgroupwmsdatadialog.cpp | 1 +
- src/gui/qgstextformatwidget.cpp | 2 ++
- src/gui/symbology/qgssymbollayerwidget.cpp | 1 +
- src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp | 1 +
- 14 files changed, 20 insertions(+)
-
-diff --git a/src/app/layout/qgslayoutpolylinewidget.cpp b/src/app/layout/qgslayoutpolylinewidget.cpp
-index 178968917a..28d5d25a4d 100644
---- a/src/app/layout/qgslayoutpolylinewidget.cpp
-+++ b/src/app/layout/qgslayoutpolylinewidget.cpp
-@@ -21,6 +21,8 @@
- #include "qgslayoutitemregistry.h"
- #include "qgslayout.h"
- #include "qgslayoutundostack.h"
-+
-+#include <QButtonGroup>
- #include <QFileDialog>
-
- QgsLayoutPolylineWidget::QgsLayoutPolylineWidget( QgsLayoutItemPolyline *polyline )
-diff --git a/src/app/layout/qgslayoutscalebarwidget.cpp b/src/app/layout/qgslayoutscalebarwidget.cpp
-index c1b8ad1509..569a4e0573 100644
---- a/src/app/layout/qgslayoutscalebarwidget.cpp
-+++ b/src/app/layout/qgslayoutscalebarwidget.cpp
-@@ -19,6 +19,7 @@
- #include "qgslayoutitemscalebar.h"
- #include "qgslayout.h"
- #include "qgsguiutils.h"
-+
- #include <QColorDialog>
- #include <QFontDialog>
- #include <QWidget>
-diff --git a/src/app/layout/qgslayoutscalebarwidget.h b/src/app/layout/qgslayoutscalebarwidget.h
-index a60b777bfa..ec7cc46cca 100644
---- a/src/app/layout/qgslayoutscalebarwidget.h
-+++ b/src/app/layout/qgslayoutscalebarwidget.h
-@@ -20,6 +20,8 @@
- #include "ui_qgslayoutscalebarwidgetbase.h"
- #include "qgslayoutitemwidget.h"
-
-+#include <QButtonGroup>
-+
- class QgsLayoutItemScaleBar;
-
- /**
-diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
-index e5cf8ff626..4d6a83700d 100644
---- a/src/app/qgslabelinggui.cpp
-+++ b/src/app/qgslabelinggui.cpp
-@@ -24,6 +24,8 @@
- #include "qgsauxiliarystorage.h"
- #include "qgsnewauxiliarylayerdialog.h"
-
-+#include <QButtonGroup>
-+
- QgsExpressionContext QgsLabelingGui::createExpressionContext() const
- {
- QgsExpressionContext expContext;
-diff --git a/src/app/qgsrulebasedlabelingwidget.cpp b/src/app/qgsrulebasedlabelingwidget.cpp
-index 6f1f77ef9a..57b7d34799 100644
---- a/src/app/qgsrulebasedlabelingwidget.cpp
-+++ b/src/app/qgsrulebasedlabelingwidget.cpp
-@@ -26,6 +26,7 @@
- #include "qgsvectorlayerlabeling.h"
- #include "qgslogger.h"
-
-+#include <QAction>
- #include <QClipboard>
- #include <QMessageBox>
-
-diff --git a/src/gui/layout/qgslayoutitemwidget.cpp b/src/gui/layout/qgslayoutitemwidget.cpp
-index 1d3d4f8171..d68799234b 100644
---- a/src/gui/layout/qgslayoutitemwidget.cpp
-+++ b/src/gui/layout/qgslayoutitemwidget.cpp
-@@ -21,6 +21,8 @@
- #include "qgsprintlayout.h"
- #include "qgslayoutatlas.h"
-
-+#include <QButtonGroup>
-+
- //
- // QgsLayoutConfigObject
- //
-diff --git a/src/gui/layout/qgslayoutnewitempropertiesdialog.cpp b/src/gui/layout/qgslayoutnewitempropertiesdialog.cpp
-index 9fa5f98358..c53d002acb 100644
---- a/src/gui/layout/qgslayoutnewitempropertiesdialog.cpp
-+++ b/src/gui/layout/qgslayoutnewitempropertiesdialog.cpp
-@@ -19,6 +19,8 @@
- #include "qgslayoutpagecollection.h"
- #include "qgsgui.h"
-
-+#include <QButtonGroup>
-+
- QgsLayoutItemPropertiesDialog::QgsLayoutItemPropertiesDialog( QWidget *parent, Qt::WindowFlags flags )
- : QDialog( parent, flags )
- {
-diff --git a/src/gui/qgscompoundcolorwidget.cpp b/src/gui/qgscompoundcolorwidget.cpp
-index a7dbb77501..48032a2456 100644
---- a/src/gui/qgscompoundcolorwidget.cpp
-+++ b/src/gui/qgscompoundcolorwidget.cpp
-@@ -20,6 +20,7 @@
- #include "qgsapplication.h"
- #include "qgssettings.h"
-
-+#include <QHeaderView>
- #include <QPushButton>
- #include <QMenu>
- #include <QToolButton>
-diff --git a/src/gui/qgsextentgroupbox.cpp b/src/gui/qgsextentgroupbox.cpp
-index ffc8ab7195..d5d77db6a0 100644
---- a/src/gui/qgsextentgroupbox.cpp
-+++ b/src/gui/qgsextentgroupbox.cpp
-@@ -24,6 +24,7 @@
-
- #include <QMenu>
- #include <QAction>
-+#include <QDoubleValidator>
-
- QgsExtentGroupBox::QgsExtentGroupBox( QWidget *parent )
- : QgsCollapsibleGroupBox( parent )
-diff --git a/src/gui/qgsgradientcolorrampdialog.cpp b/src/gui/qgsgradientcolorrampdialog.cpp
-index fcc93d74fb..317f373423 100644
---- a/src/gui/qgsgradientcolorrampdialog.cpp
-+++ b/src/gui/qgsgradientcolorrampdialog.cpp
-@@ -22,6 +22,7 @@
- #include "qgssettings.h"
-
- #include <QColorDialog>
-+#include <QHeaderView>
- #include <QInputDialog>
- #include <QPainter>
- #include <QTableWidget>
-diff --git a/src/gui/qgsgroupwmsdatadialog.cpp b/src/gui/qgsgroupwmsdatadialog.cpp
-index 456c813f5f..f9bb15ab6d 100644
---- a/src/gui/qgsgroupwmsdatadialog.cpp
-+++ b/src/gui/qgsgroupwmsdatadialog.cpp
-@@ -16,6 +16,7 @@
- #include "qgsapplication.h"
- #include "qgsgroupwmsdatadialog.h"
-
-+#include <QRegExpValidator>
-
- QgsGroupWmsDataDialog::QgsGroupWmsDataDialog( QWidget *parent, Qt::WindowFlags fl )
- : QDialog( parent, fl )
-diff --git a/src/gui/qgstextformatwidget.cpp b/src/gui/qgstextformatwidget.cpp
-index 8c3c67d8e9..9005a40081 100644
---- a/src/gui/qgstextformatwidget.cpp
-+++ b/src/gui/qgstextformatwidget.cpp
-@@ -29,6 +29,8 @@
- #include "qgseffectstack.h"
- #include "qgspainteffectregistry.h"
-
-+#include <QButtonGroup>
-+
- QgsTextFormatWidget::QgsTextFormatWidget( const QgsTextFormat &format, QgsMapCanvas *mapCanvas, QWidget *parent )
- : QWidget( parent )
- , mMapCanvas( mapCanvas )
-diff --git a/src/gui/symbology/qgssymbollayerwidget.cpp b/src/gui/symbology/qgssymbollayerwidget.cpp
-index 3a5f3c5314..da599a27ae 100644
---- a/src/gui/symbology/qgssymbollayerwidget.cpp
-+++ b/src/gui/symbology/qgssymbollayerwidget.cpp
-@@ -43,6 +43,7 @@
- #include "qgsauxiliarystorage.h"
-
- #include <QAbstractButton>
-+#include <QButtonGroup>
- #include <QColorDialog>
- #include <QCursor>
- #include <QDir>
-diff --git a/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp b/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp
-index 4cc3e8b301..d377d718b7 100644
---- a/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp
-+++ b/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp
-@@ -29,6 +29,7 @@
- #include "qgssettings.h"
- #include "qgsmapcanvas.h"
-
-+#include <QButtonGroup>
- #include <QListWidgetItem>
- #include <QMessageBox>
- #include <QFileDialog>
---
-2.16.3
-
diff --git a/sci-geosciences/qgis/qgis-3.0.1.ebuild b/sci-geosciences/qgis/qgis-3.0.1.ebuild
deleted file mode 100644
index 79614147766..00000000000
--- a/sci-geosciences/qgis/qgis-3.0.1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 )
-PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.1"
-
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
- examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
- KEYWORDS="amd64 x86"
-else
- GIT_ECLASS="git-r3"
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-fi
-inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
-unset GIT_ECLASS
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit"
-
-REQUIRED_USE="
- mapserver? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
- app-crypt/qca:2[qt5(+),ssl]
- >=dev-db/spatialite-4.2.0
- dev-db/sqlite:3
- dev-libs/expat
- dev-libs/libzip:=
- dev-libs/qtkeychain[qt5(+)]
- >=dev-qt/designer-${QT_MIN_VER}:5
- >=dev-qt/qtconcurrent-${QT_MIN_VER}:5
- >=dev-qt/qtcore-${QT_MIN_VER}:5
- >=dev-qt/qtgui-${QT_MIN_VER}:5
- >=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
- >=dev-qt/qtpositioning-${QT_MIN_VER}:5
- >=dev-qt/qtprintsupport-${QT_MIN_VER}:5
- >=dev-qt/qtsvg-${QT_MIN_VER}:5
- >=dev-qt/qtsql-${QT_MIN_VER}:5
- >=dev-qt/qtwidgets-${QT_MIN_VER}:5
- >=dev-qt/qtxml-${QT_MIN_VER}:5
- >=sci-libs/gdal-2.2.3:=[geos,python?,${PYTHON_USEDEP}]
- sci-libs/geos
- sci-libs/libspatialindex:=
- sci-libs/proj
- >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
- >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
- 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( >=sci-geosciences/grass-7.0.0:= )
- mapserver? ( dev-libs/fcgi )
- oracle? (
- dev-db/oracle-instantclient:=
- sci-libs/gdal:=[oracle]
- )
- polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
- postgres? ( dev-db/postgresql:= )
- python? ( ${PYTHON_DEPS}
- dev-python/future[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- dev-python/owslib[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/sip:=[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- )
- webkit? ( >=dev-qt/qtwebkit-${QT_MIN_VER}:5 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-qt/linguist-tools-${QT_MIN_VER}:5
- >=dev-qt/qttest-${QT_MIN_VER}:5
- >=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
- sys-devel/bison
- sys-devel/flex
-"
-RDEPEND="${COMMON_DEPEND}
- sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
- # git master
- "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
- # release-3_0 branch
- "${FILESDIR}/${P}-check-constraints.patch"
- # TODO upstream
- "${FILESDIR}/${P}-qt-5.11.patch"
- "${FILESDIR}/${PN}-3.0.0-featuresummary.patch"
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
- -i CMakeLists.txt || die "Failed to fix lrelease path"
-
- sed -e "/QT_LRELEASE_EXECUTABLE/d" \
- -e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
- -e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
- -i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
-
- cd src/plugins || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQGIS_MANUAL_SUBDIR=/share/man/
- -DBUILD_SHARED_LIBS=ON
- -DQGIS_LIB_SUBDIR=$(get_libdir)
- -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
- -DQWT_INCLUDE_DIR=/usr/include/qwt6
- -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
- -DPEDANTIC=OFF
- -DWITH_APIDOC=OFF
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=OFF
- -DWITH_3D=$(usex 3d)
- -DWITH_GEOREFERENCER=$(usex georeferencer)
- -DWITH_GRASS=$(usex grass)
- -DWITH_SERVER=$(usex mapserver)
- -DWITH_ORACLE=$(usex oracle)
- -DWITH_QWTPOLAR=$(usex polar)
- -DWITH_POSTGRESQL=$(usex postgres)
- -DWITH_BINDINGS=$(usex python)
- -DWITH_CUSTOM_WIDGETS=$(usex python)
- -DWITH_QTWEBKIT=$(usex webkit)
- )
-
- if use grass; then
- mycmakeargs+=(
- -DWITH_GRASS7=ON
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
- )
- fi
-
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
- # bugs 612956, 648726
- addpredict /dev/dri/renderD128
- addpredict /dev/dri/renderD129
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- domenu debian/qgis.desktop
-
- local size type
- for size in 16 22 24 32 48 64 96 128 256; do
- newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
- newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
- for type in qgs qml qlr qpt; do
- newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
- done
- done
- newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- python_optimize "${ED%/}"/usr/share/qgis/python
-
- if use grass; then
- python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
- if has_version "<sci-geosciences/qgis-3"; then
- elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
- fi
-
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/
@ 2018-08-15 10:37 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2018-08-15 10:37 UTC (permalink / raw
To: gentoo-commits
commit: 33704aeb6ed01b61e6276f05a7c1bb1d9ded1671
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 15 10:01:16 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 10:37:23 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33704aeb
sci-geosciences/qgis: Fix build with USE=-webkit
Closes: https://bugs.gentoo.org/663394
Package-Manager: Portage-2.3.46, Repoman-2.3.10
.../qgis/files/qgis-3.2.1-qtwebkit-optional.patch | 30 ++++++++++++++++++++++
sci-geosciences/qgis/qgis-3.2.1.ebuild | 1 +
2 files changed, 31 insertions(+)
diff --git a/sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch b/sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch
new file mode 100644
index 00000000000..9e56bf5ae95
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch
@@ -0,0 +1,30 @@
+From 55473e7e21a068dec904fd4146642c33a44ce22a Mon Sep 17 00:00:00 2001
+From: Denis Rouzaud <denis.rouzaud@gmail.com>
+Date: Wed, 8 Aug 2018 13:40:04 +0200
+Subject: [PATCH] fix build without webkit
+
+---
+ src/gui/qgsmaptip.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/gui/qgsmaptip.cpp b/src/gui/qgsmaptip.cpp
+index d9fe4a32607..7af6f97672c 100644
+--- a/src/gui/qgsmaptip.cpp
++++ b/src/gui/qgsmaptip.cpp
+@@ -155,12 +155,16 @@ void QgsMapTip::showMapTip( QgsMapLayer *pLayer,
+
+ void QgsMapTip::resizeContent()
+ {
++#if WITH_QTWEBKIT
+ // Get the content size
+ QWebElement container = mWebView->page()->mainFrame()->findFirstElement(
+ QStringLiteral( "#QgsWebViewContainer" ) );
+ int width = container.geometry().width() + MARGIN_VALUE * 2;
+ int height = container.geometry().height() + MARGIN_VALUE * 2;
+ mWidget->resize( width, height );
++#else
++ mWebView->adjustSize();
++#endif
+ }
+
+ void QgsMapTip::clear( QgsMapCanvas * )
\ No newline at end of file
diff --git a/sci-geosciences/qgis/qgis-3.2.1.ebuild b/sci-geosciences/qgis/qgis-3.2.1.ebuild
index d5c984cfc17..d5ad55122d0 100644
--- a/sci-geosciences/qgis/qgis-3.2.1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.2.1.ebuild
@@ -100,6 +100,7 @@ RESTRICT="test"
PATCHES=(
# git master
"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+ "${FILESDIR}/${P}-qtwebkit-optional.patch" # bug 663394
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/
@ 2018-10-27 15:57 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2018-10-27 15:57 UTC (permalink / raw
To: gentoo-commits
commit: 38077c5c4750fe3f0699de54a9339f68df19ec42
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 27 15:53:47 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 15:54:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38077c5c
sci-geosciences/qgis: Drop old
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
sci-geosciences/qgis/Manifest | 2 -
.../qgis/files/qgis-3.0.3-qt-5.11.0.patch | 38 ----
sci-geosciences/qgis/qgis-3.0.3-r1.ebuild | 222 ---------------------
sci-geosciences/qgis/qgis-3.2.2.ebuild | 220 --------------------
4 files changed, 482 deletions(-)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 8ad97a048eb..aa60e32de73 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,2 @@
-DIST qgis-3.0.3.tar.bz2 94462631 BLAKE2B 047f4d8852b7572dc94b9c04ec9c81e53bab2ed63a7a490682b7c557ae1b21fcc3257e751cc794d368dc4124c20c008ffdc7f1f4b79af2faea78774dc6ef430c SHA512 67f46f1acacd6688984b0c13aa5880e2f31d85b5a28ebf12830d33f198c2e5983887a8c85036b8be59edf3836ba7d38985f58433f53d3164c2ffb4a6db94d046
-DIST qgis-3.2.2.tar.bz2 71947443 BLAKE2B a6fc159ce6d90f4273483159831c9b89db40c3bd5fb34ec90d799978aae11a609509d5fd5189dc1edfb9fb72cd9ccd9298414d024db3c43561ea096774b7be17 SHA512 d19d44f71285e1d8a1d365a406550c68cd48215c7f9f67a979052f1f115d636c66c6a291e1a108b19a641f357b27e104ac642158f375fb631c141e844f468949
DIST qgis-3.2.3.tar.bz2 71991789 BLAKE2B 656c0304cfc32d619a72f08185f76cf02aed7336fac8a4bf928c7f8b0e00df2e995e891a7ba757d8ce6acb5892c5c7425765608ee0441fa7eae8070a828734d4 SHA512 3366fce6232dd1b7657c0693debf742309d5594c7875017f464efd33e63bd4116eb062a0ebeb5b3108572a9658c3fb7d729e5a5db8fefb3ceae490ef1ec6bd22
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/files/qgis-3.0.3-qt-5.11.0.patch b/sci-geosciences/qgis/files/qgis-3.0.3-qt-5.11.0.patch
deleted file mode 100644
index abda33b2dd2..00000000000
--- a/sci-geosciences/qgis/files/qgis-3.0.3-qt-5.11.0.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 83346e5ec77dc3474c01acd27d4a3e03690170b5 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 24 Jun 2018 14:38:44 +0200
-Subject: [PATCH] Fix WITH_GRASS7 build with Qt-5.11.0 (missing headers)
-
----
- src/plugins/grass/qgsgrassmoduleinput.cpp | 1 +
- src/plugins/grass/qgsgrassregion.cpp | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/src/plugins/grass/qgsgrassmoduleinput.cpp b/src/plugins/grass/qgsgrassmoduleinput.cpp
-index ebb8efd493..6968a34d8c 100644
---- a/src/plugins/grass/qgsgrassmoduleinput.cpp
-+++ b/src/plugins/grass/qgsgrassmoduleinput.cpp
-@@ -17,6 +17,7 @@
- #include <QCompleter>
- #include <QFileDialog>
- #include <QFileInfo>
-+#include <QHeaderView>
- #include <QHBoxLayout>
- #include <QIcon>
- #include <QLatin1String>
-diff --git a/src/plugins/grass/qgsgrassregion.cpp b/src/plugins/grass/qgsgrassregion.cpp
-index 00928da4a7..b31f1b9ae9 100644
---- a/src/plugins/grass/qgsgrassregion.cpp
-+++ b/src/plugins/grass/qgsgrassregion.cpp
-@@ -27,6 +27,8 @@
-
- #include <QButtonGroup>
- #include <QColorDialog>
-+#include <QDoubleValidator>
-+#include <QIntValidator>
- #include <QMessageBox>
- #include <QMouseEvent>
- #include <QRubberBand>
---
-2.18.0
-
diff --git a/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild b/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild
deleted file mode 100644
index df0980c51a1..00000000000
--- a/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
-
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
- examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
- KEYWORDS="amd64 x86"
-else
- GIT_ECLASS="git-r3"
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-fi
-inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
-unset GIT_ECLASS
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-COMMON_DEPEND="
- app-crypt/qca:2[qt5(+),ssl]
- >=dev-db/spatialite-4.2.0
- dev-db/sqlite:3
- dev-libs/expat
- dev-libs/libzip:=
- dev-libs/qtkeychain[qt5(+)]
- >=dev-qt/designer-${QT_MIN_VER}:5
- >=dev-qt/qtconcurrent-${QT_MIN_VER}:5
- >=dev-qt/qtcore-${QT_MIN_VER}:5
- >=dev-qt/qtgui-${QT_MIN_VER}:5
- >=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
- >=dev-qt/qtpositioning-${QT_MIN_VER}:5
- >=dev-qt/qtprintsupport-${QT_MIN_VER}:5
- >=dev-qt/qtsvg-${QT_MIN_VER}:5
- >=dev-qt/qtsql-${QT_MIN_VER}:5
- >=dev-qt/qtwidgets-${QT_MIN_VER}:5
- >=dev-qt/qtxml-${QT_MIN_VER}:5
- >=sci-libs/gdal-2.2.3:=[geos]
- sci-libs/geos
- sci-libs/libspatialindex:=
- sci-libs/proj
- >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
- >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
- 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( =sci-geosciences/grass-7*:= )
- mapserver? ( dev-libs/fcgi )
- oracle? (
- dev-db/oracle-instantclient:=
- sci-libs/gdal:=[oracle]
- )
- polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
- postgres? ( dev-db/postgresql:= )
- python? (
- ${PYTHON_DEPS}
- dev-python/future[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- dev-python/owslib[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/sip:=[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- )
- webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-qt/linguist-tools-${QT_MIN_VER}:5
- >=dev-qt/qttest-${QT_MIN_VER}:5
- >=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
- sys-devel/bison
- sys-devel/flex
- python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
- sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
- # git master
- "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
- # TODO upstream
- "${FILESDIR}/${PN}-3.0.0-featuresummary.patch"
- "${FILESDIR}/${P}-qt-5.11.0.patch"
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
- -i CMakeLists.txt || die "Failed to fix lrelease path"
-
- sed -e "/QT_LRELEASE_EXECUTABLE/d" \
- -e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
- -e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
- -i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
-
- cd src/plugins || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQGIS_MANUAL_SUBDIR=/share/man/
- -DBUILD_SHARED_LIBS=ON
- -DQGIS_LIB_SUBDIR=$(get_libdir)
- -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
- -DQWT_INCLUDE_DIR=/usr/include/qwt6
- -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
- -DPEDANTIC=OFF
- -DWITH_APIDOC=OFF
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=OFF
- -DWITH_3D=$(usex 3d)
- -DWITH_GEOREFERENCER=$(usex georeferencer)
- -DWITH_GRASS7=$(usex grass)
- -DWITH_SERVER=$(usex mapserver)
- -DWITH_ORACLE=$(usex oracle)
- -DWITH_QWTPOLAR=$(usex polar)
- -DWITH_POSTGRESQL=$(usex postgres)
- -DWITH_BINDINGS=$(usex python)
- -DWITH_CUSTOM_WIDGETS=$(usex python)
- -DWITH_QTWEBKIT=$(usex webkit)
- )
-
- if use grass; then
- mycmakeargs+=(
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
- )
- fi
-
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
- # bugs 612956, 648726
- addpredict /dev/dri/renderD128
- addpredict /dev/dri/renderD129
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- domenu debian/qgis.desktop
-
- local size type
- for size in 16 22 24 32 48 64 96 128 256; do
- newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
- newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
- for type in qgs qml qlr qpt; do
- newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
- done
- done
- newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- if use python; then
- python_optimize "${ED%/}"/usr/share/qgis/python
- fi
-
- if use grass; then
- python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
- if has_version "<sci-geosciences/qgis-3"; then
- elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
- fi
-
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
diff --git a/sci-geosciences/qgis/qgis-3.2.2.ebuild b/sci-geosciences/qgis/qgis-3.2.2.ebuild
deleted file mode 100644
index 23afe352fad..00000000000
--- a/sci-geosciences/qgis/qgis-3.2.2.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
-
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
- examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
- KEYWORDS="~amd64 ~x86"
-else
- GIT_ECLASS="git-r3"
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-fi
-inherit cmake-utils desktop ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
-unset GIT_ECLASS
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass mapserver oracle polar postgres python +webkit"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-COMMON_DEPEND="
- app-crypt/qca:2[qt5(+),ssl]
- >=dev-db/spatialite-4.2.0
- dev-db/sqlite:3
- dev-libs/expat
- dev-libs/libzip:=
- dev-libs/qtkeychain[qt5(+)]
- >=dev-qt/designer-${QT_MIN_VER}:5
- >=dev-qt/qtconcurrent-${QT_MIN_VER}:5
- >=dev-qt/qtcore-${QT_MIN_VER}:5
- >=dev-qt/qtgui-${QT_MIN_VER}:5
- >=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
- >=dev-qt/qtpositioning-${QT_MIN_VER}:5
- >=dev-qt/qtprintsupport-${QT_MIN_VER}:5
- >=dev-qt/qtsvg-${QT_MIN_VER}:5
- >=dev-qt/qtsql-${QT_MIN_VER}:5
- >=dev-qt/qtwidgets-${QT_MIN_VER}:5
- >=dev-qt/qtxml-${QT_MIN_VER}:5
- >=sci-libs/gdal-2.2.3:=[geos]
- sci-libs/geos
- sci-libs/libspatialindex:=
- sci-libs/proj
- >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
- >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
- 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( =sci-geosciences/grass-7*:= )
- mapserver? ( dev-libs/fcgi )
- oracle? (
- dev-db/oracle-instantclient:=
- sci-libs/gdal:=[oracle]
- )
- polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
- postgres? ( dev-db/postgresql:= )
- python? (
- ${PYTHON_DEPS}
- dev-python/future[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- dev-python/owslib[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/sip:=[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- )
- webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-qt/linguist-tools-${QT_MIN_VER}:5
- >=dev-qt/qttest-${QT_MIN_VER}:5
- >=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
- sys-devel/bison
- sys-devel/flex
- python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
- sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
- # git master
- "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
- "${FILESDIR}/${PN}-3.2.1-qtwebkit-optional.patch" # bug 663394
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
- -i CMakeLists.txt || die "Failed to fix lrelease path"
-
- sed -e "/QT_LRELEASE_EXECUTABLE/d" \
- -e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
- -e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
- -i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
-
- cd src/plugins || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQGIS_MANUAL_SUBDIR=/share/man/
- -DBUILD_SHARED_LIBS=ON
- -DQGIS_LIB_SUBDIR=$(get_libdir)
- -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
- -DQWT_INCLUDE_DIR=/usr/include/qwt6
- -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
- -DPEDANTIC=OFF
- -DWITH_APIDOC=OFF
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=OFF
- -DWITH_3D=$(usex 3d)
- -DWITH_GEOREFERENCER=$(usex georeferencer)
- -DWITH_GRASS7=$(usex grass)
- -DWITH_SERVER=$(usex mapserver)
- -DWITH_ORACLE=$(usex oracle)
- -DWITH_QWTPOLAR=$(usex polar)
- -DWITH_POSTGRESQL=$(usex postgres)
- -DWITH_BINDINGS=$(usex python)
- -DWITH_CUSTOM_WIDGETS=$(usex python)
- -DWITH_QTWEBKIT=$(usex webkit)
- )
-
- if use grass; then
- mycmakeargs+=(
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
- )
- fi
-
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
- # bugs 612956, 648726
- addpredict /dev/dri/renderD128
- addpredict /dev/dri/renderD129
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- domenu debian/qgis.desktop
-
- local size type
- for size in 16 22 24 32 48 64 96 128 256; do
- newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
- newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
- for type in qgs qml qlr qpt; do
- newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
- done
- done
- newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- if use python; then
- python_optimize "${ED%/}"/usr/share/qgis/python
- fi
-
- if use grass; then
- python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
- if has_version "<sci-geosciences/qgis-3"; then
- elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
- fi
-
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/
@ 2019-02-11 16:24 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2019-02-11 16:24 UTC (permalink / raw
To: gentoo-commits
commit: 6ab5a6ee741430214fd1f4137c90fbd6b915e522
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 11 16:23:47 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 11 16:24:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ab5a6ee
sci-geosciences/qgis: Drop failing patch
Not the most important thing to keep.
Closes: https://bugs.gentoo.org/677732
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../qgis/files/qgis-3.0.0-featuresummary.patch | 26 ----------------------
sci-geosciences/qgis/qgis-9999.ebuild | 4 +---
2 files changed, 1 insertion(+), 29 deletions(-)
diff --git a/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch b/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch
deleted file mode 100644
index 8b841a39b50..00000000000
--- a/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 70505aa1569c541dd252115848f46f91811955c0 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 9 Apr 2017 20:21:28 +0200
-Subject: [PATCH 1/2] Use FeatureSummary
-
----
- CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/CMakeLists.txt 2018-10-27 17:19:26.188192919 +0200
-+++ b/CMakeLists.txt 2018-10-27 17:19:13.915507445 +0200
-@@ -68,6 +68,8 @@
- endif(USE_CCACHE)
- endif(NOT MSVC)
-
-+include(FeatureSummary)
-+
- # in generated makefiles use relative paths so the project dir is moveable
- # Note commented out since it cause problems but it would be nice to resolve these and enable
- #
-@@ -935,3 +937,5 @@
- IF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
- ADD_SUBDIRECTORY(linux)
- ENDIF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-+
-+FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index afbd37bc704..9e1e9a34acb 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -101,8 +101,6 @@ RESTRICT="test"
PATCHES=(
# git master
"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
- # TODO upstream
- "${FILESDIR}/${PN}-3.0.0-featuresummary.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/
@ 2019-04-28 15:27 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2019-04-28 15:27 UTC (permalink / raw
To: gentoo-commits
commit: 5906613bbbf6fe18757fdd1045aef9e3774a628a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 10:55:34 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 15:26:45 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5906613b
sci-geosciences/qgis: Fix QML plugins install path
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../qgis/files/qgis-3.4.7-default-qmldir.patch | 25 ++++++++++++++++++++++
sci-geosciences/qgis/qgis-9999.ebuild | 3 ++-
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/sci-geosciences/qgis/files/qgis-3.4.7-default-qmldir.patch b/sci-geosciences/qgis/files/qgis-3.4.7-default-qmldir.patch
new file mode 100644
index 00000000000..97f8ac12858
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.4.7-default-qmldir.patch
@@ -0,0 +1,25 @@
+From 9d095f7d502cbcea8c70c127be322568b71f6663 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 28 Apr 2019 12:41:51 +0200
+Subject: [PATCH] cmake: Fix DEFAULT_QML_DIR path to comply with LFS layout
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4626042ca4..fe93ff3c4f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -660,7 +660,7 @@ IF (WITH_CORE)
+ SET (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis)
+ SET (DEFAULT_PLUGIN_SUBDIR lib${LIB_SUFFIX}/qgis/plugins)
+ SET (DEFAULT_INCLUDE_SUBDIR include/qgis)
+- SET (DEFAULT_QML_SUBDIR qml)
++ SET (DEFAULT_QML_SUBDIR ${DEFAULT_DATA_SUBDIR}/qml)
+
+ SET (DEFAULT_SERVER_MODULE_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR}/server)
+ ENDIF (APPLE)
+--
+2.21.0
+
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 6aa2463ff1c..a541d6c46fd 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -108,6 +108,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
# TODO upstream
"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
+ "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
)
pkg_setup() {
@@ -120,7 +121,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- -DQGIS_MANUAL_SUBDIR=/share/man/
+ -DQGIS_MANUAL_SUBDIR=share/man/
-DQGIS_LIB_SUBDIR=$(get_libdir)
-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
-DQWT_INCLUDE_DIR=/usr/include/qwt6
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/
@ 2019-10-20 14:21 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2019-10-20 14:21 UTC (permalink / raw
To: gentoo-commits
commit: 05d9e933f30bf2b67ef447dd3703f177c13c04a1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 20 08:45:46 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 14:19:34 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05d9e933
sci-geosciences/qgis: 3.4.12 version bump
Fixes build with Qt 5.13
Fixes pyyaml usage (fixed upstream)
Thanks-to: Marco Genasci <fedeliallalinea <AT> gmail.com>
Closes: https://bugs.gentoo.org/687292
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/qgis/Manifest | 1 +
.../qgis/files/qgis-3.4.12-qt-5.13.patch | 22 ++++++++++++++++++++++
.../qgis/{qgis-9999.ebuild => qgis-3.4.12.ebuild} | 7 ++++---
sci-geosciences/qgis/qgis-9999.ebuild | 3 ---
4 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 7619af99327..3c21f68de4e 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
DIST qgis-3.2.3.tar.bz2 71991789 BLAKE2B 656c0304cfc32d619a72f08185f76cf02aed7336fac8a4bf928c7f8b0e00df2e995e891a7ba757d8ce6acb5892c5c7425765608ee0441fa7eae8070a828734d4 SHA512 3366fce6232dd1b7657c0693debf742309d5594c7875017f464efd33e63bd4116eb062a0ebeb5b3108572a9658c3fb7d729e5a5db8fefb3ceae490ef1ec6bd22
+DIST qgis-3.4.12.tar.bz2 74738234 BLAKE2B 7b78dfc447cafb979dd86de2fd6d6a6248ecc5de8d82285ac22d44343bc2887f97574374ff3018da4fd74ed66b7ae55e20916b9fbb3c9d8745c22f0937d6d8b6 SHA512 c932357374b2b6c71188cc53ab8606bc056fac32147d8a267024bbe6787da524ce7b18ac6a166e3d5db1d5ca9f161ff3528e3eaa951cad1f764d98fde65f02a4
DIST qgis-3.4.7.tar.bz2 74373862 BLAKE2B 9b3a9987df406c703b0cdac36bc5267cca23b77e1c9f142e74b5170018c7c1ccdca738908412803a6703b0d2e64ef7733f2f4e986188cf90ce79a65e72113a55 SHA512 3977a49378ecaa27556ce76c6755281e477cea4a29a6a2ab496ef8e7b9b488cb31f9a124eece6f8a4974c98f0ae5396061e8c14fd577655bb4d428b818d1e1db
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
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
new file mode 100644
index 00000000000..9edb4427609
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch
@@ -0,0 +1,22 @@
+From ef8f06330f57882f740cfe7f8f3659b54b1bb1fb Mon Sep 17 00:00:00 2001
+From: Matthias Kuhn <matthias@opengis.ch>
+Date: Sat, 22 Jun 2019 10:11:31 +0200
+Subject: [PATCH] Add missing include
+
+Fix https://github.com/qgis/QGIS/issues/30316
+---
+ src/analysis/interpolation/qgsinterpolator.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/analysis/interpolation/qgsinterpolator.h b/src/analysis/interpolation/qgsinterpolator.h
+index 35343ccdf7f..5d694418299 100644
+--- a/src/analysis/interpolation/qgsinterpolator.h
++++ b/src/analysis/interpolation/qgsinterpolator.h
+@@ -19,6 +19,7 @@
+ #define QGSINTERPOLATOR_H
+
+ #include <QVector>
++#include <QList>
+ #include "qgis_sip.h"
+ #include "qgis_analysis.h"
+
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.4.12.ebuild
similarity index 97%
copy from sci-geosciences/qgis/qgis-9999.ebuild
copy to sci-geosciences/qgis/qgis-3.4.12.ebuild
index a541d6c46fd..dc087c07090 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-3.4.12.ebuild
@@ -106,6 +106,7 @@ RESTRICT="test"
PATCHES=(
# git master
"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+ "${FILESDIR}/${P}-qt-5.13.patch"
# TODO upstream
"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
@@ -117,6 +118,9 @@ pkg_setup() {
src_prepare() {
cmake-utils_src_prepare
+
+ sed -e "/FIND_PACKAGE(QtQmlTools/s/ REQUIRED//" \
+ -i CMakeLists.txt || die # TODO fixed in master
}
src_configure() {
@@ -207,9 +211,6 @@ pkg_postinst() {
elog "If you do not need these plugins just disable them"
elog "in the Plugins menu, else you need to set USE=\"postgres\""
fi
- if has_version "<sci-geosciences/qgis-3"; then
- elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
- fi
xdg_pkg_postinst
}
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index a541d6c46fd..682733a10dd 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -207,9 +207,6 @@ pkg_postinst() {
elog "If you do not need these plugins just disable them"
elog "in the Plugins menu, else you need to set USE=\"postgres\""
fi
- if has_version "<sci-geosciences/qgis-3"; then
- elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
- fi
xdg_pkg_postinst
}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/
@ 2019-12-02 15:02 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2019-12-02 15:02 UTC (permalink / raw
To: gentoo-commits
commit: dd4be423102fa51a4195233e716b15d341892531
Author: Marco Genasci <fedeliallalinea <AT> gmail <DOT> com>
AuthorDate: Mon Oct 28 08:42:26 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 2 15:02:28 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd4be423
sci-geosciences/qgis: bump to version 3.10.0
https://github.com/gentoo/gentoo/pull/12512
Bug: https://bugs.gentoo.org/672952
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Marco Genasci <fedeliallalinea <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/qgis/Manifest | 1 +
.../qgis/files/qgis-3.10.0-cmake-lib-suffix.patch | 12 ++
sci-geosciences/qgis/qgis-3.10.0.ebuild | 204 +++++++++++++++++++++
3 files changed, 217 insertions(+)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 415ec9dd917..5b7a90c2d8c 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,3 @@
+DIST qgis-3.10.0.tar.bz2 101075584 BLAKE2B ec2bb34a0e49c6291f02b3bd92e44999042c7f7ea77047f9ad61066503ffbe9678be91964b7300b4f0d22fe7bc51d7df53fb370a402157c3ce93949ace70c3af SHA512 0666e93998b7022b83f0321ba8848d8d0a182e3ced55a91f8d5119d4bfa971949a07b82668f7e6a4801bb9ca5a6e0c551ff4c346920feaed2ece24e61c4f2b4c
DIST qgis-3.4.12.tar.bz2 74738234 BLAKE2B 7b78dfc447cafb979dd86de2fd6d6a6248ecc5de8d82285ac22d44343bc2887f97574374ff3018da4fd74ed66b7ae55e20916b9fbb3c9d8745c22f0937d6d8b6 SHA512 c932357374b2b6c71188cc53ab8606bc056fac32147d8a267024bbe6787da524ce7b18ac6a166e3d5db1d5ca9f161ff3528e3eaa951cad1f764d98fde65f02a4
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch b/sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch
new file mode 100644
index 00000000000..472b8aa466c
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch
@@ -0,0 +1,12 @@
+diff -Naru a/cmake/PyQtMacros.cmake b/cmake/PyQtMacros.cmake
+--- a/cmake/PyQtMacros.cmake 2019-10-28 08:23:18.776024266 +0100
++++ b/cmake/PyQtMacros.cmake 2019-10-28 08:24:17.316024213 +0100
+@@ -36,7 +36,7 @@
+ ELSE(CMAKE_HOST_WIN32)
+ # TODO osx
+ SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh")
+- SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
++ SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
+ ENDIF(CMAKE_HOST_WIN32)
+
+ FOREACH(it ${ARGN})
diff --git a/sci-geosciences/qgis/qgis-3.10.0.ebuild b/sci-geosciences/qgis/qgis-3.10.0.ebuild
new file mode 100644
index 00000000000..f2da3eb9a47
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.10.0.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="sqlite"
+QT_MIN_VER="5.9.4"
+
+if [[ ${PV} = *9999 ]]; then
+ EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+ inherit git-r3
+else
+ SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
+ examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
+ KEYWORDS="~amd64 ~x86"
+fi
+inherit cmake-utils desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+BDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-qt/linguist-tools-${QT_MIN_VER}:5
+ sys-devel/bison
+ sys-devel/flex
+"
+COMMON_DEPEND="
+ app-crypt/qca:2[qt5(+),ssl]
+ >=dev-db/spatialite-4.2.0
+ dev-db/sqlite:3
+ dev-libs/expat
+ dev-libs/libzip:=
+ dev-libs/qtkeychain[qt5(+)]
+ >=dev-qt/designer-${QT_MIN_VER}:5
+ >=dev-qt/qtconcurrent-${QT_MIN_VER}:5
+ >=dev-qt/qtcore-${QT_MIN_VER}:5
+ >=dev-qt/qtgui-${QT_MIN_VER}:5
+ >=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
+ >=dev-qt/qtpositioning-${QT_MIN_VER}:5
+ >=dev-qt/qtprintsupport-${QT_MIN_VER}:5
+ >=dev-qt/qtserialport-${QT_MIN_VER}:5
+ >=dev-qt/qtsvg-${QT_MIN_VER}:5
+ >=dev-qt/qtsql-${QT_MIN_VER}:5
+ >=dev-qt/qtwidgets-${QT_MIN_VER}:5
+ >=dev-qt/qtxml-${QT_MIN_VER}:5
+ media-gfx/exiv2:=
+ >=sci-libs/gdal-2.2.3:=[geos]
+ sci-libs/geos
+ sci-libs/libspatialindex:=
+ sci-libs/proj:=
+ >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+ >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+ 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+ georeferencer? ( sci-libs/gsl:= )
+ grass? ( =sci-geosciences/grass-7*:= )
+ hdf5? ( sci-libs/hdf5:= )
+ mapserver? ( dev-libs/fcgi )
+ netcdf? ( sci-libs/netcdf:= )
+ opencl? ( virtual/opencl )
+ oracle? (
+ dev-db/oracle-instantclient:=
+ sci-libs/gdal:=[oracle]
+ )
+ polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+ postgres? ( dev-db/postgresql:= )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/future[${PYTHON_USEDEP}]
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/markupsafe[${PYTHON_USEDEP}]
+ dev-python/owslib[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/sip:=[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
+ postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+ )
+ qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
+ webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-qt/qttest-${QT_MIN_VER}:5
+ python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+ sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+ # git master
+ "${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
+ # TODO upstream
+ "${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
+ "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DQGIS_MANUAL_SUBDIR=share/man/
+ -DQGIS_LIB_SUBDIR=$(get_libdir)
+ -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
+ -DQWT_INCLUDE_DIR=/usr/include/qwt6
+ -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
+ -DPEDANTIC=OFF
+ -DUSE_CCACHE=OFF
+ -DWITH_ANALYSIS=ON
+ -DWITH_APIDOC=OFF
+ -DWITH_GUI=ON
+ -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+ -DWITH_QSPATIALITE=ON
+ -DENABLE_TESTS=OFF
+ -DWITH_3D=$(usex 3d)
+ -DWITH_GEOREFERENCER=$(usex georeferencer)
+ -DWITH_GRASS7=$(usex grass)
+ $(cmake-utils_use_find_package hdf5 HDF5)
+ -DWITH_SERVER=$(usex mapserver)
+ $(cmake-utils_use_find_package netcdf NetCDF)
+ -DUSE_OPENCL=$(usex opencl)
+ -DWITH_ORACLE=$(usex oracle)
+ -DWITH_QWTPOLAR=$(usex polar)
+ -DWITH_POSTGRESQL=$(usex postgres)
+ -DWITH_BINDINGS=$(usex python)
+ -DWITH_CUSTOM_WIDGETS=$(usex python)
+ -DWITH_QUICK=$(usex qml)
+ -DWITH_QTWEBKIT=$(usex webkit)
+ )
+
+ if use grass; then
+ mycmakeargs+=(
+ -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+ )
+ fi
+
+ use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+
+ # bugs 612956, 648726
+ addpredict /dev/dri/renderD128
+ addpredict /dev/dri/renderD129
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ insinto /usr/share/mime/packages
+ doins debian/qgis.xml
+
+ if use examples; then
+ docinto examples
+ dodoc -r "${WORKDIR}"/qgis_sample_data/.
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ if use python; then
+ python_optimize
+ python_optimize "${ED}"/usr/share/qgis/python
+ fi
+
+ if use grass; then
+ python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
+ fi
+}
+
+pkg_postinst() {
+ if use postgres; then
+ elog "If you don't intend to use an external PostGIS server"
+ elog "you should install:"
+ elog " dev-db/postgis"
+ elif use python; then
+ elog "Support of PostgreSQL is disabled."
+ elog "But some installed python-plugins import the psycopg2 module."
+ elog "If you do not need these plugins just disable them"
+ elog "in the Plugins menu, else you need to set USE=\"postgres\""
+ fi
+
+ xdg_pkg_postinst
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/
@ 2020-11-18 21:09 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2020-11-18 21:09 UTC (permalink / raw
To: gentoo-commits
commit: 43aad7b6d7418a770b60076dfcb0a4ce2b15eb7a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 18:40:51 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 21:08:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43aad7b6
sci-geosciences/qgis: Drop 3.10.9
Closes: https://bugs.gentoo.org/753236
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/qgis/Manifest | 1 -
.../qgis/files/qgis-3.10.0-cmake-lib-suffix.patch | 12 --
sci-geosciences/qgis/qgis-3.10.9.ebuild | 203 ---------------------
3 files changed, 216 deletions(-)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 212b0bba175..93502ed3377 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,2 @@
-DIST qgis-3.10.9.tar.bz2 102418680 BLAKE2B 53599dab784fc42b7a4505e13b1fd97cdb7c696bf1a004425ea0e7b88659b9af40f74b7107ef6103a138f4bc8886eda0a99a07a1c1466fb73c94d55ea39d8ea8 SHA512 91bba01db04094a194d1437a00276f076cd88d9ebcfe4792f20da8fb4339c984262e2bf79f666cf23af13081da358bbfb69bdff086e4988701c4431f53732275
DIST qgis-3.16.0.tar.bz2 113238659 BLAKE2B 42bdf8d0d69b28c20aa0decd79883c3b83d2ff9aa9d7633866b6c7d624ad20cb602beeca0e22585077c3d0ceba791e51b81ba221bc305c9bd2ebff71a4ea4bd4 SHA512 c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch b/sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch
deleted file mode 100644
index 472b8aa466c..00000000000
--- a/sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naru a/cmake/PyQtMacros.cmake b/cmake/PyQtMacros.cmake
---- a/cmake/PyQtMacros.cmake 2019-10-28 08:23:18.776024266 +0100
-+++ b/cmake/PyQtMacros.cmake 2019-10-28 08:24:17.316024213 +0100
-@@ -36,7 +36,7 @@
- ELSE(CMAKE_HOST_WIN32)
- # TODO osx
- SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh")
-- SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
-+ SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
- ENDIF(CMAKE_HOST_WIN32)
-
- FOREACH(it ${ARGN})
diff --git a/sci-geosciences/qgis/qgis-3.10.9.ebuild b/sci-geosciences/qgis/qgis-3.10.9.ebuild
deleted file mode 100644
index 65bdc947394..00000000000
--- a/sci-geosciences/qgis/qgis-3.10.9.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="sqlite"
-QTMIN="5.9.4"
-
-if [[ ${PV} = *9999 ]]; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
- inherit git-r3
-else
- SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
- examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
- KEYWORDS="amd64 x86"
-fi
-inherit cmake desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="${PYTHON_DEPS}
- >=dev-qt/linguist-tools-${QTMIN}:5
- sys-devel/bison
- sys-devel/flex
-"
-COMMON_DEPEND="
- app-crypt/qca:2[qt5(+),ssl]
- >=dev-db/spatialite-4.2.0
- dev-db/sqlite:3
- dev-libs/expat
- dev-libs/libzip:=
- dev-libs/qtkeychain[qt5(+)]
- >=dev-qt/designer-${QTMIN}:5
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtcore-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
- >=dev-qt/qtpositioning-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtserialport-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- media-gfx/exiv2:=
- >=sci-libs/gdal-3.0.4:=[geos]
- sci-libs/geos
- sci-libs/libspatialindex:=
- >=sci-libs/proj-6.3.1:=
- >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
- >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
- 3d? ( >=dev-qt/qt3d-${QTMIN}:5 )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( =sci-geosciences/grass-7*:= )
- hdf5? ( sci-libs/hdf5:= )
- mapserver? ( dev-libs/fcgi )
- netcdf? ( sci-libs/netcdf:= )
- opencl? ( virtual/opencl )
- oracle? (
- dev-db/oracle-instantclient:=
- sci-libs/gdal:=[oracle]
- )
- polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
- postgres? ( dev-db/postgresql:= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
- dev-python/jinja[${PYTHON_MULTI_USEDEP}]
- dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
- dev-python/owslib[${PYTHON_MULTI_USEDEP}]
- dev-python/pygments[${PYTHON_MULTI_USEDEP}]
- dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
- dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
- dev-python/pytz[${PYTHON_MULTI_USEDEP}]
- dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
- dev-python/requests[${PYTHON_MULTI_USEDEP}]
- dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
- dev-python/six[${PYTHON_MULTI_USEDEP}]
- >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
- ')
- )
- qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
- webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-qt/qttest-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
- sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
- # git master
- "${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
- # TODO upstream
- "${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
- "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQGIS_MANUAL_SUBDIR=share/man/
- -DQGIS_LIB_SUBDIR=$(get_libdir)
- -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
- -DQWT_INCLUDE_DIR=/usr/include/qwt6
- -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
- -DPEDANTIC=OFF
- -DUSE_CCACHE=OFF
- -DWITH_ANALYSIS=ON
- -DWITH_APIDOC=OFF
- -DWITH_GUI=ON
- -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=OFF
- -DWITH_3D=$(usex 3d)
- -DWITH_GEOREFERENCER=$(usex georeferencer)
- -DWITH_GRASS7=$(usex grass)
- $(cmake_use_find_package hdf5 HDF5)
- -DWITH_SERVER=$(usex mapserver)
- $(cmake_use_find_package netcdf NetCDF)
- -DUSE_OPENCL=$(usex opencl)
- -DWITH_ORACLE=$(usex oracle)
- -DWITH_QWTPOLAR=$(usex polar)
- -DWITH_POSTGRESQL=$(usex postgres)
- -DWITH_BINDINGS=$(usex python)
- -DWITH_CUSTOM_WIDGETS=$(usex python)
- -DWITH_QUICK=$(usex qml)
- -DWITH_QTWEBKIT=$(usex webkit)
- )
-
- if use grass; then
- mycmakeargs+=(
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
- )
- fi
-
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
- # bugs 612956, 648726
- addpredict /dev/dri/renderD128
- addpredict /dev/dri/renderD129
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- if use python; then
- python_optimize
- python_optimize "${ED}"/usr/share/qgis/python
- fi
-
- if use grass; then
- python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
-
- xdg_pkg_postinst
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/
@ 2020-11-18 21:09 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2020-11-18 21:09 UTC (permalink / raw
To: gentoo-commits
commit: 858f683062931d5e10da5e4ba517b4f420439377
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 18:58:27 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 21:08:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=858f6830
sci-geosciences/qgis: Fix 9999 patches
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../qgis/files/qgis-9999-default-qmldir.patch | 25 +++++++++++++++++
.../qgis/files/qgis-9999-featuresummary.patch | 31 ++++++++++++++++++++++
sci-geosciences/qgis/qgis-9999.ebuild | 6 ++---
3 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/sci-geosciences/qgis/files/qgis-9999-default-qmldir.patch b/sci-geosciences/qgis/files/qgis-9999-default-qmldir.patch
new file mode 100644
index 00000000000..afcaa693ced
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-9999-default-qmldir.patch
@@ -0,0 +1,25 @@
+From 9d095f7d502cbcea8c70c127be322568b71f6663 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 28 Apr 2019 12:41:51 +0200
+Subject: [PATCH] cmake: Fix DEFAULT_QML_DIR path to comply with LFS layout
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4626042ca4..fe93ff3c4f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -660,7 +660,7 @@ IF (WITH_CORE)
+ set (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis)
+ set (DEFAULT_PLUGIN_SUBDIR lib${LIB_SUFFIX}/qgis/plugins)
+ set (DEFAULT_INCLUDE_SUBDIR include/qgis)
+- set (DEFAULT_QML_SUBDIR qml)
++ set (DEFAULT_QML_SUBDIR ${DEFAULT_DATA_SUBDIR}/qml)
+
+ set (DEFAULT_SERVER_MODULE_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR}/server)
+ endif()
+--
+2.21.0
+
diff --git a/sci-geosciences/qgis/files/qgis-9999-featuresummary.patch b/sci-geosciences/qgis/files/qgis-9999-featuresummary.patch
new file mode 100644
index 00000000000..8fa7ab0e842
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-9999-featuresummary.patch
@@ -0,0 +1,31 @@
+From 0744b51784b779eab4bb2e78ed084d31258b5b4d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 28 Apr 2019 00:10:21 +0200
+Subject: [PATCH] cmake: Use FeatureSummary
+
+---
+ CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4dff8ea0f4..4626042ca4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -71,6 +71,8 @@ IF(NOT MSVC)
+ endif(USE_CCACHE)
+ endif()
+
++include(FeatureSummary)
++
+ # in generated makefiles use relative paths so the project dir is moveable
+ # Note commented out since it cause problems but it would be nice to resolve these and enable
+ #
+@@ -937,3 +939,5 @@ ENDIF (WITH_CORE)
+ if (UNIX AND NOT APPLE)
+ add_subdirectory(linux)
+ endif()
++
++FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+--
+2.21.0
+
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index f6b820db0fd..3f589eac32d 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -105,10 +105,10 @@ RESTRICT="test"
PATCHES=(
# git master
- "${FILESDIR}/${P}-cmake-lib-suffix.patch"
+ "${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
# TODO upstream
- "${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
- "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
+ "${FILESDIR}/${PN}-9999-featuresummary.patch"
+ "${FILESDIR}/${PN}-9999-default-qmldir.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/
@ 2021-01-23 0:25 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2021-01-23 0:25 UTC (permalink / raw
To: gentoo-commits
commit: d41469167b90b0a16722c68b95d149b24cd6540b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 18:49:48 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 00:25:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4146916
sci-geosciences/qgis: Drop 3.16.0-r1
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/qgis/Manifest | 1 -
.../qgis/files/qgis-3.4.7-default-qmldir.patch | 25 ---
.../qgis/files/qgis-3.4.7-featuresummary.patch | 31 ----
sci-geosciences/qgis/qgis-3.16.0-r1.ebuild | 206 ---------------------
4 files changed, 263 deletions(-)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 89be781dcfc..f6515188344 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
-DIST qgis-3.16.0.tar.bz2 113238659 BLAKE2B 42bdf8d0d69b28c20aa0decd79883c3b83d2ff9aa9d7633866b6c7d624ad20cb602beeca0e22585077c3d0ceba791e51b81ba221bc305c9bd2ebff71a4ea4bd4 SHA512 c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10
DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6 SHA512 93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
DIST qgis-3.16.3.tar.bz2 114542609 BLAKE2B e194881fbc25420c85dbe061388371da195e9696e86f441eb85a420d10a8e14ee01a7a4e4a353cdde2105ab54503b57f6f022a1800ae0dc3dc6fe87edccdeee2 SHA512 f45492ee0b1c1d45c9eca390c65ca8a6e7a35aa392beb3b55d7b7813eb7d437621441df251722fc9d0218e8d339f12cff7c1d2db366e1835c0b79236c89de365
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/files/qgis-3.4.7-default-qmldir.patch b/sci-geosciences/qgis/files/qgis-3.4.7-default-qmldir.patch
deleted file mode 100644
index 97f8ac12858..00000000000
--- a/sci-geosciences/qgis/files/qgis-3.4.7-default-qmldir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9d095f7d502cbcea8c70c127be322568b71f6663 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 28 Apr 2019 12:41:51 +0200
-Subject: [PATCH] cmake: Fix DEFAULT_QML_DIR path to comply with LFS layout
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4626042ca4..fe93ff3c4f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -660,7 +660,7 @@ IF (WITH_CORE)
- SET (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis)
- SET (DEFAULT_PLUGIN_SUBDIR lib${LIB_SUFFIX}/qgis/plugins)
- SET (DEFAULT_INCLUDE_SUBDIR include/qgis)
-- SET (DEFAULT_QML_SUBDIR qml)
-+ SET (DEFAULT_QML_SUBDIR ${DEFAULT_DATA_SUBDIR}/qml)
-
- SET (DEFAULT_SERVER_MODULE_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR}/server)
- ENDIF (APPLE)
---
-2.21.0
-
diff --git a/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch b/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch
deleted file mode 100644
index ec971cef779..00000000000
--- a/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0744b51784b779eab4bb2e78ed084d31258b5b4d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 28 Apr 2019 00:10:21 +0200
-Subject: [PATCH] cmake: Use FeatureSummary
-
----
- CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4dff8ea0f4..4626042ca4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -71,6 +71,8 @@ IF(NOT MSVC)
- endif(USE_CCACHE)
- endif(NOT MSVC)
-
-+include(FeatureSummary)
-+
- # in generated makefiles use relative paths so the project dir is moveable
- # Note commented out since it cause problems but it would be nice to resolve these and enable
- #
-@@ -937,3 +939,5 @@ ENDIF (WITH_CORE)
- IF (UNIX AND NOT APPLE)
- ADD_SUBDIRECTORY(linux)
- ENDIF (UNIX AND NOT APPLE)
-+
-+FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
---
-2.21.0
-
diff --git a/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
deleted file mode 100644
index d952288f81f..00000000000
--- a/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} = *9999 ]]; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
- inherit git-r3
-else
- SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
- examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
- KEYWORDS="amd64 x86"
-fi
-inherit cmake desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/en/site/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="${PYTHON_DEPS}
- dev-qt/linguist-tools:5
- sys-devel/bison
- sys-devel/flex
-"
-COMMON_DEPEND="
- >=app-crypt/qca-2.3.0:2[ssl]
- >=dev-db/spatialite-4.2.0
- dev-db/sqlite:3
- dev-libs/expat
- dev-libs/libzip:=
- dev-libs/protobuf:=
- dev-libs/qtkeychain:=
- dev-qt/designer:5
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtpositioning:5
- dev-qt/qtprintsupport:5
- dev-qt/qtserialport:5
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-gfx/exiv2:=
- >=sci-libs/gdal-3.0.4:=[geos]
- sci-libs/geos
- sci-libs/libspatialindex:=
- >=sci-libs/proj-6.3.1:=
- sys-libs/zlib
- >=x11-libs/qscintilla-2.10.3:=
- >=x11-libs/qwt-6.1.3-r2:6=[svg]
- 3d? ( dev-qt/qt3d:5 )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( =sci-geosciences/grass-7*:= )
- hdf5? ( sci-libs/hdf5:= )
- mapserver? ( dev-libs/fcgi )
- netcdf? ( sci-libs/netcdf:= )
- opencl? ( virtual/opencl )
- oracle? (
- dev-db/oracle-instantclient:=
- sci-libs/gdal:=[oracle]
- )
- polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
- postgres? ( dev-db/postgresql:= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
- dev-python/jinja[${PYTHON_MULTI_USEDEP}]
- dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
- dev-python/owslib[${PYTHON_MULTI_USEDEP}]
- dev-python/pygments[${PYTHON_MULTI_USEDEP}]
- dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
- dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
- dev-python/pytz[${PYTHON_MULTI_USEDEP}]
- dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
- >=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
- dev-python/requests[${PYTHON_MULTI_USEDEP}]
- dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
- dev-python/six[${PYTHON_MULTI_USEDEP}]
- >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
- ')
- )
- qml? ( dev-qt/qtdeclarative:5 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/qttest:5
-"
-RDEPEND="${COMMON_DEPEND}
- sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
- # git master
- "${FILESDIR}/${P}-cmake-lib-suffix.patch"
- # TODO upstream
- "${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
- "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
- sed -e "/QtWebKit.*.py/d" \
- -i python/PyQt/CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQGIS_MANUAL_SUBDIR=share/man/
- -DQGIS_LIB_SUBDIR=$(get_libdir)
- -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
- -DQWT_INCLUDE_DIR=/usr/include/qwt6
- -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
- -DPEDANTIC=OFF
- -DUSE_CCACHE=OFF
- -DWITH_ANALYSIS=ON
- -DWITH_APIDOC=OFF
- -DWITH_GUI=ON
- -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=OFF
- -DWITH_3D=$(usex 3d)
- -DWITH_GEOREFERENCER=$(usex georeferencer)
- -DWITH_GRASS7=$(usex grass)
- $(cmake_use_find_package hdf5 HDF5)
- -DWITH_SERVER=$(usex mapserver)
- $(cmake_use_find_package netcdf NetCDF)
- -DUSE_OPENCL=$(usex opencl)
- -DWITH_ORACLE=$(usex oracle)
- -DWITH_QWTPOLAR=$(usex polar)
- -DWITH_POSTGRESQL=$(usex postgres)
- -DWITH_BINDINGS=$(usex python)
- -DWITH_CUSTOM_WIDGETS=$(usex python)
- -DWITH_QUICK=$(usex qml)
- -DWITH_QTWEBKIT=OFF
- )
-
- if use grass; then
- mycmakeargs+=(
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
- )
- fi
-
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
- mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
-
- # bugs 612956, 648726
- addpredict /dev/dri/renderD128
- addpredict /dev/dri/renderD129
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- if use python; then
- python_optimize
- python_optimize "${ED}"/usr/share/qgis/python
- fi
-
- if use grass; then
- python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
-
- xdg_pkg_postinst
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/
@ 2021-12-08 15:08 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2021-12-08 15:08 UTC (permalink / raw
To: gentoo-commits
commit: 1507e46e6af69496a92caf3c6690035d1d90e13c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 8 13:18:20 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 8 15:07:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1507e46e
sci-geosciences/qgis: Drop 3.18.3
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/qgis/Manifest | 1 -
.../qgis/files/qgis-3.16.0-cmake-lib-suffix.patch | 12 --
.../qgis/files/qgis-3.16.1-default-qmldir.patch | 26 ---
.../qgis/files/qgis-3.16.1-featuresummary.patch | 32 ----
sci-geosciences/qgis/qgis-3.18.3.ebuild | 207 ---------------------
5 files changed, 278 deletions(-)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index d4a7736de149..1f703bc557ef 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
-DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6 SHA512 d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91 SHA512 abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5 SHA512 dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
DIST qgis-3.22.1.tar.bz2 136772144 BLAKE2B ba3a5d9db2a487ff10800da0ab12de4b6d3c1dab72e286d0cafef1804429f59e6c80fd05d662e8abadb7216811f3cbe36bb50d54b077a5c4db7cabcb1002a826 SHA512 b49fdab97c707a3bd29c2ad288733373d406fe024e07873e6ba28653a9a8882f58115ae346523b2f07011be312e18bf2643c8f0b7979d4ba8ed07dce4579cba9
diff --git a/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch b/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch
deleted file mode 100644
index 1edba1f0e747..000000000000
--- a/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naru a/cmake/PyQtMacros.cmake b/cmake/PyQtMacros.cmake
---- a/cmake/PyQtMacros.cmake 2019-10-28 08:23:18.776024266 +0100
-+++ b/cmake/PyQtMacros.cmake 2019-10-28 08:24:17.316024213 +0100
-@@ -36,7 +36,7 @@
- ELSE(CMAKE_HOST_WIN32)
- # TODO osx
- SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic_wrapper.sh")
-- SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
-+ SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
- ENDIF(CMAKE_HOST_WIN32)
-
- FOREACH(it ${ARGN})
diff --git a/sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch b/sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch
deleted file mode 100644
index 9a57d45984e2..000000000000
--- a/sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ad432e066fcc3d985fb5a451ad128cdf35c1dad9 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 20 Nov 2020 20:41:36 +0100
-Subject: [PATCH] cmake: Fix DEFAULT_QML_DIR path to comply with LFS layout
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 61b4c863d0..e7d0bdc8d3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -750,7 +750,7 @@ if (WITH_CORE)
- set (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis)
- set (DEFAULT_PLUGIN_SUBDIR lib${LIB_SUFFIX}/qgis/plugins)
- set (DEFAULT_INCLUDE_SUBDIR include/qgis)
-- set (DEFAULT_QML_SUBDIR qml)
-+ set (DEFAULT_QML_SUBDIR ${DEFAULT_DATA_SUBDIR}/qml)
-
- set (DEFAULT_SERVER_MODULE_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR}/server)
- endif()
---
-2.29.2
-
diff --git a/sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch b/sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch
deleted file mode 100644
index b1098175647c..000000000000
--- a/sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From f0fd6e80ad034cf7c49f4ba3708819424b6857b2 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 20 Nov 2020 20:41:06 +0100
-Subject: [PATCH] cmake: Use FeatureSummary
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f581b2c889..61b4c863d0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -111,6 +111,8 @@ if (FORCE_STATIC_PROVIDERS)
- set (HAVE_STATIC_PROVIDERS TRUE)
- endif()
-
-+include(FeatureSummary)
-+
- # in generated makefiles use relative paths so the project dir is moveable
- # Note commented out since it cause problems but it would be nice to resolve these and enable
- #
-@@ -1035,3 +1037,5 @@ endif()
- if (UNIX AND NOT APPLE)
- add_subdirectory(linux)
- endif()
-+
-+FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
---
-2.29.2
-
diff --git a/sci-geosciences/qgis/qgis-3.18.3.ebuild b/sci-geosciences/qgis/qgis-3.18.3.ebuild
deleted file mode 100644
index 9f48c0bfa4e3..000000000000
--- a/sci-geosciences/qgis/qgis-3.18.3.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} = *9999 ]]; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
- inherit git-r3
-else
- SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
- examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
- KEYWORDS="amd64 ~x86"
-fi
-inherit cmake desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/en/site/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="${PYTHON_DEPS}
- dev-qt/linguist-tools:5
- sys-devel/bison
- sys-devel/flex
-"
-COMMON_DEPEND="
- >=app-crypt/qca-2.3.0:2[ssl]
- >=dev-db/spatialite-4.2.0
- dev-db/sqlite:3
- dev-libs/expat
- dev-libs/libzip:=
- dev-libs/protobuf:=
- dev-libs/qtkeychain:=
- dev-qt/designer:5
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtpositioning:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-gfx/exiv2:=
- >=sci-libs/gdal-3.0.4:=[geos]
- sci-libs/geos
- sci-libs/libspatialindex:=
- >=sci-libs/proj-6.3.1:=
- sys-libs/zlib
- >=x11-libs/qscintilla-2.10.3:=
- >=x11-libs/qwt-6.1.3-r2:6=[svg]
- 3d? ( dev-qt/qt3d:5 )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( =sci-geosciences/grass-7*:= )
- hdf5? ( sci-libs/hdf5:= )
- mapserver? ( dev-libs/fcgi )
- netcdf? ( sci-libs/netcdf:= )
- opencl? ( virtual/opencl )
- oracle? (
- dev-db/oracle-instantclient:=
- sci-libs/gdal:=[oracle]
- )
- polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
- postgres? ( dev-db/postgresql:= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- dev-python/owslib[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- >=dev-python/qscintilla-python-2.10.3[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- <dev-python/sip-5:=[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- ')
- )
- qml? ( dev-qt/qtdeclarative:5 )
- serial? ( dev-qt/qtserialport:5 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/qttest:5
-"
-RDEPEND="${COMMON_DEPEND}
- sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
- # git master
- "${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
- # TODO upstream
- "${FILESDIR}/${PN}-3.16.1-featuresummary.patch"
- "${FILESDIR}/${PN}-3.16.1-default-qmldir.patch"
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
- sed -e "/QtWebKit.*.py/d" \
- -i python/PyQt/CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQGIS_MANUAL_SUBDIR=share/man/
- -DQGIS_LIB_SUBDIR=$(get_libdir)
- -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
- -DQWT_INCLUDE_DIR=/usr/include/qwt6
- -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
- -DPEDANTIC=OFF
- -DUSE_CCACHE=OFF
- -DWITH_ANALYSIS=ON
- -DWITH_APIDOC=OFF
- -DWITH_GUI=ON
- -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=OFF
- -DWITH_3D=$(usex 3d)
- -DWITH_GEOREFERENCER=$(usex georeferencer)
- -DWITH_GRASS7=$(usex grass)
- $(cmake_use_find_package hdf5 HDF5)
- -DWITH_SERVER=$(usex mapserver)
- $(cmake_use_find_package netcdf NetCDF)
- -DUSE_OPENCL=$(usex opencl)
- -DWITH_ORACLE=$(usex oracle)
- -DWITH_QWTPOLAR=$(usex polar)
- -DWITH_POSTGRESQL=$(usex postgres)
- -DWITH_BINDINGS=$(usex python)
- -DWITH_CUSTOM_WIDGETS=$(usex python)
- -DWITH_QUICK=$(usex qml)
- -DWITH_QT5SERIALPORT=$(usex serial)
- -DWITH_QTWEBKIT=OFF
- )
-
- if use grass; then
- mycmakeargs+=(
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass78
- )
- fi
-
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
- mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
-
- # bugs 612956, 648726
- addpredict /dev/dri/renderD128
- addpredict /dev/dri/renderD129
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- if use python; then
- python_optimize
- python_optimize "${ED}"/usr/share/qgis/python
- fi
-
- if use grass; then
- python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
-
- xdg_pkg_postinst
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/
@ 2022-03-20 3:23 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2022-03-20 3:23 UTC (permalink / raw
To: gentoo-commits
commit: 6dfc79c76daecabfe0c69870c86e57aa361d1743
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 02:43:08 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 03:23:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dfc79c7
sci-geosciences/qgis: add 3.22.5
Almost supports GRASS 8, but not yet, due to a bug in GRASS.
3.22.5+ *does* support GRASS 8 but we can't enable it yet because of
https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies)
Keep an eye on that bug / a fixed GRASS release and readd support
by unrestricting the dep in ${COMMON_DEPEND} once it's fixed!
(No need to change the supported GRASS versions in src_configure b/c
it won't find GRASS 8 with this dependency set.)
Bug: https://github.com/OSGeo/grass/pull/2269
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/qgis/Manifest | 1 +
.../files/qgis-3.22.5-install-grass8-scripts.patch | 17 +++++++
.../qgis/{qgis-9999.ebuild => qgis-3.22.5.ebuild} | 53 ++++++++++++++++++++--
sci-geosciences/qgis/qgis-9999.ebuild | 49 ++++++++++++++++++--
4 files changed, 114 insertions(+), 6 deletions(-)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 9e380ed22b73..11bc127abd83 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -4,4 +4,5 @@ DIST qgis-3.22.1.tar.bz2 136772144 BLAKE2B ba3a5d9db2a487ff10800da0ab12de4b6d3c1
DIST qgis-3.22.2.tar.bz2 136903329 BLAKE2B b1991944c05a9035dc91ea3fcc252a43da435199cb37c8a03647666f15dfd2367f2990bdddb2a124559993405ff61b4a110e6fa31da10d33411e24b756b9eb30 SHA512 6d893217d54483018ab5de06cc11da5da3faf24fb863da57a608429a75f3e1c4647dd809ae1bc0a7034e28296a116c8ebcb528b4886b2714e75654415b2f4c74
DIST qgis-3.22.3.tar.bz2 136876983 BLAKE2B 3b57af74829ca35802a09a8d83f4638ccd4d56674151d45e81f0d2af5544a6d59f20c3a68e5508f5bb5e32f5e98bf7f64f2c9f2d72e09a5137be63e4cbcaa1c0 SHA512 8918ee725f4f8d12c4cab009c446e137513b931583bf843356238122e22267211fffee9fd20382fbcb9b613be6d7af22bc0250d9e166ba53dd621e827aafda28
DIST qgis-3.22.4.tar.bz2 137701974 BLAKE2B f1e7c35ace59b427a29c96eb6304c2e03ef6ad5304832d679f4a51fcca2c4868bd68058aa224be82e0cdef7b4f44fa310daa51e8c207c16de90b4e6536935f54 SHA512 423ba679618876fd4e3d308ad47903b47bfe758e78c01160e9d490121a863b83f5a60f6210fbfea090fb6dac9e42749d2b92777fa2756938bb6ab41fe75377e5
+DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B d5cad96ca7fadab58e2f680493469496d8c5e06141ac646a09cc1f5fa607b860a0e15e5b6257debb9e787d294d2183bd0b007e96e839aca7e9fb87d81001edd7 SHA512 d47bcd743a0c621b3a5a90923d98844056260f396e683b0874625e341cdf84d075505e909130cfc473fc550de37bc078fc5ebb54b437e582572d930e12411dcb
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/files/qgis-3.22.5-install-grass8-scripts.patch b/sci-geosciences/qgis/files/qgis-3.22.5-install-grass8-scripts.patch
new file mode 100644
index 000000000000..5c801f23fe8c
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.22.5-install-grass8-scripts.patch
@@ -0,0 +1,17 @@
+https://github.com/qgis/QGIS/pull/47881
+https://github.com/qgis/QGIS/pull/47456
+https://github.com/qgis/QGIS/pull/47456/commits/84e574dcc043e03bb1682d1dfc5bd3b9fbf87b3d
+
+From 84e574dcc043e03bb1682d1dfc5bd3b9fbf87b3d Mon Sep 17 00:00:00 2001
+From: Bas Couwenberg <sebastic@xs4all.nl>
+Date: Fri, 18 Mar 2022 18:04:01 +0100
+Subject: [PATCH] Also install scripts for GRASS 8.
+
+--- a/src/plugins/grass/scripts/CMakeLists.txt
++++ b/src/plugins/grass/scripts/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-if (GRASS_NUM_VERSION6 GREATER 60300 OR GRASS_NUM_VERSION7 GREATER 60300)
++if (GRASS_NUM_VERSION6 GREATER 60300 OR GRASS_NUM_VERSION7 GREATER 60300 OR GRASS_NUM_VERSION8 GREATER 60300)
+ file (GLOB MODULE_FILES *.py )
+ install (FILES ${MODULE_FILES}
+ DESTINATION ${QGIS_DATA_DIR}/grass/scripts
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.22.5.ebuild
similarity index 73%
copy from sci-geosciences/qgis/qgis-9999.ebuild
copy to sci-geosciences/qgis/qgis-3.22.5.ebuild
index 12e8cd68f1e8..7aca973d344b 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.5.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8,9,10} )
PYTHON_REQ_USE="sqlite"
@@ -28,6 +28,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
# Disabling test suite because upstream disallow running from install path
RESTRICT="test"
+# 3.22.5+ *does* support GRASS 8 but we can't enable it yet because of
+# https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies)
+# Keep an eye on that bug / a fixed GRASS release and readd support
+# by unrestricting the dep in ${COMMON_DEPEND} once it's fixed!
+# (No need to change the supported GRASS versions in src_configure b/c
+# it won't find GRASS 8 with this dependency set.)
COMMON_DEPEND="
app-crypt/qca:2[qt5(+),ssl]
>=dev-db/spatialite-4.2.0
@@ -108,6 +114,10 @@ BDEPEND="
sys-devel/flex
"
+PATCHES=(
+ "${FILESDIR}"/${P}-install-grass8-scripts.patch
+)
+
pkg_setup() {
python-single-r1_pkg_setup
}
@@ -134,7 +144,6 @@ src_configure() {
-DENABLE_TESTS=OFF
-DWITH_3D=$(usex 3d)
-DWITH_GSL=$(usex georeferencer)
- -DWITH_GRASS7=$(usex grass)
$(cmake_use_find_package hdf5 HDF5)
-DWITH_SERVER=$(usex mapserver)
$(cmake_use_find_package netcdf NetCDF)
@@ -150,13 +159,51 @@ src_configure() {
-DWITH_QTWEBKIT=OFF
)
+ # We list all supported versions *by upstream for this version*
+ # here, even if we're not allowing it (e.g. bugs for now), so
+ # we enable/disable all the right versions. This is so qgis doesn't
+ # try to automatically use a version the build system knows about.
+ local supported_grass_versions=( 7 8 )
if use grass; then
+ # We can do this because we have a := dep on grass &
+ # it changes subslot (ABI) when major versions change, so
+ # the logic here doesn't end up becoming stale.
readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"
readarray -d'.' -t v <<<"${f[2]}"
grassdir="grass${v[0]}${v[1]}"
GRASSDIR=/usr/$(get_libdir)/${grassdir}
- mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
+
+ einfo "Supported versions: ${supported_grass_versions[@]}"
+ einfo "Found GRASS version: ${v[0]}*"
+
+ local known_grass_version
+ # GRASS isn't slotted (in Gentoo, anyway) so we pick
+ # the best version we can to build against, and disable the others.
+ for known_grass_version in "${supported_grass_versions[@]}" ; do
+ case "${known_grass_version}" in
+ "${v[0]}")
+ einfo "GRASS version ${known_grass_version} is supported. Enabling."
+ mycmakeargs+=(
+ "-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}"
+ "-DWITH_GRASS${known_grass_version}=ON"
+ )
+ ;;
+ *)
+ einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling."
+ mycmakeargs+=(
+ "-DWITH_GRASS${known_grass_version}=OFF"
+ )
+ ;;
+ esac
+ done
+ else
+ local known_grass_version
+ for known_grass_version in "${supported_grass_versions[@]}" ; do
+ mycmakeargs+=(
+ "-DWITH_GRASS${known_grass_version}=OFF"
+ )
+ done
fi
use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 12e8cd68f1e8..157d86c11aaf 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8,9,10} )
PYTHON_REQ_USE="sqlite"
@@ -28,6 +28,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
# Disabling test suite because upstream disallow running from install path
RESTRICT="test"
+# 3.22.5+ *does* support GRASS 8 but we can't enable it yet because of
+# https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies)
+# Keep an eye on that bug / a fixed GRASS release and readd support
+# by unrestricting the dep in ${COMMON_DEPEND} once it's fixed!
+# (No need to change the supported GRASS versions in src_configure b/c
+# it won't find GRASS 8 with this dependency set.)
COMMON_DEPEND="
app-crypt/qca:2[qt5(+),ssl]
>=dev-db/spatialite-4.2.0
@@ -134,7 +140,6 @@ src_configure() {
-DENABLE_TESTS=OFF
-DWITH_3D=$(usex 3d)
-DWITH_GSL=$(usex georeferencer)
- -DWITH_GRASS7=$(usex grass)
$(cmake_use_find_package hdf5 HDF5)
-DWITH_SERVER=$(usex mapserver)
$(cmake_use_find_package netcdf NetCDF)
@@ -150,13 +155,51 @@ src_configure() {
-DWITH_QTWEBKIT=OFF
)
+ # We list all supported versions *by upstream for this version*
+ # here, even if we're not allowing it (e.g. bugs for now), so
+ # we enable/disable all the right versions. This is so qgis doesn't
+ # try to automatically use a version the build system knows about.
+ local supported_grass_versions=( 7 8 )
if use grass; then
+ # We can do this because we have a := dep on grass &
+ # it changes subslot (ABI) when major versions change, so
+ # the logic here doesn't end up becoming stale.
readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"
readarray -d'.' -t v <<<"${f[2]}"
grassdir="grass${v[0]}${v[1]}"
GRASSDIR=/usr/$(get_libdir)/${grassdir}
- mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
+
+ einfo "Supported versions: ${supported_grass_versions[@]}"
+ einfo "Found GRASS version: ${v[0]}*"
+
+ local known_grass_version
+ # GRASS isn't slotted (in Gentoo, anyway) so we pick
+ # the best version we can to build against, and disable the others.
+ for known_grass_version in "${supported_grass_versions[@]}" ; do
+ case "${known_grass_version}" in
+ "${v[0]}")
+ einfo "GRASS version ${known_grass_version} is supported. Enabling."
+ mycmakeargs+=(
+ "-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}"
+ "-DWITH_GRASS${known_grass_version}=ON"
+ )
+ ;;
+ *)
+ einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling."
+ mycmakeargs+=(
+ "-DWITH_GRASS${known_grass_version}=OFF"
+ )
+ ;;
+ esac
+ done
+ else
+ local known_grass_version
+ for known_grass_version in "${supported_grass_versions[@]}" ; do
+ mycmakeargs+=(
+ "-DWITH_GRASS${known_grass_version}=OFF"
+ )
+ done
fi
use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/
@ 2022-10-09 18:29 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2022-10-09 18:29 UTC (permalink / raw
To: gentoo-commits
commit: 5efebdac3d58d269f9c84d4c54d588b00cbc5c8a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 7 13:29:46 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 9 18:29:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5efebdac
sci-geosciences/qgis: drop old versions
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/qgis/Manifest | 5 -
.../files/qgis-3.22.5-install-grass8-scripts.patch | 17 --
sci-geosciences/qgis/qgis-3.22.0-r4.ebuild | 205 ----------------
sci-geosciences/qgis/qgis-3.22.5.ebuild | 254 --------------------
sci-geosciences/qgis/qgis-3.22.6.ebuild | 264 ---------------------
sci-geosciences/qgis/qgis-3.22.7-r1.ebuild | 264 ---------------------
sci-geosciences/qgis/qgis-3.22.7-r2.ebuild | 259 --------------------
sci-geosciences/qgis/qgis-3.22.7.ebuild | 264 ---------------------
sci-geosciences/qgis/qgis-3.22.8.ebuild | 259 --------------------
9 files changed, 1791 deletions(-)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 0d5861607665..2b7cdae32bd0 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,8 +1,3 @@
-DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5 SHA512 dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
DIST qgis-3.22.11.tar.bz2 142155708 BLAKE2B 71b3e0a772fbea1e26d01dff6f65c35981a5ff091b5ea6bee76608f9812c569226f99789333fe39fdd772ee72af02746458c93117d21fb0352851871217a82f6 SHA512 0c41fa8e74b3cf54926aedc7a221ac440eabf9d27071bb79a17c5d7826624a8e6010521000f6b55afbc71f079ff18235d8fa5d407fe6b31b1bb705b6eb431424
-DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B d5cad96ca7fadab58e2f680493469496d8c5e06141ac646a09cc1f5fa607b860a0e15e5b6257debb9e787d294d2183bd0b007e96e839aca7e9fb87d81001edd7 SHA512 d47bcd743a0c621b3a5a90923d98844056260f396e683b0874625e341cdf84d075505e909130cfc473fc550de37bc078fc5ebb54b437e582572d930e12411dcb
-DIST qgis-3.22.6.tar.bz2 138056354 BLAKE2B a1f7681ae71b4f06c8e4542fe1351fbd0fd0c5a07934b1eb5e535d17a5c0432a9df1489db34dfdcbb776c55c233f3f53c8c1aaf957ba0b8445c4738c9a504cf2 SHA512 5ef36d6d93e5f7562f4ef2dc2a738057376153e7b34fdef7dd4cf278334d61af0b3380712b22961c3693088036d18167f9b2c2f623f405c668e8b48ef2f93d20
-DIST qgis-3.22.7.tar.bz2 138076419 BLAKE2B 25e164e9da681dc78546b2492ec85dc97976f8f6e33e41244b8d72ef109edf9c482f00807183338da1e23a0dc9fbf0526953f053f67aff5723dc30ed280daae2 SHA512 d85b88a7a9aee17e7f8179c7d715bc60e64de5bdb41498177886ecdf5da2d707e3880715b6eaba4af86398666da4e322b0fac6b03f6aa907c9e39bfe4d93db91
-DIST qgis-3.22.8.tar.bz2 138285002 BLAKE2B d9c94c9e9836f342242000279217fcd7ceee63693829306b7927378b61b5cf9a2d6c78d41722e44b515653d73ea89d104ecb0a7f1688e294d75cad52bcf065e0 SHA512 80fec733fde090b3be0ba4cad1c8709023dac2fc254d2ed10540d8a929ced3218d7ae69c11b396f9424280b1746a84871d457380aaad8e65ffc62b150c731bd2
DIST qgis-3.22.9.tar.bz2 138141096 BLAKE2B d59d6fd974333371397150e594acda1c6072948cc010b4bf4d34c33a642fabdc78a580bd76418785892114aa4997e88cf700f178a9243079ff800c76cb3c25cf SHA512 c33cfe18c542a3be42fa6a08b62f71511a71a7e72ae704177846b66444d90a28df2f1c42d98c53c2c0e43f13bce24224499c52db5d2cbcac5d8a53782f7c124c
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/files/qgis-3.22.5-install-grass8-scripts.patch b/sci-geosciences/qgis/files/qgis-3.22.5-install-grass8-scripts.patch
deleted file mode 100644
index 5c801f23fe8c..000000000000
--- a/sci-geosciences/qgis/files/qgis-3.22.5-install-grass8-scripts.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://github.com/qgis/QGIS/pull/47881
-https://github.com/qgis/QGIS/pull/47456
-https://github.com/qgis/QGIS/pull/47456/commits/84e574dcc043e03bb1682d1dfc5bd3b9fbf87b3d
-
-From 84e574dcc043e03bb1682d1dfc5bd3b9fbf87b3d Mon Sep 17 00:00:00 2001
-From: Bas Couwenberg <sebastic@xs4all.nl>
-Date: Fri, 18 Mar 2022 18:04:01 +0100
-Subject: [PATCH] Also install scripts for GRASS 8.
-
---- a/src/plugins/grass/scripts/CMakeLists.txt
-+++ b/src/plugins/grass/scripts/CMakeLists.txt
-@@ -1,4 +1,4 @@
--if (GRASS_NUM_VERSION6 GREATER 60300 OR GRASS_NUM_VERSION7 GREATER 60300)
-+if (GRASS_NUM_VERSION6 GREATER 60300 OR GRASS_NUM_VERSION7 GREATER 60300 OR GRASS_NUM_VERSION8 GREATER 60300)
- file (GLOB MODULE_FILES *.py )
- install (FILES ${MODULE_FILES}
- DESTINATION ${QGIS_DATA_DIR}/grass/scripts
diff --git a/sci-geosciences/qgis/qgis-3.22.0-r4.ebuild b/sci-geosciences/qgis/qgis-3.22.0-r4.ebuild
deleted file mode 100644
index 19fa8cd32b85..000000000000
--- a/sci-geosciences/qgis/qgis-3.22.0-r4.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
- inherit git-r3
-else
- SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
- examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
- KEYWORDS="amd64 ~x86"
-fi
-inherit cmake desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-COMMON_DEPEND="
- app-crypt/qca:2[qt5(+),ssl]
- >=dev-db/spatialite-4.2.0
- dev-db/sqlite:3
- dev-libs/expat
- dev-libs/libzip:=
- dev-libs/protobuf:=
- dev-libs/qtkeychain[qt5(+)]
- dev-qt/designer:5
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtpositioning:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtsql:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-gfx/exiv2:=
- >=sci-libs/gdal-3.0.4:=[geos]
- sci-libs/geos
- sci-libs/libspatialindex:=
- sys-libs/zlib
- >=sci-libs/proj-4.9.3:=
- >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
- >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
- 3d? ( dev-qt/qt3d:5 )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( =sci-geosciences/grass-7*:= )
- hdf5? ( sci-libs/hdf5:= )
- mapserver? ( dev-libs/fcgi )
- netcdf? ( sci-libs/netcdf:= )
- opencl? ( virtual/opencl )
- oracle? (
- dev-db/oracle-instantclient:=
- sci-libs/gdal:=[oracle]
- )
- polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
- postgres? ( dev-db/postgresql:= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/future[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/owslib[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- <dev-python/sip-5:=[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- ')
- )
- qml? ( dev-qt/qtdeclarative:5 )
- serial? ( dev-qt/qtserialport:5 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/qttest:5
- python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
- sci-geosciences/gpsbabel
-"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-qt/linguist-tools:5
- sys-devel/bison
- sys-devel/flex
-"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQGIS_MANUAL_SUBDIR=share/man/
- -DQGIS_LIB_SUBDIR=$(get_libdir)
- -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
- -DQWT_INCLUDE_DIR=/usr/include/qwt6
- -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
- -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
- -DPEDANTIC=OFF
- -DUSE_CCACHE=OFF
- -DWITH_ANALYSIS=ON
- -DWITH_APIDOC=OFF
- -DWITH_GUI=ON
- -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=OFF
- -DWITH_3D=$(usex 3d)
- -DWITH_GSL=$(usex georeferencer)
- -DWITH_GRASS7=$(usex grass)
- $(cmake_use_find_package hdf5 HDF5)
- -DWITH_SERVER=$(usex mapserver)
- $(cmake_use_find_package netcdf NetCDF)
- -DUSE_OPENCL=$(usex opencl)
- -DWITH_ORACLE=$(usex oracle)
- -DWITH_QWTPOLAR=$(usex polar)
- -DWITH_POSTGRESQL=$(usex postgres)
- -DWITH_BINDINGS=$(usex python)
- -DWITH_CUSTOM_WIDGETS=$(usex python)
- -DWITH_QUICK=$(usex qml)
- -DWITH_QT5SERIALPORT=$(usex serial)
- -DWITH_QTWEBKIT=OFF
- )
-
- if use grass; then
- readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"
- readarray -d'.' -t v <<<"${f[2]}"
- grassdir="grass${v[0]}${v[1]}"
-
- GRASSDIR=/usr/$(get_libdir)/${grassdir}
- mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
- fi
-
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
- mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
-
- # bugs 612956, 648726
- addpredict /dev/dri/renderD128
- addpredict /dev/dri/renderD129
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- if use python; then
- python_optimize
- python_optimize "${ED}"/usr/share/qgis/python
- fi
-
- if use grass; then
- python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
-
- xdg_pkg_postinst
-}
diff --git a/sci-geosciences/qgis/qgis-3.22.5.ebuild b/sci-geosciences/qgis/qgis-3.22.5.ebuild
deleted file mode 100644
index 3489bad447fe..000000000000
--- a/sci-geosciences/qgis/qgis-3.22.5.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
- inherit git-r3
-else
- SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
- examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
- KEYWORDS="amd64 ~x86"
-fi
-inherit cmake python-single-r1 xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-# 3.22.5+ *does* support GRASS 8 but we can't enable it yet because of
-# https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies)
-# Keep an eye on that bug / a fixed GRASS release and readd support
-# by unrestricting the dep in ${COMMON_DEPEND} once it's fixed!
-# (No need to change the supported GRASS versions in src_configure b/c
-# it won't find GRASS 8 with this dependency set.)
-COMMON_DEPEND="
- app-crypt/qca:2[qt5(+),ssl]
- >=dev-db/spatialite-4.2.0
- dev-db/sqlite:3
- dev-libs/expat
- dev-libs/libzip:=
- dev-libs/protobuf:=
- dev-libs/qtkeychain[qt5(+)]
- dev-qt/designer:5
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtpositioning:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtsql:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-gfx/exiv2:=
- >=sci-libs/gdal-3.0.4:=[geos]
- sci-libs/geos
- sci-libs/libspatialindex:=
- sys-libs/zlib
- >=sci-libs/proj-4.9.3:=
- >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
- >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
- 3d? ( dev-qt/qt3d:5 )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( =sci-geosciences/grass-7*:= )
- hdf5? ( sci-libs/hdf5:= )
- mapserver? ( dev-libs/fcgi )
- netcdf? ( sci-libs/netcdf:= )
- opencl? ( virtual/opencl )
- oracle? (
- dev-db/oracle-instantclient:=
- sci-libs/gdal:=[oracle]
- )
- pdal? ( sci-libs/pdal:= )
- polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
- postgres? ( dev-db/postgresql:= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/future[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/owslib[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- <dev-python/sip-5:=[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- ')
- )
- qml? ( dev-qt/qtdeclarative:5 )
- serial? ( dev-qt/qtserialport:5 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/qttest:5
- python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
- sci-geosciences/gpsbabel
-"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-qt/linguist-tools:5
- sys-devel/bison
- sys-devel/flex
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-install-grass8-scripts.patch
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQGIS_MANUAL_SUBDIR=share/man/
- -DQGIS_LIB_SUBDIR=$(get_libdir)
- -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
- -DQWT_INCLUDE_DIR=/usr/include/qwt6
- -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
- -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
- -DPEDANTIC=OFF
- -DUSE_CCACHE=OFF
- -DWITH_ANALYSIS=ON
- -DWITH_APIDOC=OFF
- -DWITH_GUI=ON
- -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=OFF
- -DWITH_3D=$(usex 3d)
- -DWITH_GSL=$(usex georeferencer)
- $(cmake_use_find_package hdf5 HDF5)
- -DWITH_SERVER=$(usex mapserver)
- $(cmake_use_find_package netcdf NetCDF)
- -DUSE_OPENCL=$(usex opencl)
- -DWITH_ORACLE=$(usex oracle)
- -DWITH_QWTPOLAR=$(usex polar)
- -DWITH_PDAL=$(usex pdal)
- -DWITH_POSTGRESQL=$(usex postgres)
- -DWITH_BINDINGS=$(usex python)
- -DWITH_CUSTOM_WIDGETS=$(usex python)
- -DWITH_QUICK=$(usex qml)
- -DWITH_QT5SERIALPORT=$(usex serial)
- -DWITH_QTWEBKIT=OFF
- )
-
- # We list all supported versions *by upstream for this version*
- # here, even if we're not allowing it (e.g. bugs for now), so
- # we enable/disable all the right versions. This is so qgis doesn't
- # try to automatically use a version the build system knows about.
- local supported_grass_versions=( 7 8 )
- if use grass; then
- # We can do this because we have a := dep on grass &
- # it changes subslot (ABI) when major versions change, so
- # the logic here doesn't end up becoming stale.
- readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"
- readarray -d'.' -t v <<<"${f[2]}"
- grassdir="grass${v[0]}${v[1]}"
-
- GRASSDIR=/usr/$(get_libdir)/${grassdir}
-
- einfo "Supported versions: ${supported_grass_versions[@]}"
- einfo "Found GRASS version: ${v[0]}*"
-
- local known_grass_version
- # GRASS isn't slotted (in Gentoo, anyway) so we pick
- # the best version we can to build against, and disable the others.
- for known_grass_version in "${supported_grass_versions[@]}" ; do
- case "${known_grass_version}" in
- "${v[0]}")
- einfo "GRASS version ${known_grass_version} is supported. Enabling."
- mycmakeargs+=(
- "-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}"
- "-DWITH_GRASS${known_grass_version}=ON"
- )
- ;;
- *)
- einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling."
- mycmakeargs+=(
- "-DWITH_GRASS${known_grass_version}=OFF"
- )
- ;;
- esac
- done
- else
- local known_grass_version
- for known_grass_version in "${supported_grass_versions[@]}" ; do
- mycmakeargs+=(
- "-DWITH_GRASS${known_grass_version}=OFF"
- )
- done
- fi
-
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
- mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
-
- # bugs 612956, 648726
- addpredict /dev/dri/renderD128
- addpredict /dev/dri/renderD129
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- if use python; then
- python_optimize
- python_optimize "${ED}"/usr/share/qgis/python
- fi
-
- if use grass; then
- python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
-
- xdg_pkg_postinst
-}
diff --git a/sci-geosciences/qgis/qgis-3.22.6.ebuild b/sci-geosciences/qgis/qgis-3.22.6.ebuild
deleted file mode 100644
index b6874427c4be..000000000000
--- a/sci-geosciences/qgis/qgis-3.22.6.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
- inherit git-r3
-else
- SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
- examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
- KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake python-single-r1 virtualx xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="!test? ( test )"
-
-# 3.22.5+ *does* support GRASS 8 but we can't enable it yet because of
-# https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies)
-# Keep an eye on that bug / a fixed GRASS release and readd support
-# by unrestricting the dep in ${COMMON_DEPEND} once it's fixed!
-# (No need to change the supported GRASS versions in src_configure b/c
-# it won't find GRASS 8 with this dependency set.)
-COMMON_DEPEND="
- app-crypt/qca:2[qt5(+),ssl]
- >=dev-db/spatialite-4.2.0
- dev-db/sqlite:3
- dev-libs/expat
- dev-libs/libzip:=
- dev-libs/protobuf:=
- dev-libs/qtkeychain[qt5(+)]
- dev-qt/designer:5
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtpositioning:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtsql:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-gfx/exiv2:=
- >=sci-libs/gdal-3.0.4:=[geos]
- sci-libs/geos
- sci-libs/libspatialindex:=
- sys-libs/zlib
- >=sci-libs/proj-4.9.3:=
- >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
- >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
- 3d? ( dev-qt/qt3d:5 )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( =sci-geosciences/grass-7*:= )
- hdf5? ( sci-libs/hdf5:= )
- mapserver? ( dev-libs/fcgi )
- netcdf? ( sci-libs/netcdf:= )
- opencl? ( virtual/opencl )
- oracle? (
- dev-db/oracle-instantclient:=
- sci-libs/gdal:=[oracle]
- )
- pdal? ( sci-libs/pdal:= )
- polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
- postgres? ( dev-db/postgresql:= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/future[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/owslib[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- <dev-python/sip-5:=[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- ')
- )
- qml? ( dev-qt/qtdeclarative:5 )
- serial? ( dev-qt/qtserialport:5 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/qttest:5
- python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
- sci-geosciences/gpsbabel
-"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-qt/linguist-tools:5
- sys-devel/bison
- sys-devel/flex
- test? (
- $(python_gen_cond_dep '
- dev-python/PyQt5[${PYTHON_USEDEP},testlib]
- dev-python/nose2[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- ')
- )
-"
-
-src_prepare() {
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQGIS_MANUAL_SUBDIR=share/man/
- -DQGIS_LIB_SUBDIR=$(get_libdir)
- -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
- -DQWT_INCLUDE_DIR=/usr/include/qwt6
- -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
- -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
- -DPEDANTIC=OFF
- -DUSE_CCACHE=OFF
- -DWITH_ANALYSIS=ON
- -DWITH_APIDOC=OFF
- -DWITH_GUI=ON
- -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=$(usex test)
- -DWITH_3D=$(usex 3d)
- -DWITH_GSL=$(usex georeferencer)
- $(cmake_use_find_package hdf5 HDF5)
- -DWITH_SERVER=$(usex mapserver)
- $(cmake_use_find_package netcdf NetCDF)
- -DUSE_OPENCL=$(usex opencl)
- -DWITH_ORACLE=$(usex oracle)
- -DWITH_QWTPOLAR=$(usex polar)
- -DWITH_PDAL=$(usex pdal)
- -DWITH_POSTGRESQL=$(usex postgres)
- -DWITH_BINDINGS=$(usex python)
- -DWITH_CUSTOM_WIDGETS=$(usex python)
- -DWITH_QUICK=$(usex qml)
- -DWITH_QT5SERIALPORT=$(usex serial)
- -DWITH_QTWEBKIT=OFF
- )
-
- # We list all supported versions *by upstream for this version*
- # here, even if we're not allowing it (e.g. bugs for now), so
- # we enable/disable all the right versions. This is so qgis doesn't
- # try to automatically use a version the build system knows about.
- local supported_grass_versions=( 7 8 )
- if use grass; then
- # We can do this because we have a := dep on grass &
- # it changes subslot (ABI) when major versions change, so
- # the logic here doesn't end up becoming stale.
- readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"
- readarray -d'.' -t v <<<"${f[2]}"
- grassdir="grass${v[0]}${v[1]}"
-
- GRASSDIR=/usr/$(get_libdir)/${grassdir}
-
- einfo "Supported versions: ${supported_grass_versions[@]}"
- einfo "Found GRASS version: ${v[0]}*"
-
- local known_grass_version
- # GRASS isn't slotted (in Gentoo, anyway) so we pick
- # the best version we can to build against, and disable the others.
- for known_grass_version in "${supported_grass_versions[@]}" ; do
- case "${known_grass_version}" in
- "${v[0]}")
- einfo "GRASS version ${known_grass_version} is supported. Enabling."
- mycmakeargs+=(
- "-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}"
- "-DWITH_GRASS${known_grass_version}=ON"
- )
- ;;
- *)
- einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling."
- mycmakeargs+=(
- "-DWITH_GRASS${known_grass_version}=OFF"
- )
- ;;
- esac
- done
- else
- local known_grass_version
- for known_grass_version in "${supported_grass_versions[@]}" ; do
- mycmakeargs+=(
- "-DWITH_GRASS${known_grass_version}=OFF"
- )
- done
- fi
-
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
- # bugs 612956, 648726
- addpredict /dev/dri/renderD128
- addpredict /dev/dri/renderD129
-
- cmake_src_configure
-}
-
-src_test() {
- local myctestargs=(
- # test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887
- # test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059
- -E '(ProcessingGuiTest|ProcessingQgisAlgorithmsTestPt1|ProcessingQgisAlgorithmsTestPt2|ProcessingQgisAlgorithmsTestPt3|ProcessingQgisAlgorithmsTestPt4|ProcessingGdalAlgorithmsRasterTest|ProcessingGdalAlgorithmsVectorTest|ProcessingGrass7AlgorithmsImageryTest|ProcessingGrass7AlgorithmsRasterTestPt1|ProcessingGrass7AlgorithmsRasterTestPt2|ProcessingGrass7AlgorithmsVectorTest|ProcessingOtbAlgorithmsTest|test_core_callout|test_core_compositionconverter|test_core_expression|test_core_gdalprovider|test_core_gdalutils|test_core_geonodeconnection|test_core_imagecache|test_core_labelingengine|test_core_layout|test_core_layoutcontext|test_core_layouthtml|test_core_layoutlabel|test_core_layoutmanualtable|test_core_layoutmap|test_core_layoutmapgrid|test_core_layoutmapoverview|test_core_layoutmultiframe|test_core_layoutpicture|test_core_linefillsymbol|test_core_mapdevicepixelratio|test_core_maprendererjob|test_core_meshlayer|test_core_meshlayerrenderer|test_core_networkaccessmanager|test_core_
offlineediting|test_core_pointpatternfillsymbol|test_core_rastercontourrenderer|test_core_rasterlayer|test_core_simplemarker|test_core_style|test_core_svgmarker|test_core_tiledownloadmanager|test_core_ziplayer|test_core_coordinatereferencesystem|test_core_geometry|test_gui_dualview|test_gui_htmlwidgetwrapper|test_gui_processinggui|test_gui_filedownloader|test_gui_ogrprovidergui|test_gui_meshlayerpropertiesdialog|test_gui_queryresultwidget|test_gui_listwidget|test_3d_3drendering|test_3d_tessellator|test_analysis_processingalgspt1|test_analysis_processingalgspt2|test_analysis_meshcontours|test_analysis_triangulation|test_analysis_processing|test_provider_wcsprovider|test_provider_postgresconn|test_provider_virtualrasterprovider|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQgsDataItem|PyQg
sDelimitedTextProvider|PyQgsEmbeddedSymbolRenderer|PyQgsExpressionBuilderWidget|PyQgsExternalStorageWebDAV|PyQgsGeometryTest|PyQgsGoogleMapsGeocoder|PyQgsImageCache|PyQgsLayout|PyQgsLayoutHtml|PyQgsLayoutLegend|PyQgsLayoutMap|PyQgsLayoutMapGrid|PyQgsLayoutMapOverview|PyQgsMapClippingUtils|PyQgsMapLayerComboBox|PyQgsMapLayerProxyModel|PyQgsMemoryProvider|PyQgsOGRProviderGpkg|PyQgsPalLabelingCanvas|PyQgsPalLabelingLayout|PyQgsPalLabelingPlacement|PyQgsPointCloudAttributeByRampRenderer|PyQgsPointCloudClassifiedRenderer|PyQgsPointCloudExtentRenderer|PyQgsPointCloudRgbRenderer|PyQgsProcessExecutable|PyQgsProcessingInPlace|TestQgsRandomMarkerSymbolLayer|PyQgsRasterLayer|PyQgsRasterLayerRenderer|PyQgsRasterResampler|PyQgsRulebasedRenderer|PyQgsShapefileProvider|PyQgsSvgCache|PyQgsOGRProvider|PyQgsSpatialiteProvider|PyQgsTaskManager|PyQgsVectorFileWriter|PyQgsVectorLayer|PyQgsVectorLayerCache|PyQgsVectorLayerEditBuffer|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVir
tualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)'
-
- --output-on-failure
- )
-
- virtx cmake_src_test -j1
-}
-
-src_install() {
- cmake_src_install
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- if use python; then
- python_optimize
- python_optimize "${ED}"/usr/share/qgis/python
- fi
-
- if use grass; then
- python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
-
- xdg_pkg_postinst
-}
diff --git a/sci-geosciences/qgis/qgis-3.22.7-r1.ebuild b/sci-geosciences/qgis/qgis-3.22.7-r1.ebuild
deleted file mode 100644
index 20f78cf866b8..000000000000
--- a/sci-geosciences/qgis/qgis-3.22.7-r1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
- inherit git-r3
-else
- SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
- examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
- KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake python-single-r1 virtualx xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="!test? ( test )"
-
-# 3.22.5+ *does* support GRASS 8 but we can't enable it yet because of
-# https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies)
-# Keep an eye on that bug / a fixed GRASS release and readd support
-# by unrestricting the dep in ${COMMON_DEPEND} once it's fixed!
-# (No need to change the supported GRASS versions in src_configure b/c
-# it won't find GRASS 8 with this dependency set.)
-COMMON_DEPEND="
- app-crypt/qca:2[qt5(+),ssl]
- >=dev-db/spatialite-4.2.0
- dev-db/sqlite:3
- dev-libs/expat
- dev-libs/libzip:=
- dev-libs/protobuf:=
- dev-libs/qtkeychain[qt5(+)]
- dev-qt/designer:5
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtpositioning:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtsql:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-gfx/exiv2:=
- >=sci-libs/gdal-3.0.4:=[geos]
- sci-libs/geos
- sci-libs/libspatialindex:=
- sys-libs/zlib
- >=sci-libs/proj-4.9.3:=
- >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
- >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
- 3d? ( dev-qt/qt3d:5 )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( =sci-geosciences/grass-7*:= )
- hdf5? ( sci-libs/hdf5:= )
- mapserver? ( dev-libs/fcgi )
- netcdf? ( sci-libs/netcdf:= )
- opencl? ( virtual/opencl )
- oracle? (
- dev-db/oracle-instantclient:=
- sci-libs/gdal:=[oracle]
- )
- pdal? ( sci-libs/pdal:= )
- polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
- postgres? ( dev-db/postgresql:= )
- python? (
- ${PYTHON_DEPS}
- >=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/future[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/owslib[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- <dev-python/sip-5:=[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- ')
- )
- qml? ( dev-qt/qtdeclarative:5 )
- serial? ( dev-qt/qtserialport:5 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/qttest:5
- python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
- sci-geosciences/gpsbabel
-"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-qt/linguist-tools:5
- sys-devel/bison
- sys-devel/flex
- test? (
- $(python_gen_cond_dep '
- dev-python/PyQt5[${PYTHON_USEDEP},testlib]
- dev-python/nose2[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- ')
- )
-"
-
-src_prepare() {
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQGIS_MANUAL_SUBDIR=share/man/
- -DQGIS_LIB_SUBDIR=$(get_libdir)
- -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
- -DQWT_INCLUDE_DIR=/usr/include/qwt6
- -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
- -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
- -DPEDANTIC=OFF
- -DUSE_CCACHE=OFF
- -DWITH_ANALYSIS=ON
- -DWITH_APIDOC=OFF
- -DWITH_GUI=ON
- -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=$(usex test)
- -DWITH_3D=$(usex 3d)
- -DWITH_GSL=$(usex georeferencer)
- $(cmake_use_find_package hdf5 HDF5)
- -DWITH_SERVER=$(usex mapserver)
- $(cmake_use_find_package netcdf NetCDF)
- -DUSE_OPENCL=$(usex opencl)
- -DWITH_ORACLE=$(usex oracle)
- -DWITH_QWTPOLAR=$(usex polar)
- -DWITH_PDAL=$(usex pdal)
- -DWITH_POSTGRESQL=$(usex postgres)
- -DWITH_BINDINGS=$(usex python)
- -DWITH_CUSTOM_WIDGETS=$(usex python)
- -DWITH_QUICK=$(usex qml)
- -DWITH_QT5SERIALPORT=$(usex serial)
- -DWITH_QTWEBKIT=OFF
- )
-
- # We list all supported versions *by upstream for this version*
- # here, even if we're not allowing it (e.g. bugs for now), so
- # we enable/disable all the right versions. This is so qgis doesn't
- # try to automatically use a version the build system knows about.
- local supported_grass_versions=( 7 8 )
- if use grass; then
- # We can do this because we have a := dep on grass &
- # it changes subslot (ABI) when major versions change, so
- # the logic here doesn't end up becoming stale.
- readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"
- readarray -d'.' -t v <<<"${f[2]}"
- grassdir="grass${v[0]}${v[1]}"
-
- GRASSDIR=/usr/$(get_libdir)/${grassdir}
-
- einfo "Supported versions: ${supported_grass_versions[@]}"
- einfo "Found GRASS version: ${v[0]}*"
-
- local known_grass_version
- # GRASS isn't slotted (in Gentoo, anyway) so we pick
- # the best version we can to build against, and disable the others.
- for known_grass_version in "${supported_grass_versions[@]}" ; do
- case "${known_grass_version}" in
- "${v[0]}")
- einfo "GRASS version ${known_grass_version} is supported. Enabling."
- mycmakeargs+=(
- "-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}"
- "-DWITH_GRASS${known_grass_version}=ON"
- )
- ;;
- *)
- einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling."
- mycmakeargs+=(
- "-DWITH_GRASS${known_grass_version}=OFF"
- )
- ;;
- esac
- done
- else
- local known_grass_version
- for known_grass_version in "${supported_grass_versions[@]}" ; do
- mycmakeargs+=(
- "-DWITH_GRASS${known_grass_version}=OFF"
- )
- done
- fi
-
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
- # bugs 612956, 648726
- addpredict /dev/dri/renderD128
- addpredict /dev/dri/renderD129
-
- cmake_src_configure
-}
-
-src_test() {
- local myctestargs=(
- # test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887
- # test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059
- -E '(ProcessingGuiTest|ProcessingQgisAlgorithmsTestPt1|ProcessingQgisAlgorithmsTestPt2|ProcessingQgisAlgorithmsTestPt3|ProcessingQgisAlgorithmsTestPt4|ProcessingGdalAlgorithmsRasterTest|ProcessingGdalAlgorithmsVectorTest|ProcessingGrass7AlgorithmsImageryTest|ProcessingGrass7AlgorithmsRasterTestPt1|ProcessingGrass7AlgorithmsRasterTestPt2|ProcessingGrass7AlgorithmsVectorTest|ProcessingOtbAlgorithmsTest|test_core_callout|test_core_compositionconverter|test_core_expression|test_core_gdalprovider|test_core_gdalutils|test_core_geonodeconnection|test_core_imagecache|test_core_labelingengine|test_core_layout|test_core_layoutcontext|test_core_layouthtml|test_core_layoutlabel|test_core_layoutmanualtable|test_core_layoutmap|test_core_layoutmapgrid|test_core_layoutmapoverview|test_core_layoutmultiframe|test_core_layoutpicture|test_core_linefillsymbol|test_core_mapdevicepixelratio|test_core_maprendererjob|test_core_meshlayer|test_core_meshlayerrenderer|test_core_networkaccessmanager|test_core_
offlineediting|test_core_pointpatternfillsymbol|test_core_rastercontourrenderer|test_core_rasterlayer|test_core_simplemarker|test_core_style|test_core_svgmarker|test_core_tiledownloadmanager|test_core_ziplayer|test_core_coordinatereferencesystem|test_core_geometry|test_gui_dualview|test_gui_htmlwidgetwrapper|test_gui_processinggui|test_gui_filedownloader|test_gui_ogrprovidergui|test_gui_meshlayerpropertiesdialog|test_gui_queryresultwidget|test_gui_listwidget|test_3d_3drendering|test_3d_tessellator|test_analysis_processingalgspt1|test_analysis_processingalgspt2|test_analysis_meshcontours|test_analysis_triangulation|test_analysis_processing|test_provider_wcsprovider|test_provider_postgresconn|test_provider_virtualrasterprovider|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQgsDataItem|PyQg
sDelimitedTextProvider|PyQgsEmbeddedSymbolRenderer|PyQgsExpressionBuilderWidget|PyQgsExternalStorageWebDAV|PyQgsGeometryTest|PyQgsGoogleMapsGeocoder|PyQgsImageCache|PyQgsLayout|PyQgsLayoutHtml|PyQgsLayoutLegend|PyQgsLayoutMap|PyQgsLayoutMapGrid|PyQgsLayoutMapOverview|PyQgsMapClippingUtils|PyQgsMapLayerComboBox|PyQgsMapLayerProxyModel|PyQgsMemoryProvider|PyQgsOGRProviderGpkg|PyQgsPalLabelingCanvas|PyQgsPalLabelingLayout|PyQgsPalLabelingPlacement|PyQgsPointCloudAttributeByRampRenderer|PyQgsPointCloudClassifiedRenderer|PyQgsPointCloudExtentRenderer|PyQgsPointCloudRgbRenderer|PyQgsProcessExecutable|PyQgsProcessingInPlace|TestQgsRandomMarkerSymbolLayer|PyQgsRasterLayer|PyQgsRasterLayerRenderer|PyQgsRasterResampler|PyQgsRulebasedRenderer|PyQgsShapefileProvider|PyQgsSvgCache|PyQgsOGRProvider|PyQgsSpatialiteProvider|PyQgsTaskManager|PyQgsVectorFileWriter|PyQgsVectorLayer|PyQgsVectorLayerCache|PyQgsVectorLayerEditBuffer|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVir
tualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)'
-
- --output-on-failure
- )
-
- virtx cmake_src_test -j1
-}
-
-src_install() {
- cmake_src_install
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- if use python; then
- python_optimize
- python_optimize "${ED}"/usr/share/qgis/python
- fi
-
- if use grass; then
- python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
-
- xdg_pkg_postinst
-}
diff --git a/sci-geosciences/qgis/qgis-3.22.7-r2.ebuild b/sci-geosciences/qgis/qgis-3.22.7-r2.ebuild
deleted file mode 100644
index 1124e0d0de93..000000000000
--- a/sci-geosciences/qgis/qgis-3.22.7-r2.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
- inherit git-r3
-else
- SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
- examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
- KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake python-single-r1 virtualx xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="!test? ( test )"
-
-# See bug #850787 re sip-6.6.
-COMMON_DEPEND="
- app-crypt/qca:2[qt5(+),ssl]
- >=dev-db/spatialite-4.2.0
- dev-db/sqlite:3
- dev-libs/expat
- dev-libs/libzip:=
- dev-libs/protobuf:=
- dev-libs/qtkeychain[qt5(+)]
- dev-qt/designer:5
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtpositioning:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtsql:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-gfx/exiv2:=
- >=sci-libs/gdal-3.0.4:=[geos]
- sci-libs/geos
- sci-libs/libspatialindex:=
- sys-libs/zlib
- >=sci-libs/proj-4.9.3:=
- >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
- >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
- 3d? ( dev-qt/qt3d:5 )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( sci-geosciences/grass:= )
- hdf5? ( sci-libs/hdf5:= )
- mapserver? ( dev-libs/fcgi )
- netcdf? ( sci-libs/netcdf:= )
- opencl? ( virtual/opencl )
- oracle? (
- dev-db/oracle-instantclient:=
- sci-libs/gdal:=[oracle]
- )
- pdal? ( sci-libs/pdal:= )
- polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
- postgres? ( dev-db/postgresql:= )
- python? (
- ${PYTHON_DEPS}
- >=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/future[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/owslib[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- <dev-python/sip-6.6:=[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- ')
- )
- qml? ( dev-qt/qtdeclarative:5 )
- serial? ( dev-qt/qtserialport:5 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/qttest:5
- python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
- sci-geosciences/gpsbabel
-"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-qt/linguist-tools:5
- sys-devel/bison
- sys-devel/flex
- test? (
- $(python_gen_cond_dep '
- dev-python/PyQt5[${PYTHON_USEDEP},testlib]
- dev-python/nose2[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- ')
- )
-"
-
-src_prepare() {
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQGIS_MANUAL_SUBDIR=share/man/
- -DQGIS_LIB_SUBDIR=$(get_libdir)
- -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
- -DQWT_INCLUDE_DIR=/usr/include/qwt6
- -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
- -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
- -DPEDANTIC=OFF
- -DUSE_CCACHE=OFF
- -DWITH_ANALYSIS=ON
- -DWITH_APIDOC=OFF
- -DWITH_GUI=ON
- -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=$(usex test)
- -DWITH_3D=$(usex 3d)
- -DWITH_GSL=$(usex georeferencer)
- $(cmake_use_find_package hdf5 HDF5)
- -DWITH_SERVER=$(usex mapserver)
- $(cmake_use_find_package netcdf NetCDF)
- -DUSE_OPENCL=$(usex opencl)
- -DWITH_ORACLE=$(usex oracle)
- -DWITH_QWTPOLAR=$(usex polar)
- -DWITH_PDAL=$(usex pdal)
- -DWITH_POSTGRESQL=$(usex postgres)
- -DWITH_BINDINGS=$(usex python)
- -DWITH_CUSTOM_WIDGETS=$(usex python)
- -DWITH_QUICK=$(usex qml)
- -DWITH_QT5SERIALPORT=$(usex serial)
- -DWITH_QTWEBKIT=OFF
- )
-
- # We list all supported versions *by upstream for this version*
- # here, even if we're not allowing it (e.g. bugs for now), so
- # we enable/disable all the right versions. This is so qgis doesn't
- # try to automatically use a version the build system knows about.
- local supported_grass_versions=( 7 8 )
- if use grass; then
- # We can do this because we have a := dep on grass &
- # it changes subslot (ABI) when major versions change, so
- # the logic here doesn't end up becoming stale.
- readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"
- readarray -d'.' -t v <<<"${f[2]}"
- grassdir="grass${v[0]}${v[1]}"
-
- GRASSDIR=/usr/$(get_libdir)/${grassdir}
-
- einfo "Supported versions: ${supported_grass_versions[@]}"
- einfo "Found GRASS version: ${v[0]}*"
-
- local known_grass_version
- # GRASS isn't slotted (in Gentoo, anyway) so we pick
- # the best version we can to build against, and disable the others.
- for known_grass_version in "${supported_grass_versions[@]}" ; do
- case "${known_grass_version}" in
- "${v[0]}")
- einfo "GRASS version ${known_grass_version} is supported. Enabling."
- mycmakeargs+=(
- "-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}"
- "-DWITH_GRASS${known_grass_version}=ON"
- )
- ;;
- *)
- einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling."
- mycmakeargs+=(
- "-DWITH_GRASS${known_grass_version}=OFF"
- )
- ;;
- esac
- done
- else
- local known_grass_version
- for known_grass_version in "${supported_grass_versions[@]}" ; do
- mycmakeargs+=(
- "-DWITH_GRASS${known_grass_version}=OFF"
- )
- done
- fi
-
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
- # bugs 612956, 648726
- addpredict /dev/dri/renderD128
- addpredict /dev/dri/renderD129
-
- cmake_src_configure
-}
-
-src_test() {
- local myctestargs=(
- # test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887
- # test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059
- -E '(ProcessingGuiTest|ProcessingQgisAlgorithmsTestPt1|ProcessingQgisAlgorithmsTestPt2|ProcessingQgisAlgorithmsTestPt3|ProcessingQgisAlgorithmsTestPt4|ProcessingGdalAlgorithmsRasterTest|ProcessingGdalAlgorithmsVectorTest|ProcessingGrass7AlgorithmsImageryTest|ProcessingGrass7AlgorithmsRasterTestPt1|ProcessingGrass7AlgorithmsRasterTestPt2|ProcessingGrass7AlgorithmsVectorTest|ProcessingOtbAlgorithmsTest|test_core_callout|test_core_compositionconverter|test_core_expression|test_core_gdalprovider|test_core_gdalutils|test_core_geonodeconnection|test_core_imagecache|test_core_labelingengine|test_core_layout|test_core_layoutcontext|test_core_layouthtml|test_core_layoutlabel|test_core_layoutmanualtable|test_core_layoutmap|test_core_layoutmapgrid|test_core_layoutmapoverview|test_core_layoutmultiframe|test_core_layoutpicture|test_core_linefillsymbol|test_core_mapdevicepixelratio|test_core_maprendererjob|test_core_meshlayer|test_core_meshlayerrenderer|test_core_networkaccessmanager|test_core_
offlineediting|test_core_pointpatternfillsymbol|test_core_rastercontourrenderer|test_core_rasterlayer|test_core_simplemarker|test_core_style|test_core_svgmarker|test_core_tiledownloadmanager|test_core_ziplayer|test_core_coordinatereferencesystem|test_core_geometry|test_gui_dualview|test_gui_htmlwidgetwrapper|test_gui_processinggui|test_gui_filedownloader|test_gui_ogrprovidergui|test_gui_meshlayerpropertiesdialog|test_gui_queryresultwidget|test_gui_listwidget|test_3d_3drendering|test_3d_tessellator|test_analysis_processingalgspt1|test_analysis_processingalgspt2|test_analysis_meshcontours|test_analysis_triangulation|test_analysis_processing|test_provider_wcsprovider|test_provider_postgresconn|test_provider_virtualrasterprovider|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQgsDataItem|PyQg
sDelimitedTextProvider|PyQgsEmbeddedSymbolRenderer|PyQgsExpressionBuilderWidget|PyQgsExternalStorageWebDAV|PyQgsGeometryTest|PyQgsGoogleMapsGeocoder|PyQgsImageCache|PyQgsLayout|PyQgsLayoutHtml|PyQgsLayoutLegend|PyQgsLayoutMap|PyQgsLayoutMapGrid|PyQgsLayoutMapOverview|PyQgsMapClippingUtils|PyQgsMapLayerComboBox|PyQgsMapLayerProxyModel|PyQgsMemoryProvider|PyQgsOGRProviderGpkg|PyQgsPalLabelingCanvas|PyQgsPalLabelingLayout|PyQgsPalLabelingPlacement|PyQgsPointCloudAttributeByRampRenderer|PyQgsPointCloudClassifiedRenderer|PyQgsPointCloudExtentRenderer|PyQgsPointCloudRgbRenderer|PyQgsProcessExecutable|PyQgsProcessingInPlace|TestQgsRandomMarkerSymbolLayer|PyQgsRasterLayer|PyQgsRasterLayerRenderer|PyQgsRasterResampler|PyQgsRulebasedRenderer|PyQgsShapefileProvider|PyQgsSvgCache|PyQgsOGRProvider|PyQgsSpatialiteProvider|PyQgsTaskManager|PyQgsVectorFileWriter|PyQgsVectorLayer|PyQgsVectorLayerCache|PyQgsVectorLayerEditBuffer|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVir
tualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)'
-
- --output-on-failure
- )
-
- virtx cmake_src_test -j1
-}
-
-src_install() {
- cmake_src_install
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- if use python; then
- python_optimize
- python_optimize "${ED}"/usr/share/qgis/python
- fi
-
- if use grass; then
- python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
-
- xdg_pkg_postinst
-}
diff --git a/sci-geosciences/qgis/qgis-3.22.7.ebuild b/sci-geosciences/qgis/qgis-3.22.7.ebuild
deleted file mode 100644
index 30e49896a601..000000000000
--- a/sci-geosciences/qgis/qgis-3.22.7.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
- inherit git-r3
-else
- SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
- examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
- KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake python-single-r1 virtualx xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="!test? ( test )"
-
-# 3.22.5+ *does* support GRASS 8 but we can't enable it yet because of
-# https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies)
-# Keep an eye on that bug / a fixed GRASS release and readd support
-# by unrestricting the dep in ${COMMON_DEPEND} once it's fixed!
-# (No need to change the supported GRASS versions in src_configure b/c
-# it won't find GRASS 8 with this dependency set.)
-COMMON_DEPEND="
- app-crypt/qca:2[qt5(+),ssl]
- >=dev-db/spatialite-4.2.0
- dev-db/sqlite:3
- dev-libs/expat
- dev-libs/libzip:=
- dev-libs/protobuf:=
- dev-libs/qtkeychain[qt5(+)]
- dev-qt/designer:5
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtpositioning:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtsql:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-gfx/exiv2:=
- >=sci-libs/gdal-3.0.4:=[geos]
- sci-libs/geos
- sci-libs/libspatialindex:=
- sys-libs/zlib
- >=sci-libs/proj-4.9.3:=
- >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
- >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
- 3d? ( dev-qt/qt3d:5 )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( =sci-geosciences/grass-7*:= )
- hdf5? ( sci-libs/hdf5:= )
- mapserver? ( dev-libs/fcgi )
- netcdf? ( sci-libs/netcdf:= )
- opencl? ( virtual/opencl )
- oracle? (
- dev-db/oracle-instantclient:=
- sci-libs/gdal:=[oracle]
- )
- pdal? ( sci-libs/pdal:= )
- polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
- postgres? ( dev-db/postgresql:= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/future[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/owslib[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- <dev-python/sip-5:=[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- ')
- )
- qml? ( dev-qt/qtdeclarative:5 )
- serial? ( dev-qt/qtserialport:5 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/qttest:5
- python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
- sci-geosciences/gpsbabel
-"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-qt/linguist-tools:5
- sys-devel/bison
- sys-devel/flex
- test? (
- $(python_gen_cond_dep '
- dev-python/PyQt5[${PYTHON_USEDEP},testlib]
- dev-python/nose2[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- ')
- )
-"
-
-src_prepare() {
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQGIS_MANUAL_SUBDIR=share/man/
- -DQGIS_LIB_SUBDIR=$(get_libdir)
- -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
- -DQWT_INCLUDE_DIR=/usr/include/qwt6
- -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
- -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
- -DPEDANTIC=OFF
- -DUSE_CCACHE=OFF
- -DWITH_ANALYSIS=ON
- -DWITH_APIDOC=OFF
- -DWITH_GUI=ON
- -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=$(usex test)
- -DWITH_3D=$(usex 3d)
- -DWITH_GSL=$(usex georeferencer)
- $(cmake_use_find_package hdf5 HDF5)
- -DWITH_SERVER=$(usex mapserver)
- $(cmake_use_find_package netcdf NetCDF)
- -DUSE_OPENCL=$(usex opencl)
- -DWITH_ORACLE=$(usex oracle)
- -DWITH_QWTPOLAR=$(usex polar)
- -DWITH_PDAL=$(usex pdal)
- -DWITH_POSTGRESQL=$(usex postgres)
- -DWITH_BINDINGS=$(usex python)
- -DWITH_CUSTOM_WIDGETS=$(usex python)
- -DWITH_QUICK=$(usex qml)
- -DWITH_QT5SERIALPORT=$(usex serial)
- -DWITH_QTWEBKIT=OFF
- )
-
- # We list all supported versions *by upstream for this version*
- # here, even if we're not allowing it (e.g. bugs for now), so
- # we enable/disable all the right versions. This is so qgis doesn't
- # try to automatically use a version the build system knows about.
- local supported_grass_versions=( 7 8 )
- if use grass; then
- # We can do this because we have a := dep on grass &
- # it changes subslot (ABI) when major versions change, so
- # the logic here doesn't end up becoming stale.
- readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"
- readarray -d'.' -t v <<<"${f[2]}"
- grassdir="grass${v[0]}${v[1]}"
-
- GRASSDIR=/usr/$(get_libdir)/${grassdir}
-
- einfo "Supported versions: ${supported_grass_versions[@]}"
- einfo "Found GRASS version: ${v[0]}*"
-
- local known_grass_version
- # GRASS isn't slotted (in Gentoo, anyway) so we pick
- # the best version we can to build against, and disable the others.
- for known_grass_version in "${supported_grass_versions[@]}" ; do
- case "${known_grass_version}" in
- "${v[0]}")
- einfo "GRASS version ${known_grass_version} is supported. Enabling."
- mycmakeargs+=(
- "-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}"
- "-DWITH_GRASS${known_grass_version}=ON"
- )
- ;;
- *)
- einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling."
- mycmakeargs+=(
- "-DWITH_GRASS${known_grass_version}=OFF"
- )
- ;;
- esac
- done
- else
- local known_grass_version
- for known_grass_version in "${supported_grass_versions[@]}" ; do
- mycmakeargs+=(
- "-DWITH_GRASS${known_grass_version}=OFF"
- )
- done
- fi
-
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
- # bugs 612956, 648726
- addpredict /dev/dri/renderD128
- addpredict /dev/dri/renderD129
-
- cmake_src_configure
-}
-
-src_test() {
- local myctestargs=(
- # test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887
- # test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059
- -E '(ProcessingGuiTest|ProcessingQgisAlgorithmsTestPt1|ProcessingQgisAlgorithmsTestPt2|ProcessingQgisAlgorithmsTestPt3|ProcessingQgisAlgorithmsTestPt4|ProcessingGdalAlgorithmsRasterTest|ProcessingGdalAlgorithmsVectorTest|ProcessingGrass7AlgorithmsImageryTest|ProcessingGrass7AlgorithmsRasterTestPt1|ProcessingGrass7AlgorithmsRasterTestPt2|ProcessingGrass7AlgorithmsVectorTest|ProcessingOtbAlgorithmsTest|test_core_callout|test_core_compositionconverter|test_core_expression|test_core_gdalprovider|test_core_gdalutils|test_core_geonodeconnection|test_core_imagecache|test_core_labelingengine|test_core_layout|test_core_layoutcontext|test_core_layouthtml|test_core_layoutlabel|test_core_layoutmanualtable|test_core_layoutmap|test_core_layoutmapgrid|test_core_layoutmapoverview|test_core_layoutmultiframe|test_core_layoutpicture|test_core_linefillsymbol|test_core_mapdevicepixelratio|test_core_maprendererjob|test_core_meshlayer|test_core_meshlayerrenderer|test_core_networkaccessmanager|test_core_
offlineediting|test_core_pointpatternfillsymbol|test_core_rastercontourrenderer|test_core_rasterlayer|test_core_simplemarker|test_core_style|test_core_svgmarker|test_core_tiledownloadmanager|test_core_ziplayer|test_core_coordinatereferencesystem|test_core_geometry|test_gui_dualview|test_gui_htmlwidgetwrapper|test_gui_processinggui|test_gui_filedownloader|test_gui_ogrprovidergui|test_gui_meshlayerpropertiesdialog|test_gui_queryresultwidget|test_gui_listwidget|test_3d_3drendering|test_3d_tessellator|test_analysis_processingalgspt1|test_analysis_processingalgspt2|test_analysis_meshcontours|test_analysis_triangulation|test_analysis_processing|test_provider_wcsprovider|test_provider_postgresconn|test_provider_virtualrasterprovider|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQgsDataItem|PyQg
sDelimitedTextProvider|PyQgsEmbeddedSymbolRenderer|PyQgsExpressionBuilderWidget|PyQgsExternalStorageWebDAV|PyQgsGeometryTest|PyQgsGoogleMapsGeocoder|PyQgsImageCache|PyQgsLayout|PyQgsLayoutHtml|PyQgsLayoutLegend|PyQgsLayoutMap|PyQgsLayoutMapGrid|PyQgsLayoutMapOverview|PyQgsMapClippingUtils|PyQgsMapLayerComboBox|PyQgsMapLayerProxyModel|PyQgsMemoryProvider|PyQgsOGRProviderGpkg|PyQgsPalLabelingCanvas|PyQgsPalLabelingLayout|PyQgsPalLabelingPlacement|PyQgsPointCloudAttributeByRampRenderer|PyQgsPointCloudClassifiedRenderer|PyQgsPointCloudExtentRenderer|PyQgsPointCloudRgbRenderer|PyQgsProcessExecutable|PyQgsProcessingInPlace|TestQgsRandomMarkerSymbolLayer|PyQgsRasterLayer|PyQgsRasterLayerRenderer|PyQgsRasterResampler|PyQgsRulebasedRenderer|PyQgsShapefileProvider|PyQgsSvgCache|PyQgsOGRProvider|PyQgsSpatialiteProvider|PyQgsTaskManager|PyQgsVectorFileWriter|PyQgsVectorLayer|PyQgsVectorLayerCache|PyQgsVectorLayerEditBuffer|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVir
tualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)'
-
- --output-on-failure
- )
-
- virtx cmake_src_test -j1
-}
-
-src_install() {
- cmake_src_install
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- if use python; then
- python_optimize
- python_optimize "${ED}"/usr/share/qgis/python
- fi
-
- if use grass; then
- python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
-
- xdg_pkg_postinst
-}
diff --git a/sci-geosciences/qgis/qgis-3.22.8.ebuild b/sci-geosciences/qgis/qgis-3.22.8.ebuild
deleted file mode 100644
index 1124e0d0de93..000000000000
--- a/sci-geosciences/qgis/qgis-3.22.8.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
- inherit git-r3
-else
- SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
- examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
- KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake python-single-r1 virtualx xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="!test? ( test )"
-
-# See bug #850787 re sip-6.6.
-COMMON_DEPEND="
- app-crypt/qca:2[qt5(+),ssl]
- >=dev-db/spatialite-4.2.0
- dev-db/sqlite:3
- dev-libs/expat
- dev-libs/libzip:=
- dev-libs/protobuf:=
- dev-libs/qtkeychain[qt5(+)]
- dev-qt/designer:5
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtpositioning:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtsql:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-gfx/exiv2:=
- >=sci-libs/gdal-3.0.4:=[geos]
- sci-libs/geos
- sci-libs/libspatialindex:=
- sys-libs/zlib
- >=sci-libs/proj-4.9.3:=
- >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
- >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
- 3d? ( dev-qt/qt3d:5 )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( sci-geosciences/grass:= )
- hdf5? ( sci-libs/hdf5:= )
- mapserver? ( dev-libs/fcgi )
- netcdf? ( sci-libs/netcdf:= )
- opencl? ( virtual/opencl )
- oracle? (
- dev-db/oracle-instantclient:=
- sci-libs/gdal:=[oracle]
- )
- pdal? ( sci-libs/pdal:= )
- polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
- postgres? ( dev-db/postgresql:= )
- python? (
- ${PYTHON_DEPS}
- >=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/future[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/owslib[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- <dev-python/sip-6.6:=[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- ')
- )
- qml? ( dev-qt/qtdeclarative:5 )
- serial? ( dev-qt/qtserialport:5 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/qttest:5
- python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
- sci-geosciences/gpsbabel
-"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-qt/linguist-tools:5
- sys-devel/bison
- sys-devel/flex
- test? (
- $(python_gen_cond_dep '
- dev-python/PyQt5[${PYTHON_USEDEP},testlib]
- dev-python/nose2[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- ')
- )
-"
-
-src_prepare() {
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQGIS_MANUAL_SUBDIR=share/man/
- -DQGIS_LIB_SUBDIR=$(get_libdir)
- -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
- -DQWT_INCLUDE_DIR=/usr/include/qwt6
- -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
- -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
- -DPEDANTIC=OFF
- -DUSE_CCACHE=OFF
- -DWITH_ANALYSIS=ON
- -DWITH_APIDOC=OFF
- -DWITH_GUI=ON
- -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=$(usex test)
- -DWITH_3D=$(usex 3d)
- -DWITH_GSL=$(usex georeferencer)
- $(cmake_use_find_package hdf5 HDF5)
- -DWITH_SERVER=$(usex mapserver)
- $(cmake_use_find_package netcdf NetCDF)
- -DUSE_OPENCL=$(usex opencl)
- -DWITH_ORACLE=$(usex oracle)
- -DWITH_QWTPOLAR=$(usex polar)
- -DWITH_PDAL=$(usex pdal)
- -DWITH_POSTGRESQL=$(usex postgres)
- -DWITH_BINDINGS=$(usex python)
- -DWITH_CUSTOM_WIDGETS=$(usex python)
- -DWITH_QUICK=$(usex qml)
- -DWITH_QT5SERIALPORT=$(usex serial)
- -DWITH_QTWEBKIT=OFF
- )
-
- # We list all supported versions *by upstream for this version*
- # here, even if we're not allowing it (e.g. bugs for now), so
- # we enable/disable all the right versions. This is so qgis doesn't
- # try to automatically use a version the build system knows about.
- local supported_grass_versions=( 7 8 )
- if use grass; then
- # We can do this because we have a := dep on grass &
- # it changes subslot (ABI) when major versions change, so
- # the logic here doesn't end up becoming stale.
- readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"
- readarray -d'.' -t v <<<"${f[2]}"
- grassdir="grass${v[0]}${v[1]}"
-
- GRASSDIR=/usr/$(get_libdir)/${grassdir}
-
- einfo "Supported versions: ${supported_grass_versions[@]}"
- einfo "Found GRASS version: ${v[0]}*"
-
- local known_grass_version
- # GRASS isn't slotted (in Gentoo, anyway) so we pick
- # the best version we can to build against, and disable the others.
- for known_grass_version in "${supported_grass_versions[@]}" ; do
- case "${known_grass_version}" in
- "${v[0]}")
- einfo "GRASS version ${known_grass_version} is supported. Enabling."
- mycmakeargs+=(
- "-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}"
- "-DWITH_GRASS${known_grass_version}=ON"
- )
- ;;
- *)
- einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling."
- mycmakeargs+=(
- "-DWITH_GRASS${known_grass_version}=OFF"
- )
- ;;
- esac
- done
- else
- local known_grass_version
- for known_grass_version in "${supported_grass_versions[@]}" ; do
- mycmakeargs+=(
- "-DWITH_GRASS${known_grass_version}=OFF"
- )
- done
- fi
-
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
- # bugs 612956, 648726
- addpredict /dev/dri/renderD128
- addpredict /dev/dri/renderD129
-
- cmake_src_configure
-}
-
-src_test() {
- local myctestargs=(
- # test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887
- # test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059
- -E '(ProcessingGuiTest|ProcessingQgisAlgorithmsTestPt1|ProcessingQgisAlgorithmsTestPt2|ProcessingQgisAlgorithmsTestPt3|ProcessingQgisAlgorithmsTestPt4|ProcessingGdalAlgorithmsRasterTest|ProcessingGdalAlgorithmsVectorTest|ProcessingGrass7AlgorithmsImageryTest|ProcessingGrass7AlgorithmsRasterTestPt1|ProcessingGrass7AlgorithmsRasterTestPt2|ProcessingGrass7AlgorithmsVectorTest|ProcessingOtbAlgorithmsTest|test_core_callout|test_core_compositionconverter|test_core_expression|test_core_gdalprovider|test_core_gdalutils|test_core_geonodeconnection|test_core_imagecache|test_core_labelingengine|test_core_layout|test_core_layoutcontext|test_core_layouthtml|test_core_layoutlabel|test_core_layoutmanualtable|test_core_layoutmap|test_core_layoutmapgrid|test_core_layoutmapoverview|test_core_layoutmultiframe|test_core_layoutpicture|test_core_linefillsymbol|test_core_mapdevicepixelratio|test_core_maprendererjob|test_core_meshlayer|test_core_meshlayerrenderer|test_core_networkaccessmanager|test_core_
offlineediting|test_core_pointpatternfillsymbol|test_core_rastercontourrenderer|test_core_rasterlayer|test_core_simplemarker|test_core_style|test_core_svgmarker|test_core_tiledownloadmanager|test_core_ziplayer|test_core_coordinatereferencesystem|test_core_geometry|test_gui_dualview|test_gui_htmlwidgetwrapper|test_gui_processinggui|test_gui_filedownloader|test_gui_ogrprovidergui|test_gui_meshlayerpropertiesdialog|test_gui_queryresultwidget|test_gui_listwidget|test_3d_3drendering|test_3d_tessellator|test_analysis_processingalgspt1|test_analysis_processingalgspt2|test_analysis_meshcontours|test_analysis_triangulation|test_analysis_processing|test_provider_wcsprovider|test_provider_postgresconn|test_provider_virtualrasterprovider|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQgsDataItem|PyQg
sDelimitedTextProvider|PyQgsEmbeddedSymbolRenderer|PyQgsExpressionBuilderWidget|PyQgsExternalStorageWebDAV|PyQgsGeometryTest|PyQgsGoogleMapsGeocoder|PyQgsImageCache|PyQgsLayout|PyQgsLayoutHtml|PyQgsLayoutLegend|PyQgsLayoutMap|PyQgsLayoutMapGrid|PyQgsLayoutMapOverview|PyQgsMapClippingUtils|PyQgsMapLayerComboBox|PyQgsMapLayerProxyModel|PyQgsMemoryProvider|PyQgsOGRProviderGpkg|PyQgsPalLabelingCanvas|PyQgsPalLabelingLayout|PyQgsPalLabelingPlacement|PyQgsPointCloudAttributeByRampRenderer|PyQgsPointCloudClassifiedRenderer|PyQgsPointCloudExtentRenderer|PyQgsPointCloudRgbRenderer|PyQgsProcessExecutable|PyQgsProcessingInPlace|TestQgsRandomMarkerSymbolLayer|PyQgsRasterLayer|PyQgsRasterLayerRenderer|PyQgsRasterResampler|PyQgsRulebasedRenderer|PyQgsShapefileProvider|PyQgsSvgCache|PyQgsOGRProvider|PyQgsSpatialiteProvider|PyQgsTaskManager|PyQgsVectorFileWriter|PyQgsVectorLayer|PyQgsVectorLayerCache|PyQgsVectorLayerEditBuffer|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVir
tualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)'
-
- --output-on-failure
- )
-
- virtx cmake_src_test -j1
-}
-
-src_install() {
- cmake_src_install
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- if use python; then
- python_optimize
- python_optimize "${ED}"/usr/share/qgis/python
- fi
-
- if use grass; then
- python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
-
- xdg_pkg_postinst
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/
@ 2023-07-25 10:35 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2023-07-25 10:35 UTC (permalink / raw
To: gentoo-commits
commit: 5b60343d2fd6009b5d91251c91a91414c7cdf6bf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 25 10:14:01 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 10:25:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b60343d
sci-geosciences/qgis: add 3.28.9, fix build with >=exiv2-0.28
Minor 9999 syncing.
Closes: https://bugs.gentoo.org/906470
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/qgis/Manifest | 1 +
.../qgis/files/qgis-3.28.9-exiv2-0.28.patch | 41 ++++++++++++++++++++++
.../qgis/{qgis-9999.ebuild => qgis-3.28.9.ebuild} | 22 ++++++------
sci-geosciences/qgis/qgis-9999.ebuild | 8 ++---
4 files changed, 55 insertions(+), 17 deletions(-)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 5bd5fba6dce6..2a47cdc347cd 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,3 @@
DIST qgis-3.28.6.tar.bz2 158638644 BLAKE2B 2613022c0cf2f9da86c195ba83d110d5825c6347fc45b4e953b44dee1ad8fde1541e51670e3a15a0f6c3f5158d7a7f84544bf5ab4e956d78e68523c04af1204f SHA512 4b1f39bb690173e8f8bb394e293e074ed748f18a6d108110bebbcb11305d230c1706013d05bb04d027dc2e06405228323904a33601586f79c22b402ec3987336
+DIST qgis-3.28.9.tar.bz2 159516017 BLAKE2B 2f1e19ff407ad430bef5a6696eb46dd25013634f8e3760312ec3e706aaea322427a4ae2be13b9b7888ba95d5d4c7f8de75d71a195a2078577e09e5d5f415542b SHA512 d3c30ab375c0e92573c4e6d1f193cbea932d8aa5f19aea2f177335c00ba63481dd67fd0a8bbc3586a882ae8ebcba698d0c222e7a3d0aaf75e99649ea404fe784
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/files/qgis-3.28.9-exiv2-0.28.patch b/sci-geosciences/qgis/files/qgis-3.28.9-exiv2-0.28.patch
new file mode 100644
index 000000000000..b41ba70003c1
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.28.9-exiv2-0.28.patch
@@ -0,0 +1,41 @@
+From 4de207e0ca26067146ac58133e64c17fdf755c6a Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sun, 9 Jul 2023 10:01:49 +0200
+Subject: [PATCH] Fix build with exiv2 0.28
+
+(cherry picked from commit 32f5418fc4f7bb2ee986dee1824ff2989c113a94)
+---
+ src/core/raster/qgsexiftools.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/core/raster/qgsexiftools.cpp b/src/core/raster/qgsexiftools.cpp
+index 1fbd6a84a8c..f64e07e9165 100644
+--- a/src/core/raster/qgsexiftools.cpp
++++ b/src/core/raster/qgsexiftools.cpp
+@@ -94,7 +94,11 @@ QVariant decodeExifData( const QString &key, Exiv2::ExifData::const_iterator &it
+ case Exiv2::signedLong:
+ case Exiv2::unsignedLongLong:
+ case Exiv2::signedLongLong:
++#if EXIV2_TEST_VERSION (0, 28, 0)
++ val = QVariant::fromValue( it->toUint32() );
++#else
+ val = QVariant::fromValue( it->toLong() );
++#endif
+ break;
+
+ case Exiv2::tiffDouble:
+@@ -108,7 +112,11 @@ QVariant decodeExifData( const QString &key, Exiv2::ExifData::const_iterator &it
+ case Exiv2::signedByte:
+ case Exiv2::tiffIfd:
+ case Exiv2::tiffIfd8:
++#if EXIV2_TEST_VERSION (0, 28, 0)
++ val = QVariant::fromValue( static_cast< int >( it->toUint32() ) );
++#else
+ val = QVariant::fromValue( static_cast< int >( it->toLong() ) );
++#endif
+ break;
+
+ case Exiv2::date:
+--
+2.41.0
+
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.28.9.ebuild
similarity index 96%
copy from sci-geosciences/qgis/qgis-9999.ebuild
copy to sci-geosciences/qgis/qgis-3.28.9.ebuild
index ff95ee431f21..9150ce1f55e8 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-3.28.9.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.qgis.org/"
LICENSE="GPL-2+ GPL-3+"
SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
+IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
mapserver? ( python )
@@ -53,16 +53,16 @@ COMMON_DEPEND="
dev-qt/qtnetwork:5[ssl]
dev-qt/qtpositioning:5
dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
dev-qt/qtsql:5
+ dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
media-gfx/exiv2:=
>=sci-libs/gdal-3.0.4:=[geos]
sci-libs/geos
sci-libs/libspatialindex:=
- sys-libs/zlib
>=sci-libs/proj-4.9.3:=
+ sys-libs/zlib
>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
3d? ( dev-qt/qt3d:5 )
@@ -83,18 +83,13 @@ COMMON_DEPEND="
${PYTHON_DEPS}
>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
$(python_gen_cond_dep '
- dev-python/httplib2[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/owslib[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
dev-python/sip:=[${PYTHON_USEDEP}]
postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
')
@@ -104,16 +99,15 @@ COMMON_DEPEND="
"
DEPEND="${COMMON_DEPEND}
dev-qt/qttest:5
- python? ( ${PYTHON_DEPS} )
"
RDEPEND="${COMMON_DEPEND}
sci-geosciences/gpsbabel
"
-BDEPEND="
- ${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
dev-qt/linguist-tools:5
sys-devel/bison
sys-devel/flex
+ doc? ( app-doc/doxygen )
test? (
$(python_gen_cond_dep '
dev-python/PyQt5[${PYTHON_USEDEP},testlib]
@@ -123,6 +117,8 @@ BDEPEND="
)
"
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # 3.34.0; bug 906470
+
src_prepare() {
cmake_src_prepare
# Tests want to be run inside a git repo
@@ -148,7 +144,7 @@ src_configure() {
-DPEDANTIC=OFF
-DUSE_CCACHE=OFF
-DWITH_ANALYSIS=ON
- -DWITH_APIDOC=OFF
+ -DWITH_APIDOC=$(usex doc)
-DWITH_GUI=ON
-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-DWITH_QSPATIALITE=ON
@@ -219,6 +215,8 @@ src_configure() {
use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+ CMAKE_BUILD_TYPE=Release # RelWithDebInfo enables debug logging
+
# bugs 612956, 648726
addpredict /dev/dri/renderD128
addpredict /dev/dri/renderD129
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index ff95ee431f21..a2d3bae6931f 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -53,16 +53,16 @@ COMMON_DEPEND="
dev-qt/qtnetwork:5[ssl]
dev-qt/qtpositioning:5
dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
dev-qt/qtsql:5
+ dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
media-gfx/exiv2:=
>=sci-libs/gdal-3.0.4:=[geos]
sci-libs/geos
sci-libs/libspatialindex:=
- sys-libs/zlib
>=sci-libs/proj-4.9.3:=
+ sys-libs/zlib
>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
3d? ( dev-qt/qt3d:5 )
@@ -104,13 +104,11 @@ COMMON_DEPEND="
"
DEPEND="${COMMON_DEPEND}
dev-qt/qttest:5
- python? ( ${PYTHON_DEPS} )
"
RDEPEND="${COMMON_DEPEND}
sci-geosciences/gpsbabel
"
-BDEPEND="
- ${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
dev-qt/linguist-tools:5
sys-devel/bison
sys-devel/flex
^ permalink raw reply related [flat|nested] 21+ messages in thread
end of thread, other threads:[~2023-07-25 10:35 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-30 17:41 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/ Amy Winston
-- strict thread matches above, loose matches on Subject: below --
2023-07-25 10:35 Andreas Sturmlechner
2022-10-09 18:29 Andreas Sturmlechner
2022-03-20 3:23 Sam James
2021-12-08 15:08 Andreas Sturmlechner
2021-01-23 0:25 Andreas Sturmlechner
2020-11-18 21:09 Andreas Sturmlechner
2020-11-18 21:09 Andreas Sturmlechner
2019-12-02 15:02 Andreas Sturmlechner
2019-10-20 14:21 Andreas Sturmlechner
2019-04-28 15:27 Andreas Sturmlechner
2019-02-11 16:24 Andreas Sturmlechner
2018-10-27 15:57 Andreas Sturmlechner
2018-08-15 10:37 Andreas Sturmlechner
2018-05-29 14:26 Andreas Sturmlechner
2017-04-09 21:34 Andreas Sturmlechner
2017-03-18 0:09 Andreas Sturmlechner
2017-03-02 19:39 Andreas Sturmlechner
2017-01-15 13:34 David Seifert
2015-12-30 19:59 Amy Winston
2015-12-30 17:41 Amy Winston
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox