aboutsummaryrefslogtreecommitdiff
path: root/ruby
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-02-06 15:17:14 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-02-06 15:17:14 +0000
commit7c929c87597f4e6fcfe8638e03e7b60c22090415 (patch)
tree625ad4cc2261b7f76d098022db32499845c3fc3e /ruby
parent05b3a52ec5ab06937bc9038c370db9b347dbe9af (diff)
downloadpaludis-7c929c87597f4e6fcfe8638e03e7b60c22090415.tar.gz
paludis-7c929c87597f4e6fcfe8638e03e7b60c22090415.tar.xz
Dep tags are no longer needed
Diffstat (limited to 'ruby')
-rw-r--r--ruby/Makefile.am3
-rw-r--r--ruby/dep_spec.cc33
-rw-r--r--ruby/dep_spec_TEST.rb18
-rw-r--r--ruby/dep_tag.cc344
-rw-r--r--ruby/dep_tag_TEST.rb191
-rwxr-xr-xruby/dep_tag_TEST_cleanup.sh12
-rwxr-xr-xruby/dep_tag_TEST_setup.sh47
-rw-r--r--ruby/paludis_ruby.hh3
8 files changed, 1 insertions, 650 deletions
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index d24fbd1d5..149d06a02 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -23,7 +23,6 @@ IF_RUBY_TESTS = \
choice_TEST.rb \
contents_TEST.rb \
dep_spec_TEST.rb \
- dep_tag_TEST.rb \
environment_TEST.rb \
filter_TEST.rb \
filtered_generator_TEST.rb \
@@ -43,7 +42,6 @@ IF_RUBY_SOURCES = \
contents.cc \
dep_label.cc \
dep_spec.cc \
- dep_tag.cc \
environment.cc \
filter.cc \
filtered_generator.cc \
@@ -68,7 +66,6 @@ EXTRA_DIST = $(IF_RUBY_TESTS) $(IF_RUBY_SOURCES) \
paludis_ruby_so.cc \
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 \
environment_TEST_setup.sh environment_TEST_cleanup.sh \
generator_TEST_setup.sh generator_TEST_cleanup.sh \
nice_names.nn \
diff --git a/ruby/dep_spec.cc b/ruby/dep_spec.cc
index 358daad09..8cb530077 100644
--- a/ruby/dep_spec.cc
+++ b/ruby/dep_spec.cc
@@ -581,37 +581,6 @@ namespace
/*
* call-seq:
- * tag -> DepTag or Nil
- *
- * Fetch the dep tag.
- */
- VALUE
- package_dep_spec_tag(VALUE self)
- {
- std::shared_ptr<WrappedSpecBase> * ptr;
- Data_Get_Struct(self, std::shared_ptr<WrappedSpecBase>, ptr);
- if (! bool(std::static_pointer_cast<const WrappedSpec<PackageDepSpec> >(*ptr)->spec()->tag()))
- return Qnil;
- return dep_tag_to_value(std::static_pointer_cast<const WrappedSpec<PackageDepSpec> >(*ptr)->spec()->tag());
- }
-
- /*
- * call-seq:
- * tag=(dep_tag) -> Qnil
- *
- * Set the dep tag.
- */
- VALUE
- package_dep_spec_set_tag(VALUE self, VALUE dep_tag)
- {
- std::shared_ptr<WrappedSpecBase> * ptr;
- Data_Get_Struct(self, std::shared_ptr<WrappedSpecBase>, ptr);
- (std::static_pointer_cast<WrappedSpec<PackageDepSpec> >(*ptr))->spec()->set_tag(value_to_dep_tag(dep_tag));
- return Qnil;
- }
-
- /*
- * call-seq:
* package -> QualifiedPackageName or Nil
*
* Fetch the package name.
@@ -1157,8 +1126,6 @@ namespace
#ifdef CIARANM_REMOVED_THIS
rb_define_method(c_package_dep_spec, "use_requirements", RUBY_FUNC_CAST(&package_dep_spec_use_requirements), 0);
#endif
- rb_define_method(c_package_dep_spec, "tag", RUBY_FUNC_CAST(&package_dep_spec_tag), 0);
- rb_define_method(c_package_dep_spec, "tag=", RUBY_FUNC_CAST(&package_dep_spec_set_tag), 1);
VALUE (* package_dep_spec_to_s) (VALUE) = &dep_spec_to_s<PackageDepSpec>;
rb_define_method(c_package_dep_spec, "to_s", RUBY_FUNC_CAST(package_dep_spec_to_s), 0);
diff --git a/ruby/dep_spec_TEST.rb b/ruby/dep_spec_TEST.rb
index 8e8112a8d..67a746a86 100644
--- a/ruby/dep_spec_TEST.rb
+++ b/ruby/dep_spec_TEST.rb
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
# vim: set sw=4 sts=4 et tw=80 :
#
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
# Copyright (c) 2007 Richard Brown
#
# This file is part of the Paludis package manager. Paludis is free software;
@@ -233,22 +233,6 @@ module Paludis
### assert_equal 'b', pda.use_requirements[1][:flag]
### assert_equal false, pda.use_requirements[1][:state]
### end
-
- def test_tag
- assert_nil pda.tag
- assert_nil pdb.tag
- assert_nil pdc.tag
- assert_nil pdd.tag
- assert_nil pde.tag
-
- my_pda = pda
- my_pda.tag = TargetDepTag.new
- assert_kind_of TargetDepTag, my_pda.tag
-
- assert_raise TypeError do
- pdb.tag = 42
- end
- end
end
class TestCase_PlainTextDepSpec < Test::Unit::TestCase
diff --git a/ruby/dep_tag.cc b/ruby/dep_tag.cc
deleted file mode 100644
index 908c0b83c..000000000
--- a/ruby/dep_tag.cc
+++ /dev/null
@@ -1,344 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2007 Richard Brown
- * Copyright (c) 2007 David Leverton
- *
- * 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/dep_spec.hh>
-#include <paludis/dep_tag.hh>
-#include <ruby.h>
-
-using namespace paludis;
-using namespace paludis::ruby;
-
-namespace
-{
- static VALUE c_dep_tag;
- static VALUE c_dependency_dep_tag;
- static VALUE c_glsa_dep_tag;
- static VALUE c_general_set_dep_tag;
- static VALUE c_target_dep_tag;
-
- struct V
- {
- VALUE value;
- std::shared_ptr<const DepTag> mm;
-
- V(std::shared_ptr<const DepTag> _m) :
- mm(_m)
- {
- }
-
- void visit(const DependencyDepTag &)
- {
- value = Data_Wrap_Struct(c_dependency_dep_tag, 0, &Common<std::shared_ptr<const DependencyDepTag> >::free,
- new std::shared_ptr<const DepTag>(mm));
- }
-
- void visit(const GLSADepTag &)
- {
- value = Data_Wrap_Struct(c_glsa_dep_tag, 0, &Common<std::shared_ptr<const DependencyDepTag> >::free,
- new std::shared_ptr<const DepTag>(mm));
- }
-
- void visit(const GeneralSetDepTag &)
- {
- value = Data_Wrap_Struct(c_general_set_dep_tag, 0, &Common<std::shared_ptr<const DependencyDepTag> >::free,
- new std::shared_ptr<const DepTag>(mm));
- }
-
- void visit(const TargetDepTag &)
- {
- value = Data_Wrap_Struct(c_target_dep_tag, 0, &Common<std::shared_ptr<const DependencyDepTag> >::free,
- new std::shared_ptr<const DepTag>(mm));
- }
- };
-
- VALUE
- dep_tag_init_1(int, VALUE*, VALUE self)
- {
- return self;
- }
-
- VALUE
- dependency_dep_tag_new(int argc, VALUE * argv, VALUE self)
- {
- if (2 != argc)
- rb_raise(rb_eArgError, "DependencyDepTag expects two arguments, but got %d", argc);
-
- std::shared_ptr<const DepTag> * ptr(0);
- try
- {
- ptr = new std::shared_ptr<const DepTag>(
- std::make_shared<DependencyDepTag>(value_to_package_id(argv[0]),
- *value_to_package_dep_spec(argv[1])));
- VALUE tdata(Data_Wrap_Struct(self, 0, &Common<std::shared_ptr<const DepTag> >::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:
- * package_id -> PackageID
- *
- * The PackageID that contains our dependency.
- */
- VALUE
- dependency_dep_tag_package_id(VALUE self)
- {
- std::shared_ptr<const DepTag> * ptr;
- Data_Get_Struct(self, std::shared_ptr<const DepTag>, ptr);
- return package_id_to_value((std::static_pointer_cast<const DependencyDepTag>(*ptr))->package_id());
- }
-
- /*
- * call-seq:
- * dependency -> PackageDepSpec
- *
- * The PackageDepSpec that pulled us in.
- */
- VALUE
- dependency_dep_tag_dependency(VALUE self)
- {
- std::shared_ptr<const DepTag> * ptr;
- Data_Get_Struct(self, std::shared_ptr<const DepTag>, ptr);
- return package_dep_spec_to_value(*(std::static_pointer_cast<const DependencyDepTag>(*ptr))->dependency());
- }
-
- VALUE
- glsa_dep_tag_new(int argc, VALUE * argv, VALUE self)
- {
- if (3 != argc)
- rb_raise(rb_eArgError, "GLSADepTag expects three arguments, but got %d",argc);
-
- std::shared_ptr<const DepTag> * ptr(0);
- try
- {
- ptr = new std::shared_ptr<const DepTag>(std::make_shared<GLSADepTag>(StringValuePtr(argv[0]), StringValuePtr(argv[1]),
- FSPath(StringValuePtr(argv[2]))));
- VALUE tdata(Data_Wrap_Struct(self, 0, &Common<std::shared_ptr<const DepTag> >::free, ptr));
- rb_obj_call_init(tdata, argc, argv);
- return tdata;
- }
- catch (const std::exception & e)
- {
- delete ptr;
- exception_to_ruby_exception(e);
- }
- }
-
- VALUE
- general_set_dep_tag_new(int argc, VALUE * argv, VALUE self)
- {
- if (2 != argc)
- rb_raise(rb_eArgError, "GeneralSetDepTag expects two arguments, but got %d",argc);
-
- std::shared_ptr<const DepTag> * ptr(0);
- try
- {
- ptr = new std::shared_ptr<const DepTag>(std::make_shared<GeneralSetDepTag>(SetName(StringValuePtr(argv[0])), StringValuePtr(argv[1])));
- VALUE tdata(Data_Wrap_Struct(self, 0, &Common<std::shared_ptr<const DepTag> >::free, ptr));
- rb_obj_call_init(tdata, argc, argv);
- return tdata;
- }
- catch (const std::exception & e)
- {
- delete ptr;
- exception_to_ruby_exception(e);
- }
- }
-
- VALUE
- target_dep_tag_new(VALUE self)
- {
- std::shared_ptr<const DepTag> * ptr(0);
- try
- {
- ptr = new std::shared_ptr<const DepTag>(std::make_shared<TargetDepTag>());
- VALUE tdata(Data_Wrap_Struct(self, 0, &Common<std::shared_ptr<const DepTag> >::free, ptr));
- rb_obj_call_init(tdata, 0, 0);
- return tdata;
- }
- catch (const std::exception & e)
- {
- delete ptr;
- exception_to_ruby_exception(e);
- }
- }
-
- /*
- * Document-method: short_text
- *
- * call-seq:
- * short_text -> String
- *
- * Fetch our short text (for example, 'GLSA-1234') that is
- * displayed with the dep list entry.
- */
- /*
- * Document-method: category
- *
- * call-seq:
- * category -> String
- *
- * Fetch our DepTagCategory's tag.
- */
- /*
- * Document-method: glsa_title
- *
- * call-seq:
- * glsa_title -> String
- *
- * Fetch our GLSA title (for example, 'Yet another PHP remote access hole').
- */
- /*
- * Document-method: source
- *
- * call-seq:
- * source -> String
- *
- * From which repository or environment did we originate?
- */
- template <typename T_, std::string (T_::* m_) () const>
- struct DepTagThings
- {
- static VALUE
- fetch(VALUE self)
- {
- std::shared_ptr<const DepTag> * ptr;
- Data_Get_Struct(self, std::shared_ptr<const DepTag>, ptr);
- return rb_str_new2((((*std::static_pointer_cast<const T_>(*ptr)).*m_)()).c_str());
- }
- };
-
- /*
- * Document-method: glsa_file
- *
- * call-seq:
- * glsa_file -> String
- *
- * Fetch our GLSA file.
- */
- template <typename T_, const FSPath (T_::* m_) () const>
- struct DepTagFSPathThings
- {
- static VALUE
- fetch(VALUE self)
- {
- std::shared_ptr<const DepTag> * ptr;
- Data_Get_Struct(self, std::shared_ptr<const DepTag>, ptr);
- return rb_str_new2(stringify(((*std::static_pointer_cast<const T_>(*ptr)).*m_)()).c_str());
- }
- };
-
- void do_register_dep_tag()
- {
- /*
- * Document-class: Paludis::DepTag
- *
- * A DepTag can be associated with a PackageDepSpec, and is transferred onto any associated DepListEntry instances.
- *
- * It is used for tagging dep list entries visually, for example to indicate an associated GLSA.
- */
- c_dep_tag = rb_define_class_under(paludis_module(), "DepTag", rb_cObject);
- rb_funcall(c_dep_tag, rb_intern("private_class_method"), 1, rb_str_new2("new"));
- rb_define_method(c_dep_tag, "initialize", RUBY_FUNC_CAST(&dep_tag_init_1), -1);
- rb_define_method(c_dep_tag, "short_text", RUBY_FUNC_CAST((&DepTagThings<DepTag,&DepTag::short_text>::fetch)), 0);
- rb_define_method(c_dep_tag, "category", RUBY_FUNC_CAST((&DepTagThings<DepTag,&DepTag::category>::fetch)), 0);
-
- /*
- * Document-class: Paludis::DependencyDepTag
- *
- * DepTag subclass for dependencies.
- */
- c_dependency_dep_tag = rb_define_class_under(paludis_module(), "DependencyDepTag", c_dep_tag);
- rb_define_singleton_method(c_dependency_dep_tag, "new", RUBY_FUNC_CAST(&dependency_dep_tag_new), -1);
- rb_define_method(c_dependency_dep_tag, "package_id", RUBY_FUNC_CAST(&dependency_dep_tag_package_id), 0);
- rb_define_method(c_dependency_dep_tag, "dependency", RUBY_FUNC_CAST(&dependency_dep_tag_dependency), 0);
-
- /*
- * Document-class: Paludis::GLSADepTag
- *
- * DepTag subclass for GLSAs.
- */
- c_glsa_dep_tag = rb_define_class_under(paludis_module(), "GLSADepTag", c_dep_tag);
- rb_define_singleton_method(c_glsa_dep_tag, "new", RUBY_FUNC_CAST(&glsa_dep_tag_new), -1);
- rb_define_method(c_glsa_dep_tag, "glsa_title", RUBY_FUNC_CAST((&DepTagThings<GLSADepTag,
- &GLSADepTag::glsa_title>::fetch)), 0);
- rb_define_method(c_glsa_dep_tag, "glsa_file", RUBY_FUNC_CAST((&DepTagFSPathThings<GLSADepTag,
- &GLSADepTag::glsa_file>::fetch)), 0);
-
- /*
- * Document-class: Paludis::GeneralSetDepTag
- *
- * DepTag subclass for general sets.
- */
- c_general_set_dep_tag = rb_define_class_under(paludis_module(), "GeneralSetDepTag", c_dep_tag);
- rb_define_singleton_method(c_general_set_dep_tag, "new", RUBY_FUNC_CAST(&general_set_dep_tag_new), -1);
- rb_define_method(c_general_set_dep_tag, "source", RUBY_FUNC_CAST((&DepTagThings<GeneralSetDepTag,
- &GeneralSetDepTag::source>::fetch)), 0);
-
- /*
- * Document-class: Paludis::TargetDepTag
- *
- * DepTag subclass for general sets.
- */
- c_target_dep_tag = rb_define_class_under(paludis_module(), "TargetDepTag", c_dep_tag);
- rb_define_singleton_method(c_target_dep_tag, "new", RUBY_FUNC_CAST(&target_dep_tag_new), 0);
- }
-}
-
-VALUE
-paludis::ruby::dep_tag_to_value(std::shared_ptr<const DepTag> m)
-{
- try
- {
- V v(m);
- m->accept(v);
- return v.value;
- }
- catch (const std::exception & e)
- {
- exception_to_ruby_exception(e);
- }
-}
-
-std::shared_ptr<const DepTag>
-paludis::ruby::value_to_dep_tag(VALUE v)
-{
- if (rb_obj_is_kind_of(v, c_dep_tag))
- {
- std::shared_ptr<const DepTag> * v_ptr;
- Data_Get_Struct(v, std::shared_ptr<const DepTag>, v_ptr);
- return *v_ptr;
- }
- else
- {
- rb_raise(rb_eTypeError, "Can't convert %s into DepTag", rb_obj_classname(v));
- }
-}
-
-RegisterRubyClass::Register paludis_ruby_register_dep_tag PALUDIS_ATTRIBUTE((used))
- (&do_register_dep_tag);
-
diff --git a/ruby/dep_tag_TEST.rb b/ruby/dep_tag_TEST.rb
deleted file mode 100644
index d6d64354a..000000000
--- a/ruby/dep_tag_TEST.rb
+++ /dev/null
@@ -1,191 +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'
-
-ENV['PALUDIS_HOME'] = Dir.getwd() + '/dep_tag_TEST_dir/home'
-
-module Paludis
- class TestCase_DepTag < Test::Unit::TestCase
- def test_no_create
- assert_raise NoMethodError do
- ce = DepTag.new('test')
- end
- end
- end
-
- class TestCase_DependencyDepTag < Test::Unit::TestCase
- def env
- @env or @env = EnvironmentFactory.instance.create("")
- end
-
- def get_dt
- DependencyDepTag.new(env[Selection::RequireExactlyOne.new(Generator::All.new)].last,
- Paludis::parse_user_package_dep_spec('foo/bar', env, []))
- end
-
- def test_create
- assert_kind_of DependencyDepTag, get_dt
- end
-
- def test_create_error
- assert_raise ArgumentError do
- DependencyDepTag.new
- end
-
- assert_raise ArgumentError do
- DependencyDepTag.new('a','b','c')
- end
-
- assert_raise TypeError do
- DependencyDepTag.new('a','b')
- end
-
- assert_raise ArgumentError do
- DependencyDepTag.new(1)
- end
- end
-
- def test_methods
- dt = get_dt
- {:short_text => 'foo/bar-1.0::testrepo', :category=>'dependency'}.each do |method, val|
- assert_respond_to dt, method
- assert_equal val, dt.send(method)
- end
- end
-
- def test_package_id
- dt = get_dt
- assert_respond_to dt, :package_id
- id = dt.package_id
- assert_kind_of PackageID, id
- assert_equal "foo/bar-1.0::testrepo", id.to_s
- end
-
- def test_dependency
- dt = get_dt
- assert_respond_to dt, :dependency
- pds = dt.dependency
- assert_kind_of PackageDepSpec, pds
- assert_equal "foo/bar", pds.to_s
- end
- end
-
- class TestCase_GLSADepTag < Test::Unit::TestCase
- def get_dt
- GLSADepTag.new("id", "title", "/path")
- end
-
- def test_create
- assert_kind_of GLSADepTag, get_dt
- end
-
- def test_create_error
- assert_raise ArgumentError do
- GLSADepTag.new
- end
-
- assert_raise ArgumentError do
- GLSADepTag.new('a')
- end
-
- assert_raise TypeError do
- GLSADepTag.new(1,1,3)
- end
- end
-
- def test_respond_to
- dt = get_dt
- {
- :short_text => 'GLSA-id',
- :category=>'glsa',
- :glsa_title => 'title',
- :glsa_file => "/path"
- }.each do |method, val|
- assert_respond_to dt, method
- assert_equal val, dt.send(method)
- end
- end
- end
-
- class TestCase_GeneralSetDepTag < Test::Unit::TestCase
- def get_dt
- GeneralSetDepTag.new("world", "title")
- end
-
- def test_create
- assert_kind_of GeneralSetDepTag, get_dt
- end
-
- def test_create_error
- assert_raise ArgumentError do
- GeneralSetDepTag.new
- end
-
- assert_raise ArgumentError do
- GeneralSetDepTag.new('a')
- end
-
- assert_raise TypeError do
- GeneralSetDepTag.new(1,1)
- end
- end
-
- def test_respond_to
- dt = get_dt
- {
- :short_text => 'world',
- :category=>'general',
- :source => 'title'
- }.each do |method, val|
- assert_respond_to dt, method
- assert_equal val, dt.send(method)
- end
- end
- end
-
- class TestCase_TargetDepTag < Test::Unit::TestCase
- def get_dt
- TargetDepTag.new
- end
-
- def test_create
- assert_kind_of TargetDepTag, get_dt
- end
-
- def test_create_error
- assert_raise ArgumentError do
- TargetDepTag.new(1)
- end
- end
-
- def test_respond_to
- dt = get_dt
- {
- :short_text => 'target',
- :category=>'target',
- }.each do |method, val|
- assert_respond_to dt, method
- assert_equal val, dt.send(method)
- end
- end
- end
-end
-
diff --git a/ruby/dep_tag_TEST_cleanup.sh b/ruby/dep_tag_TEST_cleanup.sh
deleted file mode 100755
index 2cccc9111..000000000
--- a/ruby/dep_tag_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_tag_TEST_dir ] ; then
- rm -fr dep_tag_TEST_dir
-else
- true
-fi
-
-
-
-
diff --git a/ruby/dep_tag_TEST_setup.sh b/ruby/dep_tag_TEST_setup.sh
deleted file mode 100755
index e75fed20c..000000000
--- a/ruby/dep_tag_TEST_setup.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-# vim: set ft=sh sw=4 sts=4 et :
-
-mkdir dep_tag_TEST_dir || exit 1
-cd dep_tag_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/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"
-DEPEND="|| ( foo/bar foo/baz ) foo/monkey"
-END
-
diff --git a/ruby/paludis_ruby.hh b/ruby/paludis_ruby.hh
index 925bf2e02..fe7fbd102 100644
--- a/ruby/paludis_ruby.hh
+++ b/ruby/paludis_ruby.hh
@@ -31,7 +31,6 @@
#include <paludis/environments/no_config/no_config_environment.hh>
#include <paludis/repository.hh>
#include <paludis/contents.hh>
-#include <paludis/dep_tag.hh>
#include <paludis/mask-fwd.hh>
#include <paludis/metadata_key.hh>
#include <paludis/selection.hh>
@@ -85,7 +84,6 @@ namespace paludis
VALUE repository_to_value(std::shared_ptr<Repository>);
VALUE version_spec_to_value(const VersionSpec &);
VALUE package_id_to_value(std::shared_ptr<const PackageID>);
- VALUE dep_tag_to_value(std::shared_ptr<const DepTag>);
VALUE qualified_package_name_to_value(const QualifiedPackageName &);
VALUE contents_to_value(std::shared_ptr<const Contents>);
VALUE repository_mask_info_to_value(std::shared_ptr<const RepositoryMaskInfo>);
@@ -114,7 +112,6 @@ namespace paludis
std::shared_ptr<const PackageDepSpec> value_to_package_dep_spec(VALUE v);
std::shared_ptr<const DependenciesLabelsDepSpec> value_to_dependencies_labels_dep_spec(VALUE v);
std::shared_ptr<const DepSpec> value_to_dep_spec(VALUE v);
- std::shared_ptr<const DepTag> value_to_dep_tag(VALUE v);
QualifiedPackageName value_to_qualified_package_name(VALUE v);
std::shared_ptr<Environment> value_to_environment(VALUE v);
std::shared_ptr<NoConfigEnvironment> value_to_no_config_environment(VALUE v);