summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-02-04 01:14:53 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-02-06 20:35:10 +0100
commit9f52f6421ecbe3ec235979016783f9af9371714f (patch)
tree697ef059fec695529a17c3cb072dddbb8442745b /sci-geosciences
parentprofiles: arm: Stable-mask app-misc/geoclue[gps] (diff)
downloadgentoo-9f52f6421ecbe3ec235979016783f9af9371714f.tar.gz
gentoo-9f52f6421ecbe3ec235979016783f9af9371714f.tar.bz2
gentoo-9f52f6421ecbe3ec235979016783f9af9371714f.zip
sci-geosciences/gpsd: Drop old
Closes: https://bugs.gentoo.org/632372 Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/gpsd/Manifest2
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.10-dbus.patch32
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.10-nmea-disabled.patch54
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.10-rpath.patch13
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.10-udev-install.patch40
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.15-broken-install.patch28
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.15-dynamic-libs.patch100
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch81
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.15-timebase.patch12
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.16-sysmacros.patch31
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.8-ldflags.patch15
-rw-r--r--sci-geosciences/gpsd/gpsd-3.10.ebuild167
-rw-r--r--sci-geosciences/gpsd/gpsd-3.16.ebuild170
-rw-r--r--sci-geosciences/gpsd/gpsd-3.17.ebuild163
14 files changed, 0 insertions, 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"
-}