Ticket #622: 0002-Convert-EAPI-away-from-kc-sr.patch

paludis/repositories/e/Makefile.am

@@ -6 +6 @@
         e_repository_params-sr.hh e_repository_params-sr.cc \
         e_repository_params-se.hh e_repository_params-se.cc \
         vdb_repository-sr.hh vdb_repository-sr.cc \
-        eapi-sr.hh eapi-sr.cc \
         dep_parser-se.hh dep_parser-se.cc \
         manifest2_entry-sr.hh manifest2_entry-sr.cc
 
@@ -58 +57 @@
         e_repository_sets.hh \
         e_stripper.hh \
         eapi.hh \
-        eapi-sr.hh \
         eapi-fwd.hh \
         eapi_phase.hh \
         ebuild.hh \
@@ -306 +304 @@
         dep_parser-se.cc \
         dep_parser_TEST.cc \
         dep_spec_pretty_printer_TEST.cc \
-        eapi.sr \
-        eapi-sr.hh \
-        eapi-sr.cc \
         glsa.sr \
         glsa-sr.hh \
         glsa-sr.cc \
@@ -372 +367 @@
         exndbam_repository-sr.cc \
         vdb_repository-sr.hh \
         vdb_repository-sr.cc \
-        eapi-sr.hh \
-        eapi-sr.cc \
         manifest2_entry-sr.hh \
         manifest2_entry-sr.cc
 
@@ -424 +417 @@
 manifest2_entry-sr.cc : manifest2_entry.sr $(top_srcdir)/misc/make_sr.bash
         $(top_srcdir)/misc/make_sr.bash --source $(srcdir)/manifest2_entry.sr > $@
 
-eapi-sr.hh : eapi.sr $(top_srcdir)/misc/make_sr.bash
-        $(top_srcdir)/misc/make_sr.bash --header $(srcdir)/eapi.sr > $@
-
-eapi-sr.cc : eapi.sr $(top_srcdir)/misc/make_sr.bash
-        $(top_srcdir)/misc/make_sr.bash --source $(srcdir)/eapi.sr > $@
-
 glsa-sr.hh : glsa.sr $(top_srcdir)/misc/make_sr.bash
         $(top_srcdir)/misc/make_sr.bash --header $(srcdir)/glsa.sr > $@
 

paludis/repositories/e/dep_parser.cc

@@ -66 +66 @@
     void package_dep_spec_string_handler(const typename ParseStackTypes<T_>::Stack & h, const std::string & s,
             const EAPI & eapi, const std::tr1::shared_ptr<const PackageID> & id)
     {
-        PackageDepSpec p(parse_elike_package_dep_spec(s, (*eapi[k::supported()])[k::package_dep_spec_parse_options()], id));
+        PackageDepSpec p(parse_elike_package_dep_spec(s, eapi.supported()->package_dep_spec_parse_options(), id));
         (*h.begin())[k::add_handler()](make_shared_ptr(new TreeLeaf<T_, PackageDepSpec>(make_shared_ptr(new PackageDepSpec(p)))));
     }
 
@@ -78 +78 @@
         {
             std::tr1::shared_ptr<BlockDepSpec> b(new BlockDepSpec(
                         make_shared_ptr(new PackageDepSpec(parse_elike_package_dep_spec(s.substr(1),
-                                    (*eapi[k::supported()])[k::package_dep_spec_parse_options()], id)))));
+                                    eapi.supported()->package_dep_spec_parse_options(), id)))));
             (*h.begin())[k::add_handler()](make_shared_ptr(new TreeLeaf<T_, BlockDepSpec>(b)));
         }
         else
@@ -107 +107 @@
     void arrow_handler(const typename ParseStackTypes<T_>::Stack & h, const std::string & s, const std::string & f, const std::string & t,
             const EAPI & eapi)
     {
-        if (t.empty() || ((*eapi[k::supported()])[k::dependency_spec_tree_parse_options()][dstpo_uri_supports_arrow]))
+        if (t.empty() || eapi.supported()->dependency_spec_tree_parse_options()[dstpo_uri_supports_arrow])
             (*h.begin())[k::add_handler()](make_shared_ptr(new TreeLeaf<T_, FetchableURIDepSpec>(make_shared_ptr(
                                 new FetchableURIDepSpec(t.empty() ? f : f + " -> " + t)))));
         else
@@ -203 +203 @@
 
     void use_under_any_handler(const std::string & s, const EAPI & eapi)
     {
-        if ((*eapi[k::supported()])[k::dependency_spec_tree_parse_options()][dstpo_disallow_any_use])
+        if (eapi.supported()->dependency_spec_tree_parse_options()[dstpo_disallow_any_use])
             throw EDepParseError(s, "use? not allowed under || ( ) in this EAPI");
     }
 
@@ -423 +423 @@
 std::tr1::shared_ptr<URILabelsDepSpec>
 paludis::erepository::parse_uri_label(const std::string & s, const EAPI & e)
 {
-    Context context("When parsing label string '" + s + "' using EAPI '" + e[k::name()] + "':");
+    Context context("When parsing label string '" + s + "' using EAPI '" + e.name() + "':");
 
     if (s.empty())
         throw EDepParseError(s, "Empty label");
 
-    std::string c((*e[k::supported()])[k::uri_labels()].class_for_label(s.substr(0, s.length() - 1)));
+    std::string c(e.supported()->uri_labels()->class_for_label(s.substr(0, s.length() - 1)));
     if (c.empty())
         throw EDepParseError(s, "Unknown label");
 
@@ -455 +455 @@
 std::tr1::shared_ptr<DependencyLabelsDepSpec>
 paludis::erepository::parse_dependency_label(const std::string & s, const EAPI & e)
 {
-    Context context("When parsing label string '" + s + "' using EAPI '" + e[k::name()] + "':");
+    Context context("When parsing label string '" + s + "' using EAPI '" + e.name() + "':");
 
     if (s.empty())
         throw EDepParseError(s, "Empty label");
@@ -468 +468 @@
 
     for (std::set<std::string>::iterator it = labels.begin(), it_e = labels.end(); it != it_e; ++it)
     {
-        std::string c((*e[k::supported()])[k::dependency_labels()].class_for_label(*it));
+        std::string c(e.supported()->dependency_labels()->class_for_label(*it));
         if (c.empty())
             throw EDepParseError(s, "Unknown label '" + *it + "'");
 

paludis/repositories/e/e_installed_repository.cc

@@ -298 +298 @@
     if (this != id.repository().get())
         return '\0';
     const std::tr1::shared_ptr<const EAPI> & eapi(static_cast<const ERepositoryID &>(id).eapi());
-    return (*eapi)[k::supported()] ? (*(*eapi)[k::supported()])[k::ebuild_options()].use_expand_separator : '\0';
+    return eapi->supported() ? eapi->supported()->ebuild_options()->use_expand_separator() : '\0';
 }
 
 std::string
@@ -354 +354 @@
     eclassdirs->push_back(ver_dir);
 
     std::tr1::shared_ptr<FSEntry> load_env(new FSEntry(ver_dir / "environment.bz2"));
-    EAPIPhases phases((*(*id->eapi())[k::supported()])[k::ebuild_phases()].ebuild_config);
+    EAPIPhases phases(id->eapi()->supported()->ebuild_phases()->ebuild_config());
 
     for (EAPIPhases::ConstIterator phase(phases.begin_phases()), phase_end(phases.end_phases()) ;
             phase != phase_end ; ++phase)
@@ -398 +398 @@
 
     std::tr1::shared_ptr<FSEntry> load_env(new FSEntry(ver_dir / "environment.bz2"));
 
-    EAPIPhases phases((*(*id->eapi())[k::supported()])[k::ebuild_phases()].ebuild_info);
+    EAPIPhases phases(id->eapi()->supported()->ebuild_phases()->ebuild_info());
 
     for (EAPIPhases::ConstIterator phase(phases.begin_phases()), phase_end(phases.end_phases()) ;
             phase != phase_end ; ++phase)

paludis/repositories/e/e_installed_repository_id.cc

@@ -162 +162 @@
 
     Context context("When loading ID keys from '" + stringify(_imp->dir) + "':");
 
-    if (! (*eapi())[k::supported()])
+    if (! eapi()->supported())
     {
         Log::get_instance()->message("e.eapi.unsupported", ll_debug, lc_context)
             << "Not loading further keys for '" << *this << "' because EAPI '"
-            << (*eapi())[k::name()] << "' is not supported";
+            << eapi()->name() << "' is not supported";
         return;
     }
 
-    const EAPIEbuildMetadataVariables & vars((*(*eapi())[k::supported()])[k::ebuild_metadata_variables()]);
-    const EAPIEbuildEnvironmentVariables & env((*(*eapi())[k::supported()])[k::ebuild_environment_variables()]);
+    std::tr1::shared_ptr<const EAPIEbuildMetadataVariables> vars(eapi()->supported()->ebuild_metadata_variables());
+    std::tr1::shared_ptr<const EAPIEbuildEnvironmentVariables> env(eapi()->supported()->ebuild_environment_variables());
 
-    if (! env[k::env_use()].empty())
-        if ((_imp->dir / env[k::env_use()]).exists())
+    if (! env->env_use().empty())
+        if ((_imp->dir / env->env_use()).exists())
         {
-            _imp->use.reset(new EUseKey(_imp->environment, shared_from_this(), env[k::env_use()], env[k::description_use()],
-                        file_contents(_imp->dir / env[k::env_use()]), mkt_internal));
+            _imp->use.reset(new EUseKey(_imp->environment, shared_from_this(), env->env_use(), env->description_use(),
+                        file_contents(_imp->dir / env->env_use()), mkt_internal));
             add_metadata_key(_imp->use);
         }
 
-    if (! vars.metadata_inherited.empty())
-        if ((_imp->dir / vars.metadata_inherited).exists())
+    if (! vars->inherited().name().empty())
+        if ((_imp->dir / vars->inherited().name()).exists())
         {
-            _imp->inherited.reset(new EInheritedKey(shared_from_this(), vars.metadata_inherited, vars.description_inherited,
-                        file_contents(_imp->dir / vars.metadata_inherited), mkt_internal));
+            _imp->inherited.reset(new EInheritedKey(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.metadata_iuse.empty())
-        if ((_imp->dir / vars.metadata_iuse).exists())
+    if (! vars->iuse().name().empty())
+        if ((_imp->dir / vars->iuse().name()).exists())
         {
-            _imp->iuse.reset(new EIUseKey(_imp->environment, shared_from_this(), vars.metadata_iuse, vars.description_iuse,
-                        file_contents(_imp->dir / vars.metadata_iuse), mkt_normal));
+            _imp->iuse.reset(new EIUseKey(_imp->environment, shared_from_this(), vars->iuse().name(), vars->iuse().description(),
+                        file_contents(_imp->dir / vars->iuse().name()), mkt_normal));
             add_metadata_key(_imp->iuse);
         }
 
-    if (! vars.metadata_license.empty())
-        if ((_imp->dir / vars.metadata_license).exists())
+    if (! vars->license().name().empty())
+        if ((_imp->dir / vars->license().name()).exists())
         {
-            _imp->license.reset(new ELicenseKey(_imp->environment, shared_from_this(), vars.metadata_license, vars.description_license,
-                        file_contents(_imp->dir / vars.metadata_license),  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.metadata_provide.empty())
-        if ((_imp->dir / vars.metadata_provide).exists())
+    if (! vars->provide().name().empty())
+        if ((_imp->dir / vars->provide().name()).exists())
         {
-            _imp->provide.reset(new EProvideKey(_imp->environment, shared_from_this(), vars.metadata_provide, vars.description_provide,
-                        file_contents(_imp->dir / vars.metadata_provide), 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.metadata_dependencies.empty())
+    if (! vars->dependencies().name().empty())
     {
-        if ((_imp->dir / vars.metadata_dependencies).exists())
+        if ((_imp->dir / vars->dependencies().name()).exists())
         {
             DependenciesRewriter rewriter;
-            parse_depend(file_contents(_imp->dir / vars.metadata_dependencies), _imp->environment, shared_from_this(), *eapi())->accept(rewriter);
+            parse_depend(file_contents(_imp->dir / vars->dependencies().name()), _imp->environment, shared_from_this(), *eapi())->accept(rewriter);
 
-            _imp->build_dependencies.reset(new EDependenciesKey(_imp->environment, shared_from_this(), vars.metadata_dependencies + ".DEPEND",
-                        vars.description_dependencies + " (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.metadata_dependencies + ".RDEPEND",
-                        vars.description_dependencies + " (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.metadata_dependencies + ".PDEPEND",
-                        vars.description_dependencies + " (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.metadata_build_depend.empty())
-            if ((_imp->dir / vars.metadata_build_depend).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.metadata_build_depend,
-                            vars.description_build_depend, file_contents(_imp->dir / vars.metadata_build_depend),
+                _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.metadata_run_depend.empty())
-            if ((_imp->dir / vars.metadata_run_depend).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.metadata_run_depend,
-                            vars.description_run_depend, file_contents(_imp->dir / vars.metadata_run_depend),
+                _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.metadata_pdepend.empty())
-            if ((_imp->dir / vars.metadata_pdepend).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.metadata_pdepend,
-                            vars.description_pdepend, file_contents(_imp->dir / vars.metadata_pdepend),
+                _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.metadata_restrict.empty())
-        if ((_imp->dir / vars.metadata_restrict).exists())
+    if (! vars->restrictions().name().empty())
+        if ((_imp->dir / vars->restrictions().name()).exists())
         {
-            _imp->restrictions.reset(new ERestrictKey(_imp->environment, shared_from_this(), vars.metadata_restrict, vars.description_restrict,
-                        file_contents(_imp->dir / vars.metadata_restrict), mkt_internal));
+            _imp->restrictions.reset(new ERestrictKey(_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.metadata_src_uri.empty())
-        if ((_imp->dir / vars.metadata_src_uri).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.metadata_src_uri, vars.description_src_uri,
-                        file_contents(_imp->dir / vars.metadata_src_uri), 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.metadata_description.empty())
-        if ((_imp->dir / vars.metadata_description).exists())
+    if (! vars->description().name().empty())
+        if ((_imp->dir / vars->description().name()).exists())
         {
-            _imp->short_description.reset(new LiteralMetadataValueKey<std::string> (vars.metadata_description,
-                        vars.description_description, mkt_significant, file_contents(_imp->dir / vars.metadata_description)));
+            _imp->short_description.reset(new LiteralMetadataValueKey<std::string> (vars->description().name(),
+                        vars->description().description(), mkt_significant, file_contents(_imp->dir / vars->description().name())));
             add_metadata_key(_imp->short_description);
         }
 
-    if (! vars.metadata_homepage.empty())
-        if ((_imp->dir / vars.metadata_homepage).exists())
+    if (! vars->homepage().name().empty())
+        if ((_imp->dir / vars->homepage().name()).exists())
         {
-            _imp->homepage.reset(new ESimpleURIKey(_imp->environment, shared_from_this(), vars.metadata_homepage, vars.description_homepage,
-                        file_contents(_imp->dir / vars.metadata_homepage), 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);
         }
 

paludis/repositories/e/e_key.cc

@@ -309 +309 @@
         for (DepSpecFlattener<RestrictSpecTree, PlainTextDepSpec>::ConstIterator i(f.begin()), i_end(f.end()) ;
                 i != i_end ; ++i)
         {
-            if ((*(*_imp->id->eapi())[k::supported()])[k::ebuild_options()].restrict_fetch->end() !=
-                    std::find((*(*_imp->id->eapi())[k::supported()])[k::ebuild_options()].restrict_fetch->begin(),
-                        (*(*_imp->id->eapi())[k::supported()])[k::ebuild_options()].restrict_fetch->end(), (*i)->text()))
+            if (_imp->id->eapi()->supported()->ebuild_options()->restrict_fetch()->end() !=
+                    std::find(_imp->id->eapi()->supported()->ebuild_options()->restrict_fetch()->begin(),
+                        _imp->id->eapi()->supported()->ebuild_options()->restrict_fetch()->end(), (*i)->text()))
                 _imp->initial_label = *parse_uri_label("default-restrict-fetch:", *_imp->id->eapi())->begin();
 
-            else if ((*(*_imp->id->eapi())[k::supported()])[k::ebuild_options()].restrict_fetch->end() !=
-                    std::find((*(*_imp->id->eapi())[k::supported()])[k::ebuild_options()].restrict_fetch->begin(),
-                        (*(*_imp->id->eapi())[k::supported()])[k::ebuild_options()].restrict_fetch->end(), (*i)->text()))
+            else if (_imp->id->eapi()->supported()->ebuild_options()->restrict_fetch()->end() !=
+                    std::find(_imp->id->eapi()->supported()->ebuild_options()->restrict_fetch()->begin(),
+                        _imp->id->eapi()->supported()->ebuild_options()->restrict_fetch()->end(), (*i)->text()))
                 _imp->initial_label = *parse_uri_label("default-restrict-mirror:", *_imp->id->eapi())->begin();
 
-            else if ((*(*_imp->id->eapi())[k::supported()])[k::ebuild_options()].restrict_primaryuri->end() !=
-                    std::find((*(*_imp->id->eapi())[k::supported()])[k::ebuild_options()].restrict_primaryuri->begin(),
-                        (*(*_imp->id->eapi())[k::supported()])[k::ebuild_options()].restrict_primaryuri->end(), (*i)->text()))
+            else if (_imp->id->eapi()->supported()->ebuild_options()->restrict_primaryuri()->end() !=
+                    std::find(_imp->id->eapi()->supported()->ebuild_options()->restrict_primaryuri()->begin(),
+                        _imp->id->eapi()->supported()->ebuild_options()->restrict_primaryuri()->end(), (*i)->text()))
                 _imp->initial_label = *parse_uri_label("default-restrict-primaryuri:", *_imp->id->eapi())->begin();
         }
 
@@ -586 +586 @@
     for (std::list<std::string>::const_iterator t(tokens.begin()), t_end(tokens.end()) ;
             t != t_end ; ++t)
     {
-        IUseFlag f(*t, (*(*_imp->id->eapi())[k::supported()])[k::iuse_flag_parse_options()], std::string::npos);
+        IUseFlag f(*t, _imp->id->eapi()->supported()->iuse_flag_parse_options(), std::string::npos);
         for (UseFlagNameSet::ConstIterator p(prefixes->begin()), p_end(prefixes->end()) ;
                 p != p_end ; ++p)
             if (0 == stringify(f.flag).compare(0, stringify(*p).length(), stringify(*p), 0, stringify(*p).length()))

paludis/repositories/e/e_repository.cc

@@ -150 +150 @@
                         std::tr1::shared_ptr<MetadataKey> key;
                         std::tr1::shared_ptr<const PackageIDSequence> q((*_env)[selection::AllVersionsSorted(
                                     generator::Matches(parse_elike_package_dep_spec(*i,
-                                            (*(*erepository::EAPIData::get_instance()->eapi_from_string(_p))
-                                             [k::supported()])[k::package_dep_spec_parse_options()],
+                                            erepository::EAPIData::get_instance()->eapi_from_string(_p)->supported()->package_dep_spec_parse_options(),
                                             std::tr1::shared_ptr<const PackageID>())) |
                                     filter::InstalledAtRoot(_env->root()))]);
                         if (q->empty())
@@ -362 +361 @@
 
         profile_ptr.reset(new ERepositoryProfile(
                     params.environment, repo, repo->name(), *params.profiles,
-                    (*(*erepository::EAPIData::get_instance()->eapi_from_string(
-                        params.eapi_when_unknown))[k::supported()])[k::ebuild_environment_variables()][k::env_arch()]));
+                    erepository::EAPIData::get_instance()->eapi_from_string(
+                        params.eapi_when_unknown)->supported()->ebuild_environment_variables()->env_arch()));
     }
 
     void
@@ -407 +406 @@
                             (k::status(), tokens.at(2))
                             (k::profile(), std::tr1::shared_ptr<ERepositoryProfile>(new ERepositoryProfile(
                                         params.environment, repo, repo->name(), profiles,
-                                        (*(*erepository::EAPIData::get_instance()->eapi_from_string(
-                                            params.eapi_when_unknown))[k::supported()])[k::ebuild_environment_variables()][k::env_arch()]))));
+                                        erepository::EAPIData::get_instance()->eapi_from_string(
+                                            params.eapi_when_unknown)->supported()->ebuild_environment_variables()->env_arch()))));
                 }
                 catch (const InternalError &)
                 {
@@ -596 +595 @@
             {
                 std::tr1::shared_ptr<const PackageDepSpec> a(new PackageDepSpec(parse_elike_package_dep_spec(
                                 line->first,
-                                (*(*erepository::EAPIData::get_instance()->eapi_from_string(_imp->params.profile_eapi))
-                                 [k::supported()])[k::package_dep_spec_parse_options()],
+                                erepository::EAPIData::get_instance()->eapi_from_string(
+                                    _imp->params.profile_eapi)->supported()->package_dep_spec_parse_options(),
                                 std::tr1::shared_ptr<const PackageID>())));
                 if (a->package_ptr())
                     _imp->repo_mask[*a->package_ptr()].push_back(std::make_pair(a, line->second));
@@ -641 +640 @@
 
     const erepository::ERepositoryID & id(static_cast<const erepository::ERepositoryID &>(e));
 
-    if (! (*id.eapi())[k::supported()])
+    if (! id.eapi()->supported())
     {
         Log::get_instance()->message("e.query_use.unsupported_eapi", ll_qa, lc_no_context)
             << "Was asked for the state of USE flag '" << f << "' for ID '" << e
@@ -671 +670 @@
             if (id.iuse_key()->value()->end() != id.iuse_key()->value()->find(IUseFlag(f, use_disabled, 0)))
                 break;
 
-            if (! (*(*id.eapi())[k::supported()])[k::ebuild_options()].require_use_expand_in_iuse)
+            if (! id.eapi()->supported()->ebuild_options()->require_use_expand_in_iuse())
             {
                 if (arch_flags()->end() != arch_flags()->find(f))
                     break;
@@ -688 +687 @@
 
                 Log::get_instance()->message("e.query_use.not_in_iuse", ll_qa, lc_context)
                     << "Was asked for the state of "
-                    << (*(*id.eapi())[k::supported()])[k::ebuild_environment_variables()][k::env_use()]
+                    << id.eapi()->supported()->ebuild_environment_variables()->env_use()
                     << " flag '" << f << "' for ID '" << e
                     << "', but that flag is not listed in " << id.iuse_key()->raw_name() << " and is not a "
-                    << (*(*id.eapi())[k::supported()])[k::ebuild_environment_variables()][k::env_use_expand()] << " or "
-                    << (*(*id.eapi())[k::supported()])[k::ebuild_environment_variables()][k::env_arch()] << " value";
+                    << id.eapi()->supported()->ebuild_environment_variables()->env_use_expand() << " or "
+                    << id.eapi()->supported()->ebuild_environment_variables()->env_arch() << " value";
             }
             else
                 Log::get_instance()->message("e.query_use.not_in_iuse", ll_qa, lc_context)
                     << "Was asked for the state of "
-                    << (*(*id.eapi())[k::supported()])[k::ebuild_environment_variables()][k::env_use()]
+                    << id.eapi()->supported()->ebuild_environment_variables()->env_use()
                     << " flag '" << f << "' for ID '" << e
                     << "', but that flag is not listed in " << id.iuse_key()->raw_name();
 
@@ -999 +998 @@
 {
     _imp->need_profiles();
 
-    std::string expand_sep(stringify((*(*erepository::EAPIData::get_instance()->eapi_from_string(
-                            (_imp->params.profile_eapi)))[k::supported()])[k::ebuild_options()].use_expand_separator));
+    std::string expand_sep(stringify(erepository::EAPIData::get_instance()->eapi_from_string(
+                    _imp->params.profile_eapi)->supported()->ebuild_options()->use_expand_separator()));
     std::tr1::shared_ptr<UseFlagNameSet> result(new UseFlagNameSet);
     for (ERepositoryProfile::UseExpandConstIterator i(_imp->profile_ptr->begin_use_expand()),
             i_end(_imp->profile_ptr->end_use_expand()) ; i != i_end ; ++i)
@@ -1060 +1059 @@
     if (this != id.repository().get())
         return '\0';
     const std::tr1::shared_ptr<const erepository::EAPI> & eapi(static_cast<const erepository::ERepositoryID &>(id).eapi());
-    return (*eapi)[k::supported()] ? (*(*eapi)[k::supported()])[k::ebuild_options()].use_expand_separator : '\0';
+    return eapi->supported() ? eapi->supported()->ebuild_options()->use_expand_separator() : '\0';
 }
 
 void
@@ -1154 +1153 @@
 
     if (_imp->use_desc.empty())
     {
-        std::string expand_sep(stringify((*(*erepository::EAPIData::get_instance()->eapi_from_string(
-                                _imp->params.profile_eapi))[k::supported()])[k::ebuild_options()].use_expand_separator));
+        std::string expand_sep(stringify(erepository::EAPIData::get_instance()->eapi_from_string(
+                        _imp->params.profile_eapi)->supported()->ebuild_options()->use_expand_separator()));
         std::tr1::shared_ptr<const FSEntrySequence> use_desc_dirs(_imp->layout->use_desc_dirs());
         for (FSEntrySequence::ConstIterator p(use_desc_dirs->begin()), p_end(use_desc_dirs->end()) ;
                 p != p_end ; ++p)
@@ -1184 +1183 @@
 {
     std::string f(e.repository()->format_key() ? e.repository()->format_key()->value() : "");
     if (f == "ebuild")
-        return (*(*static_cast<const erepository::ERepositoryID &>(e).eapi())[k::supported()])[k::can_be_pbin()];
+        return static_cast<const erepository::ERepositoryID &>(e).eapi()->supported()->can_be_pbin();
     else
         return false;
 }
@@ -1464 +1463 @@
 std::string
 ERepository::accept_keywords_variable() const
 {
-    return (*(*erepository::EAPIData::get_