| 1 |
commit: d37ceef5003b9da9a94c435fafe72bfc39334cf4 |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 24 05:27:07 2017 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 24 05:29:23 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d37ceef5 |
| 7 |
|
| 8 |
sci-geosciences/gpsd: update live ebuild, bug #602336 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.0, Repoman-2.3.1 |
| 11 |
|
| 12 |
.../gpsd/files/gpsd-9999-do_not_rm_library.patch | 12 ++++++++++++ |
| 13 |
sci-geosciences/gpsd/gpsd-9999.ebuild | 13 ++++++------- |
| 14 |
2 files changed, 18 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000..83e2907 |
| 19 |
--- /dev/null |
| 20 |
+++ b/sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch |
| 21 |
@@ -0,0 +1,12 @@ |
| 22 |
+diff --git a/SConstruct b/SConstruct |
| 23 |
+index c0f083a..4a98580 100644 |
| 24 |
+--- a/SConstruct |
| 25 |
++++ b/SConstruct |
| 26 |
+@@ -1646,7 +1646,6 @@ binaryinstall.append(env.Install(installdir('sbindir'), sbin_binaries)) |
| 27 |
+ binaryinstall.append(env.Install(installdir('bindir'), bin_binaries)) |
| 28 |
+ binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, libgps_version)) |
| 29 |
+ # Work around a minor bug in InstallSharedLib() link handling |
| 30 |
+-env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), )) |
| 31 |
+ |
| 32 |
+ if qt_env: |
| 33 |
+ binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib, libgps_version)) |
| 34 |
|
| 35 |
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild |
| 36 |
index 97ef209..22f6781 100644 |
| 37 |
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild |
| 38 |
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild |
| 39 |
@@ -1,4 +1,4 @@ |
| 40 |
-# Copyright 1999-2016 Gentoo Foundation |
| 41 |
+# Copyright 1999-2017 Gentoo Foundation |
| 42 |
# Distributed under the terms of the GNU General Public License v2 |
| 43 |
# $Id$ |
| 44 |
|
| 45 |
@@ -25,10 +25,10 @@ LICENSE="BSD" |
| 46 |
SLOT="0" |
| 47 |
|
| 48 |
GPSD_PROTOCOLS=( |
| 49 |
- aivdm ashtech earthmate evermore fury fv18 garmin garmintxt |
| 50 |
- geostar gpsclock itrax mtk3301 navcom nmea0183 nmea2000 ntrip |
| 51 |
- oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf superstar2 |
| 52 |
- tnt tripmate tsip ublox |
| 53 |
+ aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar |
| 54 |
+ gpsclock isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip oceanserver |
| 55 |
+ oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt |
| 56 |
+ tripmate tsip ublox |
| 57 |
) |
| 58 |
IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_} |
| 59 |
IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets static test udev usb X" |
| 60 |
@@ -69,8 +69,7 @@ src_prepare() { |
| 61 |
die "please sync ebuild & source" |
| 62 |
fi |
| 63 |
|
| 64 |
- epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch |
| 65 |
- epatch "${FILESDIR}"/${PN}-3.11-rpath.patch |
| 66 |
+ epatch "${FILESDIR}"/${P}-do_not_rm_library.patch |
| 67 |
|
| 68 |
# Avoid useless -L paths to the install dir |
| 69 |
sed -i \ |
Archives