Remove accept_keywords_key

35 files changed, 0 insertions, 148 deletions

diff --git a/paludis/repositories/accounts/accounts_repository.cc b/paludis/repositories/accounts/accounts_repository.cc
index 1827d2bb0..5127e4f8d 100644
--- a/paludis/repositories/accounts/accounts_repository.cc
+++ b/paludis/repositories/accounts/accounts_repository.cc
@@ -441,11 +441,5 @@ AccountsRepository::sync(
     return false;
 }
 
-const std::shared_ptr<const MetadataValueKey<std::string> >
-AccountsRepository::accept_keywords_key() const
-{
-    return make_null_shared_ptr();
-}
-
 template class Pimp<AccountsRepository>;
 
diff --git a/paludis/repositories/accounts/accounts_repository.hh b/paludis/repositories/accounts/accounts_repository.hh
index e3cf12c4c..5f8eb72b5 100644
--- a/paludis/repositories/accounts/accounts_repository.hh
+++ b/paludis/repositories/accounts/accounts_repository.hh
@@ -111,7 +111,6 @@ namespace paludis
                 virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
                 virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const;
                 virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const;
-                virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
                 virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const;
 
                 ///\}
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 9fc779e41..2b2a15f86 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -261,7 +261,6 @@ namespace paludis
         std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > binary_keywords_filter;
         std::shared_ptr<const MetadataValueKey<FSPath> > accounts_repository_data_location_key;
         std::shared_ptr<const MetadataValueKey<FSPath> > e_updates_location_key;
-        mutable std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key;
         std::shared_ptr<Map<std::string, std::string> > sync_hosts;
         std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key;
         std::list<std::shared_ptr<const MetadataKey> > about_keys;
@@ -570,8 +569,6 @@ ERepository::_add_metadata_keys() const
         add_metadata_key(_imp->accounts_repository_data_location_key);
     if (_imp->e_updates_location_key)
         add_metadata_key(_imp->e_updates_location_key);
-    if (_imp->accept_keywords_key)
-        add_metadata_key(_imp->accept_keywords_key);
     add_metadata_key(_imp->sync_host_key);
 
     std::for_each(_imp->about_keys.begin(), _imp->about_keys.end(), std::bind(
@@ -1084,33 +1081,6 @@ ERepository::make_manifest(const QualifiedPackageName & qpn)
 void
 ERepository::need_keys_added() const
 {
-    Lock l(_imp->mutexes->profile_ptr_mutex);
-
-    if (! _imp->accept_keywords_key)
-    {
-        _imp->need_profiles();
-
-        std::string k, v;
-
-        v = EAPIData::get_instance()->eapi_from_string(eapi_for_file(*_imp->main_profile_path)
-                )->supported()->ebuild_environment_variables()->env_accept_keywords();
-        if (! v.empty())
-            k = _imp->profile_ptr->environment_variable(v);
-
-        if (k.empty())
-        {
-            v = EAPIData::get_instance()->eapi_from_string(eapi_for_file(*_imp->main_profile_path)
-                    )->supported()->ebuild_environment_variables()->env_arch();
-            if (! v.empty())
-                k = _imp->profile_ptr->environment_variable(v);
-        }
-
-        _imp->accept_keywords_key = std::make_shared<LiteralMetadataValueKey<std::string>>(v,
-                    "Default accepted keywords", mkt_internal, k);
-        add_metadata_key(_imp->accept_keywords_key);
-    }
-
-    return;
 }
 
 const std::shared_ptr<const MetadataValueKey<std::string> >
@@ -1630,13 +1600,6 @@ ERepository::populate_sets() const
     }
 }
 
-const std::shared_ptr<const MetadataValueKey<std::string> >
-ERepository::accept_keywords_key() const
-{
-    need_keys_added();
-    return _imp->accept_keywords_key;
-}
-
 const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > >
 ERepository::sync_host_key() const
 {
diff --git a/paludis/repositories/e/e_repository.hh b/paludis/repositories/e/e_repository.hh
index 63f4930bd..3c52aa7d5 100644
--- a/paludis/repositories/e/e_repository.hh
+++ b/paludis/repositories/e/e_repository.hh
@@ -160,7 +160,6 @@ namespace paludis
             virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const;
             virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const;
             virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > info_vars_key() const;
-            virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
             virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const;
 
             ///\name RepositoryFactory functions
diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc
index 194441218..c88d188ab 100644
--- a/paludis/repositories/e/eapi.cc
+++ b/paludis/repositories/e/eapi.cc
@@ -78,7 +78,6 @@ namespace
                         n::description_use() = check_get(k, "description_use"),
                         n::env_a() = check_get(k, "env_a"),
                         n::env_aa() = check_get(k, "env_aa"),
-                        n::env_accept_keywords() = check_get(k, "env_accept_keywords"),
                         n::env_accept_license() = check_get(k, "env_accept_license"),
                         n::env_arch() = check_get(k, "env_arch"),
                         n::env_d() = check_get(k, "env_d"),
diff --git a/paludis/repositories/e/eapi.hh b/paludis/repositories/e/eapi.hh
index 246555277..ce126c41f 100644
--- a/paludis/repositories/e/eapi.hh
+++ b/paludis/repositories/e/eapi.hh
@@ -91,7 +91,6 @@ namespace paludis
         typedef Name<struct name_eclass_must_not_set_variables> eclass_must_not_set_variables;
         typedef Name<struct name_env_a> env_a;
         typedef Name<struct name_env_aa> env_aa;
-        typedef Name<struct name_env_accept_keywords> env_accept_keywords;
         typedef Name<struct name_env_accept_license> env_accept_license;
         typedef Name<struct name_env_arch> env_arch;
         typedef Name<struct name_env_d> env_d;
@@ -324,7 +323,6 @@ namespace paludis
             NamedValue<n::description_use, std::string> description_use;
             NamedValue<n::env_a, std::string> env_a;
             NamedValue<n::env_aa, std::string> env_aa;
-            NamedValue<n::env_accept_keywords, std::string> env_accept_keywords;
             NamedValue<n::env_accept_license, std::string> env_accept_license;
             NamedValue<n::env_arch, std::string> env_arch;
             NamedValue<n::env_d, std::string> env_d;
diff --git a/paludis/repositories/e/eapis/0.conf b/paludis/repositories/e/eapis/0.conf
index 7962dd04c..427d174ed 100644
--- a/paludis/repositories/e/eapis/0.conf
+++ b/paludis/repositories/e/eapis/0.conf
@@ -242,7 +242,6 @@ env_iuse_implicit = IUSE_IMPLICIT
 env_aa = AA
 env_arch = ARCH
 env_kv = KV
-env_accept_keywords = ACCEPT_KEYWORDS
 env_accept_license = ACCEPT_LICENSE
 env_portdir = PORTDIR
 env_distdir = DISTDIR
diff --git a/paludis/repositories/e/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf
index 8be093315..603d87e43 100644
--- a/paludis/repositories/e/eapis/exheres-0.conf
+++ b/paludis/repositories/e/eapis/exheres-0.conf
@@ -292,7 +292,6 @@ env_use_expand_hidden = HIDDEN_SUBOPTIONS
 env_aa =
 env_arch =
 env_kv =
-env_accept_keywords = ACCEPT_PLATFORMS
 env_portdir = REPODIR
 env_distdir = FETCHEDDIR
 env_d = IMAGE
diff --git a/paludis/repositories/e/eapis/paludis-1.conf b/paludis/repositories/e/eapis/paludis-1.conf
index 7705aedaa..088054f65 100644
--- a/paludis/repositories/e/eapis/paludis-1.conf
+++ b/paludis/repositories/e/eapis/paludis-1.conf
@@ -241,7 +241,6 @@ env_use_expand_hidden = USE_EXPAND_HIDDEN
 env_aa =
 env_arch = ARCH
 env_kv =
-env_accept_keywords = ACCEPT_KEYWORDS
 env_portdir = PORTDIR
 env_distdir = DISTDIR
 env_d = D
diff --git a/paludis/repositories/e/exndbam_repository.cc b/paludis/repositories/e/exndbam_repository.cc
index d2963b3c9..f3018394d 100644
--- a/paludis/repositories/e/exndbam_repository.cc
+++ b/paludis/repositories/e/exndbam_repository.cc
@@ -637,9 +637,3 @@ ExndbamRepository::perform_updates()
 {
 }
 
-const std::shared_ptr<const MetadataValueKey<std::string> >
-ExndbamRepository::accept_keywords_key() const
-{
-    return make_null_shared_ptr();
-}
-
diff --git a/paludis/repositories/e/exndbam_repository.hh b/paludis/repositories/e/exndbam_repository.hh
index 4a4bb8fb9..deb0325b7 100644
--- a/paludis/repositories/e/exndbam_repository.hh
+++ b/paludis/repositories/e/exndbam_repository.hh
@@ -119,7 +119,6 @@ namespace paludis
             virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
             virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const;
             virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const;
-            virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
             virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const;
 
             ///\name For use by ExndbamID
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index 62be8a0fe..b1063e7eb 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -1319,9 +1319,3 @@ VDBRepository::perform_updates()
     }
 }
 
-const std::shared_ptr<const MetadataValueKey<std::string> >
-VDBRepository::accept_keywords_key() const
-{
-    return make_null_shared_ptr();
-}
-
diff --git a/paludis/repositories/e/vdb_repository.hh b/paludis/repositories/e/vdb_repository.hh
index b99064228..24bde9630 100644
--- a/paludis/repositories/e/vdb_repository.hh
+++ b/paludis/repositories/e/vdb_repository.hh
@@ -146,7 +146,6 @@ namespace paludis
             virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
             virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const;
             virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const;
-            virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
             virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const;
 
             ///\name RepositoryFactory functions
diff --git a/paludis/repositories/fake/fake_installed_repository.cc b/paludis/repositories/fake/fake_installed_repository.cc
index ca106a004..18591535b 100644
--- a/paludis/repositories/fake/fake_installed_repository.cc
+++ b/paludis/repositories/fake/fake_installed_repository.cc
@@ -206,12 +206,6 @@ FakeInstalledRepository::repository_factory_dependencies(
     return std::make_shared<RepositoryNameSet>();
 }
 
-const std::shared_ptr<const MetadataValueKey<std::string> >
-FakeInstalledRepository::accept_keywords_key() const
-{
-    return make_null_shared_ptr();
-}
-
 const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > >
 FakeInstalledRepository::sync_host_key() const
 {
diff --git a/paludis/repositories/fake/fake_installed_repository.hh b/paludis/repositories/fake/fake_installed_repository.hh
index b7c0eb820..5b61bbaf5 100644
--- a/paludis/repositories/fake/fake_installed_repository.hh
+++ b/paludis/repositories/fake/fake_installed_repository.hh
@@ -86,7 +86,6 @@ namespace paludis
             virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
             virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const;
             virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const;
-            virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
             virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const;
 
             ///\name RepositoryFactory functions
diff --git a/paludis/repositories/fake/fake_repository.cc b/paludis/repositories/fake/fake_repository.cc
index a7cd664d4..459a25d5c 100644
--- a/paludis/repositories/fake/fake_repository.cc
+++ b/paludis/repositories/fake/fake_repository.cc
@@ -148,12 +148,6 @@ FakeRepository::installed_root_key() const
     return std::shared_ptr<const MetadataValueKey<FSPath> >();
 }
 
-const std::shared_ptr<const MetadataValueKey<std::string> >
-FakeRepository::accept_keywords_key() const
-{
-    return make_null_shared_ptr();
-}
-
 const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > >
 FakeRepository::sync_host_key() const
 {
diff --git a/paludis/repositories/fake/fake_repository.hh b/paludis/repositories/fake/fake_repository.hh
index b1895ef01..e6720fb35 100644
--- a/paludis/repositories/fake/fake_repository.hh
+++ b/paludis/repositories/fake/fake_repository.hh
@@ -78,7 +78,6 @@ namespace paludis
             virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
             virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const;
             virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const;
-            virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
             virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const;
     };
 }
diff --git a/paludis/repositories/gemcutter/gemcutter_repository.cc b/paludis/repositories/gemcutter/gemcutter_repository.cc
index 567c50374..13b8ca217 100644
--- a/paludis/repositories/gemcutter/gemcutter_repository.cc
+++ b/paludis/repositories/gemcutter/gemcutter_repository.cc
@@ -296,12 +296,6 @@ GemcutterRepository::perform_hook(const Hook &, const std::shared_ptr<OutputMana
     return make_named_values<HookResult>(n::max_exit_status() = 0, n::output() = "");
 }
 
-const std::shared_ptr<const MetadataValueKey<std::string> >
-GemcutterRepository::accept_keywords_key() const
-{
-    return make_null_shared_ptr();
-}
-
 const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > >
 GemcutterRepository::sync_host_key() const
 {
diff --git a/paludis/repositories/gemcutter/gemcutter_repository.hh b/paludis/repositories/gemcutter/gemcutter_repository.hh
index e17a660f2..e93a0c08b 100644
--- a/paludis/repositories/gemcutter/gemcutter_repository.hh
+++ b/paludis/repositories/gemcutter/gemcutter_repository.hh
@@ -72,7 +72,6 @@ namespace paludis
                 virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
                 virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const;
                 virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const;
-                virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
                 virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const;
 
                 virtual bool has_category_named(const CategoryNamePart & c, const RepositoryContentMayExcludes &) const;
diff --git a/paludis/repositories/repository/repository_repository.cc b/paludis/repositories/repository/repository_repository.cc
index 8bb872c29..6a057772f 100644
--- a/paludis/repositories/repository/repository_repository.cc
+++ b/paludis/repositories/repository/repository_repository.cc
@@ -317,12 +317,6 @@ RepositoryRepository::perform_hook(const Hook &, const std::shared_ptr<OutputMan
     return make_named_values<HookResult>(n::max_exit_status() = 0, n::output() = "");
 }
 
-const std::shared_ptr<const MetadataValueKey<std::string> >
-RepositoryRepository::accept_keywords_key() const
-{
-    return make_null_shared_ptr();
-}
-
 const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > >
 RepositoryRepository::sync_host_key() const
 {
diff --git a/paludis/repositories/repository/repository_repository.hh b/paludis/repositories/repository/repository_repository.hh
index b125d45c5..8b2a683ca 100644
--- a/paludis/repositories/repository/repository_repository.hh
+++ b/paludis/repositories/repository/repository_repository.hh
@@ -76,7 +76,6 @@ namespace paludis
                 virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
                 virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const;
                 virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const;
-                virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
                 virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const;
 
                 virtual bool has_category_named(const CategoryNamePart & c, const RepositoryContentMayExcludes &) const;
diff --git a/paludis/repositories/unavailable/unavailable_repository.cc b/paludis/repositories/unavailable/unavailable_repository.cc
index 2cbade85d..4c3306152 100644
--- a/paludis/repositories/unavailable/unavailable_repository.cc
+++ b/paludis/repositories/unavailable/unavailable_repository.cc
@@ -448,12 +448,6 @@ UnavailableRepository::perform_hook(const Hook &, const std::shared_ptr<OutputMa
     return make_named_values<HookResult>(n::max_exit_status() = 0, n::output() = "");
 }
 
-const std::shared_ptr<const MetadataValueKey<std::string> >
-UnavailableRepository::accept_keywords_key() const
-{
-    return make_null_shared_ptr();
-}
-
 const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > >
 UnavailableRepository::sync_host_key() const
 {
diff --git a/paludis/repositories/unavailable/unavailable_repository.hh b/paludis/repositories/unavailable/unavailable_repository.hh
index e2ef3de61..f75100601 100644
--- a/paludis/repositories/unavailable/unavailable_repository.hh
+++ b/paludis/repositories/unavailable/unavailable_repository.hh
@@ -75,7 +75,6 @@ namespace paludis
                 virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
                 virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const;
                 virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const;
-                virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
                 virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const;
 
                 virtual bool has_category_named(const CategoryNamePart & c, const RepositoryContentMayExcludes &) const;
diff --git a/paludis/repositories/unpackaged/installed_repository.cc b/paludis/repositories/unpackaged/installed_repository.cc
index df90d9fff..89924a3d2 100644
--- a/paludis/repositories/unpackaged/installed_repository.cc
+++ b/paludis/repositories/unpackaged/installed_repository.cc
@@ -505,12 +505,6 @@ InstalledUnpackagedRepository::sync(
     return false;
 }
 
-const std::shared_ptr<const MetadataValueKey<std::string> >
-InstalledUnpackagedRepository::accept_keywords_key() const
-{
-    return make_null_shared_ptr();
-}
-
 const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > >
 InstalledUnpackagedRepository::sync_host_key() const
 {
diff --git a/paludis/repositories/unpackaged/installed_repository.hh b/paludis/repositories/unpackaged/installed_repository.hh
index acb21a323..9b1c2d428 100644
--- a/paludis/repositories/unpackaged/installed_repository.hh
+++ b/paludis/repositories/unpackaged/installed_repository.hh
@@ -107,7 +107,6 @@ namespace paludis
             virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
             virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const;
             virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const;
-            virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
             virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const;
 
             ///\name RepositoryFactory functions
diff --git a/paludis/repositories/unpackaged/unpackaged_repository.cc b/paludis/repositories/unpackaged/unpackaged_repository.cc
index cd92f7205..1d3df374d 100644
--- a/paludis/repositories/unpackaged/unpackaged_repository.cc
+++ b/paludis/repositories/unpackaged/unpackaged_repository.cc
@@ -306,12 +306,6 @@ UnpackagedRepository::sync(
     return false;
 }
 
-const std::shared_ptr<const MetadataValueKey<std::string> >
-UnpackagedRepository::accept_keywords_key() const
-{
-    return make_null_shared_ptr();
-}
-
 const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > >
 UnpackagedRepository::sync_host_key() const
 {
diff --git a/paludis/repositories/unpackaged/unpackaged_repository.hh b/paludis/repositories/unpackaged/unpackaged_repository.hh
index 431096538..a11936d1e 100644
--- a/paludis/repositories/unpackaged/unpackaged_repository.hh
+++ b/paludis/repositories/unpackaged/unpackaged_repository.hh
@@ -115,7 +115,6 @@ namespace paludis
             virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
             virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const;
             virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const;
-            virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
             virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const;
 
             ///\name RepositoryFactory functions
diff --git a/paludis/repositories/unwritten/unwritten_repository.cc b/paludis/repositories/unwritten/unwritten_repository.cc
index 717fbc7dd..af809e45a 100644
--- a/paludis/repositories/unwritten/unwritten_repository.cc
+++ b/paludis/repositories/unwritten/unwritten_repository.cc
@@ -407,12 +407,6 @@ UnwrittenRepository::perform_hook(const Hook &, const std::shared_ptr<OutputMana
     return make_named_values<HookResult>(n::max_exit_status() = 0, n::output() = "");
 }
 
-const std::shared_ptr<const MetadataValueKey<std::string> >
-UnwrittenRepository::accept_keywords_key() const
-{
-    return make_null_shared_ptr();
-}
-
 const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > >
 UnwrittenRepository::sync_host_key() const
 {
diff --git a/paludis/repositories/unwritten/unwritten_repository.hh b/paludis/repositories/unwritten/unwritten_repository.hh
index 729f24c9e..60cabffd5 100644
--- a/paludis/repositories/unwritten/unwritten_repository.hh
+++ b/paludis/repositories/unwritten/unwritten_repository.hh
@@ -74,7 +74,6 @@ namespace paludis
                 virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
                 virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const;
                 virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const;
-                virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
                 virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const;
 
                 virtual bool has_category_named(const CategoryNamePart & c, const RepositoryContentMayExcludes &) const;
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.cc b/paludis/repositories/virtuals/installed_virtuals_repository.cc
index e4c2c5230..27de04c8f 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.cc
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.cc
@@ -264,12 +264,6 @@ InstalledVirtualsRepository::sync(
     return false;
 }
 
-const std::shared_ptr<const MetadataValueKey<std::string> >
-InstalledVirtualsRepository::accept_keywords_key() const
-{
-    return make_null_shared_ptr();
-}
-
 const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > >
 InstalledVirtualsRepository::sync_host_key() const
 {
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.hh b/paludis/repositories/virtuals/installed_virtuals_repository.hh
index 0104f2810..88ff6bafc 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.hh
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.hh
@@ -111,7 +111,6 @@ namespace paludis
             virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
             virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const;
             virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const;
-            virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
             virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const;
 
             /* RepositoryDestinationInterface */
diff --git a/paludis/repositories/virtuals/virtuals_repository.cc b/paludis/repositories/virtuals/virtuals_repository.cc
index 0341d4ead..8dcb6b3c0 100644
--- a/paludis/repositories/virtuals/virtuals_repository.cc
+++ b/paludis/repositories/virtuals/virtuals_repository.cc
@@ -213,12 +213,6 @@ VirtualsRepository::sync(
     return false;
 }
 
-const std::shared_ptr<const MetadataValueKey<std::string> >
-VirtualsRepository::accept_keywords_key() const
-{
-    return make_null_shared_ptr();
-}
-
 const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > >
 VirtualsRepository::sync_host_key() const
 {
diff --git a/paludis/repositories/virtuals/virtuals_repository.hh b/paludis/repositories/virtuals/virtuals_repository.hh
index ef59333b7..ba610a96c 100644
--- a/paludis/repositories/virtuals/virtuals_repository.hh
+++ b/paludis/repositories/virtuals/virtuals_repository.hh
@@ -107,7 +107,6 @@ namespace paludis
             virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
             virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const;
             virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const;
-            virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
             virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const;
 
             ///\name Set methods
diff --git a/paludis/repository.hh b/paludis/repository.hh
index a17a66727..0fbbd1ab5 100644
--- a/paludis/repository.hh
+++ b/paludis/repository.hh
@@ -280,17 +280,6 @@ namespace paludis
             virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const = 0;
 
             /**
-             * The accept_keywords_key belonging to a NoConfigEnvironment's
-             * main repository is used to work out whether to accept keywords.
-             *
-             * This only needs to be defined for repositories that can be a
-             * NoConfigEnvironment main repository.
-             *
-             * \since 0.44
-             */
-            virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const = 0;
-
-            /**
              * The sync_host_key, if present, should have value containing
              * the host against which a sync will be performed for each suffix.
              *
diff --git a/paludis/user_dep_spec.cc b/paludis/user_dep_spec.cc
index 404f42d18..45ade6cb4 100644
--- a/paludis/user_dep_spec.cc
+++ b/paludis/user_dep_spec.cc
@@ -918,8 +918,6 @@ UserKeyRequirement::requirement_met(
             key = repo->location_key().get();
         else if (_imp->key == "::$installed_root")
             key = repo->installed_root_key().get();
-        else if (_imp->key == "::$accept_keywords")
-            key = repo->accept_keywords_key().get();
         else if (_imp->key == "::$sync_host")
             key = repo->sync_host_key().get();
     }