copyright updates

72 files changed, 161 insertions, 148 deletions

diff --git a/bin/archive-conf b/bin/archive-conf
index 5c39fcd..e2cdfa1 100755
--- a/bin/archive-conf
+++ b/bin/archive-conf
@@ -1,14 +1,11 @@
 #!/usr/bin/python
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/archive-conf,v 1.6 2004/10/04 13:56:50 vapier Exp $
+# $Header: /local/data/ulm/cvs/history/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
 #
-#  Copyright 2003 Gentoo Technologies, Inc.
-#  Distributed under the terms of the GNU Public License v2
-#
 #  Written by Wayne Davison <gentoo@blorf.net> with code snagged from
 #  Jeremy Wohl's dispatch-conf script and the portage chkcontents script.
 #
diff --git a/bin/chkcontents b/bin/chkcontents
index 0ad84ba..0b643cf 100755
--- a/bin/chkcontents
+++ b/bin/chkcontents
@@ -1,7 +1,7 @@
 #!/usr/bin/python
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/chkcontents,v 1.10 2004/01/22 05:51:45 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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/db-update.py b/bin/db-update.py
index eaa3b9a..a87f77b 100644
--- a/bin/db-update.py
+++ b/bin/db-update.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/db-update.py,v 1.7 2004/01/24 19:03:19 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/db-update.py,v 1.8 2004/10/04 13:56:50 vapier Exp $
 
 import os,sys,string
 sys.path = ["/usr/lib/portage/pym"]+sys.path
diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 0f06653..3e7126c 100755
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -1,13 +1,12 @@
 #!/usr/bin/python -O
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/dispatch-conf,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
 #
 # dispatch-conf -- Integrate modified configs, post-emerge
 #
-#  Copyright 2003 Gentoo Technologies, Inc.
-#  Distributed under the terms of the GNU Public License v2
-#
 #  Jeremy Wohl (http://igmus.org)
-#  $Id: dispatch-conf,v 1.6 2004/09/09 08:02:53 carpaski Exp $
 #
 # TODO
 #  dialog menus
diff --git a/bin/dispatch-conf-dialog b/bin/dispatch-conf-dialog
index fc1ee5c..2447e3a 100755
--- a/bin/dispatch-conf-dialog
+++ b/bin/dispatch-conf-dialog
@@ -1,14 +1,13 @@
 #!/usr/bin/python -O
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/dispatch-conf-dialog,v 1.3 2004/10/04 13:56:50 vapier Exp $
 
 #
 # dispatch-conf-dialog -- Integrate modified configs, post-emerge
 # using a simple dialog interface...
 #
-#  Copyright 2003 Gentoo Technologies, Inc.
-#  Distributed under the terms of the GNU Public License v2
-#
 #  Jeremy Wohl (http://igmus.org)
-#  $Id: dispatch-conf-dialog,v 1.2 2004/08/09 04:00:48 ferringb Exp $
 #
 # TODO
 #  dialog menus
diff --git a/bin/dobin b/bin/dobin
index 4798f80..68fa6b7 100755
--- a/bin/dobin
+++ b/bin/dobin
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/dobin,v 1.12 2004/08/02 18:49:30 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 68a467c..0c94fa5 100755
--- a/bin/doconfd
+++ b/bin/doconfd
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/doconfd,v 1.1 2004/03/22 01:40:55 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/doconfd,v 1.2 2004/10/04 13:56:50 vapier Exp $
 
 if [ ${#} -lt 1 ] ; then
 	echo "doinfo: at least one argument needed"
diff --git a/bin/dodir b/bin/dodir
index 6916f93..c07081c 100755
--- a/bin/dodir
+++ b/bin/dodir
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/dodir,v 1.4 2003/02/22 16:59:08 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 a81afca..03cb131 100755
--- a/bin/dodoc
+++ b/bin/dodoc
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/dodoc,v 1.5 2003/04/27 21:16:47 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/dodoc,v 1.6 2004/10/04 13:56:50 vapier Exp $
 
 for x in "$@" ; do
 	if [ -s "${x}" ] ; then
diff --git a/bin/doenvd b/bin/doenvd
index da58fac..05eb67f 100755
--- a/bin/doenvd
+++ b/bin/doenvd
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/doenvd,v 1.1 2004/03/22 01:40:55 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/doenvd,v 1.2 2004/10/04 13:56:50 vapier Exp $
 
 if [ ${#} -lt 1 ] ; then
 	echo "doinfo: at least one argument needed"
diff --git a/bin/doexe b/bin/doexe
index b396d18..ccaa0dd 100755
--- a/bin/doexe
+++ b/bin/doexe
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/doexe,v 1.9 2003/04/09 14:36:59 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/doexe,v 1.10 2004/10/04 13:56:50 vapier Exp $
 
 mynum=${#}
 if [ ${mynum} -lt 1 ] ; then
diff --git a/bin/dohard b/bin/dohard
index 0ea8087..8f34968 100755
--- a/bin/dohard
+++ b/bin/dohard
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/dohard,v 1.5 2003/02/22 16:59:08 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 f5b4053..36fa43d 100755
--- a/bin/dohtml
+++ b/bin/dohtml
@@ -1,9 +1,9 @@
 #!/usr/bin/python
-
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/dohtml,v 1.13 2004/10/04 13:56:50 vapier Exp $
 # Author Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/dohtml,v 1.12 2004/07/26 00:47:51 ferringb Exp $
+
 #
 # Typical usage:
 # dohtml -r docs/*
diff --git a/bin/doinfo b/bin/doinfo
index 63ad8b1..69eb56f 100755
--- a/bin/doinfo
+++ b/bin/doinfo
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/doinfo,v 1.6 2003/06/22 23:05:23 vapier Exp $
+# $Header: /local/data/ulm/cvs/history/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 092c412..2bcf73d 100755
--- a/bin/doinitd
+++ b/bin/doinitd
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/doinitd,v 1.1 2004/03/22 01:40:55 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/doinitd,v 1.2 2004/10/04 13:56:50 vapier Exp $
 
 if [ ${#} -lt 1 ] ; then
 	echo "doinfo: at least one argument needed"
diff --git a/bin/doins b/bin/doins
index 33fb4ae..764c385 100755
--- a/bin/doins
+++ b/bin/doins
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/doins,v 1.5 2003/06/22 23:05:23 vapier Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/doins,v 1.6 2004/10/04 13:56:50 vapier Exp $
 
 if [ $# -lt 1 ] ; then
 	echo "${0}: at least one argument needed"
diff --git a/bin/dojar b/bin/dojar
index 308632d..a47cb44 100755
--- a/bin/dojar
+++ b/bin/dojar
@@ -1,9 +1,9 @@
-#! /bin/sh
-
-# Copyright 1999-2003 Gentoo Technologies, Inc.                                 
+#!/bin/sh
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Header: /local/data/ulm/cvs/history/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>
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/dojar,v 1.7 2003/06/22 23:05:23 vapier Exp $
+
 #
 # Typical usage:
 #  dojar foo.jar bar.jar
diff --git a/bin/doman b/bin/doman
index 7e97efd..4cd2315 100755
--- a/bin/doman
+++ b/bin/doman
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/doman,v 1.11 2003/07/22 07:19:04 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/doman,v 1.12 2004/10/04 13:56:50 vapier Exp $
 
 if [ ${#} -lt 1 ] ; then
 	echo "${0}: at least one argument needed" 1>&2
diff --git a/bin/domo b/bin/domo
index 949ca4a..1ee8d7b 100755
--- a/bin/domo
+++ b/bin/domo
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/domo,v 1.5 2003/02/22 16:59:08 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 3ee4a77..2c7d387 100755
--- a/bin/dopython
+++ b/bin/dopython
@@ -1,7 +1,7 @@
 #!/usr/bin/python
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/dopython,v 1.7 2003/11/10 08:30:55 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 b291249..dcb5ee1 100755
--- a/bin/dosbin
+++ b/bin/dosbin
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/dosbin,v 1.10 2004/08/02 18:49:30 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 4d3bc07..b0775de 100755
--- a/bin/dosed
+++ b/bin/dosed
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/dosed,v 1.6 2004/01/22 05:51:45 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 6237bbe..4031797 100755
--- a/bin/dosym
+++ b/bin/dosym
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/dosym,v 1.6 2003/02/22 16:59:08 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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.sh b/bin/ebuild.sh
index 9b4db80..f4414d3 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/ebuild.sh,v 1.197 2004/09/21 01:08:05 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/ebuild.sh,v 1.198 2004/10/04 13:56:50 vapier 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 8eed790..5e50cba 100755
--- a/bin/emake
+++ b/bin/emake
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/emake,v 1.8 2003/02/22 16:59:08 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/emake,v 1.9 2004/10/04 13:56:50 vapier 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 86d0eaa..21d6d68 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/emerge,v 1.333 2004/09/30 03:04:34 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/emerge,v 1.334 2004/10/04 13:56:50 vapier Exp $
 
 import os,sys
 os.environ["PORTAGE_CALLER"]="emerge"
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 40f5672..9011e23 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -1,7 +1,7 @@
 #!/bin/sh
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/Attic/emerge-webrsync,v 1.7 2004/09/30 03:04:35 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/Attic/emerge-webrsync,v 1.8 2004/10/04 13:56:50 vapier Exp $
 # 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 78e3a28..838178c 100755
--- a/bin/env-update
+++ b/bin/env-update
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/env-update,v 1.8 2003/11/10 08:30:55 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 ce104f1..a7b8691 100755
--- a/bin/env-update.sh
+++ b/bin/env-update.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/env-update.sh,v 1.1 2004/08/15 05:33:57 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 b0b8b75..cd6bcb5 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -1,14 +1,14 @@
 #!/bin/bash
-# Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU Public License v2
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/etc-update,v 1.23 2004/10/04 13:56:50 vapier Exp $
+
 # Author Brandon Low <lostlogic@gentoo.org>
 #
 # Previous version (from which I've borrowed a few bits) by:
 # Jochem Kossen <j.kossen@home.nl>
 # Leo Lipelis <aeoo@gentoo.org>
 # Karl Trygve Kalleberg <karltk@gentoo.org>
-#
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/etc-update,v 1.22 2004/09/27 23:38:21 jstubbs Exp $
 
 export PORTAGE_CALLER="etc-update"
 
diff --git a/bin/find-requires b/bin/find-requires
index 956ca2d..9746159 100755
--- a/bin/find-requires
+++ b/bin/find-requires
@@ -1,7 +1,7 @@
 #!/bin/sh
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/find-requires,v 1.4 2003/06/11 06:44:03 drobbins Exp $
+# $Header: /local/data/ulm/cvs/history/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 313fc8d..048008a 100755
--- a/bin/fix-db.py
+++ b/bin/fix-db.py
@@ -1,4 +1,7 @@
 #!/usr/bin/python
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/fix-db.py,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
 import os,sys,re
 sys.path = ["/usr/lib/portage/pym"]+sys.path
diff --git a/bin/fixdbentries b/bin/fixdbentries
index 696951b..2da87ec 100755
--- a/bin/fixdbentries
+++ b/bin/fixdbentries
@@ -1,7 +1,10 @@
 #!/bin/bash
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /local/data/ulm/cvs/history/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
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/fixdbentries,v 1.2 2003/06/11 06:44:03 drobbins Exp $
 
 VAR=$1
 NEW=$2
diff --git a/bin/fixpackages b/bin/fixpackages
index f1ef443..0a6104d 100755
--- a/bin/fixpackages
+++ b/bin/fixpackages
@@ -1,7 +1,7 @@
 #!/usr/bin/python
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/fixpackages,v 1.5 2003/11/10 08:30:55 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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/fixvardbentries b/bin/fixvardbentries
index 5202f10..95792a6 100755
--- a/bin/fixvardbentries
+++ b/bin/fixvardbentries
@@ -1,5 +1,7 @@
 #!/usr/bin/python -O
-# arch-tag: c2d62f90-d585-4f81-b92b-8588b9238e58
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/fixvardbentries,v 1.3 2004/10/04 13:56:50 vapier Exp $
 
 import os
 import sys
diff --git a/bin/fixvirtuals b/bin/fixvirtuals
index 8e7b443..3726483 100755
--- a/bin/fixvirtuals
+++ b/bin/fixvirtuals
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/fixvirtuals,v 1.1 2003/11/28 13:27:16 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/fixvirtuals,v 1.2 2004/10/04 13:56:50 vapier Exp $
 
 import os,sys
 sys.path = ["/usr/lib/portage/pym"]+sys.path
diff --git a/bin/fowners b/bin/fowners
index 68ae728..d4f8ce3 100755
--- a/bin/fowners
+++ b/bin/fowners
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/fowners,v 1.5 2003/02/22 16:59:08 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 e9ccdb1..abde921 100755
--- a/bin/fperms
+++ b/bin/fperms
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/fperms,v 1.5 2003/02/22 16:59:08 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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/g-cpan.pl b/bin/g-cpan.pl
index 686f56f..6a6d170 100755
--- a/bin/g-cpan.pl
+++ b/bin/g-cpan.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/Attic/g-cpan.pl,v 1.14 2004/10/04 13:56:50 vapier Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/Attic/g-cpan.pl,v 1.15 2004/10/04 13:58:03 vapier Exp $
 
 # History: 
 
@@ -182,7 +182,7 @@ sub create_ebuild {
     print EBUILD <<"HERE";
 
 
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit perl-module
diff --git a/bin/md5check.py b/bin/md5check.py
index d8f4996..e443b83 100755
--- a/bin/md5check.py
+++ b/bin/md5check.py
@@ -1,4 +1,7 @@
 #!/usr/bin/python -O
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/md5check.py,v 1.3 2004/10/04 13:56:50 vapier Exp $
 
 import os,sys,string
 os.environ["PORTAGE_CALLER"]="mirror"
diff --git a/bin/md5check.sh b/bin/md5check.sh
index d3f1c1d..ddb242b 100755
--- a/bin/md5check.sh
+++ b/bin/md5check.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /local/data/ulm/cvs/history/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 a79873f..997ccde 100755
--- a/bin/mirror.py
+++ b/bin/mirror.py
@@ -1,4 +1,7 @@
 #!/usr/bin/python -O
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/mirror.py,v 1.2 2004/10/04 13:56:50 vapier Exp $
 
 # Defines the number of threads carrying out the downloading.
 maxsems=5
diff --git a/bin/newbin b/bin/newbin
index ff3dfca..dc503e8 100755
--- a/bin/newbin
+++ b/bin/newbin
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/newbin,v 1.6 2003/02/22 16:59:08 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 5435b94..36881be 100755
--- a/bin/newconfd
+++ b/bin/newconfd
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/newconfd,v 1.1 2004/03/22 01:40:55 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 ae34336..71a21da 100755
--- a/bin/newdoc
+++ b/bin/newdoc
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/newdoc,v 1.6 2003/02/22 16:59:08 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 21ef439..08eade0 100755
--- a/bin/newenvd
+++ b/bin/newenvd
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/newenvd,v 1.1 2004/03/22 01:40:55 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 3537623..f42deeb 100755
--- a/bin/newexe
+++ b/bin/newexe
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/newexe,v 1.6 2003/02/22 16:59:08 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 6eb264c..69db068 100755
--- a/bin/newinitd
+++ b/bin/newinitd
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/newinitd,v 1.1 2004/03/22 01:40:55 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 946765e..3652ea7 100755
--- a/bin/newins
+++ b/bin/newins
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/newins,v 1.6 2003/02/22 16:59:08 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 5065a22..6e5a2f7 100755
--- a/bin/newlib.a
+++ b/bin/newlib.a
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/newlib.a,v 1.6 2003/02/22 16:59:08 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 dafe5c5..f183d89 100755
--- a/bin/newlib.so
+++ b/bin/newlib.so
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/newlib.so,v 1.6 2003/02/22 16:59:08 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 0393cc2..b0138ff 100755
--- a/bin/newman
+++ b/bin/newman
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/newman,v 1.6 2003/02/22 16:59:08 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 65bac4d..5c35ea4 100755
--- a/bin/newsbin
+++ b/bin/newsbin
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/newsbin,v 1.6 2003/02/22 16:59:08 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 4128899..1628d39 100755
--- a/bin/pkgmerge
+++ b/bin/pkgmerge
@@ -1,7 +1,7 @@
 #!/usr/bin/python
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/pkgmerge,v 1.7 2003/11/10 08:30:55 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 808e9d1..40ab737 100755
--- a/bin/pkgmerge.new
+++ b/bin/pkgmerge.new
@@ -1,7 +1,7 @@
 #!/usr/bin/python
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/pkgmerge.new,v 1.6 2003/11/10 08:30:55 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 a152603..e0869eb 100755
--- a/bin/pkgname
+++ b/bin/pkgname
@@ -1,7 +1,7 @@
 #!/usr/bin/python
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/pkgname,v 1.7 2003/11/10 08:30:55 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 e5d20d3..fc31ae7 100755
--- a/bin/portage_gpg_update.sh
+++ b/bin/portage_gpg_update.sh
@@ -1,5 +1,6 @@
-
+#!/bin/bash
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /local/data/ulm/cvs/history/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 73ec66b..b95753a 100755
--- a/bin/portageq
+++ b/bin/portageq
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/portageq,v 1.12 2004/01/22 05:51:45 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/portageq,v 1.13 2004/10/04 13:56:50 vapier Exp $
 
 import sys
 sys.path = ["/usr/lib/portage/pym"]+sys.path
@@ -202,7 +202,7 @@ def envvar(argv):
 #
 
 def usage():
-	rev="$Revision: 1.12 $"
+	rev="$Revision: 1.13 $"
 	ver=string.split(rev, ' ')[1]
 	print ">>> Portage information query tool -- version "+ver
 	print ">>> Usage: portageq <command> [<option> ...]"
diff --git a/bin/prepall b/bin/prepall
index 4244f6d..97a28fd 100755
--- a/bin/prepall
+++ b/bin/prepall
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/prepall,v 1.8 2004/08/16 08:19:38 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/prepall,v 1.9 2004/10/04 13:56:50 vapier Exp $
 
 prepallman
 prepallinfo
diff --git a/bin/prepalldocs b/bin/prepalldocs
index c8bcb0b..6346ca9 100755
--- a/bin/prepalldocs
+++ b/bin/prepalldocs
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/prepalldocs,v 1.5 2003/02/22 16:59:08 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 fb8bf57..7baccd6 100755
--- a/bin/prepallinfo
+++ b/bin/prepallinfo
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/prepallinfo,v 1.5 2003/02/22 16:59:08 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 f5ec29f..9669878 100755
--- a/bin/prepallman
+++ b/bin/prepallman
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/prepallman,v 1.9 2003/11/28 13:27:16 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 dbe210f..d2ffdd7 100755
--- a/bin/prepallstrip
+++ b/bin/prepallstrip
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/prepallstrip,v 1.11 2003/04/09 14:36:59 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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 037b4da..dc95ef5 100755
--- a/bin/prepinfo
+++ b/bin/prepinfo
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/prepinfo,v 1.5 2003/02/22 16:59:08 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/prepinfo,v 1.6 2004/10/04 13:56:50 vapier Exp $
 
 if [ -z "$1" ] ; then
 	z="${D}usr/share/info"
diff --git a/bin/preplib b/bin/preplib
index 70319ce..30d5455 100755
--- a/bin/preplib
+++ b/bin/preplib
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/preplib,v 1.6 2004/08/16 08:19:38 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/preplib,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
 if [ -z "${CONF_LIBDIR}" ]; then
 	# we need this to default to lib so that things dont break
diff --git a/bin/preplib.so b/bin/preplib.so
index ce62776..94d9105 100755
--- a/bin/preplib.so
+++ b/bin/preplib.so
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/preplib.so,v 1.9 2003/04/09 14:36:59 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/preplib.so,v 1.10 2004/10/04 13:56:50 vapier Exp $
 
 if [ "${FEATURES//*nostrip*/true}" == "true" ] || [ "${RESTRICT//*nostrip*/true}" == "true" ] ; then
 	exit 0
diff --git a/bin/prepman b/bin/prepman
index c1183df..4051401 100755
--- a/bin/prepman
+++ b/bin/prepman
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/prepman,v 1.9 2004/09/05 02:22:16 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/prepman,v 1.10 2004/10/04 13:56:50 vapier Exp $
 
 if [ -z "$1" ] ; then 
 	z="${D}usr/share/man"
diff --git a/bin/prepstrip b/bin/prepstrip
index 4d390f9..cc52164 100755
--- a/bin/prepstrip
+++ b/bin/prepstrip
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/prepstrip,v 1.21 2004/08/02 18:49:30 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/prepstrip,v 1.22 2004/10/04 13:56:50 vapier Exp $
 
 if [ "${FEATURES//*nostrip*/true}" == "true" ] || [ "${RESTRICT//*nostrip*/true}" == "true" ] ; then
 	echo "nostrip"
diff --git a/bin/queryhost.sh b/bin/queryhost.sh
index 2d036a2..d1ff1c7 100755
--- a/bin/queryhost.sh
+++ b/bin/queryhost.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/queryhost.sh,v 1.5 2003/02/22 16:59:08 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/queryhost.sh,v 1.6 2004/10/04 13:56:50 vapier Exp $
 
 # Ping a single host and collect the round-trip time.  Unfortunately
 # this measures latency, not bandwidth, but it's better than nothing.
diff --git a/bin/quickpkg b/bin/quickpkg
index 739b29d..d2b75ae 100755
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -1,8 +1,7 @@
 #!/bin/bash
-# Copyright (C) 2001 - Terry Chan
-# Copyright 2002-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/quickpkg,v 1.11 2004/01/22 05:51:45 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/quickpkg,v 1.12 2004/10/04 13:56:50 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 5260344..1c3f5c3 100755
--- a/bin/regenworld
+++ b/bin/regenworld
@@ -1,6 +1,7 @@
 #!/usr/bin/python
-
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/regenworld,v 1.9 2004/06/26 14:13:00 nakano Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/regenworld,v 1.10 2004/10/04 13:56:50 vapier Exp $
 
 import sys
 sys.path.insert(0, "/usr/lib/portage/pym")
diff --git a/bin/xpak b/bin/xpak
index 6165ac5..fc6b467 100755
--- a/bin/xpak
+++ b/bin/xpak
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/xpak,v 1.9 2003/11/28 13:27:16 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/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: