From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QWVi6-0003hx-G4 for garchives@archives.gentoo.org; Tue, 14 Jun 2011 15:39:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CFBB1C09D; Tue, 14 Jun 2011 15:39:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1D78D1C09D for ; Tue, 14 Jun 2011 15:39:13 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D9161B4025 for ; Tue, 14 Jun 2011 15:39:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D6DA98003C for ; Tue, 14 Jun 2011 15:39:11 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: Subject: [gentoo-commits] proj/portage:prefix commit in: / X-VCS-Repository: proj/portage X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: ebe76c40c60e1938493e87a4e690cc2615ebba79 Date: Tue, 14 Jun 2011 15:39:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 3725ef8ade05ada136b535401f555b02 commit: ebe76c40c60e1938493e87a4e690cc2615ebba79 Author: Fabian Groffen gentoo org> AuthorDate: Tue Jun 14 15:37:40 2011 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Jun 14 15:37:40 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Debe76c40 Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix Conflicts: bin/ebuild.sh pym/portage/dbapi/bintree.py bin/ebuild.sh | 14 ++- man/portage.5 | 51 +++++++- pym/_emerge/AbstractEbuildProcess.py | 26 +++- pym/_emerge/BinpkgFetcher.py | 2 +- pym/_emerge/EbuildFetcher.py | 6 +- pym/_emerge/EbuildMetadataPhase.py | 4 +- pym/_emerge/Scheduler.py | 7 +- pym/_emerge/SubProcess.py | 20 ++-- pym/_emerge/depgraph.py | 144 +++++++++++++++-= ------ pym/_emerge/resolver/circular_dependency.py | 3 +- pym/_emerge/resolver/slot_collision.py | 30 +++-- pym/_emerge/unmerge.py | 10 ++- pym/portage/__init__.py | 2 +- pym/portage/dbapi/bintree.py | 28 +++-- pym/portage/dbapi/virtual.py | 6 +- pym/portage/dep/__init__.py | 50 +++++--- pym/portage/locks.py | 9 +- pym/portage/package/ebuild/config.py | 2 +- pym/portage/package/ebuild/digestgen.py | 22 +++- pym/portage/package/ebuild/getmaskingreason.py | 11 ++ pym/portage/package/ebuild/getmaskingstatus.py | 38 ++---- pym/portage/{package =3D> tests/dbapi}/__init__.py | 2 +- pym/portage/tests/{bin =3D> dbapi}/__test__ | 0 pym/portage/tests/dbapi/test_fakedbapi.py | 58 +++++++++ pym/portage/tests/dep/testExtractAffectingUSE.py | 4 +- pym/portage/tests/dep/test_use_reduce.py | 12 +- pym/portage/tests/ebuild/test_spawn.py | 2 +- pym/portage/tests/locks/test_lock_nonblock.py | 46 +++++++ pym/portage/tests/resolver/test_merge_order.py | 33 +++++ pym/portage/util/__init__.py | 4 +- 30 files changed, 469 insertions(+), 177 deletions(-) diff --cc bin/ebuild.sh index 3c9c63e,8c301d8..a0b7b15 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@@ -2128,18 -2115,20 +2128,22 @@@ if ! hasq "$EBUILD_PHASE" clean cleanr ;; esac =20 - PATH=3D$_ebuild_helpers_path:$PREROOTPATH${PREROOTPATH:+:}/usr/local= /sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin${ROOTPATH:+:}$ROOTPATH + #PATH=3D$_ebuild_helpers_path:$PREROOTPATH${PREROOTPATH:+:}/usr/loca= l/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin${ROOTPATH:+:}$ROOTPAT= H + # PREFIX: same notes apply as at the top of this file + PATH=3D"$_ebuild_helpers_path:$PREROOTPATH${PREROOTPATH:+:}${DEFAULT= _PATH}${ROOTPATH:+:}$ROOTPATH${EXTRA_PATH:+:}${EXTRA_PATH}" unset _ebuild_helpers_path =20 + # Use default ABI libdir in accordance with bug #355283. + x=3DLIBDIR_${DEFAULT_ABI} + [[ -n $DEFAULT_ABI && -n ${!x} ]] && x=3D${!x} || x=3Dlib +=20 if hasq distcc $FEATURES ; then - PATH=3D"${EPREFIX}/usr/lib/distcc/bin:$PATH" - PATH=3D"/usr/$x/distcc/bin:$PATH" ++ PATH=3D"${EPREFIX}/usr/$x/distcc/bin:$PATH" [[ -n $DISTCC_LOG ]] && addwrite "${DISTCC_LOG%/*}" fi =20 if hasq ccache $FEATURES ; then - PATH=3D"${EPREFIX}/usr/lib/ccache/bin:$PATH" - PATH=3D"/usr/$x/ccache/bin:$PATH" ++ PATH=3D"${EPREFIX}/usr/$x/ccache/bin:$PATH" =20 if [[ -n $CCACHE_DIR ]] ; then addread "$CCACHE_DIR" diff --cc pym/portage/dbapi/bintree.py index fb52544,ebec11f..c18dc17 --- a/pym/portage/dbapi/bintree.py +++ b/pym/portage/dbapi/bintree.py @@@ -250,8 -249,8 +250,8 @@@ class binarytree(object) self._pkgindex_header_keys =3D set([ "ACCEPT_KEYWORDS", "ACCEPT_LICENSE", "ACCEPT_PROPERTIES", "CBUILD", - "CHOST", "CONFIG_PROTECT", "CONFIG_PROTECT_MASK", "FEATURES", + "CONFIG_PROTECT", "CONFIG_PROTECT_MASK", "FEATURES", - "GENTOO_MIRRORS", "INSTALL_MASK", "SYNC", "USE"]) + "GENTOO_MIRRORS", "INSTALL_MASK", "SYNC", "USE", "EPREFIX"]) self._pkgindex_default_pkg_data =3D { "BUILD_TIME" : "", "DEPEND" : "", @@@ -270,10 -269,24 +270,24 @@@ "DEFINED_PHASES" : "", "REQUIRED_USE" : "" } - self._pkgindex_inherited_keys =3D ["CHOST", "repository"] + self._pkgindex_inherited_keys =3D ["CHOST", "repository", "EPREFIX"] +=20 + # Populate the header with appropriate defaults. self._pkgindex_default_header_data =3D { - "repository":"" + "CHOST" : self.settings.get("CHOST", ""), + "repository" : "", } +=20 + # It is especially important to populate keys like + # "repository" that save space when entries can + # inherit them from the header. If an existing + # pkgindex header already defines these keys, then + # they will appropriately override our defaults. + main_repo =3D self.settings.repositories.mainRepo() + if main_repo is not None and not main_repo.missing_repo_name: + self._pkgindex_default_header_data["repository"] =3D \ + main_repo.name +=20 self._pkgindex_translated_keys =3D ( ("DESCRIPTION" , "DESC"), ("repository" , "REPO"),