Rename modprobe config file to lirc.conf

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 34 insertions, 8 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index f66758a5698e..e1df12bd1e28 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/lirc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.200 2009/06/17 21:02:36 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.201 2009/06/18 15:23:03 zzam Exp $
+
+  18 Jun 2009; Matthias Schwarzott <zzam@gentoo.org> lirc-0.8.4a.ebuild,
+  lirc-0.8.5.ebuild:
+  Rename modprobe config file to lirc.conf
 
 *lirc-0.8.5 (17 Jun 2009)
 
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index aaf0e05b5621..a1adce0bf326 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX irexec-confd 280 RMD160 f669c7c98b9d7cac2010284ab6068d29d47ec811 SHA1 c6decc19a273d98d451de137a2ffbe16d5df28ae SHA256 c404ad3b624004cab25bd3a89593cdeb0abbc25771d6e52caf2f37cb4f7b2b79
 AUX irexec-initd 808 RMD160 06b02232f892ab032e2bf8b35bb2945a623a2610 SHA1 5c5630e5434c2430b9a74b725fc5350e29adaede SHA256 9325419aa45d80c205bc1cd47fe839b178da74bca5dd928cbe3ae17423b92493
 AUX lirc-0.8.3-imon-pad2keys.patch 11556 RMD160 89a050f7099593000a40b15c46de6137f3b10dfa SHA1 019b1aa3d72df9e4b28796c173fb4fa1fc3e457d SHA256 347c6195d971f8d1a3f4c29a1ff4750d04cea297d16679aeda7529ac1720d42e
@@ -25,7 +28,14 @@ DIST lirc-0.8.5.tar.bz2 716760 RMD160 f0fafeace28bf61f17bd3403ced6de3bfb9250b4 S
 EBUILD lirc-0.8.3-r2.ebuild 9021 RMD160 6ddd9235fb94f9ccfebe0aec33d164555836ef2f SHA1 b6ecc239c4f7203fa949516c4cd99f1a3dd00dce SHA256 0f4ad34454682054fba3c42aa9964b561aa19f5922d026c2fc2f8b2a438b46d2
 EBUILD lirc-0.8.3_pre1.ebuild 8413 RMD160 5c1aad354c21af1c0e59a7664a618b4f845e4807 SHA1 b60cfb14611ba87df67cde41070f7c3b90e467a5 SHA256 aa2c154981ed8998d701e74744a73f84a758c2cfb69b2a4a07e2b6d42d75e932
 EBUILD lirc-0.8.4.ebuild 8932 RMD160 e80edd9f710a5d7dc65be707c7633e32e4237863 SHA1 04bb7d33a68eb8aab65f40d951e110e4de4fd998 SHA256 18750fc911d4a24774877ce8785186cf6565a2a0d1d5461aa58ed310bfda6638
-EBUILD lirc-0.8.4a.ebuild 8946 RMD160 774d34f42436e2a20b9a79e9271f562d3bb8dbb2 SHA1 8ed5fdf8718f824c0e0d342cc83ef9ce876183d7 SHA256 c73d5491c6207eb15aa45f3791dfe9a7aaaa03b0f3971ab815275c033b17e0e1
-EBUILD lirc-0.8.5.ebuild 9224 RMD160 fa15fdd4f6a104e85559ec43fb025dec429d6496 SHA1 19b36f57b8e1c447c8c0be5f62a313a7f746c8e4 SHA256 b78fff99f91b8974450ea219cfd9d402ef402e7b011907902b857f330abe64cd
-MISC ChangeLog 32075 RMD160 1fdf713ca9e337516c6b325184761cd82a9033ec SHA1 3382c24399fc6f428e511fe18d12175b61800ed2 SHA256 fa497fed1825db6d1034cc6211405212340ca9f4964760501a3740a80e983194
+EBUILD lirc-0.8.4a.ebuild 9131 RMD160 053e8861439399317a8c1ecb60fcf4b60706d8d3 SHA1 fc1f7e20dbf3bce6441eda5b295e62751d0fdf2d SHA256 ffaf236c249c25cbdc117864ef9f64b83be7b97f6b9ca76b77a5e6464140b4e6
+EBUILD lirc-0.8.5.ebuild 9407 RMD160 105e2dc0a79a342fc7dd3ea52123fa543c350bef SHA1 1d88d4c0d48afb4183245da304fb32cc45dd5c8f SHA256 6994569700075aa15c1d0f1c248b18efc8279a137c42531e958ee392a7c779f9
+MISC ChangeLog 32210 RMD160 a25f6100512d03031bd3b17069362eb4d93cc0d0 SHA1 b97dec8a803df96189c3cb064929610217bef312 SHA256 e936182175645fb78b1c7e5b420698d55d9c343338744cc4805f8c642464c2b2
 MISC metadata.xml 376 RMD160 7b854dad1999c38592eabe928aab80615ba1f1e5 SHA1 17dc9c9591c77aa4ec2d98b9bc1f34ff68da31ad SHA256 e3b4637a67a93eb4b9457fa5941e8a6a891adca11a1ebc80c21a59650eac93aa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAko6W94ACgkQt2vP6XvVdOdODACcC8kah7cjAt21t9uCdeZ1sebS
+WxQAoMNWOmrjXanUgP+9pAe45qvUbQIX
+=Vcyf
+-----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/lirc-0.8.4a.ebuild b/app-misc/lirc/lirc-0.8.4a.ebuild
index be10e20e785e..2237f1434bd3 100644
--- a/app-misc/lirc/lirc-0.8.4a.ebuild
+++ b/app-misc/lirc/lirc-0.8.4a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.4a.ebuild,v 1.4 2009/03/13 09:17:24 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.4a.ebuild,v 1.5 2009/06/18 15:23:03 zzam Exp $
 
 inherit eutils linux-mod flag-o-matic autotools
 
@@ -279,7 +279,7 @@ src_install() {
 	newconfd "${FILESDIR}"/lircd.conf.2 lircd
 
 	insinto /etc/modprobe.d/
-	newins "${FILESDIR}"/modprobed.lirc lirc
+	newins "${FILESDIR}"/modprobed.lirc lirc.conf
 
 	newinitd "${FILESDIR}"/irexec-initd irexec
 	newconfd "${FILESDIR}"/irexec-confd irexec
@@ -297,6 +297,12 @@ src_install() {
 pkg_preinst() {
 	linux-mod_pkg_preinst
 
+	local dir="${ROOT}/etc/modprobe.d"
+	if [[ -a ${dir}/lirc && ! -a ${dir}/lirc.conf ]]; then
+		elog "Renaming ${dir}/lirc to lirc.conf"
+		mv -f "${dir}/lirc" "${dir}/lirc.conf"
+	fi
+
 	# stop portage from deleting this file
 	if [[ -f ${ROOT}/etc/lircd.conf && ! -f ${D}/etc/lircd.conf ]]; then
 		cp "${ROOT}"/etc/lircd.conf "${D}"/etc/lircd.conf
diff --git a/app-misc/lirc/lirc-0.8.5.ebuild b/app-misc/lirc/lirc-0.8.5.ebuild
index 872e5334c7c8..9df0e17b960b 100644
--- a/app-misc/lirc/lirc-0.8.5.ebuild
+++ b/app-misc/lirc/lirc-0.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.5.ebuild,v 1.1 2009/06/17 21:02:36 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.5.ebuild,v 1.2 2009/06/18 15:23:03 zzam Exp $
 
 inherit eutils linux-mod flag-o-matic autotools
 
@@ -285,7 +285,7 @@ src_install() {
 	newconfd "${FILESDIR}"/lircd.conf.2 lircd
 
 	insinto /etc/modprobe.d/
-	newins "${FILESDIR}"/modprobed.lirc lirc
+	newins "${FILESDIR}"/modprobed.lirc lirc.conf
 
 	newinitd "${FILESDIR}"/irexec-initd irexec
 	newconfd "${FILESDIR}"/irexec-confd irexec
@@ -303,6 +303,12 @@ src_install() {
 pkg_preinst() {
 	linux-mod_pkg_preinst
 
+	local dir="${ROOT}/etc/modprobe.d"
+	if [[ -a ${dir}/lirc && ! -a ${dir}/lirc.conf ]]; then
+		elog "Renaming ${dir}/lirc to lirc.conf"
+		mv -f "${dir}/lirc" "${dir}/lirc.conf"
+	fi
+
 	# stop portage from deleting this file
 	if [[ -f ${ROOT}/etc/lircd.conf && ! -f ${D}/etc/lircd.conf ]]; then
 		cp "${ROOT}"/etc/lircd.conf "${D}"/etc/lircd.conf