Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r10883 - in main/branches/prefix: . bin pym pym/_emerge
Date: Tue, 01 Jul 2008 18:40:05
Message-Id: E1KDklj-0007Gt-46@stork.gentoo.org
1 Author: grobian
2 Date: 2008-07-01 18:39:57 +0000 (Tue, 01 Jul 2008)
3 New Revision: 10883
4
5 Removed:
6 main/branches/prefix/subst-install.vars.in.in
7 Modified:
8 main/branches/prefix/acinclude.m4
9 main/branches/prefix/bin/archive-conf
10 main/branches/prefix/bin/check-implicit-pointer-usage.py
11 main/branches/prefix/bin/chkcontents
12 main/branches/prefix/bin/clean_locks
13 main/branches/prefix/bin/dispatch-conf
14 main/branches/prefix/bin/dobin
15 main/branches/prefix/bin/doconfd
16 main/branches/prefix/bin/dodir
17 main/branches/prefix/bin/dodoc
18 main/branches/prefix/bin/doenvd
19 main/branches/prefix/bin/doexe
20 main/branches/prefix/bin/dohard
21 main/branches/prefix/bin/dohtml
22 main/branches/prefix/bin/doinfo
23 main/branches/prefix/bin/doinitd
24 main/branches/prefix/bin/doins
25 main/branches/prefix/bin/dolib
26 main/branches/prefix/bin/dolib.a
27 main/branches/prefix/bin/dolib.so
28 main/branches/prefix/bin/doman
29 main/branches/prefix/bin/domo
30 main/branches/prefix/bin/dosbin
31 main/branches/prefix/bin/dosed
32 main/branches/prefix/bin/dosym
33 main/branches/prefix/bin/ebuild
34 main/branches/prefix/bin/ebuild.sh
35 main/branches/prefix/bin/ecompress
36 main/branches/prefix/bin/ecompressdir
37 main/branches/prefix/bin/emaint
38 main/branches/prefix/bin/emake
39 main/branches/prefix/bin/emerge
40 main/branches/prefix/bin/emerge-webrsync
41 main/branches/prefix/bin/env-update
42 main/branches/prefix/bin/env-update.sh
43 main/branches/prefix/bin/eprefixify
44 main/branches/prefix/bin/etc-update
45 main/branches/prefix/bin/filter-bash-environment.py
46 main/branches/prefix/bin/find-requires
47 main/branches/prefix/bin/fix-db.py
48 main/branches/prefix/bin/fixdbentries
49 main/branches/prefix/bin/fixpackages
50 main/branches/prefix/bin/fowners
51 main/branches/prefix/bin/fperms
52 main/branches/prefix/bin/glsa-check
53 main/branches/prefix/bin/md5check.py
54 main/branches/prefix/bin/md5check.sh
55 main/branches/prefix/bin/misc-functions.sh
56 main/branches/prefix/bin/newbin
57 main/branches/prefix/bin/newconfd
58 main/branches/prefix/bin/newdoc
59 main/branches/prefix/bin/newenvd
60 main/branches/prefix/bin/newexe
61 main/branches/prefix/bin/newinitd
62 main/branches/prefix/bin/newins
63 main/branches/prefix/bin/newlib.a
64 main/branches/prefix/bin/newlib.so
65 main/branches/prefix/bin/newman
66 main/branches/prefix/bin/newsbin
67 main/branches/prefix/bin/pemerge.py
68 main/branches/prefix/bin/pkgname
69 main/branches/prefix/bin/portage_gpg_update.sh
70 main/branches/prefix/bin/portageq
71 main/branches/prefix/bin/prepall
72 main/branches/prefix/bin/prepalldocs
73 main/branches/prefix/bin/prepallinfo
74 main/branches/prefix/bin/prepallman
75 main/branches/prefix/bin/prepallstrip
76 main/branches/prefix/bin/prepinfo
77 main/branches/prefix/bin/preplib
78 main/branches/prefix/bin/prepman
79 main/branches/prefix/bin/prepstrip
80 main/branches/prefix/bin/quickpkg
81 main/branches/prefix/bin/regenworld
82 main/branches/prefix/bin/repoman
83 main/branches/prefix/bin/sed
84 main/branches/prefix/bin/xpak
85 main/branches/prefix/configure.in
86 main/branches/prefix/pym/Makefile.in
87 main/branches/prefix/pym/_emerge/__init__.py
88 main/branches/prefix/subst-install.in
89 main/branches/prefix/tarball.sh
90 Log:
91 make sure we do not clash with standard names for expansion, as e.g. $BASH
92
93 Modified: main/branches/prefix/acinclude.m4
94 ===================================================================
95 --- main/branches/prefix/acinclude.m4 2008-07-01 17:40:20 UTC (rev 10882)
96 +++ main/branches/prefix/acinclude.m4 2008-07-01 18:39:57 UTC (rev 10883)
97 @@ -16,7 +16,7 @@
98 dnl author: Fabian Groffen <grobian a gentoo.org>
99 AC_DEFUN([GENTOO_PATH_PYTHON],
100 [
101 - AC_PATH_PROG([PYTHON], [python], no, $2)
102 + AC_PATH_PROG([PORTAGE_PYTHON], [python], no, $2)
103
104 dnl is is there at all?
105 if test "$PYTHON" = "no" ; then
106
107 Modified: main/branches/prefix/bin/archive-conf
108 ===================================================================
109 --- main/branches/prefix/bin/archive-conf 2008-07-01 17:40:20 UTC (rev 10882)
110 +++ main/branches/prefix/bin/archive-conf 2008-07-01 18:39:57 UTC (rev 10883)
111 @@ -1,4 +1,4 @@
112 -#!@PYTHON@
113 +#!@PORTAGE_PYTHON@
114 # Copyright 1999-2006 Gentoo Foundation
115 # Distributed under the terms of the GNU General Public License v2
116 # $Id$
117
118 Modified: main/branches/prefix/bin/check-implicit-pointer-usage.py
119 ===================================================================
120 --- main/branches/prefix/bin/check-implicit-pointer-usage.py 2008-07-01 17:40:20 UTC (rev 10882)
121 +++ main/branches/prefix/bin/check-implicit-pointer-usage.py 2008-07-01 18:39:57 UTC (rev 10883)
122 @@ -1,4 +1,4 @@
123 -#!@PYTHON@ -O
124 +#!@PORTAGE_PYTHON@ -O
125
126 # Ripped from HP and updated from Debian
127 # Update by Gentoo to support unicode output
128
129 Modified: main/branches/prefix/bin/chkcontents
130 ===================================================================
131 --- main/branches/prefix/bin/chkcontents 2008-07-01 17:40:20 UTC (rev 10882)
132 +++ main/branches/prefix/bin/chkcontents 2008-07-01 18:39:57 UTC (rev 10883)
133 @@ -1,4 +1,4 @@
134 -#!@PYTHON@
135 +#!@PORTAGE_PYTHON@
136 # Copyright 1999-2006 Gentoo Foundation
137 # Distributed under the terms of the GNU General Public License v2
138 # $Id$
139
140 Modified: main/branches/prefix/bin/clean_locks
141 ===================================================================
142 --- main/branches/prefix/bin/clean_locks 2008-07-01 17:40:20 UTC (rev 10882)
143 +++ main/branches/prefix/bin/clean_locks 2008-07-01 18:39:57 UTC (rev 10883)
144 @@ -1,4 +1,4 @@
145 -#!@PYTHON@ -O
146 +#!@PORTAGE_PYTHON@ -O
147 # Copyright 1999-2006 Gentoo Foundation
148 # Distributed under the terms of the GNU General Public License v2
149 # $Id$
150
151 Modified: main/branches/prefix/bin/dispatch-conf
152 ===================================================================
153 --- main/branches/prefix/bin/dispatch-conf 2008-07-01 17:40:20 UTC (rev 10882)
154 +++ main/branches/prefix/bin/dispatch-conf 2008-07-01 18:39:57 UTC (rev 10883)
155 @@ -1,4 +1,4 @@
156 -#!@PYTHON@ -O
157 +#!@PORTAGE_PYTHON@ -O
158 # Copyright 1999-2006 Gentoo Foundation
159 # Distributed under the terms of the GNU General Public License v2
160 # $Id$
161
162 Modified: main/branches/prefix/bin/dobin
163 ===================================================================
164 --- main/branches/prefix/bin/dobin 2008-07-01 17:40:20 UTC (rev 10882)
165 +++ main/branches/prefix/bin/dobin 2008-07-01 18:39:57 UTC (rev 10883)
166 @@ -1,4 +1,4 @@
167 -#!@BASH@
168 +#!@PORTAGE_BASH@
169 # Copyright 1999-2006 Gentoo Foundation
170 # Distributed under the terms of the GNU General Public License v2
171 # $Id$
172
173 Modified: main/branches/prefix/bin/doconfd
174 ===================================================================
175 --- main/branches/prefix/bin/doconfd 2008-07-01 17:40:20 UTC (rev 10882)
176 +++ main/branches/prefix/bin/doconfd 2008-07-01 18:39:57 UTC (rev 10883)
177 @@ -1,4 +1,4 @@
178 -#!@BASH@
179 +#!@PORTAGE_BASH@
180 # Copyright 1999-2006 Gentoo Foundation
181 # Distributed under the terms of the GNU General Public License v2
182 # $Id$
183
184 Modified: main/branches/prefix/bin/dodir
185 ===================================================================
186 --- main/branches/prefix/bin/dodir 2008-07-01 17:40:20 UTC (rev 10882)
187 +++ main/branches/prefix/bin/dodir 2008-07-01 18:39:57 UTC (rev 10883)
188 @@ -1,4 +1,4 @@
189 -#!@BASH@
190 +#!@PORTAGE_BASH@
191 # Copyright 1999-2006 Gentoo Foundation
192 # Distributed under the terms of the GNU General Public License v2
193 # $Id$
194
195 Modified: main/branches/prefix/bin/dodoc
196 ===================================================================
197 --- main/branches/prefix/bin/dodoc 2008-07-01 17:40:20 UTC (rev 10882)
198 +++ main/branches/prefix/bin/dodoc 2008-07-01 18:39:57 UTC (rev 10883)
199 @@ -1,4 +1,4 @@
200 -#!@BASH@
201 +#!@PORTAGE_BASH@
202 # Copyright 1999-2007 Gentoo Foundation
203 # Distributed under the terms of the GNU General Public License v2
204 # $Id$
205
206 Modified: main/branches/prefix/bin/doenvd
207 ===================================================================
208 --- main/branches/prefix/bin/doenvd 2008-07-01 17:40:20 UTC (rev 10882)
209 +++ main/branches/prefix/bin/doenvd 2008-07-01 18:39:57 UTC (rev 10883)
210 @@ -1,4 +1,4 @@
211 -#!@BASH@
212 +#!@PORTAGE_BASH@
213 # Copyright 1999-2006 Gentoo Foundation
214 # Distributed under the terms of the GNU General Public License v2
215 # $Id$
216
217 Modified: main/branches/prefix/bin/doexe
218 ===================================================================
219 --- main/branches/prefix/bin/doexe 2008-07-01 17:40:20 UTC (rev 10882)
220 +++ main/branches/prefix/bin/doexe 2008-07-01 18:39:57 UTC (rev 10883)
221 @@ -1,4 +1,4 @@
222 -#!@BASH@
223 +#!@PORTAGE_BASH@
224 # Copyright 1999-2007 Gentoo Foundation
225 # Distributed under the terms of the GNU General Public License v2
226 # $Id$
227
228 Modified: main/branches/prefix/bin/dohard
229 ===================================================================
230 --- main/branches/prefix/bin/dohard 2008-07-01 17:40:20 UTC (rev 10882)
231 +++ main/branches/prefix/bin/dohard 2008-07-01 18:39:57 UTC (rev 10883)
232 @@ -1,4 +1,4 @@
233 -#!@BASH@
234 +#!@PORTAGE_BASH@
235 # Copyright 1999-2007 Gentoo Foundation
236 # Distributed under the terms of the GNU General Public License v2
237 # $Id$
238
239 Modified: main/branches/prefix/bin/dohtml
240 ===================================================================
241 --- main/branches/prefix/bin/dohtml 2008-07-01 17:40:20 UTC (rev 10882)
242 +++ main/branches/prefix/bin/dohtml 2008-07-01 18:39:57 UTC (rev 10883)
243 @@ -1,4 +1,4 @@
244 -#!@PYTHON@
245 +#!@PORTAGE_PYTHON@
246 # Copyright 1999-2006 Gentoo Foundation
247 # Distributed under the terms of the GNU General Public License v2
248 # $Id$
249
250 Modified: main/branches/prefix/bin/doinfo
251 ===================================================================
252 --- main/branches/prefix/bin/doinfo 2008-07-01 17:40:20 UTC (rev 10882)
253 +++ main/branches/prefix/bin/doinfo 2008-07-01 18:39:57 UTC (rev 10883)
254 @@ -1,4 +1,4 @@
255 -#!@BASH@
256 +#!@PORTAGE_BASH@
257 # Copyright 1999-2007 Gentoo Foundation
258 # Distributed under the terms of the GNU General Public License v2
259 # $Id$
260
261 Modified: main/branches/prefix/bin/doinitd
262 ===================================================================
263 --- main/branches/prefix/bin/doinitd 2008-07-01 17:40:20 UTC (rev 10882)
264 +++ main/branches/prefix/bin/doinitd 2008-07-01 18:39:57 UTC (rev 10883)
265 @@ -1,4 +1,4 @@
266 -#!@BASH@
267 +#!@PORTAGE_BASH@
268 # Copyright 1999-2007 Gentoo Foundation
269 # Distributed under the terms of the GNU General Public License v2
270 # $Id$
271
272 Modified: main/branches/prefix/bin/doins
273 ===================================================================
274 --- main/branches/prefix/bin/doins 2008-07-01 17:40:20 UTC (rev 10882)
275 +++ main/branches/prefix/bin/doins 2008-07-01 18:39:57 UTC (rev 10883)
276 @@ -1,4 +1,4 @@
277 -#!@BASH@
278 +#!@PORTAGE_BASH@
279 # Copyright 1999-2007 Gentoo Foundation
280 # Distributed under the terms of the GNU General Public License v2
281 # $Id$
282
283 Modified: main/branches/prefix/bin/dolib
284 ===================================================================
285 --- main/branches/prefix/bin/dolib 2008-07-01 17:40:20 UTC (rev 10882)
286 +++ main/branches/prefix/bin/dolib 2008-07-01 18:39:57 UTC (rev 10883)
287 @@ -1,4 +1,4 @@
288 -#!@BASH@
289 +#!@PORTAGE_BASH@
290 # Copyright 1999-2006 Gentoo Foundation
291 # Distributed under the terms of the GNU General Public License v2
292 # $Id$
293
294 Modified: main/branches/prefix/bin/dolib.a
295 ===================================================================
296 --- main/branches/prefix/bin/dolib.a 2008-07-01 17:40:20 UTC (rev 10882)
297 +++ main/branches/prefix/bin/dolib.a 2008-07-01 18:39:57 UTC (rev 10883)
298 @@ -1,4 +1,4 @@
299 -#!@BASH@
300 +#!@PORTAGE_BASH@
301 # Copyright 1999-2006 Gentoo Foundation
302 # Distributed under the terms of the GNU General Public License v2
303 # $Id$
304
305 Modified: main/branches/prefix/bin/dolib.so
306 ===================================================================
307 --- main/branches/prefix/bin/dolib.so 2008-07-01 17:40:20 UTC (rev 10882)
308 +++ main/branches/prefix/bin/dolib.so 2008-07-01 18:39:57 UTC (rev 10883)
309 @@ -1,4 +1,4 @@
310 -#!@BASH@
311 +#!@PORTAGE_BASH@
312 # Copyright 1999-2006 Gentoo Foundation
313 # Distributed under the terms of the GNU General Public License v2
314 # $Id$
315
316 Modified: main/branches/prefix/bin/doman
317 ===================================================================
318 --- main/branches/prefix/bin/doman 2008-07-01 17:40:20 UTC (rev 10882)
319 +++ main/branches/prefix/bin/doman 2008-07-01 18:39:57 UTC (rev 10883)
320 @@ -1,4 +1,4 @@
321 -#!@BASH@
322 +#!@PORTAGE_BASH@
323 # Copyright 1999-2006 Gentoo Foundation
324 # Distributed under the terms of the GNU General Public License v2
325 # $Id$
326
327 Modified: main/branches/prefix/bin/domo
328 ===================================================================
329 --- main/branches/prefix/bin/domo 2008-07-01 17:40:20 UTC (rev 10882)
330 +++ main/branches/prefix/bin/domo 2008-07-01 18:39:57 UTC (rev 10883)
331 @@ -1,4 +1,4 @@
332 -#!@BASH@
333 +#!@PORTAGE_BASH@
334 # Copyright 1999-2006 Gentoo Foundation
335 # Distributed under the terms of the GNU General Public License v2
336 # $Id$
337
338 Modified: main/branches/prefix/bin/dosbin
339 ===================================================================
340 --- main/branches/prefix/bin/dosbin 2008-07-01 17:40:20 UTC (rev 10882)
341 +++ main/branches/prefix/bin/dosbin 2008-07-01 18:39:57 UTC (rev 10883)
342 @@ -1,4 +1,4 @@
343 -#!@BASH@
344 +#!@PORTAGE_BASH@
345 # Copyright 1999-2006 Gentoo Foundation
346 # Distributed under the terms of the GNU General Public License v2
347 # $Id$
348
349 Modified: main/branches/prefix/bin/dosed
350 ===================================================================
351 --- main/branches/prefix/bin/dosed 2008-07-01 17:40:20 UTC (rev 10882)
352 +++ main/branches/prefix/bin/dosed 2008-07-01 18:39:57 UTC (rev 10883)
353 @@ -1,4 +1,4 @@
354 -#!@BASH@
355 +#!@PORTAGE_BASH@
356 # Copyright 1999-2006 Gentoo Foundation
357 # Distributed under the terms of the GNU General Public License v2
358 # $Id$
359
360 Modified: main/branches/prefix/bin/dosym
361 ===================================================================
362 --- main/branches/prefix/bin/dosym 2008-07-01 17:40:20 UTC (rev 10882)
363 +++ main/branches/prefix/bin/dosym 2008-07-01 18:39:57 UTC (rev 10883)
364 @@ -1,4 +1,4 @@
365 -#!@BASH@
366 +#!@PORTAGE_BASH@
367 # Copyright 1999-2006 Gentoo Foundation
368 # Distributed under the terms of the GNU General Public License v2
369 # $Id$
370
371 Modified: main/branches/prefix/bin/ebuild
372 ===================================================================
373 --- main/branches/prefix/bin/ebuild 2008-07-01 17:40:20 UTC (rev 10882)
374 +++ main/branches/prefix/bin/ebuild 2008-07-01 18:39:57 UTC (rev 10883)
375 @@ -1,4 +1,4 @@
376 -#!@PYTHON@ -O
377 +#!@PORTAGE_PYTHON@ -O
378 # Copyright 1999-2006 Gentoo Foundation
379 # Distributed under the terms of the GNU General Public License v2
380 # $Header: /var/cvsroot/gentoo-src/portage/bin/ebuild,v 1.18.2.3 2005/05/07 04:32:59 ferringb Exp $
381
382 Modified: main/branches/prefix/bin/ebuild.sh
383 ===================================================================
384 --- main/branches/prefix/bin/ebuild.sh 2008-07-01 17:40:20 UTC (rev 10882)
385 +++ main/branches/prefix/bin/ebuild.sh 2008-07-01 18:39:57 UTC (rev 10883)
386 @@ -1,4 +1,4 @@
387 -#!@BASH@
388 +#!@PORTAGE_BASH@
389 # Copyright 1999-2007 Gentoo Foundation
390 # Distributed under the terms of the GNU General Public License v2
391 # $Id$
392
393 Modified: main/branches/prefix/bin/ecompress
394 ===================================================================
395 --- main/branches/prefix/bin/ecompress 2008-07-01 17:40:20 UTC (rev 10882)
396 +++ main/branches/prefix/bin/ecompress 2008-07-01 18:39:57 UTC (rev 10883)
397 @@ -1,4 +1,4 @@
398 -#!@BASH@
399 +#!@PORTAGE_BASH@
400 # Copyright 1999-2007 Gentoo Foundation
401 # Distributed under the terms of the GNU General Public License v2
402 # $Id$
403
404 Modified: main/branches/prefix/bin/ecompressdir
405 ===================================================================
406 --- main/branches/prefix/bin/ecompressdir 2008-07-01 17:40:20 UTC (rev 10882)
407 +++ main/branches/prefix/bin/ecompressdir 2008-07-01 18:39:57 UTC (rev 10883)
408 @@ -1,4 +1,4 @@
409 -#!@BASH@
410 +#!@PORTAGE_BASH@
411 # Copyright 1999-2007 Gentoo Foundation
412 # Distributed under the terms of the GNU General Public License v2
413 # $Id$
414
415 Modified: main/branches/prefix/bin/emaint
416 ===================================================================
417 --- main/branches/prefix/bin/emaint 2008-07-01 17:40:20 UTC (rev 10882)
418 +++ main/branches/prefix/bin/emaint 2008-07-01 18:39:57 UTC (rev 10883)
419 @@ -1,4 +1,4 @@
420 -#!@PYTHON@ -O
421 +#!@PORTAGE_PYTHON@ -O
422 # vim: noet :
423 import os
424 import re
425
426 Modified: main/branches/prefix/bin/emake
427 ===================================================================
428 --- main/branches/prefix/bin/emake 2008-07-01 17:40:20 UTC (rev 10882)
429 +++ main/branches/prefix/bin/emake 2008-07-01 18:39:57 UTC (rev 10883)
430 @@ -1,4 +1,4 @@
431 -#!@BASH@
432 +#!@PORTAGE_BASH@
433 # Copyright 1999-2006 Gentoo Foundation
434 # Distributed under the terms of the GNU General Public License v2
435 # $Id$
436
437 Modified: main/branches/prefix/bin/emerge
438 ===================================================================
439 --- main/branches/prefix/bin/emerge 2008-07-01 17:40:20 UTC (rev 10882)
440 +++ main/branches/prefix/bin/emerge 2008-07-01 18:39:57 UTC (rev 10883)
441 @@ -1,4 +1,4 @@
442 -#!@PYTHON@
443 +#!@PORTAGE_PYTHON@
444 # Copyright Gentoo Foundation 2006
445 # Portage Emerge bits
446 # $Id$
447
448 Modified: main/branches/prefix/bin/emerge-webrsync
449 ===================================================================
450 --- main/branches/prefix/bin/emerge-webrsync 2008-07-01 17:40:20 UTC (rev 10882)
451 +++ main/branches/prefix/bin/emerge-webrsync 2008-07-01 18:39:57 UTC (rev 10883)
452 @@ -1,4 +1,4 @@
453 -#!@BASH@
454 +#!@PORTAGE_BASH@
455 # Copyright 1999-2008 Gentoo Foundation
456 # Distributed under the terms of the GNU General Public License v2
457 # $Id$
458
459 Modified: main/branches/prefix/bin/env-update
460 ===================================================================
461 --- main/branches/prefix/bin/env-update 2008-07-01 17:40:20 UTC (rev 10882)
462 +++ main/branches/prefix/bin/env-update 2008-07-01 18:39:57 UTC (rev 10883)
463 @@ -1,4 +1,4 @@
464 -#!@PYTHON@ -O
465 +#!@PORTAGE_PYTHON@ -O
466 # Copyright 1999-2006 Gentoo Foundation
467 # Distributed under the terms of the GNU General Public License v2
468 # $Id$
469
470 Modified: main/branches/prefix/bin/env-update.sh
471 ===================================================================
472 --- main/branches/prefix/bin/env-update.sh 2008-07-01 17:40:20 UTC (rev 10882)
473 +++ main/branches/prefix/bin/env-update.sh 2008-07-01 18:39:57 UTC (rev 10883)
474 @@ -1,4 +1,4 @@
475 -#!@BASH@
476 +#!@PORTAGE_BASH@
477 # Copyright 1999-2006 Gentoo Foundation
478 # Distributed under the terms of the GNU General Public License v2
479 # $Id$
480
481 Modified: main/branches/prefix/bin/eprefixify
482 ===================================================================
483 --- main/branches/prefix/bin/eprefixify 2008-07-01 17:40:20 UTC (rev 10882)
484 +++ main/branches/prefix/bin/eprefixify 2008-07-01 18:39:57 UTC (rev 10883)
485 @@ -1,4 +1,4 @@
486 -#!@BASH@
487 +#!@PORTAGE_BASH@
488 # Copyright 1999-2006 Gentoo Foundation
489 # Distributed under the terms of the GNU General Public License v2
490 # $Id$
491
492 Modified: main/branches/prefix/bin/etc-update
493 ===================================================================
494 --- main/branches/prefix/bin/etc-update 2008-07-01 17:40:20 UTC (rev 10882)
495 +++ main/branches/prefix/bin/etc-update 2008-07-01 18:39:57 UTC (rev 10883)
496 @@ -1,4 +1,4 @@
497 -#!@BASH@
498 +#!@PORTAGE_BASH@
499 # Copyright 1999-2007 Gentoo Foundation
500 # Distributed under the terms of the GNU General Public License v2
501 # $Id$
502
503 Modified: main/branches/prefix/bin/filter-bash-environment.py
504 ===================================================================
505 --- main/branches/prefix/bin/filter-bash-environment.py 2008-07-01 17:40:20 UTC (rev 10882)
506 +++ main/branches/prefix/bin/filter-bash-environment.py 2008-07-01 18:39:57 UTC (rev 10883)
507 @@ -1,4 +1,4 @@
508 -#!@PYTHON@
509 +#!@PORTAGE_PYTHON@
510 # Copyright 1999-2007 Gentoo Foundation
511 # Distributed under the terms of the GNU General Public License v2
512 # $Id$
513
514 Modified: main/branches/prefix/bin/find-requires
515 ===================================================================
516 --- main/branches/prefix/bin/find-requires 2008-07-01 17:40:20 UTC (rev 10882)
517 +++ main/branches/prefix/bin/find-requires 2008-07-01 18:39:57 UTC (rev 10883)
518 @@ -1,4 +1,4 @@
519 -#!@BASH@
520 +#!@PORTAGE_BASH@
521 # Copyright 1999-2006 Gentoo Foundation
522 # Distributed under the terms of the GNU General Public License v2
523 # $Id$
524
525 Modified: main/branches/prefix/bin/fix-db.py
526 ===================================================================
527 --- main/branches/prefix/bin/fix-db.py 2008-07-01 17:40:20 UTC (rev 10882)
528 +++ main/branches/prefix/bin/fix-db.py 2008-07-01 18:39:57 UTC (rev 10883)
529 @@ -1,4 +1,4 @@
530 -#!@PYTHON@
531 +#!@PORTAGE_PYTHON@
532 # Copyright 1999-2006 Gentoo Foundation
533 # Distributed under the terms of the GNU General Public License v2
534 # $Id$
535
536 Modified: main/branches/prefix/bin/fixdbentries
537 ===================================================================
538 --- main/branches/prefix/bin/fixdbentries 2008-07-01 17:40:20 UTC (rev 10882)
539 +++ main/branches/prefix/bin/fixdbentries 2008-07-01 18:39:57 UTC (rev 10883)
540 @@ -1,4 +1,4 @@
541 -#!@BASH@
542 +#!@PORTAGE_BASH@
543 # Copyright 1999-2006 Gentoo Foundation
544 # Distributed under the terms of the GNU General Public License v2
545 # $Id$
546
547 Modified: main/branches/prefix/bin/fixpackages
548 ===================================================================
549 --- main/branches/prefix/bin/fixpackages 2008-07-01 17:40:20 UTC (rev 10882)
550 +++ main/branches/prefix/bin/fixpackages 2008-07-01 18:39:57 UTC (rev 10883)
551 @@ -1,4 +1,4 @@
552 -#!@PYTHON@
553 +#!@PORTAGE_PYTHON@
554 # Copyright 1999-2006 Gentoo Foundation
555 # Distributed under the terms of the GNU General Public License v2
556 # $Id$
557
558 Modified: main/branches/prefix/bin/fowners
559 ===================================================================
560 --- main/branches/prefix/bin/fowners 2008-07-01 17:40:20 UTC (rev 10882)
561 +++ main/branches/prefix/bin/fowners 2008-07-01 18:39:57 UTC (rev 10883)
562 @@ -1,4 +1,4 @@
563 -#!@BASH@
564 +#!@PORTAGE_BASH@
565 # Copyright 1999-2007 Gentoo Foundation
566 # Distributed under the terms of the GNU General Public License v2
567 # $Id$
568
569 Modified: main/branches/prefix/bin/fperms
570 ===================================================================
571 --- main/branches/prefix/bin/fperms 2008-07-01 17:40:20 UTC (rev 10882)
572 +++ main/branches/prefix/bin/fperms 2008-07-01 18:39:57 UTC (rev 10883)
573 @@ -1,4 +1,4 @@
574 -#!@BASH@
575 +#!@PORTAGE_BASH@
576 # Copyright 1999-2007 Gentoo Foundation
577 # Distributed under the terms of the GNU General Public License v2
578 # $Id$
579
580 Modified: main/branches/prefix/bin/glsa-check
581 ===================================================================
582 --- main/branches/prefix/bin/glsa-check 2008-07-01 17:40:20 UTC (rev 10882)
583 +++ main/branches/prefix/bin/glsa-check 2008-07-01 18:39:57 UTC (rev 10883)
584 @@ -1,4 +1,4 @@
585 -#!@PYTHON@
586 +#!@PORTAGE_PYTHON@
587
588 # $Header: $
589 # This program is licensed under the GPL, version 2
590
591 Modified: main/branches/prefix/bin/md5check.py
592 ===================================================================
593 --- main/branches/prefix/bin/md5check.py 2008-07-01 17:40:20 UTC (rev 10882)
594 +++ main/branches/prefix/bin/md5check.py 2008-07-01 18:39:57 UTC (rev 10883)
595 @@ -1,4 +1,4 @@
596 -#!@PYTHON@ -O
597 +#!@PORTAGE_PYTHON@ -O
598 # Copyright 1999-2006 Gentoo Foundation
599 # Distributed under the terms of the GNU General Public License v2
600 # $Id$
601
602 Modified: main/branches/prefix/bin/md5check.sh
603 ===================================================================
604 --- main/branches/prefix/bin/md5check.sh 2008-07-01 17:40:20 UTC (rev 10882)
605 +++ main/branches/prefix/bin/md5check.sh 2008-07-01 18:39:57 UTC (rev 10883)
606 @@ -1,4 +1,4 @@
607 -#!@BASH@
608 +#!@PORTAGE_BASH@
609 # Copyright 1999-2006 Gentoo Foundation
610 # Distributed under the terms of the GNU General Public License v2
611 # $Id$
612
613 Modified: main/branches/prefix/bin/misc-functions.sh
614 ===================================================================
615 --- main/branches/prefix/bin/misc-functions.sh 2008-07-01 17:40:20 UTC (rev 10882)
616 +++ main/branches/prefix/bin/misc-functions.sh 2008-07-01 18:39:57 UTC (rev 10883)
617 @@ -1,4 +1,4 @@
618 -#!@BASH@
619 +#!@PORTAGE_BASH@
620 # Copyright 1999-2006 Gentoo Foundation
621 # Distributed under the terms of the GNU General Public License v2
622 # $Header$
623
624 Modified: main/branches/prefix/bin/newbin
625 ===================================================================
626 --- main/branches/prefix/bin/newbin 2008-07-01 17:40:20 UTC (rev 10882)
627 +++ main/branches/prefix/bin/newbin 2008-07-01 18:39:57 UTC (rev 10883)
628 @@ -1,4 +1,4 @@
629 -#!@BASH@
630 +#!@PORTAGE_BASH@
631 # Copyright 1999-2006 Gentoo Foundation
632 # Distributed under the terms of the GNU General Public License v2
633 # $Id$
634
635 Modified: main/branches/prefix/bin/newconfd
636 ===================================================================
637 --- main/branches/prefix/bin/newconfd 2008-07-01 17:40:20 UTC (rev 10882)
638 +++ main/branches/prefix/bin/newconfd 2008-07-01 18:39:57 UTC (rev 10883)
639 @@ -1,4 +1,4 @@
640 -#!@BASH@
641 +#!@PORTAGE_BASH@
642 # Copyright 1999-2006 Gentoo Foundation
643 # Distributed under the terms of the GNU General Public License v2
644 # $Id$
645
646 Modified: main/branches/prefix/bin/newdoc
647 ===================================================================
648 --- main/branches/prefix/bin/newdoc 2008-07-01 17:40:20 UTC (rev 10882)
649 +++ main/branches/prefix/bin/newdoc 2008-07-01 18:39:57 UTC (rev 10883)
650 @@ -1,4 +1,4 @@
651 -#!@BASH@
652 +#!@PORTAGE_BASH@
653 # Copyright 1999-2006 Gentoo Foundation
654 # Distributed under the terms of the GNU General Public License v2
655 # $Id$
656
657 Modified: main/branches/prefix/bin/newenvd
658 ===================================================================
659 --- main/branches/prefix/bin/newenvd 2008-07-01 17:40:20 UTC (rev 10882)
660 +++ main/branches/prefix/bin/newenvd 2008-07-01 18:39:57 UTC (rev 10883)
661 @@ -1,4 +1,4 @@
662 -#!@BASH@
663 +#!@PORTAGE_BASH@
664 # Copyright 1999-2006 Gentoo Foundation
665 # Distributed under the terms of the GNU General Public License v2
666 # $Id$
667
668 Modified: main/branches/prefix/bin/newexe
669 ===================================================================
670 --- main/branches/prefix/bin/newexe 2008-07-01 17:40:20 UTC (rev 10882)
671 +++ main/branches/prefix/bin/newexe 2008-07-01 18:39:57 UTC (rev 10883)
672 @@ -1,4 +1,4 @@
673 -#!@BASH@
674 +#!@PORTAGE_BASH@
675 # Copyright 1999-2006 Gentoo Foundation
676 # Distributed under the terms of the GNU General Public License v2
677 # $Id$
678
679 Modified: main/branches/prefix/bin/newinitd
680 ===================================================================
681 --- main/branches/prefix/bin/newinitd 2008-07-01 17:40:20 UTC (rev 10882)
682 +++ main/branches/prefix/bin/newinitd 2008-07-01 18:39:57 UTC (rev 10883)
683 @@ -1,4 +1,4 @@
684 -#!@BASH@
685 +#!@PORTAGE_BASH@
686 # Copyright 1999-2006 Gentoo Foundation
687 # Distributed under the terms of the GNU General Public License v2
688 # $Id$
689
690 Modified: main/branches/prefix/bin/newins
691 ===================================================================
692 --- main/branches/prefix/bin/newins 2008-07-01 17:40:20 UTC (rev 10882)
693 +++ main/branches/prefix/bin/newins 2008-07-01 18:39:57 UTC (rev 10883)
694 @@ -1,4 +1,4 @@
695 -#!@BASH@
696 +#!@PORTAGE_BASH@
697 # Copyright 1999-2006 Gentoo Foundation
698 # Distributed under the terms of the GNU General Public License v2
699 # $Id$
700
701 Modified: main/branches/prefix/bin/newlib.a
702 ===================================================================
703 --- main/branches/prefix/bin/newlib.a 2008-07-01 17:40:20 UTC (rev 10882)
704 +++ main/branches/prefix/bin/newlib.a 2008-07-01 18:39:57 UTC (rev 10883)
705 @@ -1,4 +1,4 @@
706 -#!@BASH@
707 +#!@PORTAGE_BASH@
708 # Copyright 1999-2006 Gentoo Foundation
709 # Distributed under the terms of the GNU General Public License v2
710 # $Id$
711
712 Modified: main/branches/prefix/bin/newlib.so
713 ===================================================================
714 --- main/branches/prefix/bin/newlib.so 2008-07-01 17:40:20 UTC (rev 10882)
715 +++ main/branches/prefix/bin/newlib.so 2008-07-01 18:39:57 UTC (rev 10883)
716 @@ -1,4 +1,4 @@
717 -#!@BASH@
718 +#!@PORTAGE_BASH@
719 # Copyright 1999-2006 Gentoo Foundation
720 # Distributed under the terms of the GNU General Public License v2
721 # $Id$
722
723 Modified: main/branches/prefix/bin/newman
724 ===================================================================
725 --- main/branches/prefix/bin/newman 2008-07-01 17:40:20 UTC (rev 10882)
726 +++ main/branches/prefix/bin/newman 2008-07-01 18:39:57 UTC (rev 10883)
727 @@ -1,4 +1,4 @@
728 -#!@BASH@
729 +#!@PORTAGE_BASH@
730 # Copyright 1999-2006 Gentoo Foundation
731 # Distributed under the terms of the GNU General Public License v2
732 # $Id$
733
734 Modified: main/branches/prefix/bin/newsbin
735 ===================================================================
736 --- main/branches/prefix/bin/newsbin 2008-07-01 17:40:20 UTC (rev 10882)
737 +++ main/branches/prefix/bin/newsbin 2008-07-01 18:39:57 UTC (rev 10883)
738 @@ -1,4 +1,4 @@
739 -#!@BASH@
740 +#!@PORTAGE_BASH@
741 # Copyright 1999-2006 Gentoo Foundation
742 # Distributed under the terms of the GNU General Public License v2
743 # $Id$
744
745 Modified: main/branches/prefix/bin/pemerge.py
746 ===================================================================
747 --- main/branches/prefix/bin/pemerge.py 2008-07-01 17:40:20 UTC (rev 10882)
748 +++ main/branches/prefix/bin/pemerge.py 2008-07-01 18:39:57 UTC (rev 10883)
749 @@ -1,4 +1,4 @@
750 -#!@PYTHON@ -O
751 +#!@PORTAGE_PYTHON@ -O
752
753 import profile,time,sys,os
754 sys.path = ["@PORTAGE_BASE@/bin","@PORTAGE_BASE@/pym"]+sys.path
755
756 Modified: main/branches/prefix/bin/pkgname
757 ===================================================================
758 --- main/branches/prefix/bin/pkgname 2008-07-01 17:40:20 UTC (rev 10882)
759 +++ main/branches/prefix/bin/pkgname 2008-07-01 18:39:57 UTC (rev 10883)
760 @@ -1,4 +1,4 @@
761 -#!@PYTHON@
762 +#!@PORTAGE_PYTHON@
763 # Copyright 1999-2006 Gentoo Foundation
764 # Distributed under the terms of the GNU General Public License v2
765 # $Id$
766
767 Modified: main/branches/prefix/bin/portage_gpg_update.sh
768 ===================================================================
769 --- main/branches/prefix/bin/portage_gpg_update.sh 2008-07-01 17:40:20 UTC (rev 10882)
770 +++ main/branches/prefix/bin/portage_gpg_update.sh 2008-07-01 18:39:57 UTC (rev 10883)
771 @@ -1,4 +1,4 @@
772 -#!@BASH@
773 +#!@PORTAGE_BASH@
774 # Copyright 1999-2006 Gentoo Foundation
775 # Distributed under the terms of the GNU General Public License v2
776 # $Id$
777
778 Modified: main/branches/prefix/bin/portageq
779 ===================================================================
780 --- main/branches/prefix/bin/portageq 2008-07-01 17:40:20 UTC (rev 10882)
781 +++ main/branches/prefix/bin/portageq 2008-07-01 18:39:57 UTC (rev 10883)
782 @@ -1,4 +1,4 @@
783 -#!@PYTHON@ -O
784 +#!@PORTAGE_PYTHON@ -O
785 # Copyright 1999-2006 Gentoo Foundation
786 # Distributed under the terms of the GNU General Public License v2
787 # $Id$
788
789 Modified: main/branches/prefix/bin/prepall
790 ===================================================================
791 --- main/branches/prefix/bin/prepall 2008-07-01 17:40:20 UTC (rev 10882)
792 +++ main/branches/prefix/bin/prepall 2008-07-01 18:39:57 UTC (rev 10883)
793 @@ -1,4 +1,4 @@
794 -#!@BASH@
795 +#!@PORTAGE_BASH@
796 # Copyright 1999-2007 Gentoo Foundation
797 # Distributed under the terms of the GNU General Public License v2
798 # $Id$
799
800 Modified: main/branches/prefix/bin/prepalldocs
801 ===================================================================
802 --- main/branches/prefix/bin/prepalldocs 2008-07-01 17:40:20 UTC (rev 10882)
803 +++ main/branches/prefix/bin/prepalldocs 2008-07-01 18:39:57 UTC (rev 10883)
804 @@ -1,4 +1,4 @@
805 -#!@BASH@
806 +#!@PORTAGE_BASH@
807 # Copyright 1999-2007 Gentoo Foundation
808 # Distributed under the terms of the GNU General Public License v2
809 # $Id$
810
811 Modified: main/branches/prefix/bin/prepallinfo
812 ===================================================================
813 --- main/branches/prefix/bin/prepallinfo 2008-07-01 17:40:20 UTC (rev 10882)
814 +++ main/branches/prefix/bin/prepallinfo 2008-07-01 18:39:57 UTC (rev 10883)
815 @@ -1,4 +1,4 @@
816 -#!@BASH@
817 +#!@PORTAGE_BASH@
818 # Copyright 1999-2006 Gentoo Foundation
819 # Distributed under the terms of the GNU General Public License v2
820 # $Id$
821
822 Modified: main/branches/prefix/bin/prepallman
823 ===================================================================
824 --- main/branches/prefix/bin/prepallman 2008-07-01 17:40:20 UTC (rev 10882)
825 +++ main/branches/prefix/bin/prepallman 2008-07-01 18:39:57 UTC (rev 10883)
826 @@ -1,4 +1,4 @@
827 -#!@BASH@
828 +#!@PORTAGE_BASH@
829 # Copyright 1999-2007 Gentoo Foundation
830 # Distributed under the terms of the GNU General Public License v2
831 # $Id$
832
833 Modified: main/branches/prefix/bin/prepallstrip
834 ===================================================================
835 --- main/branches/prefix/bin/prepallstrip 2008-07-01 17:40:20 UTC (rev 10882)
836 +++ main/branches/prefix/bin/prepallstrip 2008-07-01 18:39:57 UTC (rev 10883)
837 @@ -1,4 +1,4 @@
838 -#!@BASH@
839 +#!@PORTAGE_BASH@
840 # Copyright 1999-2006 Gentoo Foundation
841 # Distributed under the terms of the GNU General Public License v2
842 # $Id$
843
844 Modified: main/branches/prefix/bin/prepinfo
845 ===================================================================
846 --- main/branches/prefix/bin/prepinfo 2008-07-01 17:40:20 UTC (rev 10882)
847 +++ main/branches/prefix/bin/prepinfo 2008-07-01 18:39:57 UTC (rev 10883)
848 @@ -1,4 +1,4 @@
849 -#!@BASH@
850 +#!@PORTAGE_BASH@
851 # Copyright 1999-2007 Gentoo Foundation
852 # Distributed under the terms of the GNU General Public License v2
853 # $Id$
854
855 Modified: main/branches/prefix/bin/preplib
856 ===================================================================
857 --- main/branches/prefix/bin/preplib 2008-07-01 17:40:20 UTC (rev 10882)
858 +++ main/branches/prefix/bin/preplib 2008-07-01 18:39:57 UTC (rev 10883)
859 @@ -1,4 +1,4 @@
860 -#!@BASH@
861 +#!@PORTAGE_BASH@
862 # Copyright 1999-2006 Gentoo Foundation
863 # Distributed under the terms of the GNU General Public License v2
864 # $Id$
865
866 Modified: main/branches/prefix/bin/prepman
867 ===================================================================
868 --- main/branches/prefix/bin/prepman 2008-07-01 17:40:20 UTC (rev 10882)
869 +++ main/branches/prefix/bin/prepman 2008-07-01 18:39:57 UTC (rev 10883)
870 @@ -1,4 +1,4 @@
871 -#!@BASH@
872 +#!@PORTAGE_BASH@
873 # Copyright 1999-2007 Gentoo Foundation
874 # Distributed under the terms of the GNU General Public License v2
875 # $Id$
876
877 Modified: main/branches/prefix/bin/prepstrip
878 ===================================================================
879 --- main/branches/prefix/bin/prepstrip 2008-07-01 17:40:20 UTC (rev 10882)
880 +++ main/branches/prefix/bin/prepstrip 2008-07-01 18:39:57 UTC (rev 10883)
881 @@ -1,4 +1,4 @@
882 -#!@BASH@
883 +#!@PORTAGE_BASH@
884 # Copyright 1999-2007 Gentoo Foundation
885 # Distributed under the terms of the GNU General Public License v2
886 # $Id$
887
888 Modified: main/branches/prefix/bin/quickpkg
889 ===================================================================
890 --- main/branches/prefix/bin/quickpkg 2008-07-01 17:40:20 UTC (rev 10882)
891 +++ main/branches/prefix/bin/quickpkg 2008-07-01 18:39:57 UTC (rev 10883)
892 @@ -1,4 +1,4 @@
893 -#!@PYTHON@
894 +#!@PORTAGE_PYTHON@
895 # Copyright 1999-2007 Gentoo Foundation
896 # Distributed under the terms of the GNU General Public License v2
897 # $Id$
898
899 Modified: main/branches/prefix/bin/regenworld
900 ===================================================================
901 --- main/branches/prefix/bin/regenworld 2008-07-01 17:40:20 UTC (rev 10882)
902 +++ main/branches/prefix/bin/regenworld 2008-07-01 18:39:57 UTC (rev 10883)
903 @@ -1,4 +1,4 @@
904 -#!@PYTHON@
905 +#!@PORTAGE_PYTHON@
906 # Copyright 1999-2006 Gentoo Foundation
907 # Distributed under the terms of the GNU General Public License v2
908 # $Id$
909
910 Modified: main/branches/prefix/bin/repoman
911 ===================================================================
912 --- main/branches/prefix/bin/repoman 2008-07-01 17:40:20 UTC (rev 10882)
913 +++ main/branches/prefix/bin/repoman 2008-07-01 18:39:57 UTC (rev 10883)
914 @@ -1,4 +1,4 @@
915 -#!@PYTHON@ -O
916 +#!@PORTAGE_PYTHON@ -O
917 # Copyright 1999-2006 Gentoo Foundation
918 # Distributed under the terms of the GNU General Public License v2
919 # $Id$
920
921 Modified: main/branches/prefix/bin/sed
922 ===================================================================
923 --- main/branches/prefix/bin/sed 2008-07-01 17:40:20 UTC (rev 10882)
924 +++ main/branches/prefix/bin/sed 2008-07-01 18:39:57 UTC (rev 10883)
925 @@ -1,4 +1,4 @@
926 -#!@BASH@
927 +#!@PORTAGE_BASH@
928 # Copyright 2007 Gentoo Foundation
929 # Distributed under the terms of the GNU General Public License v2
930 # $Id$
931
932 Modified: main/branches/prefix/bin/xpak
933 ===================================================================
934 --- main/branches/prefix/bin/xpak 2008-07-01 17:40:20 UTC (rev 10882)
935 +++ main/branches/prefix/bin/xpak 2008-07-01 18:39:57 UTC (rev 10883)
936 @@ -1,4 +1,4 @@
937 -#!@PYTHON@ -O
938 +#!@PORTAGE_PYTHON@ -O
939 # Copyright 1999-2006 Gentoo Foundation
940 # Distributed under the terms of the GNU General Public License v2
941 # $Id$
942
943 Modified: main/branches/prefix/configure.in
944 ===================================================================
945 --- main/branches/prefix/configure.in 2008-07-01 17:40:20 UTC (rev 10882)
946 +++ main/branches/prefix/configure.in 2008-07-01 18:39:57 UTC (rev 10883)
947 @@ -38,13 +38,12 @@
948 AC_PATH_PROG(BASENAME, [basename], no)
949 AC_PATH_PROG(DIRNAME, [dirname], no)
950 dnl avoid bash internal variable messing up things here
951 -unset BASH
952 -GENTOO_PATH_GNUPROG(BASH, [bash])
953 -GENTOO_PATH_GNUPROG(SED, [sed])
954 -GENTOO_PATH_GNUPROG(WGET, [wget])
955 -GENTOO_PATH_GNUPROG(FIND, [find])
956 -GENTOO_PATH_GNUPROG(XARGS, [xargs])
957 -GENTOO_PATH_GNUPROG(GREP, [grep])
958 +GENTOO_PATH_GNUPROG(PORTAGE_BASH, [bash])
959 +GENTOO_PATH_GNUPROG(PORTAGE_SED, [sed])
960 +GENTOO_PATH_GNUPROG(PORTAGE_WGET, [wget])
961 +GENTOO_PATH_GNUPROG(PORTAGE_FIND, [find])
962 +GENTOO_PATH_GNUPROG(PORTAGE_XARGS, [xargs])
963 +GENTOO_PATH_GNUPROG(PORTAGE_GREP, [grep])
964
965 dnl Checks for header files.
966 AC_HEADER_STDC
967
968 Modified: main/branches/prefix/pym/Makefile.in
969 ===================================================================
970 --- main/branches/prefix/pym/Makefile.in 2008-07-01 17:40:20 UTC (rev 10882)
971 +++ main/branches/prefix/pym/Makefile.in 2008-07-01 18:39:57 UTC (rev 10883)
972 @@ -2,7 +2,7 @@
973 exec_prefix = @exec_prefix@
974 sysconfdir = @sysconfdir@
975 libdir = @libdir@
976 -PYTHON = @PYTHON@
977 +PYTHON = @PORTAGE_PYTHON@
978
979 srcdir=@srcdir@
980 top_builddir=@top_builddir@
981
982 Modified: main/branches/prefix/pym/_emerge/__init__.py
983 ===================================================================
984 --- main/branches/prefix/pym/_emerge/__init__.py 2008-07-01 17:40:20 UTC (rev 10882)
985 +++ main/branches/prefix/pym/_emerge/__init__.py 2008-07-01 18:39:57 UTC (rev 10883)
986 @@ -1,4 +1,4 @@
987 -#!@PYTHON@ -O
988 +#!@PORTAGE_PYTHON@ -O
989 # Copyright 1999-2006 Gentoo Foundation
990 # Distributed under the terms of the GNU General Public License v2
991 # $Id$
992
993 Modified: main/branches/prefix/subst-install.in
994 ===================================================================
995 --- main/branches/prefix/subst-install.in 2008-07-01 17:40:20 UTC (rev 10882)
996 +++ main/branches/prefix/subst-install.in 2008-07-01 18:39:57 UTC (rev 10883)
997 @@ -1,6 +1,6 @@
998 -#! @SHELL@
999 +#!@BASH@
1000
1001 -SED="@SED@"
1002 +SED="@PORTAGE_SED@"
1003 RM="@RM@"
1004 BASENAME="@BASENAME@"
1005 DIRNAME="@DIRNAME@"
1006
1007 Deleted: main/branches/prefix/subst-install.vars.in.in
1008 ===================================================================
1009 --- main/branches/prefix/subst-install.vars.in.in 2008-07-01 17:40:20 UTC (rev 10882)
1010 +++ main/branches/prefix/subst-install.vars.in.in 2008-07-01 18:39:57 UTC (rev 10883)
1011 @@ -1,133 +0,0 @@
1012 -SHELL=@SHELL@
1013 -PATH_SEPARATOR=@PATH_SEPARATOR@
1014 -PACKAGE_NAME=@PACKAGE_NAME@
1015 -PACKAGE_TARNAME=@PACKAGE_TARNAME@
1016 -PACKAGE_VERSION=@PACKAGE_VERSION@
1017 -PACKAGE_STRING=@PACKAGE_STRING@
1018 -PACKAGE_BUGREPORT=@PACKAGE_BUGREPORT@
1019 -exec_prefix=@exec_prefix@
1020 -prefix=@prefix@
1021 -program_transform_name=@program_transform_name@
1022 -bindir=@bindir@
1023 -sbindir=@sbindir@
1024 -libexecdir=@libexecdir@
1025 -datadir=@datadir@
1026 -sysconfdir=@sysconfdir@
1027 -sharedstatedir=@sharedstatedir@
1028 -localstatedir=@localstatedir@
1029 -libdir=@libdir@
1030 -includedir=@includedir@
1031 -oldincludedir=@oldincludedir@
1032 -infodir=@infodir@
1033 -mandir=@mandir@
1034 -build_alias=@build_alias@
1035 -host_alias=@host_alias@
1036 -target_alias=@target_alias@
1037 -DEFS=@DEFS@
1038 -ECHO_C=@ECHO_C@
1039 -ECHO_N=@ECHO_N@
1040 -ECHO_T=@ECHO_T@
1041 -LIBS=@LIBS@
1042 -build=@build@
1043 -build_cpu=@build_cpu@
1044 -build_vendor=@build_vendor@
1045 -build_os=@build_os@
1046 -host=@host@
1047 -host_cpu=@host_cpu@
1048 -host_vendor=@host_vendor@
1049 -host_os=@host_os@
1050 -target=@target@
1051 -target_cpu=@target_cpu@
1052 -target_vendor=@target_vendor@
1053 -target_os=@target_os@
1054 -INSTALL_PROGRAM=@INSTALL_PROGRAM@
1055 -INSTALL_SCRIPT=@INSTALL_SCRIPT@
1056 -INSTALL_DATA=@INSTALL_DATA@
1057 -CYGPATH_W=@CYGPATH_W@
1058 -PACKAGE=@PACKAGE@
1059 -VERSION=@VERSION@
1060 -ACLOCAL=@ACLOCAL@
1061 -AUTOCONF=@AUTOCONF@
1062 -AUTOMAKE=@AUTOMAKE@
1063 -AUTOHEADER=@AUTOHEADER@
1064 -MAKEINFO=@MAKEINFO@
1065 -AMTAR=@AMTAR@
1066 -install_sh=@install_sh@
1067 -STRIP=@STRIP@
1068 -ac_ct_STRIP=@ac_ct_STRIP@
1069 -INSTALL_STRIP_PROGRAM=@INSTALL_STRIP_PROGRAM@
1070 -mkdir_p=@mkdir_p@
1071 -AWK=@AWK@
1072 -SET_MAKE=@SET_MAKE@
1073 -am__leading_dot=@am__leading_dot@
1074 -CC=@CC@
1075 -CFLAGS=@CFLAGS@
1076 -LDFLAGS=@LDFLAGS@
1077 -CPPFLAGS=@CPPFLAGS@
1078 -ac_ct_CC=@ac_ct_CC@
1079 -EXEEXT=@EXEEXT@
1080 -OBJEXT=@OBJEXT@
1081 -DEPDIR=@DEPDIR@
1082 -am__include=@am__include@
1083 -am__quote=@am__quote@
1084 -AMDEP_TRUE=@AMDEP_TRUE@
1085 -AMDEP_FALSE=@AMDEP_FALSE@
1086 -AMDEPBACKSLASH=@AMDEPBACKSLASH@
1087 -CCDEPMODE=@CCDEPMODE@
1088 -am__fastdepCC_TRUE=@am__fastdepCC_TRUE@
1089 -am__fastdepCC_FALSE=@am__fastdepCC_FALSE@
1090 -LN_S=@LN_S@
1091 -EGREP=@EGREP@
1092 -XCU_ID=@XCU_ID@
1093 -RM=@RM@
1094 -MV=@MV@
1095 -SED=@SED@
1096 -BASH=@BASH@
1097 -PYTHON=@PYTHON@
1098 -PERL=@PERL@
1099 -BASENAME=@BASENAME@
1100 -DIRNAME=@DIRNAME@
1101 -DIALOG=@DIALOG@
1102 -WGET=@WGET@
1103 -INSTALL_INFO=@INSTALL_INFO@
1104 -SANDBOX=@SANDBOX@
1105 -PRELINK=@PRELINK@
1106 -RSYNC=@RSYNC@
1107 -CVS=@CVS@
1108 -SVN=@SVN@
1109 -GPG=@GPG@
1110 -MD5SUM=@MD5SUM@
1111 -LOGGER=@LOGGER@
1112 -FIND=@FIND@
1113 -FILE=@FILE@
1114 -READELF=@READELF@
1115 -SETFILES=@SETFILES@
1116 -FAKEROOT=@FAKEROOT@
1117 -CPP=@CPP@
1118 -ALLOCA=@ALLOCA@
1119 -portageuser=@portageuser@
1120 -portagegroup=@portagegroup@
1121 -wheelgid=@wheelgid@
1122 -rootuser=@rootuser@
1123 -DOMAIN_PREFIX=@DOMAIN_PREFIX@
1124 -ARCH=@ARCH@
1125 -PORTAGE_BASE=@PORTAGE_BASE@
1126 -INSTALL_PYTHON_SOURCES_TRUE=@INSTALL_PYTHON_SOURCES_TRUE@
1127 -INSTALL_PYTHON_SOURCES_FALSE=@INSTALL_PYTHON_SOURCES_FALSE@
1128 -BUILD_TBZ2TOOL_TRUE=@BUILD_TBZ2TOOL_TRUE@
1129 -BUILD_TBZ2TOOL_FALSE=@BUILD_TBZ2TOOL_FALSE@
1130 -BUILD_MISSINGOS_TRUE=@BUILD_MISSINGOS_TRUE@
1131 -BUILD_MISSINGOS_FALSE=@BUILD_MISSINGOS_FALSE@
1132 -LIBOBJS=@LIBOBJS@
1133 -LTLIBOBJS=@LTLIBOBJS@
1134 -configure_input=@configure_input@
1135 -srcdir=@srcdir@
1136 -abs_srcdir=@abs_srcdir@
1137 -top_srcdir=@top_srcdir@
1138 -abs_top_srcdir=@abs_top_srcdir@
1139 -builddir=@builddir@
1140 -abs_builddir=@abs_builddir@
1141 -top_builddir=@top_builddir@
1142 -abs_top_builddir=@abs_top_builddir@
1143 -INSTALL=@INSTALL@
1144 -all_configurevars=' SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S EGREP XCU_ID RM MV SED BASH PYTHON PERL BASENAME DIRNAME DIALOG WGET INSTALL_INFO SANDBOX PRELINK RSYNC CVS GPG MD5SUM LOGGER FIND FILE READELF S
1145 ETFILES FAKEROOT CPP ALLOCA portageuser portagegroup wheelgid rootuser DOMAIN_PREFIX ARCH PORTAGE_BASE INSTALL_PYTHON_SOURCES_TRUE INSTALL_PYTHON_SOURCES_FALSE BUILD_TBZ2TOOL_TRUE BUILD_TBZ2TOOL_FALSE BUILD_MISSINGOS_TRUE BUILD_MISSINGOS_FALSE LIBOBJS LTLIBOBJS configure_input srcdir abs_srcdir top_srcdir abs_top_srcdir builddir abs_builddir top_builddir abs_top_builddir INSTALL'
1146
1147 Modified: main/branches/prefix/tarball.sh
1148 ===================================================================
1149 --- main/branches/prefix/tarball.sh 2008-07-01 17:40:20 UTC (rev 10882)
1150 +++ main/branches/prefix/tarball.sh 2008-07-01 18:39:57 UTC (rev 10883)
1151 @@ -14,7 +14,7 @@
1152 export V="$1"
1153 export DEST="${TMP}/${PKG}-${V}"
1154
1155 -./tabcheck.py `grep "#\!@PYTHON@" bin/* | cut -d: -f1` `find ./ -type f -name '*.py'`
1156 +./tabcheck.py `grep "#\!@PORTAGE_PYTHON@" bin/* | cut -d: -f1` `find ./ -type f -name '*.py'`
1157
1158 if [ -e ${DEST} ]; then
1159 echo EXISTS ALREADY
1160
1161 --
1162 gentoo-commits@l.g.o mailing list