gentoo resync : 03.11.2019

4 files changed, 36 insertions, 26 deletions

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index ad46cd4dec0c..9b8bbe61e3e2 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,11 +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.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.4.7.tar.bz2 74373862 BLAKE2B 9b3a9987df406c703b0cdac36bc5267cca23b77e1c9f142e74b5170018c7c1ccdca738908412803a6703b0d2e64ef7733f2f4e986188cf90ce79a65e72113a55 SHA512 3977a49378ecaa27556ce76c6755281e477cea4a29a6a2ab496ef8e7b9b488cb31f9a124eece6f8a4974c98f0ae5396061e8c14fd577655bb4d428b818d1e1db
+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.7.ebuild 6148 BLAKE2B a172b10767c6b4b090f4dce7523886e4cb328c34b263a28702982999c6468a4d0e8bd2f55db6373c79bce77187315b55a8f0bcaf5ab19cea0c6b8b6f984c383b SHA512 93dfd0d7e4fcb926e5c136dffa2c296f27c08e586eca0c7e3f6397a056d1de8e2d1055f9ea18fcabc55bf475d6a4e272fb8af56af854330c4f00efdd1308967c
-EBUILD qgis-9999.ebuild 6060 BLAKE2B a3de4e10e3bbb1b403a8aabf9ca3fb7c08ab883438946677edd77f82090823aa2b4d7e2f95e290e0cb46ba221298384bad387e7f1ca49a122019b3e8d1a855ef SHA512 49083b5cacb71c640f9319659c614f21c0dda8503624f0b6437514cbb0addc1f494ca2d00cafcc27e86a18dbd39ecc4a1a672292a5477839aceed5527ed4da1e
+EBUILD qgis-3.4.12.ebuild 6075 BLAKE2B 64e2aa5661165efcbdfc3ce28c85c44cc9b9dfcc03a28883848d09b45401c450af0f50a27c219cc8db7498fdcd76302e77d70d386e1416eb7e2eef64f22c85fd SHA512 ac1f98028a53e363a2f7ac0ac334f6a7ea45a29aa7cee142b02c587b5c5700a65cefe2f9f6388567734cd21e553f3ff5227e534e167ba608481080007b58cade
+EBUILD qgis-9999.ebuild 5491 BLAKE2B ea69d54d0bf622ccad598a2465eaa22d1c88e596a726bde79da7ca5e88a5847f18942035247d2413e3230d5d82a9e882cd2750455f70adf85461250aa5ce0e79 SHA512 6ace42006d5d504bc6cccd5467f919e11dfadeec66eb2ee72341a6df95837b3683cf6ebbf2d41a904cfad395ff020d7e1574deae0b8eeede3f3b70d30700d6d5
 MISC metadata.xml 1413 BLAKE2B 63f664d32aa9df18e147346271d3fb1f49148848c7177cb22001962ecf1c32f69cc9758ddfabcbd3b8996f31a018dc1fb71a10d6d2e40ba79cad3e63c6ea6e75 SHA512 c1956fc3bb77b78d24547467fea5d71d2b22cd0f09be4b029f603952a7080c2f40ff00a7e45fc844774977978ad96e936de45296fae3d44aa93fda8f17598a99
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 000000000000..9edb44276098
--- /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-3.4.7.ebuild b/sci-geosciences/qgis/qgis-3.4.12.ebuild
index c4b4335cecb7..e0c6822fbdda 100644
--- a/sci-geosciences/qgis/qgis-3.4.7.ebuild
+++ b/sci-geosciences/qgis/qgis-3.4.12.ebuild
@@ -53,7 +53,7 @@ COMMON_DEPEND="
 	>=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 )
@@ -106,9 +106,10 @@ RESTRICT="test"
 PATCHES=(
 	# git master
 	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+	"${FILESDIR}/${P}-qt-5.13.patch"
 	# TODO upstream
-	"${FILESDIR}/${P}-featuresummary.patch"
-	"${FILESDIR}/${P}-default-qmldir.patch"
+	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
+	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
 )
 
 pkg_setup() {
@@ -210,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 a541d6c46fd2..73aa5dd50222 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -27,6 +27,7 @@ IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
 BDEPEND="
+	${PYTHON_DEPS}
 	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
 	sys-devel/bison
 	sys-devel/flex
@@ -50,10 +51,11 @@ COMMON_DEPEND="
 	>=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 )
@@ -93,7 +95,6 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qttest-${QT_MIN_VER}:5
-	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
 	python? ( ${PYTHON_DEPS} )
 "
 RDEPEND="${COMMON_DEPEND}
@@ -128,7 +129,9 @@ src_configure() {
 		-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
@@ -166,18 +169,6 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	newmenu linux/org.qgis.qgis.desktop.in org.qgis.qgis.desktop
-
-	local size type
-	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} linux/icons/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} linux/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
-		for type in qgs qml qlr qpt; do
-			newicon -c mimetypes -s ${size} linux/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
 
@@ -188,6 +179,7 @@ src_install() {
 	fi
 
 	if use python; then
+		python_optimize
 		python_optimize "${ED}"/usr/share/qgis/python
 	fi
 
@@ -207,9 +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
 
 	xdg_pkg_postinst
 }