aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-03-07 11:15:59 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2008-03-07 11:15:59 +0000
commit104c36aa1a84cfbabca4a7e3163262f9a4d095d2 (patch)
treec1b5d7eeb043bce5655148f7d80b72b163fb1f13
parentf23a5ee234120f82456569918084a77998d2193d (diff)
downloadpaludis-104c36aa1a84cfbabca4a7e3163262f9a4d095d2.tar.gz
paludis-104c36aa1a84cfbabca4a7e3163262f9a4d095d2.tar.xz
Remove remaining references to UseDepSpec.
-rw-r--r--doc/api/cplusplus/examples/example_dep_tag.cc3
-rw-r--r--doc/api/ruby/example_dep_tree.rb14
-rw-r--r--paludis/dep_tag.hh2
-rw-r--r--python/dep_tag.cc2
-rw-r--r--ruby/dep_tag.cc2
5 files changed, 10 insertions, 13 deletions
diff --git a/doc/api/cplusplus/examples/example_dep_tag.cc b/doc/api/cplusplus/examples/example_dep_tag.cc
index 17e1a3d..b8e61c3 100644
--- a/doc/api/cplusplus/examples/example_dep_tag.cc
+++ b/doc/api/cplusplus/examples/example_dep_tag.cc
@@ -89,8 +89,7 @@ namespace
return;
/* The set isn't necessarily flat. We use DepSpecFlattener to make it
- * so, rather than writing a full visitor ourselves. We don't need to
- * supply a package, since a SetSpecTree cannot contain a UseDepSpec. */
+ * so, rather than writing a full visitor ourselves. */
DepSpecFlattener<SetSpecTree, PackageDepSpec> set_flat(env.get());
set->accept(set_flat);
diff --git a/doc/api/ruby/example_dep_tree.rb b/doc/api/ruby/example_dep_tree.rb
index ba7472d..40acc96 100644
--- a/doc/api/ruby/example_dep_tree.rb
+++ b/doc/api/ruby/example_dep_tree.rb
@@ -29,10 +29,9 @@ def collect_dependencies env, id, spec, results, recursing_sets = {}
collect_dependencies(env, id, child, results, recursing_sets)
end
- elsif spec.instance_of? UseDepSpec
- # Was this use flag enabled (or, if we're inverse, disabled) when we
- # built this package?
- if env.query_use(spec.flag, id) ^ spec.inverse?
+ elsif spec.instance_of? ConditionalDepSpec
+ # Was this condition satisfied when we built this package?
+ if spec.condition_met?
spec.each do | child |
collect_dependencies(env, id, child, results, recursing_sets)
end
@@ -88,10 +87,9 @@ def collect_extensions env, id, spec, results, recursing_sets = {}
collect_extensions(env, id, child, results, recursing_sets)
end
- elsif spec.instance_of? UseDepSpec
- # Was this use flag enabled (or, if we're inverse, disabled) when we
- # built this package?
- if env.query_use(spec.flag, id) ^ spec.inverse?
+ elsif spec.instance_of? ConditionalDepSpec
+ # Was this condition satisfied when we built this package?
+ if spec.condition_met?
spec.each do | child |
collect_extensions(env, id, child, results, recursing_sets)
end
diff --git a/paludis/dep_tag.hh b/paludis/dep_tag.hh
index 3d065f7..891d00d 100644
--- a/paludis/dep_tag.hh
+++ b/paludis/dep_tag.hh
@@ -330,7 +330,7 @@ namespace paludis
const tr1::shared_ptr<const PackageDepSpec> dependency() const;
/**
- * The AnyDepSpec instances and UseDepSpec instances that our dependency
+ * The AnyDepSpec instances and ConditionalDepSpec instances that our dependency
* is conditional upon.
*/
const tr1::shared_ptr<const DependencySpecTree::ConstItem> conditions() const;
diff --git a/python/dep_tag.cc b/python/dep_tag.cc
index 7087f6f..1ef99d6 100644
--- a/python/dep_tag.cc
+++ b/python/dep_tag.cc
@@ -186,7 +186,7 @@ void expose_dep_tag()
.add_property("conditions", &DependencyDepTag::conditions,
"[ro] CompositeDepSpec\n"
- "The AllDepSpecs and UseDepSpecs that our dependency is conditional upon."
+ "The AnyDepSpec instances and ConditionalDepSpec instances that our dependency is conditional upon."
)
;
diff --git a/ruby/dep_tag.cc b/ruby/dep_tag.cc
index bd0bac7..8b057e2 100644
--- a/ruby/dep_tag.cc
+++ b/ruby/dep_tag.cc
@@ -138,7 +138,7 @@ namespace
* call-seq:
* conditions -> DepSpec
*
- * The AnyDepSpec instances and UseDepSpec instances that our dependency
+ * The AnyDepSpec instances and ConditionalDepSpec instances that our dependency
* is conditional upon.
*/
VALUE