Change ebuild, so that lirc package does no longer own lircd.conf. That way portage should not delete lircd.conf on update or unmerge.

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

3 files changed, 41 insertions, 18 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index 3ed6d2db496f..e29485bbd385 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,14 @@
 # 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.210 2009/10/06 21:15:33 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.211 2009/11/03 19:53:29 zzam Exp $
+
+  03 Nov 2009; Matthias Schwarzott <zzam@gentoo.org> lirc-0.8.6-r1.ebuild:
+  Change ebuild, so that lirc package does no longer own lircd.conf. That
+  way portage should not delete lircd.conf on update or unmerge.
+
+  03 Nov 2009; Matthias Schwarzott <zzam@gentoo.org> lirc-0.8.6-r1.ebuild:
+  Change ebuild, so that lirc package does no longer own lircd.conf. That
+  way portage should not delete lircd.conf on update or unmerge.
 
   06 Oct 2009; Christian Faulhammer <fauli@gentoo.org> lirc-0.8.5.ebuild:
   remove iguanaIR, because it is still in testing
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 22b3eb9266d0..d44b415dcdb7 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -1,6 +1,3 @@
------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
@@ -31,13 +28,6 @@ EBUILD lirc-0.8.3_pre1.ebuild 8413 RMD160 5c1aad354c21af1c0e59a7664a618b4f845e48
 EBUILD lirc-0.8.4.ebuild 8942 RMD160 19d3fea9b5dedb272a640c30ee10d4a22dbf8b58 SHA1 f473243a365096732971a49ea8f20fde3fac913b SHA256 429ce5f9fd73a743676afa665f335e9dec0b8a73d528d45cc83a0d1d736fa2d6
 EBUILD lirc-0.8.4a.ebuild 9136 RMD160 cbf9c0b69fadb9fd113d4be6fe766a1a52810939 SHA1 2a82ebe8e8c02f73b7fc49789cf6c2fd7a77ca17 SHA256 d5ff273afd5ebdc7eba7091dbd18846abfe658352189fd49df803237705934b7
 EBUILD lirc-0.8.5.ebuild 9412 RMD160 f783b4d3e53f7f68b63627d2bbec709e40f11334 SHA1 5074ad15f3f746a64e0ec47c3ec0e164ed50a4fa SHA256 281e7e312963e88d00330abb375fb154fac18172ab5ea66a159d46c099341a6b
-EBUILD lirc-0.8.6-r1.ebuild 9288 RMD160 c8a49be6cb76e9d8c89d399ba96299005f265451 SHA1 f60714e8ed5ba5720c074a8fc68450d037015bac SHA256 831ee3906c2d1a23b945c8ba71d7ba5f943d3642046d73919ce1f76c0c1bf2a1
-MISC ChangeLog 34000 RMD160 fa167e6e17cc117746b3063810790f5102318c77 SHA1 796d510f960393f8d1ab0d0f7f91591adfb04bbf SHA256 787e04c89674a853e936150b7cb17df1835cd6ac9495d811a6bfdd5610bd9bbf
+EBUILD lirc-0.8.6-r1.ebuild 10079 RMD160 1c256041c90da6b00a251b817f9ec948527d8c58 SHA1 11e9f60c72daf892dacb893b3d34da14cfc71e2e SHA256 4db3e7296972a0af0de069509b5a0d6becd24eac2bf412962ae9e0647cf5e2d1
+MISC ChangeLog 34429 RMD160 de0c058ae094d7cf7346a535b4eb65bbc46fdb56 SHA1 560772a912ec3ef02116d1202090403e66d80241 SHA256 03faec6517ab3188fdf712a5ff2da3bb231cb893625744a57297762c3974acca
 MISC metadata.xml 376 RMD160 7b854dad1999c38592eabe928aab80615ba1f1e5 SHA1 17dc9c9591c77aa4ec2d98b9bc1f34ff68da31ad SHA256 e3b4637a67a93eb4b9457fa5941e8a6a891adca11a1ebc80c21a59650eac93aa
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrLs30ACgkQNQqtfCuFneMkEgCZASk3cd2LbQht+IhnRycX9yVQ
-V/gAnjTyklx0+zjjjoLu8ZXhdd4Zkpil
-=QHcy
------END PGP SIGNATURE-----
diff --git a/app-misc/lirc/lirc-0.8.6-r1.ebuild b/app-misc/lirc/lirc-0.8.6-r1.ebuild
index 67519e10c066..b233512ded01 100644
--- a/app-misc/lirc/lirc-0.8.6-r1.ebuild
+++ b/app-misc/lirc/lirc-0.8.6-r1.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.6-r1.ebuild,v 1.1 2009/10/04 18:48:28 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.6-r1.ebuild,v 1.2 2009/11/03 19:53:29 zzam Exp $
 
 inherit eutils linux-mod flag-o-matic autotools
 
@@ -303,7 +303,10 @@ src_install() {
 	insinto /usr/share/lirc/remotes
 	doins -r remotes/*
 
-	keepdir /var/run/lirc
+	keepdir /var/run/lirc /etc/lirc
+	if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
+		newdoc "${D}"/etc/lirc/lircd.conf lircd.conf.example
+	fi
 }
 
 pkg_preinst() {
@@ -315,14 +318,36 @@ pkg_preinst() {
 		mv -f "${dir}/lirc" "${dir}/lirc.conf"
 	fi
 
-	# stop portage from deleting this file
-	if [[ -f "${ROOT}"/etc/lirc/lircd.conf && ! -f "${D}"/etc/lirc/lircd.conf ]]; then
-		cp "${ROOT}"/etc/lirc/lircd.conf "${D}"/etc/lirc/lircd.conf
+	# copy the first file that can be found
+	if [[ -f "${ROOT}"/etc/lirc/lircd.conf ]]; then
+		cp "${ROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf
+	elif [[ -f "${ROOT}"/etc/lircd.conf ]]; then
+		cp "${ROOT}"/etc/lircd.conf "${T}"/lircd.conf
+		MOVE_OLD_LIRCD_CONF=1
+	elif [[ -f "${D}"/etc/lirc/lircd.conf ]]; then
+		cp "${D}"/etc/lirc/lircd.conf "${T}"/lircd.conf
+	fi
+
+	# stop portage from touching the config file
+	if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
+		rm -f "${D}"/etc/lirc/lircd.conf
 	fi
 }
 
 pkg_postinst() {
 	linux-mod_pkg_postinst
+	
+	# copy config file to new location
+	# without portage knowing about it
+	# so it will not delete it on unmerge or ever touch it again
+	if [[ -e "${T}"/lircd.conf ]]; then
+		cp "${T}"/lircd.conf "${ROOT}"/etc/lirc/lircd.conf
+		if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
+			elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
+			rm -f "${ROOT}"/etc/lircd.conf
+		fi
+	fi
+
 	ewarn
 	ewarn "The lirc_gpio driver will not work with Kernels 2.6.22+"
 	ewarn "You need to switch over to /dev/input/event? if you need gpio"