gentoo resync : 30.12.2017

8 files changed, 57 insertions, 14 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index b84b57ae9743..bfc26fcf7488 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 60dea2a5a53f..dd3c384a8061 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -18,7 +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-r1.ebuild 4723 BLAKE2B 6dd464eed24c3eaa6d1c9d0aa7c5841d28e492934bb4e4397f49ffb73ea8cac08d404c762d61abd368511c4fe23caa6f32c223b9a7410c75ec347adb2a2710b4 SHA512 a8d26da64fcbe69f1dd8bff80928424202d76d94d524428b68606918f521c2236b76b37fe2a30976e3d58e0674cfa0c4212512fff6f842b525636e16ff60e04e
 EBUILD gpsd-3.17.ebuild 4627 BLAKE2B b257c138e370fa05be7931c76bad948ba3e747727b18a1b12856eafe7de01869ef99b3c1ee3ac7c1bd68697aa193fb199bbb26b5ec3e67318f497e14a0ee62f3 SHA512 7b4518ba869362b11fa793d66914c60d75411d017de7c75d77aef12502b1c21ca0823b36c38711b3162856cf0ed9c2187ddc49b3ffa8c4c663f4db402a9273c0
-EBUILD gpsd-9999.ebuild 4676 BLAKE2B 1a0a1ff1676ab7aa121b62ec7a5c17e73f74540b26f9c948b37a417346bde2c61b8bf2b33f33337deb0f3921a63bd3065be7c5d478dd4fbef67aeec39c8b377c SHA512 9524f3e9717280f664852933759153ee63eaa63d8f364792d27db5efaaeca788a4f049937b196fd69a5cec7b1b77a557c409f66973ad7eea0efd11da437bca3c
+EBUILD gpsd-9999.ebuild 4723 BLAKE2B 6dd464eed24c3eaa6d1c9d0aa7c5841d28e492934bb4e4397f49ffb73ea8cac08d404c762d61abd368511c4fe23caa6f32c223b9a7410c75ec347adb2a2710b4 SHA512 a8d26da64fcbe69f1dd8bff80928424202d76d94d524428b68606918f521c2236b76b37fe2a30976e3d58e0674cfa0c4212512fff6f842b525636e16ff60e04e
 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
index cb88e5860ea5..98fba863a5a6 100644
--- a/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild
@@ -30,7 +30,7 @@ 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 qt5 +shm +sockets static test udev usb X"
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth dbus debug 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} )"
@@ -115,11 +115,10 @@ src_configure() {
 		gpsd_group=uucp
 		nostrip=True
 		python=False
-		qt_versioned=5
+		libgpsmm=True
 		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)
@@ -127,12 +126,14 @@ src_configure() {
 		$(use_scons ncurses)
 		$(use_scons ntp ntpshm)
 		$(use_scons ntp pps)
+		$(use_scons qt5 libQgpsmm)
 		$(use_scons shm shm_export)
 		$(use_scons sockets socket_export)
-		$(use_scons qt5 libQgpsmm)
 		$(use_scons usb)
 	)
 
+	use qt5 && myesconsargs+=( qt_versioned=5 )
+
 	# enable specified protocols
 	local protocol
 	for protocol in ${GPSD_PROTOCOLS[@]} ; do
@@ -158,7 +159,7 @@ src_install() {
 	if use python ; then
 		distutils-r1_src_install
 		# Delete all X related packages if user doesn't want them
-		if ! use X ; then
+		if ! use X && [[ -f "${ED%/}"/usr/bin/xgps ]]; then
 			rm "${ED%/}"/usr/bin/xgps* || die
 		fi
 	fi
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index cb88e5860ea5..98fba863a5a6 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -30,7 +30,7 @@ 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 qt5 +shm +sockets static test udev usb X"
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth dbus debug 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} )"
@@ -115,11 +115,10 @@ src_configure() {
 		gpsd_group=uucp
 		nostrip=True
 		python=False
-		qt_versioned=5
+		libgpsmm=True
 		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)
@@ -127,12 +126,14 @@ src_configure() {
 		$(use_scons ncurses)
 		$(use_scons ntp ntpshm)
 		$(use_scons ntp pps)
+		$(use_scons qt5 libQgpsmm)
 		$(use_scons shm shm_export)
 		$(use_scons sockets socket_export)
-		$(use_scons qt5 libQgpsmm)
 		$(use_scons usb)
 	)
 
+	use qt5 && myesconsargs+=( qt_versioned=5 )
+
 	# enable specified protocols
 	local protocol
 	for protocol in ${GPSD_PROTOCOLS[@]} ; do
@@ -158,7 +159,7 @@ src_install() {
 	if use python ; then
 		distutils-r1_src_install
 		# Delete all X related packages if user doesn't want them
-		if ! use X ; then
+		if ! use X && [[ -f "${ED%/}"/usr/bin/xgps ]]; then
 			rm "${ED%/}"/usr/bin/xgps* || die
 		fi
 	fi
diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index 87906caf9bae..09309cbae8e4 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1,4 +1,4 @@
 DIST osm2pgsql-0.94.0.tar.gz 1203310 BLAKE2B df9af84aab13bfd79763238e89dfc216401be2460be468a2f5467513dfcbd48650d779586f9cefd4100d6404f430a2401326919e9a1c72d86b80c6526881f206 SHA512 eceb5de7679048f51a9ad1be4ecf5b2d26da827b3eb8d6b0e86657603c8bf8a6f8d6f665c8ff8db91070a2966057f2deed5e4a3cc8bfb28e60a6031454e4758e
-EBUILD osm2pgsql-0.94.0.ebuild 865 BLAKE2B f6db8ba65c070a13af1f02269d63c77b60a01bb56ae349a7bc21318c5413c270c03c2ed2dc4d798dc30df3ac80555c4ebff594454325370cc739a18d45bcd2fe SHA512 cf04e72a6f6976f5cee7ffa65b7fd967ea4796bc117ffc92a3f11c8caf059396df1c8ecd82aa85d499494af82eb47ca1f5fd33178fe3cb2a7d0b66d180fe016d
+EBUILD osm2pgsql-0.94.0.ebuild 864 BLAKE2B a500d39a0cb460cac74f228d6fafca27c9d8ac3c9b33e8c895f5287e6b7ec3fa88be469804068429c9c9390d19cf487f302412bcf8275e83906d12122b197640 SHA512 6605ebc9725f55851feb512b63f2f6b4e3a58147b87e5ee0cb91b4523737dca4f8d9b35a0db0aa762539ae9362a4193db6476562362dffed3e0493fdd5f5171c
 EBUILD osm2pgsql-99999999.ebuild 812 BLAKE2B 3f4fd25082adf137822d07ac89cb27f5a8c7d9e80437ad047241e6589e90f746aacf5d7332093a8604b566ac41d638530b47efaf2c33382856e7bdbe48f4be5e SHA512 a70c0352ec4299ddc7df14d5d10c3756d569958ca78789989ee55460e0918315a076157e03477b6054a5614e1f537ba9fe9bd680d5102f49f3135f0c1b5475e1
 MISC metadata.xml 793 BLAKE2B d74e55e2b2cd946a65cba5bd3f0ba953edf8528d6d30037fbd69640d7379ced6e07a0e81e57f02f2e49afde4a55b07c21cb5430de1d42a682e10bfd964ab7939 SHA512 2f76c2c5946179da213b0bf193e89f110c46818ab77a4dea41df1fc78d1527ace8ff81a3887ebb47e6ee0a799e0ee037364e22bfdd5ce72feb765209b6a3fcd6
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild
index 41228c63339b..f6ef3e3fbfc4 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+lua"
 
 COMMON_DEPEND="
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 52a16f2848fe..1506a6fce87f 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,8 +1,10 @@
+DIST qmapshack-1.10.0.tar.gz 7841397 BLAKE2B 7a2c92cdb8a3284ed9b9002d0b07b81fd282f48e7eaf3624a1658c988c12951667292a4aebc56bb064abdf49fbbb681013a7610bf73641221b95d642a5a869f2 SHA512 252ca368fa4fbb803a5f6a82acc29da98c55eab5cde3ff9783c5afe3100783f4f5352e463511f4196d94c70d4cf4b7718334b886c76e30172df325d89a69afe9
 DIST qmapshack-1.6.3.tar.gz 5181205 BLAKE2B 89e7a638f35e0e555b237a000992f48b1a126ed9de5c2892ee8e147060866656b87abbc46937cc5187e473681b71a2dfb250160d4847824df4989c352afd676b SHA512 6e9efdd35ebf3980011aea0cefdbcc433e4f0d333cbeff72e70880a41bff972cc27f4517e243f4990b5e04112a50af2651d99cb5c1c6e542341db30e5e000133
 DIST qmapshack-1.7.1.tar.gz 5201773 BLAKE2B 32ba3c16f6a83c6ead93ae7b91719a6a4f3b88d7a1c8e98fc7baf97b7b5d59eb86358dcc39a8ac18da3410d20500fdb608a814eff05bf6aff276b0309e600375 SHA512 406346df4777e06d14f175fc6cd01b653102d5754c3354721d5f86c2fbe3139f384f57241d2990721ceac12d4d546924c36c4e408770ad5c523a73f980bd3c02
 DIST qmapshack-1.8.0.tar.gz 7512082 BLAKE2B ef30474f6497fbc7edcefbd6350b6c84003ecdd7e2cdc8630cd513f563742e99aea7b8f00b8c04aa5f02adff9949ceab5008439bc53dae7f71f72f017b1b04b3 SHA512 9ee2e764368994c71813d48afb55368a2a26f8f4517b2671af2eb457e152b33f2eb756e347625940383b0e8c89814259d9e78133a1bc4544f183c4a424d31a4d
 DIST qmapshack-1.9.0.tar.gz 7647076 BLAKE2B 83397ff1b1fc0d15b2bc6f590a97cbe68c5006a4abd29f20ab209f481548a43f1f2fec1c1a7b829e50f7dd87f7f8a1bdeac7cf5521026e0ee26b63db00166928 SHA512 8a74434886605eed44d0264d26cae022381a0141d8ebaa6ac8ef9cf8b808e0f9550ff888b0e2f607eb9cc8cde24ac358d459d9e43c6b74f0f8c74d5e7b429c1d
 DIST qmapshack-1.9.1.tar.gz 7692254 BLAKE2B 11a32fdc4b6f319e1a09143688283a304530db7fc72b1fe27a89ecff064317270338a4ece6e056115c5ce8e4539ba34c221f461b5195beb7801a42b9a9e5dcc1 SHA512 3a4903c5c98862c139a1e2ac021fb7b0c1acd62c41a2dfdc507f3dfa5618ad89224195df3baf3b233880645103e2ff865d5ad42adad998e0d201b27877c2da75
+EBUILD qmapshack-1.10.0.ebuild 863 BLAKE2B a5b5d3fde2fc71a59d4d9b2387108d90727693b3ded3ecf7852a9a2790f0a5759d8d34babebce2729b3ae41e3c04ce5d0e62ff3531fc24bf2e8adbf6ba0b59b3 SHA512 c7c7e3253886ddc16d4274556c0de917e78a3d8dc00cb0121231cedb4dc21ffa8ebdac1687891695f408899e772a14318a9657cc5e1d5cf1993fb32185265196
 EBUILD qmapshack-1.6.3.ebuild 594 BLAKE2B 47fca8a961fe1e76d41cfee2ae99c4716bb3897a596e4ed29cc872e0296eee06fbc47188f84e423b28cf0c2d725f8e0fd5dc8e903761a1fafc4f2eedc481a4c3 SHA512 d6ba2f2fb68520668a89240021ab195477c94648b8fcf50040e671922a19f35d9107a8f0b56d33077bbb4b85f36787e995b26f54462ce8b62247d2fc4d118092
 EBUILD qmapshack-1.7.1.ebuild 596 BLAKE2B 23e353d8f7158b13e590bb093438526829b2fe6584bb189e611868a3bf23892ad124fea1742f3440aadbe87a4e942977783957ac42f492fbbc681ec981b5473e SHA512 1e4535a8cb426ce73e1b059c3dd5b595af86c4f7b9225557b413c79eef426977195c62c8d1323136af6ac731d3ee96f1ba7de339262e31e2a5e50a5dd19b9475
 EBUILD qmapshack-1.8.0-r1.ebuild 613 BLAKE2B 8e1f4155fc140c3740345be83cf05013cebf0c91c51e3fc735ec6169565981561409e7f8ed0fab08a2d03f0580424cdcb6374f47acf8bac636fc7f85669652ab SHA512 320af0e01d57a30d293d40ef9807fee19064010538ea100e7d2b92472cabd29d6825a79cf8e8042a2dca9f46fa112df1c4ea68e50f53412125997f0ec32a6170
diff --git a/sci-geosciences/qmapshack/qmapshack-1.10.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.10.0.ebuild
new file mode 100644
index 000000000000..7a68dc849f43
--- /dev/null
+++ b/sci-geosciences/qmapshack/qmapshack-1.10.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 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"
+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
+}