Don't need block_kinds any more

17 files changed, 42 insertions, 164 deletions

diff --git a/paludis/dep_spec-fwd.hh b/paludis/dep_spec-fwd.hh
index f8f152b28..51128b675 100644
--- a/paludis/dep_spec-fwd.hh
+++ b/paludis/dep_spec-fwd.hh
@@ -1,7 +1,7 @@
 /* vim: set sw=4 sts=4 et foldmethod=syntax : */
 
 /*
- * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh
+ * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
  *
  * This file is part of the Paludis package manager. Paludis is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
@@ -32,9 +32,6 @@
 
 namespace paludis
 {
-
-#include <paludis/dep_spec-se.hh>
-
     class DepSpec;
     class PackageDepSpec;
     class PlainTextDepSpec;
diff --git a/paludis/dep_spec.cc b/paludis/dep_spec.cc
index f4bcf1c59..35a7996b1 100644
--- a/paludis/dep_spec.cc
+++ b/paludis/dep_spec.cc
@@ -44,8 +44,6 @@
 
 using namespace paludis;
 
-#include <paludis/dep_spec-se.cc>
-
 namespace paludis
 {
     template <>
@@ -213,17 +211,15 @@ NamedSetDepSpec::clone() const
     return result;
 }
 
-BlockDepSpec::BlockDepSpec(const std::string & s, const PackageDepSpec & p, const BlockKind k) :
+BlockDepSpec::BlockDepSpec(const std::string & s, const PackageDepSpec & p) :
     StringDepSpec(s),
-    _spec(p),
-    _kind(k)
+    _spec(p)
 {
 }
 
 BlockDepSpec::BlockDepSpec(const BlockDepSpec & other) :
     StringDepSpec(other.text()),
-    _spec(other._spec),
-    _kind(other._kind)
+    _spec(other._spec)
 {
     set_annotations(other.maybe_annotations());
 }
@@ -392,18 +388,6 @@ BlockDepSpec::blocking() const
     return _spec;
 }
 
-BlockKind
-BlockDepSpec::block_kind() const
-{
-    return _kind;
-}
-
-void
-BlockDepSpec::set_block_kind(const BlockKind k)
-{
-    _kind = k;
-}
-
 std::shared_ptr<DepSpec>
 BlockDepSpec::clone() const
 {
diff --git a/paludis/dep_spec.hh b/paludis/dep_spec.hh
index 3ea80302a..68b5c70e1 100644
--- a/paludis/dep_spec.hh
+++ b/paludis/dep_spec.hh
@@ -583,16 +583,12 @@ namespace paludis
     {
         private:
             PackageDepSpec _spec;
-            BlockKind _kind;
 
         public:
             ///\name Basic operations
             ///\{
 
-            /**
-             * \since 0.55
-             */
-            BlockDepSpec(const std::string & text, const PackageDepSpec & spec, const BlockKind);
+            BlockDepSpec(const std::string & text, const PackageDepSpec & spec);
 
             BlockDepSpec(const BlockDepSpec &);
 
@@ -605,20 +601,6 @@ namespace paludis
              */
             const PackageDepSpec blocking() const PALUDIS_ATTRIBUTE((warn_unused_result));
 
-            /**
-             * Fetch our blocker strength.
-             *
-             * \since 0.55
-             */
-            BlockKind block_kind() const PALUDIS_ATTRIBUTE((warn_unused_result));
-
-            /**
-             * Change our blocker strength.
-             *
-             * \since 0.55
-             */
-            void set_block_kind(const BlockKind);
-
             virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result));
     };
 
diff --git a/paludis/dep_spec.se b/paludis/dep_spec.se
deleted file mode 100644
index 3531f2bd9..000000000
--- a/paludis/dep_spec.se
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-# vim: set sw=4 sts=4 et ft=sh :
-
-make_enum_BlockKind()
-{
-    prefix bk
-
-    key bk_weak                     "Generic weak block"
-    key bk_strong                   "Generic strong block"
-    key bk_manual                   "A block requiring manual resolution"
-    key bk_upgrade_blocked_before   "Strong, nothing is not fine if met"
-    key bk_uninstall_blocked_before "Strong, nothing is fine too"
-    key bk_uninstall_blocked_after  "Weak, nothing is fine too"
-
-    want_destringify
-
-    doxygen_comment << "END"
-        /**
-         * Kind of a BlockDepSpec.
-         *
-         * \ingroup g_dep_spec
-         * \since 0.55
-         */
-END
-}
-
-
diff --git a/paludis/dep_spec_TEST.cc b/paludis/dep_spec_TEST.cc
index bf7e5595a..52d8c1224 100644
--- a/paludis/dep_spec_TEST.cc
+++ b/paludis/dep_spec_TEST.cc
@@ -1,7 +1,7 @@
 /* vim: set sw=4 sts=4 et foldmethod=syntax : */
 
 /*
- * Copyright (c) 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
  *
  * This file is part of the Paludis package manager. Paludis is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
@@ -71,7 +71,7 @@ namespace test_cases
             std::shared_ptr<PackageDepSpec> c(std::static_pointer_cast<PackageDepSpec>(a.clone()));
             TEST_CHECK_STRINGIFY_EQUAL(a, *c);
 
-            BlockDepSpec d("!" + stringify(*c), *c, bk_weak);
+            BlockDepSpec d("!" + stringify(*c), *c);
             std::shared_ptr<BlockDepSpec> e(std::static_pointer_cast<BlockDepSpec>(d.clone()));
             TEST_CHECK_STRINGIFY_EQUAL(d.blocking(), e->blocking());
         }
diff --git a/paludis/files.m4 b/paludis/files.m4
index 005496e1d..d56179f48 100644
--- a/paludis/files.m4
+++ b/paludis/files.m4
@@ -27,7 +27,7 @@ add(`common_sets',                                 `hh', `cc', `fwd')
 add(`contents',                                    `hh', `cc', `fwd')
 add(`create_output_manager_info',                  `hh', `cc', `fwd', `se')
 add(`dep_label',                                   `hh', `cc', `fwd')
-add(`dep_spec',                                    `hh', `cc', `test', `fwd', `se')
+add(`dep_spec',                                    `hh', `cc', `test', `fwd')
 add(`dep_spec_annotations',                        `hh', `cc', `fwd', `se')
 add(`dep_spec_data',                               `hh', `cc', `fwd')
 add(`dep_spec_flattener',                          `hh', `cc')
diff --git a/paludis/repositories/e/apply_annotations.cc b/paludis/repositories/e/apply_annotations.cc
index 498c61daa..695458dce 100644
--- a/paludis/repositories/e/apply_annotations.cc
+++ b/paludis/repositories/e/apply_annotations.cc
@@ -35,7 +35,7 @@ void
 paludis::erepository::apply_annotations(
         const EAPI & eapi,
         const std::shared_ptr<DepSpec> & spec,
-        const std::shared_ptr<BlockDepSpec> & if_block_spec,
+        const std::shared_ptr<BlockDepSpec> &,
         const std::shared_ptr<const Map<std::string, std::string> > & m)
 {
     auto annotations(std::make_shared<DepSpecAnnotations>());
@@ -48,36 +48,21 @@ paludis::erepository::apply_annotations(
         DepSpecAnnotationRole role(dsar_none);
 
         /* blocks */
-        if (if_block_spec && (! eapi.supported()->annotations()->blocker_resolution().empty()))
+        if (k->first == eapi.supported()->annotations()->blocker_resolution())
         {
-            if (k->first == eapi.supported()->annotations()->blocker_resolution())
+            if (k->second.empty())
             {
-                if (k->second.empty())
-                {
-                }
-                else if (k->second == eapi.supported()->annotations()->blocker_resolution_manual())
-                {
-                    if_block_spec->set_block_kind(bk_manual);
-                    role = dsar_blocker_manual;
-                }
-                else if (k->second == eapi.supported()->annotations()->blocker_resolution_uninstall_blocked_after())
-                {
-                    if_block_spec->set_block_kind(bk_uninstall_blocked_after);
-                    role = dsar_blocker_uninstall_blocked_after;
-                }
-                else if (k->second == eapi.supported()->annotations()->blocker_resolution_uninstall_blocked_before())
-                {
-                    if_block_spec->set_block_kind(bk_uninstall_blocked_before);
-                    role = dsar_blocker_uninstall_blocked_before;
-                }
-                else if (k->second == eapi.supported()->annotations()->blocker_resolution_upgrade_blocked_before())
-                {
-                    if_block_spec->set_block_kind(bk_upgrade_blocked_before);
-                    role = dsar_blocker_upgrade_blocked_before;
-                }
-                else
-                    throw EDepParseError(stringify(*if_block_spec), "Unknown value '" + k->second + "' for annotation '" + k->first + "'");
             }
+            else if (k->second == eapi.supported()->annotations()->blocker_resolution_manual())
+                role = dsar_blocker_manual;
+            else if (k->second == eapi.supported()->annotations()->blocker_resolution_uninstall_blocked_after())
+                role = dsar_blocker_uninstall_blocked_after;
+            else if (k->second == eapi.supported()->annotations()->blocker_resolution_uninstall_blocked_before())
+                role = dsar_blocker_uninstall_blocked_before;
+            else if (k->second == eapi.supported()->annotations()->blocker_resolution_upgrade_blocked_before())
+                role = dsar_blocker_upgrade_blocked_before;
+            else
+                throw EDepParseError(k->second, "Unknown value '" + k->second + "' for annotation '" + k->first + "'");
         }
 
         /* myoptions number-selected */
diff --git a/paludis/repositories/e/dep_parser.cc b/paludis/repositories/e/dep_parser.cc
index 2d811f090..9dc86ff2e 100644
--- a/paludis/repositories/e/dep_parser.cc
+++ b/paludis/repositories/e/dep_parser.cc
@@ -144,23 +144,18 @@ namespace
     {
         if ((! s.empty()) && ('!' == s.at(0)))
         {
-            bool strong(false);
             std::string::size_type specstart(1);
             if (2 <= s.length() && '!' == s.at(1))
             {
                 if (! eapi.supported()->dependency_spec_tree_parse_options()[dstpo_double_bang_blocks])
                     throw EDepParseError(s, "Double-! blocks not allowed in this EAPI");
                 specstart = 2;
-                strong = true;
                 block_fix_op = bfo_explicit_strong;
             }
             else
             {
                 if (eapi.supported()->dependency_spec_tree_parse_options()[dstpo_single_bang_block_is_hard])
-                {
-                    strong = true;
                     block_fix_op = bfo_implicit_strong;
-                }
                 else
                     block_fix_op = bfo_implicit_weak;
             }
@@ -169,8 +164,7 @@ namespace
                         s,
                         parse_elike_package_dep_spec(s.substr(specstart),
                             eapi.supported()->package_dep_spec_parse_options(),
-                            eapi.supported()->version_spec_options()),
-                        strong ? bk_strong : bk_weak));
+                            eapi.supported()->version_spec_options())));
             h.begin()->item()->append(spec);
             annotations_go_here(spec, spec);
         }
diff --git a/paludis/repositories/fake/dep_parser.cc b/paludis/repositories/fake/dep_parser.cc
index b3e128896..884b5efaf 100644
--- a/paludis/repositories/fake/dep_parser.cc
+++ b/paludis/repositories/fake/dep_parser.cc
@@ -69,7 +69,7 @@ namespace
                                 + epdso_allow_slot_star_deps + epdso_allow_slot_equal_deps + epdso_allow_repository_deps
                                 + epdso_allow_use_deps + epdso_allow_ranged_deps + epdso_allow_tilde_greater_deps
                                 + epdso_strict_parsing,
-                                user_version_spec_options()), bk_weak));
+                                user_version_spec_options())));
         }
         else
             package_dep_spec_string_handler<T_>(h, s);
diff --git a/paludis/resolver/make_uninstall_blocker.cc b/paludis/resolver/make_uninstall_blocker.cc
index 24f1b474e..34ee3a72b 100644
--- a/paludis/resolver/make_uninstall_blocker.cc
+++ b/paludis/resolver/make_uninstall_blocker.cc
@@ -29,7 +29,7 @@ using namespace paludis::resolver;
 BlockDepSpec
 paludis::resolver::make_uninstall_blocker(const PackageDepSpec & spec)
 {
-    BlockDepSpec result("!" + stringify(spec), spec, bk_weak);
+    BlockDepSpec result("!" + stringify(spec), spec);
     auto annotations(std::make_shared<DepSpecAnnotations>());
     annotations->add(make_named_values<DepSpecAnnotation>(
                 n::key() = "<resolution>",
diff --git a/paludis/resolver/package_or_block_dep_spec.cc b/paludis/resolver/package_or_block_dep_spec.cc
index a4f992f75..520f5f022 100644
--- a/paludis/resolver/package_or_block_dep_spec.cc
+++ b/paludis/resolver/package_or_block_dep_spec.cc
@@ -66,7 +66,6 @@ PackageOrBlockDepSpec::serialise(Serialiser & s) const
         w
             .member(SerialiserFlags<>(), "block", true)
             .member(SerialiserFlags<>(), "spec", stringify(if_block()->blocking()))
-            .member(SerialiserFlags<>(), "block_kind", stringify(if_block()->block_kind()))
             .member(SerialiserFlags<>(), "text", if_block()->text())
             ;
     }
@@ -133,9 +132,8 @@ PackageOrBlockDepSpec::deserialise(Deserialisation & d, const std::shared_ptr<co
 
     if (block)
     {
-        BlockKind kind(destringify<BlockKind>(v.member<std::string>("block_kind")));
         std::string text(v.member<std::string>("text"));
-        BlockDepSpec b_spec(text, spec, kind);
+        BlockDepSpec b_spec(text, spec);
         if (annotations->begin() != annotations->end())
             b_spec.set_annotations(annotations);
         return PackageOrBlockDepSpec(b_spec);
diff --git a/paludis/resolver/spec_rewriter.cc b/paludis/resolver/spec_rewriter.cc
index cdcba315f..716a80e97 100644
--- a/paludis/resolver/spec_rewriter.cc
+++ b/paludis/resolver/spec_rewriter.cc
@@ -136,7 +136,7 @@ SpecRewriter::rewrite_if_special(const PackageOrBlockDepSpec & s, const std::sha
             std::string::size_type p(prefix.find_first_not_of('!'));
             if (std::string::npos != p)
                 prefix.erase(p);
-            BlockDepSpec b(prefix + stringify(spec), spec, s.if_block()->block_kind());
+            BlockDepSpec b(prefix + stringify(spec), spec);
             b.set_annotations(s.if_block()->maybe_annotations());
             result->specs()->push_back(b);
         }
diff --git a/python/dep_spec.cc b/python/dep_spec.cc
index 5d7bb5e8d..b53d3a768 100644
--- a/python/dep_spec.cc
+++ b/python/dep_spec.cc
@@ -428,17 +428,15 @@ PythonSimpleURIDepSpec::PythonSimpleURIDepSpec(const SimpleURIDepSpec & d) :
 {
 }
 
-PythonBlockDepSpec::PythonBlockDepSpec(const std::string & t, const std::shared_ptr<const PythonPackageDepSpec> & a, const BlockKind s) :
+PythonBlockDepSpec::PythonBlockDepSpec(const std::string & t, const std::shared_ptr<const PythonPackageDepSpec> & a) :
     PythonStringDepSpec(t),
-    _spec(a),
-    _kind(s)
+    _spec(a)
 {
 }
 
 PythonBlockDepSpec::PythonBlockDepSpec(const BlockDepSpec & d) :
     PythonStringDepSpec(d.text()),
-    _spec(std::make_shared<PythonPackageDepSpec>(d.blocking())),
-    _kind(d.block_kind())
+    _spec(std::make_shared<PythonPackageDepSpec>(d.blocking()))
 {
 }
 
@@ -448,12 +446,6 @@ PythonBlockDepSpec::blocking() const
     return _spec;
 }
 
-BlockKind
-PythonBlockDepSpec::block_kind() const
-{
-    return _kind;
-}
-
 PythonFetchableURIDepSpec::PythonFetchableURIDepSpec(const std::string & s) :
     PythonStringDepSpec(s)
 {
@@ -948,7 +940,7 @@ template <typename H_>
 void
 SpecTreeFromPython<H_>::real_visit(const PythonBlockDepSpec & d)
 {
-    _add_to->append(std::make_shared<BlockDepSpec>(d.text(), *d.blocking(), d.block_kind()));
+    _add_to->append(std::make_shared<BlockDepSpec>(d.text(), *d.blocking()));
 }
 
 template <typename H_>
@@ -1069,9 +1061,6 @@ void expose_dep_spec()
     enum_auto("UserPackageDepSpecOption", last_updso,
             "Options for parse_user_package_dep_spec.");
 
-    enum_auto("BlockKind", last_bk,
-            "Options for BlockDepSpec.");
-
     /**
      * Options
      */
@@ -1371,18 +1360,13 @@ void expose_dep_spec()
          "BlockDepSpec",
          "A BlockDepSpec represents a block on a package name (for example, 'app-editors/vim'), \n"
          "possibly with associated version and SLOT restrictions.",
-         bp::init<std::string, std::shared_ptr<const PythonPackageDepSpec>, BlockKind>("__init__(string, PackageDepSpec, BlockKind)")
+         bp::init<std::string, std::shared_ptr<const PythonPackageDepSpec> >("__init__(string, PackageDepSpec)")
         )
         .add_property("blocking", &PythonBlockDepSpec::blocking,
                 "[ro] PackageDepSpec\n"
                 "The spec we're blocking."
                 )
 
-        .add_property("block_kind", &PythonBlockDepSpec::block_kind,
-                "[ro] BlockKind\n"
-                "Are we a strong block?"
-                )
-
         //Work around epydoc bug
         .add_property("text", &PythonBlockDepSpec::text,
                 "[ro] string\n"
diff --git a/python/dep_spec.hh b/python/dep_spec.hh
index a33adb6c7..1a10fc191 100644
--- a/python/dep_spec.hh
+++ b/python/dep_spec.hh
@@ -246,14 +246,12 @@ namespace paludis
         {
             private:
                 std::shared_ptr<const PythonPackageDepSpec> _spec;
-                BlockKind _kind;
 
             public:
-                PythonBlockDepSpec(const std::string &, const std::shared_ptr<const PythonPackageDepSpec> &, const BlockKind);
+                PythonBlockDepSpec(const std::string &, const std::shared_ptr<const PythonPackageDepSpec> &);
                 PythonBlockDepSpec(const BlockDepSpec &);
 
                 std::shared_ptr<const PythonPackageDepSpec> blocking() const;
-                BlockKind block_kind() const;
         };
 
         class PALUDIS_VISIBLE PythonURILabelsDepSpec :
diff --git a/python/dep_spec_TEST.py b/python/dep_spec_TEST.py
index 375e7ee01..ec22662c4 100755
--- a/python/dep_spec_TEST.py
+++ b/python/dep_spec_TEST.py
@@ -31,7 +31,7 @@ class TestCase_1_DepSpecs(unittest.TestCase):
         self.pds3 = parse_user_package_dep_spec("*/*::testrepo", self.env,
                 [UserPackageDepSpecOption.ALLOW_WILDCARDS])
         self.pds4 = parse_user_package_dep_spec("cat/pkg::testrepo", self.env, [])
-        self.bds = BlockDepSpec("!>=foo/bar-1:100::testrepo", self.pds, BlockKind.WEAK)
+        self.bds = BlockDepSpec("!>=foo/bar-1:100::testrepo", self.pds)
         self.nds = NamedSetDepSpec("system")
 
     def test_01_init(self):
diff --git a/ruby/dep_spec.cc b/ruby/dep_spec.cc
index 8cb530077..405d2d05c 100644
--- a/ruby/dep_spec.cc
+++ b/ruby/dep_spec.cc
@@ -45,7 +45,6 @@ namespace
     static VALUE c_dep_spec;
     static VALUE c_string_dep_spec;
 
-    static VALUE c_block_kind;
     static VALUE c_block_dep_spec;
     static VALUE c_dependencies_labels_dep_spec;
     static VALUE c_fetchable_uri_dep_spec;
@@ -474,20 +473,16 @@ namespace
     }
 
     VALUE
-    block_dep_spec_new(VALUE self, VALUE str, VALUE spec, VALUE kind)
+    block_dep_spec_new(VALUE self, VALUE str, VALUE spec)
     {
         std::shared_ptr<const WrappedSpecBase> * ptr(0);
         try
         {
-            int l = NUM2INT(kind);
-            if (l < 0 || l >= last_bk)
-                rb_raise(rb_eTypeError, "BlockDepSpec expects a valid BlockKind as the third parameter");
-
             std::shared_ptr<const PackageDepSpec> pkg(value_to_package_dep_spec(spec));
             ptr = new std::shared_ptr<const WrappedSpecBase>(std::make_shared<WrappedSpec<BlockDepSpec>>(
-                        std::make_shared<BlockDepSpec>(StringValuePtr(str), *pkg, static_cast<BlockKind>(l))));
+                        std::make_shared<BlockDepSpec>(StringValuePtr(str), *pkg)));
             VALUE tdata(Data_Wrap_Struct(self, 0, &Common<std::shared_ptr<const WrappedSpecBase> >::free, ptr));
-            rb_obj_call_init(tdata, 3, &str);
+            rb_obj_call_init(tdata, 2, &str);
             return tdata;
         }
         catch (const std::exception & e)
@@ -1176,26 +1171,14 @@ namespace
         rb_define_method(c_plain_text_label_dep_spec, "to_s", RUBY_FUNC_CAST(plain_text_dep_label_spec_to_s), 0);
 
         /*
-         * Document-module: Paludis::BlockKind
-         *
-         * The kind of a BlockDepSpec
-         */
-        c_block_kind = rb_define_module_under(paludis_module(), "BlockKind");
-        for (BlockKind l(static_cast<BlockKind>(0)), l_end(last_bk) ; l != l_end ;
-                l = static_cast<BlockKind>(static_cast<int>(l) + 1))
-            rb_define_const(c_block_kind, value_case_to_RubyCase(stringify(l)).c_str(), INT2FIX(l));
-
-        // cc_enum_special<paludis/dep_spec.hh, BlockKind, c_block_kind>
-
-        /*
          * Document-class: Paludis::BlockDepSpec
          *
          * A BlockDepSpec represents a block on a package name (for example, 'app-editors/vim'), possibly with
          * associated version and SLOT restrictions.
          */
         c_block_dep_spec = rb_define_class_under(paludis_module(), "BlockDepSpec", c_string_dep_spec);
-        rb_define_singleton_method(c_block_dep_spec, "new", RUBY_FUNC_CAST(&block_dep_spec_new), 3);
-        rb_define_method(c_block_dep_spec, "initialize", RUBY_FUNC_CAST(&dep_spec_init_1), 3);
+        rb_define_singleton_method(c_block_dep_spec, "new", RUBY_FUNC_CAST(&block_dep_spec_new), 2);
+        rb_define_method(c_block_dep_spec, "initialize", RUBY_FUNC_CAST(&dep_spec_init_1), 2);
         rb_define_method(c_block_dep_spec, "blocking", RUBY_FUNC_CAST(&block_dep_spec_blocking), 0);
         VALUE (* block_dep_spec_to_s) (VALUE) = &dep_spec_to_s<BlockDepSpec>;
         rb_define_method(c_block_dep_spec, "to_s", RUBY_FUNC_CAST(block_dep_spec_to_s), 0);
diff --git a/ruby/dep_spec_TEST.rb b/ruby/dep_spec_TEST.rb
index 451ed5ce8..2866ee3fa 100644
--- a/ruby/dep_spec_TEST.rb
+++ b/ruby/dep_spec_TEST.rb
@@ -257,22 +257,22 @@ module Paludis
         end
 
         def test_create
-            v = BlockDepSpec.new("!>=foo/bar-1", Paludis::parse_user_package_dep_spec(">=foo/bar-1", env, []), BlockKind::Weak)
+            v = BlockDepSpec.new("!>=foo/bar-1", Paludis::parse_user_package_dep_spec(">=foo/bar-1", env, []))
         end
 
         def test_create_error
             assert_raise TypeError do
-                v = BlockDepSpec.new("!>=foo/bar-1", 0, BlockKind::Weak)
+                v = BlockDepSpec.new("!>=foo/bar-1", 0)
             end
 
             assert_raise TypeError do
-                v = BlockDepSpec.new("!>=foo/bar-1", PlainTextDepSpec.new('foo-bar/baz'), BlockKind::Weak)
+                v = BlockDepSpec.new("!>=foo/bar-1", PlainTextDepSpec.new('foo-bar/baz'))
             end
         end
 
         def test_blocked_spec
             assert_equal "foo/baz", BlockDepSpec.new("!foo/baz", Paludis::parse_user_package_dep_spec(
-                "foo/baz", env, []), BlockKind::Weak).blocking.to_s
+                "foo/baz", env, [])).blocking.to_s
         end
     end