gentoo resync : 28.04.2018

11 files changed, 283 insertions, 16 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index f7e58ba0eacf..e029a981ebd4 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest
index 7d29b7242d12..57fc54549cdb 100644
--- a/sci-geosciences/mapnik/Manifest
+++ b/sci-geosciences/mapnik/Manifest
@@ -4,6 +4,6 @@ AUX mapnik-2.2.0-scons.patch 795 BLAKE2B 236a803049779b01b25c16a2ea180a95fb0fd07
 AUX mapnik-3.0.9-harbuzz_sharper-upstream.patch 746 BLAKE2B 73ad3bcb237e30447336657b541bd794e9e7786b23961d6a7ee94c1c5c7646e9337ea5a8002a68e15a9a9cae05a21f06e5517a07f4dbd65815a06f88c3a76d12 SHA512 08815cf001db531cec2660d53f8afdc83df0bb9e59cb792487a05fb5dff64aa66fa79e8283b7b2b8aca031e90205ab0dcd0097d8129953fed33432e93e34a2e2
 AUX mapnik-3.0.9-unicode-upstream.patch 264 BLAKE2B 9b2b8a062a861c58bfbe3681d7edc1d115ae85955dd1c1b73e37b9d1f1e690a97037144d957b318cc0921071525eaae4b3a94403842bdebf503d0f8bd195a3e6 SHA512 1f1f58477f5d54408320190b369a3039c70147f6d4c8498a318969661c258a6c7b5e2f26c111e8d543409512c7a98ddb31ece12ac75b5256a06105177e303c9d
 DIST mapnik-3.0.9.tar.gz 13434729 BLAKE2B 49cf90089b34cfc706f85950d090609d5f9a5a6e9cfb56f6e1f1a6279f864b35f3f8d456caa2365787261affc4acb85ad93621d6471efed85f560c808dc0535a SHA512 ad45ecbb2661e860b7057e0a235542a390ae5790f401ef2c04f1517b6487e83cdb8e307072681847cb72a3abc242e0114bc15d48f504dec1f92df970dd1556e1
-EBUILD mapnik-3.0.9-r1.ebuild 2627 BLAKE2B 9b3c19046cc315b247c8e72f6ae443a50293d7a9c561fb064e682917c58a21ea7f8d3139f0f685f032d2027f6c72db709022d6fc9d02f217007723b3bfc0a76f SHA512 020a1036823cd73801f82b4675b0601d791a9a2fabc57f7c893f3dba08e3fd80112c625c3566e384e173c0d64fbd62275dd30fade5ecb195230b20705209ec37
-EBUILD mapnik-3.0.9.ebuild 2387 BLAKE2B 623f82d7778ce9d76f3802634939085d693fa4f73f5cf72d1d60426c857b5b023cb38a7e8217d4cda78a67ba127013b46e3a60441549a12edc00d62307d28525 SHA512 64572189d753b330507950f59dc07b7a37234c7b2ed9b2c1043b7dea4af6feff34ed502b0015069dcf799316a5c33679f84778a5bd174217deca79d2c7ea5b5a
+EBUILD mapnik-3.0.9-r1.ebuild 2615 BLAKE2B 8318f5d6182aac97264aa1a9499538e2063debc6f493ce5270ad70c9c05b4d978ee7c5f494b5534bcf3253e162a7e885235011339ee52ad7d7b09f092004fba8 SHA512 94cb8ff699da38ea8749ea49e41ea43ddcbfc2b81377880fe68be6c6e572ac472edb955c76d3ec4ed4626a4998da59bb84f9b9675cafab932134c6d9bc9b0793
+EBUILD mapnik-3.0.9.ebuild 2375 BLAKE2B da5851e20e9a5f4f3b0395ca6abced74613e061ebe1dd4ceaefe4c9b04476530743b787eb6be9bd814529ab05a1e265fbdc26e9bcb2e51d8272bff4b828583d4 SHA512 c2990ff5b334a88482cb561e0ef74f404093b66eef635f5f2badc9f657ea50f6828ac9ea6a86cc91b3c08c7e619658e89ffb3942650db16dfcc4ff93c0d3173c
 MISC metadata.xml 683 BLAKE2B c61252c70d3814876f28f6c156572cedb646e6695c430a1a5083495d53e2ebc3933d9e499a4142ec460334d200172b054bb0c7bbd25adcd5701584b037bff3e7 SHA512 a60caeed695db6aeeee83083f57269db6d6c7a7e649be8848ef560e9043ba8b710441f166498d6d0bfffd80ab10190865a3b5097fb766b0b92c5480f62aab962
diff --git a/sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild b/sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild
index bcaadad2a45f..9ed3676d7c4b 100644
--- a/sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild
+++ b/sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mapnik/mapnik/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="cairo debug doc gdal postgres sqlite"
 
 RDEPEND="
diff --git a/sci-geosciences/mapnik/mapnik-3.0.9.ebuild b/sci-geosciences/mapnik/mapnik-3.0.9.ebuild
index 84314fd48d14..ae28bff85588 100644
--- a/sci-geosciences/mapnik/mapnik-3.0.9.ebuild
+++ b/sci-geosciences/mapnik/mapnik-3.0.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mapnik/mapnik/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="cairo debug doc gdal postgres sqlite"
 
 RDEPEND="
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 724a855a58f0..4d561244819a 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -3,7 +3,9 @@ AUX qgis-3.0.0-featuresummary.patch 986 BLAKE2B 088e7aa420ae6da6b7bcbd7ffff53ec4
 AUX qgis-3.0.1-check-constraints.patch 9535 BLAKE2B d2296d9f99578c53cdca2a0287163cc17748ad79910b19e6a888e7e341adb8436ce2463fa1cec1cbe9bc9b07ef83c3390407dd2baf05c25c33300a292022b2af SHA512 a806442cc3c85b032bf5b018ebf06eb7c99cd4c212b60c7d7aa0c1cfb028f236f6f3c5b224597cfceb118bbb7a552f48f7fd64e6bb772ec63f4d3a48d1ec5006
 AUX qgis-3.0.1-qt-5.11.patch 7015 BLAKE2B 77b59b3e8381ae84b138fae9bf39029207985c212489c2a3f4a522c1bdb84f82d0ef2a283869819e63a39d89584d7f1f4967d0d4947e96dd1ad1c4af6654aba7 SHA512 4d935e6686dad9e8bf17de944706f6815da25387278a2ebf822d31c580972809226d77ee0e5e9e9137d028e8e980742bfb73926f97738242dd56220fd53d6e9d
 DIST qgis-3.0.1.tar.bz2 94217493 BLAKE2B 9f3b9e9d76dfac574cbe7c9b95f0dc59fb9ad74ddd5c5a420931107200b1ba6641e2b74cff681ecec8cdab777cda69c0e698fa952bc28cd79c761f4636f62f00 SHA512 c07fc9b033fa043e38098d226dac69ea35890109c45ccc4c47017e0af2d3fbed4b1a71b3fd7dc76fea3eb43fbcdbfb660df50d779da8c43f68a4402b239f8f75
+DIST qgis-3.0.2.tar.bz2 94483208 BLAKE2B 198587a8440bf6d1dff6d08e706f1c0972088f8f90df4def27a0066f659e4273be35687ad0f35b4f3dcd7fb60e30ead74093541c69ddbd456bcbbcbae4c99c76 SHA512 4eec027f81ee693293e87d3c16b7b210ebd66f35a2884dc4662b5a3359b18cfd8a11919132ab88489456121eab36f8e5a9c20afcb34fa9dbe54673d838fc2be1
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
 EBUILD qgis-3.0.1.ebuild 6259 BLAKE2B 452fb81c2eaa394b5d8b74ec954bb4845530b45a6e2dd54dbda9af6c220afd66f4d09dbfb2313644ebdd1357b5eb03518afc3a75b2484ad1988feeb92f780ba8 SHA512 de833d3679e3aa943e1b5361d069e08c5bb75475fa31fbcce2106ac0abaa9c8260a180c03ce6aa0ba3cdfa5f8f2a09df6e3ebd27b416038462603319a31af6f7
-EBUILD qgis-9999.ebuild 6161 BLAKE2B 1e55aece92a60ce8cfd7b4d5265f7824c8a8a54b1d996fd83852a78cf34e9cce4458a7e7d4f2f8c096c49df75d3daf4ef54fac4ffd992c84621a4ed5f5f08abf SHA512 fab722837d024b644096643096c7549453bf95b71fa17bc5f8afdedc85db425a47967e32591aaded01c22108652dfc5464cd6a28d76153f0bfc5675345469de7
+EBUILD qgis-3.0.2.ebuild 6192 BLAKE2B 304565331b8ebaed4afa777ddd454da15acd8094c63459dfb197eff024a63f5ac7cd0c1cc6bab57bb36b357107cef8a3fc1a1d7a42eceb4e5351b2eb5348ca14 SHA512 74450d5caa73086807da8651f5da1cfc86af522561356710421b06e0dae7f4cfefb13fb5456f6ac5e98703483635244d8f5584f02e71a59022601e37c6e39877
+EBUILD qgis-9999.ebuild 6192 BLAKE2B 304565331b8ebaed4afa777ddd454da15acd8094c63459dfb197eff024a63f5ac7cd0c1cc6bab57bb36b357107cef8a3fc1a1d7a42eceb4e5351b2eb5348ca14 SHA512 74450d5caa73086807da8651f5da1cfc86af522561356710421b06e0dae7f4cfefb13fb5456f6ac5e98703483635244d8f5584f02e71a59022601e37c6e39877
 MISC metadata.xml 1114 BLAKE2B eb9f40495ad88a2e5b6d07b4eb2bfd6eb4be9f992bb631cc0bb0826959a54db372253dbdc4ed79f16755b43041f81fa66a584af798dbb5b974fdcaf08046fcea SHA512 89554d9c97f843c63f5cf96f9cbb67aa8f14f26ff3956e25d7c6951a8dbbb859383df2ceee555d5e542624042377d2fee0c9f77683f184e98911df8bc0bd6700
diff --git a/sci-geosciences/qgis/qgis-3.0.2.ebuild b/sci-geosciences/qgis/qgis-3.0.2.ebuild
new file mode 100644
index 000000000000..0b888637f800
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.0.2.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_5 )
+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 eutils ${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="
+	grass? ( python )
+	mapserver? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+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,python?,${PYTHON_USEDEP}]
+	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}]
+		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
+"
+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"
+	# TODO upstream
+	"${FILESDIR}/${PN}-3.0.0-featuresummary.patch"
+)
+
+pkg_setup() {
+	use python && 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
+
+		if use grass; then
+			python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+		fi
+	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 a76181e1f87a..0b888637f800 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python3_5 )
 PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.1"
+QT_MIN_VER="5.9.4"
 
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
@@ -26,6 +26,7 @@ SLOT="0"
 IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit"
 
 REQUIRED_USE="
+	grass? ( python )
 	mapserver? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -55,7 +56,7 @@ COMMON_DEPEND="
 	>=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.0.0:= )
+	grass? ( =sci-geosciences/grass-7*:= )
 	mapserver? ( dev-libs/fcgi )
 	oracle? (
 		dev-db/oracle-instantclient:=
@@ -80,7 +81,7 @@ COMMON_DEPEND="
 		dev-python/six[${PYTHON_USEDEP}]
 		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 	)
-	webkit? ( >=dev-qt/qtwebkit-${QT_MIN_VER}:5 )
+	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
@@ -104,7 +105,7 @@ PATCHES=(
 )
 
 pkg_setup() {
-	python-single-r1_pkg_setup
+	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -135,7 +136,7 @@ src_configure() {
 		-DENABLE_TESTS=OFF
 		-DWITH_3D=$(usex 3d)
 		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS=$(usex grass)
+		-DWITH_GRASS7=$(usex grass)
 		-DWITH_SERVER=$(usex mapserver)
 		-DWITH_ORACLE=$(usex oracle)
 		-DWITH_QWTPOLAR=$(usex polar)
@@ -147,7 +148,6 @@ src_configure() {
 
 	if use grass; then
 		mycmakeargs+=(
-			-DWITH_GRASS7=ON
 			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
 		)
 	fi
@@ -185,10 +185,12 @@ src_install() {
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
 
-	python_optimize "${ED%/}"/usr/share/qgis/python
+	if use python; then
+		python_optimize "${ED%/}"/usr/share/qgis/python
 
-	if use grass; then
-		python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+		if use grass; then
+			python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+		fi
 	fi
 }
 
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 73b4c5c3b53e..543036425917 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,7 +1,9 @@
 DIST qmapshack-1.10.0.tar.gz 7841397 BLAKE2B 7a2c92cdb8a3284ed9b9002d0b07b81fd282f48e7eaf3624a1658c988c12951667292a4aebc56bb064abdf49fbbb681013a7610bf73641221b95d642a5a869f2 SHA512 252ca368fa4fbb803a5f6a82acc29da98c55eab5cde3ff9783c5afe3100783f4f5352e463511f4196d94c70d4cf4b7718334b886c76e30172df325d89a69afe9
 DIST qmapshack-1.11.0.tar.gz 8531519 BLAKE2B f79e8a98afa8dd3450214cdd4156ce8de862ab2b1a988855c5e3892e9952a4e0ed06f894f56f47412a9015d704cb447303bb5969edfa95884580899c4c42963f SHA512 1907ffe9619e6c8d0997a65eb9f59896fa1fa15123c5b166f4ee8e4ea72223772d3292808c1e730c88a21189edb5c546da2de72bfa1730a4ae5f28b69bf3555a
+DIST qmapshack-1.11.1.tar.gz 11446871 BLAKE2B fa92b93787306d23110112fd851f0ee02418ac7b27316f57b4045efc4ae726e36c4014682d1ee32879f8894bab7dcac70852384f8b158e01026d7782f67b5ede SHA512 43e1b587bd3f4901b155ea6d1d520cf303681640c1bd521b30ef7f23aaf49b2fffe9b764e5dd3fcaef360b0d32b360b76eb8d737ec5e186aa75362ff2507956e
 DIST qmapshack-1.6.3.tar.gz 5181205 BLAKE2B 89e7a638f35e0e555b237a000992f48b1a126ed9de5c2892ee8e147060866656b87abbc46937cc5187e473681b71a2dfb250160d4847824df4989c352afd676b SHA512 6e9efdd35ebf3980011aea0cefdbcc433e4f0d333cbeff72e70880a41bff972cc27f4517e243f4990b5e04112a50af2651d99cb5c1c6e542341db30e5e000133
 EBUILD qmapshack-1.10.0-r1.ebuild 880 BLAKE2B 5fddf7073345131522c5ed0037842a2274d4295bec029bd4f9b2e2386de65a3403e739a9c66e0dd1473d22eb472142f627c11a2ae663c23427f7c1752878b575 SHA512 cce23eb74299d0a21437eb3ac7bc0dedd5280e98a73c5b30beb9976d2d8fa411618c8c0c8ce62066eb3d6d64bc2c1652ba9e0506f6deb740420ea3a00e090c17
 EBUILD qmapshack-1.11.0.ebuild 880 BLAKE2B 5fddf7073345131522c5ed0037842a2274d4295bec029bd4f9b2e2386de65a3403e739a9c66e0dd1473d22eb472142f627c11a2ae663c23427f7c1752878b575 SHA512 cce23eb74299d0a21437eb3ac7bc0dedd5280e98a73c5b30beb9976d2d8fa411618c8c0c8ce62066eb3d6d64bc2c1652ba9e0506f6deb740420ea3a00e090c17
+EBUILD qmapshack-1.11.1.ebuild 880 BLAKE2B 5fddf7073345131522c5ed0037842a2274d4295bec029bd4f9b2e2386de65a3403e739a9c66e0dd1473d22eb472142f627c11a2ae663c23427f7c1752878b575 SHA512 cce23eb74299d0a21437eb3ac7bc0dedd5280e98a73c5b30beb9976d2d8fa411618c8c0c8ce62066eb3d6d64bc2c1652ba9e0506f6deb740420ea3a00e090c17
 EBUILD qmapshack-1.6.3.ebuild 594 BLAKE2B 47fca8a961fe1e76d41cfee2ae99c4716bb3897a596e4ed29cc872e0296eee06fbc47188f84e423b28cf0c2d725f8e0fd5dc8e903761a1fafc4f2eedc481a4c3 SHA512 d6ba2f2fb68520668a89240021ab195477c94648b8fcf50040e671922a19f35d9107a8f0b56d33077bbb4b85f36787e995b26f54462ce8b62247d2fc4d118092
 MISC metadata.xml 772 BLAKE2B b1bd146b3ae624d365dd366cef81f3eaf37c8220ddd4eeb1f64916275f6520f3bd2d458a339bdea85d0f13cde14b3038d98c32f6265204e3aa1e22424f9dbfd2 SHA512 03cd1cf6d4e0b5a420b4301ffb1077f2dda9e023572dedd1c56ba4574ab4460c125d63bb5c7475b66b023ff15dc0b9c4cfc8479218366c935108e89850ed5d4d
diff --git a/sci-geosciences/qmapshack/qmapshack-1.11.1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.11.1.ebuild
new file mode 100644
index 000000000000..2765fdf91e9c
--- /dev/null
+++ b/sci-geosciences/qmapshack/qmapshack-1.11.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils xdg-utils gnome2-utils
+
+DESCRIPTION="GPS mapping utility"
+HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home"
+SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwebkit:5
+	dev-qt/qtscript:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtdbus:5
+	dev-qt/qttest:5
+	dev-qt/designer:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-libs/quazip
+	>=sci-geosciences/routino-3.1.1
+	sci-libs/gdal
+	sci-libs/proj
+	sci-libs/alglib"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index 772347b9abb4..a86412c8ff11 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,4 +1,4 @@
 DIST viking-1.6.2.tar.bz2 3324897 BLAKE2B ef3ab1d60d6cdca514776aaf59d01dedd063c8850ad842d7cbd23c321304b51ccceaa9e5c4f702afc56819e557b28a7ca2b3242ae2fa207e172f7cfdfbba0c45 SHA512 91f82aa1c0a7ab80990d501767ff0bf74c1d6153162e6213fc712e6a27fb465f89adf002e389a39fc51033f36f1b2ec5f05d20af328e5342dfc1158b8a9964f8
 DIST viking.pdf 383200 BLAKE2B 388129023e62008de2d2c402a72aa1e4a1834f99e6666bb9deedb5f5c32e8b94edeadf5a40e7b1f941aacc0057d4dcfbaf13c3098eb4efa02e3a1a8e00288201 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee
-EBUILD viking-1.6.2-r1.ebuild 1737 BLAKE2B 7ebeff16a268c416f2ad3483444810f631f75b94a8b01b610a70e38bfb3c5ce0eecd582fd3aaf263ec465807f4218f084d87d54a660df82ce5c323a75f49d66f SHA512 ca42b943d2ca07bb0445ec94f30962c582c457dcf75480833d43d563a4b3566bd16350bf6d3d8aed6b2688f8deebd0585fc1c8670e8d2a2c4430ca17f6cc40a9
+EBUILD viking-1.6.2-r1.ebuild 1732 BLAKE2B 1696a27bbfbaa72b9e49baa87b06b0f0a89a6ee1cee0a936138e46b96f60bdc7bf846d355a8a204429a6f52e63818899674f15dc026c76f129388cef3563ea92 SHA512 9d460c58cb898ce1c65217596c9be4c91311302aec42184c5864ad2826d2116cd30e609e76e2490aae76c3745c3ad48ca150423311e873c33fc3718611e7a7d4
 MISC metadata.xml 828 BLAKE2B 4ca303eae02e593e48080b7fbd77fbaeff6b617b221621509932b0ef209d64ca356c9aca9504867508f3e857e587ed5db61ed97d12c49dfafe458bbfe66ec567 SHA512 c8b9fe12169e2ea31110188f2bb0aba17138dd325af8ad04d26803bed10ec63657a2de7fcc0ccb774b2731a1a85cf3bdad14c88796e6747ecbe5abb72d88e057
diff --git a/sci-geosciences/viking/viking-1.6.2-r1.ebuild b/sci-geosciences/viking/viking-1.6.2-r1.ebuild
index 3fec473d5bf5..724991cc58a8 100644
--- a/sci-geosciences/viking/viking-1.6.2-r1.ebuild
+++ b/sci-geosciences/viking/viking-1.6.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 
 COMMONDEPEND="
 	app-arch/bzip2