sync fixes for GENTOO_MIRRORS and FETCHCOMMAND, and fix Copyright header

10 files changed, 45 insertions, 44 deletions

diff --git a/cnf/make.globals b/cnf/make.globals
index 7da0ada..8d68671 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -1,6 +1,7 @@
-# Copyright 2003 Daniel Robbins, 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/cnf/make.globals,v 1.55 2004/09/30 06:29:18 vapier Exp $
 # System-wide defaults for the Portage system
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals,v 1.54 2004/09/26 10:44:31 carpaski Exp $
 
 #            *****************************
 #            **  DO NOT EDIT THIS FILE  **
@@ -69,4 +70,3 @@ RSYNC_TIMEOUT="180"
 # ** Incremental Variables Accumulate Across Files **
 # **  USE, CONFIG_*, and FEATURES are incremental  **
 # ***************************************************
-
diff --git a/cnf/make.globals.alpha b/cnf/make.globals.alpha
index e5cbefa..ad28865 100644
--- a/cnf/make.globals.alpha
+++ b/cnf/make.globals.alpha
@@ -1,6 +1,7 @@
-# Copyright 2002 Daniel Robbins, 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/cnf/make.globals.alpha,v 1.13 2004/09/30 06:29:18 vapier Exp $
 # System-wide defaults for the Portage system
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.alpha,v 1.12 2004/09/26 10:44:31 carpaski Exp $
 
 #            *****************************
 #            **  DO NOT EDIT THIS FILE  **
@@ -11,7 +12,7 @@
 # **  USE, CONFIG_*, and FEATURES are incremental  **
 # ***************************************************
 
-GENTOO_MIRRORS="http://gentoo.osuosl.org http://www.ibiblio.org/pub/Linux/distributions/gentoo"
+GENTOO_MIRRORS="http://gentoo.osuosl.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
 SYNC="rsync://rsync.gentoo.org/gentoo-portage"
 # Host-type
 CHOST="alpha-unknown-linux-gnu"
@@ -28,8 +29,8 @@ CONFIG_PROTECT_MASK="/etc/gconf"
 MAKEOPTS="-j2"
 
 # Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND='/usr/bin/wget -t 5 --passive-ftp -P ${DISTDIR} ${URI}'
-RESUMECOMMAND='/usr/bin/wget -c -t 5 --passive-ftp -P ${DISTDIR} ${URI}'
+FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp -P \${DISTDIR} \${URI}"
+RESUMECOMMAND="/usr/bin/wget -c -t 5 --passive-ftp -P \${DISTDIR} \${URI}"
 
 CFLAGS="-O2 -pipe"
 CXXFLAGS=${CFLAGS}
@@ -39,7 +40,6 @@ CXXFLAGS=${CFLAGS}
 
 # Default maintainer options
 #FEATURES="digest sandbox noclean noauto buildpkg"
-#	WARNING: sandbox is broken on ppc - don't use!
 # Default user options
 FEATURES="distlocks ccache autoaddcvs"
 
diff --git a/cnf/make.globals.amd64 b/cnf/make.globals.amd64
index 026171a..7c33c47 100644
--- a/cnf/make.globals.amd64
+++ b/cnf/make.globals.amd64
@@ -1,6 +1,7 @@
-# Copyright 2003 Daniel Robbins, 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/cnf/make.globals.amd64,v 1.4 2004/09/30 06:29:18 vapier Exp $
 # System-wide defaults for the Portage system
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.amd64,v 1.3 2004/09/27 08:40:19 lv Exp $
 
 #            *****************************
 #            **  DO NOT EDIT THIS FILE  **
@@ -69,4 +70,3 @@ RSYNC_TIMEOUT="180"
 # ** Incremental Variables Accumulate Across Files **
 # **  USE, CONFIG_*, and FEATURES are incremental  **
 # ***************************************************
-
diff --git a/cnf/make.globals.arm b/cnf/make.globals.arm
index c3d3886..3e8e33d 100644
--- a/cnf/make.globals.arm
+++ b/cnf/make.globals.arm
@@ -1,6 +1,7 @@
-# Copyright 2002 Daniel Robbins, 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/cnf/make.globals.arm,v 1.10 2004/09/30 06:29:18 vapier Exp $
 # System-wide defaults for the Portage system
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.arm,v 1.9 2004/09/26 10:44:31 carpaski Exp $
 
 #            *****************************
 #            **  DO NOT EDIT THIS FILE  **
@@ -69,4 +70,3 @@ RSYNC_TIMEOUT="180"
 # ** Incremental Variables Accumulate Across Files **
 # **  USE, CONFIG_*, and FEATURES are incremental  **
 # ***************************************************
-
diff --git a/cnf/make.globals.hppa b/cnf/make.globals.hppa
index 9daaca8..20416d9 100644
--- a/cnf/make.globals.hppa
+++ b/cnf/make.globals.hppa
@@ -1,6 +1,7 @@
-# Copyright 2002 Daniel Robbins, 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/cnf/make.globals.hppa,v 1.14 2004/09/30 06:29:18 vapier Exp $
 # System-wide defaults for the Portage system
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.hppa,v 1.13 2004/09/26 10:44:31 carpaski Exp $
 
 #            *****************************
 #            **  DO NOT EDIT THIS FILE  **
@@ -69,4 +70,3 @@ RSYNC_TIMEOUT="180"
 # ** Incremental Variables Accumulate Across Files **
 # **  USE, CONFIG_*, and FEATURES are incremental  **
 # ***************************************************
-
diff --git a/cnf/make.globals.mac b/cnf/make.globals.mac
index ee0032f..04f43cc 100644
--- a/cnf/make.globals.mac
+++ b/cnf/make.globals.mac
@@ -1,6 +1,7 @@
-# Copyright 2002 Daniel Robbins, 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/cnf/make.globals.mac,v 1.8 2004/09/30 06:29:18 vapier Exp $
 # System-wide defaults for the Portage system
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.mac,v 1.7 2004/09/26 10:44:31 carpaski Exp $
 
 #            *****************************
 #            **  DO NOT EDIT THIS FILE  **
@@ -69,4 +70,3 @@ RSYNC_TIMEOUT="180"
 # ** Incremental Variables Accumulate Across Files **
 # **  USE, CONFIG_*, and FEATURES are incremental  **
 # ***************************************************
-
diff --git a/cnf/make.globals.mips b/cnf/make.globals.mips
index 466d66e..5f4d8da 100644
--- a/cnf/make.globals.mips
+++ b/cnf/make.globals.mips
@@ -1,6 +1,7 @@
-# Copyright 2002 Daniel Robbins, 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/cnf/make.globals.mips,v 1.13 2004/09/30 06:29:18 vapier Exp $
 # System-wide defaults for the Portage system
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.mips,v 1.12 2004/09/26 10:44:31 carpaski Exp $
 
 #            *****************************
 #            **  DO NOT EDIT THIS FILE  **
@@ -11,7 +12,7 @@
 # **  USE, CONFIG_*, and FEATURES are incremental  **
 # ***************************************************
 
-GENTOO_MIRRORS="http://gentoo.osuosl.org http://www.ibiblio.org/pub/Linux/distributions/gentoo"
+GENTOO_MIRRORS="http://gentoo.osuosl.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
 SYNC="rsync://rsync.gentoo.org/gentoo-portage"
 # Host-type
 CHOST="mips-unknown-linux-gnu"
@@ -28,10 +29,10 @@ CONFIG_PROTECT_MASK="/etc/gconf"
 MAKEOPTS="-j2"
 
 # Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND='/usr/bin/wget -t 5 --passive-ftp -P ${DISTDIR} ${URI}'
-RESUMECOMMAND='/usr/bin/wget -c -t 5 --passive-ftp -P ${DISTDIR} ${URI}'
+FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp -P \${DISTDIR} \${URI}"
+RESUMECOMMAND="/usr/bin/wget -c -t 5 --passive-ftp -P \${DISTDIR} \${URI}"
 
-CFLAGS=" -O2 -pipe "
+CFLAGS="-O2 -pipe"
 CXXFLAGS=${CFLAGS}
 
 # Debug build -- if defined, binaries won't be stripped
diff --git a/cnf/make.globals.ppc b/cnf/make.globals.ppc
index 4d29157..61eff58 100644
--- a/cnf/make.globals.ppc
+++ b/cnf/make.globals.ppc
@@ -1,6 +1,7 @@
-# Copyright 2002 Daniel Robbins, 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/cnf/make.globals.ppc,v 1.27 2004/09/30 06:29:18 vapier Exp $
 # System-wide defaults for the Portage system
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.ppc,v 1.26 2004/09/26 10:44:31 carpaski Exp $
 
 #            *****************************
 #            **  DO NOT EDIT THIS FILE  **
@@ -11,7 +12,7 @@
 # **  USE, CONFIG_*, and FEATURES are incremental  **
 # ***************************************************
 
-GENTOO_MIRRORS="http://gentoo.osuosl.org http://www.ibiblio.org/pub/Linux/distributions/gentoo"
+GENTOO_MIRRORS="http://gentoo.osuosl.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
 SYNC="rsync://rsync.gentoo.org/gentoo-portage"
 # Host-type
 CHOST="powerpc-unknown-linux-gnu"
@@ -28,10 +29,10 @@ CONFIG_PROTECT_MASK="/etc/gconf"
 MAKEOPTS="-j2"
 
 # Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND='/usr/bin/wget -t 5 --passive-ftp -P ${DISTDIR} ${URI}'
-RESUMECOMMAND='/usr/bin/wget -c -t 5 --passive-ftp -P ${DISTDIR} ${URI}'
+FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp -P \${DISTDIR} \${URI}"
+RESUMECOMMAND="/usr/bin/wget -c -t 5 --passive-ftp -P \${DISTDIR} \${URI}"
 
-CFLAGS=" -O2 -pipe "
+CFLAGS="-O2 -pipe"
 CXXFLAGS=${CFLAGS}
 
 # Debug build -- if defined, binaries won't be stripped
@@ -39,7 +40,6 @@ CXXFLAGS=${CFLAGS}
 
 # Default maintainer options
 #FEATURES="digest sandbox noclean noauto buildpkg"
-#	WARNING: sandbox is broken on ppc - don't use!
 # Default user options
 FEATURES="distlocks ccache autoaddcvs"
 
diff --git a/cnf/make.globals.sparc b/cnf/make.globals.sparc
index 1324857..b2fcb8c 100644
--- a/cnf/make.globals.sparc
+++ b/cnf/make.globals.sparc
@@ -1,6 +1,7 @@
-# Copyright 2002 Daniel Robbins, 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/cnf/make.globals.sparc,v 1.13 2004/09/30 06:29:18 vapier Exp $
 # System-wide defaults for the Portage system
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.sparc,v 1.12 2004/09/26 10:44:31 carpaski Exp $
 
 #            *****************************
 #            **  DO NOT EDIT THIS FILE  **
@@ -11,7 +12,7 @@
 # **  USE, CONFIG_*, and FEATURES are incremental  **
 # ***************************************************
 
-GENTOO_MIRRORS="http://gentoo.osuosl.org http://www.ibiblio.org/pub/Linux/distributions/gentoo"
+GENTOO_MIRRORS="http://gentoo.osuosl.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
 SYNC="rsync://rsync.gentoo.org/gentoo-portage"
 # Host-type
 CHOST="sparc-unknown-linux-gnu"
@@ -28,10 +29,10 @@ CONFIG_PROTECT_MASK="/etc/gconf"
 MAKEOPTS="-j2"
 
 # Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND='/usr/bin/wget -t 5 --passive-ftp -P ${DISTDIR} ${URI}'
-RESUMECOMMAND='/usr/bin/wget -c -t 5 --passive-ftp -P ${DISTDIR} ${URI}'
+FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp -P \${DISTDIR} \${URI}"
+RESUMECOMMAND="/usr/bin/wget -c -t 5 --passive-ftp -P \${DISTDIR} \${URI}"
 
-CFLAGS=" -O2 -pipe "
+CFLAGS="-O2 -pipe"
 CXXFLAGS=${CFLAGS}
 
 # Debug build -- if defined, binaries won't be stripped
@@ -39,7 +40,6 @@ CXXFLAGS=${CFLAGS}
 
 # Default maintainer options
 #FEATURES="digest sandbox noclean noauto buildpkg"
-#	WARNING: sandbox is broken on ppc - don't use!
 # Default user options
 FEATURES="distlocks ccache autoaddcvs"
 
diff --git a/cnf/make.globals.x86 b/cnf/make.globals.x86
index eac7316..be7a590 100644
--- a/cnf/make.globals.x86
+++ b/cnf/make.globals.x86
@@ -1,6 +1,7 @@
-# Copyright 2003 Daniel Robbins, 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/cnf/make.globals.x86,v 1.3 2004/09/30 06:29:18 vapier Exp $
 # System-wide defaults for the Portage system
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.x86,v 1.2 2004/09/26 10:44:31 carpaski Exp $
 
 #            *****************************
 #            **  DO NOT EDIT THIS FILE  **
@@ -69,4 +70,3 @@ RSYNC_TIMEOUT="180"
 # ** Incremental Variables Accumulate Across Files **
 # **  USE, CONFIG_*, and FEATURES are incremental  **
 # ***************************************************
-