diff options
| author |   Matthias Maier <tamiko@gentoo.org> | 2017-01-23 23:27:07 -0600 |
|---|---|---|
| committer | Matthias Maier <tamiko@gentoo.org> | 2017-01-23 23:29:23 -0600 |
| commit | d37ceef5003b9da9a94c435fafe72bfc39334cf4 (patch) | |
| tree | e276d72e25569908df60576b866394575d4c4f72 /sci-geosciences | |
| parent | profiles: Augment GPSD_PROTOCOLS use expand and add descriptions (diff) | |
| download | gentoo-d37ceef5003b9da9a94c435fafe72bfc39334cf4.tar.gz gentoo-d37ceef5003b9da9a94c435fafe72bfc39334cf4.tar.bz2 gentoo-d37ceef5003b9da9a94c435fafe72bfc39334cf4.zip | |
sci-geosciences/gpsd: update live ebuild, bug #602336
Package-Manager: Portage-2.3.0, Repoman-2.3.1
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch | 12 | ||||
| -rw-r--r-- | sci-geosciences/gpsd/gpsd-9999.ebuild | 13 |
2 files changed, 18 insertions, 7 deletions
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 new file mode 100644 index 000000000000..83e2907fca5b --- /dev/null +++ b/sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch @@ -0,0 +1,12 @@ +diff --git a/SConstruct b/SConstruct +index c0f083a..4a98580 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -1646,7 +1646,6 @@ binaryinstall.append(env.Install(installdir('sbindir'), sbin_binaries)) + 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'), compiled_qgpsmmlib, libgps_version)) diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild index 97ef2094b0ce..22f67816f51d 100644 --- a/sci-geosciences/gpsd/gpsd-9999.ebuild +++ b/sci-geosciences/gpsd/gpsd-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -25,10 +25,10 @@ LICENSE="BSD" SLOT="0" 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 + 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" @@ -69,8 +69,7 @@ src_prepare() { die "please sync ebuild & source" fi - epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch - epatch "${FILESDIR}"/${PN}-3.11-rpath.patch + epatch "${FILESDIR}"/${P}-do_not_rm_library.patch # Avoid useless -L paths to the install dir sed -i \ |