1 |
ali_bush 09/08/22 22:14:27 |
2 |
|
3 |
Modified: ChangeLog jruby-1.3.1.ebuild |
4 |
Log: |
5 |
Fix test issues. see #282252. |
6 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.40 dev-java/jruby/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/ChangeLog?rev=1.40&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/ChangeLog?rev=1.40&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/ChangeLog?r1=1.39&r2=1.40 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v |
18 |
retrieving revision 1.39 |
19 |
retrieving revision 1.40 |
20 |
diff -u -r1.39 -r1.40 |
21 |
--- ChangeLog 7 Aug 2009 20:40:51 -0000 1.39 |
22 |
+++ ChangeLog 22 Aug 2009 22:14:27 -0000 1.40 |
23 |
@@ -1,6 +1,9 @@ |
24 |
# ChangeLog for dev-java/jruby |
25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.39 2009/08/07 20:40:51 ali_bush Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.40 2009/08/22 22:14:27 ali_bush Exp $ |
28 |
+ |
29 |
+ 22 Aug 2009; Alistair Bush <ali_bush@g.o> jruby-1.3.1.ebuild: |
30 |
+ Fix test issues. see #282252. |
31 |
|
32 |
*jruby-1.3.1 (07 Aug 2009) |
33 |
|
34 |
|
35 |
|
36 |
|
37 |
1.2 dev-java/jruby/jruby-1.3.1.ebuild |
38 |
|
39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/jruby-1.3.1.ebuild?rev=1.2&view=markup |
40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/jruby-1.3.1.ebuild?rev=1.2&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/jruby-1.3.1.ebuild?r1=1.1&r2=1.2 |
42 |
|
43 |
Index: jruby-1.3.1.ebuild |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.3.1.ebuild,v |
46 |
retrieving revision 1.1 |
47 |
retrieving revision 1.2 |
48 |
diff -u -r1.1 -r1.2 |
49 |
--- jruby-1.3.1.ebuild 7 Aug 2009 20:40:51 -0000 1.1 |
50 |
+++ jruby-1.3.1.ebuild 22 Aug 2009 22:14:27 -0000 1.2 |
51 |
@@ -1,6 +1,6 @@ |
52 |
# Copyright 1999-2009 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.3.1.ebuild,v 1.1 2009/08/07 20:40:51 ali_bush Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.3.1.ebuild,v 1.2 2009/08/22 22:14:27 ali_bush Exp $ |
56 |
|
57 |
# Note:this pmasked in gentoo-x86/profiles. |
58 |
# Please remove both once a full release is available. |
59 |
@@ -61,7 +61,7 @@ |
60 |
|
61 |
JAVA_ANT_REWRITE_CLASSPATH="true" |
62 |
JAVA_ANT_IGNORE_SYSTEM_CLASSES="true" |
63 |
-EANT_GENTOO_CLASSPATH="asm-3 bytelist constantine jay jcodings jffi-0.4 jline |
64 |
+EANT_GENTOO_CLASSPATH="asm-3 bytelist constantine jay jcodings jffi-0.4 jline \ |
65 |
joda-time joni jna jna-posix jvyamlb,nailgun" |
66 |
EANT_NEEDS_TOOLS="true" |
67 |
|
68 |
@@ -127,6 +127,11 @@ |
69 |
return |
70 |
fi |
71 |
|
72 |
+ # ali_bush was getting crashes while attempting to run a test. |
73 |
+ # No info about why it crashed seemed to be produced. |
74 |
+ # remove it as temp fix. |
75 |
+ sed -i -e '/MRI/d' build.xml || die "Failed to sed build.xml" |
76 |
+ |
77 |
# BSF is a compile-time only dependency because it's just the adapter |
78 |
# classes and they won't be used unless invoked from BSF itself. |
79 |
use bsf && java-pkg_jar-from --into build_lib --with-dependencies bsf-2.3 |