Remove ruby18-only Slot :0 wrt bug #434064. Drop ree18 and ruby18 from other ebuilds. Cleanup old.

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

6 files changed, 17 insertions, 74 deletions

diff --git a/dev-ruby/rspec-rails/ChangeLog b/dev-ruby/rspec-rails/ChangeLog
index bfa605655cbb..fe78a3a629aa 100644
--- a/dev-ruby/rspec-rails/ChangeLog
+++ b/dev-ruby/rspec-rails/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/rspec-rails
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-rails/ChangeLog,v 1.73 2013/07/26 21:15:38 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-rails/ChangeLog,v 1.74 2014/04/05 12:13:44 mrueg Exp $
+
+  05 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -rspec-rails-1.3.4.ebuild,
+  -rspec-rails-2.13.0.ebuild, rspec-rails-2.12.2.ebuild,
+  rspec-rails-2.13.2.ebuild, rspec-rails-2.14.0.ebuild:
+  Remove ruby18-only Slot :0 wrt bug #434064. Drop ree18 and ruby18 from other
+  ebuilds. Cleanup old.
 
   26 Jul 2013; Manuel Rüger <mrueg@gentoo.org> rspec-rails-2.14.0.ebuild:
   Silence repoman, drop blank line
diff --git a/dev-ruby/rspec-rails/rspec-rails-1.3.4.ebuild b/dev-ruby/rspec-rails/rspec-rails-1.3.4.ebuild
deleted file mode 100644
index df764a4bda5b..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-1.3.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-rails/rspec-rails-1.3.4.ebuild,v 1.5 2012/05/01 18:24:11 armin76 Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 ree18"
-
-# would be spec, but it needs to be in the same filesystem tree as
-# rspec (and cannot use the install-reduced code), so we cannot run
-# them for now.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Contribute.rdoc History.rdoc README.rdoc Upgrade.rdoc TODO.txt"
-
-RUBY_FAKEGEM_EXTRAINSTALL="generators"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="http://rspec.info/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-macos"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rspec-1.3.1 >=dev-ruby/rack-1.0.0"
diff --git a/dev-ruby/rspec-rails/rspec-rails-2.12.2.ebuild b/dev-ruby/rspec-rails/rspec-rails-2.12.2.ebuild
index 47574ae0314e..c9a03583b4a7 100644
--- a/dev-ruby/rspec-rails/rspec-rails-2.12.2.ebuild
+++ b/dev-ruby/rspec-rails/rspec-rails-2.12.2.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/rspec-rails/rspec-rails-2.12.2.ebuild,v 1.2 2013/07/20 12:22:21 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-rails/rspec-rails-2.12.2.ebuild,v 1.3 2014/04/05 12:13:44 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 ree18"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/rspec-rails/rspec-rails-2.13.0.ebuild b/dev-ruby/rspec-rails/rspec-rails-2.13.0.ebuild
deleted file mode 100644
index 3bb806879bfb..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-2.13.0.ebuild
+++ /dev/null
@@ -1,34 +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/rspec-rails/rspec-rails-2.13.0.ebuild,v 1.2 2013/07/20 12:22:21 graaff Exp $
-
-EAPI=5
-
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="http://rspec.info/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "=dev-ruby/activesupport-3*
-	=dev-ruby/actionpack-3*
-	=dev-ruby/railties-3*
-	=dev-ruby/rspec-${SUBVERSION}*"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? ( >=dev-ruby/ammeter-0.2.5 ~dev-ruby/rspec-rails-${PV} )"
diff --git a/dev-ruby/rspec-rails/rspec-rails-2.13.2.ebuild b/dev-ruby/rspec-rails/rspec-rails-2.13.2.ebuild
index 0ccdb9cf40fa..52ca59e1f4fc 100644
--- a/dev-ruby/rspec-rails/rspec-rails-2.13.2.ebuild
+++ b/dev-ruby/rspec-rails/rspec-rails-2.13.2.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/rspec-rails/rspec-rails-2.13.2.ebuild,v 1.2 2013/07/20 12:22:21 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-rails/rspec-rails-2.13.2.ebuild,v 1.3 2014/04/05 12:13:44 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/rspec-rails/rspec-rails-2.14.0.ebuild b/dev-ruby/rspec-rails/rspec-rails-2.14.0.ebuild
index 188ddfcbb9cb..8d9c774e8d8b 100644
--- a/dev-ruby/rspec-rails/rspec-rails-2.14.0.ebuild
+++ b/dev-ruby/rspec-rails/rspec-rails-2.14.0.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/rspec-rails/rspec-rails-2.14.0.ebuild,v 1.3 2013/07/26 21:15:38 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-rails/rspec-rails-2.14.0.ebuild,v 1.4 2014/04/05 12:13:44 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"