make elog mail module always set the 'From' header for rfc2822 compliance

svn path=/main/trunk/; revision=3483

67 files changed, 67 insertions, 67 deletions

diff --git a/bin/archive-conf b/bin/archive-conf
index e4efeff6..24f0b626 100755
--- a/bin/archive-conf
+++ b/bin/archive-conf
@@ -1,7 +1,7 @@
 #!/usr/bin/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 9b67e8df..bff77d0d 100755
--- a/bin/chkcontents
+++ b/bin/chkcontents
@@ -1,7 +1,7 @@
 #!/usr/bin/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 2a3f06d2..0ecb6242 100755
--- a/bin/clean_locks
+++ b/bin/clean_locks
@@ -1,7 +1,7 @@
 #!/usr/bin/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/clean_locks,v 1.1 2004/09/26 10:44:31 carpaski Exp $
+# $Id$
 
 import os,sys,errno
 sys.path = ["/usr/lib/portage/pym"]+sys.path
diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 586b9875..cd340a4f 100755
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -1,7 +1,7 @@
 #!/usr/bin/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/dispatch-conf,v 1.7.2.10 2005/05/12 15:20:22 jstubbs Exp $
+# $Id$
 
 #
 # dispatch-conf -- Integrate modified configs, post-emerge
diff --git a/bin/dobin b/bin/dobin
index a3269ede..f24e3416 100755
--- a/bin/dobin
+++ b/bin/dobin
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/dobin,v 1.13 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/doconfd b/bin/doconfd
index e9ea1fdf..9952ec0f 100755
--- a/bin/doconfd
+++ b/bin/doconfd
@@ -1,7 +1,7 @@
 #!/bin/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/dodir b/bin/dodir
index bc4f7f57..abf76516 100755
--- a/bin/dodir
+++ b/bin/dodir
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/dodir,v 1.5 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 slash=/
 exec install -d ${DIROPTIONS} "${@/#${slash}/${D}${slash}}"
diff --git a/bin/doenvd b/bin/doenvd
index 5232ed90..eb7dcd72 100755
--- a/bin/doenvd
+++ b/bin/doenvd
@@ -1,7 +1,7 @@
 #!/bin/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 818c8a5b..e4e6fdc6 100755
--- a/bin/doexe
+++ b/bin/doexe
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/doexe,v 1.10.2.1 2004/12/06 03:01:43 carpaski Exp $
+# $Id$
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
diff --git a/bin/dohard b/bin/dohard
index 03b5e67a..ce07f11c 100755
--- a/bin/dohard
+++ b/bin/dohard
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/dohard,v 1.6 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 if [[ $# -ne 2 ]] ; then
 	echo "$0: two arguments needed" 1>&2
diff --git a/bin/dohtml b/bin/dohtml
index ac31e809..56347a4a 100755
--- a/bin/dohtml
+++ b/bin/dohtml
@@ -1,7 +1,7 @@
 #!/usr/bin/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 67b163b1..82db070b 100755
--- a/bin/doinfo
+++ b/bin/doinfo
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 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 [ ${#} -lt 1 ] ; then
 	echo "doinfo: at least one argument needed"
diff --git a/bin/doinitd b/bin/doinitd
index 8aae1b38..e8d9f69f 100755
--- a/bin/doinitd
+++ b/bin/doinitd
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 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 f35cbc63..43df6dd2 100755
--- a/bin/doins
+++ b/bin/doins
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/doins,v 1.7.2.2 2004/12/17 22:25:13 carpaski Exp $
+# $Id$
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
diff --git a/bin/dojar b/bin/dojar
index e61015ef..e1631cc4 100755
--- a/bin/dojar
+++ b/bin/dojar
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/dojar,v 1.8 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 # Author Karl Trygve Kalleberg <karltk@gentoo.org>
 
 #
diff --git a/bin/dolib b/bin/dolib
index 1a615257..6c6628bd 100755
--- a/bin/dolib
+++ b/bin/dolib
@@ -1,7 +1,7 @@
 #!/bin/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 c4df4a46..3ef57d2f 100755
--- a/bin/dolib.a
+++ b/bin/dolib.a
@@ -1,7 +1,7 @@
 #!/bin/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="-m0644" \
 	dolib "$@"
diff --git a/bin/dolib.so b/bin/dolib.so
index efd8c169..e4d477f6 100755
--- a/bin/dolib.so
+++ b/bin/dolib.so
@@ -1,7 +1,7 @@
 #!/bin/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="-m0755" \
 	dolib "$@"
diff --git a/bin/doman b/bin/doman
index 2ed65ffc..49cf55e1 100755
--- a/bin/doman
+++ b/bin/doman
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/doman,v 1.13.2.2 2005/07/29 05:55:34 vapier Exp $
+# $Id$
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
diff --git a/bin/domo b/bin/domo
index 82950590..213b43c5 100755
--- a/bin/domo
+++ b/bin/domo
@@ -1,7 +1,7 @@
 #!/bin/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 30aa7893..c9e85c0b 100755
--- a/bin/dosbin
+++ b/bin/dosbin
@@ -1,7 +1,7 @@
 #!/bin/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 bf6538e6..0a5975a2 100755
--- a/bin/dosed
+++ b/bin/dosed
@@ -1,7 +1,7 @@
 #!/bin/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:${D}::g"
 
diff --git a/bin/dosym b/bin/dosym
index e0af15e2..da31246c 100755
--- a/bin/dosym
+++ b/bin/dosym
@@ -1,7 +1,7 @@
 #!/bin/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/ebuild.sh b/bin/ebuild.sh
index 49cea8de..e2d8987e 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/ebuild.sh,v 1.201.2.42 2005/08/20 17:24:30 jstubbs Exp $
+# $Id$
 
 PORTAGE_BIN_PATH="${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"
 PORTAGE_PYM_PATH="${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}"
diff --git a/bin/emake b/bin/emake
index 4c79c0e0..2554db98 100755
--- a/bin/emake
+++ b/bin/emake
@@ -1,7 +1,7 @@
 #!/bin/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/emerge b/bin/emerge
index 80eb2bb2..a1edad02 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1,7 +1,7 @@
 #!/usr/bin/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/emerge,v 1.345.2.38 2005/08/13 17:25:26 ferringb Exp $
+# $Id$
 
 import os,sys
 os.environ["PORTAGE_CALLER"]="emerge"
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 44e0dba8..5305c4d1 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/Attic/emerge-webrsync,v 1.8.2.4 2005/02/26 11:22:38 carpaski Exp $
+# $Id$
 # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
 # Rewritten from the old, Perl-based emerge-webrsync script
 
diff --git a/bin/env-update b/bin/env-update
index 0ee2fc3a..d7e9f396 100755
--- a/bin/env-update
+++ b/bin/env-update
@@ -1,7 +1,7 @@
 #!/usr/bin/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
 os.environ["PORTAGE_CALLER"] = "env-update"
diff --git a/bin/env-update.sh b/bin/env-update.sh
index 58e3f406..fcf083f8 100755
--- a/bin/env-update.sh
+++ b/bin/env-update.sh
@@ -1,7 +1,7 @@
 #!/bin/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/etc-update b/bin/etc-update
index b77c2a04..aa919ee7 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: etc-update 2221 2005-11-01 01:32:07Z vapier $
+# $Id$
 
 # Author Brandon Low <lostlogic@gentoo.org>
 #
diff --git a/bin/find-requires b/bin/find-requires
index 82959b74..80340c1c 100755
--- a/bin/find-requires
+++ b/bin/find-requires
@@ -1,7 +1,7 @@
 #!/bin/sh
 # 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 5fb479fc..16a15150 100755
--- a/bin/fix-db.py
+++ b/bin/fix-db.py
@@ -1,7 +1,7 @@
 #!/usr/bin/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
 sys.path = ["/usr/lib/portage/pym"]+sys.path
diff --git a/bin/fixdbentries b/bin/fixdbentries
index af330646..d15ffb62 100755
--- a/bin/fixdbentries
+++ b/bin/fixdbentries
@@ -1,7 +1,7 @@
 #!/bin/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 11cc4947..5eddb1c3 100755
--- a/bin/fixpackages
+++ b/bin/fixpackages
@@ -1,7 +1,7 @@
 #!/usr/bin/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/fowners b/bin/fowners
index a720a595..d13cb030 100755
--- a/bin/fowners
+++ b/bin/fowners
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: fowners 1912 2005-08-25 03:54:42Z ferringb $
+# $Id$
 
 slash=/
 exec chown "${@/#${slash}/${D}${slash}}"
diff --git a/bin/fperms b/bin/fperms
index 208ad351..53a2b0fd 100755
--- a/bin/fperms
+++ b/bin/fperms
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: fperms 1912 2005-08-25 03:54:42Z ferringb $
+# $Id$
 
 slash=/
 exec chmod "${@/#${slash}/${D}${slash}}"
diff --git a/bin/md5check.py b/bin/md5check.py
index 9ec6c821..65dd169e 100755
--- a/bin/md5check.py
+++ b/bin/md5check.py
@@ -1,7 +1,7 @@
 #!/usr/bin/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,string
 os.environ["PORTAGE_CALLER"]="mirror"
diff --git a/bin/md5check.sh b/bin/md5check.sh
index 2be4be11..fc5122a9 100755
--- a/bin/md5check.sh
+++ b/bin/md5check.sh
@@ -1,7 +1,7 @@
 #!/bin/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 699b9a68..8e2185b2 100755
--- a/bin/newbin
+++ b/bin/newbin
@@ -1,7 +1,7 @@
 #!/bin/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 63a38bb7..4b1e8e7b 100755
--- a/bin/newconfd
+++ b/bin/newconfd
@@ -1,7 +1,7 @@
 #!/bin/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 d3b83565..757c8214 100755
--- a/bin/newdoc
+++ b/bin/newdoc
@@ -1,7 +1,7 @@
 #!/bin/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 07bbec64..46408471 100755
--- a/bin/newenvd
+++ b/bin/newenvd
@@ -1,7 +1,7 @@
 #!/bin/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 ce3a0823..7712644d 100755
--- a/bin/newexe
+++ b/bin/newexe
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/newexe,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/newinitd b/bin/newinitd
index 50a4d54d..6873771c 100755
--- a/bin/newinitd
+++ b/bin/newinitd
@@ -1,7 +1,7 @@
 #!/bin/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 8dcbd99c..c64e0660 100755
--- a/bin/newins
+++ b/bin/newins
@@ -1,7 +1,7 @@
 #!/bin/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 0f9b45d9..008aca96 100755
--- a/bin/newlib.a
+++ b/bin/newlib.a
@@ -1,7 +1,7 @@
 #!/bin/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 a756068e..5ea2e33b 100755
--- a/bin/newlib.so
+++ b/bin/newlib.so
@@ -1,7 +1,7 @@
 #!/bin/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 24a4757e..4ae4fdb7 100755
--- a/bin/newman
+++ b/bin/newman
@@ -1,7 +1,7 @@
 #!/bin/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 ec043dbc..8adeee40 100755
--- a/bin/newsbin
+++ b/bin/newsbin
@@ -1,7 +1,7 @@
 #!/bin/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/pkgmerge b/bin/pkgmerge
index 2782ba09..9983ec37 100755
--- a/bin/pkgmerge
+++ b/bin/pkgmerge
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/pkgmerge,v 1.8 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 import sys,os,string
 sys.path = ["/usr/lib/portage/pym"]+sys.path
diff --git a/bin/pkgmerge.new b/bin/pkgmerge.new
index 8795fc6c..80c70ab1 100755
--- a/bin/pkgmerge.new
+++ b/bin/pkgmerge.new
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/pkgmerge.new,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 import os,string,sys
 sys.path = ["/usr/lib/portage/pym"]+sys.path
diff --git a/bin/pkgname b/bin/pkgname
index f3375759..d1ba2f3d 100755
--- a/bin/pkgname
+++ b/bin/pkgname
@@ -1,7 +1,7 @@
 #!/usr/bin/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
 sys.path = ["/usr/lib/portage/pym"]+sys.path
diff --git a/bin/portage_gpg_update.sh b/bin/portage_gpg_update.sh
index aac518de..92317f61 100755
--- a/bin/portage_gpg_update.sh
+++ b/bin/portage_gpg_update.sh
@@ -1,6 +1,6 @@
 #!/bin/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 /usr/portage/metadata --keyring "gentoo.gpg" --keyserver subkeys.pgp.net --recv-keys &> gpg.log
diff --git a/bin/portageq b/bin/portageq
index ab1a9311..b8e12c5f 100755
--- a/bin/portageq
+++ b/bin/portageq
@@ -1,7 +1,7 @@
 #!/usr/bin/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, os
 os.environ["PORTAGE_CALLER"] = "portageq"
diff --git a/bin/prepall b/bin/prepall
index 4772574a..118b85d8 100755
--- a/bin/prepall
+++ b/bin/prepall
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 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:-/usr/lib/portage/bin}"/isolated-functions.sh
 
diff --git a/bin/prepalldocs b/bin/prepalldocs
index d8b8b747..8d585d23 100755
--- a/bin/prepalldocs
+++ b/bin/prepalldocs
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 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$
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
diff --git a/bin/prepallinfo b/bin/prepallinfo
index 205316ab..f0ed4f33 100755
--- a/bin/prepallinfo
+++ b/bin/prepallinfo
@@ -1,7 +1,7 @@
 #!/bin/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$
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
diff --git a/bin/prepallman b/bin/prepallman
index 85a7277d..e89ad7af 100755
--- a/bin/prepallman
+++ b/bin/prepallman
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 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$
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
diff --git a/bin/prepallstrip b/bin/prepallstrip
index 3a00a2ac..178ded79 100755
--- a/bin/prepallstrip
+++ b/bin/prepallstrip
@@ -1,6 +1,6 @@
 #!/bin/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 "${D}"
diff --git a/bin/prepinfo b/bin/prepinfo
index dac4b6ac..d624561c 100755
--- a/bin/prepinfo
+++ b/bin/prepinfo
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 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$
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
diff --git a/bin/preplib b/bin/preplib
index ab784d2c..c7f45079 100755
--- a/bin/preplib
+++ b/bin/preplib
@@ -1,7 +1,7 @@
 #!/bin/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:-/usr/lib/portage/bin}"/isolated-functions.sh
 
diff --git a/bin/prepman b/bin/prepman
index 9e5e4198..2968bb18 100755
--- a/bin/prepman
+++ b/bin/prepman
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 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$
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
diff --git a/bin/prepstrip b/bin/prepstrip
index 6a308895..5260539a 100755
--- a/bin/prepstrip
+++ b/bin/prepstrip
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/prepstrip,v 1.23.2.3 2005/08/15 02:58:20 vapier Exp $
+# $Id$
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
diff --git a/bin/quickpkg b/bin/quickpkg
index 61b09a60..1231da9f 100755
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/quickpkg,v 1.13.2.6 2005/08/10 22:08:48 vapier Exp $
+# $Id$
 
 # 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 221412dd..b9937096 100755
--- a/bin/regenworld
+++ b/bin/regenworld
@@ -1,7 +1,7 @@
 #!/usr/bin/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
 sys.path.insert(0, "/usr/lib/portage/pym")
diff --git a/bin/repoman b/bin/repoman
index 1204bb54..b6808d1f 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1,7 +1,7 @@
 #!/usr/bin/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/repoman,v 1.98.2.23 2005/06/18 01:00:43 vapier Exp $
+# $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 a8a6ade0..49102456 100755
--- a/bin/xpak
+++ b/bin/xpak
@@ -1,7 +1,7 @@
 #!/usr/bin/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/xpak,v 1.10 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 import sys
 if len(sys.argv)!=3: