aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-01-18 19:51:17 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-01-18 19:51:17 +0000
commitcfbe6ed8eb60a9096d32856a8442a477137edb96 (patch)
tree5decb5cf44f1e97256c089f20302e026f3acfa0c
parenta3686c5c4eabc36c30b95d8ec375ec96cf074a47 (diff)
downloadpaludis-cfbe6ed8eb60a9096d32856a8442a477137edb96.tar.gz
paludis-cfbe6ed8eb60a9096d32856a8442a477137edb96.tar.xz
Store metadata var info in sptrs
-rw-r--r--paludis/repositories/e/e_installed_repository_id.cc218
-rw-r--r--paludis/repositories/e/eapi.cc14
-rw-r--r--paludis/repositories/e/eapi.hh56
-rw-r--r--paludis/repositories/e/ebuild.cc124
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache.cc352
-rw-r--r--paludis/repositories/e/ebuild_id.cc8
-rw-r--r--paludis/repositories/e/pipe_command_handler.cc8
7 files changed, 390 insertions, 390 deletions
diff --git a/paludis/repositories/e/e_installed_repository_id.cc b/paludis/repositories/e/e_installed_repository_id.cc
index 0940e4e..fa90edc 100644
--- a/paludis/repositories/e/e_installed_repository_id.cc
+++ b/paludis/repositories/e/e_installed_repository_id.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -193,249 +193,249 @@ EInstalledRepositoryID::need_keys_added() const
add_metadata_key(_imp->raw_use);
}
- if (! vars->inherited().name().empty())
- if ((_imp->dir / vars->inherited().name()).exists())
+ if (! vars->inherited()->name().empty())
+ if ((_imp->dir / vars->inherited()->name()).exists())
{
- _imp->inherited.reset(new EStringSetKey(shared_from_this(), vars->inherited().name(), vars->inherited().description(),
- file_contents(_imp->dir / vars->inherited().name()), mkt_internal));
+ _imp->inherited.reset(new EStringSetKey(shared_from_this(), vars->inherited()->name(), vars->inherited()->description(),
+ file_contents(_imp->dir / vars->inherited()->name()), mkt_internal));
add_metadata_key(_imp->inherited);
}
- if (! vars->defined_phases().name().empty())
- if ((_imp->dir / vars->defined_phases().name()).exists())
+ if (! vars->defined_phases()->name().empty())
+ if ((_imp->dir / vars->defined_phases()->name()).exists())
{
- std::string d(file_contents(_imp->dir / vars->defined_phases().name()));
+ std::string d(file_contents(_imp->dir / vars->defined_phases()->name()));
if (! d.empty())
{
- _imp->defined_phases.reset(new EStringSetKey(shared_from_this(), vars->defined_phases().name(), vars->defined_phases().description(),
+ _imp->defined_phases.reset(new EStringSetKey(shared_from_this(), vars->defined_phases()->name(), vars->defined_phases()->description(),
d, mkt_internal));
add_metadata_key(_imp->defined_phases);
}
}
- if (! vars->iuse().name().empty())
+ if (! vars->iuse()->name().empty())
{
- if ((_imp->dir / vars->iuse().name()).exists())
- _imp->raw_iuse.reset(new EStringSetKey(shared_from_this(), vars->iuse().name(), vars->iuse().description(),
- file_contents(_imp->dir / vars->iuse().name()), mkt_internal));
+ if ((_imp->dir / vars->iuse()->name()).exists())
+ _imp->raw_iuse.reset(new EStringSetKey(shared_from_this(), vars->iuse()->name(), vars->iuse()->description(),
+ file_contents(_imp->dir / vars->iuse()->name()), mkt_internal));
else
{
/* hack: if IUSE doesn't exist, we still need an iuse_key to make the choices
* code behave sanely. */
- _imp->raw_iuse.reset(new EStringSetKey(shared_from_this(), vars->iuse().name(), vars->iuse().description(),
+ _imp->raw_iuse.reset(new EStringSetKey(shared_from_this(), vars->iuse()->name(), vars->iuse()->description(),
"", mkt_internal));
}
add_metadata_key(_imp->raw_iuse);
}
- if (! vars->myoptions().name().empty())
- if ((_imp->dir / vars->myoptions().name()).exists())
+ if (! vars->myoptions()->name().empty())
+ if ((_imp->dir / vars->myoptions()->name()).exists())
{
- _imp->raw_myoptions.reset(new EMyOptionsKey(_imp->environment, shared_from_this(), vars->myoptions().name(),
- vars->myoptions().description(), file_contents(_imp->dir / vars->myoptions().name()), mkt_internal));
+ _imp->raw_myoptions.reset(new EMyOptionsKey(_imp->environment, shared_from_this(), vars->myoptions()->name(),
+ vars->myoptions()->description(), file_contents(_imp->dir / vars->myoptions()->name()), mkt_internal));
add_metadata_key(_imp->raw_myoptions);
}
- if (! vars->use_expand().name().empty())
- if ((_imp->dir / vars->use_expand().name()).exists())
+ if (! vars->use_expand()->name().empty())
+ if ((_imp->dir / vars->use_expand()->name()).exists())
{
- _imp->raw_use_expand.reset(new EStringSetKey(shared_from_this(), vars->use_expand().name(), vars->use_expand().description(),
- file_contents(_imp->dir / vars->use_expand().name()), mkt_internal));
+ _imp->raw_use_expand.reset(new EStringSetKey(shared_from_this(), vars->use_expand()->name(), vars->use_expand()->description(),
+ file_contents(_imp->dir / vars->use_expand()->name()), mkt_internal));
add_metadata_key(_imp->raw_use_expand);
}
- if (! vars->use_expand_hidden().name().empty())
- if ((_imp->dir / vars->use_expand_hidden().name()).exists())
+ if (! vars->use_expand_hidden()->name().empty())
+ if ((_imp->dir / vars->use_expand_hidden()->name()).exists())
{
- _imp->raw_use_expand_hidden.reset(new EStringSetKey(shared_from_this(), vars->use_expand_hidden().name(), vars->use_expand_hidden().description(),
- file_contents(_imp->dir / vars->use_expand_hidden().name()), mkt_internal));
+ _imp->raw_use_expand_hidden.reset(new EStringSetKey(shared_from_this(), vars->use_expand_hidden()->name(), vars->use_expand_hidden()->description(),
+ file_contents(_imp->dir / vars->use_expand_hidden()->name()), mkt_internal));
add_metadata_key(_imp->raw_use_expand_hidden);
}
- if (! vars->license().name().empty())
- if ((_imp->dir / vars->license().name()).exists())
+ if (! vars->license()->name().empty())
+ if ((_imp->dir / vars->license()->name()).exists())
{
- _imp->license.reset(new ELicenseKey(_imp->environment, shared_from_this(), vars->license().name(), vars->license().description(),
- file_contents(_imp->dir / vars->license().name()), mkt_normal));
+ _imp->license.reset(new ELicenseKey(_imp->environment, shared_from_this(), vars->license()->name(), vars->license()->description(),
+ file_contents(_imp->dir / vars->license()->name()), mkt_normal));
add_metadata_key(_imp->license);
}
- if (! vars->provide().name().empty())
- if ((_imp->dir / vars->provide().name()).exists())
+ if (! vars->provide()->name().empty())
+ if ((_imp->dir / vars->provide()->name()).exists())
{
- _imp->provide.reset(new EProvideKey(_imp->environment, shared_from_this(), vars->provide().name(), vars->provide().description(),
- file_contents(_imp->dir / vars->provide().name()), mkt_internal));
+ _imp->provide.reset(new EProvideKey(_imp->environment, shared_from_this(), vars->provide()->name(), vars->provide()->description(),
+ file_contents(_imp->dir / vars->provide()->name()), mkt_internal));
add_metadata_key(_imp->provide);
}
- if (! vars->dependencies().name().empty())
+ if (! vars->dependencies()->name().empty())
{
- if ((_imp->dir / vars->dependencies().name()).exists())
+ if ((_imp->dir / vars->dependencies()->name()).exists())
{
DependenciesRewriter rewriter;
- parse_depend(file_contents(_imp->dir / vars->dependencies().name()), _imp->environment, shared_from_this(), *eapi())->root()->accept(rewriter);
+ parse_depend(file_contents(_imp->dir / vars->dependencies()->name()), _imp->environment, shared_from_this(), *eapi())->root()->accept(rewriter);
- _imp->build_dependencies.reset(new EDependenciesKey(_imp->environment, shared_from_this(), vars->dependencies().name() + ".DEPEND",
- vars->dependencies().description() + " (build)", rewriter.depend(), _imp->build_dependencies_labels, mkt_dependencies));
+ _imp->build_dependencies.reset(new EDependenciesKey(_imp->environment, shared_from_this(), vars->dependencies()->name() + ".DEPEND",
+ vars->dependencies()->description() + " (build)", rewriter.depend(), _imp->build_dependencies_labels, mkt_dependencies));
add_metadata_key(_imp->build_dependencies);
- _imp->run_dependencies.reset(new EDependenciesKey(_imp->environment, shared_from_this(), vars->dependencies().name() + ".RDEPEND",
- vars->dependencies().description() + " (run)", rewriter.rdepend(), _imp->build_dependencies_labels, mkt_dependencies));
+ _imp->run_dependencies.reset(new EDependenciesKey(_imp->environment, shared_from_this(), vars->dependencies()->name() + ".RDEPEND",
+ vars->dependencies()->description() + " (run)", rewriter.rdepend(), _imp->build_dependencies_labels, mkt_dependencies));
add_metadata_key(_imp->run_dependencies);
- _imp->post_dependencies.reset(new EDependenciesKey(_imp->environment, shared_from_this(), vars->dependencies().name() + ".PDEPEND",
- vars->dependencies().description() + " (post)", rewriter.pdepend(), _imp->build_dependencies_labels, mkt_dependencies));
+ _imp->post_dependencies.reset(new EDependenciesKey(_imp->environment, shared_from_this(), vars->dependencies()->name() + ".PDEPEND",
+ vars->dependencies()->description() + " (post)", rewriter.pdepend(), _imp->build_dependencies_labels, mkt_dependencies));
add_metadata_key(_imp->post_dependencies);
}
}
else
{
- if (! vars->build_depend().name().empty())
- if ((_imp->dir / vars->build_depend().name()).exists())
+ if (! vars->build_depend()->name().empty())
+ if ((_imp->dir / vars->build_depend()->name()).exists())
{
- _imp->build_dependencies.reset(new EDependenciesKey(_imp->environment, shared_from_this(), vars->build_depend().name(),
- vars->build_depend().description(), file_contents(_imp->dir / vars->build_depend().name()),
+ _imp->build_dependencies.reset(new EDependenciesKey(_imp->environment, shared_from_this(), vars->build_depend()->name(),
+ vars->build_depend()->description(), file_contents(_imp->dir / vars->build_depend()->name()),
_imp->build_dependencies_labels, mkt_dependencies));
add_metadata_key(_imp->build_dependencies);
}
- if (! vars->run_depend().name().empty())
- if ((_imp->dir / vars->run_depend().name()).exists())
+ if (! vars->run_depend()->name().empty())
+ if ((_imp->dir / vars->run_depend()->name()).exists())
{
- _imp->run_dependencies.reset(new EDependenciesKey(_imp->environment, shared_from_this(), vars->run_depend().name(),
- vars->run_depend().description(), file_contents(_imp->dir / vars->run_depend().name()),
+ _imp->run_dependencies.reset(new EDependenciesKey(_imp->environment, shared_from_this(), vars->run_depend()->name(),
+ vars->run_depend()->description(), file_contents(_imp->dir / vars->run_depend()->name()),
_imp->run_dependencies_labels, mkt_dependencies));
add_metadata_key(_imp->run_dependencies);
}
- if (! vars->pdepend().name().empty())
- if ((_imp->dir / vars->pdepend().name()).exists())
+ if (! vars->pdepend()->name().empty())
+ if ((_imp->dir / vars->pdepend()->name()).exists())
{
- _imp->post_dependencies.reset(new EDependenciesKey(_imp->environment, shared_from_this(), vars->pdepend().name(),
- vars->pdepend().description(), file_contents(_imp->dir / vars->pdepend().name()),
+ _imp->post_dependencies.reset(new EDependenciesKey(_imp->environment, shared_from_this(), vars->pdepend()->name(),
+ vars->pdepend()->description(), file_contents(_imp->dir / vars->pdepend()->name()),
_imp->post_dependencies_labels, mkt_dependencies));
add_metadata_key(_imp->post_dependencies);
}
}
- if (! vars->restrictions().name().empty())
- if ((_imp->dir / vars->restrictions().name()).exists())
+ if (! vars->restrictions()->name().empty())
+ if ((_imp->dir / vars->restrictions()->name()).exists())
{
- _imp->restrictions.reset(new EPlainTextSpecKey(_imp->environment, shared_from_this(), vars->restrictions().name(),
- vars->restrictions().description(),
- file_contents(_imp->dir / vars->restrictions().name()), mkt_internal));
+ _imp->restrictions.reset(new EPlainTextSpecKey(_imp->environment, shared_from_this(), vars->restrictions()->name(),
+ vars->restrictions()->description(),
+ file_contents(_imp->dir / vars->restrictions()->name()), mkt_internal));
add_metadata_key(_imp->restrictions);
}
- if (! vars->properties().name().empty())
- if ((_imp->dir / vars->properties().name()).exists())
+ if (! vars->properties()->name().empty())
+ if ((_imp->dir / vars->properties()->name()).exists())
{
- _imp->properties.reset(new EPlainTextSpecKey(_imp->environment, shared_from_this(), vars->properties().name(),
- vars->properties().description(),
- file_contents(_imp->dir / vars->properties().name()), mkt_internal));
+ _imp->properties.reset(new EPlainTextSpecKey(_imp->environment, shared_from_this(), vars->properties()->name(),
+ vars->properties()->description(),
+ file_contents(_imp->dir / vars->properties()->name()), mkt_internal));
add_metadata_key(_imp->properties);
}
- if (! vars->src_uri().name().empty())
- if ((_imp->dir / vars->src_uri().name()).exists())
+ if (! vars->src_uri()->name().empty())
+ if ((_imp->dir / vars->src_uri()->name()).exists())
{
- _imp->src_uri.reset(new EFetchableURIKey(_imp->environment, shared_from_this(), vars->src_uri().name(),
- vars->src_uri().description(),
- file_contents(_imp->dir / vars->src_uri().name()), mkt_dependencies));
+ _imp->src_uri.reset(new EFetchableURIKey(_imp->environment, shared_from_this(), vars->src_uri()->name(),
+ vars->src_uri()->description(),
+ file_contents(_imp->dir / vars->src_uri()->name()), mkt_dependencies));
add_metadata_key(_imp->src_uri);
}
- if (! vars->short_description().name().empty())
- if ((_imp->dir / vars->short_description().name()).exists())
+ if (! vars->short_description()->name().empty())
+ if ((_imp->dir / vars->short_description()->name()).exists())
{
- _imp->short_description.reset(new LiteralMetadataValueKey<std::string> (vars->short_description().name(),
- vars->short_description().description(), mkt_significant, file_contents(_imp->dir / vars->short_description().name())));
+ _imp->short_description.reset(new LiteralMetadataValueKey<std::string> (vars->short_description()->name(),
+ vars->short_description()->description(), mkt_significant, file_contents(_imp->dir / vars->short_description()->name())));
add_metadata_key(_imp->short_description);
}
- if (! vars->long_description().name().empty())
- if ((_imp->dir / vars->long_description().name()).exists())
+ if (! vars->long_description()->name().empty())
+ if ((_imp->dir / vars->long_description()->name()).exists())
{
- std::string value(file_contents(_imp->dir / vars->long_description().name()));
+ std::string value(file_contents(_imp->dir / vars->long_description()->name()));
if (! value.empty())
{
- _imp->long_description.reset(new LiteralMetadataValueKey<std::string> (vars->long_description().name(),
- vars->long_description().description(), mkt_significant, value));
+ _imp->long_description.reset(new LiteralMetadataValueKey<std::string> (vars->long_description()->name(),
+ vars->long_description()->description(), mkt_significant, value));
add_metadata_key(_imp->long_description);
}
}
- if (! vars->upstream_changelog().name().empty())
- if ((_imp->dir / vars->upstream_changelog().name()).exists())
+ if (! vars->upstream_changelog()->name().empty())
+ if ((_imp->dir / vars->upstream_changelog()->name()).exists())
{
- std::string value(file_contents(_imp->dir / vars->upstream_changelog().name()));
+ std::string value(file_contents(_imp->dir / vars->upstream_changelog()->name()));
if (! value.empty())
{
_imp->upstream_changelog.reset(new ESimpleURIKey(_imp->environment, shared_from_this(),
- vars->upstream_changelog().name(),
- vars->upstream_changelog().description(), value, mkt_normal));
+ vars->upstream_changelog()->name(),
+ vars->upstream_changelog()->description(), value, mkt_normal));
add_metadata_key(_imp->upstream_changelog);
}
}
- if (! vars->upstream_release_notes().name().empty())
- if ((_imp->dir / vars->upstream_release_notes().name()).exists())
+ if (! vars->upstream_release_notes()->name().empty())
+ if ((_imp->dir / vars->upstream_release_notes()->name()).exists())
{
- std::string value(file_contents(_imp->dir / vars->upstream_release_notes().name()));
+ std::string value(file_contents(_imp->dir / vars->upstream_release_notes()->name()));
if (! value.empty())
{
_imp->upstream_release_notes.reset(new ESimpleURIKey(_imp->environment, shared_from_this(),
- vars->upstream_release_notes().name(),
- vars->upstream_release_notes().description(), value, mkt_normal));
+ vars->upstream_release_notes()->name(),
+ vars->upstream_release_notes()->description(), value, mkt_normal));
add_metadata_key(_imp->upstream_release_notes);
}
}
- if (! vars->upstream_documentation().name().empty())
- if ((_imp->dir / vars->upstream_documentation().name()).exists())
+ if (! vars->upstream_documentation()->name().empty())
+ if ((_imp->dir / vars->upstream_documentation()->name()).exists())
{
- std::string value(file_contents(_imp->dir / vars->upstream_documentation().name()));
+ std::string value(file_contents(_imp->dir / vars->upstream_documentation()->name()));
if (! value.empty())
{
_imp->upstream_documentation.reset(new ESimpleURIKey(_imp->environment, shared_from_this(),
- vars->upstream_documentation().name(),
- vars->upstream_documentation().description(), value, mkt_normal));
+ vars->upstream_documentation()->name(),
+ vars->upstream_documentation()->description(), value, mkt_normal));
add_metadata_key(_imp->upstream_documentation);
}
}
- if (! vars->bugs_to().name().empty())
- if ((_imp->dir / vars->bugs_to().name()).exists())
+ if (! vars->bugs_to()->name().empty())
+ if ((_imp->dir / vars->bugs_to()->name()).exists())
{
- std::string value(file_contents(_imp->dir / vars->bugs_to().name()));
+ std::string value(file_contents(_imp->dir / vars->bugs_to()->name()));
if (! value.empty())
{
_imp->bugs_to.reset(new EPlainTextSpecKey(_imp->environment, shared_from_this(),
- vars->bugs_to().name(),
- vars->bugs_to().description(), value, mkt_normal));
+ vars->bugs_to()->name(),
+ vars->bugs_to()->description(), value, mkt_normal));
add_metadata_key(_imp->bugs_to);
}
}
- if (! vars->remote_ids().name().empty())
- if ((_imp->dir / vars->remote_ids().name()).exists())
+ if (! vars->remote_ids()->name().empty())
+ if ((_imp->dir / vars->remote_ids()->name()).exists())
{
- std::string value(file_contents(_imp->dir / vars->remote_ids().name()));
+ std::string value(file_contents(_imp->dir / vars->remote_ids()->name()));
if (! value.empty())
{
_imp->remote_ids.reset(new EPlainTextSpecKey(_imp->environment, shared_from_this(),
- vars->remote_ids().name(),
- vars->remote_ids().description(), value, mkt_internal));
+ vars->remote_ids()->name(),
+ vars->remote_ids()->description(), value, mkt_internal));
add_metadata_key(_imp->remote_ids);
}
}
- if (! vars->homepage().name().empty())
- if ((_imp->dir / vars->homepage().name()).exists())
+ if (! vars->homepage()->name().empty())
+ if ((_imp->dir / vars->homepage()->name()).exists())
{
- _imp->homepage.reset(new ESimpleURIKey(_imp->environment, shared_from_this(), vars->homepage().name(),
- vars->homepage().description(),
- file_contents(_imp->dir / vars->homepage().name()), mkt_significant));
+ _imp->homepage.reset(new ESimpleURIKey(_imp->environment, shared_from_this(), vars->homepage()->name(),
+ vars->homepage()->description(),
+ file_contents(_imp->dir / vars->homepage()->name()), mkt_significant));
add_metadata_key(_imp->homepage);
}
diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc
index 3a7f539..f9af526 100644
--- a/paludis/repositories/e/eapi.cc
+++ b/paludis/repositories/e/eapi.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -91,13 +91,13 @@ namespace
)));
}
- EAPIMetadataVariable make_metadata_variable(const KeyValueConfigFile & k, const std::string & s)
+ std::tr1::shared_ptr<EAPIMetadataVariable> make_metadata_variable(const KeyValueConfigFile & k, const std::string & s)
{
- return make_named_values<EAPIMetadataVariable>(
- value_for<n::description>(check_get(k, "description_" + s)),
- value_for<n::flat_list_index>(destringify_key<int>(k, "flat_list_" + s)),
- value_for<n::name>(check_get(k, "metadata_" + s))
- );
+ return make_shared_ptr(new EAPIMetadataVariable(make_named_values<EAPIMetadataVariable>(
+ value_for<n::description>(check_get(k, "description_" + s)),
+ value_for<n::flat_list_index>(destringify_key<int>(k, "flat_list_" + s)),
+ value_for<n::name>(check_get(k, "metadata_" + s))
+ )));
}
std::tr1::shared_ptr<const EAPIEbuildMetadataVariables> make_ebuild_metadata_variables(const KeyValueConfigFile & k)
diff --git a/paludis/repositories/e/eapi.hh b/paludis/repositories/e/eapi.hh
index 9695e23..f1bd57e 100644
--- a/paludis/repositories/e/eapi.hh
+++ b/paludis/repositories/e/eapi.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -286,34 +286,34 @@ namespace paludis
struct EAPIEbuildMetadataVariables
{
- NamedValue<n::bugs_to, EAPIMetadataVariable> bugs_to;
- NamedValue<n::build_depend, EAPIMetadataVariable> build_depend;
- NamedValue<n::defined_phases, EAPIMetadataVariable> defined_phases;
- NamedValue<n::dependencies, EAPIMetadataVariable> dependencies;
- NamedValue<n::eapi, EAPIMetadataVariable> eapi;
- NamedValue<n::homepage, EAPIMetadataVariable> homepage;
- NamedValue<n::inherited, EAPIMetadataVariable> inherited;
- NamedValue<n::iuse, EAPIMetadataVariable> iuse;
- NamedValue<n::keywords, EAPIMetadataVariable> keywords;
- NamedValue<n::license, EAPIMetadataVariable> license;
- NamedValue<n::long_description, EAPIMetadataVariable> long_description;
+ NamedValue<n::bugs_to, std::tr1::shared_ptr<const EAPIMetadataVariable> > bugs_to;
+ NamedValue<n::build_depend, std::tr1::shared_ptr<const EAPIMetadataVariable> > build_depend;
+ NamedValue<n::defined_phases, std::tr1::shared_ptr<const EAPIMetadataVariable> > defined_phases;
+ NamedValue<n::dependencies, std::tr1::shared_ptr<const EAPIMetadataVariable> > dependencies;
+ NamedValue<n::eapi, std::tr1::shared_ptr<const EAPIMetadataVariable> > eapi;
+ NamedValue<n::homepage, std::tr1::shared_ptr<const EAPIMetadataVariable> > homepage;
+ NamedValue<n::inherited, std::tr1::shared_ptr<const EAPIMetadataVariable> > inherited;
+ NamedValue<n::iuse, std::tr1::shared_ptr<const EAPIMetadataVariable> > iuse;
+ NamedValue<n::keywords, std::tr1::shared_ptr<const EAPIMetadataVariable> > keywords;
+ NamedValue<n::license, std::tr1::shared_ptr<const EAPIMetadataVariable> > license;
+ NamedValue<n::long_description, std::tr1::shared_ptr<const EAPIMetadataVariable> > long_description;
NamedValue<n::minimum_flat_list_size, int> minimum_flat_list_size;
- NamedValue<n::myoptions, EAPIMetadataVariable> myoptions;
- NamedValue<n::pdepend, EAPIMetadataVariable> pdepend;
- NamedValue<n::properties, EAPIMetadataVariable> properties;
- NamedValue<n::provide, EAPIMetadataVariable> provide;
- NamedValue<n::remote_ids, EAPIMetadataVariable> remote_ids;
- NamedValue<n::restrictions, EAPIMetadataVariable> restrictions;
- NamedValue<n::run_depend, EAPIMetadataVariable> run_depend;
- NamedValue<n::short_description, EAPIMetadataVariable> short_description;
- NamedValue<n::slot, EAPIMetadataVariable> slot;
- NamedValue<n::src_uri, EAPIMetadataVariable> src_uri;
- NamedValue<n::upstream_changelog, EAPIMetadataVariable> upstream_changelog;
- NamedValue<n::upstream_documentation, EAPIMetadataVariable> upstream_documentation;
- NamedValue<n::upstream_release_notes, EAPIMetadataVariable> upstream_release_notes;
- NamedValue<n::use, EAPIMetadataVariable> use;
- NamedValue<n::use_expand, EAPIMetadataVariable> use_expand;
- NamedValue<n::use_expand_hidden, EAPIMetadataVariable> use_expand_hidden;
+ NamedValue<n::myoptions, std::tr1::shared_ptr<const EAPIMetadataVariable> > myoptions;
+ NamedValue<n::pdepend, std::tr1::shared_ptr<const EAPIMetadataVariable> > pdepend;
+ NamedValue<n::properties, std::tr1::shared_ptr<const EAPIMetadataVariable> > properties;
+ NamedValue<n::provide, std::tr1::shared_ptr<const EAPIMetadataVariable> > provide;
+ NamedValue<n::remote_ids, std::tr1::shared_ptr<const EAPIMetadataVariable> > remote_ids;
+ NamedValue<n::restrictions, std::tr1::shared_ptr<const EAPIMetadataVariable> > restrictions;
+ NamedValue<n::run_depend, std::tr1::shared_ptr<const EAPIMetadataVariable> > run_depend;
+ NamedValue<n::short_description, std::tr1::shared_ptr<const EAPIMetadataVariable> > short_description;
+ NamedValue<n::slot, std::tr1::shared_ptr<const EAPIMetadataVariable> > slot;
+ NamedValue<n::src_uri, std::tr1::shared_ptr<const EAPIMetadataVariable> > src_uri;
+ NamedValue<n::upstream_changelog, std::tr1::shared_ptr<const EAPIMetadataVariable> > upstream_changelog;
+ NamedValue<n::upstream_documentation, std::tr1::shared_ptr<const EAPIMetadataVariable> > upstream_documentation;
+ NamedValue<n::upstream_release_notes, std::tr1::shared_ptr<const EAPIMetadataVariable> > upstream_release_notes;
+ NamedValue<n::use, std::tr1::shared_ptr<const EAPIMetadataVariable> > use;
+ NamedValue<n::use_expand, std::tr1::shared_ptr<const EAPIMetadataVariable> > use_expand;
+ NamedValue<n::use_expand_hidden, std::tr1::shared_ptr<const EAPIMetadataVariable> > use_expand_hidden;
};
struct EAPIEbuildOptions
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index 7b5a386..e234098 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007, 2008 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008, 2009 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -409,7 +409,7 @@ EbuildMetadataCommand::load(const std::tr1::shared_ptr<const EbuildID> & id)
<< "ID pre-load EAPI '" << id->eapi()->name() << "' is supported";
std::string s;
- if (! ((s = get(keys, id->eapi()->supported()->ebuild_metadata_variables()->eapi().name()))).empty())
+ if (! ((s = get(keys, id->eapi()->supported()->ebuild_metadata_variables()->eapi()->name()))).empty())
id->set_eapi(s);
else
id->set_eapi(id->e_repository()->params().eapi_when_unspecified());
@@ -432,42 +432,42 @@ EbuildMetadataCommand::load(const std::tr1::shared_ptr<const EbuildID> & id)
const EAPIEbuildMetadataVariables & m(*id->eapi()->supported()->ebuild_metadata_variables());
- if (! m.short_description().name().empty())
- id->load_short_description(m.short_description().name(), m.short_description().description(), get(keys, m.short_description().name()));
+ if (! m.short_description()->name().empty())
+ id->load_short_description(m.short_description()->name(), m.short_description()->description(), get(keys, m.short_description()->name()));
- if (! m.long_description().name().empty())
+ if (! m.long_description()->name().empty())
{
- std::string value(get(keys, m.long_description().name()));
+ std::string value(get(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.dependencies().name().empty())
+ if (! m.dependencies()->name().empty())
{
DependenciesRewriter rewriter;
- parse_depend(get(keys, m.dependencies().name()), params.environment(), 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(get(keys, m.dependencies()->name()), params.environment(), 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());
}
else
{
- if (! m.build_depend().name().empty())
- id->load_build_depend(m.build_depend().name(), m.build_depend().description(), get(keys, m.build_depend().name()));
+ if (! m.build_depend()->name().empty())
+ id->load_build_depend(m.build_depend()->name(), m.build_depend()->description(), get(keys, m.build_depend()->name()));
- if (! m.run_depend().name().empty())
- id->load_run_depend(m.run_depend().name(), m.run_depend().description(), get(keys, m.run_depend().name()));
+ if (! m.run_depend()->name().empty())
+ id->load_run_depend(m.run_depend()->name(), m.run_depend()->description(), get(keys, m.run_depend()->name()));
- if (! m.pdepend().name().empty())
- id->load_post_depend(m.pdepend().name(), m.pdepend().description(), get(keys, m.pdepend().name()));
+ if (! m.pdepend()->name().empty())
+ id->load_post_depend(m.pdepend()->name(), m.pdepend()->description(), get(keys, m.pdepend()->name()));
}
- if (! m.slot().name().empty())
+ if (! m.slot()->name().empty())
{
try
{
Context c("When setting SLOT:");
- std::string slot(get(keys, m.slot().name()));
+ std::string slot(get(keys, m.slot()->name()));
if (slot.empty())
{
Log::get_instance()->message("e.ebuild.no_slot", ll_qa, lc_context)
@@ -489,75 +489,75 @@ EbuildMetadataCommand::load(const std::tr1::shared_ptr<const EbuildID> & id)
}
}
- if (! m.src_uri().name().empty())
- id->load_src_uri(m.src_uri().name(), m.src_uri().description(), get(keys, m.src_uri().name()));
+ if (! m.src_uri()->name().empty())
+ id->load_src_uri(m.src_uri()->name(), m.src_uri()->description(), get(keys, m.src_uri()->name()));
- if (! m.homepage().name().empty())
- id->load_homepage(m.homepage().name(), m.homepage().description(), get(keys, m.homepage().name()));
+ if (! m.homepage()->name().empty())
+ id->load_homepage(m.homepage()->name(), m.homepage()->description(), get(keys, m.homepage()->name()));
- if (! m.license().name().empty())
- id->load_license(m.license().name(), m.license().description(), get(keys, m.license().name()));
+ if (! m.license()->name().empty())
+ id->load_license(m.license()->name(), m.license()->description(), get(keys, m.license()->name()));
- if (! m.provide().name().empty())
- id->load_provide(m.provide().name(), m.provide().description(), get(keys, m.provide().name()));
+ if (! m.provide()->name().empty())
+ id->load_provide(m.provide()->name(), m.provide()->description(), get(keys, m.provide()->name()));
- if (! m.iuse().name().empty())
- id->load_iuse(m.iuse().name(), m.iuse().description(), get(keys, m.iuse().name()));
+ if (! m.iuse()->name().empty())
+ id->load_iuse(m.iuse()->name(), m.iuse()->description(), get(keys, m.iuse()->name()));
- if (! m.myoptions().name().empty())
- id->load_myoptions(m.myoptions().name(), m.myoptions().description(), get(keys, m.myoptions().name()));
+ if (! m.myoptions()->name().empty())
+ id->load_myoptions(m.myoptions()->name(), m.myoptions()->description(), get(keys, m.myoptions()->name()));
- if (! m.inherited().name().empty())
- id->load_inherited(m.inherited().name(), m.inherited().description(), get(keys, m.inherited().name()));
+ if (! m.inherited()->name().empty())
+ id->load_inherited(m.inherited()->name(), m.inherited()->description(), get(keys, m.inherited()->name()));
- if (! m.keywords().name().empty())
- id->load_keywords(m.keywords().name(), m.keywords().description(), get(keys, m.keywords().name()));
+ if (! m.keywords()->name().empty())
+ id->load_keywords(m.keywords()->name(), m.keywords()->description(), get(keys, m.keywords()->name()));
- if (! m.restrictions().name().empty())
- id->load_restrict(m.restrictions().name(), m.restrictions().description(), get(keys, m.restrictions().name()));
+ if (! m.restrictions()->name().empty())
+ id->load_restrict(m.restrictions()->name(), m.restrictions()->description(), get(keys, m.restrictions()->name()));
- if (! m.properties().name().empty())
- id->load_properties(m.properties().name(), m.properties().description(), get(keys, m.properties().name()));
+ if (! m.properties()->name().empty())
+ id->load_properties(m.properties()->name(), m.properties()->description(), get(keys, m.properties()->name()));
- if (! m.use().name().empty())
- id->load_use(m.use().name(), m.use().description(), get(keys, m.use().name()));
+ if (! m.use()->name().empty())
+ id->load_use(m.use()->name(), m.use()->description(), get(keys, m.use()->name()));
- if (! m.upstream_changelog().name().empty())
+ if (! m.upstream_changelog()->name().empty())
{
- std::string value(get(keys, m.upstream_changelog().name()));
+ std::string value(get(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(get(keys, m.upstream_documentation().name()));
+ std::string value(get(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(get(keys, m.upstream_release_notes().name()));
+ std::string value(get(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(get(keys, m.bugs_to().name()));
+ std::string value(get(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(get(keys, m.remote_ids().name()));
+ std::string value(get(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);
}
- if (! m.defined_phases().name().empty())
+ if (! m.defined_phases()->name().empty())
{
std::set<std::string> defined_phases, raw_values, ebuild_functions;
std::string raw_value(get(keys, "PALUDIS_DECLARED_FUNCTIONS"));
@@ -586,9 +586,9 @@ EbuildMetadataCommand::load(const std::tr1::shared_ptr<const EbuildID> & id)
}
if (defined_phases.empty())
- id->load_defined_phases(m.defined_phases().name(), m.defined_phases().description(), "-");
+ id->load_defined_phases(m.defined_phases()->name(), m.defined_phases()->description(), "-");
else
- id->load_defined_phases(m.defined_phases().name(), m.defined_phases().description(),
+ id->load_defined_phases(m.defined_phases()->name(), m.defined_phases()->description(),
join(defined_phases.begin(), defined_phases.end(), " "));
}
}
@@ -880,7 +880,7 @@ WriteVDBEntryCommand::operator() ()
.with_pipe_command_handler(std::tr1::bind(&pipe_command_handler, params.environment(), params.package_id(), _1))
);
- std::string defined_phases(params.package_id()->eapi()->supported()->ebuild_metadata_variables()->defined_phases().name());
+ std::string defined_phases(params.package_id()->eapi()->supported()->ebuild_metadata_variables()->defined_phases()->name());
if (! defined_phases.empty())
if (params.package_id()->defined_phases_key())
cmd.with_setenv(defined_phases, join(params.package_id()->defined_phases_key()->value()->begin(),
@@ -1089,7 +1089,7 @@ WriteBinaryEbuildCommand::operator() ()
.with_setenv("PALUDIS_BINARY_URI_PREFIX", params.destination_repository()->params().binary_uri_prefix())
.with_setenv("PALUDIS_BINARY_KEYWORDS", params.destination_repository()->params().binary_keywords())
.with_setenv("PALUDIS_BINARY_KEYWORDS_VARIABLE", EAPIData::get_instance()->eapi_from_string("pbin-1+"
- + params.package_id()->eapi()->exported_name())->supported()->ebuild_metadata_variables()->keywords().name())
+ + params.package_id()->eapi()->exported_name())->supported()->ebuild_metadata_variables()->keywords()->name())
.with_setenv("PALUDIS_BINARY_DISTDIR_VARIABLE", EAPIData::get_instance()->eapi_from_string("pbin-1+"
+ params.package_id()->eapi()->exported_name())->supported()->ebuild_environment_variables()->env_distdir())
.with_setenv("PALUDIS_EBUILD_MODULE_SUFFIXES",
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 &)
diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index 25ed312..4dc62e7 100644
--- a/paludis/repositories/e/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -288,13 +288,13 @@ EbuildID::need_keys_added() const
if (_imp->eapi->supported())
{
_imp->raw_use_expand = make_shared_ptr(new LiteralMetadataStringSetKey(
- _imp->eapi->supported()->ebuild_metadata_variables()->use_expand().name(),
- _imp->eapi->supported()->ebuild_metadata_variables()->use_expand().description(),
+ _imp->eapi->supported()->ebuild_metadata_variables()->use_expand()->name(),
+ _imp->eapi->supported()->ebuild_metadata_variables()->use_expand()->description(),
mkt_internal,
std::tr1::static_pointer_cast<const ERepository>(repository())->profile()->use_expand()));
_imp->raw_use_expand_hidden = make_shared_ptr(new LiteralMetadataStringSetKey(
- _imp->eapi->supported()->ebuild_metadata_variables()->use_expand_hidden().name(),
- _imp->eapi->supported()->ebuild_metadata_variables()->use_expand_hidden().description(),
+ _imp->eapi->supported()->ebuild_metadata_variables()->use_expand_hidden()->name(),
+ _imp->eapi->supported()->ebuild_metadata_variables()->use_expand_hidden()->description(),
mkt_internal,
std::tr1::static_pointer_cast<const ERepository>(repository())->profile()->use_expand_hidden()));
diff --git a/paludis/repositories/e/pipe_command_handler.cc b/paludis/repositories/e/pipe_command_handler.cc
index e939478..783d7ea 100644
--- a/paludis/repositories/e/pipe_command_handler.cc
+++ b/paludis/repositories/e/pipe_command_handler.cc
@@ -269,10 +269,10 @@ paludis::erepository::pipe_command_handler(const Environment * const environment
std::string var(tokens[3]);
- if ((var == eapi->supported()->ebuild_metadata_variables()->build_depend().name()) ||
- (var == eapi->supported()->ebuild_metadata_variables()->run_depend().name()) ||
- (var == eapi->supported()->ebuild_metadata_variables()->pdepend().name()) ||
- (var == eapi->supported()->ebuild_metadata_variables()->dependencies().name()))
+ if ((var == eapi->supported()->ebuild_metadata_variables()->build_depend()->name()) ||
+ (var == eapi->supported()->ebuild_metadata_variables()->run_depend()->name()) ||
+ (var == eapi->supported()->ebuild_metadata_variables()->pdepend()->name()) ||
+ (var == eapi->supported()->ebuild_metadata_variables()->dependencies()->name()))
{
std::tr1::shared_ptr<const DependencySpecTree> before(parse_depend(join(tokens.begin() + 4, tokens.end(), " "),
environment, package_id, *eapi));