aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-12 00:20:27 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-12 00:20:27 +0100
commitba3ce12a94ff45cadbffbfe6bc832ba693fbf08e (patch)
treed72550637394a2fbc054e0b37652ca2be5e99f1e
parentb9853dfc17d18250f7c5a7c6131f70ec14aa6b95 (diff)
downloadpaludis-ba3ce12a94ff45cadbffbfe6bc832ba693fbf08e.tar.gz
paludis-ba3ce12a94ff45cadbffbfe6bc832ba693fbf08e.tar.xz
Remove virtual_for_key
-rw-r--r--doc/api/ruby/example_dep_tree.rb3
-rw-r--r--paludis/package_id.hh7
-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.cc6
-rw-r--r--paludis/repositories/e/e_installed_repository_id.hh1
-rw-r--r--paludis/repositories/e/ebuild_id.cc6
-rw-r--r--paludis/repositories/e/ebuild_id.hh1
-rw-r--r--paludis/repositories/fake/fake_package_id.cc6
-rw-r--r--paludis/repositories/fake/fake_package_id.hh1
-rw-r--r--paludis/repositories/gemcutter/gemcutter_id.cc6
-rw-r--r--paludis/repositories/gemcutter/gemcutter_id.hh2
-rw-r--r--paludis/repositories/repository/repository_id.cc6
-rw-r--r--paludis/repositories/repository/repository_id.hh2
-rw-r--r--paludis/repositories/unavailable/unavailable_package_id.cc6
-rw-r--r--paludis/repositories/unavailable/unavailable_package_id.hh2
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_id.cc6
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_id.hh2
-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.cc6
-rw-r--r--ruby/package_id.cc9
-rw-r--r--src/clients/cave/cmd_report.cc6
30 files changed, 0 insertions, 121 deletions
diff --git a/doc/api/ruby/example_dep_tree.rb b/doc/api/ruby/example_dep_tree.rb
index 6249ba6..23a8bee 100644
--- a/doc/api/ruby/example_dep_tree.rb
+++ b/doc/api/ruby/example_dep_tree.rb
@@ -123,9 +123,6 @@ results = { }
# For each ID:
ids.each do | id |
- # Ignore old-style virtuals
- next if id.virtual_for_key
-
# Make a default result for this ID.
results[id.to_s] = { :has_dep => false, :has_ext => false }
diff --git a/paludis/package_id.hh b/paludis/package_id.hh
index fe1d083..ea85b3a 100644
--- a/paludis/package_id.hh
+++ b/paludis/package_id.hh
@@ -185,13 +185,6 @@ namespace paludis
virtual const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const = 0;
/**
- * The virtual_for_key, if non-zero, indicates that we are an
- * (old-style) virtual for another package. This affects dependency
- * resolution.
- */
- virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > virtual_for_key() const = 0;
-
- /**
* The keywords_key, if non-zero, is used by FindUnusedPackagesTask
* to determine whether a package is unused.
*/
diff --git a/paludis/repositories/accounts/accounts_id.cc b/paludis/repositories/accounts/accounts_id.cc
index b6245bc..ecf27e9 100644
--- a/paludis/repositories/accounts/accounts_id.cc
+++ b/paludis/repositories/accounts/accounts_id.cc
@@ -307,12 +307,6 @@ AccountsID::uniquely_identifying_spec() const
_imp->env, { });
}
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-AccountsID::virtual_for_key() const
-{
- return make_null_shared_ptr();
-}
-
const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
AccountsID::keywords_key() const
{
diff --git a/paludis/repositories/accounts/accounts_id.hh b/paludis/repositories/accounts/accounts_id.hh
index 6f6e333..34b7383 100644
--- a/paludis/repositories/accounts/accounts_id.hh
+++ b/paludis/repositories/accounts/accounts_id.hh
@@ -62,7 +62,6 @@ namespace paludis
///\{
virtual const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
- virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > virtual_for_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;
diff --git a/paludis/repositories/accounts/installed_accounts_id.cc b/paludis/repositories/accounts/installed_accounts_id.cc
index 9b1672d..c624715 100644
--- a/paludis/repositories/accounts/installed_accounts_id.cc
+++ b/paludis/repositories/accounts/installed_accounts_id.cc
@@ -226,12 +226,6 @@ InstalledAccountsID::uniquely_identifying_spec() const
return parse_user_package_dep_spec(stringify(name()) + "::" + stringify(repository_name()), _imp->env, { });
}
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-InstalledAccountsID::virtual_for_key() const
-{
- return make_null_shared_ptr();
-}
-
const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
InstalledAccountsID::keywords_key() const
{
diff --git a/paludis/repositories/accounts/installed_accounts_id.hh b/paludis/repositories/accounts/installed_accounts_id.hh
index 7e58384..431a509 100644
--- a/paludis/repositories/accounts/installed_accounts_id.hh
+++ b/paludis/repositories/accounts/installed_accounts_id.hh
@@ -60,7 +60,6 @@ namespace paludis
///\{
virtual const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
- virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > virtual_for_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;
diff --git a/paludis/repositories/e/e_installed_repository_id.cc b/paludis/repositories/e/e_installed_repository_id.cc
index 44263ed..ee28165 100644
--- a/paludis/repositories/e/e_installed_repository_id.cc
+++ b/paludis/repositories/e/e_installed_repository_id.cc
@@ -710,12 +710,6 @@ EInstalledRepositoryID::eapi() const
return _imp->eapi;
}
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-EInstalledRepositoryID::virtual_for_key() const
-{
- return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
-}
-
const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
EInstalledRepositoryID::keywords_key() const
{
diff --git a/paludis/repositories/e/e_installed_repository_id.hh b/paludis/repositories/e/e_installed_repository_id.hh
index 27a27b8..615d94c 100644
--- a/paludis/repositories/e/e_installed_repository_id.hh
+++ b/paludis/repositories/e/e_installed_repository_id.hh
@@ -58,7 +58,6 @@ namespace paludis
virtual bool is_installed() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
- virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > virtual_for_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;
diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index 3ea0bdf..f9b571b 100644
--- a/paludis/repositories/e/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -691,12 +691,6 @@ EbuildID::eapi() const
return _imp->eapi;
}
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-EbuildID::virtual_for_key() const
-{
- return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
-}
-
const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
EbuildID::keywords_key() const
{
diff --git a/paludis/repositories/e/ebuild_id.hh b/paludis/repositories/e/ebuild_id.hh
index 02c18a8..f4f457f 100644
--- a/paludis/repositories/e/ebuild_id.hh
+++ b/paludis/repositories/e/ebuild_id.hh
@@ -65,7 +65,6 @@ namespace paludis
virtual bool is_installed() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
- virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > virtual_for_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;
diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc
index bfb0157..1da3b57 100644
--- a/paludis/repositories/fake/fake_package_id.cc
+++ b/paludis/repositories/fake/fake_package_id.cc
@@ -731,12 +731,6 @@ FakePackageID::repository_name() const
return _imp->repository_name;
}
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-FakePackageID::virtual_for_key() const
-{
- return make_null_shared_ptr();
-}
-
const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
FakePackageID::keywords_key() const
{
diff --git a/paludis/repositories/fake/fake_package_id.hh b/paludis/repositories/fake/fake_package_id.hh
index bbf768a..c8fb286 100644
--- a/paludis/repositories/fake/fake_package_id.hh
+++ b/paludis/repositories/fake/fake_package_id.hh
@@ -240,7 +240,6 @@ namespace paludis
virtual PackageDepSpec uniquely_identifying_spec() const;
virtual const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
- virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > virtual_for_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;
diff --git a/paludis/repositories/gemcutter/gemcutter_id.cc b/paludis/repositories/gemcutter/gemcutter_id.cc
index 20f7c53..31b3828 100644
--- a/paludis/repositories/gemcutter/gemcutter_id.cc
+++ b/paludis/repositories/gemcutter/gemcutter_id.cc
@@ -341,12 +341,6 @@ GemcutterID::behaviours_key() const
return make_null_shared_ptr();
}
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-GemcutterID::virtual_for_key() const
-{
- return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
-}
-
const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
GemcutterID::keywords_key() const
{
diff --git a/paludis/repositories/gemcutter/gemcutter_id.hh b/paludis/repositories/gemcutter/gemcutter_id.hh
index d7fe3ed..c2875a2 100644
--- a/paludis/repositories/gemcutter/gemcutter_id.hh
+++ b/paludis/repositories/gemcutter/gemcutter_id.hh
@@ -66,8 +66,6 @@ namespace paludis
virtual PackageDepSpec uniquely_identifying_spec() const;
const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
- const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
- virtual_for_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;
diff --git a/paludis/repositories/repository/repository_id.cc b/paludis/repositories/repository/repository_id.cc
index 96e9875..0aafe9f 100644
--- a/paludis/repositories/repository/repository_id.cc
+++ b/paludis/repositories/repository/repository_id.cc
@@ -204,12 +204,6 @@ RepositoryID::behaviours_key() const
return _imp->behaviours_key;
}
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-RepositoryID::virtual_for_key() const
-{
- return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
-}
-
const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
RepositoryID::keywords_key() const
{
diff --git a/paludis/repositories/repository/repository_id.hh b/paludis/repositories/repository/repository_id.hh
index c964bf2..541adb9 100644
--- a/paludis/repositories/repository/repository_id.hh
+++ b/paludis/repositories/repository/repository_id.hh
@@ -64,8 +64,6 @@ namespace paludis
virtual PackageDepSpec uniquely_identifying_spec() const;
const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
- const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
- virtual_for_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;
diff --git a/paludis/repositories/unavailable/unavailable_package_id.cc b/paludis/repositories/unavailable/unavailable_package_id.cc
index 1079b40..efd2d77 100644
--- a/paludis/repositories/unavailable/unavailable_package_id.cc
+++ b/paludis/repositories/unavailable/unavailable_package_id.cc
@@ -228,12 +228,6 @@ UnavailablePackageID::behaviours_key() const
return make_null_shared_ptr();
}
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-UnavailablePackageID::virtual_for_key() const
-{
- return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
-}
-
const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
UnavailablePackageID::keywords_key() const
{
diff --git a/paludis/repositories/unavailable/unavailable_package_id.hh b/paludis/repositories/unavailable/unavailable_package_id.hh
index a0968ee..b147f19 100644
--- a/paludis/repositories/unavailable/unavailable_package_id.hh
+++ b/paludis/repositories/unavailable/unavailable_package_id.hh
@@ -78,8 +78,6 @@ namespace paludis
virtual PackageDepSpec uniquely_identifying_spec() const;
const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
- const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
- virtual_for_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;
diff --git a/paludis/repositories/unavailable/unavailable_repository_id.cc b/paludis/repositories/unavailable/unavailable_repository_id.cc
index e221c4e..66ccd40 100644
--- a/paludis/repositories/unavailable/unavailable_repository_id.cc
+++ b/paludis/repositories/unavailable/unavailable_repository_id.cc
@@ -335,12 +335,6 @@ UnavailableRepositoryID::behaviours_key() const
return _imp->behaviours_key;
}
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-UnavailableRepositoryID::virtual_for_key() const
-{
- return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
-}
-
const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
UnavailableRepositoryID::keywords_key() const
{
diff --git a/paludis/repositories/unavailable/unavailable_repository_id.hh b/paludis/repositories/unavailable/unavailable_repository_id.hh
index 253acbc..2875eea 100644
--- a/paludis/repositories/unavailable/unavailable_repository_id.hh
+++ b/paludis/repositories/unavailable/unavailable_repository_id.hh
@@ -78,8 +78,6 @@ namespace paludis
virtual PackageDepSpec uniquely_identifying_spec() const;
const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
- const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
- virtual_for_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;
diff --git a/paludis/repositories/unpackaged/installed_id.cc b/paludis/repositories/unpackaged/installed_id.cc
index 809ddcf..313afa4 100644
--- a/paludis/repositories/unpackaged/installed_id.cc
+++ b/paludis/repositories/unpackaged/installed_id.cc
@@ -544,12 +544,6 @@ InstalledUnpackagedID::repository_name() const
return _imp->repository_name;
}
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-InstalledUnpackagedID::virtual_for_key() const
-{
- return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
-}
-
const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
InstalledUnpackagedID::keywords_key() const
{
diff --git a/paludis/repositories/unpackaged/installed_id.hh b/paludis/repositories/unpackaged/installed_id.hh
index 8b8ac85..5a76387 100644
--- a/paludis/repositories/unpackaged/installed_id.hh
+++ b/paludis/repositories/unpackaged/installed_id.hh
@@ -57,7 +57,6 @@ namespace paludis
virtual PackageDepSpec uniquely_identifying_spec() const;
virtual const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
- virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > virtual_for_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;
diff --git a/paludis/repositories/unpackaged/unpackaged_id.cc b/paludis/repositories/unpackaged/unpackaged_id.cc
index 48e5a90..008cafe 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.cc
+++ b/paludis/repositories/unpackaged/unpackaged_id.cc
@@ -203,12 +203,6 @@ UnpackagedID::repository_name() const
return _imp->repository_name;
}
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-UnpackagedID::virtual_for_key() const
-{
- return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
-}
-
const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
UnpackagedID::keywords_key() const
{
diff --git a/paludis/repositories/unpackaged/unpackaged_id.hh b/paludis/repositories/unpackaged/unpackaged_id.hh
index d60e778..22b68ce 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.hh
+++ b/paludis/repositories/unpackaged/unpackaged_id.hh
@@ -56,7 +56,6 @@ namespace paludis
virtual PackageDepSpec uniquely_identifying_spec() const;
virtual const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
- virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > virtual_for_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;
diff --git a/paludis/repositories/unwritten/unwritten_id.cc b/paludis/repositories/unwritten/unwritten_id.cc
index ee102c4..12df62d 100644
--- a/paludis/repositories/unwritten/unwritten_id.cc
+++ b/paludis/repositories/unwritten/unwritten_id.cc
@@ -228,12 +228,6 @@ UnwrittenID::behaviours_key() const
return make_null_shared_ptr();
}
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-UnwrittenID::virtual_for_key() const
-{
- return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
-}
-
const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
UnwrittenID::keywords_key() const
{
diff --git a/paludis/repositories/unwritten/unwritten_id.hh b/paludis/repositories/unwritten/unwritten_id.hh
index f5534c5..8d2fbff 100644
--- a/paludis/repositories/unwritten/unwritten_id.hh
+++ b/paludis/repositories/unwritten/unwritten_id.hh
@@ -90,7 +90,6 @@ namespace paludis
virtual PackageDepSpec uniquely_identifying_spec() const;
const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
- const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > virtual_for_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;
diff --git a/paludis/user_dep_spec.cc b/paludis/user_dep_spec.cc
index 986a645..2bea9e8 100644
--- a/paludis/user_dep_spec.cc
+++ b/paludis/user_dep_spec.cc
@@ -986,8 +986,6 @@ UserKeyRequirement::requirement_met(
key = id->short_description_key().get();
else if (_imp->key == "$slot")
key = id->slot_key().get();
- else if (_imp->key == "$virtual_for")
- key = id->virtual_for_key().get();
}
else if (0 == _imp->key.compare(0, 2, "::"))
{
diff --git a/python/package_id.cc b/python/package_id.cc
index ae11bf1..d673775 100644
--- a/python/package_id.cc
+++ b/python/package_id.cc
@@ -108,12 +108,6 @@ void expose_package_id()
"NEED_DOC"
)
- .def("virtual_for_key", &PackageID::virtual_for_key,
- "The virtual_for_key, if not None, indicates that we are an\n"
- "(old-style) virtual for another package. This affects dependency\n"
- " resolution."
- )
-
.def("keywords_key", &PackageID::keywords_key,
"The keywords_key, if not None, is used by FindUnusedPackagesTask\n"
"to determine whether a package is unused."
diff --git a/ruby/package_id.cc b/ruby/package_id.cc
index 7b6a058..60f8c7d 100644
--- a/ruby/package_id.cc
+++ b/ruby/package_id.cc
@@ -397,14 +397,6 @@ namespace
* Our source origin repository
*/
/*
- * Document-method: virtual_for_key
- *
- * call-seq:
- * virtual_for_key -> MetadataPackageIDKey
- *
- * What we are a virtual for
- */
- /*
* Document-method: dependencies_key
*
* call-seq:
@@ -513,7 +505,6 @@ namespace
rb_define_method(c_package_id, "masked?", RUBY_FUNC_CAST((&PackageIDBool<&PackageID::masked>::fetch)), 0);
rb_define_method(c_package_id, "breaks_portage", RUBY_FUNC_CAST(&package_id_breaks_portage), 0);
- rb_define_method(c_package_id, "virtual_for_key", RUBY_FUNC_CAST((&KeyValue<MetadataValueKey<std::shared_ptr<const PackageID> > , &PackageID::virtual_for_key>::fetch)), 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);
diff --git a/src/clients/cave/cmd_report.cc b/src/clients/cave/cmd_report.cc
index 6d6704a..b584d76 100644
--- a/src/clients/cave/cmd_report.cc
+++ b/src/clients/cave/cmd_report.cc
@@ -187,12 +187,6 @@ ReportCommand::run(
for (auto i(ids->begin()), i_end(ids->end()) ;
i != i_end ; ++i)
{
- if ((*i)->virtual_for_key())
- {
- /* too weird */
- continue;
- }
-
bool done_heading(false), done_heading_origin(false);
auto origin(find_origin_for(env, *i));