From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 30 Nov 2013 18:15:33 +0000 (-0500)
Subject: portage.const: restore two dropped features
X-Git-Tag: v2.2.8~32
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=86efbac7054388819a873ee8783439ca1226c5e8;p=portage.git

portage.const: restore two dropped features

The script used to clean this up accidentally dropped two features.

Reported-by: Sebastian Luther <SebastianLuther@gmx.de>
---

diff --git a/pym/portage/const.py b/pym/portage/const.py
index a19728bf7..1785bfff7 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -150,6 +150,7 @@ SUPPORTED_FEATURES       = frozenset([
 	"keeptemp",
 	"keepwork",
 	"lmirror",
+	"merge-sync",
 	"metadata-transfer",
 	"mirror",
 	"multilib-strict",
@@ -184,6 +185,7 @@ SUPPORTED_FEATURES       = frozenset([
 	"test-fail-continue",
 	"unknown-features-filter",
 	"unknown-features-warn",
+	"unmerge-backup",
 	"unmerge-logs",
 	"unmerge-orphans",
 	"userfetch",