| 1 |
graaff 10/08/29 10:28:27 |
| 2 |
|
| 3 |
Modified: ChangeLog sinatra-1.0.ebuild |
| 4 |
Log: |
| 5 |
Fix broken tests due to new haml 3 with upstream patch. |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.11 dev-ruby/sinatra/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/sinatra/ChangeLog?rev=1.11&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/sinatra/ChangeLog?rev=1.11&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/sinatra/ChangeLog?r1=1.10&r2=1.11 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/ChangeLog,v |
| 18 |
retrieving revision 1.10 |
| 19 |
retrieving revision 1.11 |
| 20 |
diff -u -r1.10 -r1.11 |
| 21 |
--- ChangeLog 11 Aug 2010 05:36:54 -0000 1.10 |
| 22 |
+++ ChangeLog 29 Aug 2010 10:28:27 -0000 1.11 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for dev-ruby/sinatra |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/ChangeLog,v 1.10 2010/08/11 05:36:54 graaff Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/ChangeLog,v 1.11 2010/08/29 10:28:27 graaff Exp $ |
| 28 |
+ |
| 29 |
+ 29 Aug 2010; Hans de Graaff <graaff@g.o> sinatra-1.0.ebuild, |
| 30 |
+ +files/sinatra-1.0-haml3-tests.patch: |
| 31 |
+ Fix broken tests due to new haml 3 with upstream patch. |
| 32 |
|
| 33 |
11 Aug 2010; Hans de Graaff <graaff@g.o> -sinatra-0.9.4.ebuild, |
| 34 |
-sinatra-0.9.4-r1.ebuild: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.6 dev-ruby/sinatra/sinatra-1.0.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/sinatra/sinatra-1.0.ebuild?rev=1.6&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/sinatra/sinatra-1.0.ebuild?rev=1.6&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/sinatra/sinatra-1.0.ebuild?r1=1.5&r2=1.6 |
| 43 |
|
| 44 |
Index: sinatra-1.0.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/sinatra-1.0.ebuild,v |
| 47 |
retrieving revision 1.5 |
| 48 |
retrieving revision 1.6 |
| 49 |
diff -u -r1.5 -r1.6 |
| 50 |
--- sinatra-1.0.ebuild 30 Jun 2010 06:47:02 -0000 1.5 |
| 51 |
+++ sinatra-1.0.ebuild 29 Aug 2010 10:28:27 -0000 1.6 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2010 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/sinatra-1.0.ebuild,v 1.5 2010/06/30 06:47:02 fauli Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/sinatra-1.0.ebuild,v 1.6 2010/08/29 10:28:27 graaff Exp $ |
| 57 |
|
| 58 |
EAPI=2 |
| 59 |
USE_RUBY="ruby18" |
| 60 |
@@ -21,10 +21,13 @@ |
| 61 |
IUSE="" |
| 62 |
|
| 63 |
ruby_add_rdepend '>=dev-ruby/rack-1.0' |
| 64 |
-ruby_add_bdepend "test? ( dev-ruby/rack-test dev-ruby/haml dev-ruby/erubis dev-ruby/builder )" |
| 65 |
+ruby_add_bdepend "test? ( dev-ruby/rack-test >=dev-ruby/haml-3.0 dev-ruby/erubis dev-ruby/builder )" |
| 66 |
|
| 67 |
each_ruby_prepare() { |
| 68 |
# Remove tests for optional templating system which is not |
| 69 |
# available in Gentoo. |
| 70 |
rm test/less_test.rb || die |
| 71 |
+ |
| 72 |
+ # Fix tests with haml3. |
| 73 |
+ epatch "${FILESDIR}/${P}-haml3-tests.patch" |
| 74 |
} |
Archives