graaff 14/12/28 06:54:32 Modified: test-unit-2.5.5-r2.ebuild ChangeLog Log: Drop jruby. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Revision Changes Path 1.4 dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild?r1=1.3&r2=1.4 Index: test-unit-2.5.5-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- test-unit-2.5.5-r2.ebuild 16 May 2014 05:16:01 -0000 1.3 +++ test-unit-2.5.5-r2.ebuild 28 Dec 2014 06:54:32 -0000 1.4 @@ -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 @@ # 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 @@ 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 @@ } 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() { 1.105 dev-ruby/test-unit/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/test-unit/ChangeLog?rev=1.105&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/test-unit/ChangeLog?rev=1.105&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/test-unit/ChangeLog?r1=1.104&r2=1.105 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/ChangeLog,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- ChangeLog 18 Nov 2014 13:35:33 -0000 1.104 +++ ChangeLog 28 Dec 2014 06:54:32 -0000 1.105 @@ -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 <[email protected]> test-unit-2.5.5-r2.ebuild: + Drop jruby. 18 Nov 2014; Manuel Rüger <[email protected]> -files/test-unit-2.3.0-jruby-tests.patch,
