aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-16 19:57:05 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-16 19:57:05 +0100
commitbb2ba5d1665a34c0cf7b86bb71439a8711993922 (patch)
treee363592fae4f80cd42b3d9f4a9c462c2d0ff2b18
parent25c5dc5fa3b3e4c9285215b4791d2b2ba50070bc (diff)
downloadpaludis-bb2ba5d1665a34c0cf7b86bb71439a8711993922.tar.gz
paludis-bb2ba5d1665a34c0cf7b86bb71439a8711993922.tar.xz
Remove accept_keywords_key
-rw-r--r--paludis/repositories/accounts/accounts_repository.cc6
-rw-r--r--paludis/repositories/accounts/accounts_repository.hh1
-rw-r--r--paludis/repositories/e/e_repository.cc37
-rw-r--r--paludis/repositories/e/e_repository.hh1
-rw-r--r--paludis/repositories/e/eapi.cc1
-rw-r--r--paludis/repositories/e/eapi.hh2
-rw-r--r--paludis/repositories/e/eapis/0.conf1
-rw-r--r--paludis/repositories/e/eapis/exheres-0.conf1
-rw-r--r--paludis/repositories/e/eapis/paludis-1.conf1
-rw-r--r--paludis/repositories/e/exndbam_repository.cc6
-rw-r--r--paludis/repositories/e/exndbam_repository.hh1
-rw-r--r--paludis/repositories/e/vdb_repository.cc6
-rw-r--r--paludis/repositories/e/vdb_repository.hh1
-rw-r--r--paludis/repositories/fake/fake_installed_repository.cc6
-rw-r--r--paludis/repositories/fake/fake_installed_repository.hh1
-rw-r--r--paludis/repositories/fake/fake_repository.cc6
-rw-r--r--paludis/repositories/fake/fake_repository.hh1
-rw-r--r--paludis/repositories/gemcutter/gemcutter_repository.cc6
-rw-r--r--paludis/repositories/gemcutter/gemcutter_repository.hh1
-rw-r--r--paludis/repositories/repository/repository_repository.cc6
-rw-r--r--paludis/repositories/repository/repository_repository.hh1
-rw-r--r--paludis/repositories/unavailable/unavailable_repository.cc6
-rw-r--r--paludis/repositories/unavailable/unavailable_repository.hh1
-rw-r--r--paludis/repositories/unpackaged/installed_repository.cc6
-rw-r--r--paludis/repositories/unpackaged/installed_repository.hh1
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository.cc6
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository.hh1
-rw-r--r--paludis/repositories/unwritten/unwritten_repository.cc6
-rw-r--r--paludis/repositories/unwritten/unwritten_repository.hh1
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.cc6
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.hh1
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.cc6
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.hh1
-rw-r--r--paludis/repository.hh11
-rw-r--r--paludis/user_dep_spec.cc2
-rw-r--r--ruby/repository.cc2
36 files changed, 0 insertions, 150 deletions
diff --git a/paludis/repositories/accounts/accounts_repository.cc b/paludis/repositories/accounts/accounts_repository.cc
index 1827d2b..5127e4f 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 e3cf12c..5f8eb72 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 9fc779e..2b2a15f 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 63f4930..3c52aa7 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 1944412..c88d188 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 2465552..ce126c4 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 7962dd0..427d174 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 8be0933..603d87e 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 7705aed..088054f 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 d2963b3..f301839 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 4a4bb8f..deb0325 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 62be8a0..b1063e7 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 b990642..24bde96 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 ca106a0..1859153 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 b7c0eb8..5b61bba 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 a7cd664..459a25d 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 b1895ef..e6720fb 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 567c503..13b8ca2 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 e17a660..e93a0c0 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 8bb872c..6a05777 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 b125d45..8b2a683 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 2cbade8..4c33061 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 e2ef3de..f751006 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 df90d9f..89924a3 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 acb21a3..9b1c2d4 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 cd92f72..1d3df37 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 4310965..a11936d 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 717fbc7..af809e4 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 729f24c..60cabff 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 e4c2c52..27de04c 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 0104f28..88ff6ba 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 0341d4e..8dcb6b3 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 ef59333..ba610a9 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 a17a667..0fbbd1a 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 404f42d..45ade6c 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();
}
diff --git a/ruby/repository.cc b/ruby/repository.cc
index db87c3c..016aa8c 100644
--- a/ruby/repository.cc
+++ b/ruby/repository.cc
@@ -571,8 +571,6 @@ namespace
rb_define_method(c_repository, "installed_root_key",
RUBY_FUNC_CAST((&RepositoryKey<MetadataValueKey<FSPath>, &Repository::installed_root_key>::fetch)), 0);
rb_define_method(c_repository, "get_environment_variable", RUBY_FUNC_CAST(&repository_get_environment_variable), 2);
- rb_define_method(c_repository, "accept_keywords_key",
- RUBY_FUNC_CAST((&RepositoryKey<MetadataValueKey<std::string> , &Repository::accept_keywords_key>::fetch)), 0);
/*
* Document-class: Paludis::FakeRepositoryBase