header changes, $Header: -> $Id:

svn path=/main/branches/2.0/; revision=1951

73 files changed, 73 insertions, 73 deletions

diff --git a/bin/archive-conf b/bin/archive-conf
index 6e198f49..35fa2408 100755
--- a/bin/archive-conf
+++ b/bin/archive-conf
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/archive-conf,v 1.7 2004/10/04 13:57:36 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/archive-conf,v 1.7 2004/10/04 13:57:36 vapier Exp $
 
 #
 # archive-conf -- save off a config file in the dispatch-conf archive dir
diff --git a/bin/chkcontents b/bin/chkcontents
index eebf868c..96775fc5 100755
--- a/bin/chkcontents
+++ b/bin/chkcontents
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/chkcontents,v 1.11 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/chkcontents,v 1.11 2004/10/04 13:56:50 vapier Exp $
 
 # 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 aa6669c1..e374e8f9 100755
--- a/bin/clean_locks
+++ b/bin/clean_locks
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/clean_locks,v 1.1 2004/09/26 10:44:31 carpaski Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/clean_locks,v 1.1 2004/09/26 10:44:31 carpaski Exp $
 
 import os,sys
 sys.path = ["/usr/lib/portage/pym"]+sys.path
diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 2db6a329..0d316126 100755
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/dispatch-conf,v 1.7.2.10 2005/05/12 15:20:22 jstubbs Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/dispatch-conf,v 1.7.2.10 2005/05/12 15:20:22 jstubbs Exp $
 
 #
 # dispatch-conf -- Integrate modified configs, post-emerge
diff --git a/bin/dobin b/bin/dobin
index 4c070d95..b1c6fcf9 100755
--- a/bin/dobin
+++ b/bin/dobin
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/dobin,v 1.13 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/dobin,v 1.13 2004/10/04 13:56:50 vapier Exp $
 
 if [ ${#} -lt 1 ] ; then
 	echo "${0}: at least one argument needed"
diff --git a/bin/doconfd b/bin/doconfd
index 73d5cedc..652f43cd 100755
--- a/bin/doconfd
+++ b/bin/doconfd
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/doconfd,v 1.2.2.1 2005/01/13 04:51:56 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/doconfd,v 1.2.2.1 2005/01/13 04:51:56 vapier Exp $
 
 if [ ${#} -lt 1 ] ; then
 	echo "doconfd: at least one argument needed"
diff --git a/bin/dodir b/bin/dodir
index 6df8f403..1ea4d623 100755
--- a/bin/dodir
+++ b/bin/dodir
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/dodir,v 1.5 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/dodir,v 1.5 2004/10/04 13:56:50 vapier Exp $
 
 for x in "$@" ; do
 	install -d ${DIROPTIONS} "${D}${x}"
diff --git a/bin/dodoc b/bin/dodoc
index a25aeddb..20628ced 100755
--- a/bin/dodoc
+++ b/bin/dodoc
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/dodoc,v 1.6.2.2 2005/05/15 11:04:21 jstubbs Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/dodoc,v 1.6.2.2 2005/05/15 11:04:21 jstubbs Exp $
 
 if [ $# -lt 1 ] ; then
 	echo "$0: at least one argument needed" 1>&2
diff --git a/bin/doenvd b/bin/doenvd
index 8a794d7f..8289fe9d 100755
--- a/bin/doenvd
+++ b/bin/doenvd
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/doenvd,v 1.2.2.1 2005/01/13 04:51:56 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/doenvd,v 1.2.2.1 2005/01/13 04:51:56 vapier Exp $
 
 if [ ${#} -lt 1 ] ; then
 	echo "doenvd: at least one argument needed"
diff --git a/bin/doexe b/bin/doexe
index 9c2f4109..aafef223 100755
--- a/bin/doexe
+++ b/bin/doexe
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/doexe,v 1.10.2.1 2004/12/06 03:01:43 carpaski Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/doexe,v 1.10.2.1 2004/12/06 03:01:43 carpaski Exp $
 
 mynum=${#}
 if [ ${mynum} -lt 1 ] ; then
diff --git a/bin/dohard b/bin/dohard
index 7313e2f2..ce7d5d82 100755
--- a/bin/dohard
+++ b/bin/dohard
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/dohard,v 1.6 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/dohard,v 1.6 2004/10/04 13:56:50 vapier Exp $
 
 if [ ${#} -ne 2 ] ; then
 	echo "${0}: two arguments needed"
diff --git a/bin/dohtml b/bin/dohtml
index 50e13924..963f4465 100755
--- a/bin/dohtml
+++ b/bin/dohtml
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/dohtml,v 1.14.2.1 2004/10/27 14:39:29 jstubbs Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/dohtml,v 1.14.2.1 2004/10/27 14:39:29 jstubbs Exp $
 
 #
 # Typical usage:
diff --git a/bin/doinfo b/bin/doinfo
index a8d7f4d7..83f639b0 100755
--- a/bin/doinfo
+++ b/bin/doinfo
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/doinfo,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/doinfo,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
 if [ ${#} -lt 1 ] ; then
 	echo "doinfo: at least one argument needed"
diff --git a/bin/doinitd b/bin/doinitd
index d4f725ab..4f5885ec 100755
--- a/bin/doinitd
+++ b/bin/doinitd
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/doinitd,v 1.2.2.1 2005/01/13 04:51:56 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/doinitd,v 1.2.2.1 2005/01/13 04:51:56 vapier Exp $
 
 if [ ${#} -lt 1 ] ; then
 	echo "doinitd: at least one argument needed"
diff --git a/bin/doins b/bin/doins
index 551905e9..bf51463a 100755
--- a/bin/doins
+++ b/bin/doins
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/doins,v 1.7.2.2 2004/12/17 22:25:13 carpaski Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/doins,v 1.7.2.2 2004/12/17 22:25:13 carpaski Exp $
 
 if [ $# -lt 1 ] ; then
 	echo "${0}: at least one argument needed"
diff --git a/bin/dojar b/bin/dojar
index 77dadfee..2bbc5ea2 100755
--- a/bin/dojar
+++ b/bin/dojar
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/dojar,v 1.8 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/dojar,v 1.8 2004/10/04 13:56:50 vapier Exp $
 # Author Karl Trygve Kalleberg <karltk@gentoo.org>
 
 #
diff --git a/bin/dolib b/bin/dolib
index 51b2327d..5424446a 100755
--- a/bin/dolib
+++ b/bin/dolib
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/dolib,v 1.8.2.2 2005/01/12 02:07:15 carpaski Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/dolib,v 1.8.2.2 2005/01/12 02:07:15 carpaski Exp $
 
 LIBDIR_VAR="LIBDIR_${ABI}"
 if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then
diff --git a/bin/dolib.a b/bin/dolib.a
index f7cced1c..73392ab3 100755
--- a/bin/dolib.a
+++ b/bin/dolib.a
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/dolib.a,v 1.8 2004/10/10 10:07:20 carpaski Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/dolib.a,v 1.8 2004/10/10 10:07:20 carpaski Exp $
 
 exec env LIBOPTIONS="-m0644" \
 	dolib "$@"
diff --git a/bin/dolib.so b/bin/dolib.so
index aa6df7db..e130ecd4 100755
--- a/bin/dolib.so
+++ b/bin/dolib.so
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/dolib.so,v 1.12 2004/10/10 10:07:20 carpaski Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/dolib.so,v 1.12 2004/10/10 10:07:20 carpaski Exp $
 
 exec env LIBOPTIONS="-m0755" \
 	dolib "$@"
diff --git a/bin/doman b/bin/doman
index 5c23ea0d..891e236c 100755
--- a/bin/doman
+++ b/bin/doman
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/doman,v 1.13.2.2 2005/07/29 05:55:34 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/doman,v 1.13.2.2 2005/07/29 05:55:34 vapier Exp $
 
 if [ $# -lt 1 ] ; then
 	echo "$0: at least one argument needed" 1>&2
diff --git a/bin/domo b/bin/domo
index ca3cf4b4..d6cc0826 100755
--- a/bin/domo
+++ b/bin/domo
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/domo,v 1.6 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/domo,v 1.6 2004/10/04 13:56:50 vapier Exp $
 
 mynum=${#}
 if [ ${mynum} -lt 1 ] ; then
diff --git a/bin/dopython b/bin/dopython
index a3ffab96..f058282b 100755
--- a/bin/dopython
+++ b/bin/dopython
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/dopython,v 1.8 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/dopython,v 1.8 2004/10/04 13:56:50 vapier Exp $
 
 import sys
 sys.path = ["/usr/lib/portage/pym"]+sys.path
diff --git a/bin/dosbin b/bin/dosbin
index 960d3875..89c46952 100755
--- a/bin/dosbin
+++ b/bin/dosbin
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/dosbin,v 1.11 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/dosbin,v 1.11 2004/10/04 13:56:50 vapier Exp $
 
 if [ ${#} -lt 1 ] ; then
 	echo "${0}: at least one argument needed"
diff --git a/bin/dosed b/bin/dosed
index 2c53b22d..76cd4689 100755
--- a/bin/dosed
+++ b/bin/dosed
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/dosed,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/dosed,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
 mysed="s:${D}::g"
 
diff --git a/bin/dosym b/bin/dosym
index ca8cb713..fd57a45e 100755
--- a/bin/dosym
+++ b/bin/dosym
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/dosym,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/dosym,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
 if [ ${#} -ne 2 ] ; then
 	echo "${0}: two arguments needed"
diff --git a/bin/ebuild b/bin/ebuild
index 2c4ed713..68c05c00 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
 # Copyright 1999-2004 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 $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/ebuild,v 1.18.2.3 2005/05/07 04:32:59 ferringb Exp $
 
 import os,sys
 sys.path = ["/usr/lib/portage/pym"]+sys.path
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 1783b83c..ab3e05c7 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/ebuild.sh,v 1.201.2.42 2005/08/20 17:24:30 jstubbs Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/ebuild.sh,v 1.201.2.42 2005/08/20 17:24:30 jstubbs Exp $
 
 export SANDBOX_PREDICT="${SANDBOX_PREDICT}:/proc/self/maps:/dev/console:/usr/lib/portage/pym:/dev/random"
 export SANDBOX_WRITE="${SANDBOX_WRITE}:/dev/shm:${PORTAGE_TMPDIR}"
diff --git a/bin/emake b/bin/emake
index 44fe8340..efdc0a71 100755
--- a/bin/emake
+++ b/bin/emake
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/emake,v 1.9.2.1 2005/05/18 15:19:52 jstubbs Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/emake,v 1.9.2.1 2005/05/18 15:19:52 jstubbs Exp $
 #
 # 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/emerge b/bin/emerge
index 5ae17196..987c37df 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/emerge,v 1.345.2.38 2005/08/13 17:25:26 ferringb Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/emerge,v 1.345.2.38 2005/08/13 17:25:26 ferringb Exp $
 
 import os,sys
 os.environ["PORTAGE_CALLER"]="emerge"
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 024af23e..9e2a44af 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/Attic/emerge-webrsync,v 1.8.2.4 2005/02/26 11:22:38 carpaski Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/Attic/emerge-webrsync,v 1.8.2.4 2005/02/26 11:22:38 carpaski Exp $
 # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
 # Rewritten from the old, Perl-based emerge-webrsync script
 
diff --git a/bin/emerge.orig b/bin/emerge.orig
index c66f32ea..90e559e6 100755
--- a/bin/emerge.orig
+++ b/bin/emerge.orig
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/emerge,v 1.345.2.33 2005/06/02 00:57:52 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/emerge,v 1.345.2.33 2005/06/02 00:57:52 vapier Exp $
 
 import os,sys
 os.environ["PORTAGE_CALLER"]="emerge"
diff --git a/bin/env-update b/bin/env-update
index a6042876..1cd55cb8 100755
--- a/bin/env-update
+++ b/bin/env-update
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/env-update,v 1.9 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/env-update,v 1.9 2004/10/04 13:56:50 vapier Exp $
 
 import os,sys
 os.environ["PORTAGE_CALLER"] = "env-update"
diff --git a/bin/env-update.sh b/bin/env-update.sh
index 5edc2da6..ff7fa09d 100755
--- a/bin/env-update.sh
+++ b/bin/env-update.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/env-update.sh,v 1.2 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/env-update.sh,v 1.2 2004/10/04 13:56:50 vapier Exp $
 
 ############################################
 ############################################
diff --git a/bin/etc-update b/bin/etc-update
index e8ea9376..fb09ea9d 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/etc-update,v 1.23.2.5 2005/05/29 12:40:08 jstubbs Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/etc-update,v 1.23.2.5 2005/05/29 12:40:08 jstubbs Exp $
 
 # Author Brandon Low <lostlogic@gentoo.org>
 #
diff --git a/bin/find-requires b/bin/find-requires
index 44bc51da..5f413f56 100755
--- a/bin/find-requires
+++ b/bin/find-requires
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/find-requires,v 1.5 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/find-requires,v 1.5 2004/10/04 13:56:50 vapier Exp $
 
 # 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 d185580f..3dcd1ca6 100755
--- a/bin/fix-db.py
+++ b/bin/fix-db.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/fix-db.py,v 1.8 2004/10/11 04:01:00 jstubbs Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/fix-db.py,v 1.8 2004/10/11 04:01:00 jstubbs Exp $
 
 import os,sys,re
 sys.path = ["/usr/lib/portage/pym"]+sys.path
diff --git a/bin/fixdbentries b/bin/fixdbentries
index a9c3e184..884155a7 100755
--- a/bin/fixdbentries
+++ b/bin/fixdbentries
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/fixdbentries,v 1.3 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/fixdbentries,v 1.3 2004/10/04 13:56:50 vapier Exp $
 
 # 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 f8d1948a..9f44f825 100755
--- a/bin/fixpackages
+++ b/bin/fixpackages
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/fixpackages,v 1.6 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/fixpackages,v 1.6 2004/10/04 13:56:50 vapier Exp $
 
 import os,sys
 os.environ["PORTAGE_CALLER"]="fixpackages"
diff --git a/bin/fowners b/bin/fowners
index cc13372a..c2aab718 100755
--- a/bin/fowners
+++ b/bin/fowners
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/fowners,v 1.6 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/fowners,v 1.6 2004/10/04 13:56:50 vapier Exp $
 
 if [ ${#} -lt 2 ] ; then
 	echo "${0}: at least two arguments needed"
diff --git a/bin/fperms b/bin/fperms
index ce72126e..8d60983e 100755
--- a/bin/fperms
+++ b/bin/fperms
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/fperms,v 1.6 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/fperms,v 1.6 2004/10/04 13:56:50 vapier Exp $
 
 if [ ${#} -lt 2 ] ; then
 	echo "${0}: at least two arguments needed"
diff --git a/bin/md5check.py b/bin/md5check.py
index e64d54a9..96a16d3a 100755
--- a/bin/md5check.py
+++ b/bin/md5check.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/md5check.py,v 1.4 2004/10/10 10:07:20 carpaski Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/md5check.py,v 1.4 2004/10/10 10:07:20 carpaski Exp $
 
 import os,sys,string
 os.environ["PORTAGE_CALLER"]="mirror"
diff --git a/bin/md5check.sh b/bin/md5check.sh
index a4f9f3fd..6ba5efd3 100755
--- a/bin/md5check.sh
+++ b/bin/md5check.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/md5check.sh,v 1.2 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/md5check.sh,v 1.2 2004/10/04 13:56:50 vapier Exp $
 
 # pipe in the data.
 
diff --git a/bin/mirror.py b/bin/mirror.py
index 1e08574a..75579f37 100755
--- a/bin/mirror.py
+++ b/bin/mirror.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/mirror.py,v 1.3 2004/10/10 10:07:20 carpaski Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/mirror.py,v 1.3 2004/10/10 10:07:20 carpaski Exp $
 
 # Defines the number of threads carrying out the downloading.
 maxsems=5
diff --git a/bin/newbin b/bin/newbin
index 6c7904cd..c8a67466 100755
--- a/bin/newbin
+++ b/bin/newbin
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/newbin,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/newbin,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
 if [ -z "${T}" ] || [ -z "${2}" ] ; then
 	echo "Nothing defined to do."
diff --git a/bin/newconfd b/bin/newconfd
index 662b40ed..40c02139 100755
--- a/bin/newconfd
+++ b/bin/newconfd
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/newconfd,v 1.2 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/newconfd,v 1.2 2004/10/04 13:56:50 vapier Exp $
 
 if [ -z "${T}" ] || [ -z "${2}" ] ; then
 	echo "Nothing defined to do."
diff --git a/bin/newdoc b/bin/newdoc
index a3c43a2f..14544484 100755
--- a/bin/newdoc
+++ b/bin/newdoc
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/newdoc,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/newdoc,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
 if [ -z "${T}" ] || [ -z "${2}" ] ; then
 	echo "Nothing defined to do."
diff --git a/bin/newenvd b/bin/newenvd
index 0ceec650..62640b85 100755
--- a/bin/newenvd
+++ b/bin/newenvd
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/newenvd,v 1.2 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/newenvd,v 1.2 2004/10/04 13:56:50 vapier Exp $
 
 if [ -z "${T}" ] || [ -z "${2}" ] ; then
 	echo "Nothing defined to do."
diff --git a/bin/newexe b/bin/newexe
index a2585b3f..2e3321a9 100755
--- a/bin/newexe
+++ b/bin/newexe
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/newexe,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/newexe,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
 if [ -z "${T}" ] || [ -z "${2}" ] ; then
 	echo "Nothing defined to do."
diff --git a/bin/newinitd b/bin/newinitd
index cb23dd79..b1bc0a30 100755
--- a/bin/newinitd
+++ b/bin/newinitd
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/newinitd,v 1.2 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/newinitd,v 1.2 2004/10/04 13:56:50 vapier Exp $
 
 if [ -z "${T}" ] || [ -z "${2}" ] ; then
 	echo "Nothing defined to do."
diff --git a/bin/newins b/bin/newins
index 965ff94b..6ec2f6d1 100755
--- a/bin/newins
+++ b/bin/newins
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/newins,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/newins,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
 if [ -z "${T}" ] || [ -z "${2}" ] ; then
 	echo "Error: Nothing defined to do."
diff --git a/bin/newlib.a b/bin/newlib.a
index 3ec62a3e..d704bd32 100755
--- a/bin/newlib.a
+++ b/bin/newlib.a
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/newlib.a,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/newlib.a,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
 if [ -z "${T}" ] || [ -z "${2}" ] ; then
 	echo "Error: Nothing defined to do."
diff --git a/bin/newlib.so b/bin/newlib.so
index aa9f9a17..9df2a4d3 100755
--- a/bin/newlib.so
+++ b/bin/newlib.so
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/newlib.so,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/newlib.so,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
 if [ -z "${T}" ] || [ -z "${2}" ] ; then
 	echo "Error: Nothing defined to do."
diff --git a/bin/newman b/bin/newman
index 227411a5..5bb6ebdf 100755
--- a/bin/newman
+++ b/bin/newman
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/newman,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/newman,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
 if [ -z "${T}" ] || [ -z "${2}" ] ; then
 	echo "Nothing defined to do."
diff --git a/bin/newsbin b/bin/newsbin
index eadfba22..c361ea39 100755
--- a/bin/newsbin
+++ b/bin/newsbin
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/newsbin,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/newsbin,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
 if [ -z "${T}" ] || [ -z "${2}" ] ; then
 	echo "Nothing defined to do."
diff --git a/bin/pkgmerge b/bin/pkgmerge
index 2bbb5f68..2cf9b5d3 100755
--- a/bin/pkgmerge
+++ b/bin/pkgmerge
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/pkgmerge,v 1.8 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/pkgmerge,v 1.8 2004/10/04 13:56:50 vapier Exp $
 
 import sys,os,string
 sys.path = ["/usr/lib/portage/pym"]+sys.path
diff --git a/bin/pkgmerge.new b/bin/pkgmerge.new
index 66dbe167..3abcb88c 100755
--- a/bin/pkgmerge.new
+++ b/bin/pkgmerge.new
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/pkgmerge.new,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/pkgmerge.new,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
 import os,string,sys
 sys.path = ["/usr/lib/portage/pym"]+sys.path
diff --git a/bin/pkgname b/bin/pkgname
index 22be6f1d..c2c07525 100755
--- a/bin/pkgname
+++ b/bin/pkgname
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/pkgname,v 1.8 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/pkgname,v 1.8 2004/10/04 13:56:50 vapier Exp $
 
 import sys
 sys.path = ["/usr/lib/portage/pym"]+sys.path
diff --git a/bin/portage_gpg_update.sh b/bin/portage_gpg_update.sh
index a20d9bc1..7abbbda4 100755
--- a/bin/portage_gpg_update.sh
+++ b/bin/portage_gpg_update.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/portage_gpg_update.sh,v 1.2 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/portage_gpg_update.sh,v 1.2 2004/10/04 13:56:50 vapier Exp $
 
 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 /usr/portage/metadata --keyring "gentoo.gpg" --keyserver subkeys.pgp.net --recv-keys &> gpg.log
diff --git a/bin/portageq b/bin/portageq
index 6bd6c402..f85274ba 100755
--- a/bin/portageq
+++ b/bin/portageq
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/portageq,v 1.13.2.1 2005/04/12 12:23:41 jstubbs Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/portageq,v 1.13.2.1 2005/04/12 12:23:41 jstubbs Exp $
 
 import sys, os
 os.environ["PORTAGE_CALLER"] = "portageq"
diff --git a/bin/prepall b/bin/prepall
index 3826f74f..ba3db9d8 100755
--- a/bin/prepall
+++ b/bin/prepall
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/prepall,v 1.10 2004/10/14 23:31:33 ferringb Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/prepall,v 1.10 2004/10/14 23:31:33 ferringb Exp $
 
 prepallman
 prepallinfo
diff --git a/bin/prepalldocs b/bin/prepalldocs
index 26ac80ca..6c540a2f 100755
--- a/bin/prepalldocs
+++ b/bin/prepalldocs
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/prepalldocs,v 1.6 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/prepalldocs,v 1.6 2004/10/04 13:56:50 vapier Exp $
 
 z="`find "${D}"usr/share/doc \( -type f -or -type l \) -not -name "*.gz" -not -name "*.js" 2>/dev/null`"
 
diff --git a/bin/prepallinfo b/bin/prepallinfo
index 134e8326..5875285d 100755
--- a/bin/prepallinfo
+++ b/bin/prepallinfo
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/prepallinfo,v 1.6 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/prepallinfo,v 1.6 2004/10/04 13:56:50 vapier Exp $
 
 [ ! -d "${D}usr/share/info" ] && exit 0
 
diff --git a/bin/prepallman b/bin/prepallman
index 26486fda..bc094fa0 100755
--- a/bin/prepallman
+++ b/bin/prepallman
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/prepallman,v 1.10 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/prepallman,v 1.10 2004/10/04 13:56:50 vapier Exp $
 
 echo "man:"
 for x in "${D}"opt/*/man "${D}"usr/share/man "${D}"usr/local/man "${D}"usr/X11R6/man ; do
diff --git a/bin/prepallstrip b/bin/prepallstrip
index 57994738..cbec1c64 100755
--- a/bin/prepallstrip
+++ b/bin/prepallstrip
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/prepallstrip,v 1.12 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/prepallstrip,v 1.12 2004/10/04 13:56:50 vapier Exp $
 
 if [ "${FEATURES//*nostrip*/true}" == "true" ] || [ "${RESTRICT//*nostrip*/true}" == "true" ] ; then
 	exit 0
diff --git a/bin/prepinfo b/bin/prepinfo
index 65bfba32..3e85528c 100755
--- a/bin/prepinfo
+++ b/bin/prepinfo
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/prepinfo,v 1.6.2.1 2005/05/29 12:40:08 jstubbs Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/prepinfo,v 1.6.2.1 2005/05/29 12:40:08 jstubbs Exp $
 
 if [ -z "$1" ] ; then
 	z="${D}usr/share/info"
diff --git a/bin/preplib b/bin/preplib
index 2a431260..53fd2018 100755
--- a/bin/preplib
+++ b/bin/preplib
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/preplib,v 1.7.2.1 2005/01/02 09:36:02 jstubbs Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/preplib,v 1.7.2.1 2005/01/02 09:36:02 jstubbs Exp $
 
 LIBDIR_VAR="LIBDIR_${ABI}"
 if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then
diff --git a/bin/preplib.so b/bin/preplib.so
index 13d67d9c..cbcb66b2 100755
--- a/bin/preplib.so
+++ b/bin/preplib.so
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/preplib.so,v 1.10.2.1 2004/12/06 03:01:43 carpaski Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/preplib.so,v 1.10.2.1 2004/12/06 03:01:43 carpaski Exp $
 
 for x in "$@" ; do
 	if [ -d "${D}${x}" ] ; then
diff --git a/bin/prepman b/bin/prepman
index 2042c4d3..14795d95 100755
--- a/bin/prepman
+++ b/bin/prepman
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/prepman,v 1.10.2.3 2005/05/29 12:40:08 jstubbs Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/prepman,v 1.10.2.3 2005/05/29 12:40:08 jstubbs Exp $
 
 if [ -z "$1" ] ; then 
 	z="${D}usr/share/man"
diff --git a/bin/prepstrip b/bin/prepstrip
index f5a51a37..ed3e6f64 100755
--- a/bin/prepstrip
+++ b/bin/prepstrip
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/prepstrip,v 1.23.2.3 2005/08/15 02:58:20 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/prepstrip,v 1.23.2.3 2005/08/15 02:58:20 vapier Exp $
 
 if [ "${FEATURES//*nostrip*/true}" == "true" ] || [ "${RESTRICT//*nostrip*/true}" == "true" ] ; then
 	echo "nostrip"
diff --git a/bin/quickpkg b/bin/quickpkg
index f5baa4cb..caa5ce0d 100755
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/quickpkg,v 1.13.2.6 2005/08/10 22:08:48 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/quickpkg,v 1.13.2.6 2005/08/10 22:08:48 vapier Exp $
 
 # This script tries to quickly create a Gentoo binary package using the
 # VDB_PATH/category/pkg/*  files
diff --git a/bin/regenworld b/bin/regenworld
index 2e7f7f84..19650d23 100755
--- a/bin/regenworld
+++ b/bin/regenworld
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/regenworld,v 1.10.2.1 2005/01/11 03:40:57 carpaski Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/regenworld,v 1.10.2.1 2005/01/11 03:40:57 carpaski Exp $
 
 import sys
 sys.path.insert(0, "/usr/lib/portage/pym")
diff --git a/bin/repoman b/bin/repoman
index 40607d7a..1554f0bd 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/repoman,v 1.98.2.23 2005/06/18 01:00:43 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/repoman,v 1.98.2.23 2005/06/18 01:00:43 vapier Exp $
 
 # 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 03228c14..5becde25 100755
--- a/bin/xpak
+++ b/bin/xpak
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/xpak,v 1.10 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/xpak,v 1.10 2004/10/04 13:56:50 vapier Exp $
 
 import sys
 if len(sys.argv)!=3: