8 files changed, 254 insertions, 119 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index e27895a1644b..5868cf6394d1 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index f3c01e1d4177..60dea2a5a53f 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -18,6 +18,7 @@ DIST gpsd-3.16.tar.gz 8587490 BLAKE2B db6619308ddb2f473727bc91d2f696a401a0b4f97a
 DIST gpsd-3.17.tar.gz 8755304 BLAKE2B d1f82b5734fd90fe903a6f2fe8835fe8292fe3e729306e7abe4054821971fece4c23f382c08a233503f07ad66b7b3a02a52a000e55c08491bf254ab6e99378b5 SHA512 71085053f600730e0f2de269c59ce0a17ae106ef01403f02d78418b267c6adb9818d541fba59eb23bf71cdb67c5442c82b4948d262ef7e74bb993dcae677a1b1
 EBUILD gpsd-3.10.ebuild 4785 BLAKE2B 602594de9a4834b3f765a3be4e69148230987c9855f8294d9bf424704f7dadc74f1df2b92ce166752217cee8d0547ef331330819add3cafd046caa66a946bb1a SHA512 6c253b1459de0a8233537543a8c5031b6b30b2f78b4a080f31745f0fe75bb90254843a66e4f59ada264f0bfaacc3c1756351c2b0bb357a6056d96a3164bbe026
 EBUILD gpsd-3.16.ebuild 4930 BLAKE2B 14ebc98190eddf603ff9c747d871ebaf576538ff9e20b212262bf680abbb3976d3ba9d0a4397afbf9ea2419496aec587639be301f64ff7010fff6101b4d23d53 SHA512 0b977e0cf70f20ac136046ba83d3be128e0a78c3f4a62e593a7e17daeacf0b300803e34c90b15b3e3ee51c58c1c304925f9b25e78f1679edfddd7b1ffb8f26d4
+EBUILD gpsd-3.17-r1.ebuild 4676 BLAKE2B 1a0a1ff1676ab7aa121b62ec7a5c17e73f74540b26f9c948b37a417346bde2c61b8bf2b33f33337deb0f3921a63bd3065be7c5d478dd4fbef67aeec39c8b377c SHA512 9524f3e9717280f664852933759153ee63eaa63d8f364792d27db5efaaeca788a4f049937b196fd69a5cec7b1b77a557c409f66973ad7eea0efd11da437bca3c
 EBUILD gpsd-3.17.ebuild 4627 BLAKE2B b257c138e370fa05be7931c76bad948ba3e747727b18a1b12856eafe7de01869ef99b3c1ee3ac7c1bd68697aa193fb199bbb26b5ec3e67318f497e14a0ee62f3 SHA512 7b4518ba869362b11fa793d66914c60d75411d017de7c75d77aef12502b1c21ca0823b36c38711b3162856cf0ed9c2187ddc49b3ffa8c4c663f4db402a9273c0
-EBUILD gpsd-9999.ebuild 4629 BLAKE2B afb67003f8f0eaad3271cb16ec1a04cbd4c4a1b098b70ddde5c43dadfa530e6e2e2c10b1a3f3879f95462ee41ba876365e32195fcb2c1c1019409b62379342e7 SHA512 0b7a2df7735101138d71a1076f4625e8b6e4c066953f0d2aff6ea55fcd966a0da7a77d30a924717745ea063f4a02eab857dca8063f46d0674b7c6c54969e02aa
+EBUILD gpsd-9999.ebuild 4676 BLAKE2B 1a0a1ff1676ab7aa121b62ec7a5c17e73f74540b26f9c948b37a417346bde2c61b8bf2b33f33337deb0f3921a63bd3065be7c5d478dd4fbef67aeec39c8b377c SHA512 9524f3e9717280f664852933759153ee63eaa63d8f364792d27db5efaaeca788a4f049937b196fd69a5cec7b1b77a557c409f66973ad7eea0efd11da437bca3c
 MISC metadata.xml 950 BLAKE2B a2250377cdd4f1e827e7fe7dd5f8707316e8cbe9552f4ca2e56828e138d2d2b31d5c6cc930247c8666c9546fbe8dad618b2c38a34b6caac7f9e82ca620806ef3 SHA512 a5e8e60afc8c02e769cf496caa30003173455d82554378457ee7350bcc64b57a88b697cf2284a7a56f008461a33d260d167ce866bde0710e235f684e201a5bf8
diff --git a/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild
new file mode 100644
index 000000000000..cb88e5860ea5
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 )
+SCONS_MIN_VERSION="1.2.1"
+
+inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
+	inherit git-2
+else
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
+HOMEPAGE="http://catb.org/gpsd/"
+
+LICENSE="BSD"
+SLOT="0/23"
+
+GPSD_PROTOCOLS=(
+	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
+	gpsclock isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip oceanserver
+	oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt
+	tripmate tsip ublox
+)
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X"
+REQUIRED_USE="X? ( python )
+	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	bluetooth? ( net-wireless/bluez )
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	ncurses? ( sys-libs/ncurses:= )
+	ntp? ( || (
+		net-misc/ntp
+		net-misc/chrony
+	) )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+	)
+	python? ( ${PYTHON_DEPS} )
+	usb? ( virtual/libusb:1 )
+	X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( sys-devel/bc )"
+
+# xml packages are for man page generation
+if [[ ${PV} == *9999* ]] ; then
+	DEPEND+="
+		app-text/xmlto
+		=app-text/docbook-xml-dtd-4.1*"
+fi
+
+src_prepare() {
+	# Make sure our list matches the source.
+	local src_protocols=$(echo $(
+		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
+	) )
+	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
+		eerror "Detected protocols: ${src_protocols}"
+		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
+		die "please sync ebuild & source"
+	fi
+
+	epatch "${FILESDIR}"/${P}-do_not_rm_library.patch
+
+	# Avoid useless -L paths to the install dir
+	sed -i \
+		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
+		SConstruct || die
+
+	use python && distutils-r1_src_prepare
+}
+
+python_prepare_all() {
+	python_export_best
+	# Extract python info out of SConstruct so we can use saner distribute
+	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
+	local pybins=$(pyvar python_progs | tail -1)
+	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
+	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
+	local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
+	sed \
+		-e "s|@VERSION@|$(pyvar gpsd_version)|" \
+		-e "s|@URL@|$(pyvar website)|" \
+		-e "s|@EMAIL@|$(pyvar devmail)|" \
+		-e "s|@SCRIPTS@|${pybins}|" \
+		-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
+		-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
+		-e "s|@SCRIPTS@|${pybins}|" \
+		"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	myesconsargs=(
+		prefix="${EPREFIX}/usr"
+		libdir="\$prefix/$(get_libdir)"
+		udevdir="$(get_udevdir)"
+		chrpath=False
+		gpsd_user=gpsd
+		gpsd_group=uucp
+		nostrip=True
+		python=False
+		qt_versioned=5
+		manbuild=False
+		shared=$(usex !static True False)
+		$(use_scons bluetooth bluez)
+		$(use_scons cxx libgpsmm)
+		$(use_scons debug clientdebug)
+		$(use_scons dbus dbus_export)
+		$(use_scons ipv6)
+		$(use_scons latency_timing timing)
+		$(use_scons ncurses)
+		$(use_scons ntp ntpshm)
+		$(use_scons ntp pps)
+		$(use_scons shm shm_export)
+		$(use_scons sockets socket_export)
+		$(use_scons qt5 libQgpsmm)
+		$(use_scons usb)
+	)
+
+	# enable specified protocols
+	local protocol
+	for protocol in ${GPSD_PROTOCOLS[@]} ; do
+		myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
+	done
+}
+
+src_compile() {
+	export CHRPATH=
+	tc-export CC CXX PKG_CONFIG
+	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
+	escons
+
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	DESTDIR="${D}" escons install $(usex udev udev-install "")
+
+	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
+	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
+
+	if use python ; then
+		distutils-r1_src_install
+		# Delete all X related packages if user doesn't want them
+		if ! use X ; then
+			rm "${ED%/}"/usr/bin/xgps* || die
+		fi
+	fi
+}
+
+pkg_preinst() {
+	# Run the gpsd daemon as gpsd and group uucp; create it here
+	# as it doesn't seem to be needed during compile/install ...
+	enewuser gpsd -1 -1 -1 "uucp"
+}
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index cd3ef4ffa066..cb88e5860ea5 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=5
 
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python2_7 )
@@ -30,28 +30,35 @@ GPSD_PROTOCOLS=(
 	tripmate tsip ublox
 )
 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets static test udev usb X"
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X"
 REQUIRED_USE="X? ( python )
 	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	ncurses? ( sys-libs/ncurses:= )
+RDEPEND="
 	bluetooth? ( net-wireless/bluez )
-	usb? ( virtual/libusb:1 )
 	dbus? (
 		sys-apps/dbus
 		dev-libs/dbus-glib
 	)
-	ntp? ( || ( net-misc/ntp net-misc/chrony ) )
-	qt4? ( dev-qt/qtgui:4 )
-	python? ( ${PYTHON_DEPS} )"
+	ncurses? ( sys-libs/ncurses:= )
+	ntp? ( || (
+		net-misc/ntp
+		net-misc/chrony
+	) )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+	)
+	python? ( ${PYTHON_DEPS} )
+	usb? ( virtual/libusb:1 )
+	X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? ( sys-devel/bc )"
 
 # xml packages are for man page generation
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	DEPEND+="
 		app-text/xmlto
 		=app-text/docbook-xml-dtd-4.1*"
@@ -108,6 +115,7 @@ src_configure() {
 		gpsd_group=uucp
 		nostrip=True
 		python=False
+		qt_versioned=5
 		manbuild=False
 		shared=$(usex !static True False)
 		$(use_scons bluetooth bluez)
@@ -121,7 +129,7 @@ src_configure() {
 		$(use_scons ntp pps)
 		$(use_scons shm shm_export)
 		$(use_scons sockets socket_export)
-		$(use_scons qt4 libQgpsmm)
+		$(use_scons qt5 libQgpsmm)
 		$(use_scons usb)
 	)
 
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index b319c8e1c4f1..fe4359e2a6c6 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,12 +1,11 @@
 AUX qgis-2.18.12-cmake-lib-suffix.patch 454 BLAKE2B b5b7b1d64fd8c8eef1b0579124261d41b8a1e01b6670d211cdebcff4f4dd905b4e15fcf94386a5e297cadc3360bf48000106805f3425cdf383c043b3cda0560f SHA512 f6b04bddf4d60d4eec257fb71cf87e15e7a72c34c1016e8eadeb660ebc7079cb8b9104041e4df5e7cbe0e00954ad65ced53b7e19f3f9f7cfbee1b791874ddcd7
 AUX qgis-2.18.12-sip.patch 4471 BLAKE2B c4bbdbfe43f6b9c2a4f8aec25109a40967fd93ca815d0fcb2007ee8072e620c0b3aca08890cff4e085a8a2f35962d3f8e3eec54f4256274f7edb5a977b74dc63 SHA512 df08773c915ee640b6ef81ffdb1553e144f5530934bed3a37230824662fa99de91bcc52475f7232e44df3ebd147abf54f537b6a23b02563a5155c14a7d2cb9a6
 AUX qgis-2.18.6-featuresummary.patch 1009 BLAKE2B bca5de34bc4eccc10aee3b4320be0259c342d45ea538fd92d6229243fc6b0c6ab90dcc8f24fd9bc10119cac6ab87c1a64f47528269f07865e3e8bf1ca16e4f1f SHA512 4f271d7fb5b39b49bd06cb6308e82b44088978e2fcc17e453dcdc71655000b91be06e08ce05a373ed45d25472422a7b317c12b19a3a41620df07ea723766b44e
-AUX qgis-2.18.6-python.patch 647 BLAKE2B 784d5a412d349dda3d60232e184446764cd10f78ff78adb5c26f84859d2e83391d51a88b199678dde90e2361d671093a8ac7a010559c4af240bce416d15a889c SHA512 71d3ab2c1669e76fbfdb5700906c4940f74111e698b19111f148c6e96dd900f9527fc92e6ddbd801318d788f7348ad8ac294fd26e5f7e5ed1bde5bdd6b23e49c
 DIST qgis-2.18.12.tar.bz2 84936155 BLAKE2B 0d47094ae8dac3101888140b5773a8e7b52d2562517bb30983592043267adc28d878ad644162ad04d84440497c567d075225db3db5a215440dee7258a8faade3 SHA512 e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea
 DIST qgis-2.18.14.tar.bz2 84935301 BLAKE2B 37468062894235608f6efd0b58311e019f57ec0b3e6db63d8fef92ae93ac95ed13fe51290ebd063d31f1ea2318a23d7bdabb0774b451a2305064162addb4da29 SHA512 da738ae25f1207441a52091af9a3e70fd17f95704a23e27f72ee4c7ba213fd9ccf2d6685d91c34f94c555ca2dce420d6a07840b1fa682d6b960abdf3ba177036
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
 DIST qgis_sample_data.tar.gz 13601736 BLAKE2B 92acadbd009b181e74516120b3a700c96c7c1a732240434439bbe51afa441dee6521dac7bf6629fb5d7489b63fd0e0a45b1871df099820e8cd594920fa1499b7 SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78
-EBUILD qgis-2.18.12-r100.ebuild 6075 BLAKE2B b4955a6cab9f5c6923166b1c7230f29715f6d9b5a022cce4918827a1345daf2734c766ede7be2435f2ff444aa805cffb7206c50e4131a06821c5dd92ed332d0c SHA512 721ed584321140c52890025c78e9faa32fb867fbe24572e3730c0ba3ef24864ab8c8338faf29ec93abc69dd581a00b319e533e42fb0a3c37435596212c8f2971
 EBUILD qgis-2.18.12.ebuild 5279 BLAKE2B b4400f19270a6d724890e4c1e1c0c8273429ffc491cf46f5c7d6c0c27a621a9d198568f3d6f60665a7b13fcd9484ae551f73c148877fafca51c7852bb444e92b SHA512 8118478f8aa8bc7ca5221f48125b6fab899bb8bd4db12da89472fc853f1b0eb8094a51c715e1962970b67462b7ed7939f9a92142b52442fd9d735ab3ce9162a4
 EBUILD qgis-2.18.14.ebuild 5331 BLAKE2B c3600735a749a82521dcb6adaf3cf8fa72d91ccda47d64cadb6da3f69789b4fb188303e7073792fb1906fcb5d49763cb4d13c0634fa08f2d67c6b99301fb097e SHA512 b62acaea5e1f8a1467593f194cde90ef2558f64cd915f517a042299865822656db8a743c47cd2f8bfd3710fdbb7ec4ed66ba8f5cab681392db6852927d91b341
-MISC metadata.xml 1105 BLAKE2B 6822fb7470bb8416a5cdaf7acc641099d310a3a0b7f86fe19bc5d77a97deb24418911b911bab42c68214c587380771367cd9657a7ea9dd1ae5abdb0272b06507 SHA512 d16c2396c35d915e1d284aaa7b59118b9a66284fcd5e8cfef8b5835b88bf75e3a3ede1b6e7d939e403aa212190afc49b51deebc4868bfa38b44d2e6c25150fa4
+EBUILD qgis-9999.ebuild 5910 BLAKE2B 77f6df6411886052e400725c9f54ae0a21ac42d98d5414591646d19815d269b2b697f71fff4889ddd2101fd32178289bbb745a7848b4cdac1efa7303cd52fb37 SHA512 42ab726a18914c7f9b24cb839e19e2a36d0b4d8a28da18da979bc5eecfae4b964ecb58595c7c0537d4c450f9a64fe14513beceecbe2b3b282a36c31c91549e64
+MISC metadata.xml 1121 BLAKE2B c81c6538e2b0a0094f7566fc72e2c4249d5ff21d999355502b0eaf89cb77b0be305d0df0aa366144bf4ced98e5b07969b33a4f6ee2efb3438cdf098788850571 SHA512 bdd356ee78300f01de7169ab2c8915c369e8e2d5a7cce85df21ba4c4835b65164cc28d7258e7ac0efba4b826cce2d90d179c9247b3f53c06ba73d6b2ac175d06
diff --git a/sci-geosciences/qgis/files/qgis-2.18.6-python.patch b/sci-geosciences/qgis/files/qgis-2.18.6-python.patch
deleted file mode 100644
index b8a812d3e4fa..000000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.6-python.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 13d8e30bbe0ee17fff32a3eba90cd217d277e5ac
-Author: Marco Bernasocchi <marco@opengis.ch>
-Date:   Wed Dec 7 19:08:24 2016 +1300
-
-    fix 2.18 build with Qt5 by executing pyuic
-
-diff --git a/scripts/pyuic-wrapper.sh b/scripts/pyuic-wrapper.sh
-index d6fb497a84..aa146b31bb 100755
---- a/scripts/pyuic-wrapper.sh
-+++ b/scripts/pyuic-wrapper.sh
-@@ -15,12 +15,12 @@
- ###########################################################################
- 
- 
--PYUIC4=$1
-+PYUIC=$1
- LD_LIBRARY_PATH=$2:$LD_LIBRARY_PATH
- PYTHONPATH=$3:$PYTHONPATH
- PYTHON=$4
- shift 4
- 
- export LD_LIBRARY_PATH PYTHONPATH
--
-+$PYUIC $@
- exec $PYTHON $(dirname $0)/pyuic-wrapper.py $@
diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index b08b019390ee..511bb239d69d 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci-geosciences@gentoo.org</email>
-    <name>Gentoo Geosciences Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  Quantum GIS (QGIS) is a user friendly Open Source Geographic
-  Information System (GIS). QGIS supports vector, raster, and database
-  formats. QGIS lets you browse and create map data on your
-  computer. It supports many common spatial data formats (e.g. ESRI
-  ShapeFile, geotiff). QGIS supports plugins to do things like display
-  tracks from your GPS. 
-</longdescription>
-  <use>
-    <flag name="designer">Build custom widgets for <pkg>dev-qt/designer</pkg></flag>
-    <flag name="georeferencer">Determines whether georeferencer plugin should be built</flag>
-    <flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
-    <flag name="mapserver">Determines whether mapserver should be built</flag>
-    <flag name="touch">Enable support for touch input devices</flag>
-  </use>
+	<maintainer type="project">
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
+	<longdescription lang="en">
+	Quantum GIS (QGIS) is a user friendly Open Source Geographic
+	Information System (GIS). QGIS supports vector, raster, and database
+	formats. QGIS lets you browse and create map data on your
+	computer. It supports many common spatial data formats (e.g. ESRI
+	ShapeFile, geotiff). QGIS supports plugins to do things like display
+	tracks from your GPS.
+	</longdescription>
+	<use>
+		<flag name="designer">Build custom widgets for <pkg>dev-qt/designer</pkg></flag>
+		<flag name="georeferencer">Determines whether georeferencer plugin should be built</flag>
+		<flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
+		<flag name="mapserver">Determines whether mapserver should be built</flag>
+		<flag name="polar">Enable support for the polar coordinate system via <pkg>x11-libs/qwtpolar</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-geosciences/qgis/qgis-2.18.12-r100.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 2e8591032def..704f228f1f85 100644
--- a/sci-geosciences/qgis/qgis-2.18.12-r100.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -3,12 +3,13 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 PYTHON_REQ_USE="sqlite"
+QT_MIN_VER="5.9.1"
 
 if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
-		examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+	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"
@@ -18,41 +19,39 @@ inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-uti
 unset GIT_ECLASS
 
 DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
+HOMEPAGE="https://www.qgis.org/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="designer examples georeferencer grass mapserver oracle postgres python touch"
+IUSE="designer examples georeferencer grass mapserver oracle polar postgres python webkit"
 
 REQUIRED_USE="
 	mapserver? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
 COMMON_DEPEND="
-	app-crypt/qca:2[qt5,ssl]
-	>=dev-db/spatialite-4.1.0
+	app-crypt/qca:2[qt5(+),ssl]
+	>=dev-db/spatialite-4.2.0
 	dev-db/sqlite:3
 	dev-libs/expat
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtpositioning:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtsvg:5
-	dev-qt/qtsql:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
+	dev-libs/libzip:=
+	>=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
+	>=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,python?,${PYTHON_USEDEP}]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
 	sci-libs/proj
-	x11-libs/qscintilla:=[qt5]
-	>=x11-libs/qwt-6.1.2:6=[qt5,svg]
-	>=x11-libs/qwtpolar-1.1.1-r1[qt5]
-	designer? ( dev-qt/designer:5 )
+	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+	designer? ( >=dev-qt/designer-${QT_MIN_VER}:5 )
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( >=sci-geosciences/grass-7.0.0:= )
 	mapserver? ( dev-libs/fcgi )
@@ -60,6 +59,7 @@ COMMON_DEPEND="
 		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}]
@@ -67,21 +67,22 @@ COMMON_DEPEND="
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/markupsafe[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[sql,svg,webkit,${PYTHON_USEDEP}]
+		dev-python/PyQt5[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[qt5,${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}]
 		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 	)
+	webkit? ( >=dev-qt/qtwebkit-${QT_MIN_VER}:5 )
 "
 DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qttest:5
-	dev-qt/qtxmlpatterns:5
+	>=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
 "
@@ -93,13 +94,10 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	# TODO upstream
-	"${FILESDIR}/${PN}-2.18.6-featuresummary.patch"
-	"${FILESDIR}/${PN}-2.18.6-python.patch"
 	# Taken from redhat
-	"${FILESDIR}/${P}-sip.patch"
+	"${FILESDIR}/${PN}-2.18.12-sip.patch"
 	# git master
-	"${FILESDIR}/${P}-cmake-lib-suffix.patch"
+	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
 )
 
 pkg_setup() {
@@ -118,7 +116,6 @@ src_prepare() {
 		-i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
 
 	cd src/plugins || die
-	use georeferencer || cmake_comment_add_subdirectory georeferencer
 }
 
 src_configure() {
@@ -129,28 +126,20 @@ src_configure() {
 		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
 		-DQWT_INCLUDE_DIR=/usr/include/qwt6
 		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
-		-DWITH_INTERNAL_QWTPOLAR=OFF
 		-DPEDANTIC=OFF
 		-DWITH_APIDOC=OFF
 		-DWITH_QSPATIALITE=ON
 		-DENABLE_TESTS=OFF
-		-DENABLE_QT5=ON
 		-DWITH_CUSTOM_WIDGETS=$(usex designer)
+		-DWITH_GEOREFERENCER=$(usex georeferencer)
 		-DWITH_GRASS=$(usex grass)
 		-DWITH_SERVER=$(usex mapserver)
 		-DWITH_ORACLE=$(usex oracle)
+		-DWITH_QWTPOLAR=$(usex polar)
 		-DWITH_POSTGRESQL=$(usex postgres)
 		-DWITH_BINDINGS=$(usex python)
-		-DWITH_TOUCH="$(usex touch)"
+		-DWITH_QTWEBKIT=$(usex webkit)
 	)
-#	# FIXME: Re-add when segfaults were figured out upstream, bug #612070
-#	-DWITH_QTWEBKIT=$(usex webkit)
-
-	if has_version '<x11-libs/qscintilla-2.10'; then
-		mycmakeargs+=(
-			-DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2.so
-		)
-	fi
 
 	if use grass; then
 		mycmakeargs+=(
@@ -159,18 +148,10 @@ src_configure() {
 		)
 	fi
 
-	if use python; then
-		mycmakeargs+=(
-			-DBINDINGS_GLOBAL_INSTALL=ON
-			-DWITH_PYSPATIALITE=ON
-			-DWITH_INTERNAL_DATEUTIL=OFF
-			-DWITH_INTERNAL_FUTURE=OFF
-			-DWITH_INTERNAL_MARKUPSAFE=OFF
-			-DWITH_INTERNAL_PYTZ=OFF
-			-DWITH_INTERNAL_SIX=OFF
-			-DWITH_INTERNAL_YAML=OFF
-		)
-	fi
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+
+	# bug 612956
+	addpredict /dev/dri/renderD128
 
 	cmake-utils_src_configure
 }
@@ -182,10 +163,10 @@ src_install() {
 
 	local size type
 	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+		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/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+			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