5 files changed, 257 insertions, 3 deletions
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 26afb3173532..ef632e5f7959 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,10 +1,13 @@
 AUX qgis-2.18.12-cmake-lib-suffix.patch 454 BLAKE2B b5b7b1d64fd8c8eef1b0579124261d41b8a1e01b6670d211cdebcff4f4dd905b4e15fcf94386a5e297cadc3360bf48000106805f3425cdf383c043b3cda0560f SHA512 f6b04bddf4d60d4eec257fb71cf87e15e7a72c34c1016e8eadeb660ebc7079cb8b9104041e4df5e7cbe0e00954ad65ced53b7e19f3f9f7cfbee1b791874ddcd7
 AUX qgis-3.0.0-featuresummary.patch 986 BLAKE2B 088e7aa420ae6da6b7bcbd7ffff53ec4364861fc554ae490ed5b9606eea700369158a83e5bf90f183fdc7f59bbfc9a43d4a59efd261813f022b20de3a0ac3a49 SHA512 d8ad2e2c8a1f83172f37434657762d7796adf75db06201a1cc52f412327e22aeb3d5df7b24232bfb8da66593db85e772aac3fe33672fc01f81c2fabf9b8d1835
 AUX qgis-3.0.3-qt-5.11.0.patch 1210 BLAKE2B fb55302592c6c8168d8863e8794b424df350fb0231bef5772be9c43743d813bcf2f6c4d4ad1a45cf52baae371a418267e8dbeead88fb2141ac077394077d67f9 SHA512 30518f7534e452a105a428953e1fb1119acce593393fb677e7571a01a692feb6764cbb05b56aed6f866cd4c79f4fdda02da8fda4bf9fb95b1765ba0bde4a0814
+AUX qgis-3.2.1-qtwebkit-optional.patch 978 BLAKE2B 31ed74dfc390bd132547a3934d5bfb906134efc5b1d56c885a1446a4bf828474a8262414c3cdd446286a7e266d09a0f775ba2087c1741053154ca55b7773274f SHA512 dc71b850f73a11781d89bc1f08c830fd13d2d5d912d746133d7748724933143dbaf7957fbcdd8f8009ad8648d4f528661cf62ebf2aff5d04cd5856ba1429e3d8
 DIST qgis-3.0.3.tar.bz2 94462631 BLAKE2B 047f4d8852b7572dc94b9c04ec9c81e53bab2ed63a7a490682b7c557ae1b21fcc3257e751cc794d368dc4124c20c008ffdc7f1f4b79af2faea78774dc6ef430c SHA512 67f46f1acacd6688984b0c13aa5880e2f31d85b5a28ebf12830d33f198c2e5983887a8c85036b8be59edf3836ba7d38985f58433f53d3164c2ffb4a6db94d046
 DIST qgis-3.2.1.tar.bz2 72064255 BLAKE2B 7811726c3c8e84e9d2e0f2cd500d3373895bd2f91b093943d451f65de5d722ae986df59754f6d1ca6bb1a0597a841c568b40113498cb9ef707c878184387fe44 SHA512 737aa95f71661c4b2738a9db8fea49ce21f04a94768130f33b063dbca17f04119a74508211257510196b239d3acc9019e17478820534a4353519f91fbb0bc27f
+DIST qgis-3.2.2.tar.bz2 71947443 BLAKE2B a6fc159ce6d90f4273483159831c9b89db40c3bd5fb34ec90d799978aae11a609509d5fd5189dc1edfb9fb72cd9ccd9298414d024db3c43561ea096774b7be17 SHA512 d19d44f71285e1d8a1d365a406550c68cd48215c7f9f67a979052f1f115d636c66c6a291e1a108b19a641f357b27e104ac642158f375fb631c141e844f468949
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
 EBUILD qgis-3.0.3-r1.ebuild 6233 BLAKE2B df8a8d83be8b563027abc3d7e6f759357449bd9852a205e7583e5055e564da68645df7be5f8aab8107bfa115d5eb48889acdee6c8c98b1eed4f14379e5b9cf07 SHA512 18da6eb489ca5095099c11d20582c1ea140f4c843f3fc6f02c01b8a338a522420a7be44479cd61f9101ecc90621ba5da6581e28dbe7fe90cdb5377fd4f91f096
-EBUILD qgis-3.2.1.ebuild 6135 BLAKE2B 428e80a7bfa00ce20bb043293f004a09e7cc5679d528f9220cbcb5585aa3688f638d69e7ceec94ffc546203f1199e223faa1a0a1ac0b12d0aa34116415c3025e SHA512 551b9f93f91a714303d057a1c9e1d814e534929e3fc192531c2fc3ac04fd63156f03872014cb733410733abc2c9417662c6e67842331b8e3f8fff06053df5d63
-EBUILD qgis-9999.ebuild 6298 BLAKE2B 73f926b0c0f0205b22382ed0c2621cf0c77aacdf623d7a94e1c47399e2129fa2bf6893f974dd427092af90d0b0f30e1046e7b892d19f22f9c171a939c22bd631 SHA512 14c9c816890f9948ade5e0000d2b154aec820ab5a47d309c2f3db1fd0bd42a96f659cc3e9aab127ac850b6e2104f273951e8656d1e3e6778cee207e0be6e9e7b
+EBUILD qgis-3.2.1.ebuild 6192 BLAKE2B cb779cd991376e160bcf4e81e2f6af42aa97d7f9b4a53399cada6e786efbe5c54631cebf92fe59083e85ec0aaa22f0d89033289ed22654b43e3c4fa4d8d6a5ea SHA512 26e0da2a196837919e90e591ff539ca1dc89ad6f1b2f7ea90371de888251b237d42d6a1f0ce1ff4552cd4851a46b6f620dfe7f88f38daafdb562a1ea495a936a
+EBUILD qgis-3.2.2.ebuild 6200 BLAKE2B af609ca54b0333b34f0f0f6c5d940e88f49093d4ffe4326af010b21f5ac456ddca9dde7d71b3c8fbda78122309401026139c4a1da6e42b3a6e195b610a16dad3 SHA512 59a5b4868a1fa0cc6f5949553918b90f7dce113e0cf8474fda13d445f2ee313d732cb824ac73eee735633bd2fdcbe79ba2d54d485cb3a6744d663a72bbb7abd6
+EBUILD qgis-9999.ebuild 6299 BLAKE2B f0e1b484879bfb2d2545694183f81afd9994eac66575d108c072d74f2ac3f5006c8c1cbb08d46fa4961123089bcb9edb5685255d04c2cd6598ac4282a2810af7 SHA512 ec18b18d2b791372df0a5e3d0d37d76d368a193f465aca05cf2636883f91e1050e7d99dad71d2755ef2f3c1b9fdd99badab9e3c8765c9a54e1492164a831e0aa
 MISC metadata.xml 1211 BLAKE2B 761852f48581c7cca9f9474d1e2e99c751ca2597726cbbb973c82c6292806e4908fcaa091ad4ad5b60f73cea831db2f94be9c7ae3627ad9bfbe0a7572638c929 SHA512 22aa2127957668f8017e20d08297ef222bb1f9fd0a420398ee191426de0b681fb90138bfa8117f67612001d64020455871db4b8a772653d9ee02d7777555e48b
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 000000000000..9e56bf5ae959
--- /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 d5c984cfc17c..d5ad55122d0f 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() {
diff --git a/sci-geosciences/qgis/qgis-3.2.2.ebuild b/sci-geosciences/qgis/qgis-3.2.2.ebuild
new file mode 100644
index 000000000000..23afe352fad8
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.2.2.ebuild
@@ -0,0 +1,220 @@
+# 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
+}
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 7ea4905841a8..afbd37bc704c 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -15,7 +15,7 @@ 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
+inherit cmake-utils desktop ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
 unset GIT_ECLASS
 
 DESCRIPTION="User friendly Geographic Information System"