From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E6881138B43 for ; Thu, 6 Feb 2014 21:09:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 472ECE0BAC; Thu, 6 Feb 2014 21:09:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AD3B4E0BAC for ; Thu, 6 Feb 2014 21:09:57 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B451B33F97C for ; Thu, 6 Feb 2014 21:09:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id B3A3F18278 for ; Thu, 6 Feb 2014 21:09:54 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1391720955.8b858267c018f8fc8597405bc2484cbcf82b69a4.grobian@gentoo> 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: 8b858267c018f8fc8597405bc2484cbcf82b69a4 X-VCS-Branch: prefix Date: Thu, 6 Feb 2014 21:09:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c1981fcc-8fb9-47e6-bdaf-c38e9342d8f8 X-Archives-Hash: 68dec6efd7fe55607a86d7f3f8b02541 commit: 8b858267c018f8fc8597405bc2484cbcf82b69a4 Author: Fabian Groffen gentoo org> AuthorDate: Thu Feb 6 21:09:15 2014 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Feb 6 21:09:15 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8b858267 Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix Conflicts: bin/archive-conf bin/binhost-snapshot bin/check-implicit-pointer-usage.py bin/chpathtool.py bin/clean_locks bin/dispatch-conf bin/dohtml.py bin/ebuild bin/ebuild-helpers/prepstrip bin/ebuild-ipc.py bin/egencache bin/emaint bin/emerge bin/emerge-webrsync bin/emirrordist bin/env-update bin/filter-bash-environment.py bin/fixpackages bin/glsa-check bin/install.py bin/isolated-functions.sh bin/lock-helper.py bin/portageq bin/quickpkg bin/regenworld bin/repoman bin/save-ebuild-env.sh bin/xattr-helper.py bin/xpak-helper.py misc/emerge-delta-webrsync pym/portage/dispatch_conf.py pym/portage/getbinpkg.py pym/portage/tests/runTests runtests.sh tabcheck.py doc/fragment/date => .portage_not_installed | 0 bin/archive-conf | 4 +- bin/binhost-snapshot | 6 +- bin/check-implicit-pointer-usage.py | 2 +- bin/chpathtool.py | 4 +- bin/clean_locks | 10 +- bin/dispatch-conf | 4 +- bin/dohtml.py | 4 +- bin/ebuild | 4 +- bin/ebuild-helpers/prepstrip | 2 +- bin/ebuild-ipc.py | 6 +- bin/egencache | 4 +- bin/emaint | 4 +- bin/emerge | 4 +- bin/emerge-webrsync | 6 +- bin/emirrordist | 4 +- bin/env-update | 4 +- bin/filter-bash-environment.py | 4 +- bin/fixpackages | 4 +- bin/glsa-check | 6 +- bin/install.py | 6 +- bin/isolated-functions.sh | 4 +- bin/lock-helper.py | 4 +- bin/portageq | 4 +- bin/quickpkg | 4 +- bin/regenworld | 4 +- bin/repoman | 4 +- bin/save-ebuild-env.sh | 4 +- bin/xattr-helper.py | 4 +- bin/xpak-helper.py | 4 +- doc/config/sets.docbook | 5 +- man/ebuild.5 | 28 +- man/emerge.1 | 18 +- man/make.conf.5 | 25 +- man/portage.5 | 114 +++- man/ru/ebuild.1 | 16 +- misc/emerge-delta-webrsync | 4 +- mkrelease.sh | 2 +- pym/_emerge/MergeListItem.py | 14 +- pym/_emerge/Package.py | 5 +- pym/_emerge/Scheduler.py | 7 +- pym/_emerge/actions.py | 10 +- pym/_emerge/depgraph.py | 675 +++++++++++++++------ pym/_emerge/main.py | 4 +- pym/_emerge/resolver/output.py | 109 +++- pym/_emerge/resolver/output_helpers.py | 7 +- pym/_emerge/resolver/package_tracker.py | 301 +++++++++ pym/_emerge/resolver/slot_collision.py | 141 +++-- pym/portage/__init__.py | 20 +- pym/portage/_emirrordist/MirrorDistTask.py | 3 +- pym/portage/_emirrordist/main.py | 20 +- pym/portage/_global_updates.py | 224 ++++--- pym/portage/_selinux.py | 4 +- pym/portage/_sets/base.py | 3 +- pym/portage/cache/flat_hash.py | 3 +- pym/portage/cache/fs_template.py | 3 +- pym/portage/cache/metadata.py | 3 +- pym/portage/cache/sqlite.py | 3 +- pym/portage/cache/template.py | 3 +- pym/portage/checksum.py | 12 +- pym/portage/cvstree.py | 274 +++++---- pym/portage/data.py | 15 +- pym/portage/dbapi/bintree.py | 3 +- pym/portage/dbapi/porttree.py | 9 +- pym/portage/dbapi/vartree.py | 35 +- pym/portage/debug.py | 10 +- pym/portage/dep/__init__.py | 3 +- pym/portage/dispatch_conf.py | 334 +++++----- pym/portage/eclass_cache.py | 14 +- pym/portage/elog/__init__.py | 3 +- pym/portage/elog/mod_echo.py | 3 +- pym/portage/elog/mod_syslog.py | 13 +- pym/portage/emaint/main.py | 13 +- pym/portage/emaint/module.py | 8 +- pym/portage/emaint/modules/binhost/binhost.py | 4 +- pym/portage/exception.py | 13 +- pym/portage/getbinpkg.py | 172 +++--- pym/portage/glsa.py | 4 +- pym/portage/localization.py | 7 +- pym/portage/locks.py | 44 +- pym/portage/mail.py | 7 +- pym/portage/manifest.py | 3 +- pym/portage/output.py | 18 +- .../package/ebuild/_config/LocationsManager.py | 4 +- pym/portage/package/ebuild/_config/MaskManager.py | 10 +- pym/portage/package/ebuild/_config/UseManager.py | 23 +- pym/portage/package/ebuild/config.py | 18 +- pym/portage/package/ebuild/getmaskingreason.py | 8 +- pym/portage/package/ebuild/getmaskingstatus.py | 3 +- pym/portage/process.py | 7 +- pym/portage/proxy/lazyimport.py | 3 +- pym/portage/repository/config.py | 150 +++-- pym/portage/tests/dbapi/test_portdb_cache.py | 12 +- pym/portage/tests/dep/test_match_from_list.py | 3 +- pym/portage/tests/ebuild/test_config.py | 3 +- pym/portage/tests/emerge/test_emerge_slot_abi.py | 6 +- pym/portage/tests/emerge/test_simple.py | 22 +- pym/portage/tests/lint/test_compile_modules.py | 22 +- pym/portage/tests/repoman/test_simple.py | 7 +- pym/portage/tests/resolver/ResolverPlayground.py | 113 ++-- pym/portage/tests/resolver/test_backtracking.py | 13 +- pym/portage/tests/resolver/test_blocker.py | 48 ++ pym/portage/tests/resolver/test_package_tracker.py | 261 ++++++++ pym/portage/tests/resolver/test_slot_collisions.py | 75 ++- .../tests/resolver/test_slot_conflict_rebuild.py | 44 +- pym/portage/tests/runTests | 4 +- pym/portage/tests/unicode/test_string_format.py | 3 +- pym/portage/tests/util/test_getconfig.py | 27 +- pym/portage/tests/util/test_whirlpool.py | 4 +- pym/portage/update.py | 3 +- pym/portage/util/__init__.py | 9 +- .../util/_dyn_libs/PreservedLibsRegistry.py | 3 +- pym/portage/util/_urlopen.py | 3 +- pym/portage/util/digraph.py | 12 +- pym/portage/util/env_update.py | 3 +- pym/portage/util/writeable_check.py | 79 +++ pym/portage/versions.py | 14 +- pym/portage/xpak.py | 8 +- pym/repoman/checks.py | 33 +- runtests.sh | 4 +- 120 files changed, 2754 insertions(+), 1233 deletions(-) diff --cc bin/archive-conf index dc838e4,f73ca42..599e569 --- a/bin/archive-conf +++ b/bin/archive-conf @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ - # Copyright 1999-2013 Gentoo Foundation -#!/usr/bin/python -b ++#!@PREFIX_PORTAGE_PYTHON@ -b + # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # diff --cc bin/binhost-snapshot index 776686e,c2204f0..ce156a4 --- a/bin/binhost-snapshot +++ b/bin/binhost-snapshot @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ - # Copyright 2010-2013 Gentoo Foundation -#!/usr/bin/python -b ++#!@PREFIX_PORTAGE_PYTHON@ -b + # Copyright 2010-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import io diff --cc bin/check-implicit-pointer-usage.py index 710a0b8,242436c..c6389c3 --- a/bin/check-implicit-pointer-usage.py +++ b/bin/check-implicit-pointer-usage.py @@@ -1,4 -1,4 +1,4 @@@ - #!@PREFIX_PORTAGE_PYTHON@ -O -#!/usr/bin/python -b ++#!@PREFIX_PORTAGE_PYTHON@ -b # Ripped from HP and updated from Debian # Update by Gentoo to support unicode output diff --cc bin/chpathtool.py index f10d49e,6460662..7e9f260 --- a/bin/chpathtool.py +++ b/bin/chpathtool.py @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ - # Copyright 2011-2013 Gentoo Foundation -#!/usr/bin/python -b ++#!@PREFIX_PORTAGE_PYTHON@ -b + # Copyright 2011-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 """Helper tool for converting installed files to custom prefixes. diff --cc bin/clean_locks index be53bf0,3e969f2..73213b5 --- a/bin/clean_locks +++ b/bin/clean_locks @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ -O - # Copyright 1999-2013 Gentoo Foundation -#!/usr/bin/python -bO ++#!@PREFIX_PORTAGE_PYTHON@ -bO + # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function diff --cc bin/dispatch-conf index 9da949c,4b0c0ac..a1fe206 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ -O - # Copyright 1999-2013 Gentoo Foundation -#!/usr/bin/python -bO ++#!@PREFIX_PORTAGE_PYTHON@ -bO + # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # diff --cc bin/dohtml.py index c0a964c,5359f5e..3abb829 --- a/bin/dohtml.py +++ b/bin/dohtml.py @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ - # Copyright 1999-2013 Gentoo Foundation -#!/usr/bin/python -b ++#!@PREFIX_PORTAGE_PYTHON@ -b + # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # diff --cc bin/ebuild index 14d8ee6,8f4b103..bb0d79a --- a/bin/ebuild +++ b/bin/ebuild @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ -O - # Copyright 1999-2013 Gentoo Foundation -#!/usr/bin/python -bO ++#!@PREFIX_PORTAGE_PYTHON@ -bO + # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function diff --cc bin/ebuild-helpers/prepstrip index 0f065ae,2ef8a1a..1f714dd --- a/bin/ebuild-helpers/prepstrip +++ b/bin/ebuild-helpers/prepstrip @@@ -1,8 -1,9 +1,8 @@@ -#!/bin/bash +#!@PORTAGE_BASH@ - # Copyright 1999-2013 Gentoo Foundation + # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym} -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/helper-functions.sh +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/helper-functions.sh # avoid multiple calls to `has`. this creates things like: # FEATURES_foo=false diff --cc bin/ebuild-ipc.py index a3432c8,00337ee..1c7290f --- a/bin/ebuild-ipc.py +++ b/bin/ebuild-ipc.py @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ - # Copyright 2010-2013 Gentoo Foundation -#!/usr/bin/python -b ++#!@PREFIX_PORTAGE_PYTHON@ -b + # Copyright 2010-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # # This is a helper which ebuild processes can use diff --cc bin/egencache index 6c63734,c14be93..4ec4108 --- a/bin/egencache +++ b/bin/egencache @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ - # Copyright 2009-2013 Gentoo Foundation -#!/usr/bin/python -b ++#!@PREFIX_PORTAGE_PYTHON@ -b + # Copyright 2009-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # unicode_literals for compat with TextIOWrapper in Python 2 diff --cc bin/emaint index 9cac2d6,aeeb183..00711aa --- a/bin/emaint +++ b/bin/emaint @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ -O - # Copyright 2005-2013 Gentoo Foundation -#!/usr/bin/python -bO ++#!@PREFIX_PORTAGE_PYTHON@ -bO + # Copyright 2005-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 """System health checks and maintenance utilities. diff --cc bin/emerge index 3049528,bb93d83..273c0db --- a/bin/emerge +++ b/bin/emerge @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ - # Copyright 2006-2013 Gentoo Foundation -#!/usr/bin/python -b ++#!@PREFIX_PORTAGE_PYTHON@ -b + # Copyright 2006-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function diff --cc bin/emerge-webrsync index 6824086,2f0689c..340c359 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@@ -1,5 -1,5 +1,5 @@@ -#!/bin/bash +#!@PORTAGE_BASH@ - # Copyright 1999-2013 Gentoo Foundation + # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # Author: Karl Trygve Kalleberg # Rewritten from the old, Perl-based emerge-webrsync script diff --cc bin/emirrordist index 34f352b,0368eee..dbb971a --- a/bin/emirrordist +++ b/bin/emirrordist @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ - # Copyright 2013 Gentoo Foundation -#!/usr/bin/python -b ++#!@PREFIX_PORTAGE_PYTHON@ -b + # Copyright 2013-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import sys diff --cc bin/env-update index 09ccb4d,7651ef9..aefbf21 --- a/bin/env-update +++ b/bin/env-update @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ -O - # Copyright 1999-2013 Gentoo Foundation -#!/usr/bin/python -bO ++#!@PREFIX_PORTAGE_PYTHON@ -bO + # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function diff --cc bin/filter-bash-environment.py index 2537855,a4cdc54..029e491 --- a/bin/filter-bash-environment.py +++ b/bin/filter-bash-environment.py @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ - # Copyright 1999-2013 Gentoo Foundation -#!/usr/bin/python -b ++#!@PREFIX_PORTAGE_PYTHON@ -b + # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import codecs diff --cc bin/fixpackages index 0433d72,cec0030..a4e411d --- a/bin/fixpackages +++ b/bin/fixpackages @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ - # Copyright 1999-2013 Gentoo Foundation -#!/usr/bin/python -b ++#!@PREFIX_PORTAGE_PYTHON@ -b + # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function diff --cc bin/glsa-check index a7e24b1,972679a..85d4c41 --- a/bin/glsa-check +++ b/bin/glsa-check @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ - # Copyright 2008-2013 Gentoo Foundation -#!/usr/bin/python -b ++#!@PREFIX_PORTAGE_PYTHON@ -b + # Copyright 2008-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function diff --cc bin/install.py index 9bd38c7,3c5e0de..44fd102 --- a/bin/install.py +++ b/bin/install.py @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ - # Copyright 2013 Gentoo Foundation -#!/usr/bin/python -b ++#!@PREFIX_PORTAGE_PYTHON@ -b + # Copyright 2013-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import os diff --cc bin/isolated-functions.sh index a0b054a,a22af57..195c879 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@@ -1,8 -1,8 +1,8 @@@ -#!/bin/bash +#!@PORTAGE_BASH@ - # Copyright 1999-2013 Gentoo Foundation + # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}/eapi.sh" +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}/eapi.sh" # We need this next line for "die" and "assert". It expands # It _must_ preceed all the calls to die and assert. diff --cc bin/lock-helper.py index 3a27e32,aa2dd60..427c138 --- a/bin/lock-helper.py +++ b/bin/lock-helper.py @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ - # Copyright 2010-2013 Gentoo Foundation -#!/usr/bin/python -b ++#!@PREFIX_PORTAGE_PYTHON@ -b + # Copyright 2010-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import os diff --cc bin/portageq index 3a96dd4,79818f6..ea9dfde --- a/bin/portageq +++ b/bin/portageq @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ -O - # Copyright 1999-2013 Gentoo Foundation -#!/usr/bin/python -bO ++#!@PREFIX_PORTAGE_PYTHON@ -bO + # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function, unicode_literals diff --cc bin/quickpkg index 30bab2f,90277ad..d787ca1 --- a/bin/quickpkg +++ b/bin/quickpkg @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ - # Copyright 1999-2013 Gentoo Foundation -#!/usr/bin/python -b ++#!@PREFIX_PORTAGE_PYTHON@ -b + # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function diff --cc bin/regenworld index 3416aff,32e8e5c..d3fb9ed --- a/bin/regenworld +++ b/bin/regenworld @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ - # Copyright 1999-2013 Gentoo Foundation -#!/usr/bin/python -b ++#!@PREFIX_PORTAGE_PYTHON@ -b + # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function diff --cc bin/repoman index eb64a1b,3504b6b..2619e7e --- a/bin/repoman +++ b/bin/repoman @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ -O - # Copyright 1999-2013 Gentoo Foundation -#!/usr/bin/python -bO ++#!@PREFIX_PORTAGE_PYTHON@ -bO + # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # Next to do: dep syntax checking in mask files diff --cc bin/save-ebuild-env.sh index fd9a016,98cff83..194e46e --- a/bin/save-ebuild-env.sh +++ b/bin/save-ebuild-env.sh @@@ -1,5 -1,5 +1,5 @@@ -#!/bin/bash +#!@PORTAGE_PREFIX_BASH@ - # Copyright 1999-2013 Gentoo Foundation + # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @FUNCTION: __save_ebuild_env diff --cc bin/xattr-helper.py index 5680be3,ea83a5e..fdbed54 --- a/bin/xattr-helper.py +++ b/bin/xattr-helper.py @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ - # Copyright 2012-2013 Gentoo Foundation -#!/usr/bin/python -b ++#!@PREFIX_PORTAGE_PYTHON@ -b + # Copyright 2012-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 """Dump and restore extended attributes. diff --cc bin/xpak-helper.py index abe0acd,c4391cd..6d7759b --- a/bin/xpak-helper.py +++ b/bin/xpak-helper.py @@@ -1,5 -1,5 +1,5 @@@ - #!@PREFIX_PORTAGE_PYTHON@ - # Copyright 2009-2013 Gentoo Foundation -#!/usr/bin/python -b ++#!@PREFIX_PORTAGE_PYTHON@ -b + # Copyright 2009-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import sys diff --cc misc/emerge-delta-webrsync index 66e9275,96564af..b31015e --- a/misc/emerge-delta-webrsync +++ b/misc/emerge-delta-webrsync @@@ -1,5 -1,5 +1,5 @@@ -#!/bin/bash +#!@PORTAGE_BASH@ - # Copyright 1999-2013 Gentoo Foundation + # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # Author: Brian Harring , karltk@gentoo.org originally. # Rewritten from the old, Perl-based emerge-webrsync script diff --cc pym/portage/data.py index 4c92b8d,54e3a8d..59ce1b5 --- a/pym/portage/data.py +++ b/pym/portage/data.py @@@ -13,12 -12,9 +13,12 @@@ portage.proxy.lazyimport.lazyimport(glo ) from portage.localization import _ - ostype=platform.system() + ostype = platform.system() userland = None -if ostype == "DragonFly" or ostype.endswith("BSD"): +# Prefix always has USERLAND=GNU, even on +# FreeBSD, OpenBSD and Darwin (thank the lord!). +# Hopefully this entire USERLAND hack can go once +if EPREFIX == "" and (ostype == "DragonFly" or ostype.endswith("BSD")): userland = "BSD" else: userland = "GNU" diff --cc pym/portage/dbapi/vartree.py index 2159028,b593365..0ff5f66 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@@ -32,11 -32,9 +32,12 @@@ portage.proxy.lazyimport.lazyimport(glo 'portage.util.env_update:env_update', 'portage.util.listdir:dircache,listdir', 'portage.util.movefile:movefile', + 'portage.util.writeable_check:get_ro_checker', 'portage.util._dyn_libs.PreservedLibsRegistry:PreservedLibsRegistry', 'portage.util._dyn_libs.LinkageMapELF:LinkageMapELF@LinkageMap', + 'portage.util._dyn_libs.LinkageMapMachO:LinkageMapMachO', + 'portage.util._dyn_libs.LinkageMapPeCoff:LinkageMapPeCoff', + 'portage.util._dyn_libs.LinkageMapXCoff:LinkageMapXCoff', 'portage.util._async.SchedulerInterface:SchedulerInterface', 'portage.util._eventloop.EventLoop:EventLoop', 'portage.util._eventloop.global_event_loop:global_event_loop', diff --cc pym/portage/getbinpkg.py index 7294898,14dc149..997cd2e --- a/pym/portage/getbinpkg.py +++ b/pym/portage/getbinpkg.py @@@ -595,10 -591,10 +592,10 @@@ def dir_get_metadata(baseurl, conn=None metadatafilename = os.path.join(cache_path, 'remote_metadata.pickle') if makepickle is None: - makepickle = "/var/cache/edb/metadata.idx.most_recent" + makepickle = CACHE_PATH+"/metadata.idx.most_recent" try: - conn, protocol, address, params, headers = create_conn(baseurl, conn) + conn = create_conn(baseurl, conn)[0] except _all_errors as e: # ftplib.FTP(host) can raise errors like this: # socket.error: (111, 'Connection refused') diff --cc pym/portage/tests/runTests index 118e289,9c45276..0ad9715 --- a/pym/portage/tests/runTests +++ b/pym/portage/tests/runTests @@@ -1,6 -1,6 +1,6 @@@ - #!/usr/bin/env python -#!/usr/bin/python -bWd ++#!@PREFIX_PORTAGE_PYTHON@ -bWd # runTests.py -- Portage Unit Test Functionality - # Copyright 2006-2013 Gentoo Foundation + # Copyright 2006-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import os, sys diff --cc runtests.sh index a276cff,86d34b6..7f1233a --- a/runtests.sh +++ b/runtests.sh @@@ -1,5 -1,5 +1,5 @@@ -#!/bin/bash +#!/usr/bin/env bash - # Copyright 2010-2012 Gentoo Foundation + # Copyright 2010-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # These are the versions we care about. The rest are just "nice to have".