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

Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/baselayout: ChangeLog baselayout-1.11.15-r3.ebuild baselayout-1.12.12.ebuild baselayout-1.12.11.1.ebuild
Date: Mon, 31 Mar 2008 00:46:10
Message-Id: E1Jg8A3-0001W4-59@stork.gentoo.org
1 vapier 08/03/31 00:46:07
2
3 Modified: ChangeLog baselayout-1.11.15-r3.ebuild
4 baselayout-1.12.12.ebuild
5 baselayout-1.12.11.1.ebuild
6 Log:
7 Cleanup unquoted warnings and drop virtual/baselayout PROVIDE.
8 (Portage version: 2.2_pre5)
9
10 Revision Changes Path
11 1.464 sys-apps/baselayout/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.464&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.464&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?r1=1.463&r2=1.464
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v
20 retrieving revision 1.463
21 retrieving revision 1.464
22 diff -u -r1.463 -r1.464
23 --- ChangeLog 31 Mar 2008 00:13:03 -0000 1.463
24 +++ ChangeLog 31 Mar 2008 00:46:06 -0000 1.464
25 @@ -1,10 +1,15 @@
26 # ChangeLog for sys-apps/baselayout
27 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.463 2008/03/31 00:13:03 vapier Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.464 2008/03/31 00:46:06 vapier Exp $
30
31 # See the rc-scripts ChangeLog in subversion for release info:
32 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
33
34 + 31 Mar 2008; Mike Frysinger <vapier@g.o>
35 + baselayout-1.11.15-r3.ebuild, baselayout-1.12.11.1.ebuild,
36 + baselayout-1.12.12.ebuild:
37 + Cleanup unquoted warnings and drop virtual/baselayout PROVIDE.
38 +
39 *baselayout-1.12.12 (31 Mar 2008)
40
41 31 Mar 2008; Mike Frysinger <vapier@g.o>
42
43
44
45 1.10 sys-apps/baselayout/baselayout-1.11.15-r3.ebuild
46
47 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild?rev=1.10&view=markup
48 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild?rev=1.10&content-type=text/plain
49 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild?r1=1.9&r2=1.10
50
51 Index: baselayout-1.11.15-r3.ebuild
52 ===================================================================
53 RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild,v
54 retrieving revision 1.9
55 retrieving revision 1.10
56 diff -u -r1.9 -r1.10
57 --- baselayout-1.11.15-r3.ebuild 11 Mar 2008 00:00:47 -0000 1.9
58 +++ baselayout-1.11.15-r3.ebuild 31 Mar 2008 00:46:06 -0000 1.10
59 @@ -1,6 +1,6 @@
60 # Copyright 1999-2008 Gentoo Foundation
61 # Distributed under the terms of the GNU General Public License v2
62 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild,v 1.9 2008/03/11 00:00:47 wolf31o2 Exp $
63 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild,v 1.10 2008/03/31 00:46:06 vapier Exp $
64
65 inherit flag-o-matic eutils toolchain-funcs multilib
66
67 @@ -31,7 +31,6 @@
68 ) )"
69 DEPEND="virtual/os-headers
70 >=sys-apps/portage-2.0.51"
71 -PROVIDE="virtual/baselayout"
72
73 S=${WORKDIR}/rc-scripts-${SV}${SVREV}
74
75
76
77
78 1.2 sys-apps/baselayout/baselayout-1.12.12.ebuild
79
80 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-1.12.12.ebuild?rev=1.2&view=markup
81 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-1.12.12.ebuild?rev=1.2&content-type=text/plain
82 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-1.12.12.ebuild?r1=1.1&r2=1.2
83
84 Index: baselayout-1.12.12.ebuild
85 ===================================================================
86 RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.12.ebuild,v
87 retrieving revision 1.1
88 retrieving revision 1.2
89 diff -u -r1.1 -r1.2
90 --- baselayout-1.12.12.ebuild 31 Mar 2008 00:13:03 -0000 1.1
91 +++ baselayout-1.12.12.ebuild 31 Mar 2008 00:46:06 -0000 1.2
92 @@ -1,6 +1,6 @@
93 # Copyright 1999-2008 Gentoo Foundation
94 # Distributed under the terms of the GNU General Public License v2
95 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.12.ebuild,v 1.1 2008/03/31 00:13:03 vapier Exp $
96 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.12.ebuild,v 1.2 2008/03/31 00:46:06 vapier Exp $
97
98 inherit flag-o-matic eutils toolchain-funcs multilib
99
100 @@ -33,7 +33,6 @@
101 DEPEND="virtual/os-headers
102 >=sys-apps/portage-2.0.51"
103 PDEPEND="!build? ( !bootstrap? ( >=sys-apps/module-init-tools-3.2.2-r3 ) )"
104 -PROVIDE="virtual/baselayout"
105
106 src_unpack() {
107 unpack ${A}
108 @@ -56,7 +55,7 @@
109
110 # Use correct path to filefuncs.so on multilib systems
111 sed -i -e "s:/lib/rcscripts:/$(get_libdir)/rcscripts:" \
112 - ${S}/src/awk/{cachedepends,genenviron}.awk || die
113 + "${S}"/src/awk/{cachedepends,genenviron}.awk || die
114 }
115
116 src_compile() {
117 @@ -303,7 +302,7 @@
118 cp -r "${S}"/rc-lists "${D}"/usr/share/baselayout
119
120 # rc-scripts version for testing of features that *should* be present
121 - echo "Gentoo Base System release ${PV}" > ${D}/etc/gentoo-release
122 + echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release
123
124 #
125 # Setup files related to /dev
126 @@ -363,18 +362,15 @@
127 # Original design had these in /etc/net.modules.d but that is too
128 # problematic with CONFIG_PROTECT
129 dodir ${rcscripts_dir}
130 - cp -pPR "${S}"/lib/rcscripts/net ${D}${rcscripts_dir}
131 - chown -R root:0 ${D}${rcscripts_dir}
132 + cp -pPR "${S}"/lib/rcscripts/net "${D}"${rcscripts_dir}
133 + chown -R root:0 "${D}"${rcscripts_dir}
134
135 #
136 # Install baselayout documentation
137 #
138 - if ! use build ; then
139 - doman "${S}"/man/*.*
140 - docinto /
141 - dodoc ${FILESDIR}/copyright
142 - dodoc "${S}"/ChangeLog
143 - fi
144 + doman "${S}"/man/*.*
145 + docinto /
146 + dodoc "${S}"/ChangeLog
147
148 #
149 # Install baselayout utilities
150 @@ -400,7 +396,7 @@
151 -e 's/\<mac_nameservers_/mac_dns_servers_/g' \
152 -e 's/\<searchdomains_/dns_search_domains_/g' \
153 -e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \
154 - ${ROOT}/etc/conf.d/${f} > ${D}/etc/conf.d/${f}
155 + "${ROOT}"/etc/conf.d/${f} > "${D}"/etc/conf.d/${f}
156 fi
157 }
158
159 @@ -419,12 +415,11 @@
160 source "${D}"/usr/share/baselayout/mklinks.sh
161 echo
162
163 - if [[ -f ${ROOT}/etc/modules.autoload && \
164 - ! -d ${ROOT}/etc/modules.autoload.d ]]; then
165 - mkdir -p ${ROOT}/etc/modules.autoload.d
166 - mv -f ${ROOT}/etc/modules.autoload \
167 - ${ROOT}/etc/modules.autoload.d/kernel-2.4
168 - ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload
169 + if [[ -f ${ROOT}/etc/modules.autoload && ! -d ${ROOT}/etc/modules.autoload.d ]]; then
170 + mkdir -p "${ROOT}"/etc/modules.autoload.d
171 + mv -f "${ROOT}"/etc/modules.autoload \
172 + "${ROOT}"/etc/modules.autoload.d/kernel-2.4
173 + ln -snf modules.autoload.d/kernel-2.4 "${ROOT}"/etc/modules.autoload
174 fi
175
176 # Change some vars introduced in baselayout-1.11.0 before we go stable
177 @@ -478,7 +473,7 @@
178 # Create /etc/hosts in pkg_postinst so we don't overwrite an
179 # existing file during bootstrap
180 if [[ ! -e ${ROOT}/etc/hosts ]]; then
181 - cp ${ROOT}/usr/share/baselayout/hosts ${ROOT}/etc
182 + cp "${ROOT}"/usr/share/baselayout/hosts "${ROOT}"/etc
183 fi
184
185 # Touching /etc/passwd and /etc/shadow after install can be fatal, as many
186 @@ -518,14 +513,14 @@
187 # Regenerate init.d dependency tree
188 /sbin/depscan.sh --update &>/dev/null
189 else
190 - rm -f ${ROOT}/etc/modules.conf
191 + rm -f "${ROOT}"/etc/modules.conf
192 fi
193
194 # This is also written in src_install (so it's in CONTENTS), but
195 # write it here so that the new version is immediately in the file
196 # (without waiting for the user to do etc-update)
197 - rm -f ${ROOT}/etc/._cfg????_gentoo-release
198 - echo "Gentoo Base System release ${PV}" > ${ROOT}/etc/gentoo-release
199 + rm -f "${ROOT}"/etc/._cfg????_gentoo-release
200 + echo "Gentoo Base System release ${PV}" > "${ROOT}"/etc/gentoo-release
201
202 echo
203 einfo "Please be sure to update all pending '._cfg*' files in /etc,"
204 @@ -535,7 +530,7 @@
205 einfo " # etc-update"
206 echo
207
208 - for f in ${ROOT}etc/init.d/net.* ; do
209 + for f in "${ROOT}"etc/init.d/net.* ; do
210 [[ -L ${f} || ${f} == "${ROOT}etc/init.d/net.lo" ]] && continue
211 echo
212 einfo "WARNING: You have older net.* files in ${ROOT}etc/init.d/"
213 @@ -543,12 +538,12 @@
214 einfo "made personal changes to those files, you can update with the"
215 einfo "following command:"
216 einfo
217 - einfo " /bin/ls ${ROOT}etc/init.d/net.* | grep -v '/net.lo$' | xargs -n1 ln -sfvn net.lo"
218 + einfo " /bin/ls '${ROOT}'etc/init.d/net.* | grep -v '/net.lo$' | xargs -n1 ln -sfvn net.lo"
219 echo
220 break
221 done
222
223 - if sed -e 's/#.*//' ${ROOT}/etc/conf.d/{net,wireless} 2>/dev/null \
224 + if sed -e 's/#.*//' "${ROOT}"/etc/conf.d/{net,wireless} 2>/dev/null \
225 | egrep -q '\<(domain|nameservers|searchdomains)_' ; then
226 echo
227 ewarn "You have deprecated variables in ${ROOT}/etc/conf.d/net"
228 @@ -563,13 +558,13 @@
229 echo
230 fi
231
232 - if sed -e 's/#.*//' ${ROOT}/etc/conf.d/net 2>/dev/null \
233 + if sed -e 's/#.*//' "${ROOT}"/etc/conf.d/net 2>/dev/null \
234 | egrep -q '\<(iface_|gateway=|ifconfig_|aliases_|broadcasts_|netmasks_|inet6_|ipaddr_|iproute_)'; then
235 echo
236 ewarn "You are using deprecated variables in ${ROOT}/etc/conf.d/net"
237 ewarn
238 ewarn "You are advised to review the new configuration variables as"
239 - ewarn "found in ${ROOT}/etc/conf.d/net.example as there is no"
240 + ewarn "found in '${ROOT}'/etc/conf.d/net.example as there is no"
241 ewarn "guarantee that they will work in future versions."
242 echo
243 fi
244 @@ -582,7 +577,7 @@
245 rm -f "${ROOT}"/etc/init.d/domainname
246 rm -f "${ROOT}"/etc/runlevels/*/domainname
247 ewarn "The domainname init script has been removed in this version."
248 - ewarn "Consult ${ROOT}/etc/conf.d/net.example for details about how"
249 + ewarn "Consult '${ROOT}'/etc/conf.d/net.example for details about how"
250 ewarn "to apply dns/nis information to the loopback interface."
251 fi
252
253
254
255
256 1.13 sys-apps/baselayout/baselayout-1.12.11.1.ebuild
257
258 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-1.12.11.1.ebuild?rev=1.13&view=markup
259 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-1.12.11.1.ebuild?rev=1.13&content-type=text/plain
260 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-1.12.11.1.ebuild?r1=1.12&r2=1.13
261
262 Index: baselayout-1.12.11.1.ebuild
263 ===================================================================
264 RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.11.1.ebuild,v
265 retrieving revision 1.12
266 retrieving revision 1.13
267 diff -u -r1.12 -r1.13
268 --- baselayout-1.12.11.1.ebuild 16 Mar 2008 08:43:51 -0000 1.12
269 +++ baselayout-1.12.11.1.ebuild 31 Mar 2008 00:46:06 -0000 1.13
270 @@ -1,6 +1,6 @@
271 # Copyright 1999-2008 Gentoo Foundation
272 # Distributed under the terms of the GNU General Public License v2
273 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.11.1.ebuild,v 1.12 2008/03/16 08:43:51 vapier Exp $
274 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.11.1.ebuild,v 1.13 2008/03/31 00:46:06 vapier Exp $
275
276 inherit flag-o-matic eutils toolchain-funcs multilib
277
278 @@ -33,7 +33,6 @@
279 DEPEND="virtual/os-headers
280 >=sys-apps/portage-2.0.51"
281 PDEPEND="!build? ( !bootstrap? ( >=sys-apps/module-init-tools-3.2.2-r3 ) )"
282 -PROVIDE="virtual/baselayout"
283
284 src_unpack() {
285 unpack ${A}
286
287
288
289 --
290 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups