[gentoo-commits] gentoo-x86 commit in dev-ruby/rack: ChangeLog rack-1.1.0.ebuild rack-1.0.1-r1.ebuild

[Diego Petteno (flameeyes)]

flameeyes    10/04/30 20:13:50

  Modified:             ChangeLog rack-1.1.0.ebuild rack-1.0.1-r1.ebuild
  Log:
  Add patch to fix one issue with Ruby 1.9 (tempfile behaviour); also apply to 1.0.1 even though that does not work with 1.9 at all.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.28                 dev-ruby/rack/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rack/ChangeLog?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rack/ChangeLog?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rack/ChangeLog?r1=1.27&r2=1.28

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rack/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ChangeLog	17 Jan 2010 19:39:51 -0000	1.27
+++ ChangeLog	30 Apr 2010 20:13:50 -0000	1.28
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/rack
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/ChangeLog,v 1.27 2010/01/17 19:39:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/ChangeLog,v 1.28 2010/04/30 20:13:50 flameeyes Exp $
+
+  30 Apr 2010; Diego E. Pettenò <flameeyes@g.o>
+  rack-1.0.1-r1.ebuild, +files/rack-1.0.1-gentoo.patch, rack-1.1.0.ebuild,
+  +files/rack-1.1.0-gentoo.patch:
+  Add patch to fix one issue with Ruby 1.9 (tempfile behaviour); also apply
+  to 1.0.1 even though that does not work with 1.9 at all.
 
   17 Jan 2010; Diego E. Pettenò <flameeyes@g.o>
   rack-1.0.1-r1.ebuild, rack-1.1.0.ebuild:



1.3                  dev-ruby/rack/rack-1.1.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rack/rack-1.1.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rack/rack-1.1.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rack/rack-1.1.0.ebuild?r1=1.2&r2=1.3

Index: rack-1.1.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.1.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rack-1.1.0.ebuild	17 Jan 2010 19:39:51 -0000	1.2
+++ rack-1.1.0.ebuild	30 Apr 2010 20:13:50 -0000	1.3
@@ -1,13 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.1.0.ebuild,v 1.2 2010/01/17 19:39:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.1.0.ebuild,v 1.3 2010/04/30 20:13:50 flameeyes Exp $
 
 EAPI="2"
-USE_RUBY="ruby18 jruby"
+USE_RUBY="ruby18 ruby19 jruby"
 
 RUBY_FAKEGEM_DOCDIR="doc"
 
-inherit ruby-fakegem
+inherit ruby-fakegem eutils
 
 DESCRIPTION="A modular Ruby webserver interface"
 HOMEPAGE="http://rubyforge.org/projects/rack"
@@ -23,19 +23,11 @@
 # make them dependencies at all.
 ruby_add_bdepend test dev-ruby/test-spec
 
+USE_RUBY=ruby19 \
+	ruby_add_bdepend "ruby_targets_ruby19 test" '=dev-ruby/test-unit-1*'
+
 all_ruby_prepare() {
-	# Disable the test on the content-length: it not only varies on
-	# the internal implementation (and thus “needs change often” as
-	# the code says), but it also varies on the implementation (thus
-	# failing on JRuby).
-	sed -i -e '/content_length\.should\.be/s:^:#:' \
-		test/spec_rack_mock.rb || die
-
-	# This part of the test relies on millisecond timing differences,
-	# since it's very fragile (and breaks with e.g. JRuby), disable it
-	# entirely and be done with it.
-	sed -i -e '/X-Runtime-All.*should >.*X-Runtime-App/s:^:#:' \
-		test/spec_rack_runtime.rb || die
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 }
 
 each_ruby_test() {



1.10                 dev-ruby/rack/rack-1.0.1-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rack/rack-1.0.1-r1.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rack/rack-1.0.1-r1.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rack/rack-1.0.1-r1.ebuild?r1=1.9&r2=1.10

Index: rack-1.0.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.0.1-r1.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rack-1.0.1-r1.ebuild	17 Jan 2010 19:39:51 -0000	1.9
+++ rack-1.0.1-r1.ebuild	30 Apr 2010 20:13:50 -0000	1.10
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.0.1-r1.ebuild,v 1.9 2010/01/17 19:39:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.0.1-r1.ebuild,v 1.10 2010/04/30 20:13:50 flameeyes Exp $
 
 EAPI="2"
 USE_RUBY="ruby18 jruby"
@@ -23,13 +23,11 @@
 # make them dependencies at all.
 ruby_add_bdepend test dev-ruby/test-spec
 
+#USE_RUBY=ruby19 \
+#	ruby_add_bdepend "ruby_targets_ruby19 test" '=dev-ruby/test-unit-1*'
+
 all_ruby_prepare() {
-	# Disable the test on the content-length: it not only varies on
-	# the internal implementation (and thus “needs change often” as
-	# the code says), but it also varies on the implementation (thus
-	# failing on JRuby).
-	sed -i -e '/content_length\.should\.be/s:^:#:' \
-		test/spec_rack_mock.rb || die
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 }
 
 each_ruby_test() {