Remove old patches.

(Portage version: 2.1.3_rc9)

5 files changed, 7 insertions, 68 deletions

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index b89ff97a479d..5cad3a724952 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jruby
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.28 2007/08/03 16:41:00 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.29 2007/08/03 16:43:02 betelgeuse Exp $
+
+  03 Aug 2007; Petteri Räty <betelgeuse@gentoo.org>
+  -files/jruby-0.9.1-build.xml.patch,
+  -files/jruby-0.9.2-haltonfailure.patch,
+  -files/jruby-0.9.2-old_jline.patch, -files/jruby-0.9.8-old_jline.patch:
+  Remove old patches.
 
   03 Aug 2007; Petteri Räty <betelgeuse@gentoo.org> -jruby-0.9.2.ebuild,
   -jruby-0.9.8.ebuild, -jruby-0.9.8-r1.ebuild, -jruby-0.9.9.ebuild,
diff --git a/dev-java/jruby/files/jruby-0.9.1-build.xml.patch b/dev-java/jruby/files/jruby-0.9.1-build.xml.patch
deleted file mode 100644
index c95b83f1a186..000000000000
--- a/dev-java/jruby/files/jruby-0.9.1-build.xml.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- build.xml	2006-10-23 00:24:34.000000000 +0200
-+++ build.xml	2006-10-23 00:25:19.000000000 +0200
-@@ -188,7 +188,7 @@
- 
-   <target name="test" depends="copy-test-files,instrument,run-junit,coverage-report"/>
-   <target name="run-junit" description="runs junit tests">
--    <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"/>
-@@ -218,8 +218,7 @@
-           description="Creates the Java API docs">
-     <javadoc destdir="${api.docs.dir}" author="true" version="true" use="true" 
-              windowtitle="JRuby API" source="${javac.version}">
--      <fileset dir="${src.dir}"/>
--      <fileset dir="${test.dir}"/>
-+      <fileset dir="${src.dir}" includes="**/*.java"/>
-       <doctitle><![CDATA[<h1>JRuby</h1>]]></doctitle>
-       <bottom><![CDATA[<i>Copyright &#169; 2002-2006 JRuby Team. All Rights Reserved.</i>]]></bottom>
-     </javadoc>
diff --git a/dev-java/jruby/files/jruby-0.9.2-haltonfailure.patch b/dev-java/jruby/files/jruby-0.9.2-haltonfailure.patch
deleted file mode 100644
index 61451f183799..000000000000
--- a/dev-java/jruby/files/jruby-0.9.2-haltonfailure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 1c6ce2a82af7..000000000000
--- a/dev-java/jruby/files/jruby-0.9.2-old_jline.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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);

diff --git a/dev-java/jruby/files/jruby-0.9.8-old_jline.patch b/dev-java/jruby/files/jruby-0.9.8-old_jline.patch
deleted file mode 100644
index ec0fd57bd88a..000000000000
--- a/dev-java/jruby/files/jruby-0.9.8-old_jline.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Only in jruby-0.9.8-patched/src/org/jruby/ext: .Readline.java.swp
-diff -ru jruby-0.9.8/src/org/jruby/ext/Readline.java jruby-0.9.8-patched/src/org/jruby/ext/Readline.java
---- jruby-0.9.8/src/org/jruby/ext/Readline.java	2007-03-05 18:42:13.000000000 -0500
-+++ jruby-0.9.8-patched/src/org/jruby/ext/Readline.java	2007-03-07 21:59:00.000000000 -0500
-@@ -85,9 +85,9 @@
-     protected static void initReadline() throws IOException {
-         readline = new ConsoleReader();
-         readline.setUseHistory(false);
--        readline.setUsePagination(true);
-+        //readline.setUsePagination(true);
-         readline.setBellEnabled(false);
--        ((CandidateListCompletionHandler) readline.getCompletionHandler()).setAlwaysIncludeNewline(false);
-+        //((CandidateListCompletionHandler) readline.getCompletionHandler()).setAlwaysIncludeNewline(false);
-         if (currentCompletor == null)
-             currentCompletor = new RubyFileNameCompletor();
-         readline.addCompletor(currentCompletor);