Constraint -> Requirement

5 files changed, 18 insertions, 18 deletions

diff --git a/paludis/environments/paludis/keywords_conf.cc b/paludis/environments/paludis/keywords_conf.cc
index dd90b2375..461807841 100644
--- a/paludis/environments/paludis/keywords_conf.cc
+++ b/paludis/environments/paludis/keywords_conf.cc
@@ -28,7 +28,7 @@
 #include <paludis/user_dep_spec.hh>
 #include <paludis/match_package.hh>
 #include <paludis/package_id.hh>
-#include <paludis/package_dep_spec_constraint.hh>
+#include <paludis/package_dep_spec_requirement.hh>
 
 #include <paludis/util/config_file.hh>
 #include <paludis/util/options.hh>
@@ -108,9 +108,9 @@ KeywordsConf::add(const FSPath & filename)
         {
             std::shared_ptr<PackageDepSpec> d(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec(
                             tokens.at(0), _imp->env, { updso_allow_wildcards, updso_no_disambiguation, updso_throw_if_set })));
-            if (d->package_name_constraint())
+            if (d->package_name_requirement())
             {
-                KeywordsList & k(_imp->qualified[d->package_name_constraint()->name()][d]);
+                KeywordsList & k(_imp->qualified[d->package_name_requirement()->name()][d]);
                 for (std::vector<std::string>::const_iterator t(next(tokens.begin())), t_end(tokens.end()) ;
                         t != t_end ; ++t)
                     k.push_back(KeywordName(*t));
diff --git a/paludis/environments/paludis/licenses_conf.cc b/paludis/environments/paludis/licenses_conf.cc
index 70b274801..6c4a15cf2 100644
--- a/paludis/environments/paludis/licenses_conf.cc
+++ b/paludis/environments/paludis/licenses_conf.cc
@@ -29,7 +29,7 @@
 #include <paludis/match_package.hh>
 #include <paludis/util/config_file.hh>
 #include <paludis/package_id.hh>
-#include <paludis/package_dep_spec_constraint.hh>
+#include <paludis/package_dep_spec_requirement.hh>
 
 #include <paludis/util/options.hh>
 #include <paludis/util/log.hh>
@@ -108,9 +108,9 @@ LicensesConf::add(const FSPath & filename)
             std::shared_ptr<PackageDepSpec> d(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec(
                             tokens.at(0), _imp->env,
                             { updso_allow_wildcards, updso_no_disambiguation, updso_throw_if_set })));
-            if (d->package_name_constraint())
+            if (d->package_name_requirement())
             {
-                LicensesList & k(_imp->qualified[d->package_name_constraint()->name()][d]);
+                LicensesList & k(_imp->qualified[d->package_name_requirement()->name()][d]);
                 for (std::vector<std::string>::const_iterator t(next(tokens.begin())), t_end(tokens.end()) ;
                         t != t_end ; ++t)
                     k.push_back(*t);
diff --git a/paludis/environments/paludis/suggestions_conf.cc b/paludis/environments/paludis/suggestions_conf.cc
index 1eafbf180..4289dc62f 100644
--- a/paludis/environments/paludis/suggestions_conf.cc
+++ b/paludis/environments/paludis/suggestions_conf.cc
@@ -41,7 +41,7 @@
 #include <paludis/match_package.hh>
 #include <paludis/package_id.hh>
 #include <paludis/dep_spec_annotations.hh>
-#include <paludis/package_dep_spec_constraint.hh>
+#include <paludis/package_dep_spec_requirement.hh>
 
 #include <unordered_map>
 #include <list>
@@ -150,9 +150,9 @@ SuggestionsConf::add(const FSPath & filename)
             std::shared_ptr<PackageDepSpec> d(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec(
                             tokens.at(0), _imp->env,
                             { updso_allow_wildcards, updso_no_disambiguation, updso_throw_if_set })));
-            if (d->package_name_constraint())
+            if (d->package_name_requirement())
             {
-                ValuesList & k(_imp->qualified[d->package_name_constraint()->name()][d]);
+                ValuesList & k(_imp->qualified[d->package_name_requirement()->name()][d]);
                 for (std::vector<std::string>::const_iterator t(next(tokens.begin())), t_end(tokens.end()) ;
                         t != t_end ; ++t)
                     k.push_back(ValueFlag(*t));
@@ -212,10 +212,10 @@ SuggestionsConf::interest_in_suggestion(
                     else
                     {
                         if (! l->pkg_requirement.empty())
-                            if (stringify(spec.package_name_constraint()->name().package()) != l->pkg_requirement)
+                            if (stringify(spec.package_name_requirement()->name().package()) != l->pkg_requirement)
                                 continue;
                         if (! l->cat_requirement.empty())
-                            if (stringify(spec.package_name_constraint()->name().category()) != l->cat_requirement)
+                            if (stringify(spec.package_name_requirement()->name().category()) != l->cat_requirement)
                                 continue;
 
                         return l->negated ? false : true;
@@ -256,10 +256,10 @@ SuggestionsConf::interest_in_suggestion(
                 else
                 {
                     if (! l->pkg_requirement.empty())
-                        if (stringify(spec.package_name_constraint()->name().package()) != l->pkg_requirement)
+                        if (stringify(spec.package_name_requirement()->name().package()) != l->pkg_requirement)
                             continue;
                     if (! l->cat_requirement.empty())
-                        if (stringify(spec.package_name_constraint()->name().category()) != l->cat_requirement)
+                        if (stringify(spec.package_name_requirement()->name().category()) != l->cat_requirement)
                             continue;
 
                     return l->negated ? false : true;
@@ -287,10 +287,10 @@ SuggestionsConf::interest_in_suggestion(
             else
             {
                 if (! l->pkg_requirement.empty())
-                    if (stringify(spec.package_name_constraint()->name().package()) != l->pkg_requirement)
+                    if (stringify(spec.package_name_requirement()->name().package()) != l->pkg_requirement)
                         continue;
                 if (! l->cat_requirement.empty())
-                    if (stringify(spec.package_name_constraint()->name().category()) != l->cat_requirement)
+                    if (stringify(spec.package_name_requirement()->name().category()) != l->cat_requirement)
                         continue;
 
                 return l->negated ? false : true;
diff --git a/paludis/environments/paludis/world.cc b/paludis/environments/paludis/world.cc
index a3de07ae7..32569258a 100644
--- a/paludis/environments/paludis/world.cc
+++ b/paludis/environments/paludis/world.cc
@@ -171,8 +171,8 @@ World::update_config_files_for_package_move(const PackageDepSpec & s, const Qual
     if (_remove_string_from_world(stringify(s)))
         _add_string_to_world(stringify(
                     MutablePackageDepSpecData(*s.data())
-                    .unconstrain_package()
-                    .constrain_package(n)));
+                    .unrequire_package()
+                    .require_package(n)));
 }
 
 const std::shared_ptr<const SetSpecTree>
diff --git a/paludis/environments/paludis/world_TEST.cc b/paludis/environments/paludis/world_TEST.cc
index 0b5d5656c..d3b572ff5 100644
--- a/paludis/environments/paludis/world_TEST.cc
+++ b/paludis/environments/paludis/world_TEST.cc
@@ -40,7 +40,7 @@ TEST(World, Updates)
         TestEnvironment env;
         paludis_environment::World world(&env, w);
         world.update_config_files_for_package_move(MutablePackageDepSpecData({ })
-                .constrain_package(QualifiedPackageName("cat/before")),
+                .require_package(QualifiedPackageName("cat/before")),
                 QualifiedPackageName("cat/after"));
     }