Fix bug detected by mattmatteh in #gentoo-alt, the prefix version of

doins is missing the isolated-functions.sh include.  This prevents
dieing on a missing vecho, instead of the real error message.

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

diff --git a/bin/archive-conf b/bin/archive-conf
index 2c424355f1c0071ab2314d925fd158ca85f253e1..f5065cc14da37a86e8480d6584742d194e37573b 100755 (executable)
--- a/bin/archive-conf
+++ b/bin/archive-conf
@@ -1,7 +1,7 @@
 #!@PYTHON@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/archive-conf,v 1.7 2004/10/04 13:57:36 vapier Exp $
+# $Id$
 
 #
 # archive-conf -- save off a config file in the dispatch-conf archive dir

diff --git a/bin/chkcontents b/bin/chkcontents
index a4dec42c24ae64eeee712bc79b0580be4fce71fb..a1ee672edb3aec174263aae3f2a3d80a555db444 100755 (executable)
--- a/bin/chkcontents
+++ b/bin/chkcontents
@@ -1,7 +1,7 @@
 #!@PYTHON@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/chkcontents,v 1.11 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 # Very simple program to compare the md5sums of a package as listed
 # in VDB_PATH/category/package/CONTENTS with the md5sums of the

diff --git a/bin/clean_locks b/bin/clean_locks
index 176370e5f74cc67610bcf0993e854de7373ba3be..466e4df96957a0fc2f8165cfdc04e9d207b493a8 100755 (executable)
--- a/bin/clean_locks
+++ b/bin/clean_locks
@@ -1,7 +1,7 @@
 #!@PYTHON@ -O
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: clean_locks 5784 2007-01-25 17:25:47Z genone $
+# $Id$
 
 import os,sys,errno
 try:

diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 48b38d207c146ed13378030383e329c696a77d34..324f09270e23d6b6bbcaad7c1a4abacfbb4ef68f 100755 (executable)
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -1,7 +1,7 @@
 #!@PYTHON@ -O
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: $
+# $Id$
 
 #
 # dispatch-conf -- Integrate modified configs, post-emerge

diff --git a/bin/dobin b/bin/dobin
index 868b97df2a21be0786699f4d520a40b01bdfc333..164ff644aadfbdac7f2210db0861071c110b2880 100755 (executable)
--- a/bin/dobin
+++ b/bin/dobin
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: $
+# $Id$
 
 source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
 

diff --git a/bin/doconfd b/bin/doconfd
index 4ee72ad4c8b38c4de816b32a871b0a3a6fa0c9ec..0bbcab90e336cb3aa28ba0798f3b629bd1693a16 100755 (executable)
--- a/bin/doconfd
+++ b/bin/doconfd
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/doconfd,v 1.2.2.1 2005/01/13 04:51:56 vapier Exp $
+# $Id$
 
 if [[ $# -lt 1 ]] ; then
        echo "$0: at least one argument needed" 1>&2

diff --git a/bin/doenvd b/bin/doenvd
index 038a583bfd8b0fccc1e543643c9847094af8ff8f..3283cd475db88257286bb19543b2e467b4594fef 100755 (executable)
--- a/bin/doenvd
+++ b/bin/doenvd
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/doenvd,v 1.2.2.1 2005/01/13 04:51:56 vapier Exp $
+# $Id$
 
 if [[ $# -lt 1 ]] ; then
        echo "$0: at least one argument needed" 1>&2

diff --git a/bin/doexe b/bin/doexe
index 16916e21398b5bcdd1784aa9f7726530e75c1d47..caed3e735d8f1e45f046e7d87428010ea4989401 100755 (executable)
--- a/bin/doexe
+++ b/bin/doexe
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: $
+# $Id$
 
 source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
 

diff --git a/bin/dohard b/bin/dohard
index 52ffae0875d1ab20ea6aa7da31fbd601ed9a8c7c..0eb3a781937076d59dbec00bbc2d3e8565aeb100 100755 (executable)
--- a/bin/dohard
+++ b/bin/dohard
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: $
+# $Id$
 
 if [[ $# -ne 2 ]] ; then
        echo "$0: two arguments needed" 1>&2

diff --git a/bin/dohtml b/bin/dohtml
index aaebb716930aeb50ac26394f5f2411440b9a69cf..f49e754c7b85462c4898e4e080027a36c139c16a 100755 (executable)
--- a/bin/dohtml
+++ b/bin/dohtml
@@ -1,7 +1,7 @@
 #!@PYTHON@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/dohtml,v 1.14.2.1 2004/10/27 14:39:29 jstubbs Exp $
+# $Id$
 
 #
 # Typical usage:

diff --git a/bin/doinfo b/bin/doinfo
index d38de9be065592469f4ab21aad6e48f29bdccc6a..b40fd29e5514321d0c1ff32f0807174749aa62ba 100755 (executable)
--- a/bin/doinfo
+++ b/bin/doinfo
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/doinfo,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 if [[ -z $1 ]] ; then
        vecho "${0##*/}: at least one argument needed"

diff --git a/bin/doinitd b/bin/doinitd
index dcfcf734ab896b95e44387e153a74c08ec22ad10..bd8d3ce29fe4bf1c34066042ccd0868360adf3db 100755 (executable)
--- a/bin/doinitd
+++ b/bin/doinitd
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/doinitd,v 1.2.2.1 2005/01/13 04:51:56 vapier Exp $
+# $Id$
 
 if [[ $# -lt 1 ]] ; then
        echo "$0: at least one argument needed" 1>&2

diff --git a/bin/doins b/bin/doins
index 1a6fca03a3bcac5669baa4b393423584720480aa..16a1b85a1424459adf85c620b5c8274e8c885924 100755 (executable)
--- a/bin/doins
+++ b/bin/doins
@@ -1,7 +1,9 @@
 #!@BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: $
+# $Id$
+
+source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [ $# -lt 1 ] ; then
        echo "${0##*/}: at least one argument needed" 1>&2

diff --git a/bin/dolib b/bin/dolib
index 67261a57a412c1e123713e622287ab724a1fb07c..190ec26d532bd774c773d66668009068a86f5ba7 100755 (executable)
--- a/bin/dolib
+++ b/bin/dolib
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/dolib,v 1.8.2.2 2005/01/12 02:07:15 carpaski Exp $
+# $Id$
 
 # Setup ABI cruft
 LIBDIR_VAR="LIBDIR_${ABI}"

diff --git a/bin/dolib.a b/bin/dolib.a
index ffe0c9afa34b0043461d61e77018a5f4636d368c..a1cc01641d4c03455df7082898a09c14c9c048be 100755 (executable)
--- a/bin/dolib.a
+++ b/bin/dolib.a
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/dolib.a,v 1.8 2004/10/10 10:07:20 carpaski Exp $
+# $Id$
 
 exec env LIBOPTIONS="-m 0644" \
        dolib "$@"

diff --git a/bin/dolib.so b/bin/dolib.so
index bb7ece710c27ada7036bcc3a2cf60650bafa6eec..6dae7d052bbd1ffe12eca8193baf490f8aee5de8 100755 (executable)
--- a/bin/dolib.so
+++ b/bin/dolib.so
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/dolib.so,v 1.12 2004/10/10 10:07:20 carpaski Exp $
+# $Id$
 
 exec env LIBOPTIONS="-m 0755" \
        dolib "$@"

diff --git a/bin/domo b/bin/domo
index 7330938ee40264a0236323db87614da74e1184ef..dc3f7d00ffbb2d0ca32562ca0cd1dfbb2c7e6112 100755 (executable)
--- a/bin/domo
+++ b/bin/domo
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/domo,v 1.6 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 mynum=${#}
 if [ ${mynum} -lt 1 ] ; then

diff --git a/bin/dosbin b/bin/dosbin
index c1a9ad6419d399dabe3d1bfa8f5720fa324dff6f..e454aa777138f349502cd73bb4ebe9107f74709b 100755 (executable)
--- a/bin/dosbin
+++ b/bin/dosbin
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/dosbin,v 1.11 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 if [[ $# -lt 1 ]] ; then
        echo "$0: at least one argument needed" 1>&2

diff --git a/bin/dosed b/bin/dosed
index 484a380541080318c63fe65820d718706eaceb71..137457a282cad1179e0834898cc12d99617b5a8d 100755 (executable)
--- a/bin/dosed
+++ b/bin/dosed
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/dosed,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 mysed="s:${ED}::g"
 

diff --git a/bin/dosym b/bin/dosym
index 9b84e4630e9cbac4bde0112f7df74df6df2bb096..9d924205f2f1348ba8000b819de09abc32c0246c 100755 (executable)
--- a/bin/dosym
+++ b/bin/dosym
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/dosym,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 if [[ $# -ne 2 ]] ; then
        echo "$0: two arguments needed" 1>&2

diff --git a/bin/ecompress b/bin/ecompress
index 13d6bd09d959213a1a9047773be99c5cbd127962..db007f0bfef97dca83bd66d55399794a74def74b 100755 (executable)
--- a/bin/ecompress
+++ b/bin/ecompress
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: prepman 5507 2007-01-10 04:22:27Z zmedico $
+# $Id$
 
 source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
 

diff --git a/bin/ecompressdir b/bin/ecompressdir
index b99de97150573b5c8f1345ec18d849c6604a34b2..75b6059abfa995df60ef69328b32b553e5a029db 100755 (executable)
--- a/bin/ecompressdir
+++ b/bin/ecompressdir
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: prepalldocs 3483 2006-06-10 21:40:40Z genone $
+# $Id$
 
 source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
 

diff --git a/bin/emake b/bin/emake
index 5cc7deee302ca8811dd76a6334e707943683580e..7fc8e7ea78610822051cbd2937da0d6a4e7b6c6d 100755 (executable)
--- a/bin/emake
+++ b/bin/emake
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/emake,v 1.9.2.1 2005/05/18 15:19:52 jstubbs Exp $
+# $Id$
 #
 # emake: Supplies some default parameters to GNU make. At the moment the
 #        only parameter supplied is -jN, where N is a number of

diff --git a/bin/env-update b/bin/env-update
index 56321b74e70139c2bff07f9264c3f5aa753ee6b7..9c51df5d326a434eb0bd4c4d2ca21a0a60a5d35e 100755 (executable)
--- a/bin/env-update
+++ b/bin/env-update
@@ -1,7 +1,7 @@
 #!@PYTHON@ -O
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/env-update,v 1.9 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 import os, sys, errno
 

diff --git a/bin/env-update.sh b/bin/env-update.sh
index 7822821ddf96fc7cb39d9bc219718539899216a3..f68af2a5f337be5fbb3c117a3f073089fa320fb3 100755 (executable)
--- a/bin/env-update.sh
+++ b/bin/env-update.sh
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/env-update.sh,v 1.2 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 ############################################
 ############################################

diff --git a/bin/eprefixify b/bin/eprefixify
index 57ac7e53b6dfd4c3627359dd76ff2d84ad4674b4..8b9f773d32510764b75adc544611e3feae5e79ed 100755 (executable)
--- a/bin/eprefixify
+++ b/bin/eprefixify
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: $
+# $Id$
 
 # Fabian Groffen <grobian@gentoo.org>
 # replaces @GENTOO_PORTAGE_EPREFIX@ with EPREFIX for the given files

diff --git a/bin/find-requires b/bin/find-requires
index 9d036508500a8854b1b2566dfa5aae49ef7c97b8..6c187558ccdfe9a8dd12927812f47ae7bb775e99 100755 (executable)
--- a/bin/find-requires
+++ b/bin/find-requires
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/find-requires,v 1.5 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 # note this works for both a.out and ELF executables
 # it also auto-generates requirment lines for shell scripts

diff --git a/bin/fix-db.py b/bin/fix-db.py
index 223fad30a2c7a7af33523cc931cf6f0eedee5318..4c2f2606f90a08a5730f383b99285c07af49bf76 100755 (executable)
--- a/bin/fix-db.py
+++ b/bin/fix-db.py
@@ -1,7 +1,7 @@
 #!@PYTHON@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/fix-db.py,v 1.8 2004/10/11 04:01:00 jstubbs Exp $
+# $Id$
 
 import os,sys,re
 

diff --git a/bin/fixdbentries b/bin/fixdbentries
index 1b71d05872f6bdd14754648d425b8adc6886c3d1..de5a73dbce00eb56a42100f3202d05aa126a78f2 100755 (executable)
--- a/bin/fixdbentries
+++ b/bin/fixdbentries
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/fixdbentries,v 1.3 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 # Script to adjust the contents of the DB entries after a package move.
 # Fairly straight forward... ./movedbentry 'from/here' 'to/here' /over/here

diff --git a/bin/fixpackages b/bin/fixpackages
index 49320e839949d9e0aca22072eeeb89bd66bcf99a..6796395e4035db07933737b0a23860c57ede25a2 100755 (executable)
--- a/bin/fixpackages
+++ b/bin/fixpackages
@@ -1,7 +1,7 @@
 #!@PYTHON@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/fixpackages,v 1.6 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 import os,sys
 os.environ["PORTAGE_CALLER"]="fixpackages"

diff --git a/bin/md5check.py b/bin/md5check.py
index f574de3cfb5fad239374931307e1bca3ec515f71..915a0234e04268e610d287c6d59b6a23acbed57c 100755 (executable)
--- a/bin/md5check.py
+++ b/bin/md5check.py
@@ -1,7 +1,7 @@
 #!@PYTHON@ -O
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/md5check.py,v 1.4 2004/10/10 10:07:20 carpaski Exp $
+# $Id$
 
 import os,sys
 os.environ["FEATURES"]="mirror cvs"

diff --git a/bin/md5check.sh b/bin/md5check.sh
index a0361a96d6a91eb8f9bfc24c34cbb998bfb4fddd..354ea46fafb77854303da2f7def42536fb2060a2 100755 (executable)
--- a/bin/md5check.sh
+++ b/bin/md5check.sh
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/md5check.sh,v 1.2 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 # pipe in the data.
 

diff --git a/bin/newbin b/bin/newbin
index e035fec3cac98db80051d223ef4ef1eb7e884b8a..4e4a9aaf027ea1aa984381b2c932bdaaed6f829f 100755 (executable)
--- a/bin/newbin
+++ b/bin/newbin
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/newbin,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        echo "$0: Need two arguments, old file and new file" 1>&2

diff --git a/bin/newconfd b/bin/newconfd
index 5b04002aecf361166d2c182b6af67a8a609794b2..c898c347948e05b23ca04ec86e42327537f55f60 100755 (executable)
--- a/bin/newconfd
+++ b/bin/newconfd
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/newconfd,v 1.2 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        echo "$0: Need two arguments, old file and new file" 1>&2

diff --git a/bin/newdoc b/bin/newdoc
index 37bdca157d68108fed9cf25298a3a7d6cb00b3f6..4e4da01f2f6e1f77196febab67bb323cac0e8330 100755 (executable)
--- a/bin/newdoc
+++ b/bin/newdoc
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/newdoc,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        echo "$0: Need two arguments, old file and new file" 1>&2

diff --git a/bin/newenvd b/bin/newenvd
index 54a58f8708e570dd9a17970d4bb6f6a638687496..feea56ab78f061801d7420998cbbe5918541229e 100755 (executable)
--- a/bin/newenvd
+++ b/bin/newenvd
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/newenvd,v 1.2 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        echo "$0: Need two arguments, old file and new file" 1>&2

diff --git a/bin/newexe b/bin/newexe
index 5bb535f5eaadd2e367869af7f1f69dedd08afc25..e7b65f005ac5888216bb9151f82876d4d42176b0 100755 (executable)
--- a/bin/newexe
+++ b/bin/newexe
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: $
+# $Id$
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        echo "$0: Need two arguments, old file and new file" 1>&2

diff --git a/bin/newinitd b/bin/newinitd
index 92cce843b0b67e00bb9dfd19b007021a9d16eca6..dc017c934a062c658ffd12f16348fe8a14ed62cd 100755 (executable)
--- a/bin/newinitd
+++ b/bin/newinitd
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/newinitd,v 1.2 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        echo "$0: Need two arguments, old file and new file" 1>&2

diff --git a/bin/newins b/bin/newins
index 2824c6315a8472ff56a3bc4b546b0d02b63620a7..6d5774cd155ce1715d3305a499fc3ba78a9f47fa 100755 (executable)
--- a/bin/newins
+++ b/bin/newins
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/newins,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        echo "$0: Need two arguments, old file and new file" 1>&2

diff --git a/bin/newlib.a b/bin/newlib.a
index 973c504a68fb18c82ff53e584c21abd7b35c177e..3a745ebeaa5f507e9d5d0f25c3713a4769de3b1d 100755 (executable)
--- a/bin/newlib.a
+++ b/bin/newlib.a
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/newlib.a,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        echo "$0: Need two arguments, old file and new file" 1>&2

diff --git a/bin/newlib.so b/bin/newlib.so
index 2c1e1ed4a2f6adee4a4a7b76ea2757753cc88192..84bffc733956714f9d08543de75778a4c9a243da 100755 (executable)
--- a/bin/newlib.so
+++ b/bin/newlib.so
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/newlib.so,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        echo "$0: Need two arguments, old file and new file" 1>&2

diff --git a/bin/newman b/bin/newman
index 76ef9a83f81b7f3bfc3683f9ff545517f90f5c9b..d686767a0d9eef52ab8dff2b1017c56b24494e96 100755 (executable)
--- a/bin/newman
+++ b/bin/newman
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/newman,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        echo "$0: Need two arguments, old file and new file" 1>&2

diff --git a/bin/newsbin b/bin/newsbin
index 2cd42065a160718b53018843c525f0523fc6590e..e030e1fce65282ea3cc493039fa5e04ba1c50fea 100755 (executable)
--- a/bin/newsbin
+++ b/bin/newsbin
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/newsbin,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        echo "$0: Need two arguments, old file and new file" 1>&2

diff --git a/bin/pkgname b/bin/pkgname
index 819387c589380eb14ccc402ec6acf32c08148894..4660606a7e14be32414087344c8f8606e659332a 100755 (executable)
--- a/bin/pkgname
+++ b/bin/pkgname
@@ -1,7 +1,7 @@
 #!@PYTHON@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/pkgname,v 1.8 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 import sys, os
 try:

diff --git a/bin/portage_gpg_update.sh b/bin/portage_gpg_update.sh
index 79786a3aeb21ba73568a2b67ea8f941e9c3680b0..2d8b4d29f42936d57aacbebd23efd484fd6ffb56 100755 (executable)
--- a/bin/portage_gpg_update.sh
+++ b/bin/portage_gpg_update.sh
@@ -1,6 +1,6 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/portage_gpg_update.sh,v 1.2 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 wget -O - http://www.gentoo.org/proj/en/devrel/roll-call/userinfo.xml | sed 's:.*\(0x[0-9a-fA-F]\+\)[^0-9a-fA-F].*:\1:gp;d' | xargs gpg -vvv --no-default-keyring  --no-permission-warning --homedir "${EPREFIX}"/usr/portage/metadata --keyring "gentoo.gpg" --keyserver subkeys.pgp.net --recv-keys &> gpg.log

diff --git a/bin/portageq b/bin/portageq
index e5490db445d25d218a91b7f9ea6fc21d6fd8b837..8a25afa3c242ee0331d68b0273a3f3d8b154e3c4 100755 (executable)
--- a/bin/portageq
+++ b/bin/portageq
@@ -1,7 +1,7 @@
 #!@PYTHON@ -O
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/portageq,v 1.13.2.1 2005/04/12 12:23:41 jstubbs Exp $
+# $Id$
 
 import sys
 # This block ensures that ^C interrupts are handled quietly.

diff --git a/bin/prepall b/bin/prepall
index d11dc16d68523eb774ca6b2d250f44729ed91617..009ac6db2e4dd8058a1c1063fc5f2b100cbaa40a 100755 (executable)
--- a/bin/prepall
+++ b/bin/prepall
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: prepall 2230 2005-11-01 01:35:59Z vapier $
+# $Id$
 
 source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 

diff --git a/bin/prepalldocs b/bin/prepalldocs
index eea839631f458a58251208bcc1cc4a3eb8b36b5f..abf352a8116c449f3b0645f0e823a069aed1f874 100755 (executable)
--- a/bin/prepalldocs
+++ b/bin/prepalldocs
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/prepalldocs,v 1.6 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 if [[ -n $1 ]] ; then
        vecho "${0##*/}: invalid usage; takes no arguments" 1>&2

diff --git a/bin/prepallinfo b/bin/prepallinfo
index f5ec97f42312be910e359dce1bab80d8477c6792..844816451e4ba70c1bbbd9b8e7f8ff0c70dacda2 100755 (executable)
--- a/bin/prepallinfo
+++ b/bin/prepallinfo
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/prepallinfo,v 1.6 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 [[ ! -d ${ED}usr/share/info ]] && exit 0
 

diff --git a/bin/prepallman b/bin/prepallman
index 9c59d1c6fd2459f319bc41359cbf4de7dd453d83..a411d18b33ac0693cec6aa4ba5aab099e53604d1 100755 (executable)
--- a/bin/prepallman
+++ b/bin/prepallman
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/prepallman,v 1.10 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 ret=0
 

diff --git a/bin/prepallstrip b/bin/prepallstrip
index 9a012e03fd75e0e0b71f3d6e89edf9242da36be6..787e18aba7ada25a8b9d39793c3ca8c1c58103ac 100755 (executable)
--- a/bin/prepallstrip
+++ b/bin/prepallstrip
@@ -1,6 +1,6 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/prepallstrip,v 1.12 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 exec prepstrip "${ED}"

diff --git a/bin/prepinfo b/bin/prepinfo
index b831e465bfe988a0723cd32069a883141b0aeb30..df7a0ccfce85f30f14c23e5c391434b80194aaab 100755 (executable)
--- a/bin/prepinfo
+++ b/bin/prepinfo
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/prepinfo,v 1.6.2.1 2005/05/29 12:40:08 jstubbs Exp $
+# $Id$
 
 if [[ -z $1 ]] ; then
        infodir="${EPREFIX}/usr/share/info"

diff --git a/bin/preplib b/bin/preplib
index caefe5da3c98bcfa39427ce55afa84192fafb7b7..ede9576e411d878eb14191a804ceb9119c2fef53 100755 (executable)
--- a/bin/preplib
+++ b/bin/preplib
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/preplib,v 1.7.2.1 2005/01/02 09:36:02 jstubbs Exp $
+# $Id$
 
 source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
 

diff --git a/bin/prepman b/bin/prepman
index b2667904cbfe799095a88f550c20baf478e979d4..2ffa527e84ca655d71e008e130628dd3eda33ce8 100755 (executable)
--- a/bin/prepman
+++ b/bin/prepman
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/prepman,v 1.10.2.3 2005/05/29 12:40:08 jstubbs Exp $
+# $Id$
 
 if [[ -z $1 ]] ; then 
        mandir="${ED}usr/share/man"

diff --git a/bin/regenworld b/bin/regenworld
index c35bdf845dd59ff5669b16d6e719cf27692430f0..8b052b276ef0e3652e122adefc4887dc7c861115 100755 (executable)
--- a/bin/regenworld
+++ b/bin/regenworld
@@ -1,7 +1,7 @@
 #!@PYTHON@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/regenworld,v 1.10.2.1 2005/01/11 03:40:57 carpaski Exp $
+# $Id$
 
 import sys, os
 try:

diff --git a/bin/repoman b/bin/repoman
index d5c87a597c397047b2c4396d2f6af738bf406a4b..3ea24c1b48589217f7fd807e097b2228ac0558ee 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -1,7 +1,7 @@
 #!@PYTHON@ -O
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: repoman 4651 2006-10-10 21:10:33Z zmedico $
+# $Id$
 
 # Next to do: dep syntax checking in mask files
 # Then, check to make sure deps are satisfiable (to avoid "can't find match for" problems)

diff --git a/bin/xpak b/bin/xpak
index 19e66506b914bd5069fcf9f03fc8869694861ac7..6ffccf0c0e577c8262c0d287c96abab2c2069928 100755 (executable)
--- a/bin/xpak
+++ b/bin/xpak
@@ -1,7 +1,7 @@
 #!@PYTHON@ -O
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: xpak 3483 2006-06-10 21:40:40Z genone $
+# $Id$
 
 import sys, os
 if len(sys.argv)!=3: