Remove ruby18 support. Cleanup old.

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

4 files changed, 9 insertions, 93 deletions

diff --git a/dev-ruby/gherkin/ChangeLog b/dev-ruby/gherkin/ChangeLog
index 4f5e43c67aec..2e746ab6615f 100644
--- a/dev-ruby/gherkin/ChangeLog
+++ b/dev-ruby/gherkin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/gherkin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/ChangeLog,v 1.61 2014/02/01 05:01:29 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/ChangeLog,v 1.62 2014/04/24 17:35:33 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -gherkin-2.12.0.ebuild,
+  gherkin-2.11.6.ebuild, gherkin-2.12.0-r1.ebuild:
+  Remove ruby18 support. Cleanup old.
 
   01 Feb 2014; Akinori Hattori <hattya@gentoo.org> gherkin-2.11.6.ebuild:
   ia64 stable wrt bug #493780
diff --git a/dev-ruby/gherkin/gherkin-2.11.6.ebuild b/dev-ruby/gherkin/gherkin-2.11.6.ebuild
index db7f2ea512ee..14e2f400a194 100644
--- a/dev-ruby/gherkin/gherkin-2.11.6.ebuild
+++ b/dev-ruby/gherkin/gherkin-2.11.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.11.6.ebuild,v 1.9 2014/02/01 05:01:29 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.11.6.ebuild,v 1.10 2014/04/24 17:35:33 mrueg Exp $
 
 EAPI=4
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/gherkin/gherkin-2.12.0-r1.ebuild b/dev-ruby/gherkin/gherkin-2.12.0-r1.ebuild
index aae8258c3f03..053d0d68ff92 100644
--- a/dev-ruby/gherkin/gherkin-2.12.0-r1.ebuild
+++ b/dev-ruby/gherkin/gherkin-2.12.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.12.0-r1.ebuild,v 1.2 2014/02/01 00:39:47 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.12.0-r1.ebuild,v 1.3 2014/04/24 17:35:33 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/gherkin/gherkin-2.12.0.ebuild b/dev-ruby/gherkin/gherkin-2.12.0.ebuild
deleted file mode 100644
index 1015586963d7..000000000000
--- a/dev-ruby/gherkin/gherkin-2.12.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.12.0.ebuild,v 1.4 2014/02/01 00:39:47 hattya Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Fast Gherkin lexer and parser based on Ragel."
-HOMEPAGE="https://github.com/cucumber/gherkin"
-LICENSE="MIT"
-SRC_URI="https://github.com/cucumber/gherkin/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE="doc test"
-
-DEPEND="${DEPEND} dev-util/ragel"
-RDEPEND="${RDEPEND}"
-
-ruby_add_bdepend "
-	dev-ruby/rake-compiler
-	test? (
-		>=dev-ruby/builder-2.1.2
-		>=dev-util/cucumber-1.1.3
-		>=dev-ruby/rspec-2.6.0
-		>=dev-ruby/term-ansicolor-1.0.5
-	)
-	doc? ( >=dev-ruby/yard-0.8.3 )"
-
-ruby_add_rdepend ">=dev-ruby/multi_json-1.3"
-
-all_ruby_prepare() {
-	# Remove Bundler-related things.
-	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb features/support/env.rb || die
-	rm Gemfile || die
-
-	# Don't use compile dependencies to avoid building again for specs.
-	sed -i -e '/:compile/d' Rakefile
-
-	# Avoid hardcoded optimization levels.
-	sed -ie -e 's/-O0//' tasks/compile.rake || die
-
-	# Remove feature that depends on direct access to the cucumber
-	# source. We could probably set this up by downloading the source
-	# and unpacking it, but skipping this now in the interest of time.
-	rm features/pretty_formatter.feature || die
-
-	# We need to remove these tasks during bootstrapping since it tries
-	# to load cucumber already but we can be sure it isn't installed
-	# yet. Also remove other rake tasks for which we may not yet have
-	# dependencies.
-	if ! use test ; then
-		rm tasks/cucumber.rake tasks/rspec.rake || die "Unable to remove rake tasks."
-	fi
-
-	# Avoid dependency on yard if USE=-doc
-	if ! use doc ; then
-		rm tasks/apidoc.rake || die
-	fi
-
-	# Avoid implicit dependency on git
-	sed -i -e 's/git ls-files/echo/' gherkin.gemspec || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		yard || die
-	fi
-}
-
-each_ruby_compile() {
-	${RUBY} -I lib -S rake -rrake/clean -f tasks/compile.rake compile || die
-}
-
-each_ruby_test() {
-	${RUBY} -I lib -S rake spec || die "Specs failed"
-	CUCUMBER_HOME="${HOME}" RUBYLIB=lib ${RUBY} -S cucumber features || die "Cucumber features failed"
-}