From: Fabian Groffen <grobian@gentoo.org>
Date: Thu, 25 Oct 2007 20:00:02 +0000 (-0000)
Subject: Fix bug detected by mattmatteh in #gentoo-alt, the prefix version of
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0bac400b235c858900b2198bbad09b5c4d05362c;p=portage.git

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 2c424355f..f5065cc14 100755
--- 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 a4dec42c2..a1ee672ed 100755
--- 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 176370e5f..466e4df96 100755
--- 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 48b38d207..324f09270 100755
--- 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 868b97df2..164ff644a 100755
--- 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 4ee72ad4c..0bbcab90e 100755
--- 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 038a583bf..3283cd475 100755
--- 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 16916e213..caed3e735 100755
--- 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 52ffae087..0eb3a7819 100755
--- 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 aaebb7169..f49e754c7 100755
--- 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 d38de9be0..b40fd29e5 100755
--- 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 dcfcf734a..bd8d3ce29 100755
--- 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 1a6fca03a..16a1b85a1 100755
--- 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 67261a57a..190ec26d5 100755
--- 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 ffe0c9afa..a1cc01641 100755
--- 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 bb7ece710..6dae7d052 100755
--- 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 7330938ee..dc3f7d00f 100755
--- 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 c1a9ad641..e454aa777 100755
--- 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 484a38054..137457a28 100755
--- 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 9b84e4630..9d924205f 100755
--- 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 13d6bd09d..db007f0bf 100755
--- 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 b99de9715..75b6059ab 100755
--- 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 5cc7deee3..7fc8e7ea7 100755
--- 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 56321b74e..9c51df5d3 100755
--- 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 7822821dd..f68af2a5f 100755
--- 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 57ac7e53b..8b9f773d3 100755
--- 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 9d0365085..6c187558c 100755
--- 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 223fad30a..4c2f2606f 100755
--- 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 1b71d0587..de5a73dbc 100755
--- 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 49320e839..6796395e4 100755
--- 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 f574de3cf..915a0234e 100755
--- 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 a0361a96d..354ea46fa 100755
--- 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 e035fec3c..4e4a9aaf0 100755
--- 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 5b04002ae..c898c3479 100755
--- 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 37bdca157..4e4da01f2 100755
--- 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 54a58f870..feea56ab7 100755
--- 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 5bb535f5e..e7b65f005 100755
--- 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 92cce843b..dc017c934 100755
--- 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 2824c6315..6d5774cd1 100755
--- 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 973c504a6..3a745ebea 100755
--- 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 2c1e1ed4a..84bffc733 100755
--- 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 76ef9a83f..d686767a0 100755
--- 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 2cd42065a..e030e1fce 100755
--- 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 819387c58..4660606a7 100755
--- 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 79786a3ae..2d8b4d29f 100755
--- 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 e5490db44..8a25afa3c 100755
--- 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 d11dc16d6..009ac6db2 100755
--- 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 eea839631..abf352a81 100755
--- 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 f5ec97f42..844816451 100755
--- 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 9c59d1c6f..a411d18b3 100755
--- 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 9a012e03f..787e18aba 100755
--- 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 b831e465b..df7a0ccfc 100755
--- 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 caefe5da3..ede9576e4 100755
--- 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 b2667904c..2ffa527e8 100755
--- 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 c35bdf845..8b052b276 100755
--- 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 d5c87a597..3ea24c1b4 100755
--- 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 19e66506b..6ffccf0c0 100755
--- 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: