| 1 |
graaff 10/10/03 10:31:55 |
| 2 |
|
| 3 |
Modified: ChangeLog i18n-0.4.1.ebuild |
| 4 |
Log: |
| 5 |
Don't run tests on jruby, the sqlite3 dependency is not optional at the moment. |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.21 dev-ruby/i18n/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/i18n/ChangeLog?rev=1.21&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/i18n/ChangeLog?rev=1.21&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/i18n/ChangeLog?r1=1.20&r2=1.21 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/i18n/ChangeLog,v |
| 18 |
retrieving revision 1.20 |
| 19 |
retrieving revision 1.21 |
| 20 |
diff -u -r1.20 -r1.21 |
| 21 |
--- ChangeLog 29 Sep 2010 22:17:38 -0000 1.20 |
| 22 |
+++ ChangeLog 3 Oct 2010 10:31:55 -0000 1.21 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# ChangeLog for dev-ruby/i18n |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/i18n/ChangeLog,v 1.20 2010/09/29 22:17:38 ranger Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/i18n/ChangeLog,v 1.21 2010/10/03 10:31:55 graaff Exp $ |
| 28 |
|
| 29 |
29 Sep 2010; Brent Baude <ranger@g.o> i18n-0.3.7.ebuild: |
| 30 |
Marking i18n-0.3.7 ~ppc64 for bug 321283 |
| 31 |
@@ -11,6 +11,10 @@ |
| 32 |
28 Sep 2010; Brent Baude <ranger@g.o> i18n-0.1.3.ebuild: |
| 33 |
Marking i18n-0.1.3 ~ppc for bug 319241 |
| 34 |
|
| 35 |
+ 05 Sep 2010; Hans de Graaff <graaff@g.o> i18n-0.4.1.ebuild: |
| 36 |
+ Don't run tests on jruby, the sqlite3 dependency is not optional at the |
| 37 |
+ moment. |
| 38 |
+ |
| 39 |
*i18n-0.4.1 (31 Aug 2010) |
| 40 |
|
| 41 |
31 Aug 2010; Alex Legler <a3li@g.o> +i18n-0.4.1.ebuild: |
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.2 dev-ruby/i18n/i18n-0.4.1.ebuild |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/i18n/i18n-0.4.1.ebuild?rev=1.2&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/i18n/i18n-0.4.1.ebuild?rev=1.2&content-type=text/plain |
| 49 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/i18n/i18n-0.4.1.ebuild?r1=1.1&r2=1.2 |
| 50 |
|
| 51 |
Index: i18n-0.4.1.ebuild |
| 52 |
=================================================================== |
| 53 |
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/i18n/i18n-0.4.1.ebuild,v |
| 54 |
retrieving revision 1.1 |
| 55 |
retrieving revision 1.2 |
| 56 |
diff -u -r1.1 -r1.2 |
| 57 |
--- i18n-0.4.1.ebuild 31 Aug 2010 17:50:17 -0000 1.1 |
| 58 |
+++ i18n-0.4.1.ebuild 3 Oct 2010 10:31:55 -0000 1.2 |
| 59 |
@@ -1,6 +1,6 @@ |
| 60 |
# Copyright 1999-2010 Gentoo Foundation |
| 61 |
# Distributed under the terms of the GNU General Public License v2 |
| 62 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/i18n/i18n-0.4.1.ebuild,v 1.1 2010/08/31 17:50:17 a3li Exp $ |
| 63 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/i18n/i18n-0.4.1.ebuild,v 1.2 2010/10/03 10:31:55 graaff Exp $ |
| 64 |
|
| 65 |
EAPI=2 |
| 66 |
|
| 67 |
@@ -28,9 +28,8 @@ |
| 68 |
DEPEND="" |
| 69 |
RDEPEND="${DEPEND}" |
| 70 |
|
| 71 |
-# Optionally, the testsuite uses the activerecord gem to run some |
| 72 |
-# tests; whent hey run, they require sqlite3-ruby, and that is not |
| 73 |
-# available on JRuby. |
| 74 |
+# The testsuite uses the activerecord gem to run some tests; they |
| 75 |
+# require sqlite3-ruby, and that is not available on JRuby. |
| 76 |
USE_RUBY="${USE_RUBY/jruby/}" \ |
| 77 |
ruby_add_bdepend " |
| 78 |
test? ( |
| 79 |
@@ -63,3 +62,14 @@ |
| 80 |
chmod 0755 "${HOME}" || die "Failed to fix permissions on home" |
| 81 |
ruby-ng_src_test |
| 82 |
} |
| 83 |
+ |
| 84 |
+each_ruby_test() { |
| 85 |
+ # Make sure the optional activerecord tests are not run for jruby |
| 86 |
+ # because we don't ship a compatible sqlite3 |
| 87 |
+ case ${RUBY} in |
| 88 |
+ *jruby) |
| 89 |
+ ;; |
| 90 |
+ *) |
| 91 |
+ each_fakegem_test |
| 92 |
+ esac |
| 93 |
+} |
Archives