Fix build error when USE=-sockets #441760 by Conrad Kostecki.

(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

5 files changed, 75 insertions, 4 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index 494dd08e3274..b5ef0c09a117 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.96 2013/03/27 20:04:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.97 2013/03/27 20:12:36 vapier Exp $
+
+  27 Mar 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/gpsd-3.7-gps_regress.patch, gpsd-3.7.ebuild, gpsd-3.8.ebuild,
+  gpsd-9999.ebuild:
+  Fix build error when USE=-sockets #441760 by Conrad Kostecki.
 
   27 Mar 2013; Mike Frysinger <vapier@gentoo.org> gpsd-3.8.ebuild,
   gpsd-9999.ebuild, metadata.xml:
diff --git a/sci-geosciences/gpsd/files/gpsd-3.7-gps_regress.patch b/sci-geosciences/gpsd/files/gpsd-3.7-gps_regress.patch
new file mode 100644
index 000000000000..018431e1d6b9
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.7-gps_regress.patch
@@ -0,0 +1,63 @@
+https://bugs.gentoo.org/441760
+
+From 52dedf2ca8b31a8d113a1d9b14977d5d9b782744 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 27 Mar 2013 16:13:30 -0400
+Subject: [PATCH] fix build error when socket_export is disabled
+
+If you try to build with socket_export disabled, you'll hit a build
+failure due to gps_regress being undefined:
+
+NameError: name 'gps_regress' is not defined:
+  File "SConstruct", line 1519:
+    gps_regress,
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ SConstruct | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 1c187f3..a2b7a4c 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1394,8 +1394,8 @@ else:
+ # using regress-drivers requires socket_export being enabled.
+ if env['socket_export']:
+     # Regression-test the daemon
+-    gps_regress = Utility("gps-regress", [gpsd, python_built_extensions],
+-            '$SRCDIR/regress-driver test/daemon/*.log')
++    gps_regress = [Utility("gps-regress", [gpsd, python_built_extensions],
++            '$SRCDIR/regress-driver test/daemon/*.log')]
+ 
+     # Test that super-raw mode works. Compare each logfile against itself
+     # dumped through the daemon running in R=2 mode.  (This test is not
+@@ -1410,6 +1410,8 @@ if env['socket_export']:
+     # offset from subframe data.
+     Utility('gps-makeregress', [gpsd, python_built_extensions],
+         '$SRCDIR/regress-driver -b test/daemon/*.log')
++else:
++    gps_regress = []
+ 
+ # To build an individual test for a load named foo.log, put it in
+ # test/daemon and do this:
+@@ -1550,7 +1552,6 @@ flocktest = Utility("flocktest", [], "cd devtools; ./flocktest " + gitrepo)
+ check = env.Alias('check', [
+     python_compilation_regress,
+     bits_regress,
+-    gps_regress,
+     rtcm_regress,
+     aivdm_regress,
+     packet_regress,
+@@ -1559,7 +1560,7 @@ check = env.Alias('check', [
+     time_regress,
+     unpack_regress,
+     json_regress,
+-    ])
++    ] + gps_regress)
+ 
+ env.Alias('testregress', check)
+ 
+-- 
+1.8.1.2
+
diff --git a/sci-geosciences/gpsd/gpsd-3.7.ebuild b/sci-geosciences/gpsd/gpsd-3.7.ebuild
index c663f51251ed..2eab06dae4b7 100644
--- a/sci-geosciences/gpsd/gpsd-3.7.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.7.ebuild,v 1.4 2013/03/02 23:21:19 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.7.ebuild,v 1.5 2013/03/27 20:12:36 vapier Exp $
 
 EAPI="4"
 
@@ -65,6 +65,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.4-always-install-man-pages.patch
 	epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch
 	epatch "${FILESDIR}"/${PN}-3.7-rpath.patch
+	epatch "${FILESDIR}"/${PN}-3.7-gps_regress.patch #441760
 
 	# Avoid useless -L paths to the install dir
 	sed -i \
diff --git a/sci-geosciences/gpsd/gpsd-3.8.ebuild b/sci-geosciences/gpsd/gpsd-3.8.ebuild
index 1f7eff5271e6..646e10c9f66a 100644
--- a/sci-geosciences/gpsd/gpsd-3.8.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.8.ebuild,v 1.2 2013/03/27 20:04:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.8.ebuild,v 1.3 2013/03/27 20:12:36 vapier Exp $
 
 EAPI="4"
 
@@ -81,6 +81,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.8-udev.patch
 	epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch
 	epatch "${FILESDIR}"/${PN}-3.7-rpath.patch
+	epatch "${FILESDIR}"/${PN}-3.7-gps_regress.patch #441760
 
 	# Avoid useless -L paths to the install dir
 	sed -i \
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index de0e3cc5dc7a..c2c83af26df4 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.10 2013/03/27 20:04:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.11 2013/03/27 20:12:36 vapier Exp $
 
 EAPI="4"
 
@@ -81,6 +81,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.8-udev.patch
 	epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch
 	epatch "${FILESDIR}"/${PN}-3.7-rpath.patch
+	epatch "${FILESDIR}"/${PN}-3.7-gps_regress.patch #441760
 
 	# Avoid useless -L paths to the install dir
 	sed -i \