diff options
| author |   Tim Harder <radhermit@gmail.com> | 2015-07-10 17:57:36 -0400 |
|---|---|---|
| committer | Tim Harder <radhermit@gmail.com> | 2015-07-10 17:57:36 -0400 |
| commit | cfb2416f7f6605c42f27489454a315c5bdd5f54c (patch) | |
| tree | b98dcfac87053613a20c8a9f6892f97dba1c1a93 | |
| parent | bash: return to generic EAPI function banning mechanism (diff) | |
| download | pkgcore-cfb2416f7f6605c42f27489454a315c5bdd5f54c.tar.gz pkgcore-cfb2416f7f6605c42f27489454a315c5bdd5f54c.tar.bz2 pkgcore-cfb2416f7f6605c42f27489454a315c5bdd5f54c.zip | |
remove prelink references as it's not supported anymore
| -rw-r--r-- | pkgcore/const.py | 1 | ||||
| -rw-r--r-- | pkgcore/ebuild/const.py | 4 | ||||
| -rw-r--r-- | pkgcore/ebuild/triggers.py | 8 |
3 files changed, 5 insertions, 8 deletions
diff --git a/pkgcore/const.py b/pkgcore/const.py index 6674c885f..9a14b9a4a 100644 --- a/pkgcore/const.py +++ b/pkgcore/const.py @@ -27,7 +27,6 @@ SANDBOX_BINARY = "/usr/bin/sandbox" # should lift these from configuration, or PATH inspection. BASH_BINARY = "/bin/bash" COPY_BINARY = "/bin/cp" -PRELINK_BINARY = "/usr/sbin/prelink" HOST_NONROOT_PATHS = ("/usr/local/bin", "/usr/bin", "/bin") HOST_ROOT_PATHS = ("/usr/local/sbin", "/usr/local/bin", "/usr/sbin", diff --git a/pkgcore/ebuild/const.py b/pkgcore/ebuild/const.py index 5d25dffdb..dd207aaa7 100644 --- a/pkgcore/ebuild/const.py +++ b/pkgcore/ebuild/const.py @@ -11,8 +11,8 @@ from pkgcore import const incrementals = ( "ACCEPT_KEYWORDS", "ACCEPT_LICENSE", "CONFIG_PROTECT", - "CONFIG_PROTECT_MASK", "FEATURES", "IUSE_IMPLICIT", "PRELINK_PATH", - "PRELINK_PATH_MASK", "PROFILE_ONLY_VARIABLES", "USE", "USE_EXPAND", + "CONFIG_PROTECT_MASK", "FEATURES", "IUSE_IMPLICIT", + "PROFILE_ONLY_VARIABLES", "USE", "USE_EXPAND", "USE_EXPAND_HIDDEN", "USE_EXPAND_IMPLICIT", "USE_EXPAND_UNPREFIXED", ) diff --git a/pkgcore/ebuild/triggers.py b/pkgcore/ebuild/triggers.py index a61f96b8b..6110b28cb 100644 --- a/pkgcore/ebuild/triggers.py +++ b/pkgcore/ebuild/triggers.py @@ -32,16 +32,14 @@ demandload( ) colon_parsed = frozenset([ - "ADA_INCLUDE_PATH", "ADA_OBJECTS_PATH", "INFODIR", "INFOPATH", - "LDPATH", "MANPATH", "PATH", "PRELINK_PATH", "PRELINK_PATH_MASK", - "PYTHONPATH", "PKG_CONFIG_PATH", "ROOTPATH" + "ADA_INCLUDE_PATH", "ADA_OBJECTS_PATH", "INFODIR", "INFOPATH", "LDPATH", + "MANPATH", "PATH", "PYTHONPATH", "PKG_CONFIG_PATH", "ROOTPATH" ]) incrementals = frozenset([ 'ADA_INCLUDE_PATH', 'ADA_OBJECTS_PATH', 'CLASSPATH', 'CONFIG_PROTECT', 'CONFIG_PROTECT_MASK', 'INFODIR', 'INFOPATH', 'KDEDIRS', 'LDPATH', - 'MANPATH', 'PATH', 'PRELINK_PATH', 'PRELINK_PATH_MASK', 'PYTHONPATH', - 'ROOTPATH', 'PKG_CONFIG_PATH' + 'MANPATH', 'PATH', 'PYTHONPATH', 'ROOTPATH', 'PKG_CONFIG_PATH' ]) |