Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
	bin/ebuild-helpers/4/dodoc
	bin/ebuild-helpers/doins
	bin/ebuild.sh
	bin/isolated-functions.sh
	bin/misc-functions.sh

diff --cc bin/ebuild-helpers/dodoc
Simple merge

diff --cc bin/ebuild-helpers/doins
index 882e19c631587269c0bb37c7a811dbf4ea8d5258,0aedcb9e56ef5444365c3f71609b8b60e76bb810..e354ee4158c9d60e4ef593b284ab0cfbe3e74c35
--- 1/bin/ebuild-helpers/doins
--- 2/bin/ebuild-helpers/doins
+++ b/bin/ebuild-helpers/doins
@@@ -1,9 -1,20 +1,20 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2010 Gentoo Foundation
+ # Copyright 1999-2011 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
+               # default_src_install may call dodoc with no arguments
+               # when DOC is defined but empty, so simply return
+               # sucessfully in this case.
+               exit 0
+       fi
+       export INSOPTIONS=-m0644
+       export INSDESTTREE=usr/share/doc/${PF}/${_E_DOCDESTTREE_}
+ fi
+ 
  if [ $# -lt 1 ] ; then
        helpers_die "${0##*/}: at least one argument needed"
        exit 1

diff --cc bin/ebuild.sh
index 629942d1d1f758e703d95f6a84228c102d96cf7d,59bf46e918ada69bc8ab72568eeb02b68b65a2c1..81af7477fb3b048d8e9372ea1360ef6192f73dc9
--- 1/bin/ebuild.sh
--- 2/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@@ -1,9 -1,9 +1,9 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2010 Gentoo Foundation
+ # Copyright 1999-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -PORTAGE_BIN_PATH="${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"
 -PORTAGE_PYM_PATH="${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}"
 +PORTAGE_BIN_PATH="${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"
 +PORTAGE_PYM_PATH="${PORTAGE_PYM_PATH:-@PORTAGE_BASE@/pym}"
  
  if [[ $PORTAGE_SANDBOX_COMPAT_LEVEL -lt 22 ]] ; then
        # Ensure that /dev/std* streams have appropriate sandbox permission for
@@@ -1154,15 -1148,10 +1154,12 @@@ dyn_install() 
        fi
  
        vecho
 -      vecho ">>> Install ${PF} into ${D} category ${CATEGORY}"
 +      vecho ">>> Install ${PF} into ${ED} category ${CATEGORY}"
        #our custom version of libtool uses $S and $D to fix
        #invalid paths in .la files
 +      # PREFIX: I think this is very old, and all patches (both to
 +      # libtool and in ELT-patches) that did this are gone
        export S D
-       #some packages uses an alternative to $S to build in, cause
-       #our libtool to create problematic .la files
-       export PWORKDIR="$WORKDIR"
  
        # Reset exeinto(), docinto(), insinto(), and into() state variables
        # in case the user is running the install phase multiple times

diff --cc bin/egencache
Simple merge

diff --cc bin/isolated-functions.sh
index 52008277f4e814699b94c541969ca2ee60a27455,2f144a084057cb1c599ebe03caaf7d59caf9db12..def1a547e4681a8086b6e97868cb7d06de53df4f
--- 1/bin/isolated-functions.sh
--- 2/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@@ -1,5 -1,5 +1,5 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2010 Gentoo Foundation
+ # Copyright 1999-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  # We need this next line for "die" and "assert". It expands

diff --cc bin/misc-functions.sh
index 4174f15394dfb2c5d3b290dd0ad52c230b862ee2,ae4cc9e71e8509e8f4d7654ab836637cdf4a3b1e..59cc9d45440cc03126fc564e43cbac4d14b373bf
mode 100644,100755..100644
--- 1/bin/misc-functions.sh
--- 2/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@@ -1,5 -1,5 +1,5 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2010 Gentoo Foundation
+ # Copyright 1999-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  #
  # Miscellaneous shell functions that make use of the ebuild env but don't need

diff --cc bin/repoman
Simple merge

diff --cc man/emerge.1
Simple merge

diff --cc pym/_emerge/actions.py
index 21f0d10abd7127f8d56bda8061945b0b0dd273c4,20220fc57d0f1280a38e17683b47f2bebb926488..37a9b4a8d1b9039d0ea5232cc3e8cb3575f2b274
--- 1/pym/_emerge/actions.py
--- 2/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@@ -2401,56 -2412,10 +2412,58 @@@ def action_sync(settings, trees, mtimed
                                "cd %s; exec cvs -z0 -q update -dP" % \
                                (portage._shell_quote(myportdir),), **spawn_kwargs)
                        if retval != os.EX_OK:
+                               writemsg_level("!!! cvs update error; exiting.\n",
+                                       noiselevel=-1, level=logging.ERROR)
                                sys.exit(retval)
                dosyncuri = syncuri
 +      elif syncuri[:11]=="svn+http://" or syncuri[:6]=="svn://" or syncuri[:12]=="svn+https://":
 +              # Gentoo Prefix hardcoded SVN support
 +              if not os.path.exists(EPREFIX + "/usr/bin/svn"):
 +                      print("!!! " + EPREFIX + "/usr/bin/svn does not exist, so SVN support is disabled.")
 +                      print("!!! Type \"emerge dev-util/subversion\" to enable SVN support.")
 +                      sys.exit(1)
 +              svndir=os.path.dirname(myportdir)
 +              if not os.path.exists(myportdir+"/.svn"):
 +                      #initial checkout
 +                      if syncuri[:4] == "svn+":
 +                              syncuri = syncuri[4:]
 +                      print(">>> Starting initial svn checkout with "+syncuri+"...")
 +                      if os.path.exists(svndir+"/prefix-overlay"):
 +                              print("!!! existing",svndir+"/prefix-overlay directory; exiting.")
 +                              sys.exit(1)
 +                      try:
 +                              os.rmdir(myportdir)
 +                      except OSError, e:
 +                              if e.errno != errno.ENOENT:
 +                                      sys.stderr.write(
 +                                              "!!! existing '%s' directory; exiting.\n" % myportdir)
 +                                      sys.exit(1)
 +                              del e
 +                      if portage.spawn("cd "+svndir+"; svn checkout "+syncuri,settings,free=1):
 +                              print("!!! svn checkout error; exiting.")
 +                              sys.exit(1)
 +                      os.rename(os.path.join(svndir, "prefix-overlay"), myportdir)
 +              else:
 +                      #svn update
 +                      print(">>> Starting svn update...")
 +                      retval = portage.spawn("cd '%s'; svn update" % myportdir, \
 +                              settings, free=1)
 +                      if retval != os.EX_OK:
 +                              sys.exit(retval)
 +
 +              # write timestamp.chk
 +              try:
 +                      if not os.path.exists(os.path.join(myportdir, "metadata")):
 +                              os.mkdir(os.path.join(myportdir, "metadata"))
 +                      f = open(os.path.join(myportdir, "metadata", "timestamp.chk"), 'w')
 +                      f.write(time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()))
 +                      f.write('\n')
 +                      f.close()
 +              except IOError, e:
 +                      # too bad, next time better luck!
 +                      pass
 +
 +              dosyncuri = syncuri
        else:
                writemsg_level("!!! Unrecognized protocol: SYNC='%s'\n" % (syncuri,),
                        noiselevel=-1, level=logging.ERROR)

diff --cc pym/_emerge/depgraph.py
Simple merge

diff --cc pym/_emerge/main.py
Simple merge

diff --cc pym/portage/dbapi/bintree.py
Simple merge

diff --cc pym/portage/dbapi/vartree.py
Simple merge

diff --cc pym/portage/getbinpkg.py
Simple merge

diff --cc runtests.sh
index f3d91a92682ba6917818867370333bb90a5e9c9e,6c00ce530ef5e3f722ad11044f2334ab7259174e..0ae49315f445681be15b1c143ef430a38f31f65c
--- 1/runtests.sh
--- 2/runtests.sh
+++ b/runtests.sh
@@@ -1,6 -1,6 +1,6 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
  
- PYTHON_VERSIONS="2.6 2.7 3.1 3.2"
+ PYTHON_VERSIONS="2.6 2.7 3.1 3.2 3.3"
  
  case "${NOCOLOR:-false}" in
        yes|true)