Dep tags are no longer needed

8 files changed, 2 insertions, 27 deletions

diff --git a/paludis/repositories/accounts/accounts_repository.cc b/paludis/repositories/accounts/accounts_repository.cc
index 483c84cfb..1ca62acb4 100644
--- a/paludis/repositories/accounts/accounts_repository.cc
+++ b/paludis/repositories/accounts/accounts_repository.cc
@@ -30,7 +30,6 @@
 #include <paludis/util/stringify.hh>
 #include <paludis/util/log.hh>
 #include <paludis/util/make_null_shared_ptr.hh>
-#include <paludis/dep_tag.hh>
 #include <paludis/literal_metadata_key.hh>
 #include <paludis/action.hh>
 #include <paludis/package_id.hh>
diff --git a/paludis/repositories/cran/cran_installed_repository.cc b/paludis/repositories/cran/cran_installed_repository.cc
index 77f6459fe..02d46a2c8 100644
--- a/paludis/repositories/cran/cran_installed_repository.cc
+++ b/paludis/repositories/cran/cran_installed_repository.cc
@@ -21,7 +21,6 @@
 #include <paludis/environment.hh>
 #include <paludis/util/pimp-impl.hh>
 #include <paludis/dep_spec.hh>
-#include <paludis/dep_tag.hh>
 #include <paludis/util/config_file.hh>
 #include <paludis/set_file.hh>
 #include <paludis/action.hh>
diff --git a/paludis/repositories/e/e_installed_repository.cc b/paludis/repositories/e/e_installed_repository.cc
index fda8d2247..e437114ee 100644
--- a/paludis/repositories/e/e_installed_repository.cc
+++ b/paludis/repositories/e/e_installed_repository.cc
@@ -45,7 +45,6 @@
 #include <paludis/environment.hh>
 #include <paludis/set_file.hh>
 #include <paludis/hook.hh>
-#include <paludis/dep_tag.hh>
 #include <paludis/user_dep_spec.hh>
 #include <paludis/generator.hh>
 #include <paludis/filter.hh>
diff --git a/paludis/repositories/e/e_repository_sets.cc b/paludis/repositories/e/e_repository_sets.cc
index c2331df37..186b28b61 100644
--- a/paludis/repositories/e/e_repository_sets.cc
+++ b/paludis/repositories/e/e_repository_sets.cc
@@ -26,7 +26,6 @@
 
 #include <paludis/action-fwd.hh>
 #include <paludis/dep_spec.hh>
-#include <paludis/dep_tag.hh>
 #include <paludis/elike_slot_requirement.hh>
 #include <paludis/environment.hh>
 #include <paludis/filter.hh>
@@ -116,8 +115,6 @@ ERepositorySets::package_set(const SetName & ss) const
 
     if ((_imp->params.setsdir() / (stringify(s.first) + ".conf")).stat().exists())
     {
-        std::shared_ptr<GeneralSetDepTag> tag(std::make_shared<GeneralSetDepTag>(ss, stringify(_imp->e_repository->name())));
-
         FSPath ff(_imp->params.setsdir() / (stringify(s.first) + ".conf"));
         Context context("When loading package set '" + stringify(s.first) + "' from '" + stringify(ff) + "':");
 
@@ -126,7 +123,6 @@ ERepositorySets::package_set(const SetName & ss) const
                     n::file_name() = ff,
                     n::parser() = std::bind(&parse_user_package_dep_spec, _1, _imp->environment, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set, filter::All()),
                     n::set_operator_mode() = s.second,
-                    n::tag() = tag,
                     n::type() = sft_paludis_conf
                     ));
 
@@ -258,8 +254,6 @@ ERepositorySets::security_set(bool insecurity) const
     if (!_imp->params.securitydir().stat().is_directory_or_symlink_to_directory())
         return security_packages;
 
-    std::map<std::string, std::shared_ptr<GLSADepTag> > glsa_tags;
-
     for (FSIterator f(_imp->params.securitydir(), { }), f_end ; f != f_end; ++f)
     {
         if (! is_file_with_prefix_extension(*f, "glsa-", ".xml", { }))
@@ -298,10 +292,6 @@ ERepositorySets::security_set(bool insecurity) const
                     if (! is_vulnerable(*glsa_pkg, **c, ver_options, pds_options))
                         continue;
 
-                    if (glsa_tags.end() == glsa_tags.find(glsa->id()))
-                        glsa_tags.insert(std::make_pair(glsa->id(), std::shared_ptr<GLSADepTag>(
-                                        std::make_shared<GLSADepTag>(glsa->id(), glsa->title(), *f))));
-
                     if (insecurity)
                     {
                         std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(
@@ -311,7 +301,6 @@ ERepositorySets::security_set(bool insecurity) const
                                             n::version_operator() = vo_equal,
                                             n::version_spec() = (*c)->version()))
                                     .in_repository((*c)->repository_name())));
-                        spec->set_tag(glsa_tags.find(glsa->id())->second);
                         security_packages->top()->append(spec);
                     }
                     else
@@ -344,7 +333,6 @@ ERepositorySets::security_set(bool insecurity) const
                                                 n::version_operator() = vo_equal,
                                                 n::version_spec() = (*r)->version()))
                                         .in_repository((*r)->repository_name())));
-                            spec->set_tag(glsa_tags.find(glsa->id())->second);
                             security_packages->top()->append(spec);
                             ok = true;
                             break;
diff --git a/paludis/repositories/e/exheres_profile.cc b/paludis/repositories/e/exheres_profile.cc
index 166fd1633..07154dfd3 100644
--- a/paludis/repositories/e/exheres_profile.cc
+++ b/paludis/repositories/e/exheres_profile.cc
@@ -40,7 +40,6 @@
 #include <paludis/util/fs_stat.hh>
 
 #include <paludis/choice.hh>
-#include <paludis/dep_tag.hh>
 #include <paludis/environment.hh>
 #include <paludis/match_package.hh>
 #include <paludis/distribution.hh>
@@ -93,10 +92,9 @@ namespace paludis
         const std::shared_ptr<Set<std::string> > use_expand_values;
 
         const std::shared_ptr<SetSpecTree> system_packages;
-        const std::shared_ptr<GeneralSetDepTag> system_tag;
 
         Imp(const Environment * const e, const ERepository * const p,
-                const RepositoryName & name, const FSPathSequence &,
+                const RepositoryName &, const FSPathSequence &,
                 const std::string &, const bool) :
             env(e),
             repository(p),
@@ -114,8 +112,7 @@ namespace paludis
             use_expand_implicit(std::make_shared<Set<std::string>>()),
             iuse_implicit(std::make_shared<Set<std::string>>()),
             use_expand_values(std::make_shared<Set<std::string>>()),
-            system_packages(std::make_shared<SetSpecTree>(std::make_shared<AllDepSpec>())),
-            system_tag(std::make_shared<GeneralSetDepTag>(SetName("system"), stringify(name)))
+            system_packages(std::make_shared<SetSpecTree>(std::make_shared<AllDepSpec>()))
         {
             environment_variables["CONFIG_PROTECT"] = getenv_with_default("CONFIG_PROTECT", "/etc");
             environment_variables["CONFIG_PROTECT_MASK"] = getenv_with_default("CONFIG_PROTECT_MASK", "");
@@ -162,7 +159,6 @@ ExheresProfile::ExheresProfile(
                             i->first->supported()->package_dep_spec_parse_options(),
                             i->first->supported()->version_spec_options())));
 
-            spec->set_tag(_imp->system_tag);
             _imp->system_packages->top()->append(spec);
         }
 
diff --git a/paludis/repositories/e/traditional_profile.cc b/paludis/repositories/e/traditional_profile.cc
index b3e51b6f7..6255b1522 100644
--- a/paludis/repositories/e/traditional_profile.cc
+++ b/paludis/repositories/e/traditional_profile.cc
@@ -46,7 +46,6 @@
 #include <paludis/util/make_null_shared_ptr.hh>
 
 #include <paludis/choice.hh>
-#include <paludis/dep_tag.hh>
 #include <paludis/environment.hh>
 #include <paludis/match_package.hh>
 #include <paludis/distribution.hh>
@@ -151,7 +150,6 @@ namespace paludis
             ///\{
 
             std::shared_ptr<SetSpecTree> system_packages;
-            std::shared_ptr<GeneralSetDepTag> system_tag;
 
             ///\}
 
@@ -199,7 +197,6 @@ namespace paludis
                 repository(p),
                 profiles_with_parents(std::make_shared<FSPathSequence>()),
                 system_packages(std::make_shared<SetSpecTree>(std::make_shared<AllDepSpec>())),
-                system_tag(std::make_shared<GeneralSetDepTag>(SetName("system"), stringify(name))),
                 virtuals(std::make_shared<Map<QualifiedPackageName, PackageDepSpec>>()),
                 use_expand(std::make_shared<Set<std::string>>()),
                 use_expand_hidden(std::make_shared<Set<std::string>>()),
@@ -583,7 +580,6 @@ Imp<TraditionalProfile>::make_vars_from_file_vars()
                                 i->first->supported()->package_dep_spec_parse_options(),
                                 i->first->supported()->version_spec_options())));
 
-                spec->set_tag(system_tag);
                 system_packages->top()->append(spec);
             }
     }
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index 08d89250d..d1cbc8862 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -35,7 +35,6 @@
 #include <paludis/user_dep_spec.hh>
 #include <paludis/literal_metadata_key.hh>
 #include <paludis/dep_spec_flattener.hh>
-#include <paludis/dep_tag.hh>
 #include <paludis/distribution.hh>
 #include <paludis/environment.hh>
 #include <paludis/hook.hh>
diff --git a/paludis/repositories/unpackaged/installed_repository.cc b/paludis/repositories/unpackaged/installed_repository.cc
index 557bc18f2..b69dd1ebe 100644
--- a/paludis/repositories/unpackaged/installed_repository.cc
+++ b/paludis/repositories/unpackaged/installed_repository.cc
@@ -38,7 +38,6 @@
 #include <paludis/util/fs_stat.hh>
 #include <paludis/action.hh>
 #include <paludis/environment.hh>
-#include <paludis/dep_tag.hh>
 #include <paludis/metadata_key.hh>
 #include <paludis/literal_metadata_key.hh>
 #include <paludis/user_dep_spec.hh>