Drop jruby.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

diff --git a/dev-ruby/test-unit/ChangeLog b/dev-ruby/test-unit/ChangeLog
index 20337412ab6668d07d517c21744bbb840bbd85bd..6ebc2ee25155814f102c7bc06b6cdcb50b74de84 100644 (file)
--- a/dev-ruby/test-unit/ChangeLog
+++ b/dev-ruby/test-unit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/test-unit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/ChangeLog,v 1.104 2014/11/18 13:35:33 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/ChangeLog,v 1.105 2014/12/28 06:54:32 graaff Exp $
+
+  28 Dec 2014; Hans de Graaff <graaff@gentoo.org> test-unit-2.5.5-r2.ebuild:
+  Drop jruby.
 
   18 Nov 2014; Manuel Rüger <mrueg@gentoo.org>
   -files/test-unit-2.3.0-jruby-tests.patch,

diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index 842050465772d72aca75b1652012d708aeb9d24a..130c2a2c0b0cd931a3bc280a120fa2fd78ba7664 100644 (file)
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX testrb 177 SHA256 1fcfa26db2460f84b489ba51ac577be03b9844d2d18ce00f042ca7c8f9de9cf4 SHA512 9de97bde52a1e5770a8dae8da3adcbde3b1dfa7cabc6d131159c8a688a7ad5b59dbb528ce9eef3346da12264c0d30415addd907bc66c1d7d90b1dbc4c605730b WHIRLPOOL bc6cb66bc8a15ae601de115c5786960cd94cbfbc11b5ed45c2cf790f0e3c27dad325630b101cddc400b205907a8328a5344b77d9885d145bb64e308142b97779
 DIST test-unit-1.2.3.gem 40960 SHA256 a7551459c53b0d73ac8e3ad3624b88d211bc80bc41a8c1a57c9d4b422beea4b7 SHA512 5e12a9691715a1e1afb53623867b77e2e06739929da5f0615c7341dc75f5feb281492bc0f6c55bdf1cc190f09a9a2c0f602638d5cad8a65682ba5f361bd22e57 WHIRLPOOL 2d459056aabf5804cc868d893060f6833570fbdd5c3d1d3fae09c2488909a55bdd340ab34297ac57298a03ff9c48a660705c1e28390e498aaef7ed40bf165205
 DIST test-unit-2.5.5.gem 111104 SHA256 3216d6584293964c438e0573fa8f0273d12df2abb1c32d7a6aa427d6e0779d47 SHA512 4f710997d187011bc240ef869f5c86c11e01d9c7c8bee5fd938f194155137d7164e69bae6d63e41b90de8f7f6ab813a62131f2f9518d57b3913777923b491142 WHIRLPOOL 8bcdd17b02162e73afe6a306fc34e7687db7c6abb38cd94c3e558c25d30db3dda1893a923d217d887af55ff64f88e6c14861de5c30786798d3c4cf99f2c26ce3
 EBUILD test-unit-1.2.3-r1.ebuild 675 SHA256 db4d207702859be178508effa0f51ebf7e2d999f69e6f631c08e54b9a9a94a85 SHA512 023134c721a4ee29a79dd29c8af17fb8a293c82b8f8b3975d55ef88b4f438374d2b4ce8962b83132b9bf1b97115e361fd4e592342027680b645e3bd46b8a34f8 WHIRLPOOL beb3fbed0a989310618c5994bad3f7da8d70ac48d8ff1a9a38fb4c4c8915ea35b551886d59caee9651007cf823b65d042dc20af5e226d9dbfe855496eb83678c
 EBUILD test-unit-1.2.3.ebuild 818 SHA256 fa23de60049c58eb4d858c72a8dfe2d6fe817b573f8d61acfe5ac6554886782f SHA512 c1118421eedd4b0a00747a6deeaec5d5f1378cf582f8cec932d3a3cf467625ec346bf26dd7a1caddcb0015d440818971ddca6b47a91a4a771b8550a73a6ff464 WHIRLPOOL 2ae753b008228b4ec407f87018ed60a60181abf68ebf0fd616fc614101af9c08240ba5c3c7890b036d31267d60a4601f3c61a834e0e7468604eb8eddf160f5a4
 EBUILD test-unit-2.5.5-r1.ebuild 2191 SHA256 9911e973c183514c8897361bed80bec73addefb7930ac2eb80a3d383f9c08ad9 SHA512 0c66e6a426f60eabe8b46e97d4738f4ac30d63dc496707825dee1ea3e9abb3126a62810a91c4b8a543dc600b27f403e6f9a3851e4ef4d63ec721abe7ad9b5247 WHIRLPOOL a1734c5b61bdbe17211d6149c20f2d6c48b723db2f37ce3e7389a8070e82e3cc09e48c3286a802ca11866dbaa7f60a7e35c049963bdfb3d71758829ddade2584
-EBUILD test-unit-2.5.5-r2.ebuild 2219 SHA256 048fa37fcee6f9a2f257916d3ddb01a43ed1b62740b57bc727a1fa50c70e6fd4 SHA512 8665ce3aab90f6054febcdadc63b8506437012edfdb643ffe0866167e0cccbb1eca33ec1f94488aa09397dd1649a45d1e2f4d2a250c5b44b7e36ae3af0530814 WHIRLPOOL c49d67ac23cba365f25cf0b9f88c2db368954a6556935025b59a8e8055d64cb468b0e7a2d3b1629d87dbf5c80f03b1a139363ea7f2202aa0fa9b91caa8a477c8
-MISC ChangeLog 14778 SHA256 fbe6b5853610563c87b9dd06e8fe5afe2f585345276d2a82a53be015712e1fdc SHA512 d585c82ccd15809d578458b2393e1f9d4ad7dc5866bd74324828ea5100494cbb7d25880aba59afab73f6dc911b14a03e0c7f11df73efc1e31ec351987add1319 WHIRLPOOL dd9c20b3528e3dd302578a0b9b14e2bfc7102d8d6e0e7b9ce9b876eb3190ad80d0e8a02f08126692eab7f1c8f2e9a30a8c7011c3a46eae4ffac024b1642417d3
+EBUILD test-unit-2.5.5-r2.ebuild 1575 SHA256 b7312eea9f167f87fa85cdce50a0680eb9eaafa5b240523bf3b5e08e604d80f4 SHA512 9a0de3aca79dc765f36492bd228b0a74cc4fda2c0ec7f332ec461372d0bb26b630adab3fafbd5e33606f0a2d7837e4a912d1c798413120c8fdb8537df42da354 WHIRLPOOL 58d6a34afbafada16e75bf11076bcbc5b7f2e30b8cc247ad95bd79649c104d67b2b5eacb3cf390292e2e0d53b36fa4309ef1cf5974fa69bf6aa3b94a41e6fff1
+MISC ChangeLog 14871 SHA256 e7264fe43321cf131104210e9e2221c07e9cdbc2f9bdd8426efa8cc83432ae29 SHA512 8b0e768d9fc002b3b20fb046c93441b76a234eb25ab0c2e94a7f06a1142a35b199b2b6cc55ffe8bb5cced39e075b44079da09555567cdfc2e40f06afbf2ca4d7 WHIRLPOOL e94b2a568154109013ce566a8ca1adc14be79c2890627c8c3ae6f0e73790e55617a0d76d80264c40a39a26dfb5ca179ce1b3f17ce00e8931235a5d5bede0af8a
 MISC metadata.xml 313 SHA256 70c196238b5e24846ee90d328200906af70156308716e4ec568ae3e148e43813 SHA512 eacfa0f6c0b4a854b3e1319c3aad730f29932bd182358968542a52a4084169d7f0a4442b3cd6e397b49179d1d808af56c8253406a2436b960b72c13bb7753642 WHIRLPOOL 402e63c2d8a10212afa77d204679ad63b1a245f83169fa10be6502944351d1b9276a78b6e240b55fd3d8b21ad75f2bc4b1604ce52daee5e078de418161796718
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlSfqSkACgkQiIP6VqMIqNc/CAD/Y3rUWDqr+TTtNKTWHE4auGZ3
+mS4zRsymavQYGMwQtnYA/jyyrgngWmKpduPCV6P/U+j03U7GdylN/Rwvm9AvEC3K
+=cAAb
+-----END PGP SIGNATURE-----

diff --git a/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild b/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild
index 8f1a9dc2dde835e105d160370f96dec9e4823ffe..5cc0b2d498136d43e35ab4230289b56c7b3d030b 100644 (file)
--- a/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild
+++ b/dev-ruby/test-unit/test-unit-2.5.5-r2.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/test-unit/test-unit-2.5.5-r2.ebuild,v 1.3 2014/05/16 05:16:01 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild,v 1.4 2014/12/28 06:54:32 graaff Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -15,12 +15,12 @@ inherit ruby-fakegem
 # yard for the other ruby implementations. Without this assumption
 # bootstrapping ruby21 won't be possible due to the yard dependency
 # tree.
-USE_RUBY="${USE_RUBY/ruby20 ruby21/}" ruby_add_bdepend "doc? ( dev-ruby/yard )"
+USE_RUBY="${USE_RUBY/ruby21/}" ruby_add_bdepend "doc? ( dev-ruby/yard )"
 # redcloth is also needed to build documentation, but not available for
 # jruby. Since we build documentation with the main ruby implementation
 # only we skip the dependency for jruby in this roundabout way, assuming
 # that jruby won't be the main ruby.
-USE_RUBY="${USE_RUBY/ruby20 ruby21 jruby/}" ruby_add_bdepend "doc? ( dev-ruby/redcloth )"
+USE_RUBY="${USE_RUBY/ruby21/}" ruby_add_bdepend "doc? ( dev-ruby/redcloth )"
 
 DESCRIPTION="An improved version of the Test::Unit framework from Ruby 1.8"
 HOMEPAGE="http://test-unit.rubyforge.org/"
@@ -30,18 +30,6 @@ SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
-each_ruby_prepare() {
-       case ${RUBY} in
-               *jruby)
-                       # Avoid tests with slightly different output for jruby
-                       sed -i -e '/test_assert_nothing_thrown/,/^      end/ s:^:#:' \
-                               -e '/test_assert_throw/,/^      end/ s:^:#:' test/test-assertions.rb || die
-                       # And fix missing testunit exposed by it
-                       sed -i -e "9irequire 'testunit-test-util'" test/test-assertions.rb || die
-                       ;;
-       esac
-}
-
 all_ruby_compile() {
        all_fakegem_compile
 
@@ -51,14 +39,7 @@ all_ruby_compile() {
 }
 
 each_ruby_test() {
-       # the rake audit using dev-ruby/zentest currently fails, and we
-       # just need to call the testsuite directly.
-       # rake audit || die "rake audit failed"
-       local rubyflags
-
-       [[ ${RUBY} == */jruby ]] && rubyflags="-X+O"
-
-       ${RUBY} ${rubyflags} test/run-test.rb || die "testsuite failed"
+       ${RUBY} test/run-test.rb || die "testsuite failed"
 }
 
 all_ruby_install() {