aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-12 00:30:01 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-12 00:30:01 +0100
commit619b3fb210b172bb0405b02ad341cb570bff1184 (patch)
tree7458a1fa65f01f8d074260d6ce02b843b40f5658
parentba3ce12a94ff45cadbffbfe6bc832ba693fbf08e (diff)
downloadpaludis-619b3fb210b172bb0405b02ad341cb570bff1184.tar.gz
paludis-619b3fb210b172bb0405b02ad341cb570bff1184.tar.xz
Remove provide_key
-rw-r--r--doc/api/cplusplus/examples/example_dep_spec_flattener.cc21
-rw-r--r--paludis/package_id.hh6
-rw-r--r--paludis/repositories/accounts/accounts_id.cc6
-rw-r--r--paludis/repositories/accounts/accounts_id.hh1
-rw-r--r--paludis/repositories/accounts/installed_accounts_id.cc6
-rw-r--r--paludis/repositories/accounts/installed_accounts_id.hh1
-rw-r--r--paludis/repositories/e/e_installed_repository_id.cc7
-rw-r--r--paludis/repositories/e/e_installed_repository_id.hh1
-rw-r--r--paludis/repositories/e/e_repository_TEST_ever.cc4
-rw-r--r--paludis/repositories/e/e_repository_TEST_exheres_0.cc4
-rw-r--r--paludis/repositories/e/e_repository_TEST_phases.cc4
-rw-r--r--paludis/repositories/e/ebuild.cc7
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache.cc17
-rw-r--r--paludis/repositories/e/ebuild_id.cc16
-rw-r--r--paludis/repositories/e/ebuild_id.hh2
-rw-r--r--paludis/repositories/fake/fake_package_id.cc19
-rw-r--r--paludis/repositories/fake/fake_package_id.hh2
-rw-r--r--paludis/repositories/gemcutter/gemcutter_id.cc6
-rw-r--r--paludis/repositories/gemcutter/gemcutter_id.hh1
-rw-r--r--paludis/repositories/repository/repository_id.cc6
-rw-r--r--paludis/repositories/repository/repository_id.hh1
-rw-r--r--paludis/repositories/unavailable/unavailable_package_id.cc6
-rw-r--r--paludis/repositories/unavailable/unavailable_package_id.hh1
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_id.cc6
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_id.hh1
-rw-r--r--paludis/repositories/unpackaged/installed_id.cc6
-rw-r--r--paludis/repositories/unpackaged/installed_id.hh1
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.cc6
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.hh1
-rw-r--r--paludis/repositories/unwritten/unwritten_id.cc6
-rw-r--r--paludis/repositories/unwritten/unwritten_id.hh1
-rw-r--r--paludis/user_dep_spec.cc2
-rw-r--r--python/package_id.cc5
-rwxr-xr-xpython/package_id_TEST.py4
-rw-r--r--ruby/package_id.cc2
35 files changed, 8 insertions, 178 deletions
diff --git a/doc/api/cplusplus/examples/example_dep_spec_flattener.cc b/doc/api/cplusplus/examples/example_dep_spec_flattener.cc
index f508841..e776850 100644
--- a/doc/api/cplusplus/examples/example_dep_spec_flattener.cc
+++ b/doc/api/cplusplus/examples/example_dep_spec_flattener.cc
@@ -52,25 +52,8 @@ int main(int argc, char * argv[])
{
cout << "Information about '" << **i << "':" << endl;
- /* Do we have a provides key? All PackageID key methods may return a
- * zero pointer. */
- if ((*i)->provide_key())
- {
- /* Create our flattener... */
- DepSpecFlattener<ProvideSpecTree, PackageDepSpec> provides(env.get(), *i);
-
- /* Populate it by making it visit the key's value */
- (*i)->provide_key()->parse_value()->top()->accept(provides);
-
- /* The results are available through DepSpecFlattener::begin()
- * and ::end(). These return an iterator to a std::shared_ptr<>,
- * so we use indirect_iterator to add a level of dereferencing.*/
- cout << " " << left << setw(24) << "Provides:" << " "
- << join(indirect_iterator(provides.begin()), indirect_iterator(provides.end()), " ")
- << endl;
- }
-
- /* Again for homepage */
+ /* Do we have a homepage? All PackageID key methods may return a
+ * null pointer. */
if ((*i)->homepage_key())
{
DepSpecFlattener<SimpleURISpecTree, SimpleURIDepSpec> homepages(env.get(), *i);
diff --git a/paludis/package_id.hh b/paludis/package_id.hh
index ea85b3a..177fe53 100644
--- a/paludis/package_id.hh
+++ b/paludis/package_id.hh
@@ -191,12 +191,6 @@ namespace paludis
virtual const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const = 0;
/**
- * The provide_key, if non-zero, indicates that a package provides
- * certain old-style virtuals. This affects dependency resolution.
- */
- virtual const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const = 0;
-
- /**
* The contains_key, if non-zero, indicates that a package contains
* other packages. This affects dependency resolution. */
virtual const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const = 0;
diff --git a/paludis/repositories/accounts/accounts_id.cc b/paludis/repositories/accounts/accounts_id.cc
index ecf27e9..c642370 100644
--- a/paludis/repositories/accounts/accounts_id.cc
+++ b/paludis/repositories/accounts/accounts_id.cc
@@ -313,12 +313,6 @@ AccountsID::keywords_key() const
return make_null_shared_ptr();
}
-const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
-AccountsID::provide_key() const
-{
- return make_null_shared_ptr();
-}
-
const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
AccountsID::contains_key() const
{
diff --git a/paludis/repositories/accounts/accounts_id.hh b/paludis/repositories/accounts/accounts_id.hh
index 34b7383..fc9a346 100644
--- a/paludis/repositories/accounts/accounts_id.hh
+++ b/paludis/repositories/accounts/accounts_id.hh
@@ -63,7 +63,6 @@ namespace paludis
virtual const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
virtual const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
- virtual const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
virtual const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > contained_in_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
diff --git a/paludis/repositories/accounts/installed_accounts_id.cc b/paludis/repositories/accounts/installed_accounts_id.cc
index c624715..c294d5c 100644
--- a/paludis/repositories/accounts/installed_accounts_id.cc
+++ b/paludis/repositories/accounts/installed_accounts_id.cc
@@ -232,12 +232,6 @@ InstalledAccountsID::keywords_key() const
return make_null_shared_ptr();
}
-const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
-InstalledAccountsID::provide_key() const
-{
- return make_null_shared_ptr();
-}
-
const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
InstalledAccountsID::contains_key() const
{
diff --git a/paludis/repositories/accounts/installed_accounts_id.hh b/paludis/repositories/accounts/installed_accounts_id.hh
index 431a509..ba28344 100644
--- a/paludis/repositories/accounts/installed_accounts_id.hh
+++ b/paludis/repositories/accounts/installed_accounts_id.hh
@@ -61,7 +61,6 @@ namespace paludis
virtual const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
virtual const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
- virtual const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
virtual const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > contained_in_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
diff --git a/paludis/repositories/e/e_installed_repository_id.cc b/paludis/repositories/e/e_installed_repository_id.cc
index ee28165..d1d1a66 100644
--- a/paludis/repositories/e/e_installed_repository_id.cc
+++ b/paludis/repositories/e/e_installed_repository_id.cc
@@ -792,13 +792,6 @@ EInstalledRepositoryID::defined_phases_key() const
return _imp->keys->defined_phases;
}
-const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
-EInstalledRepositoryID::provide_key() const
-{
- need_keys_added();
- return _imp->keys->provide;
-}
-
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
EInstalledRepositoryID::dependencies_key() const
{
diff --git a/paludis/repositories/e/e_installed_repository_id.hh b/paludis/repositories/e/e_installed_repository_id.hh
index 615d94c..aa4c7ab 100644
--- a/paludis/repositories/e/e_installed_repository_id.hh
+++ b/paludis/repositories/e/e_installed_repository_id.hh
@@ -59,7 +59,6 @@ namespace paludis
virtual const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
virtual const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
- virtual const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const;
diff --git a/paludis/repositories/e/e_repository_TEST_ever.cc b/paludis/repositories/e/e_repository_TEST_ever.cc
index edc580f..cdd9637 100644
--- a/paludis/repositories/e/e_repository_TEST_ever.cc
+++ b/paludis/repositories/e/e_repository_TEST_ever.cc
@@ -123,8 +123,8 @@ TEST_P(EverTest, Works)
n::suitable_destination() = true,
n::supports_uninstall() = true
)));
- installed_repo->add_version("cat", "pretend-installed", "0")->provide_key()->set_from_string("virtual/virtual-pretend-installed");
- installed_repo->add_version("cat", "pretend-installed", "1")->provide_key()->set_from_string("virtual/virtual-pretend-installed");
+ installed_repo->add_version("cat", "pretend-installed", "0");
+ installed_repo->add_version("cat", "pretend-installed", "1");
env.add_repository(2, installed_repo);
InstallAction action(make_named_values<InstallActionOptions>(
diff --git a/paludis/repositories/e/e_repository_TEST_exheres_0.cc b/paludis/repositories/e/e_repository_TEST_exheres_0.cc
index 855f1ff..77f2257 100644
--- a/paludis/repositories/e/e_repository_TEST_exheres_0.cc
+++ b/paludis/repositories/e/e_repository_TEST_exheres_0.cc
@@ -113,8 +113,8 @@ TEST(ERepository, InstallExheres0)
n::suitable_destination() = true,
n::supports_uninstall() = true
)));
- installed_repo->add_version("cat", "pretend-installed", "0")->provide_key()->set_from_string("virtual/virtual-pretend-installed");
- installed_repo->add_version("cat", "pretend-installed", "1")->provide_key()->set_from_string("virtual/virtual-pretend-installed");
+ installed_repo->add_version("cat", "pretend-installed", "0");
+ installed_repo->add_version("cat", "pretend-installed", "1");
env.add_repository(2, installed_repo);
InstallAction action(make_named_values<InstallActionOptions>(
diff --git a/paludis/repositories/e/e_repository_TEST_phases.cc b/paludis/repositories/e/e_repository_TEST_phases.cc
index 68b0e0a..b48c3af 100644
--- a/paludis/repositories/e/e_repository_TEST_phases.cc
+++ b/paludis/repositories/e/e_repository_TEST_phases.cc
@@ -132,8 +132,8 @@ TEST_P(PhasesTest, Works)
n::suitable_destination() = true,
n::supports_uninstall() = true
)));
- installed_repo->add_version("cat", "pretend-installed", "0")->provide_key()->set_from_string("virtual/virtual-pretend-installed");
- installed_repo->add_version("cat", "pretend-installed", "1")->provide_key()->set_from_string("virtual/virtual-pretend-installed");
+ installed_repo->add_version("cat", "pretend-installed", "0");
+ installed_repo->add_version("cat", "pretend-installed", "1");
env.add_repository(2, installed_repo);
if (info.enable_expensive_tests)
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index 3bcda1e..8300dd4 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -613,13 +613,6 @@ EbuildMetadataCommand::load(const std::shared_ptr<const EbuildID> & id)
if (! m.license()->name().empty())
id->load_license(m.license(), get(keys, m.license()->name()));
- if (! m.provide()->name().empty())
- {
- std::string value(get(keys, m.provide()->name()));
- if (! value.empty())
- id->load_provide(m.provide(), get(keys, m.provide()->name()));
- }
-
if (! m.iuse()->name().empty())
id->load_iuse(m.iuse(), get(keys, m.iuse()->name()));
diff --git a/paludis/repositories/e/ebuild_flat_metadata_cache.cc b/paludis/repositories/e/ebuild_flat_metadata_cache.cc
index 0db3b60..e042992 100644
--- a/paludis/repositories/e/ebuild_flat_metadata_cache.cc
+++ b/paludis/repositories/e/ebuild_flat_metadata_cache.cc
@@ -242,13 +242,6 @@ namespace
if (-1 != m.pdepend()->flat_list_index() && ! m.pdepend()->name().empty())
id->load_post_depend(m.pdepend()->name(), m.pdepend()->description(), lines.at(m.pdepend()->flat_list_index()), false);
- if (-1 != m.provide()->flat_list_index() && ! m.provide()->name().empty())
- {
- std::string value(lines.at(m.provide()->flat_list_index()));
- if (! value.empty())
- id->load_provide(m.provide(), value);
- }
-
if (-1 != m.use()->flat_list_index() && ! m.use()->name().empty())
id->load_use(m.use(), lines.at(m.use()->flat_list_index()));
@@ -589,13 +582,6 @@ EbuildFlatMetadataCache::load(const std::shared_ptr<const EbuildID> & id, const
if (! m.pdepend()->name().empty())
id->load_post_depend(m.pdepend()->name(), m.pdepend()->description(), keys[m.pdepend()->name()], false);
- if (! m.provide()->name().empty())
- {
- std::string value(keys[m.provide()->name()]);
- if (! value.empty())
- id->load_provide(m.provide(), value);
- }
-
if (! m.use()->name().empty())
id->load_use(m.use(), keys[m.use()->name()]);
@@ -858,9 +844,6 @@ EbuildFlatMetadataCache::save(const std::shared_ptr<const EbuildID> & id)
if (! m.pdepend()->name().empty() && id->post_dependencies_key())
write_kv(cache, m.pdepend()->name(), flatten(id->post_dependencies_key()->parse_value()));
- if (! m.provide()->name().empty() && id->provide_key())
- write_kv(cache, m.provide()->name(), flatten(id->provide_key()->parse_value()));
-
write_kv(cache, "EAPI", normalise(id->eapi()->name()));
if (! m.long_description()->name().empty() && id->long_description_key())
diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index f9b571b..010fed2 100644
--- a/paludis/repositories/e/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -155,7 +155,6 @@ namespace paludis
mutable std::shared_ptr<const EDependenciesKey> build_dependencies;
mutable std::shared_ptr<const EDependenciesKey> run_dependencies;
mutable std::shared_ptr<const EDependenciesKey> post_dependencies;
- mutable std::shared_ptr<const EProvideKey> provide;
mutable std::shared_ptr<const EPlainTextSpecKey> restrictions;
mutable std::shared_ptr<const EPlainTextSpecKey> properties;
mutable std::shared_ptr<const EFetchableURIKey> src_uri;
@@ -761,13 +760,6 @@ EbuildID::license_key() const
return _imp->license;
}
-const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
-EbuildID::provide_key() const
-{
- need_keys_added();
- return _imp->provide;
-}
-
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
EbuildID::dependencies_key() const
{
@@ -1035,14 +1027,6 @@ EbuildID::load_properties(const std::shared_ptr<const EAPIMetadataVariable> & m,
}
void
-EbuildID::load_provide(const std::shared_ptr<const EAPIMetadataVariable> & m, const std::string & v) const
-{
- Lock l(_imp->mutex);
- _imp->provide = std::make_shared<EProvideKey>(_imp->environment, m, eapi(), v, mkt_internal, is_installed());
- add_metadata_key(_imp->provide);
-}
-
-void
EbuildID::load_iuse(const std::shared_ptr<const EAPIMetadataVariable> & k, const std::string & v) const
{
Lock l(_imp->mutex);
diff --git a/paludis/repositories/e/ebuild_id.hh b/paludis/repositories/e/ebuild_id.hh
index f4f457f..b4a4119 100644
--- a/paludis/repositories/e/ebuild_id.hh
+++ b/paludis/repositories/e/ebuild_id.hh
@@ -66,7 +66,6 @@ namespace paludis
virtual const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
virtual const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
- virtual const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const;
@@ -131,7 +130,6 @@ namespace paludis
void load_src_uri(const std::shared_ptr<const EAPIMetadataVariable> &, const std::string &) const;
void load_homepage(const std::shared_ptr<const EAPIMetadataVariable> &, const std::string &) const;
void load_license(const std::shared_ptr<const EAPIMetadataVariable> &, const std::string &) const;
- void load_provide(const std::shared_ptr<const EAPIMetadataVariable> &, const std::string &) const;
void load_iuse(const std::shared_ptr<const EAPIMetadataVariable> &, const std::string &) const;
void load_myoptions(const std::shared_ptr<const EAPIMetadataVariable> &, const std::string &) const;
void load_required_use(const std::shared_ptr<const EAPIMetadataVariable> &, const std::string &) const;
diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc
index 1da3b57..eb47739 100644
--- a/paludis/repositories/fake/fake_package_id.cc
+++ b/paludis/repositories/fake/fake_package_id.cc
@@ -639,7 +639,6 @@ namespace paludis
mutable std::shared_ptr<LiteralMetadataValueKey<SlotName> > slot;
mutable std::shared_ptr<FakeMetadataKeywordSetKey> keywords;
mutable std::shared_ptr<FakeMetadataSpecTreeKey<LicenseSpecTree> > license;
- mutable std::shared_ptr<FakeMetadataSpecTreeKey<ProvideSpecTree> > provide;
mutable std::shared_ptr<FakeMetadataSpecTreeKey<DependencySpecTree> > build_dependencies;
mutable std::shared_ptr<FakeMetadataSpecTreeKey<DependencySpecTree> > run_dependencies;
mutable std::shared_ptr<FakeMetadataSpecTreeKey<DependencySpecTree> > post_dependencies;
@@ -745,13 +744,6 @@ FakePackageID::license_key() const
return _imp->license;
}
-const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
-FakePackageID::provide_key() const
-{
- need_keys_added();
- return _imp->provide;
-}
-
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
FakePackageID::build_dependencies_key() const
{
@@ -780,13 +772,6 @@ FakePackageID::keywords_key()
return _imp->keywords;
}
-const std::shared_ptr<FakeMetadataSpecTreeKey<ProvideSpecTree> >
-FakePackageID::provide_key()
-{
- need_keys_added();
- return _imp->provide;
-}
-
const std::shared_ptr<FakeMetadataSpecTreeKey<DependencySpecTree> >
FakePackageID::build_dependencies_key()
{
@@ -919,9 +904,6 @@ FakePackageID::need_keys_added() const
_imp->license = std::make_shared<FakeMetadataSpecTreeKey<LicenseSpecTree>>("LICENSE", "License",
"", std::bind(&parse_license, _1, _imp->env), mkt_normal);
- _imp->provide = std::make_shared<FakeMetadataSpecTreeKey<ProvideSpecTree>>("PROVIDE", "Provide",
- "", std::bind(&parse_provide, _1, _imp->env), mkt_normal);
-
_imp->choices = std::make_shared<FakeMetadataChoicesKey>(_imp->env, shared_from_this());
_imp->behaviours = std::make_shared<LiteralMetadataStringSetKey>("BEHAVIOURS", "Behaviours",
@@ -938,7 +920,6 @@ FakePackageID::need_keys_added() const
add_metadata_key(_imp->post_dependencies);
add_metadata_key(_imp->src_uri);
add_metadata_key(_imp->homepage);
- add_metadata_key(_imp->provide);
add_metadata_key(_imp->license);
add_metadata_key(_imp->choices);
add_metadata_key(_imp->behaviours);
diff --git a/paludis/repositories/fake/fake_package_id.hh b/paludis/repositories/fake/fake_package_id.hh
index c8fb286..5f9917f 100644
--- a/paludis/repositories/fake/fake_package_id.hh
+++ b/paludis/repositories/fake/fake_package_id.hh
@@ -241,7 +241,6 @@ namespace paludis
virtual const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
virtual const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
- virtual const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
@@ -267,7 +266,6 @@ namespace paludis
///\{
const std::shared_ptr<FakeMetadataKeywordSetKey> keywords_key();
- const std::shared_ptr<FakeMetadataSpecTreeKey<ProvideSpecTree> > provide_key();
const std::shared_ptr<FakeMetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key();
const std::shared_ptr<FakeMetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key();
const std::shared_ptr<FakeMetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key();
diff --git a/paludis/repositories/gemcutter/gemcutter_id.cc b/paludis/repositories/gemcutter/gemcutter_id.cc
index 31b3828..88a8e77 100644
--- a/paludis/repositories/gemcutter/gemcutter_id.cc
+++ b/paludis/repositories/gemcutter/gemcutter_id.cc
@@ -347,12 +347,6 @@ GemcutterID::keywords_key() const
return std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
}
-const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
-GemcutterID::provide_key() const
-{
- return std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >();
-}
-
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
GemcutterID::dependencies_key() const
{
diff --git a/paludis/repositories/gemcutter/gemcutter_id.hh b/paludis/repositories/gemcutter/gemcutter_id.hh
index c2875a2..a7440eb 100644
--- a/paludis/repositories/gemcutter/gemcutter_id.hh
+++ b/paludis/repositories/gemcutter/gemcutter_id.hh
@@ -67,7 +67,6 @@ namespace paludis
const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
- const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
contained_in_key() const;
diff --git a/paludis/repositories/repository/repository_id.cc b/paludis/repositories/repository/repository_id.cc
index 0aafe9f..cf6de60 100644
--- a/paludis/repositories/repository/repository_id.cc
+++ b/paludis/repositories/repository/repository_id.cc
@@ -210,12 +210,6 @@ RepositoryID::keywords_key() const
return std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
}
-const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
-RepositoryID::provide_key() const
-{
- return std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >();
-}
-
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
RepositoryID::dependencies_key() const
{
diff --git a/paludis/repositories/repository/repository_id.hh b/paludis/repositories/repository/repository_id.hh
index 541adb9..4f6734e 100644
--- a/paludis/repositories/repository/repository_id.hh
+++ b/paludis/repositories/repository/repository_id.hh
@@ -65,7 +65,6 @@ namespace paludis
const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
- const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
contained_in_key() const;
diff --git a/paludis/repositories/unavailable/unavailable_package_id.cc b/paludis/repositories/unavailable/unavailable_package_id.cc
index efd2d77..703a6e5 100644
--- a/paludis/repositories/unavailable/unavailable_package_id.cc
+++ b/paludis/repositories/unavailable/unavailable_package_id.cc
@@ -234,12 +234,6 @@ UnavailablePackageID::keywords_key() const
return std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
}
-const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
-UnavailablePackageID::provide_key() const
-{
- return std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >();
-}
-
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
UnavailablePackageID::dependencies_key() const
{
diff --git a/paludis/repositories/unavailable/unavailable_package_id.hh b/paludis/repositories/unavailable/unavailable_package_id.hh
index b147f19..fea9066 100644
--- a/paludis/repositories/unavailable/unavailable_package_id.hh
+++ b/paludis/repositories/unavailable/unavailable_package_id.hh
@@ -79,7 +79,6 @@ namespace paludis
const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
- const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
contained_in_key() const;
diff --git a/paludis/repositories/unavailable/unavailable_repository_id.cc b/paludis/repositories/unavailable/unavailable_repository_id.cc
index 66ccd40..2482470 100644
--- a/paludis/repositories/unavailable/unavailable_repository_id.cc
+++ b/paludis/repositories/unavailable/unavailable_repository_id.cc
@@ -341,12 +341,6 @@ UnavailableRepositoryID::keywords_key() const
return std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
}
-const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
-UnavailableRepositoryID::provide_key() const
-{
- return std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >();
-}
-
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
UnavailableRepositoryID::dependencies_key() const
{
diff --git a/paludis/repositories/unavailable/unavailable_repository_id.hh b/paludis/repositories/unavailable/unavailable_repository_id.hh
index 2875eea..97dc314 100644
--- a/paludis/repositories/unavailable/unavailable_repository_id.hh
+++ b/paludis/repositories/unavailable/unavailable_repository_id.hh
@@ -79,7 +79,6 @@ namespace paludis
const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
- const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
contained_in_key() const;
diff --git a/paludis/repositories/unpackaged/installed_id.cc b/paludis/repositories/unpackaged/installed_id.cc
index 313afa4..7473612 100644
--- a/paludis/repositories/unpackaged/installed_id.cc
+++ b/paludis/repositories/unpackaged/installed_id.cc
@@ -550,12 +550,6 @@ InstalledUnpackagedID::keywords_key() const
return std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
}
-const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
-InstalledUnpackagedID::provide_key() const
-{
- return std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >();
-}
-
const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
InstalledUnpackagedID::contains_key() const
{
diff --git a/paludis/repositories/unpackaged/installed_id.hh b/paludis/repositories/unpackaged/installed_id.hh
index 5a76387..ba6af9e 100644
--- a/paludis/repositories/unpackaged/installed_id.hh
+++ b/paludis/repositories/unpackaged/installed_id.hh
@@ -58,7 +58,6 @@ namespace paludis
virtual const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
virtual const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
- virtual const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
virtual const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > contained_in_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const;
diff --git a/paludis/repositories/unpackaged/unpackaged_id.cc b/paludis/repositories/unpackaged/unpackaged_id.cc
index 008cafe..99ba624 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.cc
+++ b/paludis/repositories/unpackaged/unpackaged_id.cc
@@ -209,12 +209,6 @@ UnpackagedID::keywords_key() const
return std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
}
-const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
-UnpackagedID::provide_key() const
-{
- return std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >();
-}
-
const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
UnpackagedID::contains_key() const
{
diff --git a/paludis/repositories/unpackaged/unpackaged_id.hh b/paludis/repositories/unpackaged/unpackaged_id.hh
index 22b68ce..ef8a503 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.hh
+++ b/paludis/repositories/unpackaged/unpackaged_id.hh
@@ -57,7 +57,6 @@ namespace paludis
virtual const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
virtual const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
- virtual const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
virtual const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > contained_in_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const;
diff --git a/paludis/repositories/unwritten/unwritten_id.cc b/paludis/repositories/unwritten/unwritten_id.cc
index 12df62d..8f7ecbe 100644
--- a/paludis/repositories/unwritten/unwritten_id.cc
+++ b/paludis/repositories/unwritten/unwritten_id.cc
@@ -234,12 +234,6 @@ UnwrittenID::keywords_key() const
return std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
}
-const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
-UnwrittenID::provide_key() const
-{
- return std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >();
-}
-
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
UnwrittenID::dependencies_key() const
{
diff --git a/paludis/repositories/unwritten/unwritten_id.hh b/paludis/repositories/unwritten/unwritten_id.hh
index 8d2fbff..180eaae 100644
--- a/paludis/repositories/unwritten/unwritten_id.hh
+++ b/paludis/repositories/unwritten/unwritten_id.hh
@@ -91,7 +91,6 @@ namespace paludis
const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
- const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
contained_in_key() const;
diff --git a/paludis/user_dep_spec.cc b/paludis/user_dep_spec.cc
index 2bea9e8..259f4e9 100644
--- a/paludis/user_dep_spec.cc
+++ b/paludis/user_dep_spec.cc
@@ -978,8 +978,6 @@ UserKeyRequirement::requirement_met(
key = id->long_description_key().get();
else if (_imp->key == "$post_dependencies")
key = id->post_dependencies_key().get();
- else if (_imp->key == "$provide")
- key = id->provide_key().get();
else if (_imp->key == "$run_dependencies")
key = id->run_dependencies_key().get();
else if (_imp->key == "$short_description")
diff --git a/python/package_id.cc b/python/package_id.cc
index d673775..4325d14 100644
--- a/python/package_id.cc
+++ b/python/package_id.cc
@@ -113,11 +113,6 @@ void expose_package_id()
"to determine whether a package is unused."
)
- .def("provide_key", &PackageID::provide_key,
- "The provide_key, if not None, indicates that a package provides\n"
- "certain old-style virtuals. This affects dependency resolution."
- )
-
.def("contains_key", &PackageID::contains_key,
"The contains_key, if not None, indicates that a package contains\n"
"other packages. This affects dependency resolution."
diff --git a/python/package_id_TEST.py b/python/package_id_TEST.py
index 620f78d..4964426 100755
--- a/python/package_id_TEST.py
+++ b/python/package_id_TEST.py
@@ -104,10 +104,6 @@ class TestCase_01_PackageID(unittest.TestCase):
mask = iter(self.mpid.masks).next()
self.assert_(isinstance(mask, UnacceptedMask))
- def test_15_provide_key(self):
- self.assert_(isinstance(self.pid.provide_key(), MetadataProvideSpecTreeKey))
- self.assertEquals(self.ipid.provide_key(), None)
-
def test_16_contains_key(self):
self.assertEquals(self.pid.contains_key(), None)
self.assertEquals(self.ipid.contains_key(), None)
diff --git a/ruby/package_id.cc b/ruby/package_id.cc
index 60f8c7d..94862cf 100644
--- a/ruby/package_id.cc
+++ b/ruby/package_id.cc
@@ -506,8 +506,6 @@ namespace
rb_define_method(c_package_id, "breaks_portage", RUBY_FUNC_CAST(&package_id_breaks_portage), 0);
rb_define_method(c_package_id, "keywords_key", RUBY_FUNC_CAST((&KeyValue<MetadataCollectionKey<KeywordNameSet>,&PackageID::keywords_key>::fetch)), 0);
- rb_define_method(c_package_id, "provide_key", RUBY_FUNC_CAST((
- &KeyValue<MetadataSpecTreeKey<ProvideSpecTree>, &PackageID::provide_key>::fetch)), 0);
rb_define_method(c_package_id, "dependencies_key", RUBY_FUNC_CAST((
&KeyValue<MetadataSpecTreeKey<DependencySpecTree>, &PackageID::dependencies_key>::fetch)), 0);
rb_define_method(c_package_id, "build_dependencies_key", RUBY_FUNC_CAST((