gentoo resync : 30.12.2017

3 files changed, 14 insertions, 12 deletions

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