aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-12 00:32:25 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-12 00:32:25 +0100
commit59196401ac1166947914bfef013045335e3355ae (patch)
tree5b8d0ad055e1e27a8ac64ab7828a76178a543f51
parent619b3fb210b172bb0405b02ad341cb570bff1184 (diff)
downloadpaludis-59196401ac1166947914bfef013045335e3355ae.tar.gz
paludis-59196401ac1166947914bfef013045335e3355ae.tar.xz
Remove contains and contained_in keys
-rw-r--r--paludis/package_id.hh11
-rw-r--r--paludis/repositories/accounts/accounts_id.cc12
-rw-r--r--paludis/repositories/accounts/accounts_id.hh2
-rw-r--r--paludis/repositories/accounts/installed_accounts_id.cc12
-rw-r--r--paludis/repositories/accounts/installed_accounts_id.hh2
-rw-r--r--paludis/repositories/e/e_installed_repository_id.cc12
-rw-r--r--paludis/repositories/e/e_installed_repository_id.hh2
-rw-r--r--paludis/repositories/e/ebuild_id.cc12
-rw-r--r--paludis/repositories/e/ebuild_id.hh2
-rw-r--r--paludis/repositories/fake/fake_package_id.cc12
-rw-r--r--paludis/repositories/fake/fake_package_id.hh2
-rw-r--r--paludis/repositories/gemcutter/gemcutter_id.cc12
-rw-r--r--paludis/repositories/gemcutter/gemcutter_id.hh3
-rw-r--r--paludis/repositories/repository/repository_id.cc12
-rw-r--r--paludis/repositories/repository/repository_id.hh3
-rw-r--r--paludis/repositories/unavailable/unavailable_package_id.cc12
-rw-r--r--paludis/repositories/unavailable/unavailable_package_id.hh3
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_id.cc12
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_id.hh3
-rw-r--r--paludis/repositories/unpackaged/installed_id.cc12
-rw-r--r--paludis/repositories/unpackaged/installed_id.hh2
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.cc12
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.hh2
-rw-r--r--paludis/repositories/unwritten/unwritten_id.cc12
-rw-r--r--paludis/repositories/unwritten/unwritten_id.hh3
-rw-r--r--paludis/user_dep_spec.cc4
-rw-r--r--python/package_id.cc10
-rwxr-xr-xpython/package_id_TEST.py8
28 files changed, 0 insertions, 206 deletions
diff --git a/paludis/package_id.hh b/paludis/package_id.hh
index 177fe53..d035f0a 100644
--- a/paludis/package_id.hh
+++ b/paludis/package_id.hh
@@ -191,17 +191,6 @@ namespace paludis
virtual const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_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;
-
- /**
- * The contained_in_key, if non-zero, indicates that a package is
- * contained in another package. This affects dependency resolution.
- */
- virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > contained_in_key() const = 0;
-
- /**
* The dependencies_key, if non-zero, provides all of a package's
* dependencies.
*
diff --git a/paludis/repositories/accounts/accounts_id.cc b/paludis/repositories/accounts/accounts_id.cc
index c642370..086ad62 100644
--- a/paludis/repositories/accounts/accounts_id.cc
+++ b/paludis/repositories/accounts/accounts_id.cc
@@ -313,18 +313,6 @@ AccountsID::keywords_key() const
return make_null_shared_ptr();
}
-const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
-AccountsID::contains_key() const
-{
- return make_null_shared_ptr();
-}
-
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-AccountsID::contained_in_key() const
-{
- return make_null_shared_ptr();
-}
-
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
AccountsID::build_dependencies_key() const
{
diff --git a/paludis/repositories/accounts/accounts_id.hh b/paludis/repositories/accounts/accounts_id.hh
index fc9a346..32cfa69 100644
--- a/paludis/repositories/accounts/accounts_id.hh
+++ b/paludis/repositories/accounts/accounts_id.hh
@@ -63,8 +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 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;
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/accounts/installed_accounts_id.cc b/paludis/repositories/accounts/installed_accounts_id.cc
index c294d5c..482eb11 100644
--- a/paludis/repositories/accounts/installed_accounts_id.cc
+++ b/paludis/repositories/accounts/installed_accounts_id.cc
@@ -232,18 +232,6 @@ InstalledAccountsID::keywords_key() const
return make_null_shared_ptr();
}
-const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
-InstalledAccountsID::contains_key() const
-{
- return make_null_shared_ptr();
-}
-
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-InstalledAccountsID::contained_in_key() const
-{
- return make_null_shared_ptr();
-}
-
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
InstalledAccountsID::build_dependencies_key() const
{
diff --git a/paludis/repositories/accounts/installed_accounts_id.hh b/paludis/repositories/accounts/installed_accounts_id.hh
index ba28344..89f4ae5 100644
--- a/paludis/repositories/accounts/installed_accounts_id.hh
+++ b/paludis/repositories/accounts/installed_accounts_id.hh
@@ -61,8 +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 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;
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_installed_repository_id.cc b/paludis/repositories/e/e_installed_repository_id.cc
index d1d1a66..fd7fc25 100644
--- a/paludis/repositories/e/e_installed_repository_id.cc
+++ b/paludis/repositories/e/e_installed_repository_id.cc
@@ -1032,18 +1032,6 @@ EInstalledRepositoryID::perform_action(Action & a) const
a.accept(b);
}
-const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
-EInstalledRepositoryID::contains_key() const
-{
- return std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
-}
-
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-EInstalledRepositoryID::contained_in_key() const
-{
- return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
-}
-
const std::shared_ptr<const MetadataValueKey<SlotName> >
EInstalledRepositoryID::slot_key() const
{
diff --git a/paludis/repositories/e/e_installed_repository_id.hh b/paludis/repositories/e/e_installed_repository_id.hh
index aa4c7ab..ab0fd99 100644
--- a/paludis/repositories/e/e_installed_repository_id.hh
+++ b/paludis/repositories/e/e_installed_repository_id.hh
@@ -71,8 +71,6 @@ namespace paludis
virtual const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const;
virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Contents> > > contents_key() const;
virtual const std::shared_ptr<const MetadataTimeKey> installed_time_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 MetadataValueKey<FSPath> > fs_location_key() const;
virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const;
diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index 010fed2..9ef6425 100644
--- a/paludis/repositories/e/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -1304,18 +1304,6 @@ EbuildID::perform_action(Action & a) const
a.accept(b);
}
-const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
-EbuildID::contains_key() const
-{
- return std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
-}
-
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-EbuildID::contained_in_key() const
-{
- return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
-}
-
const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> >
EbuildID::remote_ids_key() const
{
diff --git a/paludis/repositories/e/ebuild_id.hh b/paludis/repositories/e/ebuild_id.hh
index b4a4119..81d90f7 100644
--- a/paludis/repositories/e/ebuild_id.hh
+++ b/paludis/repositories/e/ebuild_id.hh
@@ -76,8 +76,6 @@ namespace paludis
virtual const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const;
virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Contents> > > contents_key() const;
virtual const std::shared_ptr<const MetadataTimeKey> installed_time_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 MetadataValueKey<FSPath> > fs_location_key() const;
virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const;
const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const;
diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc
index eb47739..2c7a89b 100644
--- a/paludis/repositories/fake/fake_package_id.cc
+++ b/paludis/repositories/fake/fake_package_id.cc
@@ -1126,18 +1126,6 @@ FakePackageID::breaks_portage() const
return std::shared_ptr<const Set<std::string> >();
}
-const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
-FakePackageID::contains_key() const
-{
- return std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
-}
-
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-FakePackageID::contained_in_key() const
-{
- return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
-}
-
const std::shared_ptr<const MetadataValueKey<FSPath> >
FakePackageID::fs_location_key() const
{
diff --git a/paludis/repositories/fake/fake_package_id.hh b/paludis/repositories/fake/fake_package_id.hh
index 5f9917f..3ba726f 100644
--- a/paludis/repositories/fake/fake_package_id.hh
+++ b/paludis/repositories/fake/fake_package_id.hh
@@ -251,8 +251,6 @@ namespace paludis
virtual const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const;
virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Contents> > > contents_key() const;
virtual const std::shared_ptr<const MetadataTimeKey> installed_time_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 MetadataValueKey<FSPath> > fs_location_key() const;
virtual const std::shared_ptr<const MetadataValueKey<long> > size_of_download_required_key() const;
virtual const std::shared_ptr<const MetadataValueKey<long> > size_of_all_distfiles_key() const;
diff --git a/paludis/repositories/gemcutter/gemcutter_id.cc b/paludis/repositories/gemcutter/gemcutter_id.cc
index 88a8e77..2e169ce 100644
--- a/paludis/repositories/gemcutter/gemcutter_id.cc
+++ b/paludis/repositories/gemcutter/gemcutter_id.cc
@@ -317,18 +317,6 @@ GemcutterID::extra_hash_value() const
return 0;
}
-const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
-GemcutterID::contains_key() const
-{
- return std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
-}
-
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-GemcutterID::contained_in_key() const
-{
- return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
-}
-
const std::shared_ptr<const MetadataValueKey<FSPath> >
GemcutterID::fs_location_key() const
{
diff --git a/paludis/repositories/gemcutter/gemcutter_id.hh b/paludis/repositories/gemcutter/gemcutter_id.hh
index a7440eb..4c5e7c6 100644
--- a/paludis/repositories/gemcutter/gemcutter_id.hh
+++ b/paludis/repositories/gemcutter/gemcutter_id.hh
@@ -67,9 +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 MetadataCollectionKey<PackageIDSequence> > contains_key() const;
- const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
- contained_in_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
dependencies_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
diff --git a/paludis/repositories/repository/repository_id.cc b/paludis/repositories/repository/repository_id.cc
index cf6de60..84634ad 100644
--- a/paludis/repositories/repository/repository_id.cc
+++ b/paludis/repositories/repository/repository_id.cc
@@ -180,18 +180,6 @@ RepositoryID::extra_hash_value() const
return 0;
}
-const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
-RepositoryID::contains_key() const
-{
- return std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
-}
-
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-RepositoryID::contained_in_key() const
-{
- return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
-}
-
const std::shared_ptr<const MetadataValueKey<FSPath> >
RepositoryID::fs_location_key() const
{
diff --git a/paludis/repositories/repository/repository_id.hh b/paludis/repositories/repository/repository_id.hh
index 4f6734e..f66a985 100644
--- a/paludis/repositories/repository/repository_id.hh
+++ b/paludis/repositories/repository/repository_id.hh
@@ -65,9 +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 MetadataCollectionKey<PackageIDSequence> > contains_key() const;
- const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
- contained_in_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
dependencies_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
diff --git a/paludis/repositories/unavailable/unavailable_package_id.cc b/paludis/repositories/unavailable/unavailable_package_id.cc
index 703a6e5..8817b50 100644
--- a/paludis/repositories/unavailable/unavailable_package_id.cc
+++ b/paludis/repositories/unavailable/unavailable_package_id.cc
@@ -204,18 +204,6 @@ UnavailablePackageID::extra_hash_value() const
slot_key()->parse_value(), *_imp->from_repositories_key->parse_value()->begin()));
}
-const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
-UnavailablePackageID::contains_key() const
-{
- return std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
-}
-
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-UnavailablePackageID::contained_in_key() const
-{
- return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
-}
-
const std::shared_ptr<const MetadataValueKey<FSPath> >
UnavailablePackageID::fs_location_key() const
{
diff --git a/paludis/repositories/unavailable/unavailable_package_id.hh b/paludis/repositories/unavailable/unavailable_package_id.hh
index fea9066..06cf4c9 100644
--- a/paludis/repositories/unavailable/unavailable_package_id.hh
+++ b/paludis/repositories/unavailable/unavailable_package_id.hh
@@ -79,9 +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 MetadataCollectionKey<PackageIDSequence> > contains_key() const;
- const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
- contained_in_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
dependencies_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
diff --git a/paludis/repositories/unavailable/unavailable_repository_id.cc b/paludis/repositories/unavailable/unavailable_repository_id.cc
index 2482470..ff9e277 100644
--- a/paludis/repositories/unavailable/unavailable_repository_id.cc
+++ b/paludis/repositories/unavailable/unavailable_repository_id.cc
@@ -311,18 +311,6 @@ UnavailableRepositoryID::extra_hash_value() const
return 0;
}
-const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
-UnavailableRepositoryID::contains_key() const
-{
- return std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
-}
-
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-UnavailableRepositoryID::contained_in_key() const
-{
- return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
-}
-
const std::shared_ptr<const MetadataValueKey<FSPath> >
UnavailableRepositoryID::fs_location_key() const
{
diff --git a/paludis/repositories/unavailable/unavailable_repository_id.hh b/paludis/repositories/unavailable/unavailable_repository_id.hh
index 97dc314..b958a14 100644
--- a/paludis/repositories/unavailable/unavailable_repository_id.hh
+++ b/paludis/repositories/unavailable/unavailable_repository_id.hh
@@ -79,9 +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 MetadataCollectionKey<PackageIDSequence> > contains_key() const;
- const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
- contained_in_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
dependencies_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
diff --git a/paludis/repositories/unpackaged/installed_id.cc b/paludis/repositories/unpackaged/installed_id.cc
index 7473612..5b44d77 100644
--- a/paludis/repositories/unpackaged/installed_id.cc
+++ b/paludis/repositories/unpackaged/installed_id.cc
@@ -550,18 +550,6 @@ InstalledUnpackagedID::keywords_key() const
return std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
}
-const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
-InstalledUnpackagedID::contains_key() const
-{
- return std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
-}
-
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-InstalledUnpackagedID::contained_in_key() const
-{
- return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
-}
-
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
InstalledUnpackagedID::dependencies_key() const
{
diff --git a/paludis/repositories/unpackaged/installed_id.hh b/paludis/repositories/unpackaged/installed_id.hh
index ba6af9e..8d26fc4 100644
--- a/paludis/repositories/unpackaged/installed_id.hh
+++ b/paludis/repositories/unpackaged/installed_id.hh
@@ -58,8 +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 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;
virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
diff --git a/paludis/repositories/unpackaged/unpackaged_id.cc b/paludis/repositories/unpackaged/unpackaged_id.cc
index 99ba624..fc52de8 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.cc
+++ b/paludis/repositories/unpackaged/unpackaged_id.cc
@@ -209,18 +209,6 @@ UnpackagedID::keywords_key() const
return std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
}
-const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
-UnpackagedID::contains_key() const
-{
- return std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
-}
-
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-UnpackagedID::contained_in_key() const
-{
- return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
-}
-
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
UnpackagedID::dependencies_key() const
{
diff --git a/paludis/repositories/unpackaged/unpackaged_id.hh b/paludis/repositories/unpackaged/unpackaged_id.hh
index ef8a503..415bd7e 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.hh
+++ b/paludis/repositories/unpackaged/unpackaged_id.hh
@@ -57,8 +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 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;
virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
diff --git a/paludis/repositories/unwritten/unwritten_id.cc b/paludis/repositories/unwritten/unwritten_id.cc
index 8f7ecbe..71a7154 100644
--- a/paludis/repositories/unwritten/unwritten_id.cc
+++ b/paludis/repositories/unwritten/unwritten_id.cc
@@ -204,18 +204,6 @@ UnwrittenID::extra_hash_value() const
return Hash<SlotName>()(slot_key()->parse_value());
}
-const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
-UnwrittenID::contains_key() const
-{
- return std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
-}
-
-const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
-UnwrittenID::contained_in_key() const
-{
- return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
-}
-
const std::shared_ptr<const MetadataValueKey<FSPath> >
UnwrittenID::fs_location_key() const
{
diff --git a/paludis/repositories/unwritten/unwritten_id.hh b/paludis/repositories/unwritten/unwritten_id.hh
index 180eaae..9855361 100644
--- a/paludis/repositories/unwritten/unwritten_id.hh
+++ b/paludis/repositories/unwritten/unwritten_id.hh
@@ -91,9 +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 MetadataCollectionKey<PackageIDSequence> > contains_key() const;
- const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
- contained_in_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
dependencies_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
diff --git a/paludis/user_dep_spec.cc b/paludis/user_dep_spec.cc
index 259f4e9..d8f45ba 100644
--- a/paludis/user_dep_spec.cc
+++ b/paludis/user_dep_spec.cc
@@ -954,10 +954,6 @@ UserKeyRequirement::requirement_met(
key = id->build_dependencies_key().get();
else if (_imp->key == "$choices")
key = id->choices_key().get();
- else if (_imp->key == "$contained_in")
- key = id->contained_in_key().get();
- else if (_imp->key == "$contains")
- key = id->contains_key().get();
else if (_imp->key == "$contents")
key = id->contents_key().get();
else if (_imp->key == "$dependencies")
diff --git a/python/package_id.cc b/python/package_id.cc
index 4325d14..384f924 100644
--- a/python/package_id.cc
+++ b/python/package_id.cc
@@ -113,16 +113,6 @@ void expose_package_id()
"to determine whether a package is unused."
)
- .def("contains_key", &PackageID::contains_key,
- "The contains_key, if not None, indicates that a package contains\n"
- "other packages. This affects dependency resolution."
- )
-
- .def("contained_in_key", &PackageID::contained_in_key,
- "The contained_in_key, if not None, indicates that a package is\n"
- "contained in another package. This affects dependency resolution."
- )
-
.def("build_dependencies_key", &PackageID::build_dependencies_key,
"The build_dependencies_key, if not None, indicates a package's\n"
"build-time dependencies."
diff --git a/python/package_id_TEST.py b/python/package_id_TEST.py
index 4964426..51c6cf9 100755
--- a/python/package_id_TEST.py
+++ b/python/package_id_TEST.py
@@ -104,14 +104,6 @@ class TestCase_01_PackageID(unittest.TestCase):
mask = iter(self.mpid.masks).next()
self.assert_(isinstance(mask, UnacceptedMask))
- def test_16_contains_key(self):
- self.assertEquals(self.pid.contains_key(), None)
- self.assertEquals(self.ipid.contains_key(), None)
-
- def test_17_contained_in_key(self):
- self.assertEquals(self.pid.contained_in_key(), None)
- self.assertEquals(self.ipid.contained_in_key(), None)
-
def test_18_build_dependencies_key(self):
self.assert_(isinstance(self.pid.build_dependencies_key(), MetadataDependencySpecTreeKey))
self.assertEquals(self.ipid.build_dependencies_key(), None)