diff options
Diffstat (limited to 'paludis/repositories')
27 files changed, 1 insertions, 118 deletions
diff --git a/paludis/repositories/accounts/accounts_id.cc b/paludis/repositories/accounts/accounts_id.cc index 0a9b5fd6c..b6245bc48 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 f600313b3..6f6e33375 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 24fe801c0..9b1672d90 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 376d9d689..7e5838446 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 36dc5eb2d..44263ed8c 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 91b81a1af..27a27b84b 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 a81701ded..3ea0bdf36 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 28605084c..02c18a894 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 5aca13e38..1f0bb7338 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 fdb13e560..bfb0157f8 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 590d34245..bbf768a4d 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 39e4dd0ec..20f7c53ca 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 24302432d..d7fe3ed14 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 34d31027e..96e98755f 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 20545a336..c964bf202 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 e83d04c17..1079b4098 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 2b2543f64..a0968ee3d 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 96237121a..e221c4e56 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 5ca187787..253acbc22 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 ea98f5106..809ddcf91 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 04a20505f..8b8ac85eb 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 8bb4284b7..48e5a9087 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 474d9557d..d60e7787f 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 e6d8bbfb4..ee102c497 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 58dd3ee2a..f5534c56e 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 964792544..0fed2330c 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 ca54e941b..16bb10599 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; |