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
+}

Reply via email to