[gentoo-commits] proj/portage:prefix commit in: pym/portage/elog/, pym/portage/dbapi/, pym/portage/_sets/, pym/portage/, ...

[gentoo-commits] proj/portage:prefix commit in: pym/portage/elog/, pym/portage/dbapi/, pym/portage/_sets/, pym/portage/, ...

[Fabian Groffen]

commit:     29388983b55622b747bbeb1a1612ead9b55edb32
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 10:20:58 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 10:20:58 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=29388983

reduce differences with master

 bin/dispatch-conf                       | 3 +--
 bin/ebuild-helpers/prepall              | 2 ++
 bin/egencache                           | 1 -
 bin/install-qa-check.d/90world-writable | 2 ++
 bin/save-ebuild-env.sh                  | 3 ++-
 cnf/make.globals                        | 3 ---
 pym/_emerge/EbuildBuild.py              | 1 -
 pym/_emerge/EbuildBuildDir.py           | 1 -
 pym/portage/__init__.py                 | 2 +-
 pym/portage/_sets/profiles.py           | 1 -
 pym/portage/const.py                    | 2 --
 pym/portage/dbapi/bintree.py            | 1 -
 pym/portage/dispatch_conf.py            | 1 -
 pym/portage/elog/mod_save.py            | 1 -
 pym/portage/output.py                   | 2 +-
 15 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index dc7e182e6..184044930 100755
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -31,7 +31,6 @@ from portage import os, shutil
 from portage import _encodings, _unicode_decode
 from portage.dispatch_conf import diffstatusoutput, diff_mixed_wrapper
 from portage.process import find_binary, spawn
-from portage.const import EPREFIX
 
 FIND_EXTANT_CONFIGS  = "find '%s' %s -name '._cfg????_%s' ! -name '.*~' ! -iname '.*.bak' -print"
 DIFF_CONTENTS        = "diff -Nu '%s' '%s'"
@@ -45,7 +44,7 @@ oldmask = os.umask(0o077)
 SCRATCH_DIR = None
 while SCRATCH_DIR is None:
     try:
-        mydir = EPREFIX+"/tmp/dispatch-conf."
+        mydir = "/tmp/dispatch-conf."
         for x in range(0,8):
             if int(random() * 3) == 0:
                 mydir += chr(int(65+random()*26.0))

diff --git a/bin/ebuild-helpers/prepall b/bin/ebuild-helpers/prepall
index 94f49d22e..f43955aa7 100755
--- a/bin/ebuild-helpers/prepall
+++ b/bin/ebuild-helpers/prepall
@@ -4,7 +4,9 @@
 
 source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
 
+# PREFIX LOCAL: ED needs not to exist, wheras D does
 [[ -d ${ED} ]] || exit 0
+# END PREFIX LOCAL
 
 if ! ___eapi_has_prefix_variables; then
 	ED=${D}

diff --git a/bin/egencache b/bin/egencache
index bb7e7a9e2..044ae209f 100755
--- a/bin/egencache
+++ b/bin/egencache
@@ -62,7 +62,6 @@ from portage.util.changelog import ChangeLogTypeSort
 from portage import cpv_getkey
 from portage.dep import Atom, isjustname
 from portage.versions import vercmp
-from portage.const import EPREFIX
 
 try:
 	from xml.etree import ElementTree

diff --git a/bin/install-qa-check.d/90world-writable b/bin/install-qa-check.d/90world-writable
index bb9b0757d..90b961a86 100644
--- a/bin/install-qa-check.d/90world-writable
+++ b/bin/install-qa-check.d/90world-writable
@@ -21,7 +21,9 @@ world_writable_check() {
 		eqawarn
 	fi
 
+	# PREFIX LOCAL: keep offset prefix in the reported files
 	local unsafe_files=$(find "${ED}" -type f '(' -perm -2002 -o -perm -4002 ')' | sed -e "s:^${D}:/:")
+	# END PREFIX LOCAL
 	if [[ -n ${unsafe_files} ]] ; then
 		eqawarn "QA Notice: Unsafe files detected (set*id and world writable)"
 

diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh
index a5cc04e63..4c6ca3f17 100755
--- a/bin/save-ebuild-env.sh
+++ b/bin/save-ebuild-env.sh
@@ -89,12 +89,13 @@ __save_ebuild_env() {
 	___eapi_has_package_manager_build_user && unset -f package_manager_build_user
 	___eapi_has_package_manager_build_group && unset -f package_manager_build_group
 
-	# PREFIX: compgen is not compiled in during bootstrap
+	# BEGIN PREFIX LOCAL: compgen is not compiled in during bootstrap
 	if type compgen >& /dev/null ; then
 		# Clear out the triple underscore namespace as it is reserved by the PM.
 		unset -f $(compgen -A function ___)
 		unset ${!___*}
 	fi
+	# END PREFIX LOCAL
 
 	# portage config variables and variables set directly by portage
 	unset ACCEPT_LICENSE BAD BRACKET BUILD_PREFIX COLS \

diff --git a/cnf/make.globals b/cnf/make.globals
index 08b60564a..39986e390 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -65,9 +65,6 @@ FEATURES="assume-digests binpkg-logs
 COLLISION_IGNORE="/lib/modules/* *.py[co] *\$py.class"
 UNINSTALL_IGNORE="/lib/modules/*"
 
-# Prefix: we want preserve-libs, not sure how mainline goes about this
-FEATURES="${FEATURES} preserve-libs"
-
 # Force EPREFIX, ED and EROOT to exist in all EAPIs, not just 3 and up
 FEATURES="${FEATURES} force-prefix"
 

diff --git a/pym/_emerge/EbuildBuild.py b/pym/_emerge/EbuildBuild.py
index efa18bced..001f55fff 100644
--- a/pym/_emerge/EbuildBuild.py
+++ b/pym/_emerge/EbuildBuild.py
@@ -23,7 +23,6 @@ from portage import _encodings, _unicode_decode, _unicode_encode, os
 from portage.package.ebuild.digestcheck import digestcheck
 from portage.package.ebuild.digestgen import digestgen
 from portage.package.ebuild.doebuild import _check_temp_dir
-from portage.const import EPREFIX
 from portage.package.ebuild._spawn_nofetch import spawn_nofetch
 
 class EbuildBuild(CompositeTask):

diff --git a/pym/_emerge/EbuildBuildDir.py b/pym/_emerge/EbuildBuildDir.py
index b64b7aa56..58905c2f6 100644
--- a/pym/_emerge/EbuildBuildDir.py
+++ b/pym/_emerge/EbuildBuildDir.py
@@ -5,7 +5,6 @@ from _emerge.AsynchronousLock import AsynchronousLock
 
 import portage
 from portage import os
-import sys
 from portage.exception import PortageException
 from portage.util.SlotObject import SlotObject
 

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 1b4a6ab72..9f3301ef0 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -127,7 +127,7 @@ try:
 		DEPRECATED_PROFILE_FILE, USER_VIRTUALS_FILE, EBUILD_SH_ENV_FILE, \
 		INVALID_ENV_FILE, CUSTOM_MIRRORS_FILE, CONFIG_MEMORY_FILE,\
 		INCREMENTALS, EAPI, MISC_SH_BINARY, REPO_NAME_LOC, REPO_NAME_FILE, \
-		EPREFIX, EPREFIX_LSTRIP, rootuid
+		EPREFIX, rootuid
 
 except ImportError as e:
 	sys.stderr.write("\n\n")

diff --git a/pym/portage/_sets/profiles.py b/pym/portage/_sets/profiles.py
index 75bb00877..bccc02e7c 100644
--- a/pym/portage/_sets/profiles.py
+++ b/pym/portage/_sets/profiles.py
@@ -8,7 +8,6 @@ from portage.util import grabfile_package, stack_lists
 from portage._sets.base import PackageSet
 from portage._sets import get_boolean
 from portage.util import writemsg_level
-from portage.const import EPREFIX
 
 __all__ = ["PackagesSystemSet"]
 

diff --git a/pym/portage/const.py b/pym/portage/const.py
index 02299dc6e..d5533fb26 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -15,8 +15,6 @@ import os
 # START OF CONSTANTS -- START OF CONSTANTS -- START OF CONSTANTS -- START OF
 # ===========================================================================
 
-EPREFIX_LSTRIP          = EPREFIX.lstrip(os.path.sep)
-
 # There are two types of variables here which can easily be confused,
 # resulting in arbitrary bugs, mainly exposed with an offset
 # installation (Prefix).  The two types relate to the usage of

diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index 1a62db61a..dae959d41 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -28,7 +28,6 @@ from portage.dbapi.virtual import fakedbapi
 from portage.dep import Atom, use_reduce, paren_enclose
 from portage.exception import AlarmSignal, InvalidData, InvalidPackageName, \
 	ParseError, PermissionDenied, PortageException
-from portage.const import EAPI
 from portage.localization import _
 from portage import _movefile
 from portage import os

diff --git a/pym/portage/dispatch_conf.py b/pym/portage/dispatch_conf.py
index 76aa3d49a..eaea59393 100644
--- a/pym/portage/dispatch_conf.py
+++ b/pym/portage/dispatch_conf.py
@@ -22,7 +22,6 @@ from portage.env.loaders import KeyValuePairFileLoader
 from portage.localization import _
 from portage.util import shlex_split, varexpand
 from portage.util.path import iter_parents
-from portage.const import EPREFIX
 
 RCS_BRANCH = '1.1.1'
 RCS_LOCK = 'rcs -ko -M -l'

diff --git a/pym/portage/elog/mod_save.py b/pym/portage/elog/mod_save.py
index 338057b32..829ec6c5e 100644
--- a/pym/portage/elog/mod_save.py
+++ b/pym/portage/elog/mod_save.py
@@ -13,7 +13,6 @@ from portage import _unicode_encode
 from portage.data import portage_gid, portage_uid
 from portage.package.ebuild.prepare_build_dirs import _ensure_log_subdirs
 from portage.util import apply_permissions, ensure_dirs, normalize_path
-from portage.const import EPREFIX_LSTRIP
 
 def process(mysettings, key, logentries, fulltext):
 

diff --git a/pym/portage/output.py b/pym/portage/output.py
index 6de0375f5..6d8c6324a 100644
--- a/pym/portage/output.py
+++ b/pym/portage/output.py
@@ -21,7 +21,7 @@ from portage import os
 from portage import _encodings
 from portage import _unicode_encode
 from portage import _unicode_decode
-from portage.const import COLOR_MAP_FILE, EPREFIX
+from portage.const import COLOR_MAP_FILE
 from portage.exception import CommandNotFound, FileNotFound, \
 	ParseError, PermissionDenied, PortageException
 from portage.localization import _