aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-10-09 19:04:16 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-10-09 19:04:16 +0000
commit67a49f11f1645be945d9aba61b657075d08af430 (patch)
tree725f524c9aa61fcceb8e70563df078e9412e65a3
parent330b0a02bb290f67f4e4fa5afd0f096c226ec7eb (diff)
downloadpaludis-67a49f11f1645be945d9aba61b657075d08af430.tar.gz
paludis-67a49f11f1645be945d9aba61b657075d08af430.tar.xz
Kill PackageID::license_key. Rename PackageID::src_uri_key -> fetches_key. Fixes: ticket:392. Fixes: ticket:393
-rw-r--r--doc/examples/example_dep_label.cc8
-rw-r--r--doc/examples/example_dep_tree.cc4
-rw-r--r--paludis/package_id.hh6
-rw-r--r--paludis/repositories/cran/cran_package_id.cc8
-rw-r--r--paludis/repositories/cran/cran_package_id.hh3
-rw-r--r--paludis/repositories/e/e_repository.cc4
-rw-r--r--paludis/repositories/e/ebuild_entries.cc24
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache.cc4
-rw-r--r--paludis/repositories/e/ebuild_id.cc2
-rw-r--r--paludis/repositories/e/ebuild_id.hh4
-rw-r--r--paludis/repositories/e/qa/extractors.cc14
-rw-r--r--paludis/repositories/e/qa/extractors_TEST.cc10
-rw-r--r--paludis/repositories/e/vdb_id.cc9
-rw-r--r--paludis/repositories/e/vdb_id.hh3
-rw-r--r--paludis/repositories/fake/fake_package_id.cc4
-rw-r--r--paludis/repositories/fake/fake_package_id.hh6
-rw-r--r--paludis/repositories/gems/gem_specification.cc8
-rw-r--r--paludis/repositories/gems/gem_specification.hh3
-rw-r--r--paludis/repositories/virtuals/package_id.cc8
-rw-r--r--paludis/repositories/virtuals/package_id.hh3
20 files changed, 52 insertions, 83 deletions
diff --git a/doc/examples/example_dep_label.cc b/doc/examples/example_dep_label.cc
index 58d5545..7429e77 100644
--- a/doc/examples/example_dep_label.cc
+++ b/doc/examples/example_dep_label.cc
@@ -171,20 +171,20 @@ int main(int argc, char * argv[])
for (PackageIDSet::ConstIterator i(ids->begin()), i_end(ids->end()) ;
i != i_end ; ++i)
{
- /* If we don't have a src_uri key, skip this package. All PackageID
+ /* If we don't have a fetches key, skip this package. All PackageID
* _key() functions can potentially return zero pointers, so checking is
* essential. */
- if (! (*i)->src_uri_key())
+ if (! (*i)->fetches_key())
continue;
/* We need to know whether the default label for this package's src_uri
* is restricted. */
IsLabelRestrictedVisitor is_initial_label_restricted(false);
- (*i)->src_uri_key()->initial_label()->accept(is_initial_label_restricted);
+ (*i)->fetches_key()->initial_label()->accept(is_initial_label_restricted);
/* Create a visitor that will collect distfiles, and do the collecting. */
DistfilesCollector collector(results, is_initial_label_restricted.result);
- (*i)->src_uri_key()->value()->accept(collector);
+ (*i)->fetches_key()->value()->accept(collector);
}
/* Display summary of results */
diff --git a/doc/examples/example_dep_tree.cc b/doc/examples/example_dep_tree.cc
index 48fa6a5..defa451 100644
--- a/doc/examples/example_dep_tree.cc
+++ b/doc/examples/example_dep_tree.cc
@@ -229,8 +229,8 @@ int main(int argc, char * argv[])
FileExtensionsCollector extensions_collector(env, *i, results);
/* Again, we check for a zero pointer and visit otherwise: */
- if ((*i)->src_uri_key())
- (*i)->src_uri_key()->value()->accept(extensions_collector);
+ if ((*i)->fetches_key())
+ (*i)->fetches_key()->value()->accept(extensions_collector);
}
/* Display our results */
diff --git a/paludis/package_id.hh b/paludis/package_id.hh
index e75f5fd..1964b15 100644
--- a/paludis/package_id.hh
+++ b/paludis/package_id.hh
@@ -184,8 +184,6 @@ namespace paludis
*/
virtual const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> > iuse_key() const = 0;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const = 0;
-
/**
* The provide_key, if non-zero, indicates that a package provides
* certain old-style virtuals. This affects dependency resolution.
@@ -228,10 +226,10 @@ namespace paludis
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const = 0;
/**
- * The src_uri_key, if non-zero, indicates files that have to be fetched
+ * The fetches_key, if non-zero, indicates files that have to be fetched
* in order to install a package.
*/
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > src_uri_key() const = 0;
+ virtual const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const = 0;
/**
* The homepage_key, if non-zero, describes a package's homepages.
diff --git a/paludis/repositories/cran/cran_package_id.cc b/paludis/repositories/cran/cran_package_id.cc
index a77d2ef..bbd29e4 100644
--- a/paludis/repositories/cran/cran_package_id.cc
+++ b/paludis/repositories/cran/cran_package_id.cc
@@ -332,12 +332,6 @@ CRANPackageID::iuse_key() const
return tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> >();
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> >
-CRANPackageID::license_key() const
-{
- return tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> >();
-}
-
const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
CRANPackageID::provide_key() const
{
@@ -369,7 +363,7 @@ CRANPackageID::suggested_dependencies_key() const
}
const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
-CRANPackageID::src_uri_key() const
+CRANPackageID::fetches_key() const
{
return tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >();
}
diff --git a/paludis/repositories/cran/cran_package_id.hh b/paludis/repositories/cran/cran_package_id.hh
index e982900..f500d29 100644
--- a/paludis/repositories/cran/cran_package_id.hh
+++ b/paludis/repositories/cran/cran_package_id.hh
@@ -60,13 +60,12 @@ namespace paludis
virtual const tr1::shared_ptr<const MetadataPackageIDKey> virtual_for_key() const;
virtual const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> > keywords_key() const;
virtual const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> > iuse_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > src_uri_key() const;
+ virtual const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> short_description_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> long_description_key() const;
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index b4da94c..4b6e822 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -1195,10 +1195,10 @@ ERepository::make_manifest(const QualifiedPackageName & qpn)
v != v_end ; ++v)
{
tr1::shared_ptr<const PackageID> id = (*v);
- if (! id->src_uri_key())
+ if (! id->fetches_key())
continue;
paludis::erepository::AAVisitor aa;
- id->src_uri_key()->value()->accept(aa);
+ id->fetches_key()->value()->accept(aa);
for (paludis::erepository::AAVisitor::ConstIterator d(aa.begin()) ;
d != aa.end() ; ++d)
diff --git a/paludis/repositories/e/ebuild_entries.cc b/paludis/repositories/e/ebuild_entries.cc
index b929ffd..71b9eac 100644
--- a/paludis/repositories/e/ebuild_entries.cc
+++ b/paludis/repositories/e/ebuild_entries.cc
@@ -326,8 +326,8 @@ EbuildEntries::fetch(const tr1::shared_ptr<const ERepositoryID> & id,
/* make A */
AFinder f(_imp->params.environment, id);
- if (id->src_uri_key())
- id->src_uri_key()->value()->accept(f);
+ if (id->fetches_key())
+ id->fetches_key()->value()->accept(f);
for (AFinder::ConstIterator i(f.begin()), i_end(f.end()) ; i != i_end ; ++i)
{
@@ -345,8 +345,8 @@ EbuildEntries::fetch(const tr1::shared_ptr<const ERepositoryID> & id,
if (! id->eapi()->supported->ebuild_environment_variables->env_aa.empty())
{
AAVisitor g;
- if (id->src_uri_key())
- id->src_uri_key()->value()->accept(g);
+ if (id->fetches_key())
+ id->fetches_key()->value()->accept(g);
std::set<std::string> already_in_all_archives;
for (AAVisitor::ConstIterator gg(g.begin()), gg_end(g.end()) ; gg != gg_end ; ++gg)
@@ -370,19 +370,19 @@ EbuildEntries::fetch(const tr1::shared_ptr<const ERepositoryID> & id,
archives = strip_trailing(archives, " ");
all_archives = strip_trailing(all_archives, " ");
- if (id->src_uri_key())
+ if (id->fetches_key())
{
std::string mirrors_name(_imp->e_repository->params().master_repository ?
stringify(_imp->e_repository->params().master_repository->name()) :
stringify(_imp->e_repository->name()));
FetchVisitor f(_imp->params.environment, id, *id->eapi(),
_imp->e_repository->params().distdir, o.fetch_unneeded, fetch_userpriv_ok, mirrors_name,
- id->src_uri_key()->initial_label(), o.safe_resume);
- id->src_uri_key()->value()->accept(f);
+ id->fetches_key()->initial_label(), o.safe_resume);
+ id->fetches_key()->value()->accept(f);
CheckFetchedFilesVisitor c(_imp->environment, id, _imp->e_repository->params().distdir, o.fetch_unneeded, fetch_restrict,
((_imp->e_repository->layout()->package_directory(id->name())) / "Manifest"),
_imp->e_repository->params().use_manifest);
- id->src_uri_key()->value()->accept(c);
+ id->fetches_key()->value()->accept(c);
if (c.need_nofetch())
{
@@ -460,8 +460,8 @@ EbuildEntries::install(const tr1::shared_ptr<const ERepositoryID> & id,
/* make A */
AFinder f(_imp->params.environment, id);
- if (id->src_uri_key())
- id->src_uri_key()->value()->accept(f);
+ if (id->fetches_key())
+ id->fetches_key()->value()->accept(f);
for (AFinder::ConstIterator i(f.begin()), i_end(f.end()) ; i != i_end ; ++i)
{
@@ -479,8 +479,8 @@ EbuildEntries::install(const tr1::shared_ptr<const ERepositoryID> & id,
if (! id->eapi()->supported->ebuild_environment_variables->env_aa.empty())
{
AAVisitor g;
- if (id->src_uri_key())
- id->src_uri_key()->value()->accept(g);
+ if (id->fetches_key())
+ id->fetches_key()->value()->accept(g);
std::set<std::string> already_in_all_archives;
for (AAVisitor::ConstIterator gg(g.begin()), gg_end(g.end()) ; gg != gg_end ; ++gg)
diff --git a/paludis/repositories/e/ebuild_flat_metadata_cache.cc b/paludis/repositories/e/ebuild_flat_metadata_cache.cc
index f0c3214..51ff788 100644
--- a/paludis/repositories/e/ebuild_flat_metadata_cache.cc
+++ b/paludis/repositories/e/ebuild_flat_metadata_cache.cc
@@ -196,8 +196,8 @@ EbuildFlatMetadataCache::save(const tr1::shared_ptr<const EbuildID> & id)
cache << normalise(id->slot()) << std::endl;
- if (id->src_uri_key())
- cache << flatten(id->src_uri_key()->value()) << std::endl;
+ if (id->fetches_key())
+ cache << flatten(id->fetches_key()->value()) << std::endl;
else
cache << std::endl;
diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index b4efbb5..96eff76 100644
--- a/paludis/repositories/e/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -550,7 +550,7 @@ EbuildID::restrict_key() const
}
const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
-EbuildID::src_uri_key() const
+EbuildID::fetches_key() const
{
need_keys_added();
return _imp->src_uri;
diff --git a/paludis/repositories/e/ebuild_id.hh b/paludis/repositories/e/ebuild_id.hh
index f3a4b7a..eb2a2b9 100644
--- a/paludis/repositories/e/ebuild_id.hh
+++ b/paludis/repositories/e/ebuild_id.hh
@@ -67,13 +67,12 @@ namespace paludis
virtual const tr1::shared_ptr<const MetadataPackageIDKey> virtual_for_key() const;
virtual const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> > keywords_key() const;
virtual const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> > iuse_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > src_uri_key() const;
+ virtual const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> short_description_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> long_description_key() const;
@@ -86,6 +85,7 @@ namespace paludis
virtual const tr1::shared_ptr<const MetadataFSEntryKey> fs_location_key() const;
const tr1::shared_ptr<const MetadataSetKey<Set<std::string> > > inherited_key() const;
+ const tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<RestrictSpecTree> > restrict_key() const;
virtual bool arbitrary_less_than_comparison(const PackageID &) const
diff --git a/paludis/repositories/e/qa/extractors.cc b/paludis/repositories/e/qa/extractors.cc
index 08dc835..6ca4b3c 100644
--- a/paludis/repositories/e/qa/extractors.cc
+++ b/paludis/repositories/e/qa/extractors.cc
@@ -254,7 +254,7 @@ paludis::erepository::extractors_check(
Log::get_instance()->message(ll_debug, lc_context) << "extractors_check '"
<< entry << "', " << *id << "', " << name << "'";
- if (id->src_uri_key())
+ if (id->fetches_key())
{
try
{
@@ -262,7 +262,7 @@ paludis::erepository::extractors_check(
* since it needs to work with USE_EXPAND and it's potentially
* O(2^n). */
FlagExtractor f;
- id->src_uri_key()->value()->accept(f);
+ id->fetches_key()->value()->accept(f);
if (id->build_dependencies_key())
id->build_dependencies_key()->value()->accept(f);
@@ -275,13 +275,13 @@ paludis::erepository::extractors_check(
reporter.message(QAMessage(entry, qaml_maybe, name, "Too many flags to determine whether "
"extractor dependency requirement '" + stringify(r->first) + "' is met")
.with_associated_id(id)
- .with_associated_key(id->src_uri_key()));
+ .with_associated_key(id->fetches_key()));
continue;
}
/* Find the set of requirements. */
Requirements q(r->first, r->second);
- id->src_uri_key()->value()->accept(q);
+ id->fetches_key()->value()->accept(q);
/* Find the set of met requirements. */
Requirements m(r->first, r->second);
@@ -388,7 +388,7 @@ paludis::erepository::extractors_check(
reporter.message(QAMessage(entry, qaml_maybe, name, "Extractor '" + stringify(r->first)
+ "' may be required as a build dependency" + cond)
.with_associated_id(id)
- .with_associated_key(id->src_uri_key()));
+ .with_associated_key(id->fetches_key()));
}
}
}
@@ -396,9 +396,9 @@ paludis::erepository::extractors_check(
{
reporter.message(QAMessage(entry, qaml_severe, name,
"Caught exception '" + stringify(e.message()) + "' ("
- + stringify(e.what()) + ") when handling key '" + id->src_uri_key()->raw_name() + "'")
+ + stringify(e.what()) + ") when handling key '" + id->fetches_key()->raw_name() + "'")
.with_associated_id(id)
- .with_associated_key(id->src_uri_key()));
+ .with_associated_key(id->fetches_key()));
}
}
diff --git a/paludis/repositories/e/qa/extractors_TEST.cc b/paludis/repositories/e/qa/extractors_TEST.cc
index de07df3..ad042b1 100644
--- a/paludis/repositories/e/qa/extractors_TEST.cc
+++ b/paludis/repositories/e/qa/extractors_TEST.cc
@@ -64,7 +64,7 @@ namespace test_cases
env.package_database()->add_repository(1, repo);
tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
id->build_dependencies_key()->set_from_string("app-arch/unzip");
- id->src_uri_key()->set_from_string("foo.zip");
+ id->fetches_key()->set_from_string("foo.zip");
TestReporter r;
TEST_CHECK(extractors_check(FSEntry("/var/empty"), r, id, "spec keys"));
@@ -83,7 +83,7 @@ namespace test_cases
env.package_database()->add_repository(1, repo);
tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
id->build_dependencies_key()->set_from_string("app-misc/foo");
- id->src_uri_key()->set_from_string("foo.tar.bz2");
+ id->fetches_key()->set_from_string("foo.tar.bz2");
TestReporter r;
TEST_CHECK(extractors_check(FSEntry("/var/empty"), r, id, "spec keys"));
@@ -102,7 +102,7 @@ namespace test_cases
env.package_database()->add_repository(1, repo);
tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
id->build_dependencies_key()->set_from_string("oink? ( app-arch/unzip ) !oink? ( bar? ( app-arch/unzip ) foo? ( app-arch/unzip ) )");
- id->src_uri_key()->set_from_string("foo? ( foo.zip ) bar? ( baz? ( moo.zip ) )");
+ id->fetches_key()->set_from_string("foo? ( foo.zip ) bar? ( baz? ( moo.zip ) )");
TestReporter r;
TEST_CHECK(extractors_check(FSEntry("/var/empty"), r, id, "spec keys"));
@@ -122,7 +122,7 @@ namespace test_cases
env.package_database()->add_repository(1, repo);
tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
id->build_dependencies_key()->set_from_string("app-arch/blah");
- id->src_uri_key()->set_from_string("foo.zip");
+ id->fetches_key()->set_from_string("foo.zip");
TestReporter r;
TEST_CHECK(extractors_check(FSEntry("/var/empty"), r, id, "spec keys"));
@@ -141,7 +141,7 @@ namespace test_cases
env.package_database()->add_repository(1, repo);
tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
id->build_dependencies_key()->set_from_string("foo? ( baz? ( app-arch/unzip ) !baz? ( app-arch/unzip ) ) ");
- id->src_uri_key()->set_from_string("oink? ( a.zip ) !oink? ( bar? ( a.zip ) )");
+ id->fetches_key()->set_from_string("oink? ( a.zip ) !oink? ( bar? ( a.zip ) )");
TestReporter r;
TEST_CHECK(extractors_check(FSEntry("/var/empty"), r, id, "spec keys"));
diff --git a/paludis/repositories/e/vdb_id.cc b/paludis/repositories/e/vdb_id.cc
index 5b7b694..1db4906 100644
--- a/paludis/repositories/e/vdb_id.cc
+++ b/paludis/repositories/e/vdb_id.cc
@@ -468,13 +468,6 @@ VDBID::inherited_key() const
return _imp->inherited;
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> >
-VDBID::license_key() const
-{
- need_keys_added();
- return _imp->license;
-}
-
const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
VDBID::provide_key() const
{
@@ -517,7 +510,7 @@ VDBID::restrict_key() const
}
const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
-VDBID::src_uri_key() const
+VDBID::fetches_key() const
{
need_keys_added();
return _imp->src_uri;
diff --git a/paludis/repositories/e/vdb_id.hh b/paludis/repositories/e/vdb_id.hh
index 0d5d959..bd9310c 100644
--- a/paludis/repositories/e/vdb_id.hh
+++ b/paludis/repositories/e/vdb_id.hh
@@ -61,14 +61,13 @@ namespace paludis
virtual const tr1::shared_ptr<const MetadataPackageIDKey> virtual_for_key() const;
virtual const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> > keywords_key() const;
virtual const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> > iuse_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<RestrictSpecTree> > restrict_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > src_uri_key() const;
+ virtual const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> short_description_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> long_description_key() const;
diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc
index 2721a85..1e289d2 100644
--- a/paludis/repositories/fake/fake_package_id.cc
+++ b/paludis/repositories/fake/fake_package_id.cc
@@ -542,13 +542,13 @@ FakePackageID::suggested_dependencies_key()
}
const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
-FakePackageID::src_uri_key() const
+FakePackageID::fetches_key() const
{
return _imp->src_uri;
}
const tr1::shared_ptr<FakeMetadataSpecTreeKey<FetchableURISpecTree> >
-FakePackageID::src_uri_key()
+FakePackageID::fetches_key()
{
return _imp->src_uri;
}
diff --git a/paludis/repositories/fake/fake_package_id.hh b/paludis/repositories/fake/fake_package_id.hh
index 2b407d8..786f1e3 100644
--- a/paludis/repositories/fake/fake_package_id.hh
+++ b/paludis/repositories/fake/fake_package_id.hh
@@ -190,13 +190,12 @@ namespace paludis
virtual const tr1::shared_ptr<const MetadataPackageIDKey> virtual_for_key() const;
virtual const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> > keywords_key() const;
virtual const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> > iuse_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > src_uri_key() const;
+ virtual const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> short_description_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> long_description_key() const;
@@ -208,6 +207,7 @@ namespace paludis
virtual const tr1::shared_ptr<const MetadataPackageIDKey> contained_in_key() const;
virtual const tr1::shared_ptr<const MetadataFSEntryKey> fs_location_key() const;
+ const tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const;
const tr1::shared_ptr<FakeMetadataKeywordSetKey> keywords_key();
const tr1::shared_ptr<FakeMetadataIUseSetKey> iuse_key();
@@ -216,7 +216,7 @@ namespace paludis
const tr1::shared_ptr<FakeMetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key();
const tr1::shared_ptr<FakeMetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key();
const tr1::shared_ptr<FakeMetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key();
- const tr1::shared_ptr<FakeMetadataSpecTreeKey<FetchableURISpecTree> > src_uri_key();
+ const tr1::shared_ptr<FakeMetadataSpecTreeKey<FetchableURISpecTree> > fetches_key();
void set_slot(const SlotName &);
diff --git a/paludis/repositories/gems/gem_specification.cc b/paludis/repositories/gems/gem_specification.cc
index 6267ae0..6a6a180 100644
--- a/paludis/repositories/gems/gem_specification.cc
+++ b/paludis/repositories/gems/gem_specification.cc
@@ -409,12 +409,6 @@ GemSpecification::iuse_key() const
return tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> >();
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> >
-GemSpecification::license_key() const
-{
- return tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> >();
-}
-
const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
GemSpecification::provide_key() const
{
@@ -440,7 +434,7 @@ GemSpecification::post_dependencies_key() const
}
const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
-GemSpecification::src_uri_key() const
+GemSpecification::fetches_key() const
{
return tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >();
}
diff --git a/paludis/repositories/gems/gem_specification.hh b/paludis/repositories/gems/gem_specification.hh
index b443dae..6ee0811 100644
--- a/paludis/repositories/gems/gem_specification.hh
+++ b/paludis/repositories/gems/gem_specification.hh
@@ -93,13 +93,12 @@ namespace paludis
virtual const tr1::shared_ptr<const MetadataPackageIDKey> virtual_for_key() const;
virtual const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> > keywords_key() const;
virtual const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> > iuse_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > src_uri_key() const;
+ virtual const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> short_description_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> long_description_key() const;
diff --git a/paludis/repositories/virtuals/package_id.cc b/paludis/repositories/virtuals/package_id.cc
index afc74e7..678fc18 100644
--- a/paludis/repositories/virtuals/package_id.cc
+++ b/paludis/repositories/virtuals/package_id.cc
@@ -271,12 +271,6 @@ VirtualsPackageID::iuse_key() const
return tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> >();
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> >
-VirtualsPackageID::license_key() const
-{
- return tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> >();
-}
-
const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
VirtualsPackageID::provide_key() const
{
@@ -320,7 +314,7 @@ VirtualsPackageID::long_description_key() const
}
const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
-VirtualsPackageID::src_uri_key() const
+VirtualsPackageID::fetches_key() const
{
return tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >();
}
diff --git a/paludis/repositories/virtuals/package_id.hh b/paludis/repositories/virtuals/package_id.hh
index fa39b0d..9b5e64e 100644
--- a/paludis/repositories/virtuals/package_id.hh
+++ b/paludis/repositories/virtuals/package_id.hh
@@ -96,13 +96,12 @@ namespace paludis
virtual const tr1::shared_ptr<const MetadataPackageIDKey> virtual_for_key() const;
virtual const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> > keywords_key() const;
virtual const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> > iuse_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > src_uri_key() const;
+ virtual const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> short_description_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> long_description_key() const;