Remove ruby18 support. Cleanup old.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key )

3 files changed, 9 insertions, 35 deletions

diff --git a/dev-ruby/attic/ChangeLog b/dev-ruby/attic/ChangeLog
index 3247220545cf..bb1f3bfd5ee9 100644
--- a/dev-ruby/attic/ChangeLog
+++ b/dev-ruby/attic/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/attic
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/attic/ChangeLog,v 1.11 2014/03/07 01:43:12 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/attic/ChangeLog,v 1.12 2014/04/24 17:36:36 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -files/attic-0.5.2-fixes.patch,
+  attic-0.5.3.ebuild:
+  Remove ruby18 support. Cleanup old.
 
   07 Mar 2014; Manuel Rüger <mrueg@gentoo.org> -attic-0.5.2.ebuild:
   Cleanup old.
diff --git a/dev-ruby/attic/attic-0.5.3.ebuild b/dev-ruby/attic/attic-0.5.3.ebuild
index 915fe665ba3a..1cea8c1443c0 100644
--- a/dev-ruby/attic/attic-0.5.3.ebuild
+++ b/dev-ruby/attic/attic-0.5.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/attic/attic-0.5.3.ebuild,v 1.1 2013/12/25 07:07:28 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/attic/attic-0.5.3.ebuild,v 1.2 2014/04/24 17:36:36 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
@@ -14,7 +14,7 @@ RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
 
 RUBY_FAKEGEM_BINWRAP=""
 
-inherit ruby-fakegem eutils
+inherit ruby-fakegem
 
 DESCRIPTION="A place for Ruby objects to hide instance variables"
 HOMEPAGE="http://solutious.com/"
@@ -28,16 +28,6 @@ IUSE="test"
 
 ruby_add_bdepend "test? (  dev-ruby/tryouts:2  )"
 
-each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby18)
-			# Remove tests failing on ruby18 due to string/symbol
-			# differences: https://github.com/delano/attic/issues/1
-			rm try/01_mixins_tryouts.rb try/30_nometaclass_tryouts.rb || die
-			;;
-	esac
-}
-
 each_ruby_test() {
 	${RUBY} -Ilib -S try || die "tests failed"
 }
diff --git a/dev-ruby/attic/files/attic-0.5.2-fixes.patch b/dev-ruby/attic/files/attic-0.5.2-fixes.patch
deleted file mode 100644
index 22875582c11b..000000000000
--- a/dev-ruby/attic/files/attic-0.5.2-fixes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/try/30_nometaclass_tryouts.rb b/try/30_nometaclass_tryouts.rb
-index 0a07843..94f3ea8 100644
---- a/try/30_nometaclass_tryouts.rb
-+++ b/try/30_nometaclass_tryouts.rb
-@@ -30,13 +30,13 @@ tryouts "Basics" do
-     :any.metaclass?
-   end
-   
--  dream [:@___attic_name]
-+  dream ["@___attic_name"]
-   drill "A Symbol's attic vars appear in all_instance_variables" do
-     Symbol.extend Attic
-     Symbol.attic :name
-     a, b = :symbol1, :symbol2
-     a.name = :roger
--    a.all_instance_variables
-+    a.all_instance_variables.collect { |x| x.to_s }
-   end
-   
-   dream []