public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/, sci-geosciences/gpsd/files/
@ 2016-05-09 19:11 Mike Frysinger
  0 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger @ 2016-05-09 19:11 UTC (permalink / raw
  To: gentoo-commits

commit:     c2cf742e78552ea27ee8a22fff25063ec26fa852
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon May  9 18:46:44 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon May  9 19:11:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2cf742e

sci-geosciences/gpsd: fix build w/newer glibc #581740

 .../gpsd/files/gpsd-3.16-sysmacros.patch           | 31 ++++++++++++++++++++++
 sci-geosciences/gpsd/gpsd-3.15.ebuild              |  1 +
 sci-geosciences/gpsd/gpsd-3.16.ebuild              |  1 +
 3 files changed, 33 insertions(+)

diff --git a/sci-geosciences/gpsd/files/gpsd-3.16-sysmacros.patch b/sci-geosciences/gpsd/files/gpsd-3.16-sysmacros.patch
new file mode 100644
index 0000000..d9863c9
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.16-sysmacros.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/581740
+
+From 87027243d101cfa7e01d9b697f890ea7b247449b Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 9 May 2016 14:33:06 -0400
+Subject: [PATCH] include sys/sysmacros.h for major
+
+These functions are not part of any official spec, and Linux C libs have
+always kept them in sys/sysmacros.h.  Include the header directly to fix
+builds w/alternative C libs, and to work with future glibc versions.
+---
+ serial.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/serial.c b/serial.c
+index d8bdd8c..b748cab 100644
+--- a/serial.c
++++ b/serial.c
+@@ -14,6 +14,9 @@
+ #include <unistd.h>
+ #include <sys/socket.h>
+ #include <sys/param.h>	/* defines BSD */
++#ifdef __linux__
++#include <sys/sysmacros.h>
++#endif
+ 
+ #include "gpsd_config.h"
+ #ifdef ENABLE_BLUEZ
+-- 
+2.7.4
+

diff --git a/sci-geosciences/gpsd/gpsd-3.15.ebuild b/sci-geosciences/gpsd/gpsd-3.15.ebuild
index 3505460..e6f3172 100644
--- a/sci-geosciences/gpsd/gpsd-3.15.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.15.ebuild
@@ -73,6 +73,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.15-dynamic-libs.patch
 	epatch "${FILESDIR}"/${PN}-3.15-libgpsd.patch
 	epatch "${FILESDIR}"/${PN}-3.15-broken-install.patch
+	epatch "${FILESDIR}"/${PN}-3.16-sysmacros.patch #581740
 
 	# Avoid useless -L paths to the install dir
 	sed -i \

diff --git a/sci-geosciences/gpsd/gpsd-3.16.ebuild b/sci-geosciences/gpsd/gpsd-3.16.ebuild
index 4602b53..5928f17 100644
--- a/sci-geosciences/gpsd/gpsd-3.16.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.16.ebuild
@@ -73,6 +73,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.15-dynamic-libs.patch
 	epatch "${FILESDIR}"/${PN}-3.15-libgpsd.patch
 	epatch "${FILESDIR}"/${PN}-3.15-broken-install.patch
+	epatch "${FILESDIR}"/${PN}-3.16-sysmacros.patch #581740
 
 	# Avoid useless -L paths to the install dir
 	sed -i \


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/, sci-geosciences/gpsd/files/
@ 2018-02-06 19:35 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-02-06 19:35 UTC (permalink / raw
  To: gentoo-commits

commit:     9f52f6421ecbe3ec235979016783f9af9371714f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  4 00:14:53 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb  6 19:35:10 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f52f642

sci-geosciences/gpsd: Drop old

Closes: https://bugs.gentoo.org/632372
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sci-geosciences/gpsd/Manifest                      |   2 -
 sci-geosciences/gpsd/files/gpsd-3.10-dbus.patch    |  32 ----
 .../gpsd/files/gpsd-3.10-nmea-disabled.patch       |  54 -------
 sci-geosciences/gpsd/files/gpsd-3.10-rpath.patch   |  13 --
 .../gpsd/files/gpsd-3.10-udev-install.patch        |  40 -----
 .../gpsd/files/gpsd-3.15-broken-install.patch      |  28 ----
 .../gpsd/files/gpsd-3.15-dynamic-libs.patch        | 100 ------------
 sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch |  81 ----------
 .../gpsd/files/gpsd-3.15-timebase.patch            |  12 --
 .../gpsd/files/gpsd-3.16-sysmacros.patch           |  31 ----
 sci-geosciences/gpsd/files/gpsd-3.8-ldflags.patch  |  15 --
 sci-geosciences/gpsd/gpsd-3.10.ebuild              | 167 --------------------
 sci-geosciences/gpsd/gpsd-3.16.ebuild              | 170 ---------------------
 sci-geosciences/gpsd/gpsd-3.17.ebuild              | 163 --------------------
 14 files changed, 908 deletions(-)

diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 2fa9615e1b8..3352663f8ca 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,3 +1 @@
-DIST gpsd-3.10.tar.gz 1566622 BLAKE2B c80fcabf7d2e33d2704cd320b8bbaf0954abf4ba27d2de11e0b9db40f23ea14f5faa4ca81fa3462707018ff6d1956486bff7e0581afec35befaa005455947cfd SHA512 fd452185a8a9f9b8dfb2a5c2d5b6410f795d56dc46a7c216d8fcd686e43c5555a5f0421434060e9bb7afa465bb8a45a1e358108c4de42300eeb972caa334d8b6
-DIST gpsd-3.16.tar.gz 8587490 BLAKE2B db6619308ddb2f473727bc91d2f696a401a0b4f97afa66e52a5515f633a5a154fa6b158185e0f42f893bda4867c928314c0e56bd80ac3c12ded16d6d25ce64d6 SHA512 a8ad85a1f17d3ea550a4b99c262e47a834ed8fd16b00e10574f7cf5f34b6c506142aa77a870a61f8827c0d0c88fe7f65f6e916089d64e84c5667d4a2ca89c543
 DIST gpsd-3.17.tar.gz 8755304 BLAKE2B d1f82b5734fd90fe903a6f2fe8835fe8292fe3e729306e7abe4054821971fece4c23f382c08a233503f07ad66b7b3a02a52a000e55c08491bf254ab6e99378b5 SHA512 71085053f600730e0f2de269c59ce0a17ae106ef01403f02d78418b267c6adb9818d541fba59eb23bf71cdb67c5442c82b4948d262ef7e74bb993dcae677a1b1

diff --git a/sci-geosciences/gpsd/files/gpsd-3.10-dbus.patch b/sci-geosciences/gpsd/files/gpsd-3.10-dbus.patch
deleted file mode 100644
index 3ea68386e2f..00000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.10-dbus.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From efaf7972ca95ff52464dedfe30bafa45095d299e Mon Sep 17 00:00:00 2001
-From: Bernd Zeimetz <bernd@bzed.de>
-Date: Sat, 23 Nov 2013 02:56:22 +0100
-Subject: [PATCH] Make it build abain with dbus enabled.
-
-This reverts a bad change to SConstruct in 57e9bdea.
-
-It still leaves the issue that scons links all file sstaically now.
----
- SConstruct | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/SConstruct b/SConstruct
-index 290910b..51b07e1 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -968,7 +968,11 @@ gpsdlibs = ["-lgpsd"] + usblibs + bluezlibs + gpslibs
- #          linking
- # The final executable will build but not be portable.
- 
--env.StaticLibrary(target = 'libgps.a', source = libgps_sources)
-+env.StaticLibrary(target='libgps.a',
-+                  source=libgps_sources,
-+                  parse_flags=dbus_libs + rtlibs)
-+
-+
- 
- # Source groups
- 
--- 
-1.8.4.3
-

diff --git a/sci-geosciences/gpsd/files/gpsd-3.10-nmea-disabled.patch b/sci-geosciences/gpsd/files/gpsd-3.10-nmea-disabled.patch
deleted file mode 100644
index e87eff8a564..00000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.10-nmea-disabled.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/493022
-
-From c31095e1562494a74d56b46fcc01541d1444cd5c Mon Sep 17 00:00:00 2001
-From: Simon Dawson <spdawson@gmail.com>
-Date: Sun, 8 Dec 2013 10:31:25 +0000
-Subject: [PATCH] gpsmon: fix build when nmea is false
-
-When nmea is False and ncurses support is enabled, the build fails as
-follows.
-
-gpsmon.o: In function `gpsmon_hook':
-gpsmon.c:(.text+0x974): undefined reference to `driver_nmea0183'
-collect2: error: ld returned 1 exit status
-scons: *** [gpsmon] Error 1
-scons: building terminated because of errors.
-
-The problem appears to be a failure to protect use of the driver_nmea0183
-variable with appropriate #ifdef guards.
-
-Signed-off-by: Simon Dawson <spdawson@gmail.com>
-Signed-off-by: Eric S. Raymond <esr@thyrsus.com>
----
- gpsmon.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/gpsmon.c b/gpsmon.c
-index de1f14b..b030979 100644
---- a/gpsmon.c
-+++ b/gpsmon.c
-@@ -36,7 +36,9 @@ extern struct monitor_object_t garmin_mmt, garmin_bin_ser_mmt;
- extern struct monitor_object_t italk_mmt, ubx_mmt, superstar2_mmt;
- extern struct monitor_object_t fv18_mmt, gpsclock_mmt, mtk3301_mmt;
- extern struct monitor_object_t oncore_mmt, tnt_mmt, aivdm_mmt;
-+#ifdef NMEA_ENABLE
- extern const struct gps_type_t driver_nmea0183;
-+#endif /* NMEA_ENABLE */
- 
- /* These are public */
- struct gps_device_t session;
-@@ -477,9 +479,11 @@ static void select_packet_monitor(struct gps_device_t *device)
-      */
-     if (device->packet.type != last_type) {
- 	const struct gps_type_t *active_type = device->device_type;
-+#ifdef NMEA_ENABLE
- 	if (device->packet.type == NMEA_PACKET
- 	    && ((device->device_type->flags & DRIVER_STICKY) != 0))
- 	    active_type = &driver_nmea0183;
-+#endif /* NMEA_ENABLE */
- 	if (!switch_type(active_type))
- 	    longjmp(terminate, TERM_DRIVER_SWITCH);
- 	else {
--- 
-2.1.2
-

diff --git a/sci-geosciences/gpsd/files/gpsd-3.10-rpath.patch b/sci-geosciences/gpsd/files/gpsd-3.10-rpath.patch
deleted file mode 100644
index 8d4a309f095..00000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.10-rpath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-don't set the -rpath flag to the install dir as this breaks DESTDIR
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -287,7 +287,7 @@ def installdir(dir, add_destdir=True):
- # Honor the specified installation prefix in link paths.
- if env["sysroot"]:
-     env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir', add_destdir=False)])
--if env["shared"]:
-+if env["shared"] and env["chrpath"]:
-     env.Prepend(RPATH=[installdir('libdir')])
- 
- # Give deheader a way to set compiler flags

diff --git a/sci-geosciences/gpsd/files/gpsd-3.10-udev-install.patch b/sci-geosciences/gpsd/files/gpsd-3.10-udev-install.patch
deleted file mode 100644
index 5d81466b970..00000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.10-udev-install.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6821edb2d40956e5f93a80420ae1dbf825b95281 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 11 Mar 2013 13:26:57 -0400
-Subject: [PATCH] fix DESTDIR handling with udev rules install again
-
-Commit 102e29d16c3fd9b414eeac53c794302f902ae8da reverted the DESTDIR
-logic when upgrading the udev path handling.
-
-I fixed that with commit a41cd69c87e312198834a2e6232134176c9352e5.
-
-It's been reverted yet again in an unrelated commit
-57e9bdeae2f00664616ee1d9a936a5cfe27bfd30.  Why do people keep doing this?
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- SConstruct | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 51b07e1..caed21e 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -1790,10 +1790,10 @@ if env['python']:
- # is plugged in.
- 
- Utility('udev-install', 'install', [
--    'mkdir -p ' + env['udevdir'],
--    'cp $SRCDIR/gpsd.rules ' + env['udevdir'] + '/rules.d/25-gpsd.rules',
--    'cp $SRCDIR/gpsd.hotplug ' + env['udevdir'],
--    'chmod a+x ' + env['udevdir'] + '/gpsd.hotplug',
-+    'mkdir -p ' + DESTDIR + env['udevdir'] + '/rules.d',
-+    'cp $SRCDIR/gpsd.rules ' + DESTDIR + env['udevdir'] + '/rules.d/25-gpsd.rules',
-+    'cp $SRCDIR/gpsd.hotplug ' + DESTDIR + env['udevdir'],
-+    'chmod a+x ' + DESTDIR + env['udevdir'] + '/gpsd.hotplug',
-         ])
- 
- Utility('udev-uninstall', '', [
--- 
-1.8.4.3
-

diff --git a/sci-geosciences/gpsd/files/gpsd-3.15-broken-install.patch b/sci-geosciences/gpsd/files/gpsd-3.15-broken-install.patch
deleted file mode 100644
index ec68a3c21a9..00000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.15-broken-install.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 798629da485b9504dbb5bd5c96c9ea1d3454ebe3 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 7 Jun 2015 13:39:55 -0400
-Subject: [PATCH] Revert "# Work arount a minor bug in InstallSharedLib() link
- handling"
-
-This reverts commit 0532106c1ea0807922ea6f868fcde384f22d4e92 as it breaks
-parallel installs.  The original commit itself contains no real details.
----
- SConstruct | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 39a6b6a..c8a977e 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -1336,8 +1336,6 @@ if env["ncurses"]:
-     binaryinstall.append(env.Install(installdir('bindir'), [cgps, gpsmon]))
- binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, libgps_version))
- binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpsdlib, libgps_version))
--# Work arount a minor bug in InstallSharedLib() link handling
--env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), ))
- 
- if qt_env:
-     binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib, libgps_version))
--- 
-2.4.1
-

diff --git a/sci-geosciences/gpsd/files/gpsd-3.15-dynamic-libs.patch b/sci-geosciences/gpsd/files/gpsd-3.15-dynamic-libs.patch
deleted file mode 100644
index 9461a666b03..00000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.15-dynamic-libs.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From ac48583654e97ef04e8cbb52c2ae77a617c7add3 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 7 Jun 2015 01:08:39 -0400
-Subject: [PATCH] reenable dynamic libs
-
-Upstream decided to staticly link their own programs against their libs
-instead of using the shared ones.  Restore dynamic linking to save space
-and such.
----
- SConstruct | 64 ++++++++++++++++++++++++++++++++++----------------------------
- 1 file changed, 35 insertions(+), 29 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 28cebf0..a050f38 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -961,6 +961,9 @@ if qt_env:
- gpsflags = ["-lm"] + rtlibs + dbusflags
- gpsdflags = usbflags + bluezflags + gpsflags
- 
-+gpslibs = ["-lgps"] + gpsflags
-+gpsdlibs = ["-lgpsd"] + gpsdflags + gpslibs
-+
- # Source groups
- 
- gpsd_sources = ['gpsd.c','timehint.c', 'shmexport.c','dbusexport.c']
-@@ -983,38 +986,41 @@ gpsmon_sources = [
- ## Production programs
- 
- gpsd = env.Program('gpsd', gpsd_sources,
--                   LIBS=['gpsd', 'gps_static'], LIBPATH='.',
--                   parse_flags=gpsdflags+gpsflags)
-+                   LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs)
-+env.Depends(gpsd, [compiled_gpslib])
-+
- gpsdecode = env.Program('gpsdecode', ['gpsdecode.c'],
--                        LIBS=['gpsd', 'gps_static'], LIBPATH='.',
--                        parse_flags=gpsdflags+gpsflags)
-+                        LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs)
-+env.Depends(gpsdecode, [compiled_gpslib])
-+
- gpsctl = env.Program('gpsctl', ['gpsctl.c'],
--                     LIBS=['gpsd', 'gps_static'], LIBPATH='.',
--                     parse_flags=gpsdflags+gpsflags)
-+                     LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs)
-+env.Depends(gpsctl, [compiled_gpslib])
-+
- gpsmon = env.Program('gpsmon', gpsmon_sources,
--                     LIBS=['gpsd', 'gps_static'], LIBPATH='.',
--                     parse_flags=gpsdflags + gpsflags + ncurseslibs)
--gpsdctl = env.Program('gpsdctl', ['gpsdctl.c'],
--                      LIBS=['gps_static'], LIBPATH='.',
--                      parse_flags=gpsflags)
--gpspipe = env.Program('gpspipe', ['gpspipe.c'],
--                      LIBS=['gps_static'], LIBPATH='.',
--                      parse_flags=gpsflags)
--gps2udp = env.Program('gps2udp', ['gps2udp.c'],
--                      LIBS=['gps_static'], LIBPATH='.',
--                      parse_flags=gpsflags)
--gpxlogger = env.Program('gpxlogger', ['gpxlogger.c'],
--                        LIBS=['gps_static'], LIBPATH='.',
--                        parse_flags=gpsflags)
--lcdgps = env.Program('lcdgps', ['lcdgps.c'],
--                     LIBS=['gps_static'], LIBPATH='.',
--                     parse_flags=gpsflags)
--cgps = env.Program('cgps', ['cgps.c'],
--                   LIBS=['gps_static'], LIBPATH='.',
--                   parse_flags=gpsflags + ncurseslibs)
--ntpshmmon = env.Program('ntpshmmon', ['ntpshmmon.c'],
--                        LIBS=['gps_static'], LIBPATH='.',
--                        parse_flags=gpsflags)
-+                     LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs + ncurseslibs)
-+env.Depends(gpsmon, [compiled_gpslib])
-+
-+gpsdctl = env.Program('gpsdctl', ['gpsdctl.c'], parse_flags=gpslibs)
-+env.Depends(gpsdctl, compiled_gpslib)
-+
-+gpspipe = env.Program('gpspipe', ['gpspipe.c'], parse_flags=gpslibs)
-+env.Depends(gpspipe, compiled_gpslib)
-+
-+gps2udp = env.Program('gps2udp', ['gps2udp.c'], parse_flags=gpslibs)
-+env.Depends(gps2udp, compiled_gpslib)
-+
-+gpxlogger = env.Program('gpxlogger', ['gpxlogger.c'], parse_flags=gpslibs)
-+env.Depends(gpxlogger, compiled_gpslib)
-+
-+lcdgps = env.Program('lcdgps', ['lcdgps.c'], parse_flags=gpslibs)
-+env.Depends(lcdgps, compiled_gpslib)
-+
-+cgps = env.Program('cgps', ['cgps.c'], parse_flags=gpslibs + ncurseslibs)
-+env.Depends(cgps, compiled_gpslib)
-+
-+ntpshmmon = env.Program('ntpshmmon', ['ntpshmmon.c'], parse_flags=gpslibs)
-+env.Depends(ntpshmmon, compiled_gpslib)
- 
- binaries = [gpsd, gpsdecode, gpsctl, gpsdctl, gpspipe, gps2udp, gpxlogger, lcdgps, ntpshmmon]
- if env["ncurses"]:
--- 
-2.4.1
-

diff --git a/sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch b/sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch
deleted file mode 100644
index 77ba8a7966f..00000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 7b29fcb88a476daab12957ac22512edf66aee813 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 7 Jun 2015 01:08:48 -0400
-Subject: [PATCH] reenable libgpsd
-
-Upstream has decided to drop the shared libgpsd (since it wasn't used
-externally anymore), but this also meant they statically link the code
-into every app.  Re-enable the shared lib so that the various runtime
-programs can continue to share and save on resources.
----
- SConstruct | 25 +++++++++++++------------
- 1 file changed, 13 insertions(+), 12 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index a050f38..53f697d 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -903,7 +903,7 @@ else:
-         obj_list = []
-         for s in Flatten(sources):
-             if type(s) is str:
--                obj_list.append(env.SharedObject(s))
-+                obj_list.append(env.SharedObject(s, parse_flags=parse_flags))
-             else:
-                 obj_list.append(s)
-         return env.SharedLibrary(target=target,
-@@ -925,9 +925,12 @@ static_gpslib = env.StaticLibrary("gps_static",
-                                   [env.StaticObject(s) for s in libgps_sources],
-                                   rtlibs)
- 
--compiled_gpsdlib = env.StaticLibrary(target="gpsd",
--                           source=[env.StaticObject(s, parse_flags=usbflags + bluezflags) for s in libgpsd_sources],
--                           parse_flags=usbflags + bluezflags)
-+compiled_gpsdlib = Library(env=env,
-+                           target="gpsd",
-+                           sources=libgpsd_sources,
-+                           version=libgps_version,
-+                           parse_flags=usbflags + rtlibs + bluezflags + ["-lgps"])
-+env.Depends(compiled_gpsdlib, [compiled_gpslib])
- 
- libraries = [compiled_gpslib, compiled_gpsdlib]
- 
-@@ -985,21 +987,19 @@ gpsmon_sources = [
- 
- ## Production programs
- 
--gpsd = env.Program('gpsd', gpsd_sources,
--                   LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs)
--env.Depends(gpsd, [compiled_gpslib])
-+gpsd = env.Program('gpsd', gpsd_sources, parse_flags=gpsdlibs)
-+env.Depends(gpsd, [compiled_gpsdlib, compiled_gpslib])
- 
--gpsdecode = env.Program('gpsdecode', ['gpsdecode.c'],
--                        LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs)
--env.Depends(gpsdecode, [compiled_gpslib])
-+gpsdecode = env.Program('gpsdecode', ['gpsdecode.c'], parse_flags=gpsdlibs)
-+env.Depends(gpsdecode, [compiled_gpsdlib, compiled_gpslib])
- 
- gpsctl = env.Program('gpsctl', ['gpsctl.c'],
-                      LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs)
--env.Depends(gpsctl, [compiled_gpslib])
-+env.Depends(gpsctl, [compiled_gpsdlib, compiled_gpslib])
- 
- gpsmon = env.Program('gpsmon', gpsmon_sources,
-                      LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs + ncurseslibs)
--env.Depends(gpsmon, [compiled_gpslib])
-+env.Depends(gpsmon, [compiled_gpsdlib, compiled_gpslib])
- 
- gpsdctl = env.Program('gpsdctl', ['gpsdctl.c'], parse_flags=gpslibs)
- env.Depends(gpsdctl, compiled_gpslib)
-@@ -1339,6 +1339,7 @@ binaryinstall.append(env.Install(installdir('bindir'),  [gpsdecode, gpsctl, gpsp
- if env["ncurses"]:
-     binaryinstall.append(env.Install(installdir('bindir'), [cgps, gpsmon]))
- binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, libgps_version))
-+binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpsdlib, libgps_version))
- # Work arount a minor bug in InstallSharedLib() link handling
- env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), ))
- 
--- 
-2.4.1
-

diff --git a/sci-geosciences/gpsd/files/gpsd-3.15-timebase.patch b/sci-geosciences/gpsd/files/gpsd-3.15-timebase.patch
deleted file mode 100644
index 2477d30ce6c..00000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.15-timebase.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-don't always rebuild this header as it won't change between compile & install
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -1174,7 +1174,6 @@
-     f.close()
- timebase = env.Command(target="timebase.h",
-                        source=["leapseconds.cache"], action=timebase_h)
--env.AlwaysBuild(timebase)
- 
- env.Textfile(target="gpsd_config.h", source=confdefs)
- env.Textfile(target="gpsd.h", source=[File("gpsd.h-head"), File("gpsd_config.h"), File("gpsd.h-tail")])

diff --git a/sci-geosciences/gpsd/files/gpsd-3.16-sysmacros.patch b/sci-geosciences/gpsd/files/gpsd-3.16-sysmacros.patch
deleted file mode 100644
index d9863c9280f..00000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.16-sysmacros.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://bugs.gentoo.org/581740
-
-From 87027243d101cfa7e01d9b697f890ea7b247449b Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 9 May 2016 14:33:06 -0400
-Subject: [PATCH] include sys/sysmacros.h for major
-
-These functions are not part of any official spec, and Linux C libs have
-always kept them in sys/sysmacros.h.  Include the header directly to fix
-builds w/alternative C libs, and to work with future glibc versions.
----
- serial.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/serial.c b/serial.c
-index d8bdd8c..b748cab 100644
---- a/serial.c
-+++ b/serial.c
-@@ -14,6 +14,9 @@
- #include <unistd.h>
- #include <sys/socket.h>
- #include <sys/param.h>	/* defines BSD */
-+#ifdef __linux__
-+#include <sys/sysmacros.h>
-+#endif
- 
- #include "gpsd_config.h"
- #ifdef ENABLE_BLUEZ
--- 
-2.7.4
-

diff --git a/sci-geosciences/gpsd/files/gpsd-3.8-ldflags.patch b/sci-geosciences/gpsd/files/gpsd-3.8-ldflags.patch
deleted file mode 100644
index b41be8b66e5..00000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.8-ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/391299
-
-split up linking flags into multiple arguments
-
---- gpsd-3.8/SConstruct
-+++ gpsd-3.8/SConstruct
-@@ -214,7 +214,7 @@
-             env.Replace(**{j: os.getenv(i)})
- for flag in ["LDFLAGS", "LINKFLAGS", "SHLINKFLAGS", "CPPFLAGS"]:
-     if os.environ.has_key(flag):
--        env.MergeFlags({flag : [os.getenv(flag)]})
-+        env.MergeFlags({flag : Split(os.getenv(flag))})
- 
- 
- # Placeholder so we can kluge together something like VPATH builds.

diff --git a/sci-geosciences/gpsd/gpsd-3.10.ebuild b/sci-geosciences/gpsd/gpsd-3.10.ebuild
deleted file mode 100644
index e7b5410cc43..00000000000
--- a/sci-geosciences/gpsd/gpsd-3.10.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# 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"
-
-GPSD_PROTOCOLS=(
-	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
-	geostar gpsclock itrax mtk3301 navcom nmea nmea2000 ntrip
-	oceanserver oncore rtcm104v2 rtcm104v3 sirf 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 qt4 +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:= )
-	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} )"
-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}"/${PN}-3.8-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-3.10-rpath.patch
-	epatch "${FILESDIR}"/${PN}-3.10-dbus.patch
-	epatch "${FILESDIR}"/${PN}-3.10-udev-install.patch
-	epatch "${FILESDIR}"/${PN}-3.10-nmea-disabled.patch #493022
-
-	# 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)
-	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@|$(pyvar python_progs)|" \
-		"${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
-		strip=False
-		python=False
-		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 qt4 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-3.16.ebuild b/sci-geosciences/gpsd/gpsd-3.16.ebuild
deleted file mode 100644
index bf36c89f403..00000000000
--- a/sci-geosciences/gpsd/gpsd-3.16.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# 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/22"
-
-GPSD_PROTOCOLS=(
-	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
-	geostar gpsclock itrax mtk3301 navcom nmea0183 nmea2000 ntrip
-	oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf 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 qt4 +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:= )
-	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} )"
-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}"/${PN}-3.8-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-3.15-dynamic-libs.patch
-	epatch "${FILESDIR}"/${PN}-3.15-libgpsd.patch
-	epatch "${FILESDIR}"/${PN}-3.15-broken-install.patch
-	epatch "${FILESDIR}"/${PN}-3.15-timebase.patch
-	epatch "${FILESDIR}"/${PN}-3.16-sysmacros.patch #581740
-
-	# Avoid useless -L paths to the install dir
-	sed -i \
-		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
-		SConstruct || die
-
-	sed -e 's:libusb.h:libusb-1.0/libusb.h:' -i driver_garmin.c || 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
-		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 qt4 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-3.17.ebuild b/sci-geosciences/gpsd/gpsd-3.17.ebuild
deleted file mode 100644
index 3bc87135257..00000000000
--- a/sci-geosciences/gpsd/gpsd-3.17.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# 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 qt4 +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:= )
-	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} )"
-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
-		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 qt4 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"
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/, sci-geosciences/gpsd/files/
@ 2019-10-04 18:59 Robin H. Johnson
  0 siblings, 0 replies; 4+ messages in thread
From: Robin H. Johnson @ 2019-10-04 18:59 UTC (permalink / raw
  To: gentoo-commits

commit:     ffcb70d5dc733edf8419c1435a0b5f8c03a838f5
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  3 05:13:17 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Oct  4 18:59:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffcb70d5

sci-geosciences/gpsd: bump, partial cleanups

Bump for security vulnerability, start cleanups.

Fixes: https://bugs.gentoo.org/673372
Fixes: https://bugs.gentoo.org/673382
Fixes: https://bugs.gentoo.org/678474
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 sci-geosciences/gpsd/Manifest                      |   2 +
 .../gpsd/files/gpsd-3.18.1-do_not_rm_library.patch |  11 ++
 .../gpsd/files/gpsd-3.19-do_not_rm_library.patch   |  11 ++
 sci-geosciences/gpsd/gpsd-3.18.1.ebuild            | 192 +++++++++++++++++++++
 sci-geosciences/gpsd/gpsd-3.19.ebuild              | 192 +++++++++++++++++++++
 5 files changed, 408 insertions(+)

diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 3352663f8ca..02f03645cf4 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1 +1,3 @@
 DIST gpsd-3.17.tar.gz 8755304 BLAKE2B d1f82b5734fd90fe903a6f2fe8835fe8292fe3e729306e7abe4054821971fece4c23f382c08a233503f07ad66b7b3a02a52a000e55c08491bf254ab6e99378b5 SHA512 71085053f600730e0f2de269c59ce0a17ae106ef01403f02d78418b267c6adb9818d541fba59eb23bf71cdb67c5442c82b4948d262ef7e74bb993dcae677a1b1
+DIST gpsd-3.18.1.tar.gz 9031595 BLAKE2B 170863740c7281ea111c3f4db2dfeb67f4366da7e9e8d2f7f3bbddacbc9d2083558379b1fe60c9293c31a6428288d205aba565694fedde6f1dfe67999a6782c6 SHA512 b381b177fcd29089a61aa11f5df2c67473720a6bbc5590ca1c4fda627331c407de01c62caceeddae780626b9a02392e9a770d52a143357e1babdcc2fbff0ed38
+DIST gpsd-3.19.tar.gz 10581777 BLAKE2B 0801919c968b8027c357047dabdc8587e1d5950cb0d80f89d6d62678a11b3dfc76a6a89ae59123680dac3188a695d0c37618d3f83280f5e584e10c1fa9a5dc03 SHA512 c9f9a9ff65759f852771ec4cf97ab15343c9176a149dd5ea6c2e2dc18b47aa7c7bf9ff1f2e8523121564d33a34ae6aa08169c5454847b4fe7848e616fd20a814

diff --git a/sci-geosciences/gpsd/files/gpsd-3.18.1-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-3.18.1-do_not_rm_library.patch
new file mode 100644
index 00000000000..0500f385d79
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.18.1-do_not_rm_library.patch
@@ -0,0 +1,11 @@
+--- gpsd-3.18.1/SConstruct.orig	2018-10-19 12:45:40.000000000 -0700
++++ gpsd-3.18.1/SConstruct	2019-10-02 11:49:00.848685223 -0700
+@@ -1796,8 +1796,6 @@ # third-party client programs should not
+ binaryinstall.append(env.Install(installdir('bindir'), bin_binaries))
+ binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib,
+                                     libgps_version))
+-# Work around a minor bug in InstallSharedLib() link handling
+-env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), ))
+ 
+ if qt_env:
+     binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'),

diff --git a/sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch
new file mode 100644
index 00000000000..8008dd54fe9
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch
@@ -0,0 +1,11 @@
+--- gpsd-3.19/SConstruct.orig	2019-07-01 19:00:17.000000000 -0700
++++ gpsd-3.19/SConstruct	2019-10-02 11:49:06.080655901 -0700
+@@ -1980,8 +1980,6 @@ # third-party client programs should not
+ binaryinstall.append(env.Install(installdir('bindir'), bin_binaries))
+ binaryinstall.append(LibraryInstall(env, installdir('libdir'), libgps_shared,
+                                     libgps_version))
+-# Work around a minor bug in InstallSharedLib() link handling
+-env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), ))
+ 
+ if qt_env:
+     binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'),

diff --git a/sci-geosciences/gpsd/gpsd-3.18.1.ebuild b/sci-geosciences/gpsd/gpsd-3.18.1.ebuild
new file mode 100644
index 00000000000..6cba45913e0
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.18.1.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+SCONS_MIN_VERSION="2.3.0"
+
+inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
+HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
+
+LICENSE="BSD"
+SLOT="0/24"
+
+GPSD_PROTOCOLS=(
+	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
+	gpsclock greis 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 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 )
+	gpsd_protocols_isync? ( gpsd_protocols_ublox )
+	gpsd_protocols_ublox? ( python )
+	gpsd_protocols_greis? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( cxx )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=net-misc/pps-tools-0.0.20120407
+	bluetooth? ( net-wireless/bluez )
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	ncurses? ( sys-libs/ncurses:= )
+	ntp? ( || (
+		net-misc/ntp
+		net-misc/ntpsec
+		net-misc/chrony
+	) )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+	)
+	python? ( ${PYTHON_DEPS} )
+	gpsd_protocols_ublox? ( dev-python/pyserial )
+	gpsd_protocols_greis? ( dev-python/pyserial )
+	usb? ( virtual/libusb:1 )
+	X? ( dev-python/pygobject:3[cairo,${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
+	# Merged upstream
+	#epatch "${FILESDIR}"/${P}-scons-print.patch
+	#epatch "${FILESDIR}"/${P}-scons-py3.patch
+
+	# Avoid useless -L paths to the install dir
+	sed -i \
+		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
+		SConstruct || die
+
+	default
+
+	use python && distutils-r1_src_prepare
+}
+
+python_prepare_all() {
+	python_setup
+	python_export
+
+	# 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)
+	# Handle conditional tools manually. #666734
+	use X && pybins+="+ ['xgps', 'xgpsspeed']"
+	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
+	use gpsd_protocols_greis && pybins+="+ ['zerk']"
+	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
+		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 python)
+		$(use_scons qt5 qt)
+		$(use_scons shm shm_export)
+		$(use_scons sockets socket_export)
+		$(use_scons usb)
+	)
+
+	use X && myesconsargs+=( xgps=1 xgpsspeed=1 )
+	use qt5 && myesconsargs+=( qt_versioned=5 )
+
+	# 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
+
+	# Cleanup bad alt copy due to Scons
+	rm -rf  "${D}"/usr/local/$(get_libdir)/python*/site-packages/gps*
+	find "${D}"/usr/local/ -type d -delete
+	# Install correct multi-python copy
+	use python && distutils-r1_src_install
+
+}
+
+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-3.19.ebuild b/sci-geosciences/gpsd/gpsd-3.19.ebuild
new file mode 100644
index 00000000000..6cba45913e0
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.19.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+SCONS_MIN_VERSION="2.3.0"
+
+inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
+HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
+
+LICENSE="BSD"
+SLOT="0/24"
+
+GPSD_PROTOCOLS=(
+	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
+	gpsclock greis 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 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 )
+	gpsd_protocols_isync? ( gpsd_protocols_ublox )
+	gpsd_protocols_ublox? ( python )
+	gpsd_protocols_greis? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( cxx )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=net-misc/pps-tools-0.0.20120407
+	bluetooth? ( net-wireless/bluez )
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	ncurses? ( sys-libs/ncurses:= )
+	ntp? ( || (
+		net-misc/ntp
+		net-misc/ntpsec
+		net-misc/chrony
+	) )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+	)
+	python? ( ${PYTHON_DEPS} )
+	gpsd_protocols_ublox? ( dev-python/pyserial )
+	gpsd_protocols_greis? ( dev-python/pyserial )
+	usb? ( virtual/libusb:1 )
+	X? ( dev-python/pygobject:3[cairo,${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
+	# Merged upstream
+	#epatch "${FILESDIR}"/${P}-scons-print.patch
+	#epatch "${FILESDIR}"/${P}-scons-py3.patch
+
+	# Avoid useless -L paths to the install dir
+	sed -i \
+		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
+		SConstruct || die
+
+	default
+
+	use python && distutils-r1_src_prepare
+}
+
+python_prepare_all() {
+	python_setup
+	python_export
+
+	# 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)
+	# Handle conditional tools manually. #666734
+	use X && pybins+="+ ['xgps', 'xgpsspeed']"
+	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
+	use gpsd_protocols_greis && pybins+="+ ['zerk']"
+	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
+		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 python)
+		$(use_scons qt5 qt)
+		$(use_scons shm shm_export)
+		$(use_scons sockets socket_export)
+		$(use_scons usb)
+	)
+
+	use X && myesconsargs+=( xgps=1 xgpsspeed=1 )
+	use qt5 && myesconsargs+=( qt_versioned=5 )
+
+	# 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
+
+	# Cleanup bad alt copy due to Scons
+	rm -rf  "${D}"/usr/local/$(get_libdir)/python*/site-packages/gps*
+	find "${D}"/usr/local/ -type d -delete
+	# Install correct multi-python copy
+	use python && distutils-r1_src_install
+
+}
+
+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"
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/, sci-geosciences/gpsd/files/
@ 2021-11-08  3:22 Mike Gilbert
  0 siblings, 0 replies; 4+ messages in thread
From: Mike Gilbert @ 2021-11-08  3:22 UTC (permalink / raw
  To: gentoo-commits

commit:     6ed2df2112818a2df25878f2a065140419c327d9
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  8 03:20:52 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Nov  8 03:21:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ed2df21

sci-geosciences/gpsd: drop 3.21, 3.23-r2

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sci-geosciences/gpsd/Manifest                      |   2 -
 ...psd-3.21-scons_conditional_python_scripts.patch |  64 -------
 sci-geosciences/gpsd/files/gpsd-3.3-setup.py       |  17 --
 sci-geosciences/gpsd/gpsd-3.21.ebuild              | 200 -------------------
 sci-geosciences/gpsd/gpsd-3.23-r2.ebuild           | 212 ---------------------
 5 files changed, 495 deletions(-)

diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 9dd813f6555..bd4e7460877 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,3 +1 @@
-DIST gpsd-3.21.tar.xz 2620396 BLAKE2B 366d1857f7ff63e087ac1bec8c95d997cd8d48a60d5548c1644748e1ed20334f45a4fb279bc26c61481cc3dea0244eb0aaca0ba562838a3b5de15da5d1d82502 SHA512 a45416c31ee891a84203aea786b6385ea5f557a406d898a8facdde78d120199b7e7db8f86ab8c395f6ca90965940355fa19413b2b918642fd8c7df219745233e
 DIST gpsd-3.23.1.tar.gz 4904121 BLAKE2B 277c0c12cbe73d7c637cb0e6ce7b6ba15bead55efbbc7f4c9d9d5524f76d60261438df31b66c491e92216d8f3f7e6a13759c0e0cdd200cfae3cc3d616bf98dd5 SHA512 fccfac363103282581e4ea8236ce40e4600a01f02489c1aaec721a13deac556bac046a3b76f8a5e21fe8c736056e872d8c7f2e4ed2d38a164323dd9738f00388
-DIST gpsd-3.23.tar.gz 4893363 BLAKE2B 502c1f2103f3b4224f3bc654bfe6e08e7ddf84707a0db6369e52608c095d5d082da020091ebca27d403cf74fa0bee5ebe1550068263d8d7a55143da2bc1a7350 SHA512 967cc9801271418023630df02b457b76108968992151f6e80b569e99b856bd79cc3d0369d2088f3bc609b2ab22b29dba87639bf466bf262ab80b2b3f04055f8b

diff --git a/sci-geosciences/gpsd/files/gpsd-3.21-scons_conditional_python_scripts.patch b/sci-geosciences/gpsd/files/gpsd-3.21-scons_conditional_python_scripts.patch
deleted file mode 100644
index 00fe5ad2b81..00000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.21-scons_conditional_python_scripts.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -150,10 +150,6 @@
-     'packaging/rpm/gpsd.spec',
-     'packet_names.h',
-     'Qgpsmm.pc',
--    'ubxtool',
--    'xgps',
--    'xgpsspeed',
--    'zerk',
-    ]
- 
- generated_www = [
-@@ -172,10 +168,6 @@
-     "gpscat",
-     "gpsfake",
-     "gpsprof",
--    "ubxtool",
--    "xgps",
--    "xgpsspeed",
--    "zerk",
- ]
- 
- # All man pages.  Always build them all.
-@@ -205,10 +197,6 @@
-     "man/ntpshmmon.1": "man/ntpshmmon.xml",
-     "man/ppscheck.8": "man/ppscheck.xml",
-     "man/srec.5": "man/srec.xml",
--    "man/ubxtool.1": "man/ubxtool.xml",
--    "man/xgps.1": "man/gps.xml",
--    "man/xgpsspeed.1": "man/gps.xml",
--    "man/zerk.1": "man/zerk.xml",
- }
- 
- # doc files to install in share/gpsd/doc
-@@ -1964,6 +1952,28 @@
-         "valgrind-audit.py"
-     ]
- 
-+    if env['greis']:
-+        generated_sources.extend(["zerk"])
-+        python_progs.extend(["zerk"])
-+        all_manpages.update({
-+            "man/zerk.1": "man/zerk.xml",
-+        })
-+
-+    if env['ublox']:
-+        generated_sources.extend(["ubxtool"])
-+        python_progs.extend(["ubxtool"])
-+        all_manpages.update({
-+            "man/ubxtool.1": "man/ubxtool.xml",
-+        })
-+
-+    if env['xgps']:
-+        generated_sources.extend(["xgps", "xgpsspeed"])
-+        python_progs.extend(["xgps", "xgpsspeed"])
-+        all_manpages.update({
-+            "man/xgps.1": "man/xgps.xml",
-+            "man/xgpsspeed.1": "man/xgps.xml",
-+        })
-+
-     # Dependencies for imports in test programs
-     env.Depends('tests/test_clienthelpers.py',
-                 ['gps/__init__.py', 'gps/clienthelpers.py', 'gps/misc.py'])

diff --git a/sci-geosciences/gpsd/files/gpsd-3.3-setup.py b/sci-geosciences/gpsd/files/gpsd-3.3-setup.py
deleted file mode 100644
index 93cc5e8f214..00000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.3-setup.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from distutils.core import setup, Extension
-
-setup(
-	name = "gps",
-	version = @VERSION@,
-	description = 'Python libraries for the gpsd service daemon',
-	url = @URL@,
-	author = 'the GPSD project',
-	author_email = @EMAIL@,
-	license = "BSD",
-	ext_modules=[
-		Extension("gps.packet", @GPS_PACKET_SOURCES@, include_dirs=["."]),
-		Extension("gps.clienthelpers", @GPS_CLIENT_SOURCES@, include_dirs=["."]),
-	],
-	packages = ['gps'],
-	scripts = @SCRIPTS@,
-)

diff --git a/sci-geosciences/gpsd/gpsd-3.21.ebuild b/sci-geosciences/gpsd/gpsd-3.21.ebuild
deleted file mode 100644
index b37701583b4..00000000000
--- a/sci-geosciences/gpsd/gpsd-3.21.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 scons-utils toolchain-funcs udev
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
-fi
-
-DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
-HOMEPAGE="https://gpsd.io/"
-
-LICENSE="BSD GPL-2"
-SLOT="0/27"
-
-GPSD_PROTOCOLS=(
-	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
-	gpsclock greis 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 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 )
-	gpsd_protocols_isync? ( gpsd_protocols_ublox )
-	gpsd_protocols_ublox? ( python )
-	gpsd_protocols_greis? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( cxx )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/gpsd
-	>=net-misc/pps-tools-0.0.20120407
-	bluetooth? ( net-wireless/bluez:= )
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	ncurses? ( sys-libs/ncurses:= )
-	ntp? ( || (
-		net-misc/ntp
-		net-misc/ntpsec
-		net-misc/chrony
-	) )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-	)
-	python? ( ${PYTHON_DEPS} )
-	gpsd_protocols_ublox? ( dev-python/pyserial )
-	gpsd_protocols_greis? ( dev-python/pyserial )
-	usb? ( virtual/libusb:1 )
-	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( sys-devel/bc )"
-BDEPEND="virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-util/scons-2.3.0[\${PYTHON_USEDEP}]")"
-
-# xml packages are for man page generation
-if [[ ${PV} == *9999* ]] ; then
-	DEPEND+="
-		app-text/xmlto
-		=app-text/docbook-xml-dtd-4.1*"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.21-scons_conditional_python_scripts.patch
-)
-
-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
-
-	# Avoid useless -L paths to the install dir
-	sed -i \
-		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
-		SConstruct || die
-
-	# Fix systemd binary paths
-	sed -i -e 's/local\///' 'systemd/gpsd.service' || die
-	sed -i -e 's/local\///' 'systemd/gpsdctl@.service.in' || die
-
-	default
-
-	if use python ; then
-		distutils-r1_src_prepare
-	else
-		# We're using escons, bug #734352
-		python_setup
-	fi
-}
-
-python_prepare_all() {
-	python_setup
-
-	# Extract python info out of SConstruct so we can use saner distribute
-	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
-	local pyprogs=$(sed -n '/^ *python_progs = \[/,/\]/{s:^ *::p}' SConstruct)
-	local pybins=$("${PYTHON}" -c "${pyprogs}; print(python_progs)" || die "Unable to extract core Python tools")
-	# Handle conditional tools manually. #666734
-	use X && pybins+="+ ['xgps', 'xgpsspeed']"
-	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
-	use gpsd_protocols_greis && pybins+="+ ['zerk']"
-	local pysrcs=$(sed -n '/^ *packet_ffi_extension = \[/,/\]/{s:^ *::p}' SConstruct)
-	local packet=$("${PYTHON}" -c "${pysrcs}; print(packet_ffi_extension)" || die "Unable to extract packet types")
-	# Post 3.19 the clienthelpers were merged into gps.packet
-	sed \
-		-e "s|@VERSION@|$(pyvar gpsd_version)|" \
-		-e "s|@URL@|'${HOMEPAGE}'|" \
-		-e "s|@EMAIL@|$(pyvar devmail)|" \
-		-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
-		-e "/@GPS_CLIENT_SOURCES@/d" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	scons_opts=(
-		prefix="${EPREFIX}/usr"
-		libdir="\$prefix/$(get_libdir)"
-		udevdir="$(get_udevdir)"
-		rundir="/run"
-		chrpath=False
-		gpsd_user=gpsd
-		gpsd_group=dialout
-		nostrip=True
-		manbuild=False
-		shared=$(usex !static True False)
-		bluez=$(usex bluetooth)
-		libgpsmm=$(usex cxx)
-		clientdebug=$(usex debug)
-		dbus_export=$(usex dbus)
-		ipv6=$(usex ipv6)
-		timing=$(usex latency-timing)
-		ncurses=$(usex ncurses)
-		ntpshm=$(usex ntp)
-		pps=$(usex ntp)
-		python=$(usex python)
-		# force a predictable python libdir because lib vs. lib64 usage differs
-		# from 3.5 to 3.6+
-		$(usex python python_libdir="${EPREFIX}"/python-discard "")
-		qt=$(usex qt5)
-		shm_export=$(usex shm)
-		socket_export=$(usex sockets)
-		usb=$(usex usb)
-		xgps=$(usex X)
-	)
-
-	use qt5 && scons_opts+=( qt_versioned=5 )
-
-	# enable specified protocols
-	local protocol
-	for protocol in ${GPSD_PROTOCOLS[@]} ; do
-		scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
-	done
-}
-
-src_compile() {
-	export CHRPATH=
-	tc-export CC CXX PKG_CONFIG
-	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
-	escons "${scons_opts[@]}"
-
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install "")
-
-	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
-	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
-
-	# Cleanup bad alt copy due to Scons
-	if use python ; then
-		rm -rf "${ED}"/python-discard/gps* || die
-		find "${ED}"/python-discard/ -type d -delete || die
-	fi
-
-	# Install correct multi-python copy
-	use python && distutils-r1_src_install
-}

diff --git a/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
deleted file mode 100644
index 79a48722e97..00000000000
--- a/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{8,9,10} )
-SCONS_MIN_VERSION="2.3.0"
-
-inherit udev multilib distutils-r1 scons-utils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
-fi
-
-DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
-HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
-
-LICENSE="BSD"
-SLOT="0/29"
-
-GPSD_PROTOCOLS=(
-	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
-	gpsclock greis 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 dbus debug ipv6 latency-timing ncurses ntp python qt5 +shm +sockets static systemd test udev usb X"
-REQUIRED_USE="X? ( python )
-	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
-	gpsd_protocols_isync? ( gpsd_protocols_ublox )
-	gpsd_protocols_ublox? ( python )
-	gpsd_protocols_greis? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( cxx )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/gpsd
-	acct-group/dialout
-	>=net-misc/pps-tools-0.0.20120407
-	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
-	bluetooth? ( net-wireless/bluez:= )
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	ncurses? ( sys-libs/ncurses:= )
-	ntp? ( || (
-		net-misc/ntp
-		net-misc/ntpsec
-		net-misc/chrony
-	) )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-	)
-	python? ( ${PYTHON_DEPS} )
-	gpsd_protocols_ublox? ( dev-python/pyserial )
-	gpsd_protocols_greis? ( dev-python/pyserial )
-	usb? ( virtual/libusb:1 )
-	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	test? ( sys-devel/bc )"
-
-# asciidoctor package is for man page generation
-if [[ ${PV} == *9999* ]] ; then
-	BDEPEND+=" dev-ruby/asciidoctor"
-fi
-
-python_check_deps() {
-	has_version -b "dev-util/scons[${PYTHON_USEDEP}]" || return 1
-}
-
-src_prepare() {
-	# Make sure our list matches the source.
-	local src_protocols=$(echo $(
-		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConscript | 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
-
-	# bug #807661
-	sed -i -e 's:$SRCDIR/gpsd.hotplug:$SRCDIR/../gpsd.hotplug:' SConscript || die
-
-	default
-
-	use python && distutils-r1_src_prepare
-}
-
-python_prepare_all() {
-	python_setup
-
-	# Extract python info out of SConscript so we can use saner distribute
-	pyarray() { sed -n "/^ *$1 *= *\\[/,/\\]/p" SConscript ; }
-	local pyprogs=$(pyarray python_progs)
-	local pybins=$("${PYTHON}" -c "${pyprogs}; \
-		print(list(set(python_progs) - {'xgps', 'xgpsspeed', 'ubxtool', 'zerk'}))" || die "Unable to list pybins")
-	# Handle conditional tools manually. #666734
-	use X && pybins+="+ ['xgps', 'xgpsspeed']"
-	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
-	use gpsd_protocols_greis && pybins+="+ ['zerk']"
-	local pysrcs=$(pyarray packet_ffi_extension)
-	local packet=$("${PYTHON}" -c "${pysrcs}; print(packet_ffi_extension)" || die "Unable to extract packet types")
-
-	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConscript ; }
-	pyvar2() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
-
-	# Post 3.19 the clienthelpers were merged into gps.packet
-
-	# TODO: Fix hardcoding https://gpsd.io/ for now for @URL@
-	sed \
-		-e "s|@VERSION@|$(pyvar2 gpsd_version | sed -e 's:\"::g')|" \
-		-e "s|@URL@|https://gpsd.io/|" \
-		-e "s|@DEVMAIL@|$(pyvar devmail)|" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		-e "s|@DOWNLOAD@|$(pyvar download)|" \
-		-e "s|@IRCCHAN@|$(pyvar ircchan)|" \
-		-e "s|@ISSUES@|$(pyvar bugtracker)|" \
-		-e "s|@MAILMAN@|$(pyvar mailman)|" \
-		-e "s|@PROJECTPAGE@|$(pyvar projectpage)|" \
-		-e "s|@SUPPORT@|https://gpsd.io/SUPPORT.html|" \
-		-e "s|@WEBSITE@|https://gpsd.io/|" \
-		"${S}"/packaging/gpsd-setup.py.in > setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	scons_opts=(
-		prefix="${EPREFIX}/usr"
-		libdir="\$prefix/$(get_libdir)"
-		udevdir="$(get_udevdir)"
-		rundir="/run"
-		chrpath=False
-		gpsd_user=gpsd
-		gpsd_group=dialout
-		nostrip=True
-		systemd=$(usex systemd)
-		unitdir="\$prefix/$(get_libdir)"
-		shared=$(usex !static True False)
-		bluez=$(usex bluetooth)
-		libgpsmm=$(usex cxx)
-		clientdebug=$(usex debug)
-		dbus_export=$(usex dbus)
-		ipv6=$(usex ipv6)
-		timing=$(usex latency-timing)
-		ncurses=$(usex ncurses)
-		ntpshm=$(usex ntp)
-		pps=$(usex ntp)
-		python=$(usex python)
-		# force a predictable python libdir because lib vs. lib64 usage differs
-		# from 3.5 to 3.6+
-		$(usex python python_libdir="${EPREFIX}"/python-discard "")
-		qt=$(usex qt5)
-		shm_export=$(usex shm)
-		socket_export=$(usex sockets)
-		usb=$(usex usb)
-	)
-
-	if [[ ${PV} != *9999* ]] ; then
-		scons_opts+=( manbuild=False )
-	fi
-
-	use X && scons_opts+=( xgps=1 xgpsspeed=1 )
-	use qt5 && scons_opts+=( qt_versioned=5 )
-
-	# enable specified protocols
-	local protocol
-	for protocol in ${GPSD_PROTOCOLS[@]} ; do
-		scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
-	done
-
-	# bug #809260
-	python_setup
-}
-
-src_compile() {
-	export CHRPATH=
-	tc-export CC CXX PKG_CONFIG
-	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() {
-	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install '')
-
-	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
-	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
-
-	# Cleanup bad alt copy due to Scons
-	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
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-11-08  3:22 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-04 18:59 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/, sci-geosciences/gpsd/files/ Robin H. Johnson
  -- strict thread matches above, loose matches on Subject: below --
2021-11-08  3:22 Mike Gilbert
2018-02-06 19:35 Andreas Sturmlechner
2016-05-09 19:11 Mike Frysinger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox