Remove ree18 and ruby18 target. Cleanup old.

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

5 files changed, 13 insertions, 71 deletions

diff --git a/dev-ruby/mail/ChangeLog b/dev-ruby/mail/ChangeLog
index 0536491ad620..33e4a9b800f4 100644
--- a/dev-ruby/mail/ChangeLog
+++ b/dev-ruby/mail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/mail
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mail/ChangeLog,v 1.30 2013/11/29 14:56:10 graaff Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mail/ChangeLog,v 1.31 2014/04/05 14:28:23 mrueg Exp $
+
+  05 Apr 2014; Manuel Rüger <mrueg@gentoo.org>
+  -files/mail-2.5.3-utf8-ruby18.patch, -mail-2.5.3.ebuild, mail-2.4.4.ebuild,
+  mail-2.5.4.ebuild:
+  Remove ree18 and ruby18 target. Cleanup old.
 
   29 Nov 2013; Hans de Graaff <graaff@gentoo.org> -mail-2.3.3.ebuild:
   Remove masked Rails 3.1.
diff --git a/dev-ruby/mail/files/mail-2.5.3-utf8-ruby18.patch b/dev-ruby/mail/files/mail-2.5.3-utf8-ruby18.patch
deleted file mode 100644
index 61280fb0c9d4..000000000000
--- a/dev-ruby/mail/files/mail-2.5.3-utf8-ruby18.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 819c4767cea5c8523938b27a29e48a7ab82b503d
-Author: kennyj <kennyj@gmail.com>
-Date:   Fri Nov 30 00:22:08 2012 +0900
-
-    Fix build on Ruby18. We should specify endian for UTF16/32.
-
-diff --git a/lib/mail/version_specific/ruby_1_8.rb b/lib/mail/version_specific/ruby_1_8.rb
-index cb2bae6..f7c65bb 100644
---- a/lib/mail/version_specific/ruby_1_8.rb
-+++ b/lib/mail/version_specific/ruby_1_8.rb
-@@ -107,6 +107,10 @@ module Mail
-       case encoding.upcase
-       when 'UTF8'
-         'UTF-8'
-+      when 'UTF16', 'UTF-16'
-+        'UTF-16BE'
-+      when 'UTF32', 'UTF-32'
-+        'UTF-32BE'
-       else
-         encoding
-       end
diff --git a/dev-ruby/mail/mail-2.4.4.ebuild b/dev-ruby/mail/mail-2.4.4.ebuild
index 43f9cd5acd0a..577471ee0c46 100644
--- a/dev-ruby/mail/mail-2.4.4.ebuild
+++ b/dev-ruby/mail/mail-2.4.4.ebuild
@@ -1,9 +1,9 @@
-# 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/mail/mail-2.4.4.ebuild,v 1.3 2013/01/16 00:21:20 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mail/mail-2.4.4.ebuild,v 1.4 2014/04/05 14:28:23 mrueg Exp $
 
 EAPI=4
-USE_RUBY="ruby18 ruby19 ree18"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/mail/mail-2.5.3.ebuild b/dev-ruby/mail/mail-2.5.3.ebuild
deleted file mode 100644
index f42733504fbf..000000000000
--- a/dev-ruby/mail/mail-2.5.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mail/mail-2.5.3.ebuild,v 1.1 2013/03/15 07:01:02 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md ROADMAP TODO.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="mail.gemspec"
-
-inherit ruby-fakegem versionator
-
-GITHUB_USER="mikel"
-COMMIT="e8ec8d53c4f5c889691630d0422b9dc044762f1b"
-
-DESCRIPTION="An email handling library"
-HOMEPAGE="https://github.com/mikel/mail"
-SRC_URI="https://github.com/${GITHUB_USER}/mail/archive/${PV}.tar.gz -> ${P}-git.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_PATCHES=( "${P}-utf8-ruby18.patch" )
-
-ruby_add_rdepend "
-	>=dev-ruby/i18n-0.4.0
-	>=dev-ruby/mime-types-1.16
-	>=dev-ruby/treetop-1.4.8"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undle/d' -e '6d' Rakefile || die "Unable to remove Bundler code."
-
-	# Fix up dependencies to match our own.
-	sed -i -e 's/~>/>=/' mail.gemspec || die "Unable to fix up dependencies."
-}
diff --git a/dev-ruby/mail/mail-2.5.4.ebuild b/dev-ruby/mail/mail-2.5.4.ebuild
index b37dd9498c52..f36af3b4ef01 100644
--- a/dev-ruby/mail/mail-2.5.4.ebuild
+++ b/dev-ruby/mail/mail-2.5.4.ebuild
@@ -1,9 +1,9 @@
-# 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/mail/mail-2.5.4.ebuild,v 1.1 2013/05/14 06:08:51 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mail/mail-2.5.4.ebuild,v 1.2 2014/04/05 14:28:23 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"