gentoo resync : 15.12.2019

6 files changed, 59 insertions, 93 deletions

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 7efad702126a..96f597d5523b 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,12 +1,12 @@
 AUX qgis-2.18.12-cmake-lib-suffix.patch 454 BLAKE2B b5b7b1d64fd8c8eef1b0579124261d41b8a1e01b6670d211cdebcff4f4dd905b4e15fcf94386a5e297cadc3360bf48000106805f3425cdf383c043b3cda0560f SHA512 f6b04bddf4d60d4eec257fb71cf87e15e7a72c34c1016e8eadeb660ebc7079cb8b9104041e4df5e7cbe0e00954ad65ced53b7e19f3f9f7cfbee1b791874ddcd7
-AUX qgis-3.2.1-qtwebkit-optional.patch 978 BLAKE2B 31ed74dfc390bd132547a3934d5bfb906134efc5b1d56c885a1446a4bf828474a8262414c3cdd446286a7e266d09a0f775ba2087c1741053154ca55b7773274f SHA512 dc71b850f73a11781d89bc1f08c830fd13d2d5d912d746133d7748724933143dbaf7957fbcdd8f8009ad8648d4f528661cf62ebf2aff5d04cd5856ba1429e3d8
+AUX qgis-3.10.0-cmake-lib-suffix.patch 507 BLAKE2B f9a383f380a8e5375e062350cc81bef294b79705589f537a9a7a2054806df06550a54525e307cc1eec2ecb81340faaf595a706d3d504190d720efe638ef3e2fb SHA512 a21ff313e4d1768dc15ac7dae8901d7245efb30f3caf7f9c0dbd667647e96b282f3451e7f52c8168df23ba2e953832995d975805a8f8bc176d20bd0862d9a51d
 AUX qgis-3.4.12-qt-5.13.patch 707 BLAKE2B 3a6e14a77403980df16008345c1f8a6edeba6d7bc027e6c2844501af2d902277360d0ef3955bdc9845da3c2b8a688f4d98fd3d4062c388476c20900e08827be7 SHA512 66af7639e1ab475ae1f6d89d44bef75b5904024b04209fddb6b855f3f08e823a1224233a39f595412de196f6739d026e2c0a9384694ca308d8a5bea0ab4942e5
 AUX qgis-3.4.7-default-qmldir.patch 862 BLAKE2B 6b56317dc738004451c827b577125716eda662437a4d8469c055483b0e8c0014d0bc35e071b50a6e1a23138e8b6822df226d4d80b18f789976ff922a35311200 SHA512 59fee5497129856a15bf573d2682a4c837df044ccb44bc914fb64ad6e27d321251723131ae3ab5ffffdce876be954f2fd4db52931cd3fb6fbeb2f38a41419133
 AUX qgis-3.4.7-featuresummary.patch 865 BLAKE2B 6a875895f355c17232458e1d2e33613dd40637aeb3dd3bf3c47f30497b9c15a1e4f7c377d57ed4fefbd20b02245bb701f20ebc2a5c604df5dee600050a35edba SHA512 718dd5aca408ca34da3b5478b5d6788a1c4737304c64b8b4ac212a28fbcf1c55373fcc31a2901802461d7298935c507229c1208d0fa242a5dc5d474f3d0a292f
-DIST qgis-3.2.3.tar.bz2 71991789 BLAKE2B 656c0304cfc32d619a72f08185f76cf02aed7336fac8a4bf928c7f8b0e00df2e995e891a7ba757d8ce6acb5892c5c7425765608ee0441fa7eae8070a828734d4 SHA512 3366fce6232dd1b7657c0693debf742309d5594c7875017f464efd33e63bd4116eb062a0ebeb5b3108572a9658c3fb7d729e5a5db8fefb3ceae490ef1ec6bd22
+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
-EBUILD qgis-3.2.3.ebuild 6195 BLAKE2B 92beb6aef1915030ae047a9216d2593f2c9a5f0cace785b4ac95aaa38472b1cef8012474eac3f5a59cf2dadb1f93383e6fe0d9016af447404573ad285e40ee1a SHA512 a322aa327c5c2e6512e74597216edb6fef931cb5c2e0a85f28614bda0c5a96b4ba561e1ba2613dc875921a291f4d4dee33cb35ae51ee618b91b7969b777a0a9b
-EBUILD qgis-3.4.12.ebuild 6074 BLAKE2B f3472d5e8f4c5538fe5e87bb58628ccbb643844ff7ed22bcb0ede2e25349c7d0e5a186f3a7de8d6820d47ce2ff4ef3227289c4d5ad18e9343d5ea0099877c920 SHA512 037ca4d081d4e99f0c617ab0b3874b7f3cd13a39d5344f4fbcbfae5041f6a12365801b4362aabf195f97c35a7636c516509b1725d9e112cffa0304ebc5a1e78f
-EBUILD qgis-9999.ebuild 5491 BLAKE2B ea69d54d0bf622ccad598a2465eaa22d1c88e596a726bde79da7ca5e88a5847f18942035247d2413e3230d5d82a9e882cd2750455f70adf85461250aa5ce0e79 SHA512 6ace42006d5d504bc6cccd5467f919e11dfadeec66eb2ee72341a6df95837b3683cf6ebbf2d41a904cfad395ff020d7e1574deae0b8eeede3f3b70d30700d6d5
+EBUILD qgis-3.10.0.ebuild 5492 BLAKE2B c80a9774aae4a055711d6cf61f9407173bf7fe2eba09fcea01563166378b01d4af903d347fd6556d33a9bf9f4de8aea35882ed41203b22d1aa833abaade1d5c6 SHA512 3ec865d805c4829ab01246583d725066878af3984831df95cab852d79d4abba26af358ef88d423948481a151d50414365507f1a7770ad1f8799d557245856da9
+EBUILD qgis-3.4.12.ebuild 6073 BLAKE2B 50be207fe2ab5581b0eff3bd44a513f46b96002bfa00b80a820543b141f8c418320344e655ba519654c021de6f122198a07f2f0ffc07479f7150a10fc46c27d3 SHA512 d2a520ab4f7e492a54f5a0780627b089ce48f5b58377cfb5f44436ef8303d43601652b20f257dfb4e4901f9fd7e07f1013a206ccad507b2b082d8b95c8f1f8e1
+EBUILD qgis-9999.ebuild 5493 BLAKE2B f5ba71539f41e02cbab1cf2f6e39cab371d5af9167b318f671f55d3167d6fd125392b6ac02a6799bf0321ea428e2f3d5cddc8779d0672222bde21cb160e1f41c SHA512 df8c87b10bbb48c92904fef7690b35c557d04f7c432322302bb92dd14edd66aafd93b79f21fff505b5aee4c4864bc4d425cdb7b5eafafc9abd474f3df87b16fc
 MISC metadata.xml 1413 BLAKE2B 63f664d32aa9df18e147346271d3fb1f49148848c7177cb22001962ecf1c32f69cc9758ddfabcbd3b8996f31a018dc1fb71a10d6d2e40ba79cad3e63c6ea6e75 SHA512 c1956fc3bb77b78d24547467fea5d71d2b22cd0f09be4b029f603952a7080c2f40ff00a7e45fc844774977978ad96e936de45296fae3d44aa93fda8f17598a99
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 000000000000..472b8aa466ce
--- /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/files/qgis-3.2.1-qtwebkit-optional.patch b/sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch
deleted file mode 100644
index 9e56bf5ae959..000000000000
--- a/sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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.3.ebuild b/sci-geosciences/qgis/qgis-3.10.0.ebuild
index 7c4de2ebd699..365b9209d058 100644
--- a/sci-geosciences/qgis/qgis-3.2.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.0.ebuild
@@ -1,32 +1,37 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
 QT_MIN_VER="5.9.4"
 
-if [[ ${PV} != *9999 ]]; then
+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"
-else
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+	KEYWORDS="~amd64 ~x86"
 fi
-inherit cmake-utils desktop ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
-unset GIT_ECLASS
+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 mapserver oracle polar postgres python +webkit"
+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
@@ -41,20 +46,25 @@ COMMON_DEPEND="
 	>=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
+	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]
@@ -80,14 +90,11 @@ COMMON_DEPEND="
 		>=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/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}
@@ -99,8 +106,10 @@ RESTRICT="test"
 
 PATCHES=(
 	# git master
-	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
-	"${FILESDIR}/${PN}-3.2.1-qtwebkit-optional.patch" # bug 663394
+	"${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() {
@@ -109,39 +118,36 @@ 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_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)
 	)
 
@@ -163,18 +169,6 @@ 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
 
@@ -185,11 +179,12 @@ src_install() {
 	fi
 
 	if use python; then
-		python_optimize "${ED%/}"/usr/share/qgis/python
+		python_optimize
+		python_optimize "${ED}"/usr/share/qgis/python
 	fi
 
 	if use grass; then
-		python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+		python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
 	fi
 }
 
@@ -204,17 +199,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
-
-	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
+	xdg_pkg_postinst
 }
diff --git a/sci-geosciences/qgis/qgis-3.4.12.ebuild b/sci-geosciences/qgis/qgis-3.4.12.ebuild
index e3210886844b..e26eca9f9a28 100644
--- a/sci-geosciences/qgis/qgis-3.4.12.ebuild
+++ b/sci-geosciences/qgis/qgis-3.4.12.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999 ]]; then
 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"
+	KEYWORDS="amd64 x86"
 fi
 inherit cmake-utils desktop python-single-r1 qmake-utils xdg
 
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 73aa5dd50222..9813d2056fe6 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
 QT_MIN_VER="5.9.4"