Source /etc/conf.d/gpsd in hotplug rules #511584 by Mark Wagner.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

4 files changed, 37 insertions, 4 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index 3cb7b5c938eb..c70a01d075b4 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.122 2014/10/30 21:16:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.123 2014/10/30 21:20:36 vapier Exp $
+
+  30 Oct 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/gpsd-3.11-hotplug-config.patch, files/gpsd.init-2, gpsd-9999.ebuild:
+  Source /etc/conf.d/gpsd in hotplug rules #511584 by Mark Wagner.
 
   30 Oct 2014; Mike Frysinger <vapier@gentoo.org> +files/gpsd-3.11-rpath.patch,
   gpsd-9999.ebuild:
diff --git a/sci-geosciences/gpsd/files/gpsd-3.11-hotplug-config.patch b/sci-geosciences/gpsd/files/gpsd-3.11-hotplug-config.patch
new file mode 100644
index 000000000000..a2b96f4d01af
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.11-hotplug-config.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/511584
+
+From 2c0c2d90cbe450d208b320359b55089a441ff52a Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 30 Oct 2014 17:17:41 -0400
+Subject: [PATCH] udev rules: source Gentoo config files
+
+---
+ gpsd.hotplug | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gpsd.hotplug b/gpsd.hotplug
+index dd0deaf..5f4ce13 100644
+--- a/gpsd.hotplug
++++ b/gpsd.hotplug
+@@ -24,6 +24,8 @@ export PATH
+ 
+ if [ -r /etc/default/gpsd ]; then
+   . /etc/default/gpsd
++elif [ -r /etc/conf.d/gpsd ]; then
++  . /etc/conf.d/gpsd
+ elif [ -r /etc/sysconfig/gpsd ]; then
+   . /etc/sysconfig/gpsd
+   GPSD_OPTIONS=$OPTIONS
+-- 
+2.1.2
+
diff --git a/sci-geosciences/gpsd/files/gpsd.init-2 b/sci-geosciences/gpsd/files/gpsd.init-2
index 20f3809c5a27..02919fd18e64 100755
--- a/sci-geosciences/gpsd/files/gpsd.init-2
+++ b/sci-geosciences/gpsd/files/gpsd.init-2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init-2,v 1.2 2010/09/30 23:07:55 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init-2,v 1.3 2014/10/30 21:20:36 vapier Exp $
 
 depend() {
 	after dbus
@@ -12,6 +12,7 @@ PIDFILE=/var/run/${SVCNAME}.pid
 DAEMON=/usr/sbin/gpsd
 
 checkconfig() {
+	# Note: these GPSD_xxx var names should be kept in sync with the udev rules.
 	if [ -z "${GPSD_SOCKET}" ] && [ -z "${DEVICES}" ]; then
 		GPSD_SOCKET="/var/run/gpsd.sock"
 	fi
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 47ff9d0eec07..06241140bf3a 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.17 2014/10/30 21:16:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.18 2014/10/30 21:20:36 vapier Exp $
 
 EAPI="5"
 
@@ -71,6 +71,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
 	epatch "${FILESDIR}"/${PN}-3.11-rpath.patch
+	epatch "${FILESDIR}"/${PN}-3.11-hotplug-config.patch #511584
 
 	# Avoid useless -L paths to the install dir
 	sed -i \