Drop jruby target.

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

5 files changed, 12 insertions, 50 deletions

diff --git a/dev-ruby/session/ChangeLog b/dev-ruby/session/ChangeLog
index 44b953151bf2..2a777e0e575f 100644
--- a/dev-ruby/session/ChangeLog
+++ b/dev-ruby/session/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/session
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/session/ChangeLog,v 1.50 2014/11/18 11:58:54 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/session/ChangeLog,v 1.51 2014/11/26 02:23:51 mrueg Exp $
+
+  26 Nov 2014; Manuel Rüger <mrueg@gentoo.org> -files/session-3.1.0-jruby.patch,
+  session-3.1.2.ebuild, session-3.2.0.ebuild:
+  Drop jruby target.
 
   18 Nov 2014; Manuel Rüger <mrueg@gentoo.org> -files/session-2.4.0-jruby.patch:
   Cleanup patches.
diff --git a/dev-ruby/session/Manifest b/dev-ruby/session/Manifest
index ffa7d12270fe..b48ead371c51 100644
--- a/dev-ruby/session/Manifest
+++ b/dev-ruby/session/Manifest
@@ -1,7 +1,6 @@
-AUX session-3.1.0-jruby.patch 950 SHA256 dabfbff72320eeb75191df06b49010ba3f47120476618238d9e94c2e9058675d SHA512 c2245eceb8895d1c81bcaae71e388a78c1c3ca393ae0085921105bfda4d1a0726f21817177ece289a869ebaf59da1d22ee51c05cbf7ce637b389408844ee724b WHIRLPOOL bc28886bf047a932e434ef5151e26664abd85d4a2c26ffcea26be87bae754b6eccc39d09c417c341663f0d639ddb165223ee6eaa69bd99939f62c1d112354aa6
 DIST session-3.1.2.gem 17920 SHA256 4fd787c21b622e65867082187434e15a4cc5c8a1e895c347242e230655621d9c SHA512 ef0e8aac6776ffec6ead18079148a9ff65f5bd2699344680dec4d1ca1695e6e159d9e8174fabae7d629c5b019d9571d50930fd6af89e1f221d6662b56ae63e16 WHIRLPOOL bb45b43f27beb222d195ad9e9c86421089da2e4e803f5b0f91feca9042ef8b5c727972ed90fb3232231eb96f5f1d61bace30155c38af4ab68281120b78fb79ad
 DIST session-3.2.0.gem 18432 SHA256 e9d97adff2662aef3fb9524b62ac2fd9c09ad48ee01bb9287b77331e1566fb08 SHA512 57c0676fb4a4254e86dbe68e36309c8eb85515dd659de73a87e1ae2e8e5dc7f979192ef665135e75182c26e2a5c847d61daf855639772da7c66af888ed0dc91a WHIRLPOOL d71b084471a57d3401385b2781b547d00ee934a5eca0270bb4ded636683a8f1afb0a271e787d0daecb663241d04b425678f7a54671e2604e2a6ae6bc9525fd9e
-EBUILD session-3.1.2.ebuild 1334 SHA256 66896cfbaaf48c10406d138de2952336b73418df90dc3d208d362d3b6b2caf67 SHA512 57986288161e9c67746e5d91c47838943d3e7e3965cb100b632acaa75292dd2e8e0cdb39484f1d6392af435985628598168174a947c5f153fd7223913cd6c2bc WHIRLPOOL b77b8273ad6f8338c189ac7fbb4af9e8d078e6c8045c6b4d90fc0e9442abf4852a7cd4ed400e67efebf6835452a817f904d8847a2c56b1cf6772a7ad6f082d6b
-EBUILD session-3.2.0.ebuild 1352 SHA256 8555db3d0460ddc36e7a8177cae0416d1f962e40a6d214092da3d064c6c953d9 SHA512 c4fcc9cf7c50a823896d9f5a858afbf5e051c4485145f8039641ec1c297b1eaa998ba246fb6575b75c5bc667dcefb855529c9e8f0c3d42c43e9ee76833215b82 WHIRLPOOL 96c7c1d75b44c40aedcee240f6df84dc5f966f866ea2513d78b192e8aedf0e9aa164b0aef8c630017d598af0d862adf6d55eac9ab4bbab245fa80b79dbaff8e8
-MISC ChangeLog 6266 SHA256 8f3868c829a29da074e8a0636beb898dbb6322a708489ff3c27e326c5c76f0f0 SHA512 d87f5cfad616bfbdc86de36d2d15d865965e25595d1fc3b46294ac612f0e260f4b308ff3cd4afc50c5258e98741b1016ebbdb6720a51c55822606f537b546328 WHIRLPOOL 852aa4ace9b791e04b8e77bf788ab6b4ff709773d1f5b54c52c0724c60295f6184d59dd530baf5a16bb4c477be101028a97ae70e5bfe1f0500115b8ada0b71ab
+EBUILD session-3.1.2.ebuild 1218 SHA256 c1f79dc06bfa84a230fa8a4efd0d0035b94aca365387bead1334ccb698eb51a5 SHA512 9972f651f43ead0309a1cc02e543a3b89f9a1d365f256a3b95e0a78054d04a14a162fecc8f3af0bbd227ad07cfcf8d0e5bb235e91d59e62a806b398343978e8c WHIRLPOOL e554c7ecd7680f900be1ee4633384c018812ca52a63bc3c29001c8a4f6ace78a9df6d09b65ba7b32bee6db461c7cf44a27a25c7227d1a516396b667dea6c053f
+EBUILD session-3.2.0.ebuild 1233 SHA256 58b4e8204ba277f36f0b1c9a41f7899bf3dba84d975b3fd6755e0b43942e9bf6 SHA512 28e36de432bb4ba4dd15c054ef9030201d301ab5a8fdd3d9c13ae2efce99f82670680cf47e8fbae74cf66415190ffcfa1d8cd1d18f2ee2c83f157bc864e1d13d WHIRLPOOL c481c4c0ac5f6196d942e20307a61aed6d3b26aa8c93d03d6f351ac1e2f21c1ad78d40f22a3d9953caa9b05913f98335886351a95ce7a050d7fba0e7af657dc7
+MISC ChangeLog 6416 SHA256 5c08b21743eeed30300ff55a22772c57347d1c95b9319f3f3925f04d5590717d SHA512 84b9a5bbbc5f05a5f199f8e36d74262df8b1f3b980b17e08e7e525352a31ae73e7641225e92bea1024796bedb4846dd45c1db8f2e9c3dcb1b3cd2f620529feed WHIRLPOOL 62fdeff3ad5d67c3a15a4edc7693b930802eefd37662190f0cd2a1d74fa7261e3300a8f30f82b9227ea9e4eabe3e6be3d5cee9678b603f852416ad00c23b995f
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/session/files/session-3.1.0-jruby.patch b/dev-ruby/session/files/session-3.1.0-jruby.patch
deleted file mode 100644
index 230f31516d3d..000000000000
--- a/dev-ruby/session/files/session-3.1.0-jruby.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 879f701c35699d194890c288a036b0037f6b3424 Mon Sep 17 00:00:00 2001
-From: Charles Oliver Nutter <headius@headius.com>
-Date: Thu, 14 Jan 2010 15:23:57 -0600
-Subject: [PATCH] Modifications to get session tests running green under JRuby.
-
----
- lib/session.rb  |   16 +++++++++++-----
- test/session.rb |    3 +++
- 2 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/lib/session.rb b/lib/session.rb
-index dffa1f3..824c76f 100755
---- a/lib/session.rb
-+++ b/lib/session.rb
-@@ -86,7 +86,9 @@ module Session
-     class << self
-       def default_prog
-         return @default_prog if defined? @default_prog and @default_prog
--        if defined? self::DEFAULT_PROG
-+        # Workaround for http://jira.codehaus.org/browse/JRUBY-4479
-+        if (self::DEFAULT_PROG rescue nil)
-+#        if defined? self::DEFAULT_PROG
-           return @default_prog = self::DEFAULT_PROG 
-         else
-           @default_prog = ENV["SESSION_#{ self }_PROG"]
diff --git a/dev-ruby/session/session-3.1.2.ebuild b/dev-ruby/session/session-3.1.2.ebuild
index 5d0b135ea96a..56006bab3f21 100644
--- a/dev-ruby/session/session-3.1.2.ebuild
+++ b/dev-ruby/session/session-3.1.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/session/session-3.1.2.ebuild,v 1.12 2014/11/18 11:47:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/session/session-3.1.2.ebuild,v 1.13 2014/11/26 02:23:51 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
@@ -32,14 +32,6 @@ all_ruby_prepare() {
 	sed -i -e 's:TimeoutError:SessionTimeoutError:' test/session.rb || die
 }
 
-each_ruby_prepare() {
-	case ${RUBY} in
-		*jruby)
-			epatch "${FILESDIR}"/${PN}-3.1.0-jruby.patch
-			;;
-	esac
-}
-
 each_ruby_test() {
 	${RUBY} -Ilib test/*.rb || die "tests failed"
 }
diff --git a/dev-ruby/session/session-3.2.0.ebuild b/dev-ruby/session/session-3.2.0.ebuild
index f358f559518e..640b6e7bff82 100644
--- a/dev-ruby/session/session-3.2.0.ebuild
+++ b/dev-ruby/session/session-3.2.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/session/session-3.2.0.ebuild,v 1.1 2014/04/17 05:41:06 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/session/session-3.2.0.ebuild,v 1.2 2014/11/26 02:23:51 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
@@ -32,14 +32,6 @@ all_ruby_prepare() {
 	sed -i -e 's:TimeoutError:SessionTimeoutError:' test/session.rb || die
 }
 
-each_ruby_prepare() {
-	case ${RUBY} in
-		*jruby)
-			epatch "${FILESDIR}"/${PN}-3.1.0-jruby.patch
-			;;
-	esac
-}
-
 each_ruby_test() {
 	${RUBY} -Ilib test/*.rb || die "tests failed"
 }