From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 28 Jun 2011 09:12:27 +0000 (-0700)
Subject: Remove unimplemented "severe" FEATURES value.
X-Git-Tag: v2.2.0_alpha42~24
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=75a3815d904ca29584fd89b25017538631053c3b;p=portage.git

Remove unimplemented "severe" FEATURES value.

This will fix bug #373301.
---

diff --git a/man/make.conf.5 b/man/make.conf.5
index fcb0954ea..92a29d7c8 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -421,10 +421,6 @@ Enable sandbox\-ing when running \fBemerge\fR(1) and \fBebuild\fR(1).
 .B sesandbox
 Enable SELinux sandbox\-ing.  Do not toggle this \fBFEATURE\fR yourself.
 .TP
-.B severe
-When checking Manifests, only accept ones that have been signed by a
-key which you trust.
-.TP
 .B sfperms
 Stands for Smart Filesystem Permissions.  Before merging packages to the 
 live filesystem, automatically search for and set permissions on setuid 
diff --git a/pym/portage/const.py b/pym/portage/const.py
index e91c00989..6bca8f95a 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -97,7 +97,7 @@ SUPPORTED_FEATURES       = frozenset([
                            "parse-eapi-ebuild-head",
                            "prelink-checksums", "preserve-libs",
                            "protect-owned", "python-trace", "sandbox",
-                           "selinux", "sesandbox", "severe", "sfperms",
+                           "selinux", "sesandbox", "sfperms",
                            "sign", "skiprocheck", "split-elog", "split-log", "splitdebug",
                            "strict", "stricter", "suidctl", "test", "test-fail-continue",
                            "unknown-features-filter", "unknown-features-warn",