[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/files/, sci-geosciences/gpsd/

["Mike Frysinger" <vapier@gentoo.org>]

commit:     c806f3c116e0bcd4aae79ad074eeec981ee963a9
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon May  9 18:47:31 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon May  9 19:44:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c806f3c1

sci-geosciences/gpsd: fix parallel build #577432

 sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch  |  7 ++++---
 sci-geosciences/gpsd/files/gpsd-3.15-timebase.patch | 12 ++++++++++++
 sci-geosciences/gpsd/gpsd-3.15.ebuild               |  1 +
 sci-geosciences/gpsd/gpsd-3.16.ebuild               |  3 +--
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch b/sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch
index b8d2cf0..77ba8a7 100644
--- a/sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch
+++ b/sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch
@@ -24,7 +24,7 @@ index a050f38..53f697d 100644
              else:
                  obj_list.append(s)
          return env.SharedLibrary(target=target,
-@@ -925,9 +925,11 @@ static_gpslib = env.StaticLibrary("gps_static",
+@@ -925,9 +925,12 @@ static_gpslib = env.StaticLibrary("gps_static",
                                    [env.StaticObject(s) for s in libgps_sources],
                                    rtlibs)
  
@@ -36,6 +36,7 @@ index a050f38..53f697d 100644
 +                           sources=libgpsd_sources,
 +                           version=libgps_version,
 +                           parse_flags=usbflags + rtlibs + bluezflags + ["-lgps"])
++env.Depends(compiled_gpsdlib, [compiled_gpslib])
  
  libraries = [compiled_gpslib, compiled_gpsdlib]
  
@@ -58,12 +59,12 @@ index a050f38..53f697d 100644
  gpsctl = env.Program('gpsctl', ['gpsctl.c'],
                       LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs)
 -env.Depends(gpsctl, [compiled_gpslib])
-+env.Depends(gpsctl, [compiled_gpslib, 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_gpslib, compiled_gpslib])
++env.Depends(gpsmon, [compiled_gpsdlib, compiled_gpslib])
  
  gpsdctl = env.Program('gpsdctl', ['gpsdctl.c'], parse_flags=gpslibs)
  env.Depends(gpsdctl, compiled_gpslib)

diff --git a/sci-geosciences/gpsd/files/gpsd-3.15-timebase.patch b/sci-geosciences/gpsd/files/gpsd-3.15-timebase.patch
new file mode 100644
index 0000000..2477d30
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.15-timebase.patch
@@ -0,0 +1,12 @@
+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/gpsd-3.15.ebuild b/sci-geosciences/gpsd/gpsd-3.15.ebuild
index e6f3172..bc6e7eb 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.15-timebase.patch
 	epatch "${FILESDIR}"/${PN}-3.16-sysmacros.patch #581740
 
 	# Avoid useless -L paths to the install dir

diff --git a/sci-geosciences/gpsd/gpsd-3.16.ebuild b/sci-geosciences/gpsd/gpsd-3.16.ebuild
index 5928f17..18ad0f6 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.15-timebase.patch
 	epatch "${FILESDIR}"/${PN}-3.16-sysmacros.patch #581740
 
 	# Avoid useless -L paths to the install dir
@@ -82,8 +83,6 @@ src_prepare() {
 
 	sed -e 's:libusb.h:libusb-1.0/libusb.h:' -i driver_garmin.c || die
 
-	eapply_user
-
 	use python && distutils-r1_src_prepare
 }