Update the make.globals from newer Portage.

1 files changed, 38 insertions, 9 deletions

diff --git a/etc/make.globals b/etc/make.globals
index 429ad69..28a1a90 100644
--- a/etc/make.globals
+++ b/etc/make.globals
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: make.globals 4734 2006-10-17 04:31:10Z zmedico $
+# $Id: make.globals 15761 2010-03-08 08:47:02Z zmedico $
 # System-wide defaults for the Portage system
 
 #            *****************************
@@ -12,12 +12,21 @@
 # **  USE, CONFIG_*, and FEATURES are incremental  **
 # ***************************************************
 
+# When compiler flags are unset, many packages will substitute their own
+# implicit flags. For uniformity, use an empty string as the default.
+CFLAGS=""
+CXXFLAGS=""
+LDFLAGS=""
 
 # Default rsync mirror
 SYNC="rsync://rsync.gentoo.org/gentoo-portage"
 
-# Default distfiles mirrors
-GENTOO_MIRRORS="http://distfiles.gentoo.org http://distro.ibiblio.org/pub/linux/distributions/gentoo"
+# Default distfiles mirrors. This rotation has multiple hosts and is reliable.
+# Approved by the mirror-admin team.
+GENTOO_MIRRORS="http://distfiles.gentoo.org"
+
+ACCEPT_LICENSE="* -@EULA"
+ACCEPT_PROPERTIES="*"
 
 # Repository Paths
 PORTDIR=/usr/portage
@@ -29,11 +38,17 @@ RPMDIR=/usr/portage/rpm
 PORTAGE_TMPDIR=/var/tmp
 
 # Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND="/usr/bin/wget -t 5 -T 60 --passive-ftp -P \${DISTDIR} \${URI}"
-RESUMECOMMAND="/usr/bin/wget -c -t 5 -T 60 --passive-ftp -P \${DISTDIR} \${URI}"
+FETCHCOMMAND="/usr/bin/wget -t 5 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\""
+RESUMECOMMAND="/usr/bin/wget -c -t 5 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\""
 
 # Default user options
-FEATURES="sandbox distlocks metadata-transfer"
+FEATURES="assume-digests distlocks fixpackages news parallel-fetch protect-owned
+          sandbox sfperms strict unmerge-logs unmerge-orphans userfetch"
+
+# Ignore file collisions in /lib/modules since files inside this directory
+# are never unmerged, and therefore collisions must be ignored in order for
+# FEATURES=protect-owned to operate smoothly in all cases.
+COLLISION_IGNORE="/lib/modules"
 
 # Default chunksize for binhost comms
 PORTAGE_BINHOST_CHUNKSIZE="3000"
@@ -48,20 +63,33 @@ EMERGE_WARNING_DELAY="10"
 # This option will be removed and forced to yes.
 AUTOCLEAN="yes"
 
+# Don't compress files with these suffixes.
+PORTAGE_COMPRESS_EXCLUDE_SUFFIXES="css gif htm[l]? jp[e]?g js pdf png"
+
+# Number of mirrors to try when a downloaded file has an incorrect checksum.
+PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS="5"
+
+# Minimum size of existing file for RESUMECOMMAND to be called.
+PORTAGE_FETCH_RESUME_MIN_SIZE="350K"
+
 # Number of times 'emerge --sync' will run before giving up.
 PORTAGE_RSYNC_RETRIES="3"
 
 # Number of seconds rsync will wait before timing out.
 #RSYNC_TIMEOUT="180"
 
-PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --delete-after --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --filter=H_**/files/digest-*"
+PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
+
+# The number of days after the last `emerge --sync` that a warning
+# message should be produced.
+PORTAGE_SYNC_STALE="30"
 
 # Minimal CONFIG_PROTECT
 CONFIG_PROTECT="/etc"
 CONFIG_PROTECT_MASK="/etc/env.d"
 
 # Disable auto-use
-USE_ORDER="env:pkg:conf:defaults:pkginternal"
+USE_ORDER="env:pkg:conf:defaults:pkginternal:env.d"
 
 # Default ownership of installed files.
 PORTAGE_INST_UID="0"
@@ -72,10 +100,11 @@ PORTAGE_WORKDIR_MODE="0700"
 
 # Some defaults for elog
 PORTAGE_ELOG_CLASSES="log warn error"
+PORTAGE_ELOG_SYSTEM="save_summary echo"
 
 PORTAGE_ELOG_MAILURI="root"
 PORTAGE_ELOG_MAILSUBJECT="[portage] ebuild log for \${PACKAGE} on \${HOST}"
-PORTAGE_ELOG_MAILFROM="portage"
+PORTAGE_ELOG_MAILFROM="portage@localhost"
 
 #            *****************************
 #            **  DO NOT EDIT THIS FILE  **