aboutsummaryrefslogtreecommitdiff
path: root/paludis/environments/paludis
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-02-06 15:17:14 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-02-06 15:17:14 +0000
commit7c929c87597f4e6fcfe8638e03e7b60c22090415 (patch)
tree625ad4cc2261b7f76d098022db32499845c3fc3e /paludis/environments/paludis
parent05b3a52ec5ab06937bc9038c370db9b347dbe9af (diff)
downloadpaludis-7c929c87597f4e6fcfe8638e03e7b60c22090415.tar.gz
paludis-7c929c87597f4e6fcfe8638e03e7b60c22090415.tar.xz
Dep tags are no longer needed
Diffstat (limited to 'paludis/environments/paludis')
-rw-r--r--paludis/environments/paludis/paludis_environment.cc4
-rw-r--r--paludis/environments/paludis/world.cc6
2 files changed, 0 insertions, 10 deletions
diff --git a/paludis/environments/paludis/paludis_environment.cc b/paludis/environments/paludis/paludis_environment.cc
index ce30f7b33..c44499245 100644
--- a/paludis/environments/paludis/paludis_environment.cc
+++ b/paludis/environments/paludis/paludis_environment.cc
@@ -33,7 +33,6 @@
#include <paludis/hook.hh>
#include <paludis/set_file.hh>
#include <paludis/distribution.hh>
-#include <paludis/dep_tag.hh>
#include <paludis/package_id.hh>
#include <paludis/mask.hh>
#include <paludis/user_dep_spec.hh>
@@ -526,15 +525,12 @@ namespace
{
Context context("When making set '" + stringify(f) + "':");
- const std::shared_ptr<GeneralSetDepTag> tag(std::make_shared<GeneralSetDepTag>(n, stringify(f.basename())));
-
SetFile s(make_named_values<SetFileParams>(
n::environment() = env,
n::file_name() = f,
n::parser() = std::bind(&parse_user_package_dep_spec, std::placeholders::_1, env,
UserPackageDepSpecOptions() + updso_allow_wildcards, filter::All()),
n::set_operator_mode() = mode,
- n::tag() = tag,
n::type() = type
));
return s.contents();
diff --git a/paludis/environments/paludis/world.cc b/paludis/environments/paludis/world.cc
index ea3b90074..b546d4f5d 100644
--- a/paludis/environments/paludis/world.cc
+++ b/paludis/environments/paludis/world.cc
@@ -27,7 +27,6 @@
#include <paludis/util/fs_stat.hh>
#include <paludis/set_file.hh>
#include <paludis/user_dep_spec.hh>
-#include <paludis/dep_tag.hh>
#include <paludis/partially_made_package_dep_spec.hh>
#include <functional>
@@ -121,7 +120,6 @@ World::_add_string_to_world(const std::string & n) const
n::file_name() = *_imp->maybe_world_file,
n::parser() = std::bind(&parse_user_package_dep_spec, _1, _imp->env, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set, filter::All()),
n::set_operator_mode() = sfsmo_natural,
- n::tag() = std::shared_ptr<DepTag>(),
n::type() = sft_simple
));
bool result(world.add(n));
@@ -154,7 +152,6 @@ World::_remove_string_from_world(const std::string & n) const
n::file_name() = *_imp->maybe_world_file,
n::parser() = std::bind(&parse_user_package_dep_spec, _1, _imp->env, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set, filter::All()),
n::set_operator_mode() = sfsmo_natural,
- n::tag() = std::shared_ptr<DepTag>(),
n::type() = sft_simple
));
@@ -177,8 +174,6 @@ World::world_set() const
{
using namespace std::placeholders;
- std::shared_ptr<GeneralSetDepTag> tag(std::make_shared<GeneralSetDepTag>(SetName("world"), "Environment"));
-
if (_imp->maybe_world_file)
{
if (_imp->maybe_world_file->stat().exists())
@@ -188,7 +183,6 @@ World::world_set() const
n::file_name() = *_imp->maybe_world_file,
n::parser() = std::bind(&parse_user_package_dep_spec, _1, _imp->env, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set, filter::All()),
n::set_operator_mode() = sfsmo_natural,
- n::tag() = tag,
n::type() = sft_simple
));
return world.contents();