Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Mon, 27 Aug 2012 06:43:45 +0000 (08:43 +0200)
committerFabian Groffen <grobian@gentoo.org>
Mon, 27 Aug 2012 06:43:45 +0000 (08:43 +0200)
Conflicts:
bin/dispatch-conf
bin/ebuild-helpers/doins
bin/ebuild-helpers/newbin
bin/ebuild-helpers/newconfd
bin/ebuild-helpers/newdoc
bin/ebuild-helpers/newenvd
bin/ebuild-helpers/newexe
bin/ebuild-helpers/newinitd
bin/ebuild-helpers/newins
bin/ebuild-helpers/newlib.a
bin/ebuild-helpers/newlib.so
bin/ebuild-helpers/newman
bin/ebuild-helpers/newsbin
bin/emerge-webrsync
bin/isolated-functions.sh
bin/phase-helpers.sh

21 files changed:
1  2 
bin/dispatch-conf
bin/ebuild-helpers/doins
bin/ebuild-helpers/newins
bin/ebuild-helpers/prepstrip
bin/ebuild.sh
bin/egencache
bin/emerge-webrsync
bin/isolated-functions.sh
bin/phase-functions.sh
bin/phase-helpers.sh
man/make.conf.5
pym/_emerge/Package.py
pym/portage/dbapi/bintree.py
pym/portage/getbinpkg.py
pym/portage/package/ebuild/_config/special_env_vars.py
pym/portage/package/ebuild/config.py
pym/portage/package/ebuild/doebuild.py
pym/portage/package/ebuild/fetch.py
pym/portage/process.py
pym/portage/util/__init__.py
pym/portage/versions.py

index de8d85db7e9c70d468d235bacbe19470ed201f9f,35979dbb2c387a9905cfe4ccece3317fa38a7b6b..d67187348c079ce5481b9e9e9d4bd17d9c8f840c
@@@ -1,5 -1,5 +1,5 @@@
 -#!/usr/bin/python -O
 +#!@PREFIX_PORTAGE_PYTHON@ -O
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  #
index b9c95ed0fa3954712d896879601331d182f57d52,fd779340458e7c7042286aa9aaccce79dd2e9239..ca6b0bae430698fc69cdb40abdb19874b2156ddc
@@@ -1,8 -1,8 +1,8 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
  
  if [[ ${0##*/} == dodoc ]] ; then
        if [ $# -eq 0 ] ; then
@@@ -38,18 -38,9 +38,18 @@@ if [[ ${INSDESTTREE#${ED}} != "${INSDES
        helpers_die "${0##*/} used with \${D} or \${ED}"
        exit 1
  fi
 +# PREFIX LOCAL: check for usage with EPREFIX
 +if [[ ${INSDESTTREE#${EPREFIX}} != "${INSDESTTREE}" ]]; then
 +      vecho "-------------------------------------------------------" 1>&2
 +      vecho "You should not use \${EPREFIX} with helpers." 1>&2
 +      vecho "  --> ${INSDESTTREE}" 1>&2
 +      vecho "-------------------------------------------------------" 1>&2
 +      exit 1
 +fi
 +# END PREFIX LOCAL
  
  case "$EAPI" in
-       0|1|2|3|3_pre2)
+       0|1|2|3)
                PRESERVE_SYMLINKS=n
                ;;
        *)
index 45c3e1871b26ea535331fd84d94111e20b606390,2dc041d152fc95691d428f5ae56524dfbead3132..e9bf34b0c8d117efdc5a1a847b072b2710efb404
@@@ -1,16 -1,13 +1,14 @@@
- # Copyright 1999-2011 Gentoo Foundation
 +#!@PORTAGE_BASH@
+ #!/bin/bash
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
  
- if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
-       helpers_die "${0##*/}: Need two arguments, old file and new file"
-       exit 1
- fi
+ helper=${0##*/}
  
- if [ ! -e "$1" ] ; then
-       helpers_die "!!! ${0##*/}: $1 does not exist"
+ if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
+       helpers_die "${helper}: Need two arguments, old file and new file"
        exit 1
  fi
  
Simple merge
diff --cc bin/ebuild.sh
Simple merge
diff --cc bin/egencache
Simple merge
index 581dc5490c05eb5f3502ecc4668529e806d19a17,a962ab548a84a73f5444593e2d1a3db67eb7ee09..cdcf716def783c760d0378bfa1aeab3ba793f90d
@@@ -1,5 -1,5 +1,6 @@@
- # Copyright 1999-2011 Gentoo Foundation
 +#!@PORTAGE_BASH@
+ #!/bin/bash
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
  # Rewritten from the old, Perl-based emerge-webrsync script
@@@ -39,19 -39,14 +40,20 @@@ els
        eecho "could not find 'portageq'; aborting"
        exit 1
  fi
- eval $("${portageq}" envvar -v FEATURES FETCHCOMMAND GENTOO_MIRRORS \
-       PORTAGE_BIN_PATH PORTAGE_GPG_DIR \
-       PORTAGE_NICENESS PORTAGE_RSYNC_EXTRA_OPTS PORTAGE_TMPDIR PORTDIR \
-       SYNC http_proxy ftp_proxy \
-       EPREFIX PORTAGE_USER PORTAGE_GROUP)
- DISTDIR="${PORTAGE_TMPDIR}/emerge-webrsync"
+ eval $("${portageq}" envvar -v DISTDIR EPREFIX FEATURES \
+       FETCHCOMMAND GENTOO_MIRRORS \
+       PORTAGE_BIN_PATH PORTAGE_CONFIGROOT PORTAGE_GPG_DIR \
+       PORTAGE_NICENESS PORTAGE_RSYNC_EXTRA_OPTS \
+       PORTAGE_RSYNC_OPTS PORTAGE_TMPDIR PORTDIR \
 -      SYNC USERLAND http_proxy ftp_proxy)
++      SYNC USERLAND http_proxy ftp_proxy \
++      PORTAGE_USER PORTAGE_GROUP)
  export http_proxy ftp_proxy
  
- # just can't support us yet
- GENTOO_MIRRORS="http://gentoo-mirror1.prefix.freens.org http://gentoo-mirror2.prefix.freens.org"
 +# PREFIX LOCAL: use Prefix servers, just because we want this and infra
++# can't support us yet
++GENTOO_MIRRORS="http://gentoo-mirror1.prefix.freens.org"
 +# END PREFIX LOCAL
 +
  # If PORTAGE_NICENESS is overriden via the env then it will
  # still pass through the portageq call and override properly.
  if [ -n "${PORTAGE_NICENESS}" ]; then
@@@ -191,11 -191,21 +198,23 @@@ sync_local() 
  
        vecho "Syncing local tree ..."
  
 -      local ownership="portage:portage"
++      # PREFIX LOCAL: use PORTAGE_USER and PORTAGE_GROUP
++      local ownership="${PORTAGE_USER:-portage}:${PORTAGE_GROUP:-portage}"
++      # END PREFIX LOCAL
+       if has usersync ${FEATURES} ; then
+               case "${USERLAND}" in
+                       BSD)
+                               ownership=$(stat -f '%Su:%Sg' "${PORTDIR}")
+                               ;;
+                       *)
+                               ownership=$(stat -c '%U:%G' "${PORTDIR}")
+                               ;;
+               esac
+       fi
        if type -P tarsync > /dev/null ; then
-               # PREFIX LOCAL: use PORTAGE_USER and PORTAGE_GROUP
-               local chown_opts="-o ${PORTAGE_USER:-portage} -g ${PORTAGE_GROUP:-portage}"
-               chown ${PORTAGE_USER:-portage}:${PORTAGE_GROUP:-portage} portage > /dev/null 2>&1 || chown_opts=""
-               # END PREFIX LOCAL
+               local chown_opts="-o ${ownership%:*} -g ${ownership#*:}"
+               chown ${ownership} "${PORTDIR}" > /dev/null 2>&1 || chown_opts=""
                if ! tarsync $(vvecho -v) -s 1 ${chown_opts} \
                        -e /distfiles -e /packages -e /local "${file}" "${PORTDIR}"; then
                        eecho "tarsync failed; tarball is corrupt? (${file})"
index 3beb14acc4eae639cd8f84b5fab1a6f4166e73db,d33c0b61ea1f96970b8c2be4e49cb104e84cfe49..79801e556120f251d785507d0f76f672dcdf89f2
@@@ -1,5 -1,5 +1,5 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  # We need this next line for "die" and "assert". It expands
Simple merge
index beca5ade2379ce947f32736543e2ac550159f9d6,a00475cfb977e335c1063c3022d4cc59b1d2a647..10a7b3e5848b8b688a4dad6eb2c2cc0f4ff689c0
@@@ -1,5 -1,5 +1,5 @@@
 -#!/bin/bash
 +#!@PREFIX_PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  export DESTTREE=/usr
diff --cc man/make.conf.5
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 63c792ab2dbecc308ae5409d11cf9b76083f00df,260bf10bb4701f5fe138c8be8fe37e5c85c5e73b..7f76bb2597cc7e123dabfabf2e72b29278ef5f01
@@@ -26,10 -26,9 +26,10 @@@ portage.proxy.lazyimport.lazyimport(glo
  from portage import OrderedDict, os, selinux, shutil, _encodings, \
        _shell_quote, _unicode_encode
  from portage.checksum import (hashfunc_map, perform_md5, verify_all,
-       _filter_unaccelarated_hashes)
+       _filter_unaccelarated_hashes, _hash_filter, _apply_hash_filter)
  from portage.const import BASH_BINARY, CUSTOM_MIRRORS_FILE, \
        GLOBAL_CONFIG_PATH
 +from portage.const import rootgid
  from portage.data import portage_gid, portage_uid, secpass, userpriv_groups
  from portage.exception import FileNotFound, OperationNotPermitted, \
        PortageException, TryAgain
Simple merge
Simple merge
Simple merge