make sure we do not clash with standard names for expansion, as e.g. $BASH

svn path=/main/branches/prefix/; revision=10883

diff --git a/acinclude.m4 b/acinclude.m4
index bb73db5acb9e3c58322c52709ef231bdd6f71cbd..aca8d93f6e361cb5e96bab71c99a5380ac92f6a5 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -16,7 +16,7 @@ dnl GENTOO_PATH_PYTHON([minimum-version], [path])
 dnl author: Fabian Groffen <grobian a gentoo.org>
 AC_DEFUN([GENTOO_PATH_PYTHON],
 [
-  AC_PATH_PROG([PYTHON], [python], no, $2)
+  AC_PATH_PROG([PORTAGE_PYTHON], [python], no, $2)
 
   dnl is is there at all?
   if test "$PYTHON" = "no" ; then

diff --git a/bin/archive-conf b/bin/archive-conf
index 4caa1d564590a0ebaa0b37eb9fce222665bd6085..f32edf29625be1104f312922c441fa36c55063aa 100755 (executable)
--- a/bin/archive-conf
+++ b/bin/archive-conf
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PORTAGE_PYTHON@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/check-implicit-pointer-usage.py b/bin/check-implicit-pointer-usage.py
index a9f22a543327c539b9a8bb1e4546978d15140ebd..bf70d607d301b79710e8e251ee5c48bc1c752e23 100755 (executable)
--- a/bin/check-implicit-pointer-usage.py
+++ b/bin/check-implicit-pointer-usage.py
@@ -1,4 +1,4 @@
-#!@PYTHON@ -O
+#!@PORTAGE_PYTHON@ -O
 
 # Ripped from HP and updated from Debian
 # Update by Gentoo to support unicode output

diff --git a/bin/chkcontents b/bin/chkcontents
index e38bdedeca3ad8f8ee715081d209d05de67fcf98..4bdf34c2ec4271917bd175408bd28c2c555fed89 100755 (executable)
--- a/bin/chkcontents
+++ b/bin/chkcontents
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PORTAGE_PYTHON@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/clean_locks b/bin/clean_locks
index bae8a975901d26c56bd4c49f756b24a7694d8268..26add5adf5239cd764f61fe301edbea1ab2a53f3 100755 (executable)
--- a/bin/clean_locks
+++ b/bin/clean_locks
@@ -1,4 +1,4 @@
-#!@PYTHON@ -O
+#!@PORTAGE_PYTHON@ -O
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index a8159cdc96a9be91003a89f5d4fa37d6831095d5..557a5073481a6ed7975908db886b743f1024216f 100755 (executable)
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -1,4 +1,4 @@
-#!@PYTHON@ -O
+#!@PORTAGE_PYTHON@ -O
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/dobin b/bin/dobin
index 164ff644aadfbdac7f2210db0861071c110b2880..57a07a809abb074329b916826426a6f954138c79 100755 (executable)
--- a/bin/dobin
+++ b/bin/dobin
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/doconfd b/bin/doconfd
index 0bbcab90e336cb3aa28ba0798f3b629bd1693a16..683bef29c3657f313a0c7eab52862a5f4c62f3cc 100755 (executable)
--- a/bin/doconfd
+++ b/bin/doconfd
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/dodir b/bin/dodir
index 4c335d57ef205e336b9d9e777734e838ea34aafb..62547090cb0c6b780f900569592c4f63862fd334 100755 (executable)
--- a/bin/dodir
+++ b/bin/dodir
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/dodoc b/bin/dodoc
index 01fe8c538b7a65dc3e41754377b1f4a51f9b8a09..343ee91f314f8d3070fb5c8fe98834b52dea6a75 100755 (executable)
--- a/bin/dodoc
+++ b/bin/dodoc
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/doenvd b/bin/doenvd
index 3283cd475db88257286bb19543b2e467b4594fef..920681ea23f6b83aa50ff0f41068d3e52b72cc7f 100755 (executable)
--- a/bin/doenvd
+++ b/bin/doenvd
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/doexe b/bin/doexe
index caed3e735d8f1e45f046e7d87428010ea4989401..cfb6a72e29fd4e2b8c173eb7ea7caa1f79873829 100755 (executable)
--- a/bin/doexe
+++ b/bin/doexe
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/dohard b/bin/dohard
index 0eb3a781937076d59dbec00bbc2d3e8565aeb100..33813c7e9c861e769d19526433b0db986351a1d6 100755 (executable)
--- a/bin/dohard
+++ b/bin/dohard
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/dohtml b/bin/dohtml
index db5aaaba67a98c911f6b99de37d8d973e6f4fde1..6bc41ff0251200d87f2c28943eab795164029d59 100755 (executable)
--- a/bin/dohtml
+++ b/bin/dohtml
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PORTAGE_PYTHON@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/doinfo b/bin/doinfo
index b40fd29e5514321d0c1ff32f0807174749aa62ba..c263a093a6b4cbdab8fef63da3a856da3d109395 100755 (executable)
--- a/bin/doinfo
+++ b/bin/doinfo
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/doinitd b/bin/doinitd
index bd8d3ce29fe4bf1c34066042ccd0868360adf3db..527874dae2cac019cc4c5b3ede55c9711c794785 100755 (executable)
--- a/bin/doinitd
+++ b/bin/doinitd
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/doins b/bin/doins
index 9b2d9f4135e1264ecae21d8a77bb54c1924ed655..009ae47edb53a24d74431ffffc58b206e295ea90 100755 (executable)
--- a/bin/doins
+++ b/bin/doins
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/dolib b/bin/dolib
index 190ec26d532bd774c773d66668009068a86f5ba7..95d764037c54cef92891494e9432be42a3c34b7a 100755 (executable)
--- a/bin/dolib
+++ b/bin/dolib
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/dolib.a b/bin/dolib.a
index 22c5705878605a998fec2426e67e5188b09df955..f65f9423f28b6cf792d211ef62e11deb4d330bfb 100755 (executable)
--- a/bin/dolib.a
+++ b/bin/dolib.a
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/dolib.so b/bin/dolib.so
index 63baaae00ab3da4dbee50c011fd75b33d7d38623..0732ca5d3ee4dd8659315db75b76a061b179ce1b 100755 (executable)
--- a/bin/dolib.so
+++ b/bin/dolib.so
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/doman b/bin/doman
index 1102c4d075235576a4339dd20cd9cd4b59d6b836..0ee656befb145114e66ca945286c6ec6a0dfa249 100755 (executable)
--- a/bin/doman
+++ b/bin/doman
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/domo b/bin/domo
index dc3f7d00ffbb2d0ca32562ca0cd1dfbb2c7e6112..9f41c360de68902fd12ae17743430ecf424f1694 100755 (executable)
--- a/bin/domo
+++ b/bin/domo
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/dosbin b/bin/dosbin
index c2b1eb06369b51099fe057443dc61b51f51324fd..9da3c3397cfb7797d8b4512166377cda2c406b18 100755 (executable)
--- a/bin/dosbin
+++ b/bin/dosbin
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/dosed b/bin/dosed
index 137457a282cad1179e0834898cc12d99617b5a8d..951f581d7756d51284ae1e3ea6af0e1df8ebf5b0 100755 (executable)
--- a/bin/dosed
+++ b/bin/dosed
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/dosym b/bin/dosym
index 8d0acd563251fc956dc6b838b4f7a48496e8dadb..32043d24751f9ea660a1733da089738069fbca45 100755 (executable)
--- a/bin/dosym
+++ b/bin/dosym
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/ebuild b/bin/ebuild
index 1f6088654e850c2020211db39e5026d3c0e0e703..4a4f0a0345c6d09eef2c8ba6c1adaa85d15e4c0b 100755 (executable)
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -1,4 +1,4 @@
-#!@PYTHON@ -O
+#!@PORTAGE_PYTHON@ -O
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-src/portage/bin/ebuild,v 1.18.2.3 2005/05/07 04:32:59 ferringb Exp $

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 46060a9e01a5d0488706bc5e5b015095ae75491b..f0b9312eb827d45258120c3c581081b806241cf4 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/ecompress b/bin/ecompress
index db007f0bfef97dca83bd66d55399794a74def74b..4c73689f0511c9df8fe090a5c07c87671230400f 100755 (executable)
--- a/bin/ecompress
+++ b/bin/ecompress
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/ecompressdir b/bin/ecompressdir
index 7933322a30ec9dfac799f3f558e89300284e53dd..c7572410e3df262a146b3bf1ca7fabf0b5ffb3a8 100755 (executable)
--- a/bin/ecompressdir
+++ b/bin/ecompressdir
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/emaint b/bin/emaint
index 0f4f7b417e584bc86d29e1c387bc98232dca5c02..ab8e2a58e972697720b13c1ba4adbf1b89bf1610 100755 (executable)
--- a/bin/emaint
+++ b/bin/emaint
@@ -1,4 +1,4 @@
-#!@PYTHON@ -O
+#!@PORTAGE_PYTHON@ -O
 # vim: noet :
 import os
 import re

diff --git a/bin/emake b/bin/emake
index 7fc8e7ea78610822051cbd2937da0d6a4e7b6c6d..a5abf9c108998616989c794196f20728a1fb2a8a 100755 (executable)
--- a/bin/emake
+++ b/bin/emake
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/emerge b/bin/emerge
index 16ca57d29510de4cbe62e57310a263e0051f5c6b..6988d519d34a552ffccfc514bd6dbf09f394e94d 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PORTAGE_PYTHON@
 # Copyright Gentoo Foundation 2006
 # Portage Emerge bits
 # $Id$

diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 86982b77ccc5bd8bf253442a9cb4391714eb834f..51be0d85913d2d9c30ab5031911a53c65e879d03 100755 (executable)
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/env-update b/bin/env-update
index 53019b2fbedf69772f112865a8b110727be01569..545367074b6a8ab0ff427c62c5cf0bff914212aa 100755 (executable)
--- a/bin/env-update
+++ b/bin/env-update
@@ -1,4 +1,4 @@
-#!@PYTHON@ -O
+#!@PORTAGE_PYTHON@ -O
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/env-update.sh b/bin/env-update.sh
index f68af2a5f337be5fbb3c117a3f073089fa320fb3..ac3d293e05dd99bdb5b7e19040f0c395e8c43862 100755 (executable)
--- a/bin/env-update.sh
+++ b/bin/env-update.sh
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/eprefixify b/bin/eprefixify
index 8b9f773d32510764b75adc544611e3feae5e79ed..835e785dc103b712ad8262fed27c2b6aecc69fc8 100755 (executable)
--- a/bin/eprefixify
+++ b/bin/eprefixify
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/etc-update b/bin/etc-update
index e554d44679211cb6723bfdd3d58f19aa2585f93f..8eeb484c89545c07777eeb5633896bacf05cf0d5 100755 (executable)
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/filter-bash-environment.py b/bin/filter-bash-environment.py
index 323600916a03dac09b61c9a11d998ba9ee9a94ce..e775ff3a8ecd33d729858182b4800a74626dc12d 100755 (executable)
--- a/bin/filter-bash-environment.py
+++ b/bin/filter-bash-environment.py
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PORTAGE_PYTHON@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/find-requires b/bin/find-requires
index 6c187558ccdfe9a8dd12927812f47ae7bb775e99..91951a8a5692eb1d6c4c80568900fba2935fd7a1 100755 (executable)
--- a/bin/find-requires
+++ b/bin/find-requires
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/fix-db.py b/bin/fix-db.py
index 5829412eb556356d572c4cba0f6c4117d86416bd..aa2bd756e0fc78809e8e14afaaa2e181192e0ce1 100755 (executable)
--- a/bin/fix-db.py
+++ b/bin/fix-db.py
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PORTAGE_PYTHON@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/fixdbentries b/bin/fixdbentries
index de5a73dbce00eb56a42100f3202d05aa126a78f2..d4e2888219950e723d9932a2ae34bdb87ffcb8cc 100755 (executable)
--- a/bin/fixdbentries
+++ b/bin/fixdbentries
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/fixpackages b/bin/fixpackages
index 756da6126cd0bc147ac0b2ffcc9a1daaaad51367..381098081969afcf24d2470fc285e31ef6846faf 100755 (executable)
--- a/bin/fixpackages
+++ b/bin/fixpackages
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PORTAGE_PYTHON@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/fowners b/bin/fowners
index 424add968465f78f7a6417358ddb2a4e8e4aa745..d71e62a8bd29d225fd103e738ba426970810d4bd 100755 (executable)
--- a/bin/fowners
+++ b/bin/fowners
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/fperms b/bin/fperms
index cf28a2aabb5c9e0c4ba8446ebad43a43456f2e19..88782d17382c72f7c4fad9f1bea26ed9aeacb614 100755 (executable)
--- a/bin/fperms
+++ b/bin/fperms
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/glsa-check b/bin/glsa-check
index 1e3533d1ea7f7aae7b47cd0253fe5aca8171a8a6..23565fc6fd9d3fa7e567920b6c12d311c17dfe0b 100644 (file)
--- a/bin/glsa-check
+++ b/bin/glsa-check
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PORTAGE_PYTHON@
 
 # $Header: $
 # This program is licensed under the GPL, version 2

diff --git a/bin/md5check.py b/bin/md5check.py
index 0b8395078758fafbaf69ad1926f5e1c69ac2332a..5976c143483ea7e0bd16695ac6d3b4ad5ca233e8 100755 (executable)
--- a/bin/md5check.py
+++ b/bin/md5check.py
@@ -1,4 +1,4 @@
-#!@PYTHON@ -O
+#!@PORTAGE_PYTHON@ -O
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/md5check.sh b/bin/md5check.sh
index 354ea46fafb77854303da2f7def42536fb2060a2..05cc59615a5ee76b405230f5704f36d0d5d5e4d1 100755 (executable)
--- a/bin/md5check.sh
+++ b/bin/md5check.sh
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index deb51422a752fadf2ed20d5abb4b132dfa3ed0db..01a9e0d63d631aafbecd1cc35f5fc84b8edcab27 100644 (file)
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header$

diff --git a/bin/newbin b/bin/newbin
index 4e4a9aaf027ea1aa984381b2c932bdaaed6f829f..b45dd849719a38620564fb82f954ac098eb7ed49 100755 (executable)
--- a/bin/newbin
+++ b/bin/newbin
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/newconfd b/bin/newconfd
index c898c347948e05b23ca04ec86e42327537f55f60..9ce6d406961102ca53db9170361431d04b9e8321 100755 (executable)
--- a/bin/newconfd
+++ b/bin/newconfd
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/newdoc b/bin/newdoc
index 4e4da01f2f6e1f77196febab67bb323cac0e8330..8b41093f48ff8506016cf337eaef379fde60cf2c 100755 (executable)
--- a/bin/newdoc
+++ b/bin/newdoc
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/newenvd b/bin/newenvd
index feea56ab78f061801d7420998cbbe5918541229e..ece766bf3f347d06049bac103fd0337be0bf76c0 100755 (executable)
--- a/bin/newenvd
+++ b/bin/newenvd
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/newexe b/bin/newexe
index e7b65f005ac5888216bb9151f82876d4d42176b0..6bd52418c09798d505134c3ec9eb909a0fd4331c 100755 (executable)
--- a/bin/newexe
+++ b/bin/newexe
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/newinitd b/bin/newinitd
index dc017c934a062c658ffd12f16348fe8a14ed62cd..5ab06d3afdd440dde1bc355bf64a099cef68b8c4 100755 (executable)
--- a/bin/newinitd
+++ b/bin/newinitd
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/newins b/bin/newins
index f6ba21b8c127c658d2af3ced3b28a2fb4808ad52..a0e58bed8a568be93f089cb28dc64a813dd4cf44 100755 (executable)
--- a/bin/newins
+++ b/bin/newins
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/newlib.a b/bin/newlib.a
index 3a745ebeaa5f507e9d5d0f25c3713a4769de3b1d..f26abfbcb99c4626f39dc75478f052c73cdaad34 100755 (executable)
--- a/bin/newlib.a
+++ b/bin/newlib.a
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/newlib.so b/bin/newlib.so
index 84bffc733956714f9d08543de75778a4c9a243da..558bc2fc0d9aaf731a8e68579bfa9146c7b89156 100755 (executable)
--- a/bin/newlib.so
+++ b/bin/newlib.so
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/newman b/bin/newman
index d686767a0d9eef52ab8dff2b1017c56b24494e96..5273fc64c266c2da6d9082d04816912d3ac691d7 100755 (executable)
--- a/bin/newman
+++ b/bin/newman
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/newsbin b/bin/newsbin
index e030e1fce65282ea3cc493039fa5e04ba1c50fea..74acaf1705c70576e67095097b9e6fa53b33a5d1 100755 (executable)
--- a/bin/newsbin
+++ b/bin/newsbin
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/pemerge.py b/bin/pemerge.py
index c73cdbe106afa0e1e82be16f40f8f92148ff895d..8a578e7b6fbe9a4bb2475136efca41130da20a66 100755 (executable)
--- a/bin/pemerge.py
+++ b/bin/pemerge.py
@@ -1,4 +1,4 @@
-#!@PYTHON@ -O
+#!@PORTAGE_PYTHON@ -O
 
 import profile,time,sys,os
 sys.path = ["@PORTAGE_BASE@/bin","@PORTAGE_BASE@/pym"]+sys.path

diff --git a/bin/pkgname b/bin/pkgname
index e50b35352a606baeeddba2ce35b963e82cc064a6..1d363719470649541ed8c68c58d088df4b9243b8 100755 (executable)
--- a/bin/pkgname
+++ b/bin/pkgname
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PORTAGE_PYTHON@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/portage_gpg_update.sh b/bin/portage_gpg_update.sh
index 2d8b4d29f42936d57aacbebd23efd484fd6ffb56..b878b80f7d41463ecbcbe6dc3d8e4af776bdaffb 100755 (executable)
--- a/bin/portage_gpg_update.sh
+++ b/bin/portage_gpg_update.sh
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/portageq b/bin/portageq
index e5b36bbbc2f5dcaab420d96384791a9a6a1b6b3b..3acba5079e08eb2d1a2ed673a7d5567db93b47df 100755 (executable)
--- a/bin/portageq
+++ b/bin/portageq
@@ -1,4 +1,4 @@
-#!@PYTHON@ -O
+#!@PORTAGE_PYTHON@ -O
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/prepall b/bin/prepall
index 009ac6db2e4dd8058a1c1063fc5f2b100cbaa40a..dfaacfd3c9786ddf5c010215bd7777169b35197d 100755 (executable)
--- a/bin/prepall
+++ b/bin/prepall
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/prepalldocs b/bin/prepalldocs
index 4da754b925c2d24c8460d24a34dc3aa5bc1c08e5..6dbdaa848fdf28b515b4b6be03123631e58d40a6 100755 (executable)
--- a/bin/prepalldocs
+++ b/bin/prepalldocs
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/prepallinfo b/bin/prepallinfo
index 844816451e4ba70c1bbbd9b8e7f8ff0c70dacda2..6bd2f619f5a01f2c4c6f90b6d89fa2f4e50dbe11 100755 (executable)
--- a/bin/prepallinfo
+++ b/bin/prepallinfo
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/prepallman b/bin/prepallman
index a411d18b33ac0693cec6aa4ba5aab099e53604d1..353b31f357fa7f2d2b40d6edc9b767ef2e77424e 100755 (executable)
--- a/bin/prepallman
+++ b/bin/prepallman
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/prepallstrip b/bin/prepallstrip
index 787e18aba7ada25a8b9d39793c3ca8c1c58103ac..6787f7a7df62b3b6f3bfd171d688871583ce9d86 100755 (executable)
--- a/bin/prepallstrip
+++ b/bin/prepallstrip
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/prepinfo b/bin/prepinfo
index cfb8fc799c5394b458c64ab2f9131673fd1a6221..f294a3c601c972139c789fb402d5a19f0c2375f9 100755 (executable)
--- a/bin/prepinfo
+++ b/bin/prepinfo
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/preplib b/bin/preplib
index 3c6e3b0b549720bbf81efa6933db5b026323f64a..dafd77662726ace8e64e73975ac737bd08b01ff1 100755 (executable)
--- a/bin/preplib
+++ b/bin/preplib
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/prepman b/bin/prepman
index 59abffe6c5bb7321bafc17a5664f5b1495a28aab..ced966240b895993e5c2a1bab8b692117b0d8bcf 100755 (executable)
--- a/bin/prepman
+++ b/bin/prepman
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/prepstrip b/bin/prepstrip
index 5b7a865db2f7b8dfbff1d6de68e5380ed15b50c2..8d8dceba9a4788a6166073050118daf64191bb6d 100755 (executable)
--- a/bin/prepstrip
+++ b/bin/prepstrip
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/quickpkg b/bin/quickpkg
index 419e40f96ac9b102bd0739f0eb730fdd1006e59b..44b1a4f39cc0d590d7e6d67319fb95a3c6b156bd 100755 (executable)
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PORTAGE_PYTHON@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/regenworld b/bin/regenworld
index fe88a24103ba72b4f05852d33b2b7f602132ffbb..4c831a01dfabe327a064b4c4787b3aa944c172cf 100755 (executable)
--- a/bin/regenworld
+++ b/bin/regenworld
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PORTAGE_PYTHON@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/repoman b/bin/repoman
index 66eed48b7d1b01af2930a2bfaa0d54e2eb61d62b..0eec50d6c63b8829a1e2d8f7d29e329a793af17d 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -1,4 +1,4 @@
-#!@PYTHON@ -O
+#!@PORTAGE_PYTHON@ -O
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/sed b/bin/sed
index fb0148023da8ce5145ed0353500ae1c2620aa90f..cc92ff13eb0157882d9e5bf41cfb26565f91c337 100755 (executable)
--- a/bin/sed
+++ b/bin/sed
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@PORTAGE_BASH@
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/xpak b/bin/xpak
index 0a714fa8f25e2054e6a80f3cb7250447f242e03a..c41c184492bf29883fa297336d265f839b747f9e 100755 (executable)
--- a/bin/xpak
+++ b/bin/xpak
@@ -1,4 +1,4 @@
-#!@PYTHON@ -O
+#!@PORTAGE_PYTHON@ -O
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/configure.in b/configure.in
index 6ea9037e5078284aabb7f51f9f238543b86f0981..0ffb90b24671725da564f92d4d7be8f61380ffee 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -38,13 +38,12 @@ AC_PATH_PROG(MV, [mv], no)
 AC_PATH_PROG(BASENAME, [basename], no)
 AC_PATH_PROG(DIRNAME, [dirname], no)
 dnl avoid bash internal variable messing up things here
-unset BASH
-GENTOO_PATH_GNUPROG(BASH, [bash])
-GENTOO_PATH_GNUPROG(SED, [sed])
-GENTOO_PATH_GNUPROG(WGET, [wget])
-GENTOO_PATH_GNUPROG(FIND, [find])
-GENTOO_PATH_GNUPROG(XARGS, [xargs])
-GENTOO_PATH_GNUPROG(GREP, [grep])
+GENTOO_PATH_GNUPROG(PORTAGE_BASH, [bash])
+GENTOO_PATH_GNUPROG(PORTAGE_SED, [sed])
+GENTOO_PATH_GNUPROG(PORTAGE_WGET, [wget])
+GENTOO_PATH_GNUPROG(PORTAGE_FIND, [find])
+GENTOO_PATH_GNUPROG(PORTAGE_XARGS, [xargs])
+GENTOO_PATH_GNUPROG(PORTAGE_GREP, [grep])
 
 dnl Checks for header files.
 AC_HEADER_STDC

diff --git a/pym/Makefile.in b/pym/Makefile.in
index 742eed4b7a02f6bf4f4e49785d0661549f5aef3c..4629a86e3e51666624bb28a7675139b6b6f6a674 100644 (file)
--- a/pym/Makefile.in
+++ b/pym/Makefile.in
@@ -2,7 +2,7 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 sysconfdir = @sysconfdir@
 libdir = @libdir@
-PYTHON = @PYTHON@
+PYTHON = @PORTAGE_PYTHON@
 
 srcdir=@srcdir@
 top_builddir=@top_builddir@

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index d3121aaa9116565b98b60c5ec15731e9b40d9abb..4a9b9c572cd1b55d1e73c51ca5e304b44e66ed05 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -1,4 +1,4 @@
-#!@PYTHON@ -O
+#!@PORTAGE_PYTHON@ -O
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/subst-install.in b/subst-install.in
index 2d45d88b6cfa39ba0740dba5a681db5419c173a2..bc50065ed8a3a27ac965bdd51b25e17ec4ab4cfd 100644 (file)
--- a/subst-install.in
+++ b/subst-install.in
@@ -1,6 +1,6 @@
-#! @SHELL@
+#!@BASH@
 
-SED="@SED@"
+SED="@PORTAGE_SED@"
 RM="@RM@"
 BASENAME="@BASENAME@"
 DIRNAME="@DIRNAME@"

diff --git a/subst-install.vars.in.in b/subst-install.vars.in.in
deleted file mode 100644 (file)
index 149e44b..0000000
--- a/subst-install.vars.in.in
+++ /dev/null
@@ -1,133 +0,0 @@
-SHELL=@SHELL@
-PATH_SEPARATOR=@PATH_SEPARATOR@
-PACKAGE_NAME=@PACKAGE_NAME@
-PACKAGE_TARNAME=@PACKAGE_TARNAME@
-PACKAGE_VERSION=@PACKAGE_VERSION@
-PACKAGE_STRING=@PACKAGE_STRING@
-PACKAGE_BUGREPORT=@PACKAGE_BUGREPORT@
-exec_prefix=@exec_prefix@
-prefix=@prefix@
-program_transform_name=@program_transform_name@
-bindir=@bindir@
-sbindir=@sbindir@
-libexecdir=@libexecdir@
-datadir=@datadir@
-sysconfdir=@sysconfdir@
-sharedstatedir=@sharedstatedir@
-localstatedir=@localstatedir@
-libdir=@libdir@
-includedir=@includedir@
-oldincludedir=@oldincludedir@
-infodir=@infodir@
-mandir=@mandir@
-build_alias=@build_alias@
-host_alias=@host_alias@
-target_alias=@target_alias@
-DEFS=@DEFS@
-ECHO_C=@ECHO_C@
-ECHO_N=@ECHO_N@
-ECHO_T=@ECHO_T@
-LIBS=@LIBS@
-build=@build@
-build_cpu=@build_cpu@
-build_vendor=@build_vendor@
-build_os=@build_os@
-host=@host@
-host_cpu=@host_cpu@
-host_vendor=@host_vendor@
-host_os=@host_os@
-target=@target@
-target_cpu=@target_cpu@
-target_vendor=@target_vendor@
-target_os=@target_os@
-INSTALL_PROGRAM=@INSTALL_PROGRAM@
-INSTALL_SCRIPT=@INSTALL_SCRIPT@
-INSTALL_DATA=@INSTALL_DATA@
-CYGPATH_W=@CYGPATH_W@
-PACKAGE=@PACKAGE@
-VERSION=@VERSION@
-ACLOCAL=@ACLOCAL@
-AUTOCONF=@AUTOCONF@
-AUTOMAKE=@AUTOMAKE@
-AUTOHEADER=@AUTOHEADER@
-MAKEINFO=@MAKEINFO@
-AMTAR=@AMTAR@
-install_sh=@install_sh@
-STRIP=@STRIP@
-ac_ct_STRIP=@ac_ct_STRIP@
-INSTALL_STRIP_PROGRAM=@INSTALL_STRIP_PROGRAM@
-mkdir_p=@mkdir_p@
-AWK=@AWK@
-SET_MAKE=@SET_MAKE@
-am__leading_dot=@am__leading_dot@
-CC=@CC@
-CFLAGS=@CFLAGS@
-LDFLAGS=@LDFLAGS@
-CPPFLAGS=@CPPFLAGS@
-ac_ct_CC=@ac_ct_CC@
-EXEEXT=@EXEEXT@
-OBJEXT=@OBJEXT@
-DEPDIR=@DEPDIR@
-am__include=@am__include@
-am__quote=@am__quote@
-AMDEP_TRUE=@AMDEP_TRUE@
-AMDEP_FALSE=@AMDEP_FALSE@
-AMDEPBACKSLASH=@AMDEPBACKSLASH@
-CCDEPMODE=@CCDEPMODE@
-am__fastdepCC_TRUE=@am__fastdepCC_TRUE@
-am__fastdepCC_FALSE=@am__fastdepCC_FALSE@
-LN_S=@LN_S@
-EGREP=@EGREP@
-XCU_ID=@XCU_ID@
-RM=@RM@
-MV=@MV@
-SED=@SED@
-BASH=@BASH@
-PYTHON=@PYTHON@
-PERL=@PERL@
-BASENAME=@BASENAME@
-DIRNAME=@DIRNAME@
-DIALOG=@DIALOG@
-WGET=@WGET@
-INSTALL_INFO=@INSTALL_INFO@
-SANDBOX=@SANDBOX@
-PRELINK=@PRELINK@
-RSYNC=@RSYNC@
-CVS=@CVS@
-SVN=@SVN@
-GPG=@GPG@
-MD5SUM=@MD5SUM@
-LOGGER=@LOGGER@
-FIND=@FIND@
-FILE=@FILE@
-READELF=@READELF@
-SETFILES=@SETFILES@
-FAKEROOT=@FAKEROOT@
-CPP=@CPP@
-ALLOCA=@ALLOCA@
-portageuser=@portageuser@
-portagegroup=@portagegroup@
-wheelgid=@wheelgid@
-rootuser=@rootuser@
-DOMAIN_PREFIX=@DOMAIN_PREFIX@
-ARCH=@ARCH@
-PORTAGE_BASE=@PORTAGE_BASE@
-INSTALL_PYTHON_SOURCES_TRUE=@INSTALL_PYTHON_SOURCES_TRUE@
-INSTALL_PYTHON_SOURCES_FALSE=@INSTALL_PYTHON_SOURCES_FALSE@
-BUILD_TBZ2TOOL_TRUE=@BUILD_TBZ2TOOL_TRUE@
-BUILD_TBZ2TOOL_FALSE=@BUILD_TBZ2TOOL_FALSE@
-BUILD_MISSINGOS_TRUE=@BUILD_MISSINGOS_TRUE@
-BUILD_MISSINGOS_FALSE=@BUILD_MISSINGOS_FALSE@
-LIBOBJS=@LIBOBJS@
-LTLIBOBJS=@LTLIBOBJS@
-configure_input=@configure_input@
-srcdir=@srcdir@
-abs_srcdir=@abs_srcdir@
-top_srcdir=@top_srcdir@
-abs_top_srcdir=@abs_top_srcdir@
-builddir=@builddir@
-abs_builddir=@abs_builddir@
-top_builddir=@top_builddir@
-abs_top_builddir=@abs_top_builddir@
-INSTALL=@INSTALL@
-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 SETFILES 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'

diff --git a/tarball.sh b/tarball.sh
index c1d0799652ce61fe489509ea82ea3f90fbd109bf..f1d67afff0112eb84e9cd6c5f7c7a491541b1740 100755 (executable)
--- a/tarball.sh
+++ b/tarball.sh
@@ -14,7 +14,7 @@ export TMP="/var/tmp"
 export V="$1"
 export DEST="${TMP}/${PKG}-${V}"
 
-./tabcheck.py `grep "#\!@PYTHON@" bin/* | cut -d: -f1` `find ./ -type f -name '*.py'`
+./tabcheck.py `grep "#\!@PORTAGE_PYTHON@" bin/* | cut -d: -f1` `find ./ -type f -name '*.py'`
 
 if [ -e ${DEST} ]; then
        echo EXISTS ALREADY