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

Gentoo Archives: gentoo-commits

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