1 files changed, 167 insertions, 100 deletions

diff --git a/paludis/repositories/e/qa/qa_checks.cc b/paludis/repositories/e/qa/qa_checks.cc
index 97e2d4a71..a791fc483 100644
--- a/paludis/repositories/e/qa/qa_checks.cc
+++ b/paludis/repositories/e/qa/qa_checks.cc
@@ -18,8 +18,11 @@
  */
 
 #include <paludis/repositories/e/qa/qa_checks.hh>
+#include <paludis/repositories/e/extra_distribution_data.hh>
 #include <paludis/util/private_implementation_pattern-impl.hh>
-#include <paludis/util/instantiation_policy-impl.hh>
+#include <paludis/util/wrapped_forward_iterator.hh>
+#include <paludis/distribution.hh>
+#include <paludis/environment.hh>
 
 #include <paludis/repositories/e/qa/stray_files.hh>
 #include <paludis/repositories/e/qa/manifest.hh>
@@ -55,13 +58,12 @@
 using namespace paludis;
 using namespace paludis::erepository;
 
-template class InstantiationPolicy<QAChecks, instantiation_method::SingletonTag>;
-
 namespace paludis
 {
     template <>
     struct Implementation<QAChecks>
     {
+        const Environment * const env;
         const std::tr1::shared_ptr<QAChecksGroup<TreeCheckFunction> > tree_checks_group;
         const std::tr1::shared_ptr<QAChecksGroup<EclassFileContentsCheckFunction> > eclass_file_contents_checks_group;
         const std::tr1::shared_ptr<QAChecksGroup<CategoryDirCheckFunction> > category_dir_checks_group;
@@ -69,7 +71,8 @@ namespace paludis
         const std::tr1::shared_ptr<QAChecksGroup<PackageIDCheckFunction> > package_id_checks_group;
         const std::tr1::shared_ptr<QAChecksGroup<PackageIDFileContentsCheckFunction> > package_id_file_contents_checks_group;
 
-        Implementation() :
+        Implementation(const Environment * const e) :
+            env(e),
             tree_checks_group(new QAChecksGroup<TreeCheckFunction>),
             eclass_file_contents_checks_group(new QAChecksGroup<EclassFileContentsCheckFunction>),
             category_dir_checks_group(new QAChecksGroup<CategoryDirCheckFunction>),
@@ -81,133 +84,197 @@ namespace paludis
     };
 }
 
-QAChecks::QAChecks() :
-    PrivateImplementationPattern<QAChecks>(new Implementation<QAChecks>())
+QAChecks::QAChecks(const Environment * const env) :
+    PrivateImplementationPattern<QAChecks>(new Implementation<QAChecks>(env))
 {
     using namespace std::tr1::placeholders;
 
-    _imp->tree_checks_group->add_check("stray_tree_files",
-            std::tr1::bind(stray_files_check, _2, _4, _1, is_stray_at_tree_dir, "stray_tree_files"));
-
-    _imp->tree_checks_group->add_check("repo_name",
-            std::tr1::bind(repo_name_check, _2, _1, "repo_name"));
-
-    _imp->tree_checks_group->add_check("categories",
-            std::tr1::bind(categories_check, _2, _4, "categories"));
-
-    _imp->eclass_file_contents_checks_group->add_check("variable_assigns",
-            std::tr1::bind(variable_assigns_check, _1, _2, std::tr1::shared_ptr<const ERepositoryID>(), _5, "variable_assigns"));
-
-    _imp->eclass_file_contents_checks_group->add_check("deprecated_functions",
-            std::tr1::bind(deprecated_functions_check, _1, _2, std::tr1::shared_ptr<const ERepositoryID>(), _5, "deprecated_functions"));
-
-    _imp->eclass_file_contents_checks_group->add_check("subshell_die",
-            std::tr1::bind(subshell_die_check, _1, _2, std::tr1::shared_ptr<const ERepositoryID>(), _5, "subshell_die"));
+    const std::tr1::shared_ptr<const EDistribution> distribution(EExtraDistributionData::get_instance()->data_from_distribution(
+                *DistributionData::get_instance()->distribution_from_string(_imp->env->distribution())));
 
-    _imp->eclass_file_contents_checks_group->add_check("header",
-            std::tr1::bind(header_check, _1, _2, std::tr1::shared_ptr<const ERepositoryID>(), _5, "header"));
+    if (distribution->qa_tree_checks()->end() != distribution->qa_tree_checks()->find("stray_tree_files"))
+        _imp->tree_checks_group->add_check("stray_tree_files",
+                std::tr1::bind(stray_files_check, _2, _4, _1, is_stray_at_tree_dir, "stray_tree_files"));
 
-    _imp->eclass_file_contents_checks_group->add_check("function_keyword",
-            std::tr1::bind(function_keyword_check, _1, _2, std::tr1::shared_ptr<const ERepositoryID>(), _5, "function_keyword"));
+    if (distribution->qa_tree_checks()->end() != distribution->qa_tree_checks()->find("repo_name"))
+        _imp->tree_checks_group->add_check("repo_name",
+                std::tr1::bind(repo_name_check, _2, _1, "repo_name"));
 
-    _imp->eclass_file_contents_checks_group->add_check("whitespace",
-            std::tr1::bind(whitespace_check, _1, _2, std::tr1::shared_ptr<const ERepositoryID>(), _5, "whitespace"));
+    if (distribution->qa_tree_checks()->end() != distribution->qa_tree_checks()->find("categories"))
+        _imp->tree_checks_group->add_check("categories",
+                std::tr1::bind(categories_check, _2, _4, "categories"));
 
-    _imp->category_dir_checks_group->add_check("stray_category_dir_files",
-            std::tr1::bind(stray_files_check, _2, _4, _1, is_stray_at_category_dir, "stray_category_dir_files"));
+    if (distribution->qa_eclass_file_contents_checks()->end() != distribution->qa_eclass_file_contents_checks()->find("variable_assigns"))
+        _imp->eclass_file_contents_checks_group->add_check("variable_assigns",
+                std::tr1::bind(variable_assigns_check, _1, _2, std::tr1::shared_ptr<const ERepositoryID>(), _5, "variable_assigns"));
 
-    _imp->package_dir_checks_group->add_check("manifest",
-            std::tr1::bind(manifest_check, _2, _1, _4, _5, "manifest"));
+    if (distribution->qa_eclass_file_contents_checks()->end() != distribution->qa_eclass_file_contents_checks()->find("deprecated_functions"))
+        _imp->eclass_file_contents_checks_group->add_check("deprecated_functions",
+                std::tr1::bind(deprecated_functions_check, _1, _2, std::tr1::shared_ptr<const ERepositoryID>(), _5, "deprecated_functions"));
 
-    _imp->package_dir_checks_group->add_check("ebuild_count",
-            std::tr1::bind(ebuild_count_check, _2, _1, _4, _5, "ebuild_count"));
+    if (distribution->qa_eclass_file_contents_checks()->end() != distribution->qa_eclass_file_contents_checks()->find("subshell_die"))
+        _imp->eclass_file_contents_checks_group->add_check("subshell_die",
+                std::tr1::bind(subshell_die_check, _1, _2, std::tr1::shared_ptr<const ERepositoryID>(), _5, "subshell_die"));
 
-    _imp->package_dir_checks_group->add_check("changelog",
-            std::tr1::bind(changelog_check, _2, _1, _5, "changelog"));
+    if (distribution->qa_eclass_file_contents_checks()->end() != distribution->qa_eclass_file_contents_checks()->find("header"))
+        _imp->eclass_file_contents_checks_group->add_check("header",
+                std::tr1::bind(header_check, _1, _2, std::tr1::shared_ptr<const ERepositoryID>(), _5, "header"));
 
-    _imp->package_dir_checks_group->add_check("misc_files",
-            std::tr1::bind(misc_files_check, _2, _1, "misc_files"));
+    if (distribution->qa_eclass_file_contents_checks()->end() != distribution->qa_eclass_file_contents_checks()->find("function_keyword"))
+        _imp->eclass_file_contents_checks_group->add_check("function_keyword",
+                std::tr1::bind(function_keyword_check, _1, _2, std::tr1::shared_ptr<const ERepositoryID>(), _5, "function_keyword"));
 
-    _imp->package_dir_checks_group->add_check("files_dir_size",
-            std::tr1::bind(files_dir_size_check, _2, _1, "files_dir_size"));
+    if (distribution->qa_eclass_file_contents_checks()->end() != distribution->qa_eclass_file_contents_checks()->find("whitespace"))
+        _imp->eclass_file_contents_checks_group->add_check("whitespace",
+                std::tr1::bind(whitespace_check, _1, _2, std::tr1::shared_ptr<const ERepositoryID>(), _5, "whitespace"));
 
-    _imp->package_id_checks_group->add_check("eapi_supported",
-            std::tr1::bind(eapi_supported_check, _1, _2, _5, "eapi_supported"));
+    if (distribution->qa_category_dir_checks()->end() != distribution->qa_category_dir_checks()->find("stray_category_dir_files"))
+        _imp->category_dir_checks_group->add_check("stray_category_dir_files",
+                std::tr1::bind(stray_files_check, _2, _4, _1, is_stray_at_category_dir, "stray_category_dir_files"));
 
-    _imp->package_id_checks_group->add_check("metadata_keys",
-            std::tr1::bind(metadata_keys_check, _1, _2, _5, "metadata_keys"));
-    _imp->package_id_checks_group->add_prerequirement("metadata_keys", "eapi_supported");
+    if (distribution->qa_package_dir_checks()->end() != distribution->qa_package_dir_checks()->find("manifest"))
+        _imp->package_dir_checks_group->add_check("manifest",
+                std::tr1::bind(manifest_check, _2, _1, _4, _5, "manifest"));
 
-    _imp->package_id_checks_group->add_check("short_description_key",
-            std::tr1::bind(short_description_key_check, _1, _2, _5, "short_description_key"));
-    _imp->package_id_checks_group->add_prerequirement("short_description_key", "metadata_keys");
+    if (distribution->qa_package_dir_checks()->end() != distribution->qa_package_dir_checks()->find("ebuild_count"))
+        _imp->package_dir_checks_group->add_check("ebuild_count",
+                std::tr1::bind(ebuild_count_check, _2, _1, _4, _5, "ebuild_count"));
 
-    _imp->package_id_checks_group->add_check("homepage_key",
-            std::tr1::bind(homepage_key_check, _1, _2, _5, "homepage_key"));
-    _imp->package_id_checks_group->add_prerequirement("homepage_key", "metadata_keys");
+    if (distribution->qa_package_dir_checks()->end() != distribution->qa_package_dir_checks()->find("changelog"))
+        _imp->package_dir_checks_group->add_check("changelog",
+                std::tr1::bind(changelog_check, _2, _1, _5, "changelog"));
 
-    _imp->package_id_checks_group->add_check("iuse_key",
-            std::tr1::bind(iuse_key_check, _1, _2, _4, _5, "iuse_key"));
-    _imp->package_id_checks_group->add_prerequirement("iuse_key", "metadata_keys");
+    if (distribution->qa_package_dir_checks()->end() != distribution->qa_package_dir_checks()->find("misc_files"))
+        _imp->package_dir_checks_group->add_check("misc_files",
+                std::tr1::bind(misc_files_check, _2, _1, "misc_files"));
 
-    _imp->package_id_checks_group->add_check("keywords_key",
-            std::tr1::bind(keywords_key_check, _1, _2, _5, "keywords_key"));
-    _imp->package_id_checks_group->add_prerequirement("keywords_key", "metadata_keys");
+    if (distribution->qa_package_dir_checks()->end() != distribution->qa_package_dir_checks()->find("files_dir_size"))
+        _imp->package_dir_checks_group->add_check("files_dir_size",
+                std::tr1::bind(files_dir_size_check, _2, _1, "files_dir_size"));
 
-    _imp->package_id_checks_group->add_check("license_key",
-            std::tr1::bind(license_key_check, _1, _2, _4, _5, "license_key"));
-    _imp->package_id_checks_group->add_prerequirement("license_key", "metadata_keys");
+    if (distribution->qa_package_id_checks()->end() != distribution->qa_package_id_checks()->find("eapi_supported"))
+        _imp->package_id_checks_group->add_check("eapi_supported",
+                std::tr1::bind(eapi_supported_check, _1, _2, _5, "eapi_supported"));
 
-    _imp->package_id_checks_group->add_check("spec_keys",
-            std::tr1::bind(spec_keys_check, _1, _2, _5, "spec_keys"));
-    _imp->package_id_checks_group->add_prerequirement("spec_keys", "metadata_keys");
-
-    _imp->package_id_checks_group->add_check("extractors",
-            std::tr1::bind(extractors_check, _1, _2, _5, "extractors"));
-    _imp->package_id_checks_group->add_prerequirement("extractors", "metadata_keys");
-
-    _imp->package_id_checks_group->add_check("fetches_key",
-            std::tr1::bind(fetches_key_check, _1, _2, _5, "fetches_key"));
-    _imp->package_id_checks_group->add_prerequirement("fetches_key", "metadata_keys");
-
-    _imp->package_id_checks_group->add_check("restrict_key",
-            std::tr1::bind(restrict_key_check, _1, _2, _5, "restrict_key"));
-    _imp->package_id_checks_group->add_prerequirement("restrict_key", "metadata_keys");
+    if (distribution->qa_package_id_checks()->end() != distribution->qa_package_id_checks()->find("metadata_keys"))
+    {
+        _imp->package_id_checks_group->add_check("metadata_keys",
+                std::tr1::bind(metadata_keys_check, _1, _2, _5, "metadata_keys"));
+        _imp->package_id_checks_group->add_prerequirement("metadata_keys", "eapi_supported");
+    }
 
-    _imp->package_id_checks_group->add_check("inherited_key",
-            std::tr1::bind(inherited_key_check, _1, _2, _5, "inherited_key"));
-    _imp->package_id_checks_group->add_prerequirement("inherited_key", "metadata_keys");
+    if (distribution->qa_package_id_checks()->end() != distribution->qa_package_id_checks()->find("short_description_key"))
+    {
+        _imp->package_id_checks_group->add_check("short_description_key",
+                std::tr1::bind(short_description_key_check, _1, _2, _5, "short_description_key"));
+        _imp->package_id_checks_group->add_prerequirement("short_description_key", "metadata_keys");
+    }
 
-    _imp->package_id_checks_group->add_check("visibility",
-            std::tr1::bind(visibility_check, _1, _2, _3, _4, _5, "visibility"));
-    _imp->package_id_checks_group->add_prerequirement("visibility", "metadata_keys");
+    if (distribution->qa_package_id_checks()->end() != distribution->qa_package_id_checks()->find("homepage_key"))
+    {
+        _imp->package_id_checks_group->add_check("homepage_key",
+                std::tr1::bind(homepage_key_check, _1, _2, _5, "homepage_key"));
+        _imp->package_id_checks_group->add_prerequirement("homepage_key", "metadata_keys");
+    }
 
-    _imp->package_id_file_contents_checks_group->add_check("default_functions",
-            std::tr1::bind(default_functions_check, _1, _2, _5, _6, "default_functions"));
+    if (distribution->qa_package_id_checks()->end() != distribution->qa_package_id_checks()->find("iuse_key"))
+    {
+        _imp->package_id_checks_group->add_check("iuse_key",
+                std::tr1::bind(iuse_key_check, _1, _2, _4, _5, "iuse_key"));
+        _imp->package_id_checks_group->add_prerequirement("iuse_key", "metadata_keys");
+    }
 
-    _imp->package_id_file_contents_checks_group->add_check("variable_assigns",
-            std::tr1::bind(variable_assigns_check, _1, _2, _5, _6, "variable_assigns"));
+    if (distribution->qa_package_id_checks()->end() != distribution->qa_package_id_checks()->find("keywords_key"))
+    {
+        _imp->package_id_checks_group->add_check("keywords_key",
+                std::tr1::bind(keywords_key_check, _1, _2, _5, "keywords_key"));
+        _imp->package_id_checks_group->add_prerequirement("keywords_key", "metadata_keys");
+    }
 
-    _imp->package_id_file_contents_checks_group->add_check("deprecated_functions",
-            std::tr1::bind(deprecated_functions_check, _1, _2, _5, _6, "deprecated_functions"));
+    if (distribution->qa_package_id_checks()->end() != distribution->qa_package_id_checks()->find("license_key"))
+    {
+        _imp->package_id_checks_group->add_check("license_key",
+                std::tr1::bind(license_key_check, _1, _2, _4, _5, "license_key"));
+        _imp->package_id_checks_group->add_prerequirement("license_key", "metadata_keys");
+    }
 
-    _imp->package_id_file_contents_checks_group->add_check("kv_variables",
-            std::tr1::bind(kv_variables_check, _1, _2, _5, _6, "kv_variables"));
+    if (distribution->qa_package_id_checks()->end() != distribution->qa_package_id_checks()->find("spec_keys"))
+    {
+        _imp->package_id_checks_group->add_check("spec_keys",
+                std::tr1::bind(spec_keys_check, _1, _2, _5, "spec_keys"));
+        _imp->package_id_checks_group->add_prerequirement("spec_keys", "metadata_keys");
+    }
 
-    _imp->package_id_file_contents_checks_group->add_check("root_variable",
-            std::tr1::bind(root_variable_check, _1, _2, _5, _6, "root_variable"));
+    if (distribution->qa_package_id_checks()->end() != distribution->qa_package_id_checks()->find("extractors"))
+    {
+        _imp->package_id_checks_group->add_check("extractors",
+                std::tr1::bind(extractors_check, _1, _2, _5, "extractors"));
+        _imp->package_id_checks_group->add_prerequirement("extractors", "metadata_keys");
+    }
 
-    _imp->package_id_file_contents_checks_group->add_check("subshell_die",
-            std::tr1::bind(subshell_die_check, _1, _2, _5, _6, "subshell_die"));
+    if (distribution->qa_package_id_checks()->end() != distribution->qa_package_id_checks()->find("fetches_key"))
+    {
+        _imp->package_id_checks_group->add_check("fetches_key",
+                std::tr1::bind(fetches_key_check, _1, _2, _5, "fetches_key"));
+        _imp->package_id_checks_group->add_prerequirement("fetches_key", "metadata_keys");
+    }
 
-    _imp->package_id_file_contents_checks_group->add_check("function_keyword",
-            std::tr1::bind(function_keyword_check, _1, _2, _5, _6, "function_keyword"));
+    if (distribution->qa_package_id_checks()->end() != distribution->qa_package_id_checks()->find("restrict_key"))
+    {
+        _imp->package_id_checks_group->add_check("restrict_key",
+                std::tr1::bind(restrict_key_check, _1, _2, _5, "restrict_key"));
+        _imp->package_id_checks_group->add_prerequirement("restrict_key", "metadata_keys");
+    }
 
-    _imp->package_id_file_contents_checks_group->add_check("whitespace",
-            std::tr1::bind(whitespace_check, _1, _2, _5, _6, "whitespace"));
+    if (distribution->qa_package_id_checks()->end() != distribution->qa_package_id_checks()->find("inherited_key"))
+    {
+        _imp->package_id_checks_group->add_check("inherited_key",
+                std::tr1::bind(inherited_key_check, _1, _2, _5, "inherited_key"));
+        _imp->package_id_checks_group->add_prerequirement("inherited_key", "metadata_keys");
+    }
 
-    _imp->package_id_file_contents_checks_group->add_check("header",
-            std::tr1::bind(header_check, _1, _2, _5, _6, "header"));
+    if (distribution->qa_package_id_checks()->end() != distribution->qa_package_id_checks()->find("visibility"))
+    {
+        _imp->package_id_checks_group->add_check("visibility",
+                std::tr1::bind(visibility_check, _1, _2, _3, _4, _5, "visibility"));
+        _imp->package_id_checks_group->add_prerequirement("visibility", "metadata_keys");
+    }
+
+    if (distribution->qa_package_id_file_contents_checks()->end() != distribution->qa_package_id_file_contents_checks()->find("default_functions"))
+        _imp->package_id_file_contents_checks_group->add_check("default_functions",
+                std::tr1::bind(default_functions_check, _1, _2, _5, _6, "default_functions"));
+
+    if (distribution->qa_package_id_file_contents_checks()->end() != distribution->qa_package_id_file_contents_checks()->find("variable_assigns"))
+        _imp->package_id_file_contents_checks_group->add_check("variable_assigns",
+                std::tr1::bind(variable_assigns_check, _1, _2, _5, _6, "variable_assigns"));
+
+    if (distribution->qa_package_id_file_contents_checks()->end() != distribution->qa_package_id_file_contents_checks()->find("deprecated_functions"))
+        _imp->package_id_file_contents_checks_group->add_check("deprecated_functions",
+                std::tr1::bind(deprecated_functions_check, _1, _2, _5, _6, "deprecated_functions"));
+
+    if (distribution->qa_package_id_file_contents_checks()->end() != distribution->qa_package_id_file_contents_checks()->find("kv_variables"))
+        _imp->package_id_file_contents_checks_group->add_check("kv_variables",
+                std::tr1::bind(kv_variables_check, _1, _2, _5, _6, "kv_variables"));
+
+    if (distribution->qa_package_id_file_contents_checks()->end() != distribution->qa_package_id_file_contents_checks()->find("root_variable"))
+        _imp->package_id_file_contents_checks_group->add_check("root_variable",
+                std::tr1::bind(root_variable_check, _1, _2, _5, _6, "root_variable"));
+
+    if (distribution->qa_package_id_file_contents_checks()->end() != distribution->qa_package_id_file_contents_checks()->find("subshell_die"))
+        _imp->package_id_file_contents_checks_group->add_check("subshell_die",
+                std::tr1::bind(subshell_die_check, _1, _2, _5, _6, "subshell_die"));
+
+    if (distribution->qa_package_id_file_contents_checks()->end() != distribution->qa_package_id_file_contents_checks()->find("function_keyword"))
+        _imp->package_id_file_contents_checks_group->add_check("function_keyword",
+                std::tr1::bind(function_keyword_check, _1, _2, _5, _6, "function_keyword"));
+
+    if (distribution->qa_package_id_file_contents_checks()->end() != distribution->qa_package_id_file_contents_checks()->find("whitespace"))
+        _imp->package_id_file_contents_checks_group->add_check("whitespace",
+                std::tr1::bind(whitespace_check, _1, _2, _5, _6, "whitespace"));
+
+    if (distribution->qa_package_id_file_contents_checks()->end() != distribution->qa_package_id_file_contents_checks()->find("header"))
+        _imp->package_id_file_contents_checks_group->add_check("header",
+                std::tr1::bind(header_check, _1, _2, _5, _6, "header"));
 }
 
 QAChecks::~QAChecks()