Remove ruby18 support. Cleanup old.

Package-Manager: portage-2.2.10/cvs/Linux x86_64

4 files changed, 11 insertions, 38 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/Manifest b/dev-ruby/attic/Manifest
index 7a0cd3d0aa2c..205b20a3ec75 100644
--- a/dev-ruby/attic/Manifest
+++ b/dev-ruby/attic/Manifest
@@ -1,5 +1,4 @@
-AUX attic-0.5.2-fixes.patch 580 SHA256 bd41dfe0ab38a16df6c3f1510d229dedd377b0db9eef14309da4bc9293898b84 SHA512 c0b7cd8311004cdb66a42b88dbc7ca26007e985548760b6222d25fc038810c229ca677d64d8a206ea999f4b7a32a9a40104d4ea2175772819e67cf0bb45a6ac6 WHIRLPOOL 98e7bc41761dda76edc482a3ed427a81c592a0b6eaa7e27d77167498a932ad0f5f87b362a1ffc05a806226896ec95bcbf4bab3038ed4694f57aadb186c91c472
 DIST attic-git-0.5.3.tgz 6697 SHA256 f443d7ecb1a7b8618f852a10482fa629232811e280d8bc680ddc37b0629bc83b SHA512 39d4b2a2733b6d4a8eaeb63b8cd4566eadb7dc9ca97cffbbd3e3b30217d4f3076d57cb9d231c5d3a19c6e2f5e04a6201b3430c38dd25e7dd66873fdf3ff366ff WHIRLPOOL d3bcc965b03e7ad8cb37925fe501a9fb87c6c77a27700ae6872786698275f660f9213b25ea510aec43bd4dcee15dec2c89001100dbaf2a1ce22fd7932908f720
-EBUILD attic-0.5.3.ebuild 1046 SHA256 fbcd98ba36345389dc451f6c54d60c4c1df827ccf910bad5bf909bb45402bee3 SHA512 afef2aef35cfaf3f8f9338b790d47c5bebeec9c5ac433b9f7a8f5ada68bd898cfc42f0465a7ac8fd7e735a89b0f6db8295f81c07107c10a9dac6c750bc6aa46c WHIRLPOOL fb6399da2bc377c33e46f594a567dc821f6a3e40e819570b214ec42cf4379de97197ff27c856513f59ef56eba222170c5dc0f19db62753d5963073609b161850
-MISC ChangeLog 1585 SHA256 3b80a8529ec96d1bc1ead305b157f65f35d6e6191f3a2ed7a79c55cc7f1bbb41 SHA512 0a3bcba7de21e75b76b1c7d26074850aa64926329bd3e0e75ecbdf9ac1fb5ee79a9c1fd69299003580c2cd8354b22c4c9be08d82a95e8705969e076df3b74862 WHIRLPOOL f207e17b6a5e53cc53d80a73460d1dfbb2cab03e7464c0debd1944d4ec2e5c214e640e958eb6586da8b5ccf16e1a95094b4f6c6636b9d4f0b34ff8d112271505
+EBUILD attic-0.5.3.ebuild 782 SHA256 53ec850c36dbb74ad80f8e1dfc8e0256f468d231cccbb7d483638441f18bd6c8 SHA512 91e24a7f0e58a9731c8fba2a34a64718a5eef4544c225865c30667d03ae93eed38462b9ef9b93388146e8e131228212de8858217b6ab00b0af5872d8fa16fd0c WHIRLPOOL ae136a7235bc9e379b2ef62e309ab30e9841a8e40f3b62417adba9db705bac58152a1190733dd7f2cc3582f96a1771c43a0097366f23f5f25d635b980b0bd2c4
+MISC ChangeLog 1726 SHA256 5543e9b570adf75fc75ff35c8ab1a02833c75979c6ca9553512c1cd3f3aa1f88 SHA512 a07f47d38ec3a5a03e2cd3a700d52ac423a63720648ed0bf3ebaac39a130d9e5d56610aa06627a84e2800b6d1b79e3e10cb3b23ddb77617410b8c63a078ebcb0 WHIRLPOOL 343043aabdcdcbf53ea20f5d6b8aedd2edc53bc6f30aa2fca4459d753541aa9cd917e9c0dbf40ad9f08d405323dbd8ce20d5d7dc5b4f9bd2127a0fff118298b8
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
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 []