1 |
zzam 08/04/19 12:23:23 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: gentoo-vdr-scripts-0.4.3-r1.ebuild |
5 |
Log: |
6 |
Fix wakeup-reboot-script for baselayout-1. |
7 |
(Portage version: 2.1.5_rc4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.91 media-tv/gentoo-vdr-scripts/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog?rev=1.91&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog?rev=1.91&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog?r1=1.90&r2=1.91 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v |
19 |
retrieving revision 1.90 |
20 |
retrieving revision 1.91 |
21 |
diff -u -r1.90 -r1.91 |
22 |
--- ChangeLog 22 Mar 2008 17:00:05 -0000 1.90 |
23 |
+++ ChangeLog 19 Apr 2008 12:23:23 -0000 1.91 |
24 |
@@ -1,6 +1,13 @@ |
25 |
# ChangeLog for media-tv/gentoo-vdr-scripts |
26 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.90 2008/03/22 17:00:05 zzam Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.91 2008/04/19 12:23:23 zzam Exp $ |
29 |
+ |
30 |
+*gentoo-vdr-scripts-0.4.3-r1 (19 Apr 2008) |
31 |
+ |
32 |
+ 19 Apr 2008; Matthias Schwarzott <zzam@g.o> |
33 |
+ +files/gentoo-vdr-scripts-0.4.3-fix-wakeup-reboot.diff, |
34 |
+ +gentoo-vdr-scripts-0.4.3-r1.ebuild: |
35 |
+ Fix wakeup-reboot-script for baselayout-1. |
36 |
|
37 |
22 Mar 2008; Matthias Schwarzott <zzam@g.o> |
38 |
gentoo-vdr-scripts-0.4.3.ebuild: |
39 |
|
40 |
|
41 |
|
42 |
1.1 media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.3-r1.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.3-r1.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.3-r1.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: gentoo-vdr-scripts-0.4.3-r1.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2008 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.3-r1.ebuild,v 1.1 2008/04/19 12:23:23 zzam Exp $ |
52 |
|
53 |
inherit eutils |
54 |
|
55 |
DESCRIPTION="Scripts necessary for use of vdr as a set-top-box" |
56 |
HOMEPAGE="http://www.gentoo.org/" |
57 |
SRC_URI="mirror://gentoo/${P}.tar.bz2 |
58 |
http://dev.gentoo.org/~zzam/distfiles/${P}.tar.bz2" |
59 |
|
60 |
LICENSE="GPL-2" |
61 |
SLOT="0" |
62 |
KEYWORDS="~amd64 ~ppc ~x86" |
63 |
IUSE="nvram" |
64 |
|
65 |
RDEPEND="nvram? ( sys-power/nvram-wakeup ) |
66 |
app-admin/sudo |
67 |
!media-tv/vdr-dvd-scripts |
68 |
!media-tv/vdrplugin-rebuild" |
69 |
|
70 |
VDR_HOME=/var/vdr |
71 |
|
72 |
pkg_setup() { |
73 |
enewgroup vdr |
74 |
|
75 |
# Add user vdr to these groups: |
76 |
# video - accessing dvb-devices |
77 |
# audio - playing sound when using software-devices |
78 |
# cdrom - playing dvds/audio-cds ... |
79 |
enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom |
80 |
} |
81 |
|
82 |
src_unpack() { |
83 |
unpack ${A} |
84 |
cd "${S}" |
85 |
epatch "${FILESDIR}/${P}-fix-wakeup-reboot.diff" |
86 |
} |
87 |
|
88 |
src_install() { |
89 |
local myopts="" |
90 |
if use nvram ; then |
91 |
myopts="${myopts} NVRAM=1" |
92 |
fi |
93 |
|
94 |
emake -s install DESTDIR="${D}" ${myopts} || die "make install failed" |
95 |
dodoc README TODO ChangeLog |
96 |
|
97 |
# create necessary directories |
98 |
diropts -ovdr -gvdr |
99 |
keepdir "${VDR_HOME}" |
100 |
|
101 |
local kd |
102 |
for kd in shutdown-data merged-config-files dvd-images tmp; do |
103 |
keepdir "${VDR_HOME}/${kd}" |
104 |
done |
105 |
} |
106 |
|
107 |
pkg_preinst() { |
108 |
einfo "Smart updating /etc/conf.d/vdr.plugins" |
109 |
local PLUGINS_NEW=0 |
110 |
if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then |
111 |
PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l) |
112 |
fi |
113 |
if [[ ${PLUGINS_NEW} > 0 ]]; then |
114 |
einfo "Using existing /etc/conf.d/vdr.plugins" |
115 |
cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins |
116 |
else |
117 |
einfo "Using PLUGINS from /etc/conf.d/vdr" |
118 |
local PLUGIN |
119 |
for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do |
120 |
echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins |
121 |
done |
122 |
fi |
123 |
} |
124 |
|
125 |
VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh" |
126 |
|
127 |
pkg_postinst() { |
128 |
if has_version "<media-tv/gentoo-vdr-scripts-0.3.6"; then |
129 |
ewarn |
130 |
ewarn "A shutdown-file has been changed." |
131 |
ewarn "You really have to execute" |
132 |
ewarn "\temerge --config gentoo-vdr-scripts" |
133 |
ewarn "to keep shutdown working." |
134 |
ewarn |
135 |
|
136 |
ebeep 5 |
137 |
else |
138 |
elog |
139 |
elog "To make shutdown work add this line to /etc/sudoers" |
140 |
elog "\t${VDRSUDOENTRY}" |
141 |
elog |
142 |
elog "or execute this command:" |
143 |
elog "\temerge --config gentoo-vdr-scripts" |
144 |
elog |
145 |
fi |
146 |
|
147 |
if ! use nvram ; then |
148 |
elog "nvram wakeup is now optional." |
149 |
elog "To make use of it enable the use flag nvram for ${PN}" |
150 |
elog "or just emerge nvram-wakeup." |
151 |
fi |
152 |
|
153 |
if has_version "<media-tv/gentoo-vdr-scripts-0.3.7"; then |
154 |
einfo |
155 |
einfo "Plugins which should be used are now set via its" |
156 |
einfo "own config-file called /etc/conf.d/vdr.plugins" |
157 |
einfo |
158 |
einfo "Smart updating should have moved all your settings" |
159 |
einfo |
160 |
fi |
161 |
|
162 |
if [[ -f "${ROOT}/etc/init.d/dvbsplash" ]]; then |
163 |
ewarn |
164 |
ewarn "You have dvbsplash installed!" |
165 |
ewarn "/etc/init.d/dvbsplash will now be deleted" |
166 |
ewarn "as it causes difficult to debug problems." |
167 |
ewarn |
168 |
rm "${ROOT}/etc/init.d/dvbsplash" |
169 |
fi |
170 |
|
171 |
if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] && |
172 |
grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch |
173 |
then |
174 |
ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch" |
175 |
ewarn "This no longer has any effect, please use" |
176 |
ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd" |
177 |
fi |
178 |
} |
179 |
|
180 |
pkg_config() { |
181 |
if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then |
182 |
einfo "sudoers-entry for vdr already in place." |
183 |
else |
184 |
einfo "Adding this line to /etc/sudoers:" |
185 |
einfo "+ ${VDRSUDOENTRY}" |
186 |
|
187 |
cd "${T}" |
188 |
cat >sudoedit-vdr.sh <<-SUDOEDITOR |
189 |
#!/bin/bash |
190 |
echo Commenting out old entry |
191 |
sed -i \${1} -e '/\/usr\/lib\/vdr\/bin\/vdrshutdown-really.sh/s/^/#/' |
192 |
echo Adding new entry |
193 |
echo "" >> \${1} |
194 |
echo "${VDRSUDOENTRY}" >> \${1} |
195 |
SUDOEDITOR |
196 |
chmod a+x sudoedit-vdr.sh |
197 |
|
198 |
VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed" |
199 |
|
200 |
einfo "Edited /etc/sudoers" |
201 |
fi |
202 |
} |
203 |
|
204 |
|
205 |
|
206 |
-- |
207 |
gentoo-commits@l.g.o mailing list |