summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Nichols <nichoj@gentoo.org>2007-01-05 04:24:29 +0000
committerJoshua Nichols <nichoj@gentoo.org>2007-01-05 04:24:29 +0000
commit6661f1e32060b8d0cc2bea5e24bdf5af8641b687 (patch)
treed2a9f083b514cd30e76d42bf795c70c444f44910 /dev-java/jruby/files
parentRemove debug.eclass usage. (diff)
downloadgentoo-2-6661f1e32060b8d0cc2bea5e24bdf5af8641b687.tar.gz
gentoo-2-6661f1e32060b8d0cc2bea5e24bdf5af8641b687.tar.bz2
gentoo-2-6661f1e32060b8d0cc2bea5e24bdf5af8641b687.zip
Version bump.
(Portage version: 2.1.2_rc4-r4)
Diffstat (limited to 'dev-java/jruby/files')
-rw-r--r--dev-java/jruby/files/digest-jruby-0.9.23
-rw-r--r--dev-java/jruby/files/jruby-0.9.2-haltonfailure.patch13
-rw-r--r--dev-java/jruby/files/jruby-0.9.2-old_jline.patch17
3 files changed, 33 insertions, 0 deletions
diff --git a/dev-java/jruby/files/digest-jruby-0.9.2 b/dev-java/jruby/files/digest-jruby-0.9.2
new file mode 100644
index 000000000000..eb56edaefe46
--- /dev/null
+++ b/dev-java/jruby/files/digest-jruby-0.9.2
@@ -0,0 +1,3 @@
+MD5 6dcd06bd5bb6f6a785e23210aabf3fe4 jruby-src-0.9.2.tar.gz 4696196
+RMD160 cadcd4b1b3fab3695f60c854257a5e45d0fa892f jruby-src-0.9.2.tar.gz 4696196
+SHA256 306276034c7d9dd37618ff31aa3a600bd38371edb8d2e0fb58dfa54af879e132 jruby-src-0.9.2.tar.gz 4696196
diff --git a/dev-java/jruby/files/jruby-0.9.2-haltonfailure.patch b/dev-java/jruby/files/jruby-0.9.2-haltonfailure.patch
new file mode 100644
index 000000000000..61451f183799
--- /dev/null
+++ b/dev-java/jruby/files/jruby-0.9.2-haltonfailure.patch
@@ -0,0 +1,13 @@
+Only in jruby-0.9.2-patched/: .build.xml.swp
+diff -ru jruby-0.9.2/build.xml jruby-0.9.2-patched/build.xml
+--- jruby-0.9.2/build.xml 2006-12-10 13:08:05.000000000 -0500
++++ jruby-0.9.2-patched/build.xml 2007-01-04 21:53:00.000000000 -0500
+@@ -314,7 +314,7 @@
+ <target name="test" depends="copy-test-files,instrument,run-junit,coverage-report"/>
+ <target name="run-junit" description="runs junit tests">
+ <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" classpath="${lib.dir}/junit.jar"/>
+- <junit fork="yes" haltonfailure="false" dir="${basedir}" maxmemory="256M">
++ <junit fork="yes" haltonfailure="true" dir="${basedir}" maxmemory="256M">
+ <classpath>
+ <pathelement location="${jruby.instrumented.classes.dir}" />
+ <path refid="build.classpath"/>
diff --git a/dev-java/jruby/files/jruby-0.9.2-old_jline.patch b/dev-java/jruby/files/jruby-0.9.2-old_jline.patch
new file mode 100644
index 000000000000..1c6ce2a82af7
--- /dev/null
+++ b/dev-java/jruby/files/jruby-0.9.2-old_jline.patch
@@ -0,0 +1,17 @@
+diff -ru jruby-0.9.2/src/org/jruby/ext/Readline.java jruby-0.9.2-patched/src/org/jruby/ext/Readline.java
+--- jruby-0.9.2/src/org/jruby/ext/Readline.java 2006-12-10 13:07:09.000000000 -0500
++++ jruby-0.9.2-patched/src/org/jruby/ext/Readline.java 2007-01-04 20:11:04.000000000 -0500
+@@ -85,8 +85,13 @@
+ protected static void initReadline() throws IOException {
+ readline = new ConsoleReader();
+ readline.setUseHistory(false);
++
++ // disabled until jline-0.9.91 is released. see
++ // http://jira.codehaus.org/browse/JRUBY-383
++ /*
+ readline.setUsePagination(true);
+ ((CandidateListCompletionHandler) readline.getCompletionHandler()).setAlwaysIncludeNewline(false);
++ */
+ if (currentCompletor == null) {
+ currentCompletor = new RubyFileNameCompletor();
+ readline.addCompletor(currentCompletor);