Remove legacy code

10 files changed, 3 insertions, 2208 deletions

diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index 472f9864c..d24fbd1d5 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -22,13 +22,11 @@ IF_RUBY_TESTS = \
 	action_TEST.rb \
 	choice_TEST.rb \
 	contents_TEST.rb \
-	dep_list_TEST.rb \
 	dep_spec_TEST.rb \
 	dep_tag_TEST.rb \
 	environment_TEST.rb \
 	filter_TEST.rb \
 	filtered_generator_TEST.rb \
-	find_unused_packages_task_TEST.rb \
 	generator_TEST.rb \
 	log_TEST.rb \
 	package_database_TEST.rb \
@@ -44,13 +42,11 @@ IF_RUBY_SOURCES = \
 	choice.cc \
 	contents.cc \
 	dep_label.cc \
-	dep_list.cc \
 	dep_spec.cc \
 	dep_tag.cc \
 	environment.cc \
 	filter.cc \
 	filtered_generator.cc \
-	find_unused_packages_task.cc \
 	generator.cc \
 	log.cc \
 	mask.cc \
@@ -73,9 +69,7 @@ EXTRA_DIST = $(IF_RUBY_TESTS) $(IF_RUBY_SOURCES) \
 	choice_TEST_setup.sh choice_TEST_cleanup.sh \
 	dep_spec_TEST_setup.sh dep_spec_TEST_cleanup.sh \
 	dep_tag_TEST_setup.sh dep_tag_TEST_cleanup.sh \
-	dep_list_TEST_setup.sh dep_list_TEST_cleanup.sh \
 	environment_TEST_setup.sh environment_TEST_cleanup.sh \
-	find_unused_packages_task_TEST_setup.sh find_unused_packages_task_TEST_cleanup.sh \
 	generator_TEST_setup.sh generator_TEST_cleanup.sh \
 	nice_names.nn \
 	package_database_TEST_setup.sh package_database_TEST_cleanup.sh \
@@ -106,7 +100,6 @@ libpaludisruby_@PALUDIS_PC_SLOT@_la_SOURCES = $(IF_RUBY_SOURCES)
 TESTS = $(IF_RUBY_TESTS)
 
 libpaludisruby_@PALUDIS_PC_SLOT@_la_LIBADD = \
-	$(top_builddir)/paludis/legacy/libpaludislegacy_@PALUDIS_PC_SLOT@.la \
 	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
 	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
 	$(PTHREAD_LIBS)
diff --git a/ruby/dep_list.cc b/ruby/dep_list.cc
deleted file mode 100644
index 2c16c3d2d..000000000
--- a/ruby/dep_list.cc
+++ /dev/null
@@ -1,1477 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2007 Richard Brown
- *
- * 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
- * Public License version 2, as published by the Free Software Foundation.
- *
- * Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <paludis_ruby.hh>
-#include <paludis/legacy/dep_list.hh>
-#include <paludis/dep_tag.hh>
-#include <paludis/util/wrapped_forward_iterator.hh>
-#include <paludis/util/set.hh>
-#include <paludis/util/sequence.hh>
-#include <paludis/legacy/override_functions.hh>
-#include <ruby.h>
-
-using namespace paludis;
-using namespace paludis::ruby;
-
-namespace
-{
-    static VALUE c_dep_list_target_type;
-    static VALUE c_dep_list_reinstall_option;
-    static VALUE c_dep_list_fall_back_option;
-    static VALUE c_dep_list_reinstall_scm_option;
-    static VALUE c_dep_list_upgrade_option;
-    static VALUE c_dep_list_downgrade_option;
-    static VALUE c_dep_list_new_slots_option;
-    static VALUE c_dep_list_deps_option;
-    static VALUE c_dep_list_suggested_option;
-    static VALUE c_dep_list_circular_option;
-    static VALUE c_dep_list_blocks_option;
-    static VALUE c_dep_list_use_option;
-    static VALUE c_dep_list_entry_state;
-    static VALUE c_dep_list_entry_kind;
-    static VALUE c_dep_list_options;
-    static VALUE c_dep_list;
-    static VALUE c_dep_list_entry;
-    static VALUE c_dep_list_override_masks_functions;
-
-    std::shared_ptr<DepListOverrideMasksFunctions>
-    value_to_dep_list_override_masks_functions(VALUE v)
-    {
-        if (rb_obj_is_kind_of(v, c_dep_list_override_masks_functions))
-        {
-            std::shared_ptr<DepListOverrideMasksFunctions> * v_ptr;
-            Data_Get_Struct(v, std::shared_ptr<DepListOverrideMasksFunctions>, v_ptr);
-            return *v_ptr;
-        }
-        else
-        {
-            rb_raise(rb_eTypeError, "Can't convert %s into DepListOverrideMasksFunctions", rb_obj_classname(v));
-        }
-    }
-
-    VALUE
-    dep_list_override_masks_functions_to_value(std::shared_ptr<DepListOverrideMasksFunctions> m)
-    {
-        std::shared_ptr<DepListOverrideMasksFunctions> * m_ptr(0);
-        try
-        {
-            m_ptr = new std::shared_ptr<DepListOverrideMasksFunctions>(m);
-            return  Data_Wrap_Struct(c_dep_list_override_masks_functions, 0, &Common<std::shared_ptr<DepListOverrideMasksFunctions> >::free, m_ptr);
-        }
-        catch (const std::exception & e)
-        {
-            delete m_ptr;
-            exception_to_ruby_exception(e);
-        }
-    }
-
-    std::shared_ptr<DepListOptions>
-    value_to_dep_list_options(VALUE v)
-    {
-        if (rb_obj_is_kind_of(v, c_dep_list_options))
-        {
-            std::shared_ptr<DepListOptions> * v_ptr;
-            Data_Get_Struct(v, std::shared_ptr<DepListOptions>, v_ptr);
-            return *v_ptr;
-        }
-        else
-        {
-            rb_raise(rb_eTypeError, "Can't convert %s into DepListOptions", rb_obj_classname(v));
-        }
-    }
-
-    VALUE
-    dep_list_options_to_value(std::shared_ptr<DepListOptions> m)
-    {
-        std::shared_ptr<DepListOptions> * m_ptr(0);
-        try
-        {
-            m_ptr = new std::shared_ptr<DepListOptions>(m);
-            return  Data_Wrap_Struct(c_dep_list_options, 0, &Common<std::shared_ptr<DepListOptions> >::free, m_ptr);
-        }
-        catch (const std::exception & e)
-        {
-            delete m_ptr;
-            exception_to_ruby_exception(e);
-        }
-    }
-
-    VALUE
-    dep_list_entry_to_value(const DepListEntry & v)
-    {
-        DepListEntry * vv(new DepListEntry(v));
-        return Data_Wrap_Struct(c_dep_list_entry, 0, &Common<DepListEntry>::free, vv);
-    }
-
-    VALUE
-    dep_list_override_masks_functions_init(int, VALUE *, VALUE self)
-    {
-        return self;
-    }
-
-    VALUE
-    dep_list_override_masks_functions_new(int argc, VALUE* argv, VALUE self)
-    {
-        if (argc != 0)
-            rb_raise(rb_eArgError, "No Arguments Please, we're british");
-        std::shared_ptr<DepListOverrideMasksFunctions> * ptr(0);
-        try
-        {
-            ptr = new std::shared_ptr<DepListOverrideMasksFunctions>(std::make_shared<DepListOverrideMasksFunctions>());
-            VALUE tdata(Data_Wrap_Struct(self, 0, &Common<std::shared_ptr<DepListOverrideMasksFunctions> >::free, ptr));
-            rb_obj_call_init(tdata, argc, argv);
-            return tdata;
-        }
-        catch (const std::exception & e)
-        {
-            delete ptr;
-            exception_to_ruby_exception(e);
-        }
-    }
-
-
-    VALUE
-    dep_list_options_init(int, VALUE *, VALUE self)
-    {
-        return self;
-    }
-
-    /*
-     * call-seq:
-     *     DepListOptions.new(reinstall, reinstall_scm, target_type, upgrade, new_slots, fall_back, installed_deps_prem installed_deps_runtime, installed_deps_post, uninstalled_deps_pre, uninstalled_deps_runtime, uninstalled_deps_post, uninstalled_deps_suggested, suggested, circular, blocks, override_masks, dependency_tags, MatchPackageOptions) -> DepListOptions
-     *     DepListOptions.new(Hash) -> DepListOptions
-     *     DepListOptions.new -> DepListOptions
-     *
-     * DepListOptions.new can either be called with all parameters in order, or with one hash
-     * parameter, where the hash keys are symbols with the names above, or with no parameters
-     * in which case it will be created with the default options, i.e. the following hash:
-     *
-     *       {
-     *           :reinstall => DepListReinstallOption::Never,
-     *           :reinstall_scm => DepListReinstallScmOption::Never,
-     *           :target_type => DepListTargetType::Package,
-     *           :upgrade => DepListUpgradeOption::Always,
-     *           :downgrade => DepListDowngradeOption::AsNeeded,
-     *           :new_slots => DepListNewSlotsOption::Always,
-     *           :fall_back => DepListFallBackOption::AsNeededExceptTargets,
-     *           :installed_deps_pre => DepListDepsOption::Discard,
-     *           :installed_deps_runtime => DepListDepsOption::TryPost,
-     *           :installed_deps_post => DepListDepsOption::TryPost,
-     *           :uninstalled_deps_pre => DepListDepsOption::Pre,
-     *           :uninstalled_deps_runtime => DepListDepsOption::PreOrPost,
-     *           :uninstalled_deps_post => DepListDepsOption::Post,
-     *           :uninstalled_deps_suggested => DepListDepsOption::TryPost,
-     *           :suggested => DepListSuggestedOption::Show,
-     *           :circular => DepListCircularOption::Error,
-     *           :use => DepListUseOption::Standard,
-     *           :blocks => DepListBlocksOption::Accumulate,
-     *           :override_masks => DepListOverrideMasksFunctions.new
-     *           :dependency_tags => false,
-     *           :match_package_options => MatchPackageOptions.new
-     *       }
-     */
-    VALUE
-    dep_list_options_new(int argc, VALUE *argv, VALUE self)
-    {
-        std::shared_ptr<DepListOptions> * ptr(0);
-        if (0 == argc)
-        {
-            try
-            {
-                ptr = new std::shared_ptr<DepListOptions>(std::make_shared<DepListOptions>());
-                VALUE tdata(Data_Wrap_Struct(self, 0, &Common<std::shared_ptr<DepListOptions> >::free, ptr));
-                rb_obj_call_init(tdata, argc, argv);
-                return tdata;
-            }
-            catch (const std::exception & e)
-            {
-                delete ptr;
-                exception_to_ruby_exception(e);
-            }
-        }
-        else
-        {
-            try
-            {
-                int value_for_reinstall;
-                int value_for_reinstall_scm;
-                int value_for_target_type;
-                int value_for_upgrade;
-                int value_for_downgrade;
-                int value_for_new_slots;
-                int value_for_fall_back;
-                int value_for_installed_deps_pre;
-                int value_for_installed_deps_runtime;
-                int value_for_installed_deps_post;
-                int value_for_uninstalled_deps_pre;
-                int value_for_uninstalled_deps_runtime;
-                int value_for_uninstalled_deps_post;
-                int value_for_uninstalled_deps_suggested;
-                int value_for_suggested;
-                int value_for_circular;
-                int value_for_use;
-                int value_for_blocks;
-                bool value_for_dependency_tags;
-                std::shared_ptr<DepListOverrideMasksFunctions> value_for_override_masks_functions;
-                MatchPackageOptions value_for_match_package_options;
-
-                if (1 == argc && rb_obj_is_kind_of(argv[0], rb_cHash))
-                {
-                    if (Qnil == rb_hash_aref(argv[0], ID2SYM(rb_intern("reinstall"))))
-                        rb_raise(rb_eArgError, "Missing Parameter: reinstall");
-                    if (Qnil == rb_hash_aref(argv[0], ID2SYM(rb_intern("reinstall_scm"))))
-                        rb_raise(rb_eArgError, "Missing Parameter: reinstall_scm");
-                    if (Qnil == rb_hash_aref(argv[0], ID2SYM(rb_intern("target_type"))))
-                        rb_raise(rb_eArgError, "Missing Parameter: target_type");
-                    if (Qnil == rb_hash_aref(argv[0], ID2SYM(rb_intern("upgrade"))))
-                        rb_raise(rb_eArgError, "Missing Parameter: upgrade");
-                    if (Qnil == rb_hash_aref(argv[0], ID2SYM(rb_intern("downgrade"))))
-                        rb_raise(rb_eArgError, "Missing Parameter: downgrade");
-                    if (Qnil == rb_hash_aref(argv[0], ID2SYM(rb_intern("new_slots"))))
-                        rb_raise(rb_eArgError, "Missing Parameter: new_slots");
-                    if (Qnil == rb_hash_aref(argv[0], ID2SYM(rb_intern("fall_back"))))
-                        rb_raise(rb_eArgError, "Missing Parameter: fall_back");
-                    if (Qnil == rb_hash_aref(argv[0], ID2SYM(rb_intern("installed_deps_pre"))))
-                        rb_raise(rb_eArgError, "Missing Parameter: installed_deps_pre");
-                    if (Qnil == rb_hash_aref(argv[0], ID2SYM(rb_intern("installed_deps_runtime"))))
-                        rb_raise(rb_eArgError, "Missing Parameter: installed_deps_runtime");
-                    if (Qnil == rb_hash_aref(argv[0], ID2SYM(rb_intern("installed_deps_post"))))
-                        rb_raise(rb_eArgError, "Missing Parameter: installed_deps_post");
-                    if (Qnil == rb_hash_aref(argv[0], ID2SYM(rb_intern("uninstalled_deps_pre"))))
-                        rb_raise(rb_eArgError, "Missing Parameter: uninstalled_deps_pre");
-                    if (Qnil == rb_hash_aref(argv[0], ID2SYM(rb_intern("installed_deps_runtime"))))
-                        rb_raise(rb_eArgError, "Missing Parameter: uninstalled_deps_runtime");
-                    if (Qnil == rb_hash_aref(argv[0], ID2SYM(rb_intern("uninstalled_deps_post"))))
-                        rb_raise(rb_eArgError, "Missing Parameter: uninstalled_deps_post");
-                    if (Qnil == rb_hash_aref(argv[0], ID2SYM(rb_intern("uninstalled_deps_suggested"))))
-                        rb_raise(rb_eArgError, "Missing Parameter: uninstalled_deps_suggested");
-                    if (Qnil == rb_hash_aref(argv[0], ID2SYM(rb_intern("suggested"))))
-                        rb_raise(rb_eArgError, "Missing Parameter: suggested");
-                    if (Qnil == rb_hash_aref(argv[0], ID2SYM(rb_intern("circular"))))
-                        rb_raise(rb_eArgError, "Missing Parameter: circular");
-                    if (Qnil == rb_hash_aref(argv[0], ID2SYM(rb_intern("use"))))
-                        rb_raise(rb_eArgError, "Missing Parameter: use");
-                    if (Qnil == rb_hash_aref(argv[0], ID2SYM(rb_intern("blocks"))))
-                        rb_raise(rb_eArgError, "Missing Parameter: blocks");
-                    if (Qnil == rb_hash_aref(argv[0], ID2SYM(rb_intern("dependency_tags"))))
-                        rb_raise(rb_eArgError, "Missing Parameter: dependency_tags");
-                    if (Qnil == rb_hash_aref(argv[0], ID2SYM(rb_intern("match_package_options"))))
-                        rb_raise(rb_eArgError, "Missing Parameter: match_package_options");
-                    value_for_reinstall =
-                        NUM2INT(rb_hash_aref(argv[0], ID2SYM(rb_intern("reinstall"))));
-                    value_for_reinstall_scm =
-                        NUM2INT(rb_hash_aref(argv[0], ID2SYM(rb_intern("reinstall_scm"))));
-                    value_for_target_type =
-                        NUM2INT(rb_hash_aref(argv[0], ID2SYM(rb_intern("target_type"))));
-                    value_for_upgrade =
-                        NUM2INT(rb_hash_aref(argv[0], ID2SYM(rb_intern("upgrade"))));
-                    value_for_downgrade =
-                        NUM2INT(rb_hash_aref(argv[0], ID2SYM(rb_intern("downgrade"))));
-                    value_for_new_slots =
-                        NUM2INT(rb_hash_aref(argv[0], ID2SYM(rb_intern("new_slots"))));
-                    value_for_fall_back =
-                        NUM2INT(rb_hash_aref(argv[0], ID2SYM(rb_intern("fall_back"))));
-                    value_for_installed_deps_pre =
-                        NUM2INT(rb_hash_aref(argv[0], ID2SYM(rb_intern("installed_deps_pre"))));
-                    value_for_installed_deps_runtime =
-                        NUM2INT(rb_hash_aref(argv[0], ID2SYM(rb_intern("installed_deps_runtime"))));
-                    value_for_installed_deps_post =
-                        NUM2INT(rb_hash_aref(argv[0], ID2SYM(rb_intern("installed_deps_post"))));
-                    value_for_uninstalled_deps_pre =
-                        NUM2INT(rb_hash_aref(argv[0], ID2SYM(rb_intern("uninstalled_deps_pre"))));
-                    value_for_uninstalled_deps_runtime =
-                        NUM2INT(rb_hash_aref(argv[0], ID2SYM(rb_intern("uninstalled_deps_runtime"))));
-                    value_for_uninstalled_deps_post =
-                        NUM2INT(rb_hash_aref(argv[0], ID2SYM(rb_intern("uninstalled_deps_post"))));
-                    value_for_uninstalled_deps_suggested =
-                        NUM2INT(rb_hash_aref(argv[0], ID2SYM(rb_intern("uninstalled_deps_suggested"))));
-                    value_for_suggested =
-                        NUM2INT(rb_hash_aref(argv[0], ID2SYM(rb_intern("suggested"))));
-                    value_for_circular =
-                        NUM2INT(rb_hash_aref(argv[0], ID2SYM(rb_intern("circular"))));
-                    value_for_use =
-                        NUM2INT(rb_hash_aref(argv[0], ID2SYM(rb_intern("use"))));
-                    value_for_blocks =
-                        NUM2INT(rb_hash_aref(argv[0], ID2SYM(rb_intern("blocks"))));
-                    value_for_override_masks_functions =
-                        value_to_dep_list_override_masks_functions(rb_hash_aref(argv[0], ID2SYM(rb_intern("override_masks"))));
-                    value_for_dependency_tags =
-                        Qtrue == (rb_hash_aref(argv[0], ID2SYM(rb_intern("dependency_tags")))) ? true : false;
-                    value_for_match_package_options = value_to_match_package_options(
-                            rb_hash_aref(argv[0], ID2SYM(rb_intern("match_package_options"))));
-                }
-                else if (21 == argc)
-                {
-                    value_for_reinstall                     = NUM2INT(argv[0]);
-                    value_for_reinstall_scm                 = NUM2INT(argv[1]);
-                    value_for_target_type                   = NUM2INT(argv[2]);
-                    value_for_upgrade                       = NUM2INT(argv[3]);
-                    value_for_downgrade                     = NUM2INT(argv[4]);
-                    value_for_new_slots                     = NUM2INT(argv[5]);
-                    value_for_fall_back                     = NUM2INT(argv[6]);
-                    value_for_installed_deps_pre            = NUM2INT(argv[7]);
-                    value_for_installed_deps_runtime        = NUM2INT(argv[8]);
-                    value_for_installed_deps_post           = NUM2INT(argv[9]);
-                    value_for_uninstalled_deps_pre          = NUM2INT(argv[10]);
-                    value_for_uninstalled_deps_runtime      = NUM2INT(argv[11]);
-                    value_for_uninstalled_deps_post         = NUM2INT(argv[12]);
-                    value_for_uninstalled_deps_suggested    = NUM2INT(argv[13]);
-                    value_for_suggested                     = NUM2INT(argv[14]);
-                    value_for_circular                      = NUM2INT(argv[15]);
-                    value_for_use                           = NUM2INT(argv[16]);
-                    value_for_blocks                        = NUM2INT(argv[17]);
-                    value_for_override_masks_functions = value_to_dep_list_override_masks_functions(argv[18]);
-                    value_for_dependency_tags = Qtrue == argv[19] ? true : false;
-                    value_for_match_package_options = value_to_match_package_options(argv[20]);
-                }
-                else
-                {
-                    rb_raise(rb_eArgError, "DepListOptions expects twenty one or zero arguments, but got %d",argc);
-                }
-
-                if (value_for_reinstall < 0 ||  value_for_reinstall >= last_dl_reinstall)
-                    rb_raise(rb_eArgError, "reinstall out of range");
-                if (value_for_reinstall_scm < 0 ||  value_for_reinstall_scm >= last_dl_reinstall_scm)
-                    rb_raise(rb_eArgError, "reinstall_scm out of range");
-                if (value_for_target_type < 0 ||  value_for_target_type >= last_dl_target)
-                    rb_raise(rb_eArgError, "target_type out of range");
-                if (value_for_upgrade < 0 ||  value_for_upgrade >= last_dl_upgrade)
-                    rb_raise(rb_eArgError, "upgrade out of range");
-                if (value_for_downgrade < 0 ||  value_for_downgrade >= last_dl_downgrade)
-                    rb_raise(rb_eArgError, "downgrade out of range");
-                if (value_for_new_slots < 0 ||  value_for_new_slots >= last_dl_new_slots)
-                    rb_raise(rb_eArgError, "new_slots out of range");
-                if (value_for_fall_back < 0 ||  value_for_fall_back >= last_dl_fall_back)
-                    rb_raise(rb_eArgError, "fall_back out of range");
-                if (value_for_installed_deps_pre < 0 ||  value_for_installed_deps_pre >= last_dl_deps)
-                    rb_raise(rb_eArgError, "installed_deps_pre out of range");
-                if (value_for_installed_deps_runtime < 0 ||  value_for_installed_deps_runtime >= last_dl_deps)
-                    rb_raise(rb_eArgError, "installed_deps_runtime out of range");
-                if (value_for_installed_deps_post < 0 ||  value_for_installed_deps_post >= last_dl_deps)
-                    rb_raise(rb_eArgError, "installed_deps_post out of range");
-                if (value_for_uninstalled_deps_pre < 0 ||  value_for_uninstalled_deps_pre >= last_dl_deps)
-                    rb_raise(rb_eArgError, "uninstalled_deps_pre out of range");
-                if (value_for_uninstalled_deps_runtime < 0 ||  value_for_uninstalled_deps_runtime >= last_dl_deps)
-                    rb_raise(rb_eArgError, "uninstalled_deps_runtime out of range");
-                if (value_for_uninstalled_deps_post < 0 ||  value_for_uninstalled_deps_post >= last_dl_deps)
-                    rb_raise(rb_eArgError, "uninstalled_deps_post out of range");
-                if (value_for_uninstalled_deps_suggested < 0 ||  value_for_uninstalled_deps_suggested >= last_dl_deps)
-                    rb_raise(rb_eArgError, "uninstalled_deps_suggested out of range");
-                if (value_for_suggested < 0 ||  value_for_suggested >= last_dl_suggested)
-                    rb_raise(rb_eArgError, "suggested out of range");
-                if (value_for_circular < 0 ||  value_for_circular >= last_dl_circular)
-                    rb_raise(rb_eArgError, "circular out of range");
-                if (value_for_circular < 0 ||  value_for_use >= last_dl_use_deps)
-                    rb_raise(rb_eArgError, "use out of range");
-                if (value_for_circular < 0 ||  value_for_blocks >= last_dl_blocks)
-                    rb_raise(rb_eArgError, "blocks out of range");
-
-                ptr = new std::shared_ptr<DepListOptions>(std::make_shared<DepListOptions>());
-                (*ptr)->blocks() = static_cast<DepListBlocksOption>(value_for_blocks);
-                (*ptr)->circular() = static_cast<DepListCircularOption>(value_for_circular);
-                (*ptr)->dependency_tags() = value_for_dependency_tags;
-                (*ptr)->downgrade() = static_cast<DepListDowngradeOption>(value_for_downgrade);
-                (*ptr)->fall_back() = static_cast<DepListFallBackOption>(value_for_fall_back);
-                (*ptr)->installed_deps_post() = static_cast<DepListDepsOption>(value_for_installed_deps_post);
-                (*ptr)->installed_deps_pre() = static_cast<DepListDepsOption>(value_for_installed_deps_pre);
-                (*ptr)->installed_deps_runtime() = static_cast<DepListDepsOption>(value_for_installed_deps_runtime);
-                (*ptr)->match_package_options() = value_for_match_package_options;
-                (*ptr)->new_slots() = static_cast<DepListNewSlotsOption>(value_for_new_slots);
-                (*ptr)->override_masks() = value_for_override_masks_functions;
-                (*ptr)->reinstall() = static_cast<DepListReinstallOption>(value_for_reinstall);
-                (*ptr)->reinstall_scm() = static_cast<DepListReinstallScmOption>(value_for_reinstall_scm);
-                (*ptr)->suggested() = static_cast<DepListSuggestedOption>(value_for_suggested);
-                (*ptr)->target_type() = static_cast<DepListTargetType>(value_for_target_type);
-                (*ptr)->uninstalled_deps_post() = static_cast<DepListDepsOption>(value_for_uninstalled_deps_post);
-                (*ptr)->uninstalled_deps_pre() = static_cast<DepListDepsOption>(value_for_uninstalled_deps_pre);
-                (*ptr)->uninstalled_deps_runtime() = static_cast<DepListDepsOption>(value_for_uninstalled_deps_runtime);
-                (*ptr)->uninstalled_deps_suggested() = static_cast<DepListDepsOption>(value_for_uninstalled_deps_suggested);
-                (*ptr)->upgrade() = static_cast<DepListUpgradeOption>(value_for_upgrade);
-                (*ptr)->use() = static_cast<DepListUseOption>(value_for_use);
-
-                VALUE tdata(Data_Wrap_Struct(self, 0, &Common<std::shared_ptr<DepListOptions> >::free, ptr));
-                rb_obj_call_init(tdata, argc, argv);
-                return tdata;
-            }
-            catch (const std::exception & e)
-            {
-                delete ptr;
-                exception_to_ruby_exception(e);
-            }
-        }
-    }
-
-    /*
-     * Document-method: reinstall
-     *
-     * call-seq:
-     *     reinstall -> DepListReinstallOption
-     *
-     * Our DepListReinstallOption
-     */
-    /*
-     * Document-method: reinstall_scm
-     *
-     * call-seq:
-     *     reinstall_scm -> DepListReinstallScmOption
-     *
-     * Our DepListReinstallScmOption
-     */
-    /*
-     * Document-method: target
-     *
-     * call-seq:
-     *     target -> DepListTargetType
-     *
-     * Our DepListTargetType
-     */
-    /*
-     * Document-method: upgrade
-     *
-     * call-seq:
-     *     upgrade -> DepListUpgradeOption
-     *
-     * Our DepListUpgradeOption
-     */
-    /*
-     * Document-method: downgrade
-     *
-     * call-seq:
-     *     downgrade -> DepListDowngradeOption
-     *
-     * Our DepListDowngradeOption
-     */
-    /*
-     * Document-method: new_slots
-     *
-     * call-seq:
-     *     new_slots -> DepListNewSlotsOption
-     *
-     * Our DepListNewSlotsOption
-     */
-    /*
-     * Document-method: fall_back
-     *
-     * call-seq:
-     *     fall_back -> DepListFallBackOption
-     *
-     * Our DepListFallBackOption
-     */
-    /*
-     * Document-method: installed_deps_pre
-     *
-     * call-seq:
-     *     installed_deps_pre -> DepListDepsOption
-     *
-     * Our installed_deps_runtime
-     */
-    /*
-     * Document-method: installed_deps_runtime
-     *
-     * call-seq:
-     *     installed_deps_runtime -> DepListDepsOption
-     *
-     * Our installed_deps_runtime
-     */
-    /*
-     * Document-method: installed_deps_post
-     *
-     * call-seq:
-     *     installed_deps_post -> DepListDepsOption
-     *
-     * Our installed_deps_post
-     */
-    /*
-     * Document-method: uninstalled_deps_pre
-     *
-     * call-seq:
-     *     uninstalled_deps_pre -> DepListDepsOption
-     *
-     * Our uninstalled_deps_runtime
-     */
-    /*
-     * Document-method: uninstalled_deps_runtime
-     *
-     * call-seq:
-     *     uninstalled_deps_runtime -> DepListDepsOption
-     *
-     * Our uninstalled_deps_runtime
-     */
-    /*
-     * Document-method: uninstalled_deps_post
-     *
-     * call-seq:
-     *     uninstalled_deps_post -> DepListDepsOption
-     *
-     * Our uninstalled_deps_post
-     */
-    /*
-     * Document-method: uninstalled_deps_suggested
-     *
-     * call-seq:
-     *     uninstalled_deps_suggested -> DepListDepsOption
-     *
-     * Our uninstalled_deps_suggested
-     */
-    /*
-     * Document-method: suggested
-     *
-     * call-seq:
-     *     suggested -> DepListSuggestedOption
-     *
-     * Our DepListSuggestedOption
-     */
-    /*
-     * Document-method: circular
-     *
-     * call-seq:
-     *     circular -> DepListCircularOption
-     *
-     * Our DepListCircularOption
-     */
-    /*
-     * Document-method: use
-     *
-     * call-seq:
-     *     use -> DepListUseOption
-     *
-     * Our DepListSuggestedOption
-     */
-    /*
-     * Document-method: blocks
-     *
-     * call-seq:
-     *     blocks -> DepListBlockOption
-     *
-     * Our DepListBlockOption
-     */
-    /*
-     * Document-method: suggested
-     *
-     * call-seq:
-     *     suggested -> DepListSuggestedOption
-     *
-     * Our DepListSuggestedOption
-     */
-    /*
-     * Document-method: reinstall=
-     *
-     * call-seq:
-     *     reinstall=(dep_list_reinstall_option) -> Qnil
-     *
-     * Set our DepListReinstallOption
-     */
-    /*
-     * Document-method: reinstall_scm=
-     *
-     * call-seq:
-     *     reinstall_scm=(dep_list_reinstall_scm_option) -> Qnil
-     *
-     * Set our DepListReinstallScmOption
-     */
-    /*
-     * Document-method: target=
-     *
-     * call-seq:
-     *     target=dep_list_target_type) -> Qnil
-     *
-     * Set our DepListTargetType
-     */
-    /*
-     * Document-method: upgrade=
-     *
-     * call-seq:
-     *     upgrade=(dep_list_upgrade_option) -> Qnil
-     *
-     * Set our DepListUpgradeOption
-     */
-    /*
-     * Document-method: downgrade=
-     *
-     * call-seq:
-     *     downgrade=(dep_list_downgrade_options) -> Qnil
-     *
-     * Set our DepListDowngradeOption
-     */
-    /*
-     * Document-method: new_slots=
-     *
-     * call-seq:
-     *     new_slots=(dep_list_new_slots_options) -> Qnil
-     *
-     * Set our DepListNewSlotsOption
-     */
-    /*
-     * Document-method: fall_back=
-     *
-     * call-seq:
-     *     fall_back=(dep_list_fall_back_option) -> Qnil
-     *
-     * Set our DepListFallBackOption
-     */
-    /*
-     * Document-method: installed_deps_pre=
-     *
-     * call-seq:
-     *     installed_deps_pre=(dep_list_deps_option) -> Qnil
-     *
-     * Set our installed_deps_runtime
-     */
-    /*
-     * Document-method: installed_deps_runtime=
-     *
-     * call-seq:
-     *     installed_deps_runtime=(dep_list_deps_option) -> Qnil
-     *
-     * Set our installed_deps_runtime
-     */
-    /*
-     * Document-method: installed_deps_post=
-     *
-     * call-seq:
-     *     installed_deps_post=(dep_list_deps_option) -> Qnil
-     *
-     * Set our installed_deps_post
-     */
-    /*
-     * Document-method: uninstalled_deps_pre=
-     *
-     * call-seq:
-     *     uninstalled_deps_pre=(dep_list_deps_option) -> Qnil
-     *
-     * Set our uninstalled_deps_runtime
-     */
-    /*
-     * Document-method: uninstalled_deps_runtime=
-     *
-     * call-seq:
-     *     uninstalled_deps_runtime(dep_list_deps_option) -> Qnil
-     *
-     * Set our uninstalled_deps_runtime
-     */
-    /*
-     * Document-method: uninstalled_deps_post=
-     *
-     * call-seq:
-     *     uninstalled_deps_post=(dep_list_deps_option) -> Qnil
-     *
-     * Set our uninstalled_deps_post
-     */
-    /*
-     * Document-method: uninstalled_deps_suggested=
-     *
-     * call-seq:
-     *     uninstalled_deps_suggested=(dep_list_deps_option) -> Qnil
-     *
-     * Set our uninstalled_deps_suggested
-     */
-    /*
-     * Document-method: suggested=
-     *
-     * call-seq:
-     *     suggested=(dep_list_suggested_option) -> Qnil
-     *
-     * Set our DepListSuggestedOption
-     */
-    /*
-     * Document-method: circular=
-     *
-     * call-seq:
-     *     circular=(dep_list_circular_options) -> Qnil
-     *
-     * Set our DepListCircularOption
-     */
-    /*
-     * Document-method: use=
-     *
-     * call-seq:
-     *     use=(dep_list_use_option) -> Qnil
-     *
-     * Set our DepListSuggestedOption
-     */
-    /*
-     * Document-method: blocks=
-     *
-     * call-seq:
-     *     blocks=(dep_list_block_option) -> Qnil
-     *
-     * Set our DepListBlockOption
-     */
-    template <typename T_, typename K_, NamedValue<K_, T_> DepListOptions::* m_>
-    struct OptionsMember
-    {
-        static VALUE
-        fetch(VALUE self)
-        {
-            std::shared_ptr<DepListOptions> * p;
-            Data_Get_Struct(self, std::shared_ptr<DepListOptions>, p);
-            return INT2FIX(((**p).*m_)());
-        }
-
-        static VALUE
-        set (VALUE self, VALUE val)
-        {
-            std::shared_ptr<DepListOptions> * p;
-            Data_Get_Struct(self, std::shared_ptr<DepListOptions>, p);
-            try
-            {
-                ((**p).*m_)() = static_cast<T_>(NUM2INT(val));
-                return Qnil;
-            }
-            catch (const std::exception & e)
-            {
-                exception_to_ruby_exception(e);
-            }
-        }
-    };
-
-    /*
-     * call-seq:
-     *     dependancy_tags -> true or false
-     *
-     * Our dependency_tags
-     */
-    VALUE
-    dep_list_options_dependency_tags(VALUE self)
-    {
-        std::shared_ptr<DepListOptions> * p;
-        Data_Get_Struct(self, std::shared_ptr<DepListOptions>, p);
-        return (*p)->dependency_tags() ? Qtrue : Qfalse;
-    }
-
-    /*
-     * call-seq:
-     *     dependancy_tags=(true or false) -> Qnil
-     *
-     * Set our dependency_tags
-     */
-    VALUE
-    dep_list_options_dependency_tags_set(VALUE self, VALUE tags)
-    {
-        std::shared_ptr<DepListOptions> * p;
-        Data_Get_Struct(self, std::shared_ptr<DepListOptions>, p);
-        try
-        {
-            if (Qtrue == tags)
-            {
-                (*p)->dependency_tags() = true;
-            }
-            else if (Qfalse == tags)
-            {
-                (*p)->dependency_tags() = false;
-            }
-            else
-            {
-                rb_raise(rb_eTypeError, "dependency_tags= expects a bool");
-            }
-            return Qnil;
-        }
-        catch (const std::exception & e)
-        {
-            exception_to_ruby_exception(e);
-        }
-    }
-
-    /*
-     * call-seq:
-     *     override_masks -> DepListOverrideMasksFunctions
-     *
-     * Our override masks.
-     */
-    VALUE
-    dep_list_options_override_masks(VALUE self)
-    {
-        std::shared_ptr<DepListOptions> * p;
-        Data_Get_Struct(self, std::shared_ptr<DepListOptions>, p);
-        return (*p)->override_masks() ? dep_list_override_masks_functions_to_value((*p)->override_masks()) : Qnil;
-    }
-
-    /*
-     * call-seq:
-     *     override_masks=(dep_list_override_masks_functions) -> Qnil
-     *
-     * Set our override masks.
-     */
-    VALUE
-    dep_list_options_override_masks_set(VALUE self, VALUE omf)
-    {
-        std::shared_ptr<DepListOptions> * p;
-        Data_Get_Struct(self, std::shared_ptr<DepListOptions>, p);
-        try
-        {
-            (*p)->override_masks() = value_to_dep_list_override_masks_functions(omf);
-            return Qnil;
-        }
-        catch (const std::exception & e)
-        {
-            exception_to_ruby_exception(e);
-        }
-    }
-
-    /*
-     * call-seq:
-     *     match_package_options -> MatchPackageOptions
-     *
-     * Our match_package options.
-     */
-    VALUE
-    dep_list_options_match_package_options(VALUE self)
-    {
-        std::shared_ptr<DepListOptions> * p;
-        Data_Get_Struct(self, std::shared_ptr<DepListOptions>, p);
-        return match_package_options_to_value((*p)->match_package_options());
-    }
-
-    /*
-     * call-seq:
-     *     match_package_options=(MatchPackageOptions) -> Qnil
-     *
-     * Set our override masks.
-     */
-    VALUE
-    dep_list_options_match_package_options_set(VALUE self, VALUE omf)
-    {
-        std::shared_ptr<DepListOptions> * p;
-        Data_Get_Struct(self, std::shared_ptr<DepListOptions>, p);
-        try
-        {
-            (*p)->match_package_options() = value_to_match_package_options(omf);
-            return Qnil;
-        }
-        catch (const std::exception & e)
-        {
-            exception_to_ruby_exception(e);
-        }
-    }
-
-    VALUE
-    dep_list_init(int, VALUE *, VALUE self)
-    {
-        return self;
-    }
-
-    /*
-     * call-seq:
-     *     new(environment, dep_list_options) -> DepList
-     *
-     * Create a new DepList
-     */
-    VALUE
-    dep_list_new(int argc, VALUE *argv, VALUE self)
-    {
-        DepList * ptr(0);
-        try
-        {
-            if (2 == argc)
-            {
-                ptr = new DepList(value_to_environment(argv[0]).get(),
-                        *value_to_dep_list_options(argv[1]));
-            }
-            else
-            {
-                rb_raise(rb_eArgError, "DepList expects two arguments, but got %d",argc);
-            }
-            VALUE tdata(Data_Wrap_Struct(self, 0, &Common<DepList>::free, ptr));
-            rb_obj_call_init(tdata, argc, argv);
-            return tdata;
-        }
-        catch (const std::exception & e)
-        {
-            delete ptr;
-            exception_to_ruby_exception(e);
-        }
-    }
-
-    /*
-     * call-seq:
-     *     add(dep_spec, destinations)
-     *     add(set_spec_tree, destinations)
-     *
-     * Add the packages required to resolve an additional dependency
-     * spec or set.
-     */
-    VALUE
-    dep_list_add(VALUE self, VALUE da, VALUE d)
-    {
-        try
-        {
-            DepList * p;
-            Data_Get_Struct(self, DepList, p);
-            if (!rb_obj_is_kind_of(d, rb_cArray))
-                rb_raise(rb_eTypeError, "Can't convert %s into Array", rb_obj_classname(d));
-            std::shared_ptr<DestinationsSet> destinations(std::make_shared<DestinationsSet>());
-
-            for (long i = 0 ; i < RARRAY_LEN(d) ; ++i)
-                destinations->insert(value_to_repository(rb_ary_entry(d, i)));
-
-            std::shared_ptr<const SetSpecTree> sst(value_to_dep_tree<SetSpecTree>(da));
-            p->add(*sst, destinations);
-            return self;
-        }
-        catch (const std::exception & e)
-        {
-            exception_to_ruby_exception(e);
-        }
-    }
-
-    /*
-     * call-seq:
-     *     clear
-     *
-     * Clear the list.
-     */
-    VALUE
-    dep_list_clear(VALUE self)
-    {
-        DepList * p;
-        Data_Get_Struct(self, DepList, p);
-        p->clear();
-        return self;
-    }
-
-    /*
-     * call-seq:
-     *     options -> DepListOptions
-     *
-     * Our DepListOptions.
-     */
-    VALUE
-    dep_list_options(VALUE self)
-    {
-        DepList * p;
-        Data_Get_Struct(self, DepList, p);
-        return dep_list_options_to_value(p->options());
-    }
-
-#if CIARANM_REMOVED_THIS
-    /*
-     * call-seq:
-     *     already_installed?(dep_spec, destinations)
-     *
-     * Is an spec structure already installed?
-     */
-    VALUE
-    dep_list_already_installed(VALUE self, VALUE da, VALUE d)
-    {
-        try
-        {
-            DepList * p;
-            Data_Get_Struct(self, DepList, p);
-            if (!rb_obj_is_kind_of(d, rb_cArray))
-                rb_raise(rb_eTypeError, "Can't convert %s into Array", rb_obj_classname(d));
-            std::shared_ptr<DestinationsCollection> destinations(std::make_shared<DestinationsCollection::Concrete>());
-
-            for (long i = 0 ; i < RARRAY_LEN(d) ; ++i)
-                destinations->insert(value_to_repository(rb_ary_entry(d, i)));
-
-            return p->already_installed(*value_to_dep_spec(da), destinations) ? Qtrue : Qfalse;
-        }
-        catch (const std::exception & e)
-        {
-            exception_to_ruby_exception(e);
-        }
-    }
-#endif
-
-    /*
-     * call-seq:
-     *     each {|dep_list_entry| block}
-     *
-     * Iterate over our DepListEntrys
-     */
-    VALUE
-    dep_list_each(VALUE self)
-    {
-        DepList * p;
-        Data_Get_Struct(self, DepList, p);
-        for (DepList::Iterator i(p->begin()), i_end(p->end()) ; i != i_end ; ++i)
-            rb_yield(dep_list_entry_to_value(*i));
-        return self;
-    }
-
-    /*
-     * call-seq:
-     *     kind -> DepListEntryKind
-     *
-     * Our DepListEntryKind.
-     */
-    VALUE
-    dep_list_entry_kind(VALUE self)
-    {
-        try
-        {
-            DepListEntry * p;
-            Data_Get_Struct(self, DepListEntry, p);
-            return INT2FIX(p->kind());
-        }
-        catch (const std::exception & e)
-        {
-            exception_to_ruby_exception(e);
-        }
-    }
-
-    /*
-     * call-seq:
-     *     package_id -> PackageID
-     *
-     * Our PackageID.
-     */
-
-    VALUE
-    dep_list_entry_package_id(VALUE self)
-    {
-        try
-        {
-            DepListEntry * p;
-            Data_Get_Struct(self, DepListEntry, p);
-            return(package_id_to_value(p->package_id()));
-        }
-        catch (const std::exception & e)
-        {
-            exception_to_ruby_exception(e);
-        }
-    }
-
-    /*
-     * call-seq:
-     *     tags -> Array
-     *
-     * Our DepTags
-     */
-    VALUE
-    dep_list_entry_tags(VALUE self)
-    {
-        try
-        {
-            DepListEntry * p;
-            Data_Get_Struct(self, DepListEntry, p);
-
-            VALUE result(rb_ary_new());
-            for (DepListEntryTags::ConstIterator r(p->tags()->begin()),
-                    r_end(p->tags()->end()) ; r != r_end ; ++r)
-                rb_ary_push(result, dep_tag_to_value((*r).tag()));
-
-            return result;
-        }
-        catch (const std::exception & e)
-        {
-            exception_to_ruby_exception(e);
-        }
-    }
-
-    /*
-     * call-seq:
-     *     state -> DepListEntryState
-     *
-     * Our DepListEntryState.
-     */
-    VALUE
-    dep_list_entry_state(VALUE self)
-    {
-        try
-        {
-            DepListEntry * p;
-            Data_Get_Struct(self, DepListEntry, p);
-            return INT2FIX(p->state());
-        }
-        catch (const std::exception & e)
-        {
-            exception_to_ruby_exception(e);
-        }
-    }
-
-    /*
-     * call-seq:
-     *     bind(function, [environment] -> self
-     *
-     * Bind a c++ function to DepListOverrideMasksFunctions. Acceptable values are
-     * bind(:tilde_keywords, env)
-     * bind(:unkeyworded, env)
-     * bind(:repository_masks)
-     * bind(:license)
-     */
-    VALUE
-    dep_list_override_masks_functions_bind(int argc, VALUE* argv, VALUE self)
-    {
-        using namespace std::placeholders;
-
-        if (argc < 1 || argc > 2)
-            rb_raise(rb_eArgError, "Expected one or two arguments, not %d", argc);
-        Check_Type(argv[0], T_SYMBOL);
-        std::shared_ptr<DepListOverrideMasksFunctions> * p;
-        Data_Get_Struct(self, std::shared_ptr<DepListOverrideMasksFunctions>, p);
-        if (rb_intern("tilde_keywords") == SYM2ID(argv[0]))
-        {
-            if (2 != argc)
-                rb_raise(rb_eArgError, "Expected two arguments, not %d", argc);
-            std::shared_ptr<Environment> env = value_to_environment(argv[1]);
-            (*p)->push_back(std::bind(&override_tilde_keywords, env.get(), _1, _2));
-        }
-        else if (rb_intern("unkeyworded") == SYM2ID(argv[0]))
-        {
-            if (2 != argc)
-                rb_raise(rb_eArgError, "Expected two arguments, not %d", argc);
-            std::shared_ptr<Environment> env = value_to_environment(argv[1]);
-            (*p)->push_back(std::bind(&override_unkeyworded, env.get(), _1, _2));
-        }
-        else if (rb_intern("repository_masks") == SYM2ID(argv[0]))
-        {
-            if (1 != argc)
-                rb_raise(rb_eArgError, "Expected one argument, not %d", argc);
-            (*p)->push_back(std::bind(&override_repository_masks, _2));
-        }
-        else if (rb_intern("license") == SYM2ID(argv[0]))
-        {
-            if (1 != argc)
-            {
-                rb_raise(rb_eArgError, "Expected one argument, not %d", argc);
-            }
-            (*p)->push_back(std::bind(&override_license, _1, _2));
-        }
-        else
-        {
-            rb_raise(rb_eArgError, "Unrecognised function to bind: %s", rb_id2name(SYM2ID(argv[0])));
-        }
-        return self;
-    }
-
-    void do_register_dep_list()
-    {
-        /*
-         * Document-module: Paludis::DepListTargetType
-         *
-         * What type of target are we handling at the top level.
-         *
-         */
-        c_dep_list_target_type = rb_define_module_under(paludis_module(), "DepListTargetType");
-        for (DepListTargetType l(static_cast<DepListTargetType>(0)), l_end(last_dl_target) ; l != l_end ;
-                l = static_cast<DepListTargetType>(static_cast<int>(l) + 1))
-            rb_define_const(c_dep_list_target_type, value_case_to_RubyCase(stringify(l)).c_str(), INT2FIX(l));
-
-        // cc_enum_special<paludis/dep_list_options-se.hh, DepListTargetType, c_dep_list_target_type>
-
-        /*
-         * Document-module: Paludis::DepListReinstallOption
-         *
-         * What should we reinstall.
-         *
-         */
-        c_dep_list_reinstall_option = rb_define_module_under(paludis_module(), "DepListReinstallOption");
-        for (DepListReinstallOption l(static_cast<DepListReinstallOption>(0)), l_end(last_dl_reinstall) ; l != l_end ;
-                l = static_cast<DepListReinstallOption>(static_cast<int>(l) + 1))
-            rb_define_const(c_dep_list_reinstall_option, value_case_to_RubyCase(stringify(l)).c_str(), INT2FIX(l));
-
-        // cc_enum_special<paludis/dep_list_options-se.hh, DepListReinstallOption, c_dep_list_reinstall_option>
-
-        /*
-         * Document-module: Paludis::DepListFallBackOption
-         *
-         * When can we fall back to installed?
-         *
-         */
-        c_dep_list_fall_back_option = rb_define_module_under(paludis_module(), "DepListFallBackOption");
-        for (DepListFallBackOption l(static_cast<DepListFallBackOption>(0)), l_end(last_dl_fall_back) ; l != l_end ;
-                l = static_cast<DepListFallBackOption>(static_cast<int>(l) + 1))
-            rb_define_const(c_dep_list_fall_back_option, value_case_to_RubyCase(stringify(l)).c_str(), INT2FIX(l));
-
-        // cc_enum_special<paludis/dep_list_options-se.hh, DepListFallBackOption, c_dep_list_fall_back_option>
-
-        /*
-         * Document-module: Paludis::DepListReinstallScmOption
-         *
-         * When should we reinstall scm.
-         *
-         */
-        c_dep_list_reinstall_scm_option = rb_define_module_under(paludis_module(), "DepListReinstallScmOption");
-        for (DepListReinstallScmOption l(static_cast<DepListReinstallScmOption>(0)), l_end(last_dl_reinstall_scm) ; l != l_end ;
-                l = static_cast<DepListReinstallScmOption>(static_cast<int>(l) + 1))
-            rb_define_const(c_dep_list_reinstall_scm_option, value_case_to_RubyCase(stringify(l)).c_str(), INT2FIX(l));
-
-        // cc_enum_special<paludis/dep_list_options-se.hh, DepListReinstallScmOption, c_dep_list_reinstall_scm_option>
-
-        /*
-         * Document-module: Paludis::DepListDowngradeOption
-         *
-         * What do we do when we downgrade.
-         *
-         */
-        c_dep_list_downgrade_option = rb_define_module_under(paludis_module(), "DepListDowngradeOption");
-        for (DepListDowngradeOption l(static_cast<DepListDowngradeOption>(0)), l_end(last_dl_downgrade) ; l != l_end ;
-                l = static_cast<DepListDowngradeOption>(static_cast<int>(l) + 1))
-            rb_define_const(c_dep_list_downgrade_option, value_case_to_RubyCase(stringify(l)).c_str(), INT2FIX(l));
-
-        // cc_enum_special<paludis/dep_list_options-se.hh, DepListDowngradeOption, c_dep_list_downgrade_option>
-
-        /*
-         * Document-module: Paludis::DepListUpgradeOption
-         *
-         * When should we upgrade.
-         *
-         */
-        c_dep_list_upgrade_option = rb_define_module_under(paludis_module(), "DepListUpgradeOption");
-        for (DepListUpgradeOption l(static_cast<DepListUpgradeOption>(0)), l_end(last_dl_upgrade) ; l != l_end ;
-                l = static_cast<DepListUpgradeOption>(static_cast<int>(l) + 1))
-            rb_define_const(c_dep_list_upgrade_option, value_case_to_RubyCase(stringify(l)).c_str(), INT2FIX(l));
-
-        // cc_enum_special<paludis/dep_list_options-se.hh, DepListUpgradeOption, c_dep_list_upgrade_option>
-
-        /*
-         * Document-module: Paludis::DepListNewSlotsOption
-         *
-         * When should we pull in a new slot.
-         *
-         */
-        c_dep_list_new_slots_option = rb_define_module_under(paludis_module(), "DepListNewSlotsOption");
-        for (DepListNewSlotsOption l(static_cast<DepListNewSlotsOption>(0)), l_end(last_dl_new_slots) ; l != l_end ;
-                l = static_cast<DepListNewSlotsOption>(static_cast<int>(l) + 1))
-            rb_define_const(c_dep_list_new_slots_option, value_case_to_RubyCase(stringify(l)).c_str(), INT2FIX(l));
-
-        // cc_enum_special<paludis/dep_list_options-se.hh, DepListNewSlotsOption, c_dep_list_new_slots_option>
-
-        /*
-         * Document-module: Paludis::DepListDepsOption
-         *
-         * How should we handle a dep class.
-         *
-         */
-        c_dep_list_deps_option = rb_define_module_under(paludis_module(), "DepListDepsOption");
-        for (DepListDepsOption l(static_cast<DepListDepsOption>(0)), l_end(last_dl_deps) ; l != l_end ;
-                l = static_cast<DepListDepsOption>(static_cast<int>(l) + 1))
-            rb_define_const(c_dep_list_deps_option, value_case_to_RubyCase(stringify(l)).c_str(), INT2FIX(l));
-
-        // cc_enum_special<paludis/dep_list_options-se.hh, DepListDepsOption, c_dep_list_deps_option>
-
-        /*
-         * Document-module: Paludis::DepListCircularOption
-         *
-         * How we handle circular deps.
-         *
-         */
-        c_dep_list_suggested_option = rb_define_module_under(paludis_module(), "DepListSuggestedOption");
-        for (DepListSuggestedOption l(static_cast<DepListSuggestedOption>(0)), l_end(last_dl_suggested) ; l != l_end ;
-                l = static_cast<DepListSuggestedOption>(static_cast<int>(l) + 1))
-            rb_define_const(c_dep_list_suggested_option, value_case_to_RubyCase(stringify(l)).c_str(), INT2FIX(l));
-
-        // cc_enum_special<paludis/dep_list_options-se.hh, DepListSuggestedOption, c_dep_list_suggested_option>
-
-        /*
-         * Document-module: Paludis::DepListCircularOption
-         *
-         * How we handle circular deps.
-         *
-         */
-        c_dep_list_circular_option = rb_define_module_under(paludis_module(), "DepListCircularOption");
-        for (DepListCircularOption l(static_cast<DepListCircularOption>(0)), l_end(last_dl_circular) ; l != l_end ;
-                l = static_cast<DepListCircularOption>(static_cast<int>(l) + 1))
-            rb_define_const(c_dep_list_circular_option, value_case_to_RubyCase(stringify(l)).c_str(), INT2FIX(l));
-
-        // cc_enum_special<paludis/dep_list_options-se.hh, DepListCircularOption, c_dep_list_circular_option>
-
-        /*
-         * Document-module: Paludis::DepListUseOption
-         *
-         * Not for end user use. Used by adjutrix and qa.
-         *
-         */
-        c_dep_list_use_option = rb_define_module_under(paludis_module(), "DepListUseOption");
-        for (DepListUseOption l(static_cast<DepListUseOption>(0)), l_end(last_dl_use_deps) ; l != l_end ;
-                l = static_cast<DepListUseOption>(static_cast<int>(l) + 1))
-            rb_define_const(c_dep_list_use_option, value_case_to_RubyCase(stringify(l)).c_str(), INT2FIX(l));
-
-        // cc_enum_special<paludis/dep_list_options-se.hh, DepListUseOption, c_dep_list_use_option>
-
-        /*
-         * Document-module: Paludis::DepListBlocksOption
-         *
-         * How we handle blocks.
-         *
-         */
-        c_dep_list_blocks_option = rb_define_module_under(paludis_module(), "DepListBlocksOption");
-        for (DepListBlocksOption l(static_cast<DepListBlocksOption>(0)), l_end(last_dl_blocks) ; l != l_end ;
-                l = static_cast<DepListBlocksOption>(static_cast<int>(l) + 1))
-            rb_define_const(c_dep_list_blocks_option, value_case_to_RubyCase(stringify(l)).c_str(), INT2FIX(l));
-
-        // cc_enum_special<paludis/dep_list_options-se.hh, DepListBlocksOption, c_dep_list_blocks_option>
-
-        /*
-         * Document-module: Paludis::DepListEntryState
-         *
-         * State of a DepListEntry.
-         *
-         */
-        c_dep_list_entry_state = rb_define_module_under(paludis_module(), "DepListEntryState");
-        for (DepListEntryState l(static_cast<DepListEntryState>(0)), l_end(last_dle) ; l != l_end ;
-                l = static_cast<DepListEntryState>(static_cast<int>(l) + 1))
-            rb_define_const(c_dep_list_entry_state, value_case_to_RubyCase(stringify(l)).c_str(), INT2FIX(l));
-
-        // cc_enum_special<paludis/dep_list_options-se.hh, DepListEntryState, c_dep_list_entry_state>
-
-        /*
-         * Document-module: Paludis::DepListEntryKind
-         *
-         * Kind of a DepListEntry.
-         *
-         */
-        c_dep_list_entry_kind = rb_define_module_under(paludis_module(), "DepListEntryKind");
-        for (DepListEntryKind l(static_cast<DepListEntryKind>(0)), l_end(last_dlk) ; l != l_end ;
-                l = static_cast<DepListEntryKind>(static_cast<int>(l) + 1))
-            rb_define_const(c_dep_list_entry_kind, value_case_to_RubyCase(stringify(l)).c_str(), INT2FIX(l));
-
-        // cc_enum_special<paludis/dep_list_options-se.hh, DepListEntryKind, c_dep_list_entry_kind>
-
-        /*
-         * Document-class: Paludis::DepListOptions
-         *
-         * Parameters for a DepList.
-         */
-        c_dep_list_options = rb_define_class_under(paludis_module(), "DepListOptions", rb_cObject);
-        rb_define_singleton_method(c_dep_list_options, "new", RUBY_FUNC_CAST(&dep_list_options_new), -1);
-        rb_define_method(c_dep_list_options, "initialize", RUBY_FUNC_CAST(&dep_list_options_init), -1);
-        rb_define_method(c_dep_list_options, "reinstall",
-                RUBY_FUNC_CAST((&OptionsMember<DepListReinstallOption, n::reinstall, &DepListOptions::reinstall>::fetch)),0);
-        rb_define_method(c_dep_list_options, "reinstall_scm",
-                RUBY_FUNC_CAST((&OptionsMember<DepListReinstallScmOption, n::reinstall_scm, &DepListOptions::reinstall_scm>::fetch)),0);
-        rb_define_method(c_dep_list_options, "target_type",
-                RUBY_FUNC_CAST((&OptionsMember<DepListTargetType, n::target_type, &DepListOptions::target_type>::fetch)),0);
-        rb_define_method(c_dep_list_options, "downgrade",
-                RUBY_FUNC_CAST((&OptionsMember<DepListDowngradeOption, n::downgrade, &DepListOptions::downgrade>::fetch)),0);
-        rb_define_method(c_dep_list_options, "upgrade",
-                RUBY_FUNC_CAST((&OptionsMember<DepListUpgradeOption, n::upgrade, &DepListOptions::upgrade>::fetch)),0);
-        rb_define_method(c_dep_list_options, "new_slots",
-                RUBY_FUNC_CAST((&OptionsMember<DepListNewSlotsOption, n::new_slots, &DepListOptions::new_slots>::fetch)),0);
-        rb_define_method(c_dep_list_options, "fall_back",
-                RUBY_FUNC_CAST((&OptionsMember<DepListFallBackOption, n::fall_back, &DepListOptions::fall_back>::fetch)),0);
-        rb_define_method(c_dep_list_options, "installed_deps_pre",
-                RUBY_FUNC_CAST((&OptionsMember<DepListDepsOption, n::installed_deps_pre, &DepListOptions::installed_deps_pre>::fetch)),0);
-        rb_define_method(c_dep_list_options, "installed_deps_runtime",
-                RUBY_FUNC_CAST((&OptionsMember<DepListDepsOption, n::installed_deps_runtime, &DepListOptions::installed_deps_runtime>::fetch)),0);
-        rb_define_method(c_dep_list_options, "installed_deps_post",
-                RUBY_FUNC_CAST((&OptionsMember<DepListDepsOption, n::installed_deps_post, &DepListOptions::installed_deps_post>::fetch)),0);
-        rb_define_method(c_dep_list_options, "uninstalled_deps_pre",
-                RUBY_FUNC_CAST((&OptionsMember<DepListDepsOption, n::uninstalled_deps_pre, &DepListOptions::uninstalled_deps_pre>::fetch)),0);
-        rb_define_method(c_dep_list_options, "uninstalled_deps_runtime",
-                RUBY_FUNC_CAST((&OptionsMember<DepListDepsOption, n::uninstalled_deps_runtime, &DepListOptions::uninstalled_deps_runtime>::fetch)),0);
-        rb_define_method(c_dep_list_options, "uninstalled_deps_post",
-                RUBY_FUNC_CAST((&OptionsMember<DepListDepsOption, n::uninstalled_deps_post, &DepListOptions::uninstalled_deps_post>::fetch)),0);
-        rb_define_method(c_dep_list_options, "uninstalled_deps_suggested",
-                RUBY_FUNC_CAST((&OptionsMember<DepListDepsOption, n::uninstalled_deps_suggested, &DepListOptions::uninstalled_deps_suggested>::fetch)),0);
-        rb_define_method(c_dep_list_options, "suggested",
-                RUBY_FUNC_CAST((&OptionsMember<DepListSuggestedOption, n::suggested, &DepListOptions::suggested>::fetch)),0);
-        rb_define_method(c_dep_list_options, "circular",
-                RUBY_FUNC_CAST((&OptionsMember<DepListCircularOption, n::circular, &DepListOptions::circular>::fetch)),0);
-        rb_define_method(c_dep_list_options, "use",
-                RUBY_FUNC_CAST((&OptionsMember<DepListUseOption, n::use, &DepListOptions::use>::fetch)),0);
-        rb_define_method(c_dep_list_options, "blocks",
-                RUBY_FUNC_CAST((&OptionsMember<DepListBlocksOption, n::blocks, &DepListOptions::blocks>::fetch)),0);
-
-        rb_define_method(c_dep_list_options, "reinstall=",
-                RUBY_FUNC_CAST((&OptionsMember<DepListReinstallOption, n::reinstall, &DepListOptions::reinstall>::set)),1);
-        rb_define_method(c_dep_list_options, "reinstall_scm=",
-                RUBY_FUNC_CAST((&OptionsMember<DepListReinstallScmOption, n::reinstall_scm, &DepListOptions::reinstall_scm>::set)),1);
-        rb_define_method(c_dep_list_options, "target_type=",
-                RUBY_FUNC_CAST((&OptionsMember<DepListTargetType, n::target_type, &DepListOptions::target_type>::set)),1);
-        rb_define_method(c_dep_list_options, "upgrade=",
-                RUBY_FUNC_CAST((&OptionsMember<DepListUpgradeOption, n::upgrade, &DepListOptions::upgrade>::set)),1);
-        rb_define_method(c_dep_list_options, "downgrade=",
-                RUBY_FUNC_CAST((&OptionsMember<DepListDowngradeOption, n::downgrade, &DepListOptions::downgrade>::set)),1);
-        rb_define_method(c_dep_list_options, "new_slots=",
-                RUBY_FUNC_CAST((&OptionsMember<DepListNewSlotsOption, n::new_slots, &DepListOptions::new_slots>::set)),1);
-        rb_define_method(c_dep_list_options, "fall_back=",
-                RUBY_FUNC_CAST((&OptionsMember<DepListFallBackOption, n::fall_back, &DepListOptions::fall_back>::set)),1);
-        rb_define_method(c_dep_list_options, "installed_deps_pre=",
-                RUBY_FUNC_CAST((&OptionsMember<DepListDepsOption, n::installed_deps_pre, &DepListOptions::installed_deps_pre>::set)),1);
-        rb_define_method(c_dep_list_options, "installed_deps_runtime=",
-                RUBY_FUNC_CAST((&OptionsMember<DepListDepsOption, n::installed_deps_runtime, &DepListOptions::installed_deps_runtime>::set)),1);
-        rb_define_method(c_dep_list_options, "installed_deps_post=",
-                RUBY_FUNC_CAST((&OptionsMember<DepListDepsOption, n::installed_deps_post, &DepListOptions::installed_deps_post>::set)),1);
-        rb_define_method(c_dep_list_options, "uninstalled_deps_pre=",
-                RUBY_FUNC_CAST((&OptionsMember<DepListDepsOption, n::uninstalled_deps_pre, &DepListOptions::uninstalled_deps_pre>::set)),1);
-        rb_define_method(c_dep_list_options, "uninstalled_deps_runtime=",
-                RUBY_FUNC_CAST((&OptionsMember<DepListDepsOption, n::uninstalled_deps_runtime, &DepListOptions::uninstalled_deps_runtime>::set)),1);
-        rb_define_method(c_dep_list_options, "uninstalled_deps_post=",
-                RUBY_FUNC_CAST((&OptionsMember<DepListDepsOption, n::uninstalled_deps_post, &DepListOptions::uninstalled_deps_post>::set)),1);
-        rb_define_method(c_dep_list_options, "uninstalled_deps_suggested=",
-                RUBY_FUNC_CAST((&OptionsMember<DepListDepsOption, n::uninstalled_deps_suggested, &DepListOptions::uninstalled_deps_suggested>::set)),1);
-        rb_define_method(c_dep_list_options, "suggested=",
-                RUBY_FUNC_CAST((&OptionsMember<DepListSuggestedOption, n::suggested, &DepListOptions::suggested>::set)),1);
-        rb_define_method(c_dep_list_options, "circular=",
-                RUBY_FUNC_CAST((&OptionsMember<DepListCircularOption, n::circular, &DepListOptions::circular>::set)),1);
-        rb_define_method(c_dep_list_options, "use=",
-                RUBY_FUNC_CAST((&OptionsMember<DepListUseOption, n::use, &DepListOptions::use>::set)),1);
-        rb_define_method(c_dep_list_options, "blocks=",
-                RUBY_FUNC_CAST((&OptionsMember<DepListBlocksOption, n::blocks, &DepListOptions::blocks>::set)),1);
-
-
-        rb_define_method(c_dep_list_options, "dependency_tags", RUBY_FUNC_CAST(&dep_list_options_dependency_tags),0);
-        rb_define_method(c_dep_list_options, "dependency_tags=", RUBY_FUNC_CAST(&dep_list_options_dependency_tags_set),1);
-
-        rb_define_method(c_dep_list_options, "override_masks", RUBY_FUNC_CAST(&dep_list_options_override_masks),0);
-        rb_define_method(c_dep_list_options, "override_masks=", RUBY_FUNC_CAST(&dep_list_options_override_masks_set),1);
-
-        rb_define_method(c_dep_list_options, "match_package_options", RUBY_FUNC_CAST(&dep_list_options_match_package_options), 0);
-        rb_define_method(c_dep_list_options, "match_package_options=", RUBY_FUNC_CAST(&dep_list_options_match_package_options_set), 1);
-
-        /*
-         * Document-class: Paludis::DepList
-         *
-         * Holds a list of dependencies in merge order. Includes Enumerable[http://www.ruby-doc.org/core/classes/Enumerable.html],
-         * but not Comparable.
-         */
-        c_dep_list= rb_define_class_under(paludis_module(), "DepList", rb_cObject);
-        rb_define_singleton_method(c_dep_list, "new", RUBY_FUNC_CAST(&dep_list_new), -1);
-        rb_define_method(c_dep_list, "initialize", RUBY_FUNC_CAST(&dep_list_init), -1);
-        rb_define_method(c_dep_list, "clear", RUBY_FUNC_CAST(&dep_list_clear), 0);
-        rb_define_method(c_dep_list, "add", RUBY_FUNC_CAST(&dep_list_add), 2);
-#if CIARANM_REMOVED_THIS
-        rb_define_method(c_dep_list, "already_installed?", RUBY_FUNC_CAST(&dep_list_already_installed), 2);
-#endif
-        rb_define_method(c_dep_list, "each", RUBY_FUNC_CAST(&dep_list_each), 0);
-        rb_include_module(c_dep_list, rb_mEnumerable);
-        rb_define_method(c_dep_list, "options", RUBY_FUNC_CAST(&dep_list_options), 0);
-
-        /*
-         * Document-class Paludis::DepListEntry
-         *
-         * An entry in a DepList.
-         */
-        c_dep_list_entry = rb_define_class_under(paludis_module(), "DepListEntry", rb_cObject);
-        rb_funcall(c_dep_list_entry, rb_intern("private_class_method"), 1, rb_str_new2("new"));
-        rb_define_method(c_dep_list_entry, "kind", RUBY_FUNC_CAST(&dep_list_entry_kind), 0);
-        rb_define_method(c_dep_list_entry, "package_id", RUBY_FUNC_CAST(&dep_list_entry_package_id), 0);
-        rb_define_method(c_dep_list_entry, "state", RUBY_FUNC_CAST(&dep_list_entry_state), 0);
-        rb_define_method(c_dep_list_entry, "tags", RUBY_FUNC_CAST(&dep_list_entry_tags), 0);
-
-        /*
-         * Document-module Paludis::OverrideFunctions
-         *
-         * blah
-         */
-        c_dep_list_override_masks_functions = rb_define_class_under(paludis_module(), "DepListOverrideMasksFunctions", rb_cObject);
-        rb_define_singleton_method(c_dep_list_override_masks_functions, "new", RUBY_FUNC_CAST(&dep_list_override_masks_functions_new), -1);
-        rb_define_method(c_dep_list_override_masks_functions, "initialize", RUBY_FUNC_CAST(&dep_list_override_masks_functions_init), -1);
-        rb_define_method(c_dep_list_override_masks_functions, "bind",
-                RUBY_FUNC_CAST(&dep_list_override_masks_functions_bind), -1);
-    }
-}
-
-
-RegisterRubyClass::Register paludis_ruby_register_dep_list PALUDIS_ATTRIBUTE((used))
-    (&do_register_dep_list);
-
-
diff --git a/ruby/dep_list_TEST.rb b/ruby/dep_list_TEST.rb
deleted file mode 100644
index 056ba64f6..000000000
--- a/ruby/dep_list_TEST.rb
+++ /dev/null
@@ -1,305 +0,0 @@
-#!/usr/bin/env ruby
-# vim: set sw=4 sts=4 et tw=80 :
-#
-# Copyright (c) 2007 Richard Brown
-#
-# 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
-# Public License version 2, as published by the Free Software Foundation.
-#
-# Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
-ENV['PALUDIS_HOME'] = Dir.getwd() + '/dep_list_TEST_dir/home'
-
-require 'test/unit'
-require 'Paludis'
-
-Paludis::Log.instance.log_level = Paludis::LogLevel::Warning
-
-module Paludis
-    module Shared
-        def dlo
-            DepListOptions.new(
-                DepListReinstallOption::Never,
-                DepListReinstallScmOption::Never,
-                DepListTargetType::Package,
-                DepListUpgradeOption::Always,
-                DepListDowngradeOption::AsNeeded,
-                DepListNewSlotsOption::Always,
-                DepListFallBackOption::AsNeededExceptTargets,
-                DepListDepsOption::Discard,
-                DepListDepsOption::TryPost,
-                DepListDepsOption::TryPost,
-                DepListDepsOption::Pre,
-                DepListDepsOption::PreOrPost,
-                DepListDepsOption::Post,
-                DepListDepsOption::TryPost,
-                DepListSuggestedOption::Show,
-                DepListCircularOption::Error,
-                DepListUseOption::Standard,
-                DepListBlocksOption::Accumulate,
-                DepListOverrideMasksFunctions.new,
-                false,
-                []
-            )
-        end
-
-        def default_options
-            {
-                :reinstall => DepListReinstallOption::Never,
-                :reinstall_scm => DepListReinstallScmOption::Never,
-                :target_type => DepListTargetType::Package,
-                :upgrade => DepListUpgradeOption::Always,
-                :downgrade => DepListDowngradeOption::AsNeeded,
-                :new_slots => DepListNewSlotsOption::Always,
-                :fall_back => DepListFallBackOption::AsNeededExceptTargets,
-                :installed_deps_pre => DepListDepsOption::Discard,
-                :installed_deps_runtime => DepListDepsOption::TryPost,
-                :installed_deps_post => DepListDepsOption::TryPost,
-                :uninstalled_deps_pre => DepListDepsOption::Pre,
-                :uninstalled_deps_runtime => DepListDepsOption::PreOrPost,
-                :uninstalled_deps_post => DepListDepsOption::Post,
-                :uninstalled_deps_suggested => DepListDepsOption::TryPost,
-                :suggested => DepListSuggestedOption::Show,
-                :circular => DepListCircularOption::Error,
-                :use => DepListUseOption::Standard,
-                :blocks => DepListBlocksOption::Accumulate,
-                :override_masks => DepListOverrideMasksFunctions.new,
-                :dependency_tags => false,
-                :match_package_options => []
-            }
-        end
-
-        def dlo_hash
-            DepListOptions.new(options_hash)
-        end
-
-        def options_hash
-            {
-                :reinstall => DepListReinstallOption::Always,
-                :reinstall_scm => DepListReinstallScmOption::Always,
-                :target_type => DepListTargetType::Set,
-                :upgrade => DepListUpgradeOption::AsNeeded,
-                :downgrade => DepListDowngradeOption::Warning,
-                :new_slots => DepListNewSlotsOption::AsNeeded,
-                :fall_back => DepListFallBackOption::AsNeeded,
-                :installed_deps_pre => DepListDepsOption::Pre,
-                :installed_deps_runtime => DepListDepsOption::Discard,
-                :installed_deps_post => DepListDepsOption::Discard,
-                :uninstalled_deps_pre => DepListDepsOption::Discard,
-                :uninstalled_deps_runtime => DepListDepsOption::Discard,
-                :uninstalled_deps_post => DepListDepsOption::Discard,
-                :uninstalled_deps_suggested => DepListDepsOption::Discard,
-                :suggested => DepListSuggestedOption::Discard,
-                :circular => DepListCircularOption::Discard,
-                :use => DepListUseOption::TakeAll,
-                :blocks => DepListBlocksOption::Error,
-                :override_masks => DepListOverrideMasksFunctions.new,
-                :dependency_tags => true,
-                :match_package_options => []
-            }
-        end
-
-        def dlo_default
-            DepListOptions.new()
-        end
-
-        def env
-            @env or @env = EnvironmentFactory.instance.create("")
-        end
-
-        def dl
-            DepList.new(env,dlo)
-        end
-
-        def pda
-            Paludis::parse_user_package_dep_spec('foo/bar', env, [])
-        end
-
-        def dd
-            env.default_destinations
-        end
-    end
-
-    class TestCase_DepListOptions < Test::Unit::TestCase
-        include Shared
-
-        def test_create
-            assert_nothing_raised do
-                dlo
-            end
-
-            assert_nothing_raised do
-                dlo_hash
-            end
-
-            assert_nothing_raised do
-                dlo_default
-            end
-        end
-
-        def test_members
-            options = dlo_default
-            #This will fail if the defaults change, please also update the rdoc.
-            default_options.each_pair do |method, value|
-                assert_respond_to options, method
-                if :override_masks == method
-                    assert_nil options.send(method)
-                else
-                    assert_equal value, options.send(method)
-                end
-                #check setters work
-                assert_nothing_raised do
-                    options.send("#{method}=", options_hash[method])
-                    if :override_masks == method
-                        assert_equal options_hash[method].class, options.send(method).class
-                    else
-                        assert_equal options_hash[method], options.send(method)
-                    end
-                end
-            end
-        end
-
-        def test_bad_create
-            options_hash.each_key do |key|
-                assert_raises ArgumentError do
-                    DepListOptions.new(options_hash.delete(key))
-                end
-            end
-        end
-    end
-
-    class TestCase_DepList < Test::Unit::TestCase
-        include Shared
-
-        def test_create
-            assert_nothing_raised do
-                dl
-            end
-        end
-
-###        def test_respond
-###            dep_list = dl
-###            [:add, :clear, :already_installed?, :each, :options].each {|sym| assert_respond_to dep_list, sym}
-###        end
-
-        def test_add
-            assert_nothing_raised do
-                dl.add(pda, dd)
-            end
-        end
-
-        def test_add_set
-            assert_nothing_raised do
-                dl.add(env.set("world"), dd)
-            end
-        end
-
-        def test_add_bad_tree
-            assert_raise TypeError do
-                dl.add(env[Selection::BestVersionOnly.new(Generator::Matches.new(
-                    pda, nil, []))].last.build_dependencies_key.value, dd)
-            end
-        end
-
-        def test_clear
-            assert_nothing_raised do
-                dl.clear
-            end
-        end
-
-###        def test_already_installed?
-###            dep_spec = pda
-###            dep_list = dl
-###            assert !dep_list.already_installed?(dep_spec, dd)
-###            dep_list.add(dep_spec, dd)
-###            assert dep_list.already_installed?(dep_spec, dd)
-###        end
-
-###        def test_each
-###            assert_kind_of DepListEntry, dl.add(pda, dd).entries.first
-###        end
-
-###        def test_errors
-###            assert_raise AllMaskedError do
-###                dl.add(PackageDepSpec.new('foo/ba', PackageDepSpecParseMode::Permissive), dd)
-###            end
-###
-###            begin
-###                dl.add(PackageDepSpec.new('foo/ba', PackageDepSpecParseMode::Permissive), dd)
-###            rescue AllMaskedError => error
-###                assert_equal 'foo/ba', error.query
-###            end
-###
-###        end
-
-        def test_options
-            dep_list = dl
-            assert_kind_of DepListOptions, dep_list.options
-            assert_equal DepListReinstallOption::Never, dep_list.options.reinstall
-
-            assert_nothing_raised do
-                dep_list.options.reinstall = DepListReinstallOption::Always
-            end
-
-            assert_equal DepListReinstallOption::Always, dep_list.options.reinstall
-
-        end
-    end
-
-    class TestCase_DepListEntry < Test::Unit::TestCase
-        include Shared
-
-        def dle
-            dl.add(pda, dd).entries.first
-        end
-
-        def test_create
-            assert_raise NoMethodError do
-                DepListEntry.new
-            end
-        end
-
-        def test_methods
-            dep_list_entry = dle
-            {
-                :package_id => PackageID, :state=> Integer, :tags => [String]
-            }.each_pair do |method, returns|
-                assert_respond_to dep_list_entry, method
-                if returns.kind_of? Array
-                    assert_kind_of Array, dep_list_entry.send(method)
-                    dep_list_entry.send(method).each {|x| assert_kind_of returns.first, x}
-                else
-                    assert_kind_of returns, dep_list_entry.send(method)
-                end
-            end
-        end
-    end
-
-    class TestCase_DepListOverrideMasksFunctions < Test::Unit::TestCase
-        include Shared
-
-        def test_create
-            assert_nothing_raised do
-                DepListOverrideMasksFunctions.new
-            end
-        end
-
-        def test_bind
-            dlo = DepListOverrideMasksFunctions.new
-            assert_equal dlo, dlo.bind(:tilde_keywords, env)
-            assert_equal dlo, dlo.bind(:unkeyworded, env)
-            assert_equal dlo, dlo.bind(:repository_masks)
-            assert_equal dlo, dlo.bind(:license)
-        end
-    end
-end
-
diff --git a/ruby/dep_list_TEST_cleanup.sh b/ruby/dep_list_TEST_cleanup.sh
deleted file mode 100755
index f51e43b49..000000000
--- a/ruby/dep_list_TEST_cleanup.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-# vim: set ft=sh sw=4 sts=4 et :
-
-if [ -d dep_list_TEST_dir ] ; then
-    rm -fr dep_list_TEST_dir
-else
-    true
-fi
-
-
-
-
diff --git a/ruby/dep_list_TEST_setup.sh b/ruby/dep_list_TEST_setup.sh
deleted file mode 100755
index 923afd21c..000000000
--- a/ruby/dep_list_TEST_setup.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/bin/env bash
-# vim: set ft=sh sw=4 sts=4 et :
-
-mkdir dep_list_TEST_dir || exit 1
-cd dep_list_TEST_dir || exit 1
-
-mkdir -p home/.paludis/repositories
-
-cat <<END > home/.paludis/repositories/testrepo.conf
-location = `pwd`/testrepo
-format = e
-names_cache = /var/empty
-cache = /var/empty
-profiles = \${location}/profiles/testprofile
-builddir = `pwd`
-END
-
-cat <<END > home/.paludis/repositories/installed.conf
-location = `pwd`/installed
-format = vdb
-names_cache = /var/empty
-provides_cache = /var/empty
-builddir = `pwd`
-END
-
-cat <<END > home/.paludis/keywords.conf
-*/* test
-~foo/bar-1.0 ~test
-END
-
-cat <<END > home/.paludis/use.conf
-*/* enabled
-~foo/bar-1.0 sometimes_enabled
-END
-
-cat <<END > home/.paludis/package_mask.conf
-=foo/bar-3*
-END
-
-cat <<END > home/.paludis/licenses.conf
-*/* *
-END
-
-cat <<END > home/.paludis/general.conf
-world = /dev/null
-END
-
-mkdir -p testrepo/{eclass,distfiles,profiles/testprofile,foo/bar/files} || exit 1
-cd testrepo || exit 1
-echo "testrepo" > profiles/repo_name || exit 1
-cat <<END > profiles/categories || exit 1
-foo
-END
-cat <<END > profiles/testprofile/make.defaults
-ARCH=test
-USERLAND=test
-KERNEL=test
-END
-cat <<END > profiles/profiles.desc
-test testprofile stable
-END
-
-cat <<"END" > foo/bar/bar-1.0.ebuild || exit 1
-DESCRIPTION="Test package"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI=""
-SLOT="0"
-IUSE=""
-LICENSE="GPL-2"
-KEYWORDS="test"
-END
-
-cat <<"END" > foo/bar/bar-2.0.ebuild || exit 1
-DESCRIPTION="Test package"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI=""
-SLOT="0"
-IUSE=""
-LICENSE="GPL-2"
-KEYWORDS="~test"
-DEPEND="disabled? ( bar/foo )"
-END
-cd ..
-
-mkdir -p installed/cat-one/pkg-one-1 || exit 1
-
-echo foo/bar >installed/world
-
-for i in SLOT EAPI; do
-    echo "0" >installed/cat-one/pkg-one-1/${i}
-done
-
-for i in DEPEND RDEPEND LICENSE INHERITED IUSE PDEPEND PROVIDE; do
-    touch installed/cat-one/pkg-one-1/${i}
-done
-
-echo "flag1 flag2" >>installed/cat-one/pkg-one-1/USE
-
-cat <<END >installed/cat-one/pkg-one-1/CONTENTS
-dir //test
-obj /test/test_file de54c26b0678df67aca147575523b3c2 1165250496
-sym /test/test_link -> /test/test_file 1165250496
-END
-
diff --git a/ruby/find_unused_packages_task.cc b/ruby/find_unused_packages_task.cc
deleted file mode 100644
index df149c265..000000000
--- a/ruby/find_unused_packages_task.cc
+++ /dev/null
@@ -1,101 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2007 Richard Brown
- *
- * 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
- * Public License version 2, as published by the Free Software Foundation.
- *
- * Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <paludis_ruby.hh>
-#include <paludis/legacy/find_unused_packages_task.hh>
-#include <paludis/util/wrapped_forward_iterator.hh>
-#include <paludis/util/sequence-impl.hh>
-#include <ruby.h>
-
-using namespace paludis;
-using namespace paludis::ruby;
-
-namespace
-{
-    static VALUE c_find_unused_packages_task;
-
-    VALUE
-    find_unused_packages_task_init(int, VALUE *, VALUE self)
-    {
-        return self;
-    }
-
-    VALUE
-    find_unused_packages_task_new(int argc, VALUE *argv, VALUE self)
-    {
-        FindUnusedPackagesTask * ptr(0);
-        try
-        {
-            if (2 == argc)
-            {
-                ptr = new FindUnusedPackagesTask(value_to_environment(argv[0]).get(),
-                    value_to_repository(argv[1]).get());
-            }
-            else
-            {
-                rb_raise(rb_eArgError, "FindUnusedPackagesTask expects two arguments, but got %d",argc);
-            }
-            VALUE tdata(Data_Wrap_Struct(self, 0, &Common<FindUnusedPackagesTask>::free, ptr));
-            rb_obj_call_init(tdata, argc, argv);
-            return tdata;
-        }
-        catch (const std::exception & e)
-        {
-            delete ptr;
-            exception_to_ruby_exception(e);
-        }
-    }
-
-    VALUE find_unused_packages_task_execute(VALUE self, VALUE qpn)
-    {
-        try
-        {
-            FindUnusedPackagesTask * ptr;
-            Data_Get_Struct(self, FindUnusedPackagesTask, ptr);
-            std::shared_ptr<const PackageIDSequence> c(ptr->execute(value_to_qualified_package_name(qpn)));
-            VALUE result(rb_ary_new());
-            for (PackageIDSequence::ConstIterator i(c->begin()), i_end(c->end()) ; i != i_end ; ++i)
-                rb_ary_push(result, package_id_to_value(*i));
-            return result;
-        }
-        catch (const std::exception & e)
-        {
-            exception_to_ruby_exception(e);
-        }
-    }
-
-    void do_register_find_unused_packages_task()
-    {
-        /* Document-class: Paludis::QA::Message
-         *
-         * A QA message
-         */
-        c_find_unused_packages_task = rb_define_class_under(paludis_module(),
-                "FindUnusedPackagesTask", rb_cObject);
-        rb_define_singleton_method(c_find_unused_packages_task,
-                "new", RUBY_FUNC_CAST(&find_unused_packages_task_new),-1);
-        rb_define_method(c_find_unused_packages_task,
-                "initialize", RUBY_FUNC_CAST(&find_unused_packages_task_init),-1);
-        rb_define_method(c_find_unused_packages_task,
-                "execute", RUBY_FUNC_CAST(&find_unused_packages_task_execute),1);
-    }
-}
-
-RegisterRubyClass::Register paludis_ruby_register_find_unused_packages_task PALUDIS_ATTRIBUTE((used))
-    (&do_register_find_unused_packages_task);
diff --git a/ruby/find_unused_packages_task_TEST.rb b/ruby/find_unused_packages_task_TEST.rb
deleted file mode 100644
index 175b258fd..000000000
--- a/ruby/find_unused_packages_task_TEST.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env ruby
-# vim: set sw=4 sts=4 et tw=80 :
-
-#
-# Copyright (c) 2007 Richard Brown
-#
-# 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
-# Public License version 2, as published by the Free Software Foundation.
-#
-# Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
-require 'test/unit'
-require 'Paludis'
-
-module Paludis
-    Log.instance.log_level = LogLevel::Warning
-
-    class TestCase_FindUnusedPackagesTask < Test::Unit::TestCase
-        def env
-            NoConfigEnvironment.new(Dir.getwd().to_s + "/find_unused_packages_task_TEST_dir/testrepo")
-        end
-
-        def task
-            FindUnusedPackagesTask.new(env,env.main_repository)
-        end
-
-        def test_create
-            assert_nothing_raised do
-                task
-            end
-        end
-
-        def test_execute
-            t = task
-            bar = t.execute(QualifiedPackageName.new('foo/bar'))
-            assert bar.empty?
-            baz = t.execute(QualifiedPackageName.new('foo/baz'))
-            assert_equal 1, baz.length
-            assert_kind_of PackageID, baz.first
-        end
-    end
-end
-
diff --git a/ruby/find_unused_packages_task_TEST_cleanup.sh b/ruby/find_unused_packages_task_TEST_cleanup.sh
deleted file mode 100755
index 63faeb572..000000000
--- a/ruby/find_unused_packages_task_TEST_cleanup.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-# vim: set ft=sh sw=4 sts=4 et :
-
-if [ -d find_unused_packages_task_TEST_dir ] ; then
-    rm -fr find_unused_packages_task_TEST_dir
-else
-    true
-fi
-
-
-
-
diff --git a/ruby/find_unused_packages_task_TEST_setup.sh b/ruby/find_unused_packages_task_TEST_setup.sh
deleted file mode 100755
index b37d2c8f4..000000000
--- a/ruby/find_unused_packages_task_TEST_setup.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env bash
-# vim: set ft=sh sw=4 sts=4 et :
-
-mkdir find_unused_packages_task_TEST_dir || exit 1
-cd find_unused_packages_task_TEST_dir || exit 1
-
-mkdir -p testrepo/{eclass,distfiles,profiles/testprofile,foo/bar/files,foo/baz/files} || exit 1
-
-cd testrepo || exit 1
-echo "testrepo" > profiles/repo_name || exit 1
-cat <<END > profiles/categories || exit 1
-foo
-END
-cat <<END > profiles/testprofile/make.defaults
-ARCH=test
-USERLAND=test
-KERNEL=test
-END
-cat <<END > profiles/profiles.desc
-test testprofile stable
-END
-
-cat <<"END" > foo/bar/bar-1.0.ebuild || exit 1
-DESCRIPTION="Test package"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI=""
-SLOT="0"
-IUSE=""
-LICENSE="GPL-2"
-KEYWORDS="test"
-END
-
-cat <<"END" > foo/bar/bar-2.0.ebuild || exit 1
-DESCRIPTION="Test package"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI=""
-SLOT="0"
-IUSE=""
-LICENSE="GPL-2"
-KEYWORDS="~test"
-END
-
-cat <<"END" > foo/baz/baz-1.0.ebuild || exit 1
-DESCRIPTION="Test package"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI=""
-SLOT="0"
-IUSE=""
-LICENSE="GPL-2"
-KEYWORDS="test"
-END
-
-cat <<"END" > foo/baz/baz-2.0.ebuild || exit 1
-DESCRIPTION="Test package"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI=""
-SLOT="0"
-IUSE=""
-LICENSE="GPL-2"
-KEYWORDS="test"
-END
-
-cd ..
diff --git a/ruby/paludis_ruby.cc b/ruby/paludis_ruby.cc
index 292dda43b..3c201b95a 100644
--- a/ruby/paludis_ruby.cc
+++ b/ruby/paludis_ruby.cc
@@ -22,13 +22,13 @@
 #include <paludis/util/config_file.hh>
 #include <paludis/util/singleton-impl.hh>
 #include <paludis/util/pimp-impl.hh>
-#include <paludis/legacy/dep_list_exceptions.hh>
 #include <paludis/match_package.hh>
 #include <paludis/version_spec.hh>
 #include <paludis/version_operator.hh>
 #include <paludis/about.hh>
 #include <paludis/user_dep_spec.hh>
 #include <paludis/action.hh>
+#include <paludis/package_database.hh>
 #include <ruby.h>
 #include <list>
 #include <ctype.h>
@@ -63,13 +63,6 @@ namespace
     static VALUE c_no_such_repository_error;
     static VALUE c_configuration_error;
     static VALUE c_config_file_error;
-    static VALUE c_dep_list_error;
-    static VALUE c_all_masked_error;
-    static VALUE c_block_error;
-    static VALUE c_circular_dependency_error;
-    static VALUE c_additional_requirements_not_met_error;
-    static VALUE c_downgrade_not_allowed_error;
-    static VALUE c_no_destination_error;
     static VALUE c_action_failed_error;
     static VALUE c_action_aborted_error;
     static VALUE c_bad_version_operator_error;
@@ -196,8 +189,6 @@ void paludis::ruby::exception_to_ruby_exception(const std::exception & ee)
         rb_raise(c_name_error, dynamic_cast<const paludis::NameError *>(&ee)->message().c_str());
     else if (0 != dynamic_cast<const paludis::PackageDepSpecError *>(&ee))
         rb_raise(c_package_dep_spec_error, dynamic_cast<const paludis::PackageDepSpecError *>(&ee)->message().c_str());
-    else if (0 != dynamic_cast<const paludis::NoSuchRepositoryError *>(&ee))
-        rb_raise(c_no_such_repository_error, dynamic_cast<const paludis::NoSuchRepositoryError *>(&ee)->message().c_str());
     else if (0 != dynamic_cast<const paludis::AmbiguousPackageNameError *>(&ee))
     {
         VALUE ex_args[2];
@@ -211,29 +202,12 @@ void paludis::ruby::exception_to_ruby_exception(const std::exception & ee)
     }
     else if (0 != dynamic_cast<const paludis::NoSuchPackageError *>(&ee))
         rb_raise(c_no_such_package_error, dynamic_cast<const paludis::NoSuchPackageError *>(&ee)->message().c_str());
+    else if (0 != dynamic_cast<const paludis::NoSuchRepositoryError *>(&ee))
+        rb_raise(c_no_such_repository_error, dynamic_cast<const paludis::NoSuchRepositoryError *>(&ee)->message().c_str());
     else if (0 != dynamic_cast<const paludis::PackageDatabaseLookupError *>(&ee))
         rb_raise(c_package_database_lookup_error, dynamic_cast<const paludis::PackageDatabaseLookupError *>(&ee)->message().c_str());
     else if (0 != dynamic_cast<const paludis::PackageDatabaseError *>(&ee))
         rb_raise(c_package_database_error, dynamic_cast<const paludis::PackageDatabaseError *>(&ee)->message().c_str());
-    else if (0 != dynamic_cast<const paludis::AllMaskedError *>(&ee))
-    {
-        VALUE ex_args[2];
-        ex_args[0] = rb_str_new2(dynamic_cast<const paludis::AllMaskedError *>(&ee)->message().c_str());
-        ex_args[1] = rb_str_new2(stringify(dynamic_cast<const paludis::AllMaskedError *>(&ee)->query()).c_str());
-        rb_exc_raise(rb_class_new_instance(2, ex_args, c_all_masked_error));
-    }
-    else if (0 != dynamic_cast<const paludis::BlockError *>(&ee))
-        rb_raise(c_block_error, dynamic_cast<const paludis::BlockError *>(&ee)->message().c_str());
-    else if (0 != dynamic_cast<const paludis::CircularDependencyError *>(&ee))
-        rb_raise(c_circular_dependency_error, dynamic_cast<const paludis::CircularDependencyError *>(&ee)->message().c_str());
-    else if (0 != dynamic_cast<const paludis::AdditionalRequirementsNotMetError *>(&ee))
-        rb_raise(c_additional_requirements_not_met_error, dynamic_cast<const paludis::AdditionalRequirementsNotMetError *>(&ee)->message().c_str());
-    else if (0 != dynamic_cast<const paludis::DowngradeNotAllowedError *>(&ee))
-        rb_raise(c_downgrade_not_allowed_error, dynamic_cast<const paludis::DowngradeNotAllowedError *>(&ee)->message().c_str());
-    else if (0 != dynamic_cast<const paludis::NoDestinationError *>(&ee))
-        rb_raise(c_no_destination_error, dynamic_cast<const paludis::NoDestinationError *>(&ee)->message().c_str());
-    else if (0 != dynamic_cast<const paludis::DepListError *>(&ee))
-        rb_raise(c_dep_list_error, dynamic_cast<const paludis::DepListError *>(&ee)->message().c_str());
     else if (0 != dynamic_cast<const paludis::ConfigFileError *>(&ee))
         rb_raise(c_config_file_error, dynamic_cast<const paludis::ConfigFileError *>(&ee)->message().c_str());
     else if (0 != dynamic_cast<const paludis::ConfigurationError *>(&ee))
@@ -282,17 +256,6 @@ paludis::ruby::paludis_module()
     return c_paludis_module;
 }
 
-static VALUE
-has_query_property_error_init(int argc, VALUE* argv, VALUE self)
-{
-    VALUE query;
-
-    query = (argc > 1) ? argv[--argc] : Qnil;
-    rb_call_super(argc, argv);
-    rb_iv_set(self, "query", query);
-    return self;
-}
-
 /*
  * call-seq:
  *     query -> String or Nil
@@ -358,41 +321,6 @@ void PALUDIS_VISIBLE paludis::ruby::init()
     c_no_such_repository_error = rb_define_class_under(c_paludis_module, "NoSuchRepositoryError", c_package_database_lookup_error);
     c_configuration_error = rb_define_class_under(c_paludis_module, "ConfigurationError", rb_eRuntimeError);
     c_config_file_error = rb_define_class_under(c_paludis_module, "ConfigFileError", c_configuration_error);
-    c_dep_list_error = rb_define_class_under(c_paludis_module, "DepListError", rb_eRuntimeError);
-
-    /*
-     * Document-class: Paludis::AllMaskedError
-     *
-     * Thrown if all versions of a particular spec are masked.
-     */
-    c_all_masked_error = rb_define_class_under(c_paludis_module, "AllMaskedError", c_dep_list_error);
-    rb_define_method(c_all_masked_error, "initialize", RUBY_FUNC_CAST(&has_query_property_error_init), -1);
-    rb_define_method(c_all_masked_error, "query", RUBY_FUNC_CAST(&has_query_property_error_query), 0);
-
-    /*
-     * Document-class: Paludis::BlockError
-     *
-     * Thrown if a block is encountered.
-     */
-    c_block_error = rb_define_class_under(c_paludis_module, "BlockError", c_dep_list_error);
-
-    /*
-     * Document-class: Paludis::CircularDependencyError
-     *
-     * Thrown if a circular dependency is encountered.
-     */
-    c_circular_dependency_error = rb_define_class_under(c_paludis_module, "CircularDependencyError", c_dep_list_error);
-
-    /*
-     * Document-class: Paludis::UseRequirementsNotMetError
-     *
-     * Thrown if all versions of a particular spec are masked, but would not be if use requirements were not in effect.
-     */
-    c_additional_requirements_not_met_error = rb_define_class_under(c_paludis_module, "UseRequirementsNotMetError", c_dep_list_error);
-    rb_define_method(c_additional_requirements_not_met_error, "initialize", RUBY_FUNC_CAST(&has_query_property_error_init), -1);
-    rb_define_method(c_additional_requirements_not_met_error, "query", RUBY_FUNC_CAST(&has_query_property_error_query), 0);
-    c_downgrade_not_allowed_error = rb_define_class_under(c_paludis_module, "DowngradeNotAllowedError", c_dep_list_error);
-    c_no_destination_error = rb_define_class_under(c_paludis_module, "NoDestinationError", c_dep_list_error);
 
     /*
      * Document-class: Paludis::ActionFailedError