Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Matthias Schwarzott (zzam)" <zzam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-www/vdradmin-am: ChangeLog vdradmin-am-3.6.1-r1.ebuild
Date: Fri, 29 Feb 2008 10:23:32
Message-Id: E1JV2Om-00032G-Tm@stork.gentoo.org
1 zzam 08/02/29 10:23:28
2
3 Modified: ChangeLog
4 Added: vdradmin-am-3.6.1-r1.ebuild
5 Log:
6 Fix initscript on openrc, thanks to Daniel Pielmeier <daniel.pielmeier@××××××××××.com>.
7 (Portage version: 2.1.4.4)
8
9 Revision Changes Path
10 1.25 net-www/vdradmin-am/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/vdradmin-am/ChangeLog?rev=1.25&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/vdradmin-am/ChangeLog?rev=1.25&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/vdradmin-am/ChangeLog?r1=1.24&r2=1.25
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v
19 retrieving revision 1.24
20 retrieving revision 1.25
21 diff -u -r1.24 -r1.25
22 --- ChangeLog 20 Dec 2007 14:38:01 -0000 1.24
23 +++ ChangeLog 29 Feb 2008 10:23:28 -0000 1.25
24 @@ -1,6 +1,13 @@
25 # ChangeLog for net-www/vdradmin-am
26 -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v 1.24 2007/12/20 14:38:01 zzam Exp $
28 +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
29 +# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v 1.25 2008/02/29 10:23:28 zzam Exp $
30 +
31 +*vdradmin-am-3.6.1-r1 (29 Feb 2008)
32 +
33 + 29 Feb 2008; Matthias Schwarzott <zzam@g.o> +files/vdradmin-rc-3,
34 + +vdradmin-am-3.6.1-r1.ebuild:
35 + Fix initscript on openrc, thanks to Daniel Pielmeier
36 + <daniel.pielmeier@××××××××××.com>.
37
38 *vdradmin-am-3.6.1 (20 Dec 2007)
39
40
41
42
43 1.1 net-www/vdradmin-am/vdradmin-am-3.6.1-r1.ebuild
44
45 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/vdradmin-am/vdradmin-am-3.6.1-r1.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/vdradmin-am/vdradmin-am-3.6.1-r1.ebuild?rev=1.1&content-type=text/plain
47
48 Index: vdradmin-am-3.6.1-r1.ebuild
49 ===================================================================
50 # Copyright 1999-2008 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/vdradmin-am-3.6.1-r1.ebuild,v 1.1 2008/02/29 10:23:28 zzam Exp $
53
54 inherit eutils
55
56 MY_P="${P/_/}"
57
58 DESCRIPTION="WWW Admin for the Video Disk Recorder"
59 HOMEPAGE="http://andreas.vdr-developer.org/"
60 SRC_URI="http://andreas.vdr-developer.org/download/${MY_P}.tar.bz2"
61
62 KEYWORDS="~amd64 ~x86"
63 SLOT="0"
64 LICENSE="GPL-2"
65 IUSE="unicode"
66
67 DEPEND="dev-lang/perl
68 dev-perl/Template-Toolkit
69 >=dev-perl/Compress-Zlib-1.2.2
70 media-video/vdr
71 dev-perl/Compress-Zlib
72 dev-perl/Locale-gettext
73 dev-perl/Authen-SASL
74 dev-perl/Digest-HMAC
75 dev-perl/URI
76 unicode? ( sys-devel/gettext )"
77 RDEPEND="${DEPEND}"
78
79 ETC_DIR="/etc/vdradmin"
80 LIB_DIR="/usr/share/vdradmin"
81 VDRADMIN_USER="vdradmin"
82 VDRADMIN_GROUP="vdradmin"
83 TMP_DIR=/var/tmp/vdradmin
84
85 S="${WORKDIR}/${MY_P}"
86
87 pkg_setup() {
88 enewuser ${VDRADMIN_USER} -1 /bin/bash ${TMP_DIR}
89 }
90
91 src_unpack() {
92
93 unpack ${A}
94 cd "${S}"
95 epatch "${FILESDIR}"/${PN}-config-autoflush.diff
96 sed -i vdradmind.pl \
97 -e "/COMPILE_DIR/s-/tmp-${TMP_DIR}-" \
98 -e "s-/var/run/vdradmind.pid-/var/tmp/vdradmin/vdradmind.pid-"
99 }
100
101 src_compile() {
102
103 if ! use unicode; then
104 einfo "no need to compile"
105 else
106 einfo "additionally generating utf8 locales"
107 "${S}"/make.sh utf8add || die
108 "${S}"/make.sh po || die
109 fi
110 }
111
112 src_install() {
113
114 newinitd "${FILESDIR}"/vdradmin-rc-3 vdradmin
115 newconfd "${FILESDIR}"/confd-2 vdradmin
116
117 dobin vdradmind.pl
118
119 insinto ${LIB_DIR}/template
120 doins -r "${S}"/template/*
121
122 insinto ${LIB_DIR}/lib/Template/Plugin
123 doins -r "${S}"/lib/Template/Plugin/JavaScript.pm
124
125 insinto /usr/share/locale/
126 doins -r "${S}"/locale/*
127
128 exeinto ${LIB_DIR}
129 doexe autotimer2searchtimer.pl
130
131 dodoc HISTORY INSTALL CREDITS README* REQUIREMENTS FAQ
132 docinto contrib
133 dodoc "${S}"/contrib/*
134
135 diropts "-m755 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP}"
136 keepdir "${ETC_DIR}"
137 keepdir "${TMP_DIR}"
138
139 dosed "s:FILES_IN_SYSTEM = 0;:FILES_IN_SYSTEM = 1;:g" /usr/bin/vdradmind.pl
140 }
141
142 pkg_preinst() {
143 if [[ -f ${ROOT}${ETC_DIR}/vdradmind.conf ]]; then
144 cp "${ROOT}"${ETC_DIR}/vdradmind.conf "${D}"${ETC_DIR}/vdradmind.conf
145 else
146 elog "Creating a new config-file."
147 echo
148
149 cat <<-EOF > "${D}"${ETC_DIR}/vdradmind.conf
150 VDRCONFDIR = /etc/vdr
151 VIDEODIR = /var/vdr/video
152 EPG_FILENAME = /var/vdr/video/epg.data
153 EPGIMAGES = /var/vdr/video/epgimages
154 PASSWORD = gentoo-vdr
155 USERNAME = gentoo-vdr
156 EOF
157 # feed it with newlines
158 yes "" \
159 | "${D}"/usr/bin/vdradmind.pl --cfgdir "${D}"${ETC_DIR} --config \
160 |sed -e 's/: /: \n/g'
161
162 [[ ${PIPESTATUS[1]} == "0" ]] || die "Failed to create initial configuration."
163
164 elog
165 elog "Created default user/password: gentoo-vdr/gentoo-vdr"
166 elog
167 elog "you can run \"emerge --config vdradmin-am\" if"
168 elog "the default-values for vdr does not match your"
169 elog "installation or change it in Setup-Menu of Web-Interface."
170 elog
171 fi
172 chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} "${D}"${ETC_DIR}/vdradmind.conf
173 }
174
175 pkg_postinst() {
176 if [[ -d ${ROOT}${ETC_DIR} ]]; then
177 local owner=$(stat ${ROOT}${ETC_DIR} -c "%U")
178 if [[ ${owner} != vdradmin ]]; then
179 elog "Changing ownership of ${ETC_DIR}."
180 chown -R ${VDRADMIN_USER}:${VDRADMIN_GROUP} "${ROOT}"${ETC_DIR}
181 fi
182 fi
183
184 if [[ -d ${ROOT}/tmp/usr/share/vdradmin ]]; then
185 ewarn "You have a leftover directory of vdradmin."
186 ewarn "You can safely remove it with:"
187 ewarn "# rm -rf /tmp/usr/share/vdradmin/template"
188 ewarn "# rmdir -p /tmp/usr/share/vdradmin"
189 fi
190
191 local DEST=/etc/vdr/plugins/epgsearch/epgsearch.conf
192 local SOURCE=${ETC_DIR}/vdradmind.at
193 if [[ -s ${ROOT}${SOURCE} ]]; then
194 ewarn "If you used the autotimer of vdradmin,"
195 ewarn "it is a good idea to convert them now"
196 ewarn "to use with epgsearch."
197 ewarn
198 if [[ ! -d ${ROOT}/etc/vdr/plugins/epgsearch ]]; then
199 ewarn "# install -d -o vdr -g vdr /etc/vdr/plugins/epgsearch"
200 fi
201
202 local SIZE=0
203
204 [[ -e ${DEST} ]] && SIZE=$(grep '^[^#]' ${ROOT}${DEST}|wc -l)
205
206 ewarn "If vdr is running with epgsearch-Plugin loaded you can use (recommended):"
207 local BASE_CMD="${LIB_DIR}/autotimer2searchtimer.pl -i ${SOURCE}"
208 ewarn "# ${BASE_CMD} -s"
209
210 ewarn
211 ewarn "Else you can use this:"
212 if [[ ${SIZE} == 0 ]]; then
213 ewarn "# ${BASE_CMD} -o ${DEST}"
214 else
215 ewarn "You already have some timers defined!."
216 ewarn "# ${BASE_CMD} -o ${DEST}.new"
217 ewarn
218 ewarn "You need to merge epgsearch.conf and epgsearch.conf.new on your own."
219 ewarn
220 fi
221 ewarn "# chown vdr:vdr ${DEST}"
222 ewarn
223 ewarn "If you are sure that epgsearch has got all your timer,"
224 ewarn "then you can delete vdradmin-autotimers."
225 ewarn "# rm ${SOURCE}"
226 fi
227 }
228
229 pkg_config() {
230 /usr/bin/vdradmind.pl -c
231 chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} "${ROOT}"${ETC_DIR}/vdradmind.conf
232 }
233
234
235
236 --
237 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups