aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/ebuild_flat_metadata_cache.cc
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/repositories/e/ebuild_flat_metadata_cache.cc')
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache.cc352
1 files changed, 176 insertions, 176 deletions
diff --git a/paludis/repositories/e/ebuild_flat_metadata_cache.cc b/paludis/repositories/e/ebuild_flat_metadata_cache.cc
index 4e581ba..f7fbdf1 100644
--- a/paludis/repositories/e/ebuild_flat_metadata_cache.cc
+++ b/paludis/repositories/e/ebuild_flat_metadata_cache.cc
@@ -114,7 +114,7 @@ namespace
if (ok)
{
std::set<std::string> tokens;
- tokenise_whitespace(lines[m.inherited().flat_list_index()], std::inserter(tokens, tokens.begin()));
+ tokenise_whitespace(lines[m.inherited()->flat_list_index()], std::inserter(tokens, tokens.begin()));
FSEntry eclassdir((id->repository()->location_key()->value() / "eclass").realpath_if_exists());
for (std::set<std::string>::const_iterator it(tokens.begin()),
it_end(tokens.end()); it_end != it; ++it)
@@ -160,114 +160,114 @@ namespace
}
}
- if (-1 != m.dependencies().flat_list_index() && ! m.dependencies().name().empty())
+ if (-1 != m.dependencies()->flat_list_index() && ! m.dependencies()->name().empty())
{
DependenciesRewriter rewriter;
- parse_depend(lines.at(m.dependencies().flat_list_index()), _imp->env, id, *id->eapi())->root()->accept(rewriter);
- id->load_build_depend(m.dependencies().name() + ".DEPEND", m.dependencies().description() + " (build)", rewriter.depend());
- id->load_run_depend(m.dependencies().name() + ".RDEPEND", m.dependencies().description() + " (run)", rewriter.rdepend());
- id->load_post_depend(m.dependencies().name() + ".PDEPEND", m.dependencies().description() + " (post)", rewriter.pdepend());
+ parse_depend(lines.at(m.dependencies()->flat_list_index()), _imp->env, id, *id->eapi())->root()->accept(rewriter);
+ id->load_build_depend(m.dependencies()->name() + ".DEPEND", m.dependencies()->description() + " (build)", rewriter.depend());
+ id->load_run_depend(m.dependencies()->name() + ".RDEPEND", m.dependencies()->description() + " (run)", rewriter.rdepend());
+ id->load_post_depend(m.dependencies()->name() + ".PDEPEND", m.dependencies()->description() + " (post)", rewriter.pdepend());
}
- if (-1 != m.build_depend().flat_list_index() && ! m.build_depend().name().empty())
- id->load_build_depend(m.build_depend().name(), m.build_depend().description(), lines.at(m.build_depend().flat_list_index()));
+ if (-1 != m.build_depend()->flat_list_index() && ! m.build_depend()->name().empty())
+ id->load_build_depend(m.build_depend()->name(), m.build_depend()->description(), lines.at(m.build_depend()->flat_list_index()));
- if (-1 != m.run_depend().flat_list_index() && ! m.run_depend().name().empty())
- id->load_run_depend(m.run_depend().name(), m.run_depend().description(), lines.at(m.run_depend().flat_list_index()));
+ if (-1 != m.run_depend()->flat_list_index() && ! m.run_depend()->name().empty())
+ id->load_run_depend(m.run_depend()->name(), m.run_depend()->description(), lines.at(m.run_depend()->flat_list_index()));
- id->set_slot(SlotName(lines.at(m.slot().flat_list_index())));
+ id->set_slot(SlotName(lines.at(m.slot()->flat_list_index())));
- if (-1 != m.src_uri().flat_list_index() && ! m.src_uri().name().empty())
- id->load_src_uri(m.src_uri().name(), m.src_uri().description(), lines.at(m.src_uri().flat_list_index()));
+ if (-1 != m.src_uri()->flat_list_index() && ! m.src_uri()->name().empty())
+ id->load_src_uri(m.src_uri()->name(), m.src_uri()->description(), lines.at(m.src_uri()->flat_list_index()));
- if (-1 != m.restrictions().flat_list_index() && ! m.restrictions().name().empty())
- id->load_restrict(m.restrictions().name(), m.restrictions().description(), lines.at(m.restrictions().flat_list_index()));
+ if (-1 != m.restrictions()->flat_list_index() && ! m.restrictions()->name().empty())
+ id->load_restrict(m.restrictions()->name(), m.restrictions()->description(), lines.at(m.restrictions()->flat_list_index()));
- if (-1 != m.properties().flat_list_index() && ! m.properties().name().empty())
- id->load_properties(m.properties().name(), m.properties().description(), lines.at(m.properties().flat_list_index()));
+ if (-1 != m.properties()->flat_list_index() && ! m.properties()->name().empty())
+ id->load_properties(m.properties()->name(), m.properties()->description(), lines.at(m.properties()->flat_list_index()));
- if (-1 != m.homepage().flat_list_index() && ! m.homepage().name().empty())
- id->load_homepage(m.homepage().name(), m.homepage().description(), lines.at(m.homepage().flat_list_index()));
+ if (-1 != m.homepage()->flat_list_index() && ! m.homepage()->name().empty())
+ id->load_homepage(m.homepage()->name(), m.homepage()->description(), lines.at(m.homepage()->flat_list_index()));
- if (-1 != m.license().flat_list_index() && ! m.license().name().empty())
- id->load_license(m.license().name(), m.license().description(), lines.at(m.license().flat_list_index()));
+ if (-1 != m.license()->flat_list_index() && ! m.license()->name().empty())
+ id->load_license(m.license()->name(), m.license()->description(), lines.at(m.license()->flat_list_index()));
- if (-1 != m.short_description().flat_list_index() && ! m.short_description().name().empty())
- id->load_short_description(m.short_description().name(),
- m.short_description().description(),
- lines.at(m.short_description().flat_list_index()));
+ if (-1 != m.short_description()->flat_list_index() && ! m.short_description()->name().empty())
+ id->load_short_description(m.short_description()->name(),
+ m.short_description()->description(),
+ lines.at(m.short_description()->flat_list_index()));
- if (-1 != m.long_description().flat_list_index() && ! m.long_description().name().empty())
+ if (-1 != m.long_description()->flat_list_index() && ! m.long_description()->name().empty())
{
- std::string value(lines.at(m.long_description().flat_list_index()));
+ std::string value(lines.at(m.long_description()->flat_list_index()));
if (! value.empty())
- id->load_long_description(m.long_description().name(),
- m.long_description().description(), value);
+ id->load_long_description(m.long_description()->name(),
+ m.long_description()->description(), value);
}
- if (-1 != m.keywords().flat_list_index() && ! m.keywords().name().empty())
- id->load_keywords(m.keywords().name(), m.keywords().description(), lines.at(m.keywords().flat_list_index()));
+ if (-1 != m.keywords()->flat_list_index() && ! m.keywords()->name().empty())
+ id->load_keywords(m.keywords()->name(), m.keywords()->description(), lines.at(m.keywords()->flat_list_index()));
- if (-1 != m.inherited().flat_list_index() && ! m.inherited().name().empty())
- id->load_inherited(m.inherited().name(), m.inherited().description(), lines.at(m.inherited().flat_list_index()));
+ if (-1 != m.inherited()->flat_list_index() && ! m.inherited()->name().empty())
+ id->load_inherited(m.inherited()->name(), m.inherited()->description(), lines.at(m.inherited()->flat_list_index()));
- if (-1 != m.defined_phases().flat_list_index() && ! m.defined_phases().name().empty())
- if (! lines.at(m.defined_phases().flat_list_index()).empty())
- id->load_defined_phases(m.defined_phases().name(), m.defined_phases().description(), lines.at(m.defined_phases().flat_list_index()));
+ if (-1 != m.defined_phases()->flat_list_index() && ! m.defined_phases()->name().empty())
+ if (! lines.at(m.defined_phases()->flat_list_index()).empty())
+ id->load_defined_phases(m.defined_phases()->name(), m.defined_phases()->description(), lines.at(m.defined_phases()->flat_list_index()));
- if (-1 != m.iuse().flat_list_index() && ! m.iuse().name().empty())
- id->load_iuse(m.iuse().name(), m.iuse().description(), lines.at(m.iuse().flat_list_index()));
+ if (-1 != m.iuse()->flat_list_index() && ! m.iuse()->name().empty())
+ id->load_iuse(m.iuse()->name(), m.iuse()->description(), lines.at(m.iuse()->flat_list_index()));
- if (-1 != m.myoptions().flat_list_index() && ! m.myoptions().name().empty())
- id->load_myoptions(m.myoptions().name(), m.myoptions().description(), lines.at(m.myoptions().flat_list_index()));
+ if (-1 != m.myoptions()->flat_list_index() && ! m.myoptions()->name().empty())
+ id->load_myoptions(m.myoptions()->name(), m.myoptions()->description(), lines.at(m.myoptions()->flat_list_index()));
- if (-1 != m.pdepend().flat_list_index() && ! m.pdepend().name().empty())
- id->load_post_depend(m.pdepend().name(), m.pdepend().description(), lines.at(m.pdepend().flat_list_index()));
+ if (-1 != m.pdepend()->flat_list_index() && ! m.pdepend()->name().empty())
+ id->load_post_depend(m.pdepend()->name(), m.pdepend()->description(), lines.at(m.pdepend()->flat_list_index()));
- if (-1 != m.provide().flat_list_index() && ! m.provide().name().empty())
- id->load_provide(m.provide().name(), m.provide().description(), lines.at(m.provide().flat_list_index()));
+ if (-1 != m.provide()->flat_list_index() && ! m.provide()->name().empty())
+ id->load_provide(m.provide()->name(), m.provide()->description(), lines.at(m.provide()->flat_list_index()));
- if (-1 != m.use().flat_list_index() && ! m.use().name().empty())
- id->load_use(m.use().name(), m.use().description(), lines.at(m.use().flat_list_index()));
+ if (-1 != m.use()->flat_list_index() && ! m.use()->name().empty())
+ id->load_use(m.use()->name(), m.use()->description(), lines.at(m.use()->flat_list_index()));
- if (-1 != m.upstream_changelog().flat_list_index() && ! m.upstream_changelog().name().empty())
+ if (-1 != m.upstream_changelog()->flat_list_index() && ! m.upstream_changelog()->name().empty())
{
- std::string value(lines.at(m.upstream_changelog().flat_list_index()));
+ std::string value(lines.at(m.upstream_changelog()->flat_list_index()));
if (! value.empty())
- id->load_upstream_changelog(m.upstream_changelog().name(),
- m.upstream_changelog().description(), value);
+ id->load_upstream_changelog(m.upstream_changelog()->name(),
+ m.upstream_changelog()->description(), value);
}
- if (-1 != m.upstream_documentation().flat_list_index() && ! m.upstream_documentation().name().empty())
+ if (-1 != m.upstream_documentation()->flat_list_index() && ! m.upstream_documentation()->name().empty())
{
- std::string value(lines.at(m.upstream_documentation().flat_list_index()));
+ std::string value(lines.at(m.upstream_documentation()->flat_list_index()));
if (! value.empty())
- id->load_upstream_documentation(m.upstream_documentation().name(),
- m.upstream_documentation().description(), value);
+ id->load_upstream_documentation(m.upstream_documentation()->name(),
+ m.upstream_documentation()->description(), value);
}
- if (-1 != m.upstream_release_notes().flat_list_index() && ! m.upstream_release_notes().name().empty())
+ if (-1 != m.upstream_release_notes()->flat_list_index() && ! m.upstream_release_notes()->name().empty())
{
- std::string value(lines.at(m.upstream_release_notes().flat_list_index()));
+ std::string value(lines.at(m.upstream_release_notes()->flat_list_index()));
if (! value.empty())
- id->load_upstream_release_notes(m.upstream_release_notes().name(),
- m.upstream_release_notes().description(), value);
+ id->load_upstream_release_notes(m.upstream_release_notes()->name(),
+ m.upstream_release_notes()->description(), value);
}
- if (-1 != m.bugs_to().flat_list_index() && ! m.bugs_to().name().empty())
+ if (-1 != m.bugs_to()->flat_list_index() && ! m.bugs_to()->name().empty())
{
- std::string value(lines.at(m.bugs_to().flat_list_index()));
+ std::string value(lines.at(m.bugs_to()->flat_list_index()));
if (! value.empty())
- id->load_bugs_to(m.bugs_to().name(),
- m.bugs_to().description(), value);
+ id->load_bugs_to(m.bugs_to()->name(),
+ m.bugs_to()->description(), value);
}
- if (-1 != m.remote_ids().flat_list_index() && ! m.remote_ids().name().empty())
+ if (-1 != m.remote_ids()->flat_list_index() && ! m.remote_ids()->name().empty())
{
- std::string value(lines.at(m.remote_ids().flat_list_index()));
+ std::string value(lines.at(m.remote_ids()->flat_list_index()));
if (! value.empty())
- id->load_remote_ids(m.remote_ids().name(),
- m.remote_ids().description(), value);
+ id->load_remote_ids(m.remote_ids()->name(),
+ m.remote_ids()->description(), value);
}
}
else
@@ -474,55 +474,55 @@ EbuildFlatMetadataCache::load(const std::tr1::shared_ptr<const EbuildID> & id)
}
}
- if (! m.dependencies().name().empty())
+ if (! m.dependencies()->name().empty())
{
DependenciesRewriter rewriter;
- parse_depend(keys[m.dependencies().name()], _imp->env, id, *id->eapi())->root()->accept(rewriter);
- id->load_build_depend(m.dependencies().name() + ".DEPEND", m.dependencies().description() + " (build)", rewriter.depend());
- id->load_run_depend(m.dependencies().name() + ".RDEPEND", m.dependencies().description() + " (run)", rewriter.rdepend());
- id->load_post_depend(m.dependencies().name() + ".PDEPEND", m.dependencies().description() + " (post)", rewriter.pdepend());
+ parse_depend(keys[m.dependencies()->name()], _imp->env, id, *id->eapi())->root()->accept(rewriter);
+ id->load_build_depend(m.dependencies()->name() + ".DEPEND", m.dependencies()->description() + " (build)", rewriter.depend());
+ id->load_run_depend(m.dependencies()->name() + ".RDEPEND", m.dependencies()->description() + " (run)", rewriter.rdepend());
+ id->load_post_depend(m.dependencies()->name() + ".PDEPEND", m.dependencies()->description() + " (post)", rewriter.pdepend());
}
- if (! m.build_depend().name().empty())
- id->load_build_depend(m.build_depend().name(), m.build_depend().description(), keys[m.build_depend().name()]);
+ if (! m.build_depend()->name().empty())
+ id->load_build_depend(m.build_depend()->name(), m.build_depend()->description(), keys[m.build_depend()->name()]);
- if (! m.run_depend().name().empty())
- id->load_run_depend(m.run_depend().name(), m.run_depend().description(), keys[m.run_depend().name()]);
+ if (! m.run_depend()->name().empty())
+ id->load_run_depend(m.run_depend()->name(), m.run_depend()->description(), keys[m.run_depend()->name()]);
- id->set_slot(SlotName(keys[m.slot().name()]));
+ id->set_slot(SlotName(keys[m.slot()->name()]));
- if (! m.src_uri().name().empty())
- id->load_src_uri(m.src_uri().name(), m.src_uri().description(), keys[m.src_uri().name()]);
+ if (! m.src_uri()->name().empty())
+ id->load_src_uri(m.src_uri()->name(), m.src_uri()->description(), keys[m.src_uri()->name()]);
- if (! m.restrictions().name().empty())
- id->load_restrict(m.restrictions().name(), m.restrictions().description(), keys[m.restrictions().name()]);
+ if (! m.restrictions()->name().empty())
+ id->load_restrict(m.restrictions()->name(), m.restrictions()->description(), keys[m.restrictions()->name()]);
- if (! m.properties().name().empty())
- id->load_properties(m.properties().name(), m.properties().description(), keys[m.properties().name()]);
+ if (! m.properties()->name().empty())
+ id->load_properties(m.properties()->name(), m.properties()->description(), keys[m.properties()->name()]);
- if (! m.homepage().name().empty())
- id->load_homepage(m.homepage().name(), m.homepage().description(), keys[m.homepage().name()]);
+ if (! m.homepage()->name().empty())
+ id->load_homepage(m.homepage()->name(), m.homepage()->description(), keys[m.homepage()->name()]);
- if (! m.license().name().empty())
- id->load_license(m.license().name(), m.license().description(), keys[m.license().name()]);
+ if (! m.license()->name().empty())
+ id->load_license(m.license()->name(), m.license()->description(), keys[m.license()->name()]);
- if (! m.short_description().name().empty())
- id->load_short_description(m.short_description().name(),
- m.short_description().description(),
- keys[m.short_description().name()]);
+ if (! m.short_description()->name().empty())
+ id->load_short_description(m.short_description()->name(),
+ m.short_description()->description(),
+ keys[m.short_description()->name()]);
- if (! m.long_description().name().empty())
+ if (! m.long_description()->name().empty())
{
- std::string value(keys[m.long_description().name()]);
+ std::string value(keys[m.long_description()->name()]);
if (! value.empty())
- id->load_long_description(m.long_description().name(),
- m.long_description().description(), value);
+ id->load_long_description(m.long_description()->name(),
+ m.long_description()->description(), value);
}
- if (! m.keywords().name().empty())
- id->load_keywords(m.keywords().name(), m.keywords().description(), keys[m.keywords().name()]);
+ if (! m.keywords()->name().empty())
+ id->load_keywords(m.keywords()->name(), m.keywords()->description(), keys[m.keywords()->name()]);
- if (! m.inherited().name().empty())
+ if (! m.inherited()->name().empty())
{
std::vector<std::string> full, brief;
if (id->eapi()->supported()->ebuild_options()->support_eclasses())
@@ -536,66 +536,66 @@ EbuildFlatMetadataCache::load(const std::tr1::shared_ptr<const EbuildID> & id)
if (std::string::npos != (++it)->find('/'))
++it;
}
- id->load_inherited(m.inherited().name(), m.inherited().description(), join(brief.begin(), brief.end(), " "));
+ id->load_inherited(m.inherited()->name(), m.inherited()->description(), join(brief.begin(), brief.end(), " "));
}
- if (! m.defined_phases().name().empty())
- if (! keys[m.defined_phases().name()].empty())
- id->load_defined_phases(m.defined_phases().name(), m.defined_phases().description(), keys[m.defined_phases().name()]);
+ if (! m.defined_phases()->name().empty())
+ if (! keys[m.defined_phases()->name()].empty())
+ id->load_defined_phases(m.defined_phases()->name(), m.defined_phases()->description(), keys[m.defined_phases()->name()]);
- if (! m.iuse().name().empty())
- id->load_iuse(m.iuse().name(), m.iuse().description(), keys[m.iuse().name()]);
+ if (! m.iuse()->name().empty())
+ id->load_iuse(m.iuse()->name(), m.iuse()->description(), keys[m.iuse()->name()]);
- if (! m.myoptions().name().empty())
- id->load_myoptions(m.myoptions().name(), m.myoptions().description(), keys[m.myoptions().name()]);
+ if (! m.myoptions()->name().empty())
+ id->load_myoptions(m.myoptions()->name(), m.myoptions()->description(), keys[m.myoptions()->name()]);
- if (! m.pdepend().name().empty())
- id->load_post_depend(m.pdepend().name(), m.pdepend().description(), keys[m.pdepend().name()]);
+ if (! m.pdepend()->name().empty())
+ id->load_post_depend(m.pdepend()->name(), m.pdepend()->description(), keys[m.pdepend()->name()]);
- if (! m.provide().name().empty())
- id->load_provide(m.provide().name(), m.provide().description(), keys[m.provide().name()]);
+ if (! m.provide()->name().empty())
+ id->load_provide(m.provide()->name(), m.provide()->description(), keys[m.provide()->name()]);
- if (! m.use().name().empty())
- id->load_use(m.use().name(), m.use().description(), keys[m.use().name()]);
+ if (! m.use()->name().empty())
+ id->load_use(m.use()->name(), m.use()->description(), keys[m.use()->name()]);
- if (! m.upstream_changelog().name().empty())
+ if (! m.upstream_changelog()->name().empty())
{
- std::string value(keys[m.upstream_changelog().name()]);
+ std::string value(keys[m.upstream_changelog()->name()]);
if (! value.empty())
- id->load_upstream_changelog(m.upstream_changelog().name(),
- m.upstream_changelog().description(), value);
+ id->load_upstream_changelog(m.upstream_changelog()->name(),
+ m.upstream_changelog()->description(), value);
}
- if (! m.upstream_documentation().name().empty())
+ if (! m.upstream_documentation()->name().empty())
{
- std::string value(keys[m.upstream_documentation().name()]);
+ std::string value(keys[m.upstream_documentation()->name()]);
if (! value.empty())
- id->load_upstream_documentation(m.upstream_documentation().name(),
- m.upstream_documentation().description(), value);
+ id->load_upstream_documentation(m.upstream_documentation()->name(),
+ m.upstream_documentation()->description(), value);
}
- if (! m.upstream_release_notes().name().empty())
+ if (! m.upstream_release_notes()->name().empty())
{
- std::string value(keys[m.upstream_release_notes().name()]);
+ std::string value(keys[m.upstream_release_notes()->name()]);
if (! value.empty())
- id->load_upstream_release_notes(m.upstream_release_notes().name(),
- m.upstream_release_notes().description(), value);
+ id->load_upstream_release_notes(m.upstream_release_notes()->name(),
+ m.upstream_release_notes()->description(), value);
}
- if (! m.bugs_to().name().empty())
+ if (! m.bugs_to()->name().empty())
{
- std::string value(keys[m.bugs_to().name()]);
+ std::string value(keys[m.bugs_to()->name()]);
if (! value.empty())
- id->load_bugs_to(m.bugs_to().name(),
- m.bugs_to().description(), value);
+ id->load_bugs_to(m.bugs_to()->name(),
+ m.bugs_to()->description(), value);
}
- if (! m.remote_ids().name().empty())
+ if (! m.remote_ids()->name().empty())
{
- std::string value(keys[m.remote_ids().name()]);
+ std::string value(keys[m.remote_ids()->name()]);
if (! value.empty())
- id->load_remote_ids(m.remote_ids().name(),
- m.remote_ids().description(), value);
+ id->load_remote_ids(m.remote_ids()->name(),
+ m.remote_ids()->description(), value);
}
}
else
@@ -713,7 +713,7 @@ EbuildFlatMetadataCache::save(const std::tr1::shared_ptr<const EbuildID> & id)
{
const EAPIEbuildMetadataVariables & m(*id->eapi()->supported()->ebuild_metadata_variables());
- if (! m.dependencies().name().empty())
+ if (! m.dependencies()->name().empty())
{
std::string s;
@@ -724,75 +724,75 @@ EbuildFlatMetadataCache::save(const std::tr1::shared_ptr<const EbuildID> & id)
if (id->post_dependencies_key())
s.append(flatten(id->post_dependencies_key()->value()) + " ");
- write_kv(cache, m.dependencies().name(), s);
+ write_kv(cache, m.dependencies()->name(), s);
}
- if (! m.use().name().empty() && id->raw_use_key())
- write_kv(cache, m.use().name(), join(id->raw_use_key()->value()->begin(), id->raw_use_key()->value()->end(), " "));
+ if (! m.use()->name().empty() && id->raw_use_key())
+ write_kv(cache, m.use()->name(), join(id->raw_use_key()->value()->begin(), id->raw_use_key()->value()->end(), " "));
- if (! m.build_depend().name().empty() && id->build_dependencies_key())
- write_kv(cache, m.build_depend().name(), flatten(id->build_dependencies_key()->value()));
+ if (! m.build_depend()->name().empty() && id->build_dependencies_key())
+ write_kv(cache, m.build_depend()->name(), flatten(id->build_dependencies_key()->value()));
- if (! m.run_depend().name().empty() && id->run_dependencies_key())
- write_kv(cache, m.run_depend().name(), flatten(id->run_dependencies_key()->value()));
+ if (! m.run_depend()->name().empty() && id->run_dependencies_key())
+ write_kv(cache, m.run_depend()->name(), flatten(id->run_dependencies_key()->value()));
- write_kv(cache, m.slot().name(), normalise(id->slot()));
+ write_kv(cache, m.slot()->name(), normalise(id->slot()));
- if (! m.src_uri().name().empty() && id->fetches_key())
- write_kv(cache, m.src_uri().name(), flatten(id->fetches_key()->value()));
+ if (! m.src_uri()->name().empty() && id->fetches_key())
+ write_kv(cache, m.src_uri()->name(), flatten(id->fetches_key()->value()));
- if (! m.restrictions().name().empty() && id->restrict_key())
- write_kv(cache, m.restrictions().name(), flatten(id->restrict_key()->value()));
+ if (! m.restrictions()->name().empty() && id->restrict_key())
+ write_kv(cache, m.restrictions()->name(), flatten(id->restrict_key()->value()));
- if (! m.properties().name().empty() && id->properties_key())
- write_kv(cache, m.properties().name(), flatten(id->properties_key()->value()));
+ if (! m.properties()->name().empty() && id->properties_key())
+ write_kv(cache, m.properties()->name(), flatten(id->properties_key()->value()));
- if (! m.homepage().name().empty() && id->homepage_key())
- write_kv(cache, m.homepage().name(), flatten(id->homepage_key()->value()));
+ if (! m.homepage()->name().empty() && id->homepage_key())
+ write_kv(cache, m.homepage()->name(), flatten(id->homepage_key()->value()));
- if (! m.license().name().empty() && id->license_key())
- write_kv(cache, m.license().name(), flatten(id->license_key()->value()));
+ if (! m.license()->name().empty() && id->license_key())
+ write_kv(cache, m.license()->name(), flatten(id->license_key()->value()));
- if (! m.short_description().name().empty() && id->short_description_key())
- write_kv(cache, m.short_description().name(), normalise(id->short_description_key()->value()));
+ if (! m.short_description()->name().empty() && id->short_description_key())
+ write_kv(cache, m.short_description()->name(), normalise(id->short_description_key()->value()));
- if (! m.keywords().name().empty() && id->keywords_key())
- write_kv(cache, m.keywords().name(), join(id->keywords_key()->value()->begin(), id->keywords_key()->value()->end(), " "));
+ if (! m.keywords()->name().empty() && id->keywords_key())
+ write_kv(cache, m.keywords()->name(), join(id->keywords_key()->value()->begin(), id->keywords_key()->value()->end(), " "));
- if (! m.iuse().name().empty() && id->raw_iuse_key())
- write_kv(cache, m.iuse().name(), join(id->raw_iuse_key()->value()->begin(), id->raw_iuse_key()->value()->end(), " "));
+ if (! m.iuse()->name().empty() && id->raw_iuse_key())
+ write_kv(cache, m.iuse()->name(), join(id->raw_iuse_key()->value()->begin(), id->raw_iuse_key()->value()->end(), " "));
- if (! m.myoptions().name().empty() && id->raw_myoptions_key())
- write_kv(cache, m.myoptions().name(), flatten(id->raw_myoptions_key()->value()));
+ if (! m.myoptions()->name().empty() && id->raw_myoptions_key())
+ write_kv(cache, m.myoptions()->name(), flatten(id->raw_myoptions_key()->value()));
- if (! m.pdepend().name().empty() && id->post_dependencies_key())
- write_kv(cache, m.pdepend().name(), flatten(id->post_dependencies_key()->value()));
+ if (! m.pdepend()->name().empty() && id->post_dependencies_key())
+ write_kv(cache, m.pdepend()->name(), flatten(id->post_dependencies_key()->value()));
- if (! m.provide().name().empty() && id->provide_key())
- write_kv(cache, m.provide().name(), flatten(id->provide_key()->value()));
+ if (! m.provide()->name().empty() && id->provide_key())
+ write_kv(cache, m.provide()->name(), flatten(id->provide_key()->value()));
write_kv(cache, "EAPI", normalise(id->eapi()->name()));
- if (! m.long_description().name().empty() && id->long_description_key())
- write_kv(cache, m.long_description().name(), normalise(id->long_description_key()->value()));
+ if (! m.long_description()->name().empty() && id->long_description_key())
+ write_kv(cache, m.long_description()->name(), normalise(id->long_description_key()->value()));
- if (! m.bugs_to().name().empty() && id->bugs_to_key())
- write_kv(cache, m.bugs_to().name(), flatten(id->bugs_to_key()->value()));
+ if (! m.bugs_to()->name().empty() && id->bugs_to_key())
+ write_kv(cache, m.bugs_to()->name(), flatten(id->bugs_to_key()->value()));
- if (! m.remote_ids().name().empty() && id->remote_ids_key())
- write_kv(cache, m.remote_ids().name(), flatten(id->remote_ids_key()->value()));
+ if (! m.remote_ids()->name().empty() && id->remote_ids_key())
+ write_kv(cache, m.remote_ids()->name(), flatten(id->remote_ids_key()->value()));
- if (! m.upstream_changelog().name().empty() && id->upstream_changelog_key())
- write_kv(cache, m.upstream_changelog().name(), flatten(id->upstream_changelog_key()->value()));
+ if (! m.upstream_changelog()->name().empty() && id->upstream_changelog_key())
+ write_kv(cache, m.upstream_changelog()->name(), flatten(id->upstream_changelog_key()->value()));
- if (! m.upstream_documentation().name().empty() && id->upstream_documentation_key())
- write_kv(cache, m.upstream_documentation().name(), flatten(id->upstream_documentation_key()->value()));
+ if (! m.upstream_documentation()->name().empty() && id->upstream_documentation_key())
+ write_kv(cache, m.upstream_documentation()->name(), flatten(id->upstream_documentation_key()->value()));
- if (! m.upstream_release_notes().name().empty() && id->upstream_release_notes_key())
- write_kv(cache, m.upstream_release_notes().name(), flatten(id->upstream_release_notes_key()->value()));
+ if (! m.upstream_release_notes()->name().empty() && id->upstream_release_notes_key())
+ write_kv(cache, m.upstream_release_notes()->name(), flatten(id->upstream_release_notes_key()->value()));
- if (! m.defined_phases().name().empty() && id->defined_phases_key())
- write_kv(cache, m.defined_phases().name(), join(id->defined_phases_key()->value()->begin(),
+ if (! m.defined_phases()->name().empty() && id->defined_phases_key())
+ write_kv(cache, m.defined_phases()->name(), join(id->defined_phases_key()->value()->begin(),
id->defined_phases_key()->value()->end(), " "));
}
catch (const InternalError &)