| 1 |
zzam 09/11/03 19:53:29 |
| 2 |
|
| 3 |
Modified: ChangeLog lirc-0.8.6-r1.ebuild |
| 4 |
Log: |
| 5 |
Change ebuild, so that lirc package does no longer own lircd.conf. That way portage should not delete lircd.conf on update or unmerge. |
| 6 |
(Portage version: 2.1.6.13/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.211 app-misc/lirc/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/lirc/ChangeLog?rev=1.211&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/lirc/ChangeLog?rev=1.211&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/lirc/ChangeLog?r1=1.210&r2=1.211 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v |
| 18 |
retrieving revision 1.210 |
| 19 |
retrieving revision 1.211 |
| 20 |
diff -u -r1.210 -r1.211 |
| 21 |
--- ChangeLog 6 Oct 2009 21:15:33 -0000 1.210 |
| 22 |
+++ ChangeLog 3 Nov 2009 19:53:29 -0000 1.211 |
| 23 |
@@ -1,6 +1,14 @@ |
| 24 |
# ChangeLog for app-misc/lirc |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.210 2009/10/06 21:15:33 fauli Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.211 2009/11/03 19:53:29 zzam Exp $ |
| 28 |
+ |
| 29 |
+ 03 Nov 2009; Matthias Schwarzott <zzam@g.o> lirc-0.8.6-r1.ebuild: |
| 30 |
+ Change ebuild, so that lirc package does no longer own lircd.conf. That |
| 31 |
+ way portage should not delete lircd.conf on update or unmerge. |
| 32 |
+ |
| 33 |
+ 03 Nov 2009; Matthias Schwarzott <zzam@g.o> lirc-0.8.6-r1.ebuild: |
| 34 |
+ Change ebuild, so that lirc package does no longer own lircd.conf. That |
| 35 |
+ way portage should not delete lircd.conf on update or unmerge. |
| 36 |
|
| 37 |
06 Oct 2009; Christian Faulhammer <fauli@g.o> lirc-0.8.5.ebuild: |
| 38 |
remove iguanaIR, because it is still in testing |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.2 app-misc/lirc/lirc-0.8.6-r1.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/lirc/lirc-0.8.6-r1.ebuild?rev=1.2&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/lirc/lirc-0.8.6-r1.ebuild?rev=1.2&content-type=text/plain |
| 46 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/lirc/lirc-0.8.6-r1.ebuild?r1=1.1&r2=1.2 |
| 47 |
|
| 48 |
Index: lirc-0.8.6-r1.ebuild |
| 49 |
=================================================================== |
| 50 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.6-r1.ebuild,v |
| 51 |
retrieving revision 1.1 |
| 52 |
retrieving revision 1.2 |
| 53 |
diff -u -r1.1 -r1.2 |
| 54 |
--- lirc-0.8.6-r1.ebuild 4 Oct 2009 18:48:28 -0000 1.1 |
| 55 |
+++ lirc-0.8.6-r1.ebuild 3 Nov 2009 19:53:29 -0000 1.2 |
| 56 |
@@ -1,6 +1,6 @@ |
| 57 |
# Copyright 1999-2009 Gentoo Foundation |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
-# $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 $ |
| 60 |
+# $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 $ |
| 61 |
|
| 62 |
inherit eutils linux-mod flag-o-matic autotools |
| 63 |
|
| 64 |
@@ -303,7 +303,10 @@ |
| 65 |
insinto /usr/share/lirc/remotes |
| 66 |
doins -r remotes/* |
| 67 |
|
| 68 |
- keepdir /var/run/lirc |
| 69 |
+ keepdir /var/run/lirc /etc/lirc |
| 70 |
+ if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then |
| 71 |
+ newdoc "${D}"/etc/lirc/lircd.conf lircd.conf.example |
| 72 |
+ fi |
| 73 |
} |
| 74 |
|
| 75 |
pkg_preinst() { |
| 76 |
@@ -315,14 +318,36 @@ |
| 77 |
mv -f "${dir}/lirc" "${dir}/lirc.conf" |
| 78 |
fi |
| 79 |
|
| 80 |
- # stop portage from deleting this file |
| 81 |
- if [[ -f "${ROOT}"/etc/lirc/lircd.conf && ! -f "${D}"/etc/lirc/lircd.conf ]]; then |
| 82 |
- cp "${ROOT}"/etc/lirc/lircd.conf "${D}"/etc/lirc/lircd.conf |
| 83 |
+ # copy the first file that can be found |
| 84 |
+ if [[ -f "${ROOT}"/etc/lirc/lircd.conf ]]; then |
| 85 |
+ cp "${ROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf |
| 86 |
+ elif [[ -f "${ROOT}"/etc/lircd.conf ]]; then |
| 87 |
+ cp "${ROOT}"/etc/lircd.conf "${T}"/lircd.conf |
| 88 |
+ MOVE_OLD_LIRCD_CONF=1 |
| 89 |
+ elif [[ -f "${D}"/etc/lirc/lircd.conf ]]; then |
| 90 |
+ cp "${D}"/etc/lirc/lircd.conf "${T}"/lircd.conf |
| 91 |
+ fi |
| 92 |
+ |
| 93 |
+ # stop portage from touching the config file |
| 94 |
+ if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then |
| 95 |
+ rm -f "${D}"/etc/lirc/lircd.conf |
| 96 |
fi |
| 97 |
} |
| 98 |
|
| 99 |
pkg_postinst() { |
| 100 |
linux-mod_pkg_postinst |
| 101 |
+ |
| 102 |
+ # copy config file to new location |
| 103 |
+ # without portage knowing about it |
| 104 |
+ # so it will not delete it on unmerge or ever touch it again |
| 105 |
+ if [[ -e "${T}"/lircd.conf ]]; then |
| 106 |
+ cp "${T}"/lircd.conf "${ROOT}"/etc/lirc/lircd.conf |
| 107 |
+ if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then |
| 108 |
+ elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf" |
| 109 |
+ rm -f "${ROOT}"/etc/lircd.conf |
| 110 |
+ fi |
| 111 |
+ fi |
| 112 |
+ |
| 113 |
ewarn |
| 114 |
ewarn "The lirc_gpio driver will not work with Kernels 2.6.22+" |
| 115 |
ewarn "You need to switch over to /dev/input/event? if you need gpio" |
Archives