aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-11 18:10:32 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-11 19:13:23 +0100
commit26a2fd96e1360ec5432aa5958b42aa72034a8512 (patch)
tree066f8bfa47f645a209caadc2f5a02604dca0e363
parent4c6e4d042a9088653c5463c4ea7afc49d8d50dd7 (diff)
downloadpaludis-26a2fd96e1360ec5432aa5958b42aa72034a8512.tar.gz
paludis-26a2fd96e1360ec5432aa5958b42aa72034a8512.tar.xz
PackageID::suggestions_key can go
-rw-r--r--doc/api/ruby/example_dep_tree.rb3
-rw-r--r--paludis/package_id.hh9
-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/e/vdb_repository.cc3
-rw-r--r--paludis/repositories/fake/fake_package_id.cc25
-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.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.hh2
-rw-r--r--paludis/repositories/virtuals/package_id.cc6
-rw-r--r--paludis/repositories/virtuals/package_id.hh1
-rw-r--r--paludis/resolver/collect_depped_upon.cc6
-rw-r--r--paludis/resolver/sanitised_dependencies.cc2
-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.cc10
35 files changed, 3 insertions, 157 deletions
diff --git a/doc/api/ruby/example_dep_tree.rb b/doc/api/ruby/example_dep_tree.rb
index ab56fdb..6249ba6 100644
--- a/doc/api/ruby/example_dep_tree.rb
+++ b/doc/api/ruby/example_dep_tree.rb
@@ -131,8 +131,7 @@ ids.each do | id |
# IDs can potentially have four dependency-related keys. Each of thse keys
# may return nil. If it doesn't, collect 'app-arch/unzip' dependencies.
- [ :build_dependencies_key, :run_dependencies_key, :post_dependencies_key,
- :suggested_dependencies_key ].each do | key |
+ [ :build_dependencies_key, :run_dependencies_key, :post_dependencies_key ].each do | key |
if id.send(key)
collect_dependencies(env, id, id.send(key).parse_value, results)
end
diff --git a/paludis/package_id.hh b/paludis/package_id.hh
index 1231f51..fe1d083 100644
--- a/paludis/package_id.hh
+++ b/paludis/package_id.hh
@@ -219,8 +219,7 @@ namespace paludis
* dependencies.
*
* If dependencies_key is used, the client should ignore
- * build_dependencies_key, run_dependencies_key,
- * post_dependencies_key and suggested_dependencies_key.
+ * build_dependencies_key, run_dependencies_key and post_dependencies_key.
*
* Repositories that support this key must also provide the old
* split out keys.
@@ -248,12 +247,6 @@ namespace paludis
virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const = 0;
/**
- * The suggested_dependencies_key, if non-zero, indicates a package's
- * suggested post-merge dependencies.
- */
- virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const = 0;
-
- /**
* The fetches_key, if non-zero, indicates files that have to be fetched
* in order to install a package.
*/
diff --git a/paludis/repositories/accounts/accounts_id.cc b/paludis/repositories/accounts/accounts_id.cc
index 0a9b5fd..b6245bc 100644
--- a/paludis/repositories/accounts/accounts_id.cc
+++ b/paludis/repositories/accounts/accounts_id.cc
@@ -358,12 +358,6 @@ AccountsID::post_dependencies_key() const
}
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
-AccountsID::suggested_dependencies_key() const
-{
- return make_null_shared_ptr();
-}
-
-const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
AccountsID::dependencies_key() const
{
_need_file_keys();
diff --git a/paludis/repositories/accounts/accounts_id.hh b/paludis/repositories/accounts/accounts_id.hh
index f600313..6f6e333 100644
--- a/paludis/repositories/accounts/accounts_id.hh
+++ b/paludis/repositories/accounts/accounts_id.hh
@@ -70,7 +70,6 @@ namespace paludis
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;
- virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
virtual const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
diff --git a/paludis/repositories/accounts/installed_accounts_id.cc b/paludis/repositories/accounts/installed_accounts_id.cc
index 24fe801..9b1672d 100644
--- a/paludis/repositories/accounts/installed_accounts_id.cc
+++ b/paludis/repositories/accounts/installed_accounts_id.cc
@@ -282,12 +282,6 @@ InstalledAccountsID::dependencies_key() const
return _imp->dependencies_key;
}
-const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
-InstalledAccountsID::suggested_dependencies_key() const
-{
- return make_null_shared_ptr();
-}
-
const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
InstalledAccountsID::fetches_key() const
{
diff --git a/paludis/repositories/accounts/installed_accounts_id.hh b/paludis/repositories/accounts/installed_accounts_id.hh
index 376d9d6..7e58384 100644
--- a/paludis/repositories/accounts/installed_accounts_id.hh
+++ b/paludis/repositories/accounts/installed_accounts_id.hh
@@ -68,7 +68,6 @@ namespace paludis
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;
- virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
virtual const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
diff --git a/paludis/repositories/e/e_installed_repository_id.cc b/paludis/repositories/e/e_installed_repository_id.cc
index 36dc5eb..44263ed 100644
--- a/paludis/repositories/e/e_installed_repository_id.cc
+++ b/paludis/repositories/e/e_installed_repository_id.cc
@@ -833,12 +833,6 @@ EInstalledRepositoryID::post_dependencies_key() const
return _imp->keys->post_dependencies;
}
-const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
-EInstalledRepositoryID::suggested_dependencies_key() const
-{
- return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
-}
-
const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> >
EInstalledRepositoryID::restrict_key() const
{
diff --git a/paludis/repositories/e/e_installed_repository_id.hh b/paludis/repositories/e/e_installed_repository_id.hh
index 91b81a1..27a27b8 100644
--- a/paludis/repositories/e/e_installed_repository_id.hh
+++ b/paludis/repositories/e/e_installed_repository_id.hh
@@ -64,7 +64,6 @@ namespace paludis
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;
- virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > restrict_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > properties_key() const;
diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index a81701d..3ea0bdf 100644
--- a/paludis/repositories/e/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -802,12 +802,6 @@ EbuildID::post_dependencies_key() const
return _imp->post_dependencies;
}
-const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
-EbuildID::suggested_dependencies_key() const
-{
- return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
-}
-
const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> >
EbuildID::restrict_key() const
{
diff --git a/paludis/repositories/e/ebuild_id.hh b/paludis/repositories/e/ebuild_id.hh
index 2860508..02c18a8 100644
--- a/paludis/repositories/e/ebuild_id.hh
+++ b/paludis/repositories/e/ebuild_id.hh
@@ -71,7 +71,6 @@ namespace paludis
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;
- virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index 5aca13e..1f0bb73 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -1605,9 +1605,6 @@ VDBRepository::perform_updates()
if ((*i)->post_dependencies_key())
rewrite_done |= rewrite_dependencies((*i)->fs_location_key()->parse_value() / (*i)->post_dependencies_key()->raw_name(),
(*i)->post_dependencies_key(), dep_rewrites);
- if ((*i)->suggested_dependencies_key())
- rewrite_done |= rewrite_dependencies((*i)->fs_location_key()->parse_value() / (*i)->suggested_dependencies_key()->raw_name(),
- (*i)->suggested_dependencies_key(), dep_rewrites);
}
std::cout << std::endl << "Updating configuration files" << std::endl;
diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc
index fdb13e5..bfb0157 100644
--- a/paludis/repositories/fake/fake_package_id.cc
+++ b/paludis/repositories/fake/fake_package_id.cc
@@ -609,18 +609,15 @@ namespace
std::shared_ptr<DependenciesLabelSequence> build_dependencies_labels;
std::shared_ptr<DependenciesLabelSequence> run_dependencies_labels;
std::shared_ptr<DependenciesLabelSequence> post_dependencies_labels;
- std::shared_ptr<DependenciesLabelSequence> suggested_dependencies_labels;
FakePackageIDData() :
build_dependencies_labels(std::make_shared<DependenciesLabelSequence>()),
run_dependencies_labels(std::make_shared<DependenciesLabelSequence>()),
- post_dependencies_labels(std::make_shared<DependenciesLabelSequence>()),
- suggested_dependencies_labels(std::make_shared<DependenciesLabelSequence>())
+ post_dependencies_labels(std::make_shared<DependenciesLabelSequence>())
{
build_dependencies_labels->push_back(std::make_shared<AlwaysEnabledDependencyLabel<DependenciesBuildLabelTag> >("DEPEND"));
run_dependencies_labels->push_back(std::make_shared<AlwaysEnabledDependencyLabel<DependenciesRunLabelTag> >("RDEPEND"));
post_dependencies_labels->push_back(std::make_shared<AlwaysEnabledDependencyLabel<DependenciesPostLabelTag> >("PDEPEND"));
- suggested_dependencies_labels->push_back(std::make_shared<AlwaysEnabledDependencyLabel<DependenciesSuggestionLabelTag> >("SDEPEND"));
}
};
}
@@ -646,7 +643,6 @@ namespace paludis
mutable std::shared_ptr<FakeMetadataSpecTreeKey<DependencySpecTree> > build_dependencies;
mutable std::shared_ptr<FakeMetadataSpecTreeKey<DependencySpecTree> > run_dependencies;
mutable std::shared_ptr<FakeMetadataSpecTreeKey<DependencySpecTree> > post_dependencies;
- mutable std::shared_ptr<FakeMetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies;
mutable std::shared_ptr<FakeMetadataSpecTreeKey<PlainTextSpecTree> > restrictions;
mutable std::shared_ptr<FakeMetadataSpecTreeKey<FetchableURISpecTree> > src_uri;
mutable std::shared_ptr<FakeMetadataSpecTreeKey<SimpleURISpecTree> > homepage;
@@ -783,13 +779,6 @@ FakePackageID::post_dependencies_key() const
return _imp->post_dependencies;
}
-const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
-FakePackageID::suggested_dependencies_key() const
-{
- need_keys_added();
- return _imp->suggested_dependencies;
-}
-
const std::shared_ptr<FakeMetadataKeywordSetKey>
FakePackageID::keywords_key()
{
@@ -825,13 +814,6 @@ FakePackageID::post_dependencies_key()
return _imp->post_dependencies;
}
-const std::shared_ptr<FakeMetadataSpecTreeKey<DependencySpecTree> >
-FakePackageID::suggested_dependencies_key()
-{
- need_keys_added();
- return _imp->suggested_dependencies;
-}
-
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
FakePackageID::dependencies_key() const
{
@@ -934,10 +916,6 @@ FakePackageID::need_keys_added() const
"", std::bind(&parse_depend, _1, _imp->env),
FakePackageIDData::get_instance()->post_dependencies_labels, mkt_dependencies);
- _imp->suggested_dependencies = std::make_shared<FakeMetadataSpecTreeKey<DependencySpecTree>>("SDEPEND", "Suggested dependencies",
- "", std::bind(&parse_depend, _1, _imp->env),
- FakePackageIDData::get_instance()->suggested_dependencies_labels, mkt_dependencies);
-
_imp->src_uri = std::make_shared<FakeMetadataSpecTreeKey<FetchableURISpecTree>>("SRC_URI", "Source URI",
"", std::bind(&parse_fetchable_uri, _1, _imp->env), mkt_normal);
@@ -964,7 +942,6 @@ FakePackageID::need_keys_added() const
add_metadata_key(_imp->build_dependencies);
add_metadata_key(_imp->run_dependencies);
add_metadata_key(_imp->post_dependencies);
- add_metadata_key(_imp->suggested_dependencies);
add_metadata_key(_imp->src_uri);
add_metadata_key(_imp->homepage);
add_metadata_key(_imp->provide);
diff --git a/paludis/repositories/fake/fake_package_id.hh b/paludis/repositories/fake/fake_package_id.hh
index 590d342..bbf768a 100644
--- a/paludis/repositories/fake/fake_package_id.hh
+++ b/paludis/repositories/fake/fake_package_id.hh
@@ -247,7 +247,6 @@ namespace paludis
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;
- virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
virtual const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
@@ -273,7 +272,6 @@ namespace paludis
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();
- const std::shared_ptr<FakeMetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key();
const std::shared_ptr<FakeMetadataSpecTreeKey<FetchableURISpecTree> > fetches_key();
const std::shared_ptr<FakeMetadataSpecTreeKey<SimpleURISpecTree> > homepage_key();
const std::shared_ptr<FakeMetadataChoicesKey> choices_key();
diff --git a/paludis/repositories/gemcutter/gemcutter_id.cc b/paludis/repositories/gemcutter/gemcutter_id.cc
index 39e4dd0..20f7c53 100644
--- a/paludis/repositories/gemcutter/gemcutter_id.cc
+++ b/paludis/repositories/gemcutter/gemcutter_id.cc
@@ -383,12 +383,6 @@ GemcutterID::post_dependencies_key() const
return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
-GemcutterID::suggested_dependencies_key() const
-{
- return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
-}
-
const std::shared_ptr<const MetadataValueKey<std::string> >
GemcutterID::short_description_key() const
{
diff --git a/paludis/repositories/gemcutter/gemcutter_id.hh b/paludis/repositories/gemcutter/gemcutter_id.hh
index 2430243..d7fe3ed 100644
--- a/paludis/repositories/gemcutter/gemcutter_id.hh
+++ b/paludis/repositories/gemcutter/gemcutter_id.hh
@@ -81,8 +81,6 @@ namespace paludis
run_dependencies_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
post_dependencies_key() const;
- const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
- suggested_dependencies_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
diff --git a/paludis/repositories/repository/repository_id.cc b/paludis/repositories/repository/repository_id.cc
index 34d3102..96e9875 100644
--- a/paludis/repositories/repository/repository_id.cc
+++ b/paludis/repositories/repository/repository_id.cc
@@ -246,12 +246,6 @@ RepositoryID::post_dependencies_key() const
return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
-RepositoryID::suggested_dependencies_key() const
-{
- return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
-}
-
const std::shared_ptr<const MetadataValueKey<std::string> >
RepositoryID::short_description_key() const
{
diff --git a/paludis/repositories/repository/repository_id.hh b/paludis/repositories/repository/repository_id.hh
index 20545a3..c964bf2 100644
--- a/paludis/repositories/repository/repository_id.hh
+++ b/paludis/repositories/repository/repository_id.hh
@@ -79,8 +79,6 @@ namespace paludis
run_dependencies_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
post_dependencies_key() const;
- const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
- suggested_dependencies_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
diff --git a/paludis/repositories/unavailable/unavailable_package_id.cc b/paludis/repositories/unavailable/unavailable_package_id.cc
index e83d04c..1079b40 100644
--- a/paludis/repositories/unavailable/unavailable_package_id.cc
+++ b/paludis/repositories/unavailable/unavailable_package_id.cc
@@ -270,12 +270,6 @@ UnavailablePackageID::post_dependencies_key() const
return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
-UnavailablePackageID::suggested_dependencies_key() const
-{
- return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
-}
-
const std::shared_ptr<const MetadataValueKey<std::string> >
UnavailablePackageID::short_description_key() const
{
diff --git a/paludis/repositories/unavailable/unavailable_package_id.hh b/paludis/repositories/unavailable/unavailable_package_id.hh
index 2b2543f..a0968ee 100644
--- a/paludis/repositories/unavailable/unavailable_package_id.hh
+++ b/paludis/repositories/unavailable/unavailable_package_id.hh
@@ -93,8 +93,6 @@ namespace paludis
run_dependencies_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
post_dependencies_key() const;
- const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
- suggested_dependencies_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
diff --git a/paludis/repositories/unavailable/unavailable_repository_id.cc b/paludis/repositories/unavailable/unavailable_repository_id.cc
index 9623712..e221c4e 100644
--- a/paludis/repositories/unavailable/unavailable_repository_id.cc
+++ b/paludis/repositories/unavailable/unavailable_repository_id.cc
@@ -377,12 +377,6 @@ UnavailableRepositoryID::post_dependencies_key() const
return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
-UnavailableRepositoryID::suggested_dependencies_key() const
-{
- return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
-}
-
const std::shared_ptr<const MetadataValueKey<std::string> >
UnavailableRepositoryID::short_description_key() const
{
diff --git a/paludis/repositories/unavailable/unavailable_repository_id.hh b/paludis/repositories/unavailable/unavailable_repository_id.hh
index 5ca1877..253acbc 100644
--- a/paludis/repositories/unavailable/unavailable_repository_id.hh
+++ b/paludis/repositories/unavailable/unavailable_repository_id.hh
@@ -93,8 +93,6 @@ namespace paludis
run_dependencies_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
post_dependencies_key() const;
- const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
- suggested_dependencies_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
diff --git a/paludis/repositories/unpackaged/installed_id.cc b/paludis/repositories/unpackaged/installed_id.cc
index ea98f51..809ddcf 100644
--- a/paludis/repositories/unpackaged/installed_id.cc
+++ b/paludis/repositories/unpackaged/installed_id.cc
@@ -598,12 +598,6 @@ InstalledUnpackagedID::post_dependencies_key() const
return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
-InstalledUnpackagedID::suggested_dependencies_key() const
-{
- return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
-}
-
const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
InstalledUnpackagedID::fetches_key() const
{
diff --git a/paludis/repositories/unpackaged/installed_id.hh b/paludis/repositories/unpackaged/installed_id.hh
index 04a2050..8b8ac85 100644
--- a/paludis/repositories/unpackaged/installed_id.hh
+++ b/paludis/repositories/unpackaged/installed_id.hh
@@ -66,7 +66,6 @@ namespace paludis
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;
- virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
virtual const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
diff --git a/paludis/repositories/unpackaged/unpackaged_id.cc b/paludis/repositories/unpackaged/unpackaged_id.cc
index 8bb4284..48e5a90 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.cc
+++ b/paludis/repositories/unpackaged/unpackaged_id.cc
@@ -257,12 +257,6 @@ UnpackagedID::post_dependencies_key() const
return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
-UnpackagedID::suggested_dependencies_key() const
-{
- return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
-}
-
const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
UnpackagedID::fetches_key() const
{
diff --git a/paludis/repositories/unpackaged/unpackaged_id.hh b/paludis/repositories/unpackaged/unpackaged_id.hh
index 474d955..d60e778 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.hh
+++ b/paludis/repositories/unpackaged/unpackaged_id.hh
@@ -65,7 +65,6 @@ namespace paludis
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;
- virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
virtual const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
diff --git a/paludis/repositories/unwritten/unwritten_id.cc b/paludis/repositories/unwritten/unwritten_id.cc
index e6d8bbf..ee102c4 100644
--- a/paludis/repositories/unwritten/unwritten_id.cc
+++ b/paludis/repositories/unwritten/unwritten_id.cc
@@ -270,12 +270,6 @@ UnwrittenID::post_dependencies_key() const
return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
-UnwrittenID::suggested_dependencies_key() const
-{
- return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
-}
-
const std::shared_ptr<const MetadataValueKey<SlotName> >
UnwrittenID::slot_key() const
{
diff --git a/paludis/repositories/unwritten/unwritten_id.hh b/paludis/repositories/unwritten/unwritten_id.hh
index 58dd3ee..f5534c5 100644
--- a/paludis/repositories/unwritten/unwritten_id.hh
+++ b/paludis/repositories/unwritten/unwritten_id.hh
@@ -104,8 +104,6 @@ namespace paludis
run_dependencies_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
post_dependencies_key() const;
- const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
- suggested_dependencies_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
diff --git a/paludis/repositories/virtuals/package_id.cc b/paludis/repositories/virtuals/package_id.cc
index 9647925..0fed233 100644
--- a/paludis/repositories/virtuals/package_id.cc
+++ b/paludis/repositories/virtuals/package_id.cc
@@ -309,12 +309,6 @@ VirtualsPackageID::post_dependencies_key() const
return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
-VirtualsPackageID::suggested_dependencies_key() const
-{
- return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
-}
-
const std::shared_ptr<const MetadataValueKey<std::string> >
VirtualsPackageID::short_description_key() const
{
diff --git a/paludis/repositories/virtuals/package_id.hh b/paludis/repositories/virtuals/package_id.hh
index ca54e94..16bb105 100644
--- a/paludis/repositories/virtuals/package_id.hh
+++ b/paludis/repositories/virtuals/package_id.hh
@@ -91,7 +91,6 @@ namespace paludis
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;
- virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
virtual const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
virtual const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
diff --git a/paludis/resolver/collect_depped_upon.cc b/paludis/resolver/collect_depped_upon.cc
index e6f281f..b577304 100644
--- a/paludis/resolver/collect_depped_upon.cc
+++ b/paludis/resolver/collect_depped_upon.cc
@@ -189,8 +189,6 @@ paludis::resolver::dependent_upon(
id->run_dependencies_key()->parse_value()->top()->accept(c);
if (id->post_dependencies_key())
id->post_dependencies_key()->parse_value()->top()->accept(c);
- if (id->suggested_dependencies_key())
- id->suggested_dependencies_key()->parse_value()->top()->accept(c);
}
return c.result;
@@ -214,8 +212,6 @@ paludis::resolver::collect_depped_upon(
id->run_dependencies_key()->parse_value()->top()->accept(c);
if (id->post_dependencies_key())
id->post_dependencies_key()->parse_value()->top()->accept(c);
- if (id->suggested_dependencies_key())
- id->suggested_dependencies_key()->parse_value()->top()->accept(c);
}
const std::shared_ptr<PackageIDSet> result(std::make_shared<PackageIDSet>());
@@ -250,8 +246,6 @@ paludis::resolver::collect_dependents(
(*i)->run_dependencies_key()->parse_value()->top()->accept(c);
if ((*i)->post_dependencies_key())
(*i)->post_dependencies_key()->parse_value()->top()->accept(c);
- if ((*i)->suggested_dependencies_key())
- (*i)->suggested_dependencies_key()->parse_value()->top()->accept(c);
}
if (! c.result->empty())
diff --git a/paludis/resolver/sanitised_dependencies.cc b/paludis/resolver/sanitised_dependencies.cc
index 890c4e0..395c675 100644
--- a/paludis/resolver/sanitised_dependencies.cc
+++ b/paludis/resolver/sanitised_dependencies.cc
@@ -515,8 +515,6 @@ SanitisedDependencies::populate(
_populate_one(env, decider, resolution, id, changed, &PackageID::run_dependencies_key);
if (id->post_dependencies_key())
_populate_one(env, decider, resolution, id, changed, &PackageID::post_dependencies_key);
- if (id->suggested_dependencies_key())
- _populate_one(env, decider, resolution, id, changed, &PackageID::suggested_dependencies_key);
}
}
diff --git a/paludis/user_dep_spec.cc b/paludis/user_dep_spec.cc
index b1d1f3f..cfb10c9 100644
--- a/paludis/user_dep_spec.cc
+++ b/paludis/user_dep_spec.cc
@@ -980,8 +980,6 @@ UserKeyRequirement::requirement_met(
key = id->short_description_key().get();
else if (_imp->key == "$slot")
key = id->slot_key().get();
- else if (_imp->key == "$suggested_dependencies")
- key = id->suggested_dependencies_key().get();
else if (_imp->key == "$virtual_for")
key = id->virtual_for_key().get();
}
diff --git a/python/package_id.cc b/python/package_id.cc
index 1301db1..ae11bf1 100644
--- a/python/package_id.cc
+++ b/python/package_id.cc
@@ -149,11 +149,6 @@ void expose_package_id()
"post-merge dependencies."
)
- .def("suggested_dependencies_key", &PackageID::suggested_dependencies_key,
- "The suggested_dependencies_key, if not None, indicates a package's\n"
- "suggested post-merge dependencies."
- )
-
.def("fetches_key", &PackageID::fetches_key,
"The fetches_key, if not None, indicates files that have to be fetched\n"
"in order to install a package."
diff --git a/python/package_id_TEST.py b/python/package_id_TEST.py
index d274c9e..b85b52b 100755
--- a/python/package_id_TEST.py
+++ b/python/package_id_TEST.py
@@ -136,10 +136,6 @@ class TestCase_01_PackageID(unittest.TestCase):
self.assert_(isinstance(self.pid.post_dependencies_key(), MetadataDependencySpecTreeKey))
self.assertEquals(self.ipid.post_dependencies_key(), None)
- def test_21_suggested_dependencies_key(self):
- self.assertEquals(self.pid.suggested_dependencies_key(), None)
- self.assertEquals(self.ipid.suggested_dependencies_key(), None)
-
def test_22_fetches_key(self):
self.assert_(isinstance(self.pid.fetches_key(), MetadataFetchableURISpecTreeKey))
self.assertEquals(self.ipid.fetches_key(), None)
diff --git a/ruby/package_id.cc b/ruby/package_id.cc
index a52a7aa..7b6a058 100644
--- a/ruby/package_id.cc
+++ b/ruby/package_id.cc
@@ -437,14 +437,6 @@ namespace
* Our post dependencies
*/
/*
- * Document-method: suggested_dependencies_key
- *
- * call-seq:
- * suggested_dependencies_key -> MetadataDependencySpecTreeKey
- *
- * Our suggested dependencies
- */
- /*
* Document-method: homepage_key
*
* call-seq:
@@ -533,8 +525,6 @@ namespace
&KeyValue<MetadataSpecTreeKey<DependencySpecTree>, &PackageID::run_dependencies_key>::fetch)), 0);
rb_define_method(c_package_id, "post_dependencies_key", RUBY_FUNC_CAST((
&KeyValue<MetadataSpecTreeKey<DependencySpecTree>, &PackageID::post_dependencies_key>::fetch)), 0);
- rb_define_method(c_package_id, "suggested_dependencies_key", RUBY_FUNC_CAST((
- &KeyValue<MetadataSpecTreeKey<DependencySpecTree>, &PackageID::suggested_dependencies_key>::fetch)), 0);
rb_define_method(c_package_id, "homepage_key", RUBY_FUNC_CAST((
&KeyValue<MetadataSpecTreeKey<SimpleURISpecTree>, &PackageID::homepage_key>::fetch)), 0);
rb_define_method(c_package_id, "short_description_key", RUBY_FUNC_CAST((&KeyValue<MetadataValueKey<std::string>,