ebuild(1): fix env FEATURES overrides bug #364035

diff --git a/bin/ebuild b/bin/ebuild
index 58ab46f138509bf80fcd10d4eabb0184f633bf67..60d0dadef85e301ef1dd47dcafd05df7dcf38810 100755 (executable)
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -248,11 +248,9 @@ if "test" in pargs:
        # of problems such as masked "test" USE flag.
        tmpsettings["EBUILD_FORCE_TEST"] = "1"
        tmpsettings.backup_changes("EBUILD_FORCE_TEST")
-       tmpsettings["FEATURES"] = tmpsettings.get("FEATURES", "") + " " + "test"
-       tmpsettings.backup_changes("FEATURES")
+       tmpsettings.features.add("test")
 
-tmpsettings["FEATURES"] = tmpsettings.get("FEATURES", "") + " " + "-fail-clean"
-tmpsettings.backup_changes("FEATURES")
+tmpsettings.features.discard("fail-clean")
 
 # Apply package.env settings. This allows per-package FEATURES and other
 # variables (possibly PORTAGE_TMPDIR) to be available as soon as possible.