allowed conf.d/lircd to override socket and symlink for multiplexing, bug 287731

(Portage version: 2.1.10.65/cvs/Linux x86_64)

4 files changed, 22 insertions, 7 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index da321e75c39f..3ab8ff84cce8 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/lirc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.228 2012/07/17 20:30:16 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.229 2012/07/19 19:52:18 axs Exp $
+
+*lirc-0.9.0-r2 (19 Jul 2012)
+
+  19 Jul 2012; Ian Stakenvicius <axs@gentoo.org> -files/lircd-0.8.6-r1,
+  +files/lircd-0.8.6-r2, -lirc-0.9.0-r1.ebuild, +lirc-0.9.0-r2.ebuild,
+  +files/lircd.conf.4, -files/lircd.conf.3:
+  allowed conf.d/lircd to override socket and symlink for multiplexing, bug
+  287731
 
   17 Jul 2012; Ian Stakenvicius <axs@gentoo.org> lirc-0.9.0-r1.ebuild,
   +files/lirc-0.9.0-atiusb_kfifo.patch:
diff --git a/app-misc/lirc/files/lircd-0.8.6-r1 b/app-misc/lirc/files/lircd-0.8.6-r2
index aba22626b12f..e651f19da50d 100644
--- a/app-misc/lirc/files/lircd-0.8.6-r1
+++ b/app-misc/lirc/files/lircd-0.8.6-r2
@@ -1,11 +1,11 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/files/lircd-0.8.6-r1,v 1.1 2012/07/17 19:18:25 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/files/lircd-0.8.6-r2,v 1.1 2012/07/19 19:52:17 axs Exp $
 
 PIDFILE=/var/run/lirc/${SVCNAME}.pid
-LIRCD_SYMLINKFILE=/dev/lircd
-LIRCD_SOCKET=/var/run/lirc/lircd
+: ${LIRCD_SYMLINKFILE:=/dev/lircd}
+: ${LIRCD_SOCKET:=/var/run/lirc/lircd}
 
 depend() {
 	need localmount
diff --git a/app-misc/lirc/files/lircd.conf.3 b/app-misc/lirc/files/lircd.conf.4
index f800c0aa191e..f59c5f214283 100644
--- a/app-misc/lirc/files/lircd.conf.3
+++ b/app-misc/lirc/files/lircd.conf.4
@@ -13,3 +13,10 @@
 # for the following entries in /sys/class/rc/
 # (space-separated list if there is more than one)
 LIRCD_SET_SYSCLASSRCS="rc0"
+
+# If running mulitple instances of lircd, the following
+# can be used to override the default socket path and
+# socket symlink
+#LIRCD_SOCKET="/var/run/lirc/lircd"
+#LIRCD_SYMLINKFILE="/dev/lircd"
+
diff --git a/app-misc/lirc/lirc-0.9.0-r1.ebuild b/app-misc/lirc/lirc-0.9.0-r2.ebuild
index acbf1f3fe413..a74c091a2d33 100644
--- a/app-misc/lirc/lirc-0.9.0-r1.ebuild
+++ b/app-misc/lirc/lirc-0.9.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.9.0-r1.ebuild,v 1.3 2012/07/17 20:30:16 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.9.0-r2.ebuild,v 1.1 2012/07/19 19:52:18 axs Exp $
 
 EAPI=4
 
@@ -350,9 +350,9 @@ src_install() {
 	emake DESTDIR="${D}" install
 	emake -C drivers DESTDIR="${D}" install
 
-	newinitd "${FILESDIR}"/lircd-0.8.6-r1 lircd
+	newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
 	newinitd "${FILESDIR}"/lircmd lircmd
-	newconfd "${FILESDIR}"/lircd.conf.3 lircd
+	newconfd "${FILESDIR}"/lircd.conf.4 lircd
 
 	insinto /etc/modprobe.d/
 	newins "${FILESDIR}"/modprobed.lirc lirc.conf