Remove old patches.

Package-Manager: portage-2.1.3_rc9

6 files changed, 14 insertions, 91 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/Manifest b/dev-java/jruby/Manifest
index bbe254118a40..c0b3fd4e9217 100644
--- a/dev-java/jruby/Manifest
+++ b/dev-java/jruby/Manifest
@@ -1,22 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX jruby-0.9.1-build.xml.patch 1077 RMD160 f900cc14b62f612851e3f8bc318be78af76a275e SHA1 70a6d9b46ad404068b1b74b9a51b8d0185704d62 SHA256 84be93ae37090a2d7f9fcf969804a9748103420a62695eca79939e224fb7ed5d
-MD5 8e75e6f804e6ea96e4bf8ddbc07b514a files/jruby-0.9.1-build.xml.patch 1077
-RMD160 f900cc14b62f612851e3f8bc318be78af76a275e files/jruby-0.9.1-build.xml.patch 1077
-SHA256 84be93ae37090a2d7f9fcf969804a9748103420a62695eca79939e224fb7ed5d files/jruby-0.9.1-build.xml.patch 1077
-AUX jruby-0.9.2-haltonfailure.patch 823 RMD160 d0acc89ced233f6fbd44a90984dcecd598202f7f SHA1 f7cf20a4476366eb1220827a5ed5f75baa9180db SHA256 ce9cc74bb27ca1401e3ace16d4bf723db6c52b7d3077698f8a3cac582a4d13f3
-MD5 6d5abfd264f3df9d29bbed7432364514 files/jruby-0.9.2-haltonfailure.patch 823
-RMD160 d0acc89ced233f6fbd44a90984dcecd598202f7f files/jruby-0.9.2-haltonfailure.patch 823
-SHA256 ce9cc74bb27ca1401e3ace16d4bf723db6c52b7d3077698f8a3cac582a4d13f3 files/jruby-0.9.2-haltonfailure.patch 823
-AUX jruby-0.9.2-old_jline.patch 876 RMD160 63d9605afd243752b92f17e4637c1419fbf9d3bf SHA1 65a5409f8f1e6409355379920c4faba3771e57f1 SHA256 fd5c26f049e0c2a22947592638c8d19e9e92a750026d25102ea93343c5253ebb
-MD5 5ec40b3dc92d2a9244ec0fbd0abf51c2 files/jruby-0.9.2-old_jline.patch 876
-RMD160 63d9605afd243752b92f17e4637c1419fbf9d3bf files/jruby-0.9.2-old_jline.patch 876
-SHA256 fd5c26f049e0c2a22947592638c8d19e9e92a750026d25102ea93343c5253ebb files/jruby-0.9.2-old_jline.patch 876
-AUX jruby-0.9.8-old_jline.patch 1004 RMD160 d8d3022e5561e7d4694b9461aa37afcca5b20fa4 SHA1 e9e5dc23600c5dcc34dcf428890f4770f9681779 SHA256 8c1c66fdf77ed43a059fe58fb3bdc21baeb5ba33156d1e9ed043869bc4c43b99
-MD5 80595981802ba7bed2f57694ae2d00c8 files/jruby-0.9.8-old_jline.patch 1004
-RMD160 d8d3022e5561e7d4694b9461aa37afcca5b20fa4 files/jruby-0.9.8-old_jline.patch 1004
-SHA256 8c1c66fdf77ed43a059fe58fb3bdc21baeb5ba33156d1e9ed043869bc4c43b99 files/jruby-0.9.8-old_jline.patch 1004
 AUX jruby-0.9.8-sandbox.patch 522 RMD160 f9aebe3469edb3d2d22d641e616691ff14def7db SHA1 9d983c1bd7cb35239d85af445f5aa7c5d1c143a3 SHA256 1c2701881674a978c9ddc32e2e126cf25690e86011c6301e7f825407fb5810a2
 MD5 898463cbef30f1c337df6dca781ba83d files/jruby-0.9.8-sandbox.patch 522
 RMD160 f9aebe3469edb3d2d22d641e616691ff14def7db files/jruby-0.9.8-sandbox.patch 522
@@ -31,10 +15,10 @@ EBUILD jruby-1.0.0.ebuild 4735 RMD160 c498d6dbde445ef37a6d888c4f4c6a62aa57e00e S
 MD5 e3b9db40076b46f06bb0de5af740e22d jruby-1.0.0.ebuild 4735
 RMD160 c498d6dbde445ef37a6d888c4f4c6a62aa57e00e jruby-1.0.0.ebuild 4735
 SHA256 e1525f0ec6e25d59f19dbf91e5f4838a4540a50f55837d0cec59ad7f82a46e6a jruby-1.0.0.ebuild 4735
-MISC ChangeLog 4738 RMD160 ab0dc854c852c0c2f1bfc33a8a27cecbb21f5b4c SHA1 ecadc7f906724aebb0a22bf9fa88d9a6791e39ec SHA256 56780a4a51ccb05665adab9b5bf74302e58be69b7fb684a0d458233b8692fba2
-MD5 d3c75e648ee62b23decee3460076c89b ChangeLog 4738
-RMD160 ab0dc854c852c0c2f1bfc33a8a27cecbb21f5b4c ChangeLog 4738
-SHA256 56780a4a51ccb05665adab9b5bf74302e58be69b7fb684a0d458233b8692fba2 ChangeLog 4738
+MISC ChangeLog 4968 RMD160 aede8c7a187c599ea087ebeb52d48bd1a621648b SHA1 f1004ddc30a3a5ea0ea9bfb08c9f522fd91e39aa SHA256 c01042b0351246fab25e8f781c5c1fe2867c624f8631a7c287b84daa8207212c
+MD5 8bc093bb56c9d67db84019847d89636f ChangeLog 4968
+RMD160 aede8c7a187c599ea087ebeb52d48bd1a621648b ChangeLog 4968
+SHA256 c01042b0351246fab25e8f781c5c1fe2867c624f8631a7c287b84daa8207212c ChangeLog 4968
 MISC metadata.xml 252 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 SHA1 7a38c8eea607b775e3b67757b0deda944aa27c65 SHA256 530d1e67c69f08b473ce1a5e7bbab5682e6deee068b27dbb57d459ca61c1290a
 MD5 04e248f270fb5cf8193c02ebd018d503 metadata.xml 252
 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 metadata.xml 252
@@ -48,7 +32,7 @@ SHA256 f46252b7d091496da106d37e1906d4a84a01fe2f42ed5d24181d7400eea5c441 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGs1qfcxLzpIGCsLQRAgyMAJ95X/IksuRFn1V4raZ3kgPl5yzVkACfftF3
-kis29BcXslR5KnCHTYbYa0A=
-=r8Js
+iD8DBQFGs1sZcxLzpIGCsLQRAgi5AKCSjhGEehuEIv2uM5I6wZLWJyUILQCeOOgb
+tdQhXZzS8bJOdCRCoaxevKE=
+=R4d9
 -----END PGP SIGNATURE-----
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);