aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Jones <carpaski@gentoo.org>2004-11-30 22:20:24 +0000
committerNicholas Jones <carpaski@gentoo.org>2004-11-30 22:20:24 +0000
commitdd2915ade79741b6e47bf980a602364bdb81c9a3 (patch)
treea612b35868863c08b8d9a6d13e88ad789c894e6a
parentfix var capitalization #72720 (diff)
downloadportage-cvs-portage_2_0_51_r5.tar.gz
portage-cvs-portage_2_0_51_r5.tar.bz2
portage-cvs-portage_2_0_51_r5.zip
Added the missing return to treewalk. Removed prozilla references.portage_2_0_51_r5
Changed the default mirror to distfiles.gentoo.org RR.
-rw-r--r--ChangeLog11
-rw-r--r--cnf/make.conf5
-rw-r--r--cnf/make.conf.alpha5
-rw-r--r--cnf/make.conf.amd645
-rw-r--r--cnf/make.conf.arm5
-rw-r--r--cnf/make.conf.hppa5
-rw-r--r--cnf/make.conf.ia645
-rw-r--r--cnf/make.conf.mips5
-rw-r--r--cnf/make.conf.ppc5
-rw-r--r--cnf/make.conf.s3905
-rw-r--r--cnf/make.conf.sparc5
-rw-r--r--cnf/make.conf.x865
-rw-r--r--cnf/make.globals4
-rw-r--r--cnf/make.globals.alpha4
-rw-r--r--cnf/make.globals.amd644
-rw-r--r--cnf/make.globals.arm4
-rw-r--r--cnf/make.globals.hppa4
-rw-r--r--cnf/make.globals.ia644
-rw-r--r--cnf/make.globals.mac4
-rw-r--r--cnf/make.globals.mips4
-rw-r--r--cnf/make.globals.ppc4
-rw-r--r--cnf/make.globals.s3904
-rw-r--r--cnf/make.globals.sparc4
-rw-r--r--cnf/make.globals.x864
-rw-r--r--pym/portage.py3
25 files changed, 47 insertions, 70 deletions
diff --git a/ChangeLog b/ChangeLog
index 530921d..589b0fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,21 @@
# ChangeLog for Portage; the Gentoo Linux ports system
# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.796.2.18 2004/11/29 08:41:27 carpaski Exp $
+# $Id: ChangeLog,v 1.796.2.19 2004/11/30 22:20:24 carpaski Exp $
MAJOR CHANGES in 2.0.51:
1. /var/cache/edb/virtuals is no longer used at all. It's calculated now.
2. /var/cache/edb/world is now /var/lib/portage/world.
3. /etc/portage/profile/virtuals is _USER_ configs only.
+*portage-2.0.51-r5 (30 Nov 2004): Cleanup
+
+ 29 Nov 2004; Nicholas Jones <carpaski@gentoo.org> portage.py: Added a
+ (backport?) missing return to treewalk.
+
+ 29 Nov 2004; Nicholas Jones <carpaski@gentoo.org> cnf/*: Removed the
+ prozilla references. Adjusted the default mirrors to a gentoo round-
+ robin.
+
29 Nov 2004; Nicholas Jones <carpaski@gentoo.org> portage_exec.py: Modified
the magic constants to be os.access calls.
diff --git a/cnf/make.conf b/cnf/make.conf
index c7918be..11e6678 100644
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -1,6 +1,6 @@
# 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.conf,v 1.84 2004/10/10 23:27:28 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf,v 1.84.2.1 2004/11/30 22:20:24 carpaski Exp $
# Contains local system settings for Portage system
# Please review 'man make.conf' for more information.
@@ -160,9 +160,6 @@ CHOST="i686-pc-linux-gnu"
#FETCHCOMMAND="/usr/bin/lukemftp -s -a -o \${DISTDIR}/\${FILE} \${URI}"
#RESUMECOMMAND="/usr/bin/lukemftp -s -a -R -o \${DISTDIR}/\${FILE} \${URI}"
#
-# Prozilla (turbo downloader)
-#FETCHCOMMAND='/usr/bin/proz --no-getch -s ${URI} -P ${DISTDIR}'
-#
# Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval.
# The list is a space separated list which is read left to right. If you use
# another mirror we highly recommend leaving the default mirror at the end of
diff --git a/cnf/make.conf.alpha b/cnf/make.conf.alpha
index 181f84f..ee613d8 100644
--- a/cnf/make.conf.alpha
+++ b/cnf/make.conf.alpha
@@ -1,6 +1,6 @@
# 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.conf.alpha,v 1.40 2004/10/10 23:27:28 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.alpha,v 1.40.2.1 2004/11/30 22:20:24 carpaski Exp $
# Contains local system settings for Portage system
# Please review 'man make.conf' for more information.
@@ -146,9 +146,6 @@ CFLAGS="-mcpu=ev5 -O3 -pipe "
#FETCHCOMMAND="/usr/bin/lukemftp -s -a -o \${DISTDIR}/\${FILE} \${URI}"
#RESUMECOMMAND="/usr/bin/lukemftp -s -a -R -o \${DISTDIR}/\${FILE} \${URI}"
#
-# Prozilla (turbo downloader)
-#FETCHCOMMAND='/usr/bin/proz --no-getch -s ${URI} -P ${DISTDIR}'
-#
# Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval.
# The list is a space separated list which is read left to right. If you use
# another mirror we highly recommend leaving the default mirror at the end of
diff --git a/cnf/make.conf.amd64 b/cnf/make.conf.amd64
index 3230f1c..5fed5db 100644
--- a/cnf/make.conf.amd64
+++ b/cnf/make.conf.amd64
@@ -1,6 +1,6 @@
# 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.conf.amd64,v 1.5 2004/10/10 23:27:28 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.amd64,v 1.5.2.1 2004/11/30 22:20:24 carpaski Exp $
# Contains local system settings for Portage system
# Please review 'man make.conf' for more information.
@@ -158,9 +158,6 @@ CHOST="x86_64-pc-linux-gnu"
#FETCHCOMMAND="/usr/bin/lukemftp -s -a -o \${DISTDIR}/\${FILE} \${URI}"
#RESUMECOMMAND="/usr/bin/lukemftp -s -a -R -o \${DISTDIR}/\${FILE} \${URI}"
#
-# Prozilla (turbo downloader)
-#FETCHCOMMAND='/usr/bin/proz --no-getch -s ${URI} -P ${DISTDIR}'
-#
# Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval.
# The list is a space separated list which is read left to right. If you use
# another mirror we highly recommend leaving the default mirror at the end of
diff --git a/cnf/make.conf.arm b/cnf/make.conf.arm
index e7f4ab5..49376e1 100644
--- a/cnf/make.conf.arm
+++ b/cnf/make.conf.arm
@@ -1,6 +1,6 @@
# 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.conf.arm,v 1.31 2004/10/15 01:34:01 vapier Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.arm,v 1.31.2.1 2004/11/30 22:20:24 carpaski Exp $
# Contains local system settings for Portage system
# Please review 'man make.conf' for more information.
@@ -154,9 +154,6 @@ CHOST="armv4l-unknown-linux-gnu"
#FETCHCOMMAND="/usr/bin/lukemftp -s -a -o \${DISTDIR}/\${FILE} \${URI}"
#RESUMECOMMAND="/usr/bin/lukemftp -s -a -R -o \${DISTDIR}/\${FILE} \${URI}"
#
-# Prozilla (turbo downloader)
-#FETCHCOMMAND='/usr/bin/proz --no-getch -s ${URI} -P ${DISTDIR}'
-#
# Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval.
# The list is a space separated list which is read left to right. If you use
# another mirror we highly recommend leaving the default mirror at the end of
diff --git a/cnf/make.conf.hppa b/cnf/make.conf.hppa
index ac289f7..493363b 100644
--- a/cnf/make.conf.hppa
+++ b/cnf/make.conf.hppa
@@ -1,6 +1,6 @@
# 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.conf.hppa,v 1.37 2004/10/10 23:27:28 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.hppa,v 1.37.2.1 2004/11/30 22:20:24 carpaski Exp $
# Contains local system settings for Portage system
# Please review 'man make.conf' for more information.
@@ -163,9 +163,6 @@ CHOST="hppa-unknown-linux-gnu"
#FETCHCOMMAND="/usr/bin/lukemftp -s -a -o \${DISTDIR}/\${FILE} \${URI}"
#RESUMECOMMAND="/usr/bin/lukemftp -s -a -R -o \${DISTDIR}/\${FILE} \${URI}"
#
-# Prozilla (turbo downloader)
-#FETCHCOMMAND='/usr/bin/proz --no-getch -s ${URI} -P ${DISTDIR}'
-#
# Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval.
# The list is a space separated list which is read left to right. If you use
# another mirror we highly recommend leaving the default mirror at the end of
diff --git a/cnf/make.conf.ia64 b/cnf/make.conf.ia64
index ed3db3b..283d2fc 100644
--- a/cnf/make.conf.ia64
+++ b/cnf/make.conf.ia64
@@ -1,6 +1,6 @@
# 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.conf.ia64,v 1.1 2004/10/12 02:00:34 vapier Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.ia64,v 1.1.2.1 2004/11/30 22:20:24 carpaski Exp $
# Contains local system settings for Portage system
# Please review 'man make.conf' for more information.
@@ -126,9 +126,6 @@ CHOST="ia64-unknown-linux-gnu"
#FETCHCOMMAND="/usr/bin/lukemftp -s -a -o \${DISTDIR}/\${FILE} \${URI}"
#RESUMECOMMAND="/usr/bin/lukemftp -s -a -R -o \${DISTDIR}/\${FILE} \${URI}"
#
-# Prozilla (turbo downloader)
-#FETCHCOMMAND='/usr/bin/proz --no-getch -s ${URI} -P ${DISTDIR}'
-#
# Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval.
# The list is a space separated list which is read left to right. If you use
# another mirror we highly recommend leaving the default mirror at the end of
diff --git a/cnf/make.conf.mips b/cnf/make.conf.mips
index db8f676..c057df3 100644
--- a/cnf/make.conf.mips
+++ b/cnf/make.conf.mips
@@ -1,6 +1,6 @@
# 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.conf.mips,v 1.38 2004/10/10 23:27:28 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.mips,v 1.38.2.1 2004/11/30 22:20:24 carpaski Exp $
# Contains local system settings for Portage system
# Please review 'man make.conf' for more information.
@@ -144,9 +144,6 @@ CHOST="mips-unknown-linux-gnu"
#FETCHCOMMAND="/usr/bin/lukemftp -s -a -o \${DISTDIR}/\${FILE} \${URI}"
#RESUMECOMMAND="/usr/bin/lukemftp -s -a -R -o \${DISTDIR}/\${FILE} \${URI}"
#
-# Prozilla (turbo downloader)
-#FETCHCOMMAND='/usr/bin/proz --no-getch -s ${URI} -P ${DISTDIR}'
-#
# Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval.
# The list is a space separated list which is read left to right. If you use
# another mirror we highly recommend leaving the default mirror at the end of
diff --git a/cnf/make.conf.ppc b/cnf/make.conf.ppc
index 1a65d3e..799e779 100644
--- a/cnf/make.conf.ppc
+++ b/cnf/make.conf.ppc
@@ -1,6 +1,6 @@
# 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.conf.ppc,v 1.57 2004/10/10 23:27:28 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.ppc,v 1.57.2.1 2004/11/30 22:20:24 carpaski Exp $
# Contains local system settings for Portage system
# Please review 'man make.conf' for more information.
@@ -177,9 +177,6 @@ CHOST="powerpc-unknown-linux-gnu"
#FETCHCOMMAND="/usr/bin/lukemftp -s -a -o \${DISTDIR}/\${FILE} \${URI}"
#RESUMECOMMAND="/usr/bin/lukemftp -s -a -R -o \${DISTDIR}/\${FILE} \${URI}"
#
-# Prozilla (turbo downloader)
-#FETCHCOMMAND='/usr/bin/proz --no-getch -s ${URI} -P ${DISTDIR}'
-#
# Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval.
# The list is a space separated list which is read left to right. If you use
# another mirror we highly recommend leaving the default mirror at the end of
diff --git a/cnf/make.conf.s390 b/cnf/make.conf.s390
index 9e9f2ae..0b9207d 100644
--- a/cnf/make.conf.s390
+++ b/cnf/make.conf.s390
@@ -1,6 +1,6 @@
# 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.conf.s390,v 1.3 2004/10/10 23:27:28 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.s390,v 1.3.2.1 2004/11/30 22:20:24 carpaski Exp $
# Contains local system settings for Portage system
# Please review 'man make.conf' for more information.
@@ -126,9 +126,6 @@ CHOST="s390-ibm-linux-gnu"
#FETCHCOMMAND="/usr/bin/lukemftp -s -a -o \${DISTDIR}/\${FILE} \${URI}"
#RESUMECOMMAND="/usr/bin/lukemftp -s -a -R -o \${DISTDIR}/\${FILE} \${URI}"
#
-# Prozilla (turbo downloader)
-#FETCHCOMMAND='/usr/bin/proz --no-getch -s ${URI} -P ${DISTDIR}'
-#
# Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval.
# The list is a space separated list which is read left to right. If you use
# another mirror we highly recommend leaving the default mirror at the end of
diff --git a/cnf/make.conf.sparc b/cnf/make.conf.sparc
index abbfa77..73e2819 100644
--- a/cnf/make.conf.sparc
+++ b/cnf/make.conf.sparc
@@ -1,6 +1,6 @@
# 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.conf.sparc,v 1.42 2004/10/10 23:27:28 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.sparc,v 1.42.2.1 2004/11/30 22:20:24 carpaski Exp $
# Contains local system settings for Portage system
# Please review 'man make.conf' for more information.
@@ -167,9 +167,6 @@ CHOST="sparc-unknown-linux-gnu"
#FETCHCOMMAND="/usr/bin/lukemftp -s -a -o \${DISTDIR}/\${FILE} \${URI}"
#RESUMECOMMAND="/usr/bin/lukemftp -s -a -R -o \${DISTDIR}/\${FILE} \${URI}"
#
-# Prozilla (turbo downloader)
-#FETCHCOMMAND='/usr/bin/proz --no-getch -s ${URI} -P ${DISTDIR}'
-#
# Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval.
# The list is a space separated list which is read left to right. If you use
# another mirror we highly recommend leaving the default mirror at the end of
diff --git a/cnf/make.conf.x86 b/cnf/make.conf.x86
index b39b577..5d8a00e 100644
--- a/cnf/make.conf.x86
+++ b/cnf/make.conf.x86
@@ -1,6 +1,6 @@
# 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.conf.x86,v 1.5 2004/10/10 23:27:28 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.x86,v 1.5.2.1 2004/11/30 22:20:24 carpaski Exp $
# Contains local system settings for Portage system
# Please review 'man make.conf' for more information.
@@ -160,9 +160,6 @@ CHOST="i686-pc-linux-gnu"
#FETCHCOMMAND="/usr/bin/lukemftp -s -a -o \${DISTDIR}/\${FILE} \${URI}"
#RESUMECOMMAND="/usr/bin/lukemftp -s -a -R -o \${DISTDIR}/\${FILE} \${URI}"
#
-# Prozilla (turbo downloader)
-#FETCHCOMMAND='/usr/bin/proz --no-getch -s ${URI} -P ${DISTDIR}'
-#
# Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval.
# The list is a space separated list which is read left to right. If you use
# another mirror we highly recommend leaving the default mirror at the end of
diff --git a/cnf/make.globals b/cnf/make.globals
index 71967d2..9d39b3f 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -1,6 +1,6 @@
# 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.56 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals,v 1.56.2.1 2004/11/30 22:20:24 carpaski Exp $
# System-wide defaults for the Portage system
# *****************************
@@ -12,7 +12,7 @@
# ** USE, CONFIG_*, and FEATURES are incremental **
# ***************************************************
-GENTOO_MIRRORS="http://gentoo.osuosl.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
+GENTOO_MIRRORS="http://distfiles.gentoo.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
# Host-type
CHOST=i686-pc-linux-gnu
diff --git a/cnf/make.globals.alpha b/cnf/make.globals.alpha
index 2f656f0..471118e 100644
--- a/cnf/make.globals.alpha
+++ b/cnf/make.globals.alpha
@@ -1,6 +1,6 @@
# 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.14 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.alpha,v 1.14.2.1 2004/11/30 22:20:24 carpaski Exp $
# System-wide defaults for the Portage system
# *****************************
@@ -12,7 +12,7 @@
# ** USE, CONFIG_*, and FEATURES are incremental **
# ***************************************************
-GENTOO_MIRRORS="http://gentoo.osuosl.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
+GENTOO_MIRRORS="http://distfiles.gentoo.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
# Host-type
CHOST="alpha-unknown-linux-gnu"
diff --git a/cnf/make.globals.amd64 b/cnf/make.globals.amd64
index 9ae1040..799aa20 100644
--- a/cnf/make.globals.amd64
+++ b/cnf/make.globals.amd64
@@ -1,6 +1,6 @@
# 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.5 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.amd64,v 1.5.2.1 2004/11/30 22:20:24 carpaski Exp $
# System-wide defaults for the Portage system
# *****************************
@@ -12,7 +12,7 @@
# ** USE, CONFIG_*, and FEATURES are incremental **
# ***************************************************
-GENTOO_MIRRORS="http://gentoo.osuosl.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
+GENTOO_MIRRORS="http://distfiles.gentoo.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
# Host-type
CHOST=x86_64-pc-linux-gnu
diff --git a/cnf/make.globals.arm b/cnf/make.globals.arm
index bfb4009..910972e 100644
--- a/cnf/make.globals.arm
+++ b/cnf/make.globals.arm
@@ -1,6 +1,6 @@
# 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.11.2.1 2004/10/22 16:53:30 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.arm,v 1.11.2.2 2004/11/30 22:20:24 carpaski Exp $
# System-wide defaults for the Portage system
# *****************************
@@ -12,7 +12,7 @@
# ** USE, CONFIG_*, and FEATURES are incremental **
# ***************************************************
-GENTOO_MIRRORS="http://gentoo.osuosl.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
+GENTOO_MIRRORS="http://distfiles.gentoo.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
# Host-type
CHOST=arm-unknown-linux-gnu
diff --git a/cnf/make.globals.hppa b/cnf/make.globals.hppa
index 38aaacf..235b738 100644
--- a/cnf/make.globals.hppa
+++ b/cnf/make.globals.hppa
@@ -1,6 +1,6 @@
# 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.15 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.hppa,v 1.15.2.1 2004/11/30 22:20:24 carpaski Exp $
# System-wide defaults for the Portage system
# *****************************
@@ -12,7 +12,7 @@
# ** USE, CONFIG_*, and FEATURES are incremental **
# ***************************************************
-GENTOO_MIRRORS="http://gentoo.osuosl.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
+GENTOO_MIRRORS="http://distfiles.gentoo.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
# Host-type
CHOST=hppa-unknown-linux-gnu
diff --git a/cnf/make.globals.ia64 b/cnf/make.globals.ia64
index 31d000f..add95a5 100644
--- a/cnf/make.globals.ia64
+++ b/cnf/make.globals.ia64
@@ -1,6 +1,6 @@
# 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.ia64,v 1.1 2004/10/12 02:00:34 vapier Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.ia64,v 1.1.2.1 2004/11/30 22:20:24 carpaski Exp $
# System-wide defaults for the Portage system
# *****************************
@@ -12,7 +12,7 @@
# ** USE, CONFIG_*, and FEATURES are incremental **
# ***************************************************
-GENTOO_MIRRORS="http://gentoo.osuosl.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
+GENTOO_MIRRORS="http://distfiles.gentoo.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
# Host-type
CHOST=ia64-unknown-linux-gnu
diff --git a/cnf/make.globals.mac b/cnf/make.globals.mac
index 6e0c84f..42a91bf 100644
--- a/cnf/make.globals.mac
+++ b/cnf/make.globals.mac
@@ -1,6 +1,6 @@
# 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.9 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.mac,v 1.9.2.1 2004/11/30 22:20:24 carpaski Exp $
# System-wide defaults for the Portage system
# *****************************
@@ -12,7 +12,7 @@
# ** USE, CONFIG_*, and FEATURES are incremental **
# ***************************************************
-GENTOO_MIRRORS="http://gentoo.osuosl.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
+GENTOO_MIRRORS="http://distfiles.gentoo.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
# Host-type
CHOST=ppc-darwin
diff --git a/cnf/make.globals.mips b/cnf/make.globals.mips
index 89d2136..2a197c6 100644
--- a/cnf/make.globals.mips
+++ b/cnf/make.globals.mips
@@ -1,6 +1,6 @@
# 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.14 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.mips,v 1.14.2.1 2004/11/30 22:20:24 carpaski Exp $
# System-wide defaults for the Portage system
# *****************************
@@ -12,7 +12,7 @@
# ** USE, CONFIG_*, and FEATURES are incremental **
# ***************************************************
-GENTOO_MIRRORS="http://gentoo.osuosl.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
+GENTOO_MIRRORS="http://distfiles.gentoo.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
# Host-type
CHOST="mips-unknown-linux-gnu"
diff --git a/cnf/make.globals.ppc b/cnf/make.globals.ppc
index 2c15388..b26fd7f 100644
--- a/cnf/make.globals.ppc
+++ b/cnf/make.globals.ppc
@@ -1,6 +1,6 @@
# 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.28 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.ppc,v 1.28.2.1 2004/11/30 22:20:24 carpaski Exp $
# System-wide defaults for the Portage system
# *****************************
@@ -12,7 +12,7 @@
# ** USE, CONFIG_*, and FEATURES are incremental **
# ***************************************************
-GENTOO_MIRRORS="http://gentoo.osuosl.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
+GENTOO_MIRRORS="http://distfiles.gentoo.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
# Host-type
CHOST="powerpc-unknown-linux-gnu"
diff --git a/cnf/make.globals.s390 b/cnf/make.globals.s390
index c9eebe5..e8393ae 100644
--- a/cnf/make.globals.s390
+++ b/cnf/make.globals.s390
@@ -1,6 +1,6 @@
# 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.s390,v 1.2 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.s390,v 1.2.2.1 2004/11/30 22:20:24 carpaski Exp $
# System-wide defaults for the Portage system
# *****************************
@@ -12,7 +12,7 @@
# ** USE, CONFIG_*, and FEATURES are incremental **
# ***************************************************
-GENTOO_MIRRORS="http://gentoo.osuosl.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
+GENTOO_MIRRORS="http://distfiles.gentoo.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
# Host-type
CHOST=s390-ibm-linux-gnu
diff --git a/cnf/make.globals.sparc b/cnf/make.globals.sparc
index 9f18dfc..e3ada89 100644
--- a/cnf/make.globals.sparc
+++ b/cnf/make.globals.sparc
@@ -1,6 +1,6 @@
# 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.14 2004/10/03 17:56:19 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.sparc,v 1.14.2.1 2004/11/30 22:20:24 carpaski Exp $
# System-wide defaults for the Portage system
# *****************************
@@ -12,7 +12,7 @@
# ** USE, CONFIG_*, and FEATURES are incremental **
# ***************************************************
-GENTOO_MIRRORS="http://gentoo.osuosl.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
+GENTOO_MIRRORS="http://distfiles.gentoo.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
# Host-type
CHOST="sparc-unknown-linux-gnu"
diff --git a/cnf/make.globals.x86 b/cnf/make.globals.x86
index a420dfb..fe5bb78 100644
--- a/cnf/make.globals.x86
+++ b/cnf/make.globals.x86
@@ -1,6 +1,6 @@
# 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.4 2004/10/03 17:56:19 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.x86,v 1.4.2.1 2004/11/30 22:20:24 carpaski Exp $
# System-wide defaults for the Portage system
# *****************************
@@ -12,7 +12,7 @@
# ** USE, CONFIG_*, and FEATURES are incremental **
# ***************************************************
-GENTOO_MIRRORS="http://gentoo.osuosl.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
+GENTOO_MIRRORS="http://distfiles.gentoo.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
# Host-type
CHOST=i686-pc-linux-gnu
diff --git a/pym/portage.py b/pym/portage.py
index 3f2e05a..20812c5 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1,7 +1,7 @@
# portage.py -- core Portage functionality
# Copyright 1998-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/pym/portage.py,v 1.524.2.10 2004/11/29 08:41:28 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.524.2.11 2004/11/30 22:20:24 carpaski Exp $
# ===========================================================================
# START OF CONSTANTS -- START OF CONSTANTS -- START OF CONSTANTS -- START OF
@@ -6416,6 +6416,7 @@ class dblink:
if dircache.has_key(self.dbcatdir):
del dircache[self.dbcatdir]
print ">>>",self.mycpv,"merged."
+ return 0
def mergeme(self,srcroot,destroot,outfile,secondhand,stufftomerge,cfgfiledict,thismtime):
srcroot=os.path.normpath("///"+srcroot)+"/"