1 |
zzam 07/10/01 13:05:25 |
2 |
|
3 |
Modified: ChangeLog vdr-1.4.6.ebuild |
4 |
Log: |
5 |
Fix patching logic for USE=bigpatch noepg, Bug #193550. |
6 |
(Portage version: 2.1.3.11) |
7 |
|
8 |
Revision Changes Path |
9 |
1.89 media-video/vdr/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/ChangeLog?rev=1.89&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/ChangeLog?rev=1.89&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/ChangeLog?r1=1.88&r2=1.89 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v |
18 |
retrieving revision 1.88 |
19 |
retrieving revision 1.89 |
20 |
diff -u -r1.88 -r1.89 |
21 |
--- ChangeLog 1 Oct 2007 12:28:38 -0000 1.88 |
22 |
+++ ChangeLog 1 Oct 2007 13:05:25 -0000 1.89 |
23 |
@@ -1,6 +1,9 @@ |
24 |
# ChangeLog for media-video/vdr |
25 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.88 2007/10/01 12:28:38 zzam Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.89 2007/10/01 13:05:25 zzam Exp $ |
28 |
+ |
29 |
+ 01 Oct 2007; Matthias Schwarzott <zzam@g.o> vdr-1.4.6.ebuild: |
30 |
+ Fix patching logic for USE=bigpatch noepg, Bug #193550. |
31 |
|
32 |
01 Oct 2007; Matthias Schwarzott <zzam@g.o> vdr-1.4.7-r5.ebuild: |
33 |
Code cleanup. |
34 |
|
35 |
|
36 |
|
37 |
1.7 media-video/vdr/vdr-1.4.6.ebuild |
38 |
|
39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/vdr-1.4.6.ebuild?rev=1.7&view=markup |
40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/vdr-1.4.6.ebuild?rev=1.7&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/vdr-1.4.6.ebuild?r1=1.6&r2=1.7 |
42 |
|
43 |
Index: vdr-1.4.6.ebuild |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.6.ebuild,v |
46 |
retrieving revision 1.6 |
47 |
retrieving revision 1.7 |
48 |
diff -u -r1.6 -r1.7 |
49 |
--- vdr-1.4.6.ebuild 11 Sep 2007 19:06:48 -0000 1.6 |
50 |
+++ vdr-1.4.6.ebuild 1 Oct 2007 13:05:25 -0000 1.7 |
51 |
@@ -1,6 +1,6 @@ |
52 |
# Copyright 1999-2007 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.6.ebuild,v 1.6 2007/09/11 19:06:48 zzam Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.6.ebuild,v 1.7 2007/10/01 13:05:25 zzam Exp $ |
56 |
|
57 |
inherit eutils flag-o-matic multilib |
58 |
|
59 |
@@ -12,7 +12,7 @@ |
60 |
PATCHSET_NAME=gentoo-${PN}-patchset-${PV}-${PATCHSET_V} |
61 |
|
62 |
MY_P="${P%_p*}" |
63 |
-S=${WORKDIR}/${MY_P} |
64 |
+S="${WORKDIR}/${MY_P}" |
65 |
|
66 |
DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB" |
67 |
HOMEPAGE="http://www.cadsoft.de/vdr/" |
68 |
@@ -39,9 +39,9 @@ |
69 |
# Relevant Pathes for vdr on gentoo |
70 |
DVB_DIR=/usr/include |
71 |
VDR_INCLUDE_DIR=/usr/include/vdr |
72 |
-PLUGIN_LIB_DIR=/usr/$(get_libdir)/vdr/plugins |
73 |
+PLUGIN_LIB_DIR="/usr/$(get_libdir)/vdr/plugins" |
74 |
CONF_DIR=/etc/vdr |
75 |
-CAP_FILE=${S}/capabilities.sh |
76 |
+CAP_FILE="${S}/capabilities.sh" |
77 |
CAPS="# Capabilities of the vdr-executable for use by startscript etc." |
78 |
|
79 |
pkg_setup() { |
80 |
@@ -49,9 +49,9 @@ |
81 |
} |
82 |
|
83 |
add_cap() { |
84 |
- while [ "$1" ]; do |
85 |
- CAPS="${CAPS}\n$1=1" |
86 |
- shift |
87 |
+ local ARG |
88 |
+ for ARG; do |
89 |
+ CAPS="${CAPS}\n${ARG}=1" |
90 |
done |
91 |
} |
92 |
|
93 |
@@ -61,11 +61,15 @@ |
94 |
ewarn "Using local developer patchset." |
95 |
PATCHSET_DIR="${VDR_LOCAL_PATCHSET}" |
96 |
else |
97 |
- unpack ${PATCHSET_NAME}.tar.bz2 |
98 |
- PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME} |
99 |
+ unpack "${PATCHSET_NAME}".tar.bz2 |
100 |
+ PATCHSET_DIR="${WORKDIR}/${PATCHSET_NAME}" |
101 |
+ |
102 |
+ # Fix logic bigpatch+noepg, Bug #193550 |
103 |
+ sed -i "${PATCHSET_DIR}"/apply_patchset.sh \ |
104 |
+ -e 's/use noepg/use noepg \&\& use !bigpatch/' |
105 |
fi |
106 |
|
107 |
- cd ${S} |
108 |
+ cd "${S}" |
109 |
|
110 |
ebegin "Changing pathes for gentoo" |
111 |
sed -e 's-$(DVBDIR)/include-$(DVBDIR)-' -i Makefile |
112 |
@@ -86,7 +90,7 @@ |
113 |
EOT |
114 |
eend 0 |
115 |
|
116 |
- source ${PATCHSET_DIR}/apply_patchset.sh |
117 |
+ source "${PATCHSET_DIR}"/apply_patchset.sh |
118 |
apply_vdr_patchset "${PATCHSET_DIR}" |
119 |
|
120 |
if use !vanilla; then |
121 |
@@ -118,7 +122,7 @@ |
122 |
fi |
123 |
|
124 |
if [[ -n "${VDRSOURCE_DIR}" ]]; then |
125 |
- cp -r ${S} ${T}/source-tree |
126 |
+ cp -r "${S}" "${T}"/source-tree |
127 |
fi |
128 |
|
129 |
if ! use vanilla; then |
130 |
@@ -127,7 +131,7 @@ |
131 |
CAP_SHUTDOWN_SVDRP \ |
132 |
CAP_CHUID |
133 |
|
134 |
- echo -e ${CAPS} > ${CAP_FILE} |
135 |
+ echo -e ${CAPS} > "${CAP_FILE}" |
136 |
fi |
137 |
} |
138 |
|
139 |
@@ -136,17 +140,17 @@ |
140 |
doexe vdr |
141 |
doexe svdrpsend.pl |
142 |
|
143 |
- insinto ${VDR_INCLUDE_DIR} |
144 |
+ insinto "${VDR_INCLUDE_DIR}" |
145 |
doins *.h |
146 |
doins Make.config |
147 |
|
148 |
- insinto ${VDR_INCLUDE_DIR}/libsi |
149 |
+ insinto "${VDR_INCLUDE_DIR}"/libsi |
150 |
doins libsi/*.h |
151 |
|
152 |
- keepdir ${CONF_DIR}/plugins |
153 |
- keepdir ${CONF_DIR}/themes |
154 |
+ keepdir "${CONF_DIR}"/plugins |
155 |
+ keepdir "${CONF_DIR}"/themes |
156 |
|
157 |
- insinto ${CONF_DIR} |
158 |
+ insinto "${CONF_DIR}" |
159 |
doins *.conf channels.conf.* |
160 |
|
161 |
keepdir "${PLUGIN_LIB_DIR}" |
162 |
@@ -158,20 +162,20 @@ |
163 |
dodoc TODO-enAIO-rm CONTRIBUTORS |
164 |
|
165 |
insinto /usr/share/vdr |
166 |
- doins ${CAP_FILE} |
167 |
+ doins "${CAP_FILE}" |
168 |
|
169 |
if [[ -n "${VDRSOURCE_DIR}" ]]; then |
170 |
elog "Installing sources" |
171 |
- insinto ${VDRSOURCE_DIR}/${P} |
172 |
- doins -r ${T}/source-tree/* |
173 |
- keepdir ${VDRSOURCE_DIR}/${P}/PLUGINS/lib |
174 |
+ insinto "${VDRSOURCE_DIR}/${P}" |
175 |
+ doins -r "${T}"/source-tree/* |
176 |
+ keepdir "${VDRSOURCE_DIR}/${P}"/PLUGINS/lib |
177 |
fi |
178 |
|
179 |
if use setup-plugin; then |
180 |
insinto /usr/share/vdr/setup |
181 |
- doins ${S}/menu.c |
182 |
+ doins "${S}"/menu.c |
183 |
fi |
184 |
- chown -R vdr:vdr ${D}/${CONF_DIR} |
185 |
+ chown -R vdr:vdr "${D}/${CONF_DIR}" |
186 |
} |
187 |
|
188 |
pkg_postinst() { |
189 |
@@ -202,7 +206,7 @@ |
190 |
local keysfound=0 |
191 |
local key |
192 |
local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow" |
193 |
- local remote_file=${ROOT}/etc/vdr/remote.conf |
194 |
+ local remote_file="${ROOT}"/etc/vdr/remote.conf |
195 |
|
196 |
if [[ -e ${remote_file} ]]; then |
197 |
for key in ${warn_keys}; do |
198 |
|
199 |
|
200 |
|
201 |
-- |
202 |
gentoo-commits@g.o mailing list |