gentoo resync : 25.08.2018

8 files changed, 346 insertions, 3 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index fec679743b32..4719e61010b2 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index b43570c6aa93..30abe842436f 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -4,6 +4,8 @@ AUX gmt-4.5.8-bfr-overflow.patch 1576 BLAKE2B 01ec91d3bf94dbc1497f4f233bc1df86ce
 AUX gmt-4.5.8-impl-dec.patch 291 BLAKE2B c6d393a8985a66dd5398fc30fd268ee4291298181eefb01c04a0e29a7e3807f4add43dd0889828cbe2cfa3010806e28d72eeef8447607dc26142305108dc2ee2 SHA512 ed977bd1a19024a60682d6e422c202cb3c29ed5da1450d85558544d6aa300ac967595811c90143a4858213a6b60b8fffee453de8351666c55676371e00b144ad
 AUX gmt-4.5.9-no-strip.patch 1246 BLAKE2B f834f1b514a2ce59a56f52290b54ef80ec1580d88facfb77f2af6aa4472609638d627ff5a10a2b692a8b3357adb12cfde0f9587f0529e5c257c9c56037be946d SHA512 271be4c32607bd4776cace933ed0a81a76fb5ea8ccc0c92f0f11cdf17f6b4f8740e2345323236af94dd4eb52323625cc82e5c661e22a008dcdc85f4d1d452b23
 AUX gmt-4.5.9-unistd.h.patch 358 BLAKE2B 48a577c87e521fe89ff815a88e0f40a6031ce4dfb388116081125f2847115786f8ae20f6797aa477edb36a602907b20fe9ca1725f89aae0b9b9e9ea00bd0a449 SHA512 877e73b161d9fbb1fe17d5f575852be67cfd9eec31ff8b74ffeb7b00569e3061d5a85c55e6633c06f12147bf7e3ab2838ab2738c5fe4adf93065ce55e7884df6
+DIST gmt-4.5.18-non-gpl-src.tar.bz2 103378 BLAKE2B 3a52b547940f3e79a6dd8076b8279310e90b3f7a01a5b9e68186fc3d1711af4f5730fa20a8a04bdc57a8e06f9a656c8db71c5bc2b8d42292cb7434ad07880732 SHA512 57281e78cd40b168cfd49818a25523c1d1b44a8c4cab59aa5683052f14df25016b70485f79327bac37f5dd8b7c77d01a2264fe08045b7c13c3e1bd216323e50e
+DIST gmt-4.5.18-src.tar.bz2 39791396 BLAKE2B 2199c337707773f91c3372992821f35a4e2d0f7451881507d29798425d914e82cc8d038fee43e6a44bbc18190619134906424f4d5ca3261af69d43934661fd90 SHA512 6d28ac29049c480d22063bbbcdb0cacf2c620e817eda19435e9b1bc0a899acf062296530f1fc677c77472fafaa6b1e6c443aaf8def7505847ed4afdd5c972945
 DIST gmt-4.5.6-doc.tar.bz2 25230761 BLAKE2B 5e4ed5400accb3da2af6d6403ffb1b86b05a8fe6724b7fcf1728c31f56cfd0a4ce80fe47b9b3f5fcab1bc42ef8cc06ec0cc971cdd7397ab059035dfe9bc2e109 SHA512 97d3ab39b8f015c7488d039af1578c9187f8fdd82e8492729150afb1ec658b2e5221d92145e0776348ecfd1a720004e9766760e3a20337b00f43f309150ae302
 DIST gmt-4.5.6-share.tar.bz2 43704 BLAKE2B 56c4c2e29a97824245c8b8cc9afbf5e865886d3047392c4ab72311bb278f4a041516a16858f06103b8edfe6ec251db09e0a3e028bb944c289ba833f99c0af79f SHA512 7b1ca938a291f06be83421d1324612851da74a2156bc7568da01b05f2a235eb2f36854abd4fac5c357f9e22df4f98a69410fc3e2e2117f72994db60c00780fc0
 DIST gmt-4.5.6-src.tar.bz2 1134118 BLAKE2B 6519002bfcafd91c420d56fb356d70cb6a814a62c8b7d9d30d77015f8401ea71ffb87b9ea4ea5b2af7917b0bce3794d66566150ce2ae82c7a5d9bb52bf5414ef SHA512 0cb06f6be7cf6a3f586f7d9b4579d5520fb15f6ef14eec216c60aa4b3fa9a3ca3308bf4683c8cc0bcf71f3c02ba74a0f9bf296fec4c1980d10adc4ba4a12024e
@@ -13,10 +15,12 @@ DIST gmt-4.5.8-non-gpl.tar.bz2 109125 BLAKE2B 7b6eef77a7c15f6d5acfc9ca4cc4d2a8db
 DIST gmt-4.5.8.tar.bz2 39350328 BLAKE2B 8d1e0c588ef4ecef1d64a4071101d9a0c14ba9780a213ce1b121840c0acd676f43931f4a4f03a539b40bfba57935f8a9e9bae3cb3630410f15cccb3bd57eb87b SHA512 5bc3be1f7963df6a3035195e2123645d8a8b7a8a9aa17c89a6dd50560485706c628e0e0aca779930c4a28f2305fcc184981db728085d3373b2cad89e59d5c6fd
 DIST gmt-4.5.9-non-gpl.tar.bz2 103494 BLAKE2B a056845917a7eb2c6e66a8797a2d47a2fe4c9a659b98242ff6953f9194d86d56a85c3e1e973f562d060a3d3396845847de683e06b6b929effb84ca0c625afe8e SHA512 a41cd94acbd014bed780797be1ac1b492388c7c8e0fcfc5e773e894e803a024bdc60b897589ad4db9af973f20606a87ac9cff606f0391641236bca95c0b7a4c5
 DIST gmt-4.5.9.tar.bz2 39325492 BLAKE2B 012afa7555d7262a4b8ae9af90309653f6f374fdb34bffbc1f0052e2cbee93b17d1f6e70934e3de555f83774a34c278bc81f5a6cc7521840a35bc70001d9ee6f SHA512 1edda71787fa2e1434a6891618d4523c39d04c2db285dadc66c1d52b425cfff6866c492926cae41d78d2a4e5118e8d003ef3d71d164e0c0695d71aaddb598242
+DIST gshhg-gmt-2.3.7.tar.gz 57052180 BLAKE2B 5b618c874cca97da819263c3c436db1235d3293712a72c21ac4ca3ae78e95b5d36915312de3df361f978b14c697884ca278bebc41ac4c1d054adda6c417eb5b9 SHA512 27e97efe9d146a58d1c6674c5b6cde6b7545be60c1f7d3d93faca1034986d1648e73b589de571897fc53cd0d050a5875dcc9923e3f861f8473ca568a8142d727
 DIST gshhs-2.1.1-coast.tar.bz2 4322743 BLAKE2B e171b6a41ceee6c15a9a7679c6a9145c1ffcede7be61bc26b351371a7bde7f4ddd68bbd5104638da56a66af3e930fc11d9dc6c215d3c3b528f0d56b855e3b496 SHA512 6009139cc4760925817e789e0c9980ec6bde1310f521e6f43e5643b9eba1e859bb9a23bdc4bb661e66d32f4886ad3ad93f5af76ca93ac847307f9acd37eeb332
 DIST gshhs-2.1.1-full.tar.bz2 29916230 BLAKE2B 80ae867a46fc5f9cab60c3e4cedb0db7d683cb58294865a228b8853b458647179382d8fc7fefcbfff7f33ee0e12b527e402376b78f1be0ff8388a81ba682d52d SHA512 f4759d21514a63b1cf3a65c75aeab951740091235e3f19d832ad2c09416d2ab8d516a8f5bf0f6068c81f6c18f76734c4bf3772c37406c1df5abd4ae445f3d375
 DIST gshhs-2.1.1-high.tar.bz2 9712697 BLAKE2B fa81ee855916566e135eb0522b414da9cf28f1cc29847fbccf80a485f337e6b8a1e051df95d38454679e0405cfa6777cc7f0139772425c082d46b6bd65c17c98 SHA512 a9c22d7ce285320d4ae22a1a446e7d7d446d1b0641abeb39d50e358d65011fd3e39761a61a41820a373df4d4ef950160f5aab71d2df899a8425caf7d162e6e0e
 DIST gshhs-2.2.0.tar.bz2 47021761 BLAKE2B 89ffbca48d782a64ec1ecf7945915a64ab70385c1db3fef65bf1d41db46f3c047554d51c13de20706fe84d1568593679fb822b23d8ab580c100159475edd9cf1 SHA512 a9c1550f24feeefbc7ae633cce41e737f8153bb7df974e942fb5b9f0c931a49707c737f34bf6316ac89aa9bf487a091ada08ca8d798e2a5385e75f3dc05fdf83
+EBUILD gmt-4.5.18.ebuild 1880 BLAKE2B 64ea1e4b79139bfbbd24e500edea6dd6d38edf211863b7cd70aa44527a4dff4349ce163c8a4666a6cedc54b146909c46c47079336c4fe97dcce9dc4db4f93eb8 SHA512 c6504708e8549b010bb0190458b12d42e5bbc796c8498caf1f22d1568ee88579f4e8d64a0442c8e8e01f76f1c680f2b2cb612445976917e8b29a42edaf264019
 EBUILD gmt-4.5.6.ebuild 2311 BLAKE2B 019492348e921aec08fd1d25d84b653c43e4c69837c1114cecc739137ad1ecfa1f157a3e5937816caa32da6a2c4656c159f010c91e850e35b9660aaed0673f07 SHA512 c3ce34dbd2e000416eae85e98b582e4729de4ee4b1e09107e8930c9802970207b35a56c76e918bf89bbff4f582f8310b6dc8bc3d89a346b25cd4ac20e021cf8c
 EBUILD gmt-4.5.8.ebuild 1972 BLAKE2B 9cbeaecc962ef48d36c1f356f62d72ff95a1c3a44f79daa46e934b0296625bd85c7a0cdfe12fbb3f13a2b789f886a717a53c4d10ec9dd56985a6aceaba7122e7 SHA512 c8f810de340e6205c5b97a6e9c2accccda2f589941c435b2f09670761960858c43ab6fb42b20fdf62895052c96f6e59969036c71df3ee2f551e51f7dd110bee1
 EBUILD gmt-4.5.9.ebuild 1954 BLAKE2B 52acf9053715f5582e7fcf89e855551574e4841de2320db4b7000aea8cedd83d42089cfd0b52adbab51e686681520709299e44bc68906cc8258e6352113acd1d SHA512 31974c6a7e26f02cf457aa4b178e32a5c556b1fce8226162b7178211e73569a2eb9df0f0e14d45c878a7c561a26e04a8e8d7e917aab9f7379c9dfba7dc1ab996
diff --git a/sci-geosciences/gmt/gmt-4.5.18.ebuild b/sci-geosciences/gmt/gmt-4.5.18.ebuild
new file mode 100644
index 000000000000..9730b119d3cb
--- /dev/null
+++ b/sci-geosciences/gmt/gmt-4.5.18.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+GSHHG="gshhg-gmt-2.3.7"
+
+DESCRIPTION="Powerful map generator"
+HOMEPAGE="https://gmt.soest.hawaii.edu/"
+SRC_URI="
+	mirror://gmt/${P}-src.tar.bz2
+	mirror://gmt/${GSHHG}.tar.gz
+	gmttria? ( mirror://gmt/${P}-non-gpl-src.tar.bz2 )"
+
+LICENSE="GPL-2 gmttria? ( Artistic )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +gdal gmttria +metric mex +netcdf octave postscript"
+
+RDEPEND="
+	!sci-biology/probcons
+	gdal? ( sci-libs/gdal )
+	netcdf? ( >=sci-libs/netcdf-4.1 )
+	octave? ( sci-mathematics/octave )"
+DEPEND="${RDEPEND}"
+
+# mex can use matlab too which i can't test
+REQUIRED_USE="
+	mex? ( octave )
+"
+
+# hand written make files that are not parallel safe
+MAKEOPTS+=" -j1"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.5.9-no-strip.patch
+	"${FILESDIR}"/${PN}-4.5.6-respect-ldflags.patch
+	)
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	default
+
+	mkdir "${S}/share/coast" || die
+	mv -f "${WORKDIR}/${GSHHG}/"*.nc "${S}/share/coast/" || die
+}
+
+src_configure() {
+	econf \
+		--libdir=/usr/$(get_libdir)/${P} \
+		--includedir=/usr/include/${P} \
+		--datadir=/usr/share/${P} \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-update \
+		--disable-matlab \
+		--disable-xgrid \
+		--disable-debug \
+		$(use_enable gdal) \
+		$(use_enable netcdf) \
+		$(use_enable octave) \
+		$(use_enable debug devdebug) \
+		$(use_enable !metric US) \
+		$(use_enable postscript eps) \
+		$(use_enable mex) \
+		$(use_enable gmttria triangle)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-all
+	einstalldocs
+
+	docompress -x /usr/share/doc/${PF}/{examples,tutorial}
+
+	# remove static libs
+	find "${ED}/usr/$(get_libdir)" -name '*.a' -exec rm -f {} + || die
+
+	cat <<- _EOF_ > "${T}/99gmt"
+	GMTHOME="${EPREFIX}/usr/share/${P}"
+	GMT_SHAREDIR="${EPREFIX}/usr/share/${P}"
+	_EOF_
+	doenvd "${T}/99gmt"
+}
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"