gentoo resync : 21.08.2021

8 files changed, 85 insertions, 8 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index f23542e4b8ea..70a4bf5b0476 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/foxtrotgps/Manifest b/sci-geosciences/foxtrotgps/Manifest
index 36d93ad10eaf..82dbc2df852d 100644
--- a/sci-geosciences/foxtrotgps/Manifest
+++ b/sci-geosciences/foxtrotgps/Manifest
@@ -1,5 +1,7 @@
+AUX foxtrotgps-1.2.2-fix-some-receivers.patch 1098 BLAKE2B 33591dbe0c0b2d2704ec286535a7043cf8052fb0facccbfb345605edec94cbf8b6b2be7420d1ae0556fc0367d3bfadf4bae9abe8bd7fce3a05618830b66f24a3 SHA512 c3484641c627d518fbf0f12580e690de150c5b196e48e6313c86ac9498fad7572c95645d20c0b6e3587ce68dfdb05fdc7aa0ffb21f5e1bcd969df88fa803457f
 AUX foxtrotgps-1.2.2-gcc10.patch 591 BLAKE2B fac2f1f2f3ddbde8c1a959c58600183eacde1a541731d50da22c7e8ba5eb4c3bd64d1d5a6b92e6f85001d4bafb4eb0865421e72d9e48108ebf6e2fb2eec3d6e5 SHA512 b9dff10263f033021d89dfba583b7f0f7e34c06c8340126cf36a1d8145b2fd9e449edd64e7a9bb83d058597a8669567cda896521130c6804afc4286c54756e8b
 AUX foxtrotgps-1.2.2-gpsd-api9.patch 1178 BLAKE2B 9ca91432862f1b488b497d44a7252be373d560287c0751363b306dca32d1c21f9de93dfa6987e3b67ff35e340f626943c9c6843b715071e6fe4fdec6e22598b2 SHA512 a2c89485f1bfaa9053a1a8ee47e3803345334a1504ce7a6af2add8dd0ab7d17e9651651263e8141e27f21ab32c3bd5852e96ac42934e6422f9d236782b7b7cd8
 DIST foxtrotgps-1.2.2.tar.xz 1692120 BLAKE2B a8a70948992cd25609189caae3ec4136d056f86c85dc8b6e9610e935f60499f7bd78f083cc3f3e0904ec56eadb492babb7c8016e0270ea3285dadd99b32fcca8 SHA512 57b436221698fd81e58052f847e19999783e8dd1a165b196c80616591f22b36896454a87dd5a3c2c25bdd4654b8110dc0f320f70f0592ed58210fcc0be98f2ff
+EBUILD foxtrotgps-1.2.2-r1.ebuild 691 BLAKE2B 9a557caf8dd3640c61a74eea186d8e727667851a67c2722438302b5a69b2f94f88ca81e83a4d85c7da0c57212e2a5b17f740500ca183b381d5b06c0abc7c0927 SHA512 9c52e6ea6885a476488d8ed84e7379607091f9b11efae03f83b7eca25818baac19effafa086c0f26e024ac8e485b5fa50b21a3aa49b4fbd5b77dab863c5463c2
 EBUILD foxtrotgps-1.2.2.ebuild 646 BLAKE2B 08ad38e71d5a94f3fddd0b639a9b4e5c6f823ac28f860e977969c985d57ec6480181cb49bcb5ce9db89108df867f7e3d7af258db6d01caef18683805e2a661ad SHA512 461f2f41e97ccbd522b9f79494ea450943292c12178ee8a615c1d7448fa27374725f59cebb7e305b6d09f13fd8c19b165edca5df1f751c4a7faf22405c177e15
 MISC metadata.xml 638 BLAKE2B 80aa309f8c886fe6405df01099753668953aa7ec7d40ab908bdc743706db71be0ec4fd93fe5cc92871d84330f7f4133829cd90baede016c6b042a808f7106495 SHA512 e527ac4bbf4c1b1ee71264ca8d533bab5daecdc3bcb2e75f9464f79de4ff678d22c37c82bd6dae7cb64c65f67d56c13897dcc8f3eedf559cd584762db4b6c5e9
diff --git a/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-fix-some-receivers.patch b/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-fix-some-receivers.patch
new file mode 100644
index 000000000000..23930212f31f
--- /dev/null
+++ b/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-fix-some-receivers.patch
@@ -0,0 +1,33 @@
+From ea27c684924b8d8a560ca6fe1f25443624d54a93 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 18 Aug 2021 20:18:03 +0100
+Subject: [PATCH] Fix some GPS receivers
+
+Rebased version of upstream patch:
+https://bazaar.launchpad.net/~foxtrotgps-team/foxtrotgps/trunk/revision/329
+
+Conservatively added an extra API version check for gpsd.
+
+Bug: https://bugs.gentoo.org/808883
+---
+ src/gps_functions.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/gps_functions.c b/src/gps_functions.c
+index 602b06e..4f30cbb 100644
+--- a/src/gps_functions.c
++++ b/src/gps_functions.c
+@@ -762,7 +762,9 @@ cb_gpsd_data(GIOChannel *src, GIOCondition condition, gpointer data)
+ 		{
+ 			gpsdata->fix.time = (time_t) 0;
+ 		}
+-#if GPSD_API_MAJOR_VERSION >= 9
++#if GPSD_API_MAJOR_VERSION >= 10
++		gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX || libgps_gpsdata.fix.mode >= MODE_2D);
++#elif GPSD_API_MAJOR_VERSION >= 9
+ 		gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX);
+ #else
+ 		gpsdata->valid = (libgps_gpsdata.status != STATUS_NO_FIX);
+-- 
+2.33.0
+
diff --git a/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild b/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..cc36b1da8d8e
--- /dev/null
+++ b/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2
+
+DESCRIPTION="Easy to use, fast and lightweight mapping application (fork of tangogps)"
+HOMEPAGE="https://www.foxtrotgps.org/"
+SRC_URI="https://www.foxtrotgps.org/releases/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/libxml2:2
+	gnome-base/libglade
+	media-libs/libexif
+	net-misc/curl
+	>=sci-geosciences/gpsd-2.90:=
+	sys-apps/dbus
+	x11-libs/gtk+:2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gpsd-api9.patch"
+	"${FILESDIR}/${P}-gcc10.patch"
+	"${FILESDIR}/${P}-fix-some-receivers.patch"
+)
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 23ece91cfde1..78c0bd7e2735 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -4,7 +4,7 @@ AUX gpsd.conf-2 198 BLAKE2B c72808d1b43c8f1d97d97369d3f95fe2726a7972ea08915dcd35
 AUX gpsd.init-2 825 BLAKE2B 340bd992093d81067cef4329e50e4daa6e663ae214e560080ee58f99fbde742272979ca8b843c47ad6f1c2038d5bcab5c7886a963881bcf09079fb1ec1730aae SHA512 51319247eb78c3021d3eb897cb5d6026cc09d46a532a245a835459ed525947ffb6239f08126dd7e344de52e3b0387226bce060191ec3f14f99fc9f255d96f8ea
 DIST gpsd-3.21.tar.xz 2620396 BLAKE2B 366d1857f7ff63e087ac1bec8c95d997cd8d48a60d5548c1644748e1ed20334f45a4fb279bc26c61481cc3dea0244eb0aaca0ba562838a3b5de15da5d1d82502 SHA512 a45416c31ee891a84203aea786b6385ea5f557a406d898a8facdde78d120199b7e7db8f86ab8c395f6ca90965940355fa19413b2b918642fd8c7df219745233e
 DIST gpsd-3.23.tar.gz 4893363 BLAKE2B 502c1f2103f3b4224f3bc654bfe6e08e7ddf84707a0db6369e52608c095d5d082da020091ebca27d403cf74fa0bee5ebe1550068263d8d7a55143da2bc1a7350 SHA512 967cc9801271418023630df02b457b76108968992151f6e80b569e99b856bd79cc3d0369d2088f3bc609b2ab22b29dba87639bf466bf262ab80b2b3f04055f8b
-EBUILD gpsd-3.21.ebuild 5672 BLAKE2B 527955d42df4ac78352cca9b9698adb7ac59d4623f3a9a7b012b3ffd0393b6f4bb7fee0c32683a1a8e615472bac1e0a3fb58e0ecd0260f30cefb8c1304df5fe3 SHA512 19a9c31bcbd8a2407c51ffe5c9a6d948f0aace05910647ff385e1a26465416c1b9818e47f8dff539f22ed2ec1a91f539da59875012408b99305157c12ea1a983
-EBUILD gpsd-3.23.ebuild 5985 BLAKE2B 53a2f35922c6aa2961dff9ea7411267f3a9c0e5d4f26423fa724327c7752c441ae6ad1d02f60574f246c76900bd7d51a9a4d5925d6d04b57e9f7002b2c5d8d54 SHA512 cfef12eeaaa603d6dff21c817de2a38c3b6c85619eea989805111b7bc724a9e33553b1de6d26a40d78c18d7ee261c71ec6d7fd9ee5a84a93d42e0d7a10376029
-EBUILD gpsd-9999.ebuild 5985 BLAKE2B 53a2f35922c6aa2961dff9ea7411267f3a9c0e5d4f26423fa724327c7752c441ae6ad1d02f60574f246c76900bd7d51a9a4d5925d6d04b57e9f7002b2c5d8d54 SHA512 cfef12eeaaa603d6dff21c817de2a38c3b6c85619eea989805111b7bc724a9e33553b1de6d26a40d78c18d7ee261c71ec6d7fd9ee5a84a93d42e0d7a10376029
+EBUILD gpsd-3.21.ebuild 5674 BLAKE2B 34fb21d6a888469285112e33e10ae44685871a447999de76c87d2eddb7055603a76e6aa4a68c414f134dbcbdca8294ae07e3079bfb51c5032885261c800e1ea5 SHA512 414db9434056c76c1e0b6ce04926c79f9be7ee74aaebcaecaa2a3230d8d93c817c112280cec95574dade27f7ed4b4c614dd698f24b8dfa4caca6c792e7f79ef6
+EBUILD gpsd-3.23-r2.ebuild 6083 BLAKE2B 7da49280dc9f322b5836fb72e1f9affc3dd8e5223398b29f055e174a21253969ebc270d1d05a205c1487b095a68245bb8bab10dc65157853ad207aca6e4d72c5 SHA512 e61fefd9e7e40958cc6c94127cdaa9a82618bcf8ceaafd16ea7d22c4566ff9ac2e274acffbba32f9a21c1c752e09cbc37a4c1141dd2734b9f29a68a2af316e80
+EBUILD gpsd-9999.ebuild 6083 BLAKE2B 7da49280dc9f322b5836fb72e1f9affc3dd8e5223398b29f055e174a21253969ebc270d1d05a205c1487b095a68245bb8bab10dc65157853ad207aca6e4d72c5 SHA512 e61fefd9e7e40958cc6c94127cdaa9a82618bcf8ceaafd16ea7d22c4566ff9ac2e274acffbba32f9a21c1c752e09cbc37a4c1141dd2734b9f29a68a2af316e80
 MISC metadata.xml 950 BLAKE2B 1187055e96b7b5f0288f76fafbe2b1afd29729365fbf30b7e8120830db76193aa544815fd348058ef59351d1c097747684ae022b0ec7df0f655c0a9e3f4d7449 SHA512 87fdd329ffe13ec6aee16b877b355b2aac2267e8262b30ab5ab04307bc50797e1e3da8328a540a0484b06cbbd2f643f084e556ce32cc01b37c97d0f8f1b6be2a
diff --git a/sci-geosciences/gpsd/gpsd-3.21.ebuild b/sci-geosciences/gpsd/gpsd-3.21.ebuild
index 628cd0ae3c91..d5be3ad7ddb8 100644
--- a/sci-geosciences/gpsd/gpsd-3.21.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.21.ebuild
@@ -42,7 +42,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	acct-user/gpsd
 	>=net-misc/pps-tools-0.0.20120407
-	bluetooth? ( net-wireless/bluez )
+	bluetooth? ( net-wireless/bluez:= )
 	dbus? (
 		sys-apps/dbus
 		dev-libs/dbus-glib
diff --git a/sci-geosciences/gpsd/gpsd-3.23.ebuild b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
index f21d1e6662f4..96a5705d5db6 100644
--- a/sci-geosciences/gpsd/gpsd-3.23.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
 	acct-group/dialout
 	>=net-misc/pps-tools-0.0.20120407
 	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
-	bluetooth? ( net-wireless/bluez )
+	bluetooth? ( net-wireless/bluez:= )
 	dbus? (
 		sys-apps/dbus
 		dev-libs/dbus-glib
@@ -187,7 +187,10 @@ src_compile() {
 	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
 	escons "${scons_opts[@]}"
 
+	pushd "${P}" || die
+	ln -sf ../setup.py . || die
 	use python && distutils-r1_src_compile
+	popd || die
 }
 
 src_install() {
@@ -200,6 +203,7 @@ src_install() {
 	rm -rf  "${D}"/python-discard/gps*
 	find "${D}"/python-discard/ -type d -delete
 	# Install correct multi-python copy
+	pushd "${P}" || die
 	use python && distutils-r1_src_install
-
+	popd || die
 }
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index f21d1e6662f4..96a5705d5db6 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
 	acct-group/dialout
 	>=net-misc/pps-tools-0.0.20120407
 	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
-	bluetooth? ( net-wireless/bluez )
+	bluetooth? ( net-wireless/bluez:= )
 	dbus? (
 		sys-apps/dbus
 		dev-libs/dbus-glib
@@ -187,7 +187,10 @@ src_compile() {
 	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
 	escons "${scons_opts[@]}"
 
+	pushd "${P}" || die
+	ln -sf ../setup.py . || die
 	use python && distutils-r1_src_compile
+	popd || die
 }
 
 src_install() {
@@ -200,6 +203,7 @@ src_install() {
 	rm -rf  "${D}"/python-discard/gps*
 	find "${D}"/python-discard/ -type d -delete
 	# Install correct multi-python copy
+	pushd "${P}" || die
 	use python && distutils-r1_src_install
-
+	popd || die
 }