From: Fabian Groffen <grobian@gentoo.org>
Date: Mon, 3 Jan 2011 19:29:33 +0000 (+0100)
Subject: Merge remote branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=62299281838042fafa163eddc138805f08b3ddb3;p=portage.git

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

Conflicts:
	bin/ebuild-helpers/newins
	bin/ebuild-helpers/prepallman
	bin/ebuild-helpers/prepinfo
	bin/ebuild.sh
---

62299281838042fafa163eddc138805f08b3ddb3
diff --cc bin/ebuild-helpers/newins
index a2326bb08,065477f47..d10c84f97
--- a/bin/ebuild-helpers/newins
+++ b/bin/ebuild-helpers/newins
@@@ -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
  
  source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
diff --cc bin/ebuild-helpers/prepallman
index 6e95f0d20,574ab6251..20880fb06
--- a/bin/ebuild-helpers/prepallman
+++ b/bin/ebuild-helpers/prepallman
@@@ -9,11 -9,9 +9,11 @@@ hasq "${EAPI}" 0 1 2 3 || exit 
  
  ret=0
  
 -find "${D}" -type d -name man > "${T}"/prepallman.filelist
 +[[ -d ${ED} ]] || exit ${ret}
 +
 +find "${ED}" -type d -name man > "${T}"/prepallman.filelist
- while read mandir ; do
+ while read -r mandir ; do
 -	mandir=${mandir#${D}}
 +	mandir=${mandir#${ED}}
  	prepman "${mandir%/man}"
  	((ret|=$?))
  done < "${T}"/prepallman.filelist
diff --cc bin/ebuild-helpers/prepinfo
index 1349e459e,9552923a3..94e67f0a4
--- a/bin/ebuild-helpers/prepinfo
+++ b/bin/ebuild-helpers/prepinfo
@@@ -23,7 -23,7 +23,7 @@@ if [[ ! -d ${ED}${infodir} ]] ; the
  	fi
  fi
  
- find "${ED}${infodir}" -type d -print0 | while read -d $'\0' x ; do
 -find "${D}${infodir}" -type d -print0 | while read -r -d $'\0' x ; do
++find "${ED}${infodir}" -type d -print0 | while read -r -d $'\0' x ; do
  	for f in "${x}"/.keepinfodir*; do
  		[[ -e ${f} ]] && continue 2
  	done
diff --cc bin/ebuild.sh
index fd87b9c49,35ac05243..de4e433f8
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@@ -507,12 -501,12 +507,12 @@@ econf() 
  			sed -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" -i "$ECONF_SOURCE/configure" || \
  				die "Substition of shebang in '$ECONF_SOURCE/configure' failed"
  		fi
 -		if [ -e /usr/share/gnuconfig/ ]; then
 +		if [ -e "${EPREFIX}"/usr/share/gnuconfig/ ]; then
  			find "${WORKDIR}" -type f '(' \
  			-name config.guess -o -name config.sub ')' -print0 | \
- 			while read -d $'\0' x ; do
+ 			while read -r -d $'\0' x ; do
 -				vecho " * econf: updating ${x/${WORKDIR}\/} with /usr/share/gnuconfig/${x##*/}"
 -				cp -f /usr/share/gnuconfig/"${x##*/}" "${x}"
 +				vecho " * econf: updating ${x/${WORKDIR}\/} with ${EPREFIX}/usr/share/gnuconfig/${x##*/}"
 +				cp -f "${EPREFIX}"/usr/share/gnuconfig/"${x##*/}" "${x}"
  			done
  		fi
  
diff --cc bin/misc-functions.sh
index 332fbe0a9,46be5011c..125ebb48b
mode 100644,100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
diff --cc pym/portage/dbapi/bintree.py
index 877a2bd48,2da7799e8..1600eb18f
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@@ -23,9 -23,8 +23,9 @@@ from portage.cache.mappings import slot
  from portage.const import CACHE_PATH
  from portage.dbapi.virtual import fakedbapi
  from portage.dep import Atom, use_reduce, paren_enclose
- from portage.exception import InvalidPackageName, \
+ from portage.exception import AlarmSignal, InvalidPackageName, \
  	PermissionDenied, PortageException
 +from portage.const import EAPI
  from portage.localization import _
  from portage import _movefile
  from portage import os
diff --cc pym/portage/package/ebuild/fetch.py
index 031ddc8dd,99e2a8645..cdfee0869
--- a/pym/portage/package/ebuild/fetch.py
+++ b/pym/portage/package/ebuild/fetch.py
@@@ -26,10 -26,9 +26,10 @@@ portage.proxy.lazyimport.lazyimport(glo
  
  from portage import OrderedDict, os, selinux, _encodings, \
  	_shell_quote, _unicode_encode
- from portage.checksum import perform_md5, verify_all
+ from portage.checksum import hashfunc_map, perform_md5, verify_all
  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, \
  	PermissionDenied, PortageException, TryAgain