Kill --no-config-protection.

It didn't do what you expect anyway.

Fixes: ticket:619

26 files changed, 27 insertions, 136 deletions

diff --git a/paludis/action-fwd.hh b/paludis/action-fwd.hh
index b0364271c..ef58a1c40 100644
--- a/paludis/action-fwd.hh
+++ b/paludis/action-fwd.hh
@@ -81,24 +81,12 @@ namespace paludis
      * \since 0.26
      */
     typedef kc::KeyedClass<
-        kc::Field<k::no_config_protect, bool>,
         kc::Field<k::debug_build, InstallActionDebugOption>,
         kc::Field<k::checks, InstallActionChecksOption>,
         kc::Field<k::destination, std::tr1::shared_ptr<Repository> >
             > InstallActionOptions;
 
     /**
-     * Options for an UninstallAction.
-     *
-     * \see UninstallAction
-     * \ingroup g_actions
-     * \since 0.26
-     */
-    typedef kc::KeyedClass<
-        kc::Field<k::no_config_protect, bool>
-            > UninstallActionOptions;
-
-    /**
      * A failed fetch action part.
      *
      * \see FetchActionError
diff --git a/paludis/action.cc b/paludis/action.cc
index 031aeccf3..df6361633 100644
--- a/paludis/action.cc
+++ b/paludis/action.cc
@@ -81,23 +81,7 @@ FetchAction::~FetchAction()
 {
 }
 
-namespace paludis
-{
-    template <>
-    struct Implementation<UninstallAction>
-    {
-        const UninstallActionOptions options;
-
-        Implementation(const UninstallActionOptions & o) :
-            options(o)
-        {
-        }
-    };
-}
-
-UninstallAction::UninstallAction(const UninstallActionOptions & o) :
-    PrivateImplementationPattern<UninstallAction>(new Implementation<UninstallAction>(o)),
-    options(_imp->options)
+UninstallAction::UninstallAction()
 {
 }
 
@@ -329,7 +313,6 @@ template class PrivateImplementationPattern<FetchAction>;
 template class PrivateImplementationPattern<InstallAction>;
 template class PrivateImplementationPattern<PretendAction>;
 template class PrivateImplementationPattern<PretendFetchAction>;
-template class PrivateImplementationPattern<UninstallAction>;
 
 template class Sequence<FetchActionFailure>;
 
diff --git a/paludis/action.hh b/paludis/action.hh
index 5cb506fde..3aa4c91ea 100644
--- a/paludis/action.hh
+++ b/paludis/action.hh
@@ -168,20 +168,16 @@ namespace paludis
      */
     class PALUDIS_VISIBLE UninstallAction :
         public Action,
-        private PrivateImplementationPattern<UninstallAction>,
         public AcceptInterfaceVisitsThis<ActionVisitorTypes, UninstallAction>
     {
         public:
             ///\name Basic operations
             ///\{
 
-            UninstallAction(const UninstallActionOptions &);
+            UninstallAction();
             ~UninstallAction();
 
             ///\}
-
-            /// Options for the action.
-            const UninstallActionOptions & options;
     };
 
     /**
diff --git a/paludis/args/install_args_group.cc b/paludis/args/install_args_group.cc
index 05b88f867..773074784 100644
--- a/paludis/args/install_args_group.cc
+++ b/paludis/args/install_args_group.cc
@@ -36,7 +36,6 @@ InstallArgsGroup::InstallArgsGroup(ArgsHandler * h, const std::string & our_name
     a_preserve_world(this, "preserve-world", '1', "Don't modify the world file", true),
     a_add_to_world_spec(this, "add-to-world-spec", '\0',
             "Use this spec, rather than all targets, for updating world (for resume commands)"),
-    a_no_config_protection(this, "no-config-protection", '\0', "Disable config file protection (dangerous)", false),
     a_debug_build(this, "debug-build", '\0'),
     a_checks(this, "checks", '\0'),
     a_fetch(this, "fetch", 'f', "Only fetch sources; don't install anything", false),
@@ -111,7 +110,6 @@ InstallArgsGroup::destinations(Environment * env) const
 void
 InstallArgsGroup::populate_install_task(const Environment *, InstallTask & task) const
 {
-    task.set_no_config_protect(a_no_config_protection.specified());
     task.set_fetch_only(a_fetch.specified());
     task.set_pretend(a_pretend.specified());
     task.set_preserve_world(a_preserve_world.specified());
@@ -201,9 +199,6 @@ InstallArgsGroup::paludis_command_fragment() const
 {
     std::string paludis_command;
 
-    if (a_no_config_protection.specified())
-        paludis_command.append(" --" + a_no_config_protection.long_name());
-
     if (a_preserve_world.specified())
         paludis_command.append(" --" + a_preserve_world.long_name());
 
diff --git a/paludis/args/install_args_group.hh b/paludis/args/install_args_group.hh
index 4689735ad..e16acee16 100644
--- a/paludis/args/install_args_group.hh
+++ b/paludis/args/install_args_group.hh
@@ -74,9 +74,6 @@ namespace paludis
                 /// --add-to-world-spec
                 paludis::args::StringArg a_add_to_world_spec;
 
-                /// --no-config-protection
-                paludis::args::SwitchArg a_no_config_protection;
-
                 /// --debug-build
                 paludis::args::DebugBuildArg a_debug_build;
 
diff --git a/paludis/install_task.cc b/paludis/install_task.cc
index b507318e6..ebc0a88af 100644
--- a/paludis/install_task.cc
+++ b/paludis/install_task.cc
@@ -69,7 +69,6 @@ namespace paludis
         DepList dep_list;
         FetchActionOptions fetch_options;
         InstallActionOptions install_options;
-        UninstallActionOptions uninstall_options;
 
         std::list<std::string> raw_targets;
         std::tr1::shared_ptr<ConstTreeSequence<SetSpecTree, AllDepSpec> > targets;
@@ -99,12 +98,10 @@ namespace paludis
                     ),
             install_options(
                     InstallActionOptions::named_create()
-                    (k::no_config_protect(), false)
                     (k::debug_build(), iado_none)
                     (k::checks(), iaco_default)
                     (k::destination(), std::tr1::shared_ptr<Repository>())
                     ),
-            uninstall_options(false),
             targets(new ConstTreeSequence<SetSpecTree, AllDepSpec>(std::tr1::shared_ptr<AllDepSpec>(new AllDepSpec))),
             destinations(d),
             pretend(false),
@@ -785,7 +782,7 @@ InstallTask::_one(const DepList::Iterator dep, const int x, const int y, const i
 
             try
             {
-                UninstallAction uninstall_action(_imp->uninstall_options);
+                UninstallAction uninstall_action;
                 (*c)->perform_action(uninstall_action);
             }
             catch (const UninstallActionError & e)
@@ -1113,13 +1110,6 @@ InstallTask::dep_list() const
 }
 
 void
-InstallTask::set_no_config_protect(const bool value)
-{
-    _imp->install_options[k::no_config_protect()] = value;
-    _imp->uninstall_options[k::no_config_protect()] = value;
-}
-
-void
 InstallTask::set_fetch_only(const bool value)
 {
     _imp->fetch_only = value;
diff --git a/paludis/install_task.hh b/paludis/install_task.hh
index cc5ef2831..286d0c769 100644
--- a/paludis/install_task.hh
+++ b/paludis/install_task.hh
@@ -94,7 +94,6 @@ namespace paludis
             ///\name DepList and Install behaviour options
             ///\{
 
-            void set_no_config_protect(const bool value);
             void set_fetch_only(const bool value);
             void set_pretend(const bool value);
             void set_preserve_world(const bool value);
diff --git a/paludis/repositories/e/e_installed_repository.hh b/paludis/repositories/e/e_installed_repository.hh
index 319ef36d2..8a972abd1 100644
--- a/paludis/repositories/e/e_installed_repository.hh
+++ b/paludis/repositories/e/e_installed_repository.hh
@@ -118,7 +118,7 @@ namespace paludis
                 ///\{
 
                 virtual void perform_uninstall(const std::tr1::shared_ptr<const erepository::ERepositoryID> & id,
-                        const UninstallActionOptions & o, bool reinstalling) const = 0;
+                        bool reinstalling) const = 0;
 
                 virtual void perform_config(const std::tr1::shared_ptr<const erepository::ERepositoryID> & id) const;
 
diff --git a/paludis/repositories/e/e_installed_repository_id.cc b/paludis/repositories/e/e_installed_repository_id.cc
index 19beb9a08..667edd7bc 100644
--- a/paludis/repositories/e/e_installed_repository_id.cc
+++ b/paludis/repositories/e/e_installed_repository_id.cc
@@ -702,10 +702,9 @@ namespace
         {
         }
 
-        void visit(const UninstallAction & a)
+        void visit(const UninstallAction &)
         {
-            std::tr1::static_pointer_cast<const EInstalledRepository>(id->repository())->perform_uninstall(id,
-                    a.options, false);
+            std::tr1::static_pointer_cast<const EInstalledRepository>(id->repository())->perform_uninstall(id, false);
         }
 
         void visit(const InstalledAction &)
diff --git a/paludis/repositories/e/e_repository_TEST.cc b/paludis/repositories/e/e_repository_TEST.cc
index da26ee425..d9c119092 100644
--- a/paludis/repositories/e/e_repository_TEST.cc
+++ b/paludis/repositories/e/e_repository_TEST.cc
@@ -1114,7 +1114,6 @@ namespace test_cases
             InstallAction action(InstallActionOptions::named_create()
                     (k::debug_build(), iado_none)
                     (k::checks(), iaco_default)
-                    (k::no_config_protect(), false)
                     (k::destination(), installed_repo)
                     );
 
@@ -1340,7 +1339,6 @@ namespace test_cases
             InstallAction action(InstallActionOptions::named_create()
                     (k::debug_build(), iado_none)
                     (k::checks(), iaco_default)
-                    (k::no_config_protect(), false)
                     (k::destination(), installed_repo)
                     );
 
@@ -1405,7 +1403,6 @@ namespace test_cases
             InstallAction action(InstallActionOptions::named_create()
                     (k::debug_build(), iado_none)
                     (k::checks(), iaco_default)
-                    (k::no_config_protect(), false)
                     (k::destination(), installed_repo)
                     );
 
@@ -1575,7 +1572,6 @@ namespace test_cases
             InstallAction action(InstallActionOptions::named_create()
                     (k::debug_build(), iado_none)
                     (k::checks(), iaco_default)
-                    (k::no_config_protect(), false)
                     (k::destination(), installed_repo)
                     );
 
@@ -2033,7 +2029,6 @@ namespace test_cases
             InstallAction action(InstallActionOptions::named_create()
                     (k::debug_build(), iado_none)
                     (k::checks(), iaco_default)
-                    (k::no_config_protect(), false)
                     (k::destination(), installed_repo)
                     );
 
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index 21045e116..778a70b79 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -578,8 +578,6 @@ EbuildInstallCommand::extend_command(const Command & cmd)
             .with_setenv("PALUDIS_LOADSAVEENV_DIR", stringify(install_params[k::loadsaveenv_dir()]))
             .with_setenv("PALUDIS_CONFIG_PROTECT", install_params[k::config_protect()])
             .with_setenv("PALUDIS_CONFIG_PROTECT_MASK", install_params[k::config_protect_mask()])
-            .with_setenv("PALUDIS_EBUILD_OVERRIDE_CONFIG_PROTECT_MASK",
-                install_params[k::disable_cfgpro()] ? "/" : "")
             .with_setenv("PALUDIS_PROFILE_DIR", stringify(*install_params[k::profiles()]->begin()))
             .with_setenv("PALUDIS_PROFILE_DIRS", join(install_params[k::profiles()]->begin(),
                                           install_params[k::profiles()]->end(), " "))
@@ -634,8 +632,7 @@ EbuildUninstallCommand::extend_command(const Command & cmd)
     Command result(Command(cmd)
             .with_setenv("ROOT", uninstall_params[k::root()])
             .with_setenv("PALUDIS_LOADSAVEENV_DIR", stringify(uninstall_params[k::loadsaveenv_dir()]))
-            .with_setenv("PALUDIS_EBUILD_OVERRIDE_CONFIG_PROTECT_MASK",
-                uninstall_params[k::disable_cfgpro()] ? "/" : ""));
+            );
 
     if (uninstall_params[k::load_environment()])
         result
diff --git a/paludis/repositories/e/ebuild.hh b/paludis/repositories/e/ebuild.hh
index ff3fa2131..ebc7ac650 100644
--- a/paludis/repositories/e/ebuild.hh
+++ b/paludis/repositories/e/ebuild.hh
@@ -103,7 +103,6 @@ namespace paludis
             kc::Field<k::root, std::string>,
             kc::Field<k::profiles, std::tr1::shared_ptr<const FSEntrySequence> >,
             kc::Field<k::expand_vars, std::tr1::shared_ptr<const Map<std::string, std::string> > >,
-            kc::Field<k::disable_cfgpro, bool>,
             kc::Field<k::slot, SlotName>,
             kc::Field<k::config_protect, std::string>,
             kc::Field<k::config_protect_mask, std::string>,
@@ -134,7 +133,6 @@ namespace paludis
          */
         typedef kc::KeyedClass<
             kc::Field<k::root, std::string>,
-            kc::Field<k::disable_cfgpro, bool>,
             kc::Field<k::unmerge_only, bool>,
             kc::Field<k::load_environment, const FSEntry *>,
             kc::Field<k::loadsaveenv_dir, FSEntry>
diff --git a/paludis/repositories/e/ebuild_entries.cc b/paludis/repositories/e/ebuild_entries.cc
index 758c0c58a..d3df168ca 100644
--- a/paludis/repositories/e/ebuild_entries.cc
+++ b/paludis/repositories/e/ebuild_entries.cc
@@ -708,7 +708,6 @@ EbuildEntries::install(const std::tr1::shared_ptr<const ERepositoryID> & id,
                             (k::root(), o[k::destination()]->installed_root_key() ?
                              stringify(o[k::destination()]->installed_root_key()->value()) : "/")
                             (k::profiles(), _imp->params.profiles)
-                            (k::disable_cfgpro(), o[k::no_config_protect()])
                             (k::config_protect(), _imp->e_repository->profile_variable("CONFIG_PROTECT"))
                             (k::config_protect_mask(), _imp->e_repository->profile_variable("CONFIG_PROTECT_MASK"))
                             (k::loadsaveenv_dir(), _imp->params.builddir / (stringify(id->name().category) + "-" +
diff --git a/paludis/repositories/e/exndbam_repository.cc b/paludis/repositories/e/exndbam_repository.cc
index d59a7bdf2..9eb927306 100644
--- a/paludis/repositories/e/exndbam_repository.cc
+++ b/paludis/repositories/e/exndbam_repository.cc
@@ -368,8 +368,7 @@ ExndbamRepository::merge(const MergeParams & m)
 
     if (if_overwritten_id)
     {
-        UninstallActionOptions uninstall_options(false);
-        perform_uninstall(std::tr1::static_pointer_cast<const ERepositoryID>(if_overwritten_id), uninstall_options, true);
+        perform_uninstall(std::tr1::static_pointer_cast<const ERepositoryID>(if_overwritten_id), true);
     }
 
     VDBPostMergeCommand post_merge_command(
@@ -380,8 +379,7 @@ ExndbamRepository::merge(const MergeParams & m)
 }
 
 void
-ExndbamRepository::perform_uninstall(const std::tr1::shared_ptr<const ERepositoryID> & id,
-        const UninstallActionOptions & o, bool replace) const
+ExndbamRepository::perform_uninstall(const std::tr1::shared_ptr<const ERepositoryID> & id, bool replace) const
 {
     Context context("When uninstalling '" + stringify(*id) + (replace ? "' for a reinstall:" : "':"));
 
@@ -458,7 +456,6 @@ ExndbamRepository::perform_uninstall(const std::tr1::shared_ptr<const ERepositor
 
             EbuildUninstallCommandParams uninstall_params(EbuildUninstallCommandParams::named_create()
                     (k::root(), stringify(_imp->params.root))
-                    (k::disable_cfgpro(), o[k::no_config_protect()])
                     (k::unmerge_only(), false)
                     (k::loadsaveenv_dir(), ver_dir)
                     (k::load_environment(), load_env.get()));
diff --git a/paludis/repositories/e/exndbam_repository.hh b/paludis/repositories/e/exndbam_repository.hh
index 49de3fd7b..006c05c38 100644
--- a/paludis/repositories/e/exndbam_repository.hh
+++ b/paludis/repositories/e/exndbam_repository.hh
@@ -108,7 +108,7 @@ namespace paludis
             ///\{
 
             void perform_uninstall(const std::tr1::shared_ptr<const erepository::ERepositoryID> & id,
-                    const UninstallActionOptions & o, bool reinstalling) const;
+                    bool reinstalling) const;
 
             ///\}
 
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index cd0a136d8..b8dcaf765 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -368,8 +368,7 @@ VDBRepositoryKeyReadError::VDBRepositoryKeyReadError(
 }
 
 void
-VDBRepository::perform_uninstall(const std::tr1::shared_ptr<const ERepositoryID> & id,
-        const UninstallActionOptions & o, bool reinstalling) const
+VDBRepository::perform_uninstall(const std::tr1::shared_ptr<const ERepositoryID> & id, bool reinstalling) const
 {
     Context context("When uninstalling '" + stringify(*id) + (reinstalling ? "' for a reinstall:" : "':"));
 
@@ -437,7 +436,6 @@ VDBRepository::perform_uninstall(const std::tr1::shared_ptr<const ERepositoryID>
 
             EbuildUninstallCommandParams uninstall_params(EbuildUninstallCommandParams::named_create()
                     (k::root(), stringify(_imp->params.root))
-                    (k::disable_cfgpro(), o[k::no_config_protect()])
                     (k::unmerge_only(), false)
                     (k::loadsaveenv_dir(), pkg_dir)
                     (k::load_environment(), load_env.get()));
@@ -843,10 +841,7 @@ VDBRepository::merge(const MergeParams & m)
     merger.merge();
 
     if (is_replace)
-    {
-        UninstallActionOptions uninstall_options(false);
-        perform_uninstall(is_replace, uninstall_options, true);
-    }
+        perform_uninstall(is_replace, true);
 
     VDBPostMergeCommand post_merge_command(
             VDBPostMergeCommandParams::named_create()
diff --git a/paludis/repositories/e/vdb_repository.hh b/paludis/repositories/e/vdb_repository.hh
index 67657de34..b47483a39 100644
--- a/paludis/repositories/e/vdb_repository.hh
+++ b/paludis/repositories/e/vdb_repository.hh
@@ -105,7 +105,7 @@ namespace paludis
             virtual void regenerate_cache() const;
 
             virtual void perform_uninstall(const std::tr1::shared_ptr<const erepository::ERepositoryID> & id,
-                    const UninstallActionOptions & o, bool reinstalling) const;
+                    bool reinstalling) const;
 
             /* RepositoryProvidesInterface */
 
diff --git a/paludis/repositories/e/vdb_repository_TEST.cc b/paludis/repositories/e/vdb_repository_TEST.cc
index b895f092f..817239a2a 100644
--- a/paludis/repositories/e/vdb_repository_TEST.cc
+++ b/paludis/repositories/e/vdb_repository_TEST.cc
@@ -337,13 +337,10 @@ namespace test_cases
             InstallAction install_action(InstallActionOptions::named_create()
                     (k::debug_build(), iado_none)
                     (k::checks(), iaco_default)
-                    (k::no_config_protect(), false)
                     (k::destination(), vdb_repo)
                     );
 
-            UninstallAction uninstall_action(UninstallActionOptions::named_create()
-                    (k::no_config_protect(), false)
-                    );
+            UninstallAction uninstall_action;
 
             InfoAction info_action;
             ConfigAction config_action;
@@ -454,13 +451,10 @@ namespace test_cases
             InstallAction install_action(InstallActionOptions::named_create()
                     (k::debug_build(), iado_none)
                     (k::checks(), iaco_default)
-                    (k::no_config_protect(), false)
                     (k::destination(), vdb_repo)
                     );
 
-            UninstallAction uninstall_action(UninstallActionOptions::named_create()
-                    (k::no_config_protect(), false)
-                    );
+            UninstallAction uninstall_action;
 
             InfoAction info_action;
             ConfigAction config_action;
@@ -571,13 +565,10 @@ namespace test_cases
             InstallAction install_action(InstallActionOptions::named_create()
                     (k::debug_build(), iado_none)
                     (k::checks(), iaco_default)
-                    (k::no_config_protect(), false)
                     (k::destination(), vdb_repo)
                     );
 
-            UninstallAction uninstall_action(UninstallActionOptions::named_create()
-                    (k::no_config_protect(), false)
-                    );
+            UninstallAction uninstall_action;
 
             {
                 std::vector<FSEntry> cache_contents;
@@ -933,13 +924,10 @@ namespace test_cases
             InstallAction install_action(InstallActionOptions::named_create()
                     (k::debug_build(), iado_none)
                     (k::checks(), iaco_default)
-                    (k::no_config_protect(), false)
                     (k::destination(), vdb_repo)
                     );
 
-            UninstallAction uninstall_action(UninstallActionOptions::named_create()
-                    (k::no_config_protect(), false)
-                    );
+            UninstallAction uninstall_action;
 
             TEST_CHECK_EQUAL(read_file(provides_cache), "paludis-3\ninstalled\n");
 
@@ -1149,7 +1137,6 @@ namespace test_cases
             InstallAction install_action(InstallActionOptions::named_create()
                     (k::debug_build(), iado_none)
                     (k::checks(), iaco_default)
-                    (k::no_config_protect(), false)
                     (k::destination(), vdb_repo)
                     );
 
diff --git a/paludis/repositories/unpackaged/installed_id.cc b/paludis/repositories/unpackaged/installed_id.cc
index 1aa95467d..b4f7bd7eb 100644
--- a/paludis/repositories/unpackaged/installed_id.cc
+++ b/paludis/repositories/unpackaged/installed_id.cc
@@ -676,9 +676,9 @@ namespace
         {
         }
 
-        void visit(UninstallAction & a)
+        void visit(UninstallAction &)
         {
-            id->uninstall(a.options, false);
+            id->uninstall(false);
         }
     };
 }
@@ -724,7 +724,7 @@ InstalledUnpackagedID::extra_hash_value() const
 }
 
 void
-InstalledUnpackagedID::uninstall(const UninstallActionOptions &, const bool replace) const
+InstalledUnpackagedID::uninstall(const bool replace) const
 {
     Context context("When uninstalling '" + stringify(*this) + "':");
 
diff --git a/paludis/repositories/unpackaged/installed_id.hh b/paludis/repositories/unpackaged/installed_id.hh
index aa68682d9..d81a98532 100644
--- a/paludis/repositories/unpackaged/installed_id.hh
+++ b/paludis/repositories/unpackaged/installed_id.hh
@@ -87,7 +87,7 @@ namespace paludis
                 virtual std::size_t extra_hash_value() const
                     PALUDIS_ATTRIBUTE((warn_unused_result));
 
-                void uninstall(const UninstallActionOptions &, const bool replace) const;
+                void uninstall(const bool replace) const;
         };
     }
 }
diff --git a/paludis/repositories/unpackaged/installed_repository.cc b/paludis/repositories/unpackaged/installed_repository.cc
index 03fe9f70d..acd6f335c 100644
--- a/paludis/repositories/unpackaged/installed_repository.cc
+++ b/paludis/repositories/unpackaged/installed_repository.cc
@@ -367,9 +367,7 @@ InstalledUnpackagedRepository::merge(const MergeParams & m)
 
     if (if_overwritten_id)
     {
-        std::tr1::static_pointer_cast<const InstalledUnpackagedID>(if_overwritten_id)->uninstall(UninstallActionOptions::named_create()
-                (k::no_config_protect(), false),
-                true);
+        std::tr1::static_pointer_cast<const InstalledUnpackagedID>(if_overwritten_id)->uninstall(true);
     }
 }
 
diff --git a/paludis/repositories/unpackaged/installed_repository_TEST.cc b/paludis/repositories/unpackaged/installed_repository_TEST.cc
index d8732fd38..bd017326e 100644
--- a/paludis/repositories/unpackaged/installed_repository_TEST.cc
+++ b/paludis/repositories/unpackaged/installed_repository_TEST.cc
@@ -255,9 +255,7 @@ namespace test_cases
 
             const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::All())]->begin());
 
-            UninstallAction action(UninstallActionOptions::named_create()
-                    (k::no_config_protect(), false)
-                    );
+            UninstallAction action;
             id->perform_action(action);
 
             TEST_CHECK(! FSEntry("installed_repository_TEST_dir/root2/first").exists());
@@ -306,9 +304,7 @@ namespace test_cases
                         generator::Matches(parse_user_package_dep_spec("cat-one/foo:fred",
                                 &env, UserPackageDepSpecOptions())))]->begin());
 
-            UninstallAction action(UninstallActionOptions::named_create()
-                    (k::no_config_protect(), false)
-                    );
+            UninstallAction action;
             id->perform_action(action);
 
             TEST_CHECK(FSEntry("installed_repository_TEST_dir/repo3/indices/categories/cat-one/foo").is_symbolic_link());
@@ -391,7 +387,6 @@ namespace test_cases
 
                 InstallAction action(InstallActionOptions::named_create()
                         (k::destination(), repo)
-                        (k::no_config_protect(), false)
                         (k::checks(), iaco_default)
                         (k::debug_build(), iado_none));
                 (*env[selection::RequireExactlyOne(generator::InRepository(RepositoryName("unpackaged")))]->begin())->perform_action(action);
@@ -446,7 +441,6 @@ namespace test_cases
 
                 InstallAction action(InstallActionOptions::named_create()
                         (k::destination(), repo)
-                        (k::no_config_protect(), false)
                         (k::checks(), iaco_default)
                         (k::debug_build(), iado_none));
                 (*env[selection::RequireExactlyOne(generator::InRepository(RepositoryName("unpackaged")))]->begin())->perform_action(action);
@@ -504,7 +498,6 @@ namespace test_cases
 
                 InstallAction action(InstallActionOptions::named_create()
                         (k::destination(), repo)
-                        (k::no_config_protect(), false)
                         (k::checks(), iaco_default)
                         (k::debug_build(), iado_none));
                 (*env[selection::RequireExactlyOne(generator::InRepository(RepositoryName("unpackaged")))]->begin())->perform_action(action);
@@ -544,8 +537,7 @@ namespace test_cases
                             "cat/pkg4a-1.0:foo::installed-unpackaged cat/pkg4b-1.0:foo::installed-unpackaged");
                 }
 
-                UninstallAction action(UninstallActionOptions::named_create()
-                        (k::no_config_protect(), false));
+                UninstallAction action;
                 (*env[selection::RequireExactlyOne(generator::Matches(
                         parse_user_package_dep_spec("cat/pkg4a",
                             &env, UserPackageDepSpecOptions())))]->begin())->perform_action(action);
@@ -585,8 +577,7 @@ namespace test_cases
                             "cat/pkg4b-1.0:foo::installed-unpackaged");
                 }
 
-                UninstallAction action(UninstallActionOptions::named_create()
-                        (k::no_config_protect(), false));
+                UninstallAction action;
                 (*env[selection::RequireExactlyOne(generator::Matches(
                         parse_user_package_dep_spec("cat/pkg4b",
                             &env, UserPackageDepSpecOptions())))]->begin())->perform_action(action);
diff --git a/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc b/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc
index 0a3915779..90bf59e20 100644
--- a/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc
+++ b/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc
@@ -218,7 +218,6 @@ namespace test_cases
                     *env[selection::RequireExactlyOne(generator::All())]->begin());
 
             InstallAction action(InstallActionOptions::named_create()
-                    (k::no_config_protect(), false)
                     (k::debug_build(), iado_none)
                     (k::checks(), iaco_default)
                     (k::destination(), installed_repo)
@@ -273,7 +272,6 @@ namespace test_cases
                     *env[selection::RequireExactlyOne(generator::All())]->begin());
 
             InstallAction action(InstallActionOptions::named_create()
-                    (k::no_config_protect(), false)
                     (k::debug_build(), iado_none)
                     (k::checks(), iaco_default)
                     (k::destination(), installed_repo)
diff --git a/paludis/uninstall_task.cc b/paludis/uninstall_task.cc
index 89584f7d1..9a3b3877e 100644
--- a/paludis/uninstall_task.cc
+++ b/paludis/uninstall_task.cc
@@ -87,7 +87,6 @@ namespace paludis
     struct Implementation<UninstallTask>
     {
         Environment * const env;
-        UninstallActionOptions uninstall_options;
 
         std::list<std::string> raw_targets;
         std::list<std::tr1::shared_ptr<const PackageDepSpec> > targets;
@@ -105,7 +104,6 @@ namespace paludis
 
         Implementation<UninstallTask>(Environment * const e) :
             env(e),
-            uninstall_options(false),
             pretend(false),
             preserve_world(false),
             all_versions(false),
@@ -136,12 +134,6 @@ UninstallTask::set_pretend(const bool v)
 }
 
 void
-UninstallTask::set_no_config_protect(const bool v)
-{
-    _imp->uninstall_options[k::no_config_protect()] = v;
-}
-
-void
 UninstallTask::set_preserve_world(const bool v)
 {
     _imp->preserve_world = v;
@@ -367,7 +359,7 @@ UninstallTask::execute()
 
         try
         {
-            UninstallAction uninstall_action(_imp->uninstall_options);
+            UninstallAction uninstall_action;
             i->package_id->perform_action(uninstall_action);
         }
         catch (const UninstallActionError & e)
diff --git a/paludis/uninstall_task.hh b/paludis/uninstall_task.hh
index 5e0d58654..52628a4b3 100644
--- a/paludis/uninstall_task.hh
+++ b/paludis/uninstall_task.hh
@@ -112,7 +112,6 @@ namespace paludis
             ///\name Behaviour options
             ///\{
 
-            void set_no_config_protect(const bool value);
             void set_pretend(const bool value);
             void set_preserve_world(const bool value);
             void set_all_versions(const bool value);
diff --git a/paludis/util/keys.hh b/paludis/util/keys.hh
index 67e7d49b8..4375c7900 100644
--- a/paludis/util/keys.hh
+++ b/paludis/util/keys.hh
@@ -28,7 +28,6 @@ namespace paludis
     {
         typedef kc::Key<1> fetch_unneeded;
         typedef kc::Key<2> safe_resume;
-        typedef kc::Key<3> no_config_protect;
         typedef kc::Key<4> debug_build;
         typedef kc::Key<5> checks;
         typedef kc::Key<6> destination;
@@ -131,7 +130,6 @@ namespace paludis
         typedef kc::Key<102> tools_options;
         typedef kc::Key<103> rewrite_virtuals;
         typedef kc::Key<104> no_slot_or_repo;
-        typedef kc::Key<105> disable_cfgpro;
         typedef kc::Key<106> slot;
         typedef kc::Key<107> loadsaveenv_dir;
         typedef kc::Key<108> unmerge_only;