Drop jruby support.

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

7 files changed, 34 insertions, 61 deletions

diff --git a/dev-ruby/rspec/ChangeLog b/dev-ruby/rspec/ChangeLog
index ab4a1339d5df..e3d309d6682e 100644
--- a/dev-ruby/rspec/ChangeLog
+++ b/dev-ruby/rspec/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/rspec
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/ChangeLog,v 1.179 2014/11/18 11:54:57 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/ChangeLog,v 1.180 2014/12/07 15:22:57 mrueg Exp $
+
+  07 Dec 2014; Manuel Rüger <mrueg@gentoo.org> rspec-1.3.2-r1.ebuild,
+  rspec-1.3.2.ebuild, rspec-2.14.1-r1.ebuild, rspec-2.14.1.ebuild,
+  rspec-2.99.0.ebuild:
+  Drop jruby support.
 
   18 Nov 2014; Manuel Rüger <mrueg@gentoo.org> -rspec-2.12.0.ebuild:
   Cleanup old.
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 393b7fdf29fe..2da217b13691 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -1,10 +1,10 @@
 DIST rspec-1.3.2.gem 214016 SHA256 cced85c55b92477272d157ea92b925676db76c373f8040a62b8dbe1365296aba SHA512 c4a02214ce825fa3c03c7332963aaa04313687ba343ee1c9a33d40b0b22c9007f4dade734ed388a986d32a5bd64f413edd4a6c508c5f81161530b87960b4a315 WHIRLPOOL d4bdbfbbadc2e4861dc24002ced78e3c560384c628db545e9f3dae3ee11028310f888ad1b225f65792fd418136983011e33667ab3f8138ed712b69f0bf1566bc
 DIST rspec-2.14.1.gem 4608 SHA256 4f9fc6c58696faa22571ca80d710fd0e4f30eaeb700155968d36df303f279e8c SHA512 cb5f7b720860c7a0f9f3aabf08b2b6ebf0a6cd220fb019c4b9a03368b9fd5b8049c3a374dff1251d261f6d0046f120e574f59b16f3775a478c04bb691785f720 WHIRLPOOL 760e9cf6e61ab097f797d0900bcf4341749a6502d620de2ec3d7bde228e417f4b72a7bdd9f622445314b0890af06307e5545949bebfb6c783aa9cea463158ee5
 DIST rspec-2.99.0.gem 5632 SHA256 432b31d528aac0dd192b3fa7c83f6cc22dec4a0385fb4020d293cc6777870393 SHA512 bcdf5e86938b102200144c49370e0a0691e39a8720048df2eab1a55f95a5bc5e4ced84c7da86d0ddc83ee4ce0f40602c2ae7ee10e55dccf8bb8b769ab048ebb8 WHIRLPOOL 7c71c569e3dd2a94f4564298c7af1069d29c0a1ca8b6045cd5b8ba0ae6833fa2e948b572d048397adc2aae90578e2cdf1f98e3fb0197697927538e925bef7b1c
-EBUILD rspec-1.3.2-r1.ebuild 3122 SHA256 d8b9fb3c985dcfda6433789c7f14b8016f59c2a96303d087d60114a5da33e296 SHA512 00254cad58bc6a2c1ab12783c68438b4003aa221e1a03ce9ad6a0eac82ba2c85caca6261fd6f588ae0ce31866566ea12bb7654420f5efa3250087e59801f80f4 WHIRLPOOL 0618612b5db19b35bca275acc78465b915fea3eef16c4a5e614d8ef285489ed6e95c1a88f535bbf7abd9078f172c6de9e9070d231b569d15365cd9eba6950993
-EBUILD rspec-1.3.2.ebuild 2936 SHA256 ff4da28ebffd8429138acc1dbcd4ce21dd96eaa251d4a98ca5947af9adb1448c SHA512 f3edaa6f6f6108170c630b1a2d7212230a83a1d1440723b24427bd7ce57e78802dcd2b8bc8c4583342fc6d923b03ac0a501fe62fc79b1c5b654bf7a929eb2cc8 WHIRLPOOL 2e26b9ee23726eb138b1ac8dc2a40aebe43d2b525d066ec7a53f976559a5c12c54f082a14c7858af11ffaa2f805c69b97f9f6826a81154ff27a3f60238bb8628
-EBUILD rspec-2.14.1-r1.ebuild 910 SHA256 7906477ba7a3b079d60da373f418e240fb46c5f629d2092e66a0e181975d601e SHA512 c792d58a696286c499e69f84e6e4ab863e9ed65323b8391d19a9f8972c4e881adf5aba643c4091e156497b3811cd8ba04695e790ccc6c028fab3553a3b30204f WHIRLPOOL cf247cf5f2cfb647c319f797cef6d0127a0855526e67b43c57f307e2f9109ed36fbcf0e40db34d5dba4f36626777e01069670fc09adf5411c557789fff0b6a79
-EBUILD rspec-2.14.1.ebuild 888 SHA256 4b0b4adcce28841f449ad35d4b6c92aeaae6096a8bf2e001874cf11a810c0af3 SHA512 0f59db71c75ff3f3f0dd986717d4862f1b1054a42220b9da0d5cbeae472e00ab31457039ef66136404be2dee0e64af28c40659cc9eb52e4c8a8206cce61fb16d WHIRLPOOL 5bdc5aa5865676004334baffeef7a877e4a588d86c9537f3d20122896f77ea4af67c22a1bdc359dcbbae6b4bb91c94e557513d14fb76ff4769776769e508b426
-EBUILD rspec-2.99.0.ebuild 907 SHA256 e4840668d3ed083c014d95e5f974cf928d6242245ed834abaded816495ecbee5 SHA512 21f546814faf329f7e5b3a62a950bb57623ee6e86d815029a0ed2b1a4ac9a6ff7817a871262ead75ddf16654a3f71e13339d88734c1f896e65588667fa5677b8 WHIRLPOOL 5125fa0c5ad4c4525f3c6d1dfe27c1f86fcebb87b7210920e5d66ed4363edf37aee5b3816139482d2c0910de77bd4e1fedf2e3bea84c422aa043f41925d48644
-MISC ChangeLog 22251 SHA256 8554273a7f595f0aef7f2eebde9ccb853a6ec76679fc45dab1afb2305d169e5e SHA512 4454d79255f912da16ea8545c6e8c4c80c1114c10ac7de400be62d6ca176658f5da3fd0cde1ae9a838f9c3ff61d7877acd9f3b99d68c7c79cb52568a4e8f14f3 WHIRLPOOL dbfbea0f68906c264e8201ed7fe2ed06efd7a3078c56a0ab8b17f32e945843d0e0048a825ad265626c8c254ed3f784dd75cb6ec8ab8bd450a24d724655cee06d
+EBUILD rspec-1.3.2-r1.ebuild 2695 SHA256 1fc42017c2091a9059f14458b6a027178f2695e5ed7f052d3a0b62c501c50331 SHA512 3aaa0d30d59289f1a2ff583c8b59b98f735216f4c9df9ac81edcbe7ae3948c638758e6aa5f92ca2c91d9300eb04c3a00d2a5cbd0a823fc916e5c09be88ed78b3 WHIRLPOOL f83fb736af14e92852b3042d3be80f10a77ddf8dde46840c93d4b16fe09599f64333b1b2b789f1613bb68da02f8a583df1fc3295e51cb6abfb529df108a3d22b
+EBUILD rspec-1.3.2.ebuild 2538 SHA256 7edb6cce331a7824924d87f779fbac258779ae476b11c1bee22e54dd1b128b71 SHA512 5a97e87afc56d816dcc9d98bf201199accfcf3d96cb2687fb323e898d3ee06165aa881f7050a14075119a7cee17dbdcdad25ac2f57683434f8ba0a66007a13cf WHIRLPOOL 47471d8887f380e86a16eb6bffca1e6e439cd5626db7807f2d6da63aa7a1ae16e49ddbc182d1b433e1ec079f388c4ad4730b842eb5ddfb6a1c6a38d7aa9e5617
+EBUILD rspec-2.14.1-r1.ebuild 902 SHA256 c755a47749c3e7bfa73cccd4c0429eb1412d5dfd83941629a2c2549f806d106f SHA512 3d1fb4e7fb94886d956c607c0aaf253a71796be10ca373fc9818e74924ce91fb0f7e7c43efcd81b72a0c7cdd7cbdf0973b01e13e508babedfa1c3af922b7436d WHIRLPOOL 726a4c91916e9d7d2f232def070d0da86cb0c51bc99854da61da5f877b37a0a6c3976cf8d8798b1b97b259e9c3b1dd4ee40b081342eaf78bce1949a72b1317cf
+EBUILD rspec-2.14.1.ebuild 884 SHA256 36211a36c398bf6e42288d7612a3a215d014177f876dce243f3853cdd6054352 SHA512 9ed392b60f4f7325ef92b00f13e5a4db8362d6d3d4c3c8a33799714faf2bb9eb0061405676016a63bfe73b5cb68ce38e897f8a80fc134835f9b9579952a6f039 WHIRLPOOL 967b69b7048b875be1c585746bfeda45feb9873b6cabdedaeb594fe1f5dcd8a113bd1e459b599095756091f2c6639540eb5460dcf4f234c6665e2d5691396096
+EBUILD rspec-2.99.0.ebuild 899 SHA256 0878dda534de34afc620ce90ae1ab20747401c2f70888d86304349506c5932d3 SHA512 03b98fbeca67d29380b0f3f62381ba8d6cf29c3ae8544940c1017a121018f761c2996f1c7bd756d3cac6bcc44cb08b2d24df23cfbf859da8f24f9c7336e5b99b WHIRLPOOL 589f08c708b35e2585840006ff664545102a85ab835569939e7e7948ee20069153b1562e6e99b53aef8f29d71cf9e784bc6261e2868ae6706810e76ce85e837b
+MISC ChangeLog 22435 SHA256 4804d4a4c47ca8d793b116cf95cace8e58bfcdf2d6b0b922d3bd5dfb9ed77a8d SHA512 e28328ae551d5d5ac55602cdce83fe6717bc9e4b0d80ab67ec80c24d551dbcc4205ef605e449d9b216e504dabf9e158a8afaccee0c221b1e2185d3d223c7cd31 WHIRLPOOL 1c4d9d85198d3833ddd762c679f0022bb1fcfda411c624c3daf33dee55271923dc215f52017b359cd702da0ef4cfff36ae399d7d2c4c81f52fc18432d66969bd
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/rspec/rspec-1.3.2-r1.ebuild b/dev-ruby/rspec/rspec-1.3.2-r1.ebuild
index 748273fde7f6..e1d6e591ef1f 100644
--- a/dev-ruby/rspec/rspec-1.3.2-r1.ebuild
+++ b/dev-ruby/rspec/rspec-1.3.2-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/rspec/rspec-1.3.2-r1.ebuild,v 1.3 2014/08/13 18:37:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-1.3.2-r1.ebuild,v 1.4 2014/12/07 15:22:57 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_TEST="spec"
 
@@ -30,19 +30,15 @@ ruby_add_rdepend ">=dev-ruby/diff-lcs-1.1.2"
 
 RDEPEND="!<dev-ruby/rspec-rails-${PV}"
 
-# don't require test dependencies for jruby since we cannot run them
-# for now (fakefs doesn't work).
-#
 # We should add nokogiri here to make sure that we test as much as
 # possible, but since it's yet unported to 1.9 and the nokogiri-due
 # tests fail for sure, we'll be waiting on it.
-USE_RUBY="ruby19 ruby20 ruby21" \
-	ruby_add_bdepend "test? (
-		>=dev-ruby/hoe-2.0.0
-		dev-ruby/zentest
-		>=dev-ruby/syntax-1.0
-		>=dev-ruby/fakefs-0.2.1 )"
-USE_RUBY="ruby19 ruby20 ruby21" ruby_add_bdepend "test? ( ~dev-ruby/test-unit-1.2.3 )"
+ruby_add_bdepend "test? (
+	>=dev-ruby/hoe-2.0.0
+	dev-ruby/zentest
+	>=dev-ruby/syntax-1.0
+	>=dev-ruby/fakefs-0.2.1 )"
+ruby_add_bdepend "test? ( ~dev-ruby/test-unit-1.2.3 )"
 
 all_ruby_prepare() {
 	# Avoid dependency on git.
@@ -81,15 +77,3 @@ src_test() {
 	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
 	ruby-ng_src_test
 }
-
-each_ruby_test() {
-	case ${RUBY} in
-		*jruby)
-			ewarn "Tests for JRuby are disabled because dev-ruby/fakefs does not currently support"
-			ewarn "JRuby properly and it's needed to run the tests."
-			;;
-		*)
-			each_fakegem_test
-			;;
-	esac
-}
diff --git a/dev-ruby/rspec/rspec-1.3.2.ebuild b/dev-ruby/rspec/rspec-1.3.2.ebuild
index 49edd7522692..90075d7a8fad 100644
--- a/dev-ruby/rspec/rspec-1.3.2.ebuild
+++ b/dev-ruby/rspec/rspec-1.3.2.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/rspec/rspec-1.3.2.ebuild,v 1.19 2014/05/12 18:18:44 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-1.3.2.ebuild,v 1.20 2014/12/07 15:22:57 mrueg Exp $
 
 EAPI=2
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_TEST="spec"
 
@@ -30,19 +30,15 @@ ruby_add_rdepend ">=dev-ruby/diff-lcs-1.1.2"
 
 RDEPEND="!<dev-ruby/rspec-rails-${PV}"
 
-# don't require test dependencies for jruby since we cannot run them
-# for now (fakefs doesn't work).
-#
 # We should add nokogiri here to make sure that we test as much as
 # possible, but since it's yet unported to 1.9 and the nokogiri-due
 # tests fail for sure, we'll be waiting on it.
-USE_RUBY="ruby19" \
-	ruby_add_bdepend "test? (
-		>=dev-ruby/hoe-2.0.0
-		dev-ruby/zentest
-		>=dev-ruby/syntax-1.0
-		>=dev-ruby/fakefs-0.2.1 )"
-USE_RUBY="ruby19" ruby_add_bdepend "test? ( =dev-ruby/test-unit-1.2.3 )"
+ruby_add_bdepend "test? (
+	>=dev-ruby/hoe-2.0.0
+	dev-ruby/zentest
+	>=dev-ruby/syntax-1.0
+	>=dev-ruby/fakefs-0.2.1 )"
+ruby_add_bdepend "test? ( =dev-ruby/test-unit-1.2.3 )"
 
 all_ruby_prepare() {
 	# Avoid dependency on git.
@@ -76,15 +72,3 @@ src_test() {
 	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
 	ruby-ng_src_test
 }
-
-each_ruby_test() {
-	case ${RUBY} in
-		*jruby)
-			ewarn "Tests for JRuby are disabled because dev-ruby/fakefs does not currently support"
-			ewarn "JRuby properly and it's needed to run the tests."
-			;;
-		*)
-			each_fakegem_test
-			;;
-	esac
-}
diff --git a/dev-ruby/rspec/rspec-2.14.1-r1.ebuild b/dev-ruby/rspec/rspec-2.14.1-r1.ebuild
index 65a3943bbc34..82205838db6d 100644
--- a/dev-ruby/rspec/rspec-2.14.1-r1.ebuild
+++ b/dev-ruby/rspec/rspec-2.14.1-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/rspec/rspec-2.14.1-r1.ebuild,v 1.3 2014/08/13 18:30:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-2.14.1-r1.ebuild,v 1.4 2014/12/07 15:22:57 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/rspec/rspec-2.14.1.ebuild b/dev-ruby/rspec/rspec-2.14.1.ebuild
index f5e71434abb5..e2c75df48273 100644
--- a/dev-ruby/rspec/rspec-2.14.1.ebuild
+++ b/dev-ruby/rspec/rspec-2.14.1.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/rspec/rspec-2.14.1.ebuild,v 1.12 2014/11/18 11:46:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-2.14.1.ebuild,v 1.13 2014/12/07 15:22:57 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/rspec/rspec-2.99.0.ebuild b/dev-ruby/rspec/rspec-2.99.0.ebuild
index dbe586c8ff9f..df3629fe4968 100644
--- a/dev-ruby/rspec/rspec-2.99.0.ebuild
+++ b/dev-ruby/rspec/rspec-2.99.0.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/rspec/rspec-2.99.0.ebuild,v 1.3 2014/08/13 18:30:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-2.99.0.ebuild,v 1.4 2014/12/07 15:22:57 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_TEST=""