summaryrefslogtreecommitdiffstats
path: root/cnf
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-10-10 01:33:10 +0000
committerZac Medico <zmedico@gentoo.org>2009-10-10 01:33:10 +0000
commitfc447b9a1b5902d914fc8bd1f341cb897260dce1 (patch)
tree0eef7fe5f5f7015dc9eced15d0b8bb625f358775 /cnf
parent3ce278ba6c7fdb53b470124d8dfa8f7faf3f1ea8 (diff)
downloadportage-fc447b9a1b5902d914fc8bd1f341cb897260dce1.tar.gz
portage-fc447b9a1b5902d914fc8bd1f341cb897260dce1.tar.bz2
portage-fc447b9a1b5902d914fc8bd1f341cb897260dce1.zip
Revert preserve-libs support since it won't be supported in this branch.
svn path=/main/branches/2.1.7/; revision=14538
Diffstat (limited to 'cnf')
-rw-r--r--cnf/make.globals3
-rw-r--r--cnf/sets.conf6
2 files changed, 0 insertions, 9 deletions
diff --git a/cnf/make.globals b/cnf/make.globals
index 14ebf4fd0..0eb664e19 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -49,9 +49,6 @@ FEATURES="assume-digests distlocks fixpackages news parallel-fetch protect-owned
# FEATURES=protect-owned to operate smoothly in all cases.
COLLISION_IGNORE="/lib/modules"
-# Enable for global testing
-FEATURES="${FEATURES} preserve-libs"
-
# Default chunksize for binhost comms
PORTAGE_BINHOST_CHUNKSIZE="3000"
diff --git a/cnf/sets.conf b/cnf/sets.conf
index a921a2bb1..79760a1b3 100644
--- a/cnf/sets.conf
+++ b/cnf/sets.conf
@@ -40,12 +40,6 @@ class = portage.sets.files.StaticFileSet
multiset = true
directory = /etc/portage/sets
-# Set to rebuild all packages that need a preserved lib that only remains due
-# to FEATURES=preserve-libs
-[preserved-rebuild]
-class = portage.sets.libs.PreservedLibraryConsumerSet
-world-candidate = False
-
# Installed ebuilds that inherit from known live eclasses.
[live-rebuild]
class = portage.sets.dbapi.VariableSet