Supply a good default conf-file. This fixes Bug 198482.

Package-Manager: portage-2.1.3.19

5 files changed, 39 insertions, 21 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index 1854aed13c67..7b87bc5da47c 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/lirc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.161 2007/11/02 21:12:52 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.162 2007/11/12 19:08:21 zzam Exp $
+
+  12 Nov 2007; Matthias Schwarzott <zzam@gentoo.org> +files/lircd.conf.2,
+  lirc-0.8.2-r2.ebuild, lirc-0.8.3_pre1.ebuild:
+  Supply a good default conf-file. This fixes Bug 198482.
 
   02 Nov 2007; Lars Weiler <pylon@gentoo.org> lirc-0.8.2-r2.ebuild:
   stable ppc, bug #197768
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 1cbf9f69f93e..40daab8bb569 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -93,6 +93,10 @@ AUX lircd.conf 67 RMD160 9d6e579362e19b1ea2b04acd9b80e25bbfd3ba63 SHA1 81e3cdd5a
 MD5 47d0c4ff9caf25dee3e01edea851c9c6 files/lircd.conf 67
 RMD160 9d6e579362e19b1ea2b04acd9b80e25bbfd3ba63 files/lircd.conf 67
 SHA256 5bfdf541edea0df7a4c2d7d0ce1aec8b0122313645e0b0b7297b97e4ef4fad0e files/lircd.conf 67
+AUX lircd.conf.2 315 RMD160 94efda1b445dd2e680ff12c941a854af4428c2a4 SHA1 2cea988bcab226bea90142b98a5315032bd5c5f6 SHA256 d498acd009e3ebd8593c3fa03ddd9e3dce763309e9668733fb5c74e29b8b4420
+MD5 6660a1269b0f9314d4fbb021d7017aa9 files/lircd.conf.2 315
+RMD160 94efda1b445dd2e680ff12c941a854af4428c2a4 files/lircd.conf.2 315
+SHA256 d498acd009e3ebd8593c3fa03ddd9e3dce763309e9668733fb5c74e29b8b4420 files/lircd.conf.2 315
 AUX lircmd 466 RMD160 32f2b2411afc60522944f5c3dff9f53aac242a9c SHA1 79939de790d20704009643bd810e3186090d0e36 SHA256 d47f22a33a83c14a4a0c333d6a445c40e550c491899fb0c6d323e23fe1eac7b7
 MD5 54581835f791fe37a1285926c6d21b12 files/lircmd 466
 RMD160 32f2b2411afc60522944f5c3dff9f53aac242a9c files/lircmd 466
@@ -122,10 +126,10 @@ EBUILD lirc-0.8.2-r1.ebuild 8282 RMD160 9b9d86196447c1e4fce2ecaeaa2ed7366a74f427
 MD5 afe5e236cf9ba6069efebefea74fcfc8 lirc-0.8.2-r1.ebuild 8282
 RMD160 9b9d86196447c1e4fce2ecaeaa2ed7366a74f427 lirc-0.8.2-r1.ebuild 8282
 SHA256 eb2769d7bb8646a66188ebce339e7cf037146d343260b3b2cf178a6fb3be22ce lirc-0.8.2-r1.ebuild 8282
-EBUILD lirc-0.8.2-r2.ebuild 8276 RMD160 9d3406d1f58249ead123269557f6777de6c3f917 SHA1 85541e930ecda3b09858f7acefbc9b802ecc8e39 SHA256 591492eb89039cdd51a503af7bf4d1306187e783f5cc5f3637bf37d1b1a4dfeb
-MD5 2906cb031b018cafd58c7760e0799763 lirc-0.8.2-r2.ebuild 8276
-RMD160 9d3406d1f58249ead123269557f6777de6c3f917 lirc-0.8.2-r2.ebuild 8276
-SHA256 591492eb89039cdd51a503af7bf4d1306187e783f5cc5f3637bf37d1b1a4dfeb lirc-0.8.2-r2.ebuild 8276
+EBUILD lirc-0.8.2-r2.ebuild 8277 RMD160 5632feb230c8b4455913b62b5e71e4a3ff8d212e SHA1 6c93a5b49610d5a429fa42f7056bc602e68c652c SHA256 4e69e6e3ea1f32df0605194c02232fb57b1fef268ea52db0a3d4a65a47187ffe
+MD5 10bcdd369e1da3521a5169964cb956c9 lirc-0.8.2-r2.ebuild 8277
+RMD160 5632feb230c8b4455913b62b5e71e4a3ff8d212e lirc-0.8.2-r2.ebuild 8277
+SHA256 4e69e6e3ea1f32df0605194c02232fb57b1fef268ea52db0a3d4a65a47187ffe lirc-0.8.2-r2.ebuild 8277
 EBUILD lirc-0.8.2.ebuild 7749 RMD160 15289a7b2c51dcf4c32c399b16861f5e73c30965 SHA1 9338e58f0351a7eab10837b07253c4b5be6eeb6d SHA256 de6312c8bc46974d99c73f958843f2c143994ed68c18cc964d30aa1405c94998
 MD5 41579ad2697fef80f9895ddd6043a2bd lirc-0.8.2.ebuild 7749
 RMD160 15289a7b2c51dcf4c32c399b16861f5e73c30965 lirc-0.8.2.ebuild 7749
@@ -134,14 +138,14 @@ EBUILD lirc-0.8.2_pre2.ebuild 7768 RMD160 2437273d778a5ba426026aaafab4e2528c4619
 MD5 4c7863d2f6891a08995b48c67e42f7c8 lirc-0.8.2_pre2.ebuild 7768
 RMD160 2437273d778a5ba426026aaafab4e2528c4619e6 lirc-0.8.2_pre2.ebuild 7768
 SHA256 b35bdae2c7011fb84d2279d12de811dbc128266d197f83e4bb70bb9e5c8ec67b lirc-0.8.2_pre2.ebuild 7768
-EBUILD lirc-0.8.3_pre1.ebuild 8310 RMD160 da521f0ca0db4d8f629c9d89e0ef66da19e97a30 SHA1 624118a9286cb893bca8a7eec7c5fb320ed16926 SHA256 bc40aaac7ee7269f0382ff5fbdf18125860ef31757656a585ebf642b51b973d8
-MD5 1bb20ccb860d9fe90842dbb5b7b5e71a lirc-0.8.3_pre1.ebuild 8310
-RMD160 da521f0ca0db4d8f629c9d89e0ef66da19e97a30 lirc-0.8.3_pre1.ebuild 8310
-SHA256 bc40aaac7ee7269f0382ff5fbdf18125860ef31757656a585ebf642b51b973d8 lirc-0.8.3_pre1.ebuild 8310
-MISC ChangeLog 24942 RMD160 ba8927ef1639a63fcf75b1720843f5afaf8f23a2 SHA1 fb746b7cef9b44a69a9d95602fb2d5b53b2f6bb0 SHA256 cb3e9d4c6098aee3d5a4d397a75899a81415a486488e77429b002831a4f1ad4b
-MD5 979a1648909c97f78ab8a8dcf7e0b733 ChangeLog 24942
-RMD160 ba8927ef1639a63fcf75b1720843f5afaf8f23a2 ChangeLog 24942
-SHA256 cb3e9d4c6098aee3d5a4d397a75899a81415a486488e77429b002831a4f1ad4b ChangeLog 24942
+EBUILD lirc-0.8.3_pre1.ebuild 8312 RMD160 fa19369be5ddcf47a0f83180f88cbd67054abf5c SHA1 ac5a9cfcc60ed10eda4cf122a1488764926e6f23 SHA256 a81e9a25442457207b33c3a11b04b7f2e0a174100314960a69a57a2ccb490325
+MD5 ed7d57a35116908e3dafb2c279801db3 lirc-0.8.3_pre1.ebuild 8312
+RMD160 fa19369be5ddcf47a0f83180f88cbd67054abf5c lirc-0.8.3_pre1.ebuild 8312
+SHA256 a81e9a25442457207b33c3a11b04b7f2e0a174100314960a69a57a2ccb490325 lirc-0.8.3_pre1.ebuild 8312
+MISC ChangeLog 25122 RMD160 a2b2bc7a134dfe6e5bd2299929dbd4fa9ffee862 SHA1 393e37972d528f9466ab1f619f69a65843306f80 SHA256 9a932a78059cd130857fd4c0da4d643980021d6e5fc4c575e5de1f83fa1d94f1
+MD5 a935d15f1263291b2a266bebf7d2b0a0 ChangeLog 25122
+RMD160 a2b2bc7a134dfe6e5bd2299929dbd4fa9ffee862 ChangeLog 25122
+SHA256 9a932a78059cd130857fd4c0da4d643980021d6e5fc4c575e5de1f83fa1d94f1 ChangeLog 25122
 MISC metadata.xml 162 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af SHA1 7464d1657179a3f30c5ea2ad401590e4489ac945 SHA256 aaad144c69dd58781e1dc97b5fbad08a5b4db504bd3cbbb4ab27018a307d5d81
 MD5 dcc0143f6508e9fd068845f98b7bb403 metadata.xml 162
 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af metadata.xml 162
@@ -168,9 +172,9 @@ MD5 f10b4ad3629db03b5994e1ec47466dff files/digest-lirc-0.8.3_pre1 247
 RMD160 f24b17125eda2634a8b1d06a55b52e6f8fd4f2a5 files/digest-lirc-0.8.3_pre1 247
 SHA256 24e0ee567b857e06d93d64cbf7e9cbaee53a734e5c76862d9ff64dba06739dc3 files/digest-lirc-0.8.3_pre1 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHK5Jn6IPkARlRZfQRAs9oAKCTTQQwMiHVz8x7WJUrIT5g8I4IaACfTVRy
-iTtsBgNnZvzoIuWOXY5W/aM=
-=/15Y
+iD8DBQFHOKSut2vP6XvVdOcRAiD7AJ4s1hQ3C9bgk7Sz6UgbTVjXE1NqBgCgp7Ct
+A/HkwWp4TeopHERlQDkMXXA=
+=HOzt
 -----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/files/lircd.conf.2 b/app-misc/lirc/files/lircd.conf.2
new file mode 100644
index 000000000000..461a24925d58
--- /dev/null
+++ b/app-misc/lirc/files/lircd.conf.2
@@ -0,0 +1,10 @@
+# Options to pass to the lircd process
+
+# for devices with lirc-kernel-module
+#LIRCD_OPTS="-d /dev/lirc0"
+#LIRCD_OPTS="-d /dev/lirc"
+
+# for devices using the input-layer
+#LIRCD_OPTS="-H devinput -d /dev/input/by-path/pci-0000:00:0a.0--event-ir"
+# Maybe this works (untested):
+#LIRCD_OPTS="-H devinput name='*DVB*'"
diff --git a/app-misc/lirc/lirc-0.8.2-r2.ebuild b/app-misc/lirc/lirc-0.8.2-r2.ebuild
index 493968d3aded..5a7db769bcbf 100644
--- a/app-misc/lirc/lirc-0.8.2-r2.ebuild
+++ b/app-misc/lirc/lirc-0.8.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.2-r2.ebuild,v 1.7 2007/11/02 21:12:52 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.2-r2.ebuild,v 1.8 2007/11/12 19:08:21 zzam Exp $
 
 inherit eutils linux-mod flag-o-matic autotools
 
@@ -266,7 +266,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/lircd lircd
 	newinitd "${FILESDIR}"/lircmd lircmd
-	newconfd "${FILESDIR}"/lircd.conf lircd
+	newconfd "${FILESDIR}"/lircd.conf.2 lircd
 
 	insinto /etc/modules.d/
 	newins "${FILESDIR}"/modulesd.lirc lirc
diff --git a/app-misc/lirc/lirc-0.8.3_pre1.ebuild b/app-misc/lirc/lirc-0.8.3_pre1.ebuild
index df409547d5d3..2a32881cecf6 100644
--- a/app-misc/lirc/lirc-0.8.3_pre1.ebuild
+++ b/app-misc/lirc/lirc-0.8.3_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.3_pre1.ebuild,v 1.5 2007/10/18 16:05:52 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.3_pre1.ebuild,v 1.6 2007/11/12 19:08:21 zzam Exp $
 
 inherit eutils linux-mod flag-o-matic autotools
 
@@ -267,7 +267,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/lircd lircd
 	newinitd "${FILESDIR}"/lircmd lircmd
-	newconfd "${FILESDIR}"/lircd.conf lircd
+	newconfd "${FILESDIR}"/lircd.conf.2 lircd
 
 	insinto /etc/modules.d/
 	newins "${FILESDIR}"/modulesd.lirc lirc