From a6ec4a478e4391c70009b9cf9f95d8e6f86feabb Mon Sep 17 00:00:00 2001 From: Manuel Rüger Date: Sun, 27 Apr 2014 23:47:17 +0000 Subject: Move ruby21 to -r1. Cleanup old. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key ) --- dev-ruby/minitest/ChangeLog | 10 +++++- dev-ruby/minitest/minitest-4.7.4-r1.ebuild | 53 ----------------------------- dev-ruby/minitest/minitest-4.7.5-r1.ebuild | 53 +++++++++++++++++++++++++++++ dev-ruby/minitest/minitest-4.7.5.ebuild | 4 +-- dev-ruby/minitest/minitest-5.3.2.ebuild | 54 ------------------------------ dev-ruby/minitest/minitest-5.3.3-r1.ebuild | 54 ++++++++++++++++++++++++++++++ dev-ruby/minitest/minitest-5.3.3.ebuild | 4 +-- 7 files changed, 120 insertions(+), 112 deletions(-) delete mode 100644 dev-ruby/minitest/minitest-4.7.4-r1.ebuild create mode 100644 dev-ruby/minitest/minitest-4.7.5-r1.ebuild delete mode 100644 dev-ruby/minitest/minitest-5.3.2.ebuild create mode 100644 dev-ruby/minitest/minitest-5.3.3-r1.ebuild (limited to 'dev-ruby') diff --git a/dev-ruby/minitest/ChangeLog b/dev-ruby/minitest/ChangeLog index 7b5208f86f96..662b9fd1024f 100644 --- a/dev-ruby/minitest/ChangeLog +++ b/dev-ruby/minitest/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-ruby/minitest # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/ChangeLog,v 1.143 2014/04/18 17:36:05 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/ChangeLog,v 1.144 2014/04/27 23:47:17 mrueg Exp $ + +*minitest-5.3.3-r1 (27 Apr 2014) +*minitest-4.7.5-r1 (27 Apr 2014) + + 27 Apr 2014; Manuel Rüger +minitest-4.7.5-r1.ebuild, + +minitest-5.3.3-r1.ebuild, -minitest-4.7.4-r1.ebuild, -minitest-5.3.2.ebuild, + minitest-4.7.5.ebuild, minitest-5.3.3.ebuild: + Move ruby21 to -r1. Cleanup old. *minitest-5.3.3 (18 Apr 2014) diff --git a/dev-ruby/minitest/minitest-4.7.4-r1.ebuild b/dev-ruby/minitest/minitest-4.7.4-r1.ebuild deleted file mode 100644 index 710b68f67c92..000000000000 --- a/dev-ruby/minitest/minitest-4.7.4-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/minitest-4.7.4-r1.ebuild,v 1.3 2014/04/07 13:24:11 mrueg Exp $ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 jruby" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" - -RUBY_FAKEGEM_DOCDIR="doc" -RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.txt" - -inherit ruby-fakegem - -DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit." -HOMEPAGE="https://github.com/seattlerb/minitest" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc test" - -each_ruby_prepare() { - case ${RUBY} in - *jruby) - # Remove failing tests. Upstream claims that these are all - # bugs in jruby. By removing the failing tests we can at - # least run the remainder. See bug 321055 for details. - rm -f test/minitest/test_minitest_unit.rb || die - # Also add minitest_mock since there are jruby-specific failures. - rm -f test/minitest/test_minitest_mock.rb || die - - # Our jruby throws a slightly different error - sed -i -e 's/not :xxx/not \\"xxx\\"/' test/minitest/test_minitest_spec.rb || die - ;; - *) - ;; - esac -} - -each_ruby_test() { - case ${RUBY} in - *jruby) - # JRuby 1.6.x has threading bugs that are triggered by - # minitests 4's new parallel test support. Should be fixed - # in JRuby 1.7. - N=1 ${RUBY} -Ilib:bin:test:. -S testrb test || die - ;; - *) - ${RUBY} -Ilib:bin:test:. -S testrb test || die - ;; - esac -} diff --git a/dev-ruby/minitest/minitest-4.7.5-r1.ebuild b/dev-ruby/minitest/minitest-4.7.5-r1.ebuild new file mode 100644 index 000000000000..6a8818bd92f4 --- /dev/null +++ b/dev-ruby/minitest/minitest-4.7.5-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/minitest-4.7.5-r1.ebuild,v 1.1 2014/04/27 23:47:17 mrueg Exp $ + +EAPI=5 +USE_RUBY="ruby19 ruby20 ruby21 jruby" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" + +RUBY_FAKEGEM_DOCDIR="doc" +RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.txt" + +inherit ruby-fakegem + +DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit." +HOMEPAGE="https://github.com/seattlerb/minitest" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc test" + +each_ruby_prepare() { + case ${RUBY} in + *jruby) + # Remove failing tests. Upstream claims that these are all + # bugs in jruby. By removing the failing tests we can at + # least run the remainder. See bug 321055 for details. + rm -f test/minitest/test_minitest_unit.rb || die + # Also add minitest_mock since there are jruby-specific failures. + rm -f test/minitest/test_minitest_mock.rb || die + + # Our jruby throws a slightly different error + sed -i -e 's/not :xxx/not \\"xxx\\"/' test/minitest/test_minitest_spec.rb || die + ;; + *) + ;; + esac +} + +each_ruby_test() { + case ${RUBY} in + *jruby) + # JRuby 1.6.x has threading bugs that are triggered by + # minitests 4's new parallel test support. Should be fixed + # in JRuby 1.7. + N=1 ${RUBY} -Ilib:bin:test:. -S testrb test || die + ;; + *) + ${RUBY} -Ilib:bin:test:. -S testrb test || die + ;; + esac +} diff --git a/dev-ruby/minitest/minitest-4.7.5.ebuild b/dev-ruby/minitest/minitest-4.7.5.ebuild index 3c8963e16f6f..ccbd1393fdc6 100644 --- a/dev-ruby/minitest/minitest-4.7.5.ebuild +++ b/dev-ruby/minitest/minitest-4.7.5.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/minitest/minitest-4.7.5.ebuild,v 1.2 2014/04/07 13:24:11 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/minitest-4.7.5.ebuild,v 1.3 2014/04/27 23:47:17 mrueg Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 jruby" +USE_RUBY="ruby19 ruby20 jruby" RUBY_FAKEGEM_RECIPE_DOC="rdoc" diff --git a/dev-ruby/minitest/minitest-5.3.2.ebuild b/dev-ruby/minitest/minitest-5.3.2.ebuild deleted file mode 100644 index b4ad21435eed..000000000000 --- a/dev-ruby/minitest/minitest-5.3.2.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/minitest-5.3.2.ebuild,v 1.1 2014/04/07 13:24:11 mrueg Exp $ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 jruby" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" - -RUBY_FAKEGEM_DOCDIR="doc" -RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.txt" - -inherit ruby-fakegem - -DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit." -HOMEPAGE="https://github.com/seattlerb/minitest" - -LICENSE="MIT" -SLOT="5" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc test" - -each_ruby_prepare() { - case ${RUBY} in - *jruby) - # Make sure __jtrap is available in all threads. This should - # be fixed in jruby 1.7.x - sed -i -e '8i trap :INFO do ; end' lib/minitest/parallel.rb || die - - # Avoid failures. Most of these look like low-level jruby - # differences and it looks like these were not run properly - # in previous versions. - for t in test_return_mock_does_not_raise test_mock_args_does_not_raise test_stub_block test_stub_value ; do - local command="/${t}/,/^ end/ s:^:#:" - sed -i -e "${command}" test/minitest/test_minitest_mock.rb || die - done - for t in test_run_failing test_run_skip test_run_error test_run_skip_verbose test_run_error_teardown test_runnable_methods_random test_assert_throws_different test_to_s_error_in_test_and_teardown test_run_filtered_including_suite_name_string test_run_filtered_string_method_only test_run_filtered_including_suite_name ; do - command="/${t}/,/^ end/ s:^:#:" - sed -i -e "${command}" test/minitest/test_minitest_unit.rb || die - done - for t in test_name2 "needs to verify throw" ; do - command="/${t}/,/^ end/ s:^:#:" - sed -i -e "${command}" test/minitest/test_minitest_spec.rb || die - done - sed -i -e '/test_report_error/,/^ end/ s:^:#:' test/minitest/test_minitest_reporter.rb || die - ;; - esac -} - -each_ruby_test() { - for f in test/minitest/test_*.rb; do - ${RUBY} -Ilib:test ${f} || die "${f} tests failed" - done -} diff --git a/dev-ruby/minitest/minitest-5.3.3-r1.ebuild b/dev-ruby/minitest/minitest-5.3.3-r1.ebuild new file mode 100644 index 000000000000..f4eb47c8982d --- /dev/null +++ b/dev-ruby/minitest/minitest-5.3.3-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/minitest-5.3.3-r1.ebuild,v 1.1 2014/04/27 23:47:17 mrueg Exp $ + +EAPI=5 +USE_RUBY="ruby19 ruby20 ruby21 jruby" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" + +RUBY_FAKEGEM_DOCDIR="doc" +RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.txt" + +inherit ruby-fakegem + +DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit." +HOMEPAGE="https://github.com/seattlerb/minitest" + +LICENSE="MIT" +SLOT="5" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc test" + +each_ruby_prepare() { + case ${RUBY} in + *jruby) + # Make sure __jtrap is available in all threads. This should + # be fixed in jruby 1.7.x + sed -i -e '8i trap :INFO do ; end' lib/minitest/parallel.rb || die + + # Avoid failures. Most of these look like low-level jruby + # differences and it looks like these were not run properly + # in previous versions. + for t in test_return_mock_does_not_raise test_mock_args_does_not_raise test_stub_block test_stub_value ; do + local command="/${t}/,/^ end/ s:^:#:" + sed -i -e "${command}" test/minitest/test_minitest_mock.rb || die + done + for t in test_run_failing test_run_skip test_run_error test_run_skip_verbose test_run_error_teardown test_runnable_methods_random test_assert_throws_different test_to_s_error_in_test_and_teardown test_run_filtered_including_suite_name_string test_run_filtered_string_method_only test_run_filtered_including_suite_name ; do + command="/${t}/,/^ end/ s:^:#:" + sed -i -e "${command}" test/minitest/test_minitest_unit.rb || die + done + for t in test_name2 "needs to verify throw" ; do + command="/${t}/,/^ end/ s:^:#:" + sed -i -e "${command}" test/minitest/test_minitest_spec.rb || die + done + sed -i -e '/test_report_error/,/^ end/ s:^:#:' test/minitest/test_minitest_reporter.rb || die + ;; + esac +} + +each_ruby_test() { + for f in test/minitest/test_*.rb; do + ${RUBY} -Ilib:test ${f} || die "${f} tests failed" + done +} diff --git a/dev-ruby/minitest/minitest-5.3.3.ebuild b/dev-ruby/minitest/minitest-5.3.3.ebuild index 44eb07e09347..165b50f5ee22 100644 --- a/dev-ruby/minitest/minitest-5.3.3.ebuild +++ b/dev-ruby/minitest/minitest-5.3.3.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/minitest/minitest-5.3.3.ebuild,v 1.1 2014/04/18 17:36:05 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/minitest-5.3.3.ebuild,v 1.2 2014/04/27 23:47:17 mrueg Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 jruby" +USE_RUBY="ruby19 ruby20 jruby" RUBY_FAKEGEM_RECIPE_DOC="rdoc" -- cgit v1.2.3-65-gdbad