From: Joshua Nichols <nichoj@gentoo.org>
Date: Thu, 8 Mar 2007 03:00:41 +0000 (+0000)
Subject: Fixed bad patch.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=149a158e6595825411bf2cf556ab95e1d48fd639;p=gentoo.git

Fixed bad patch.
Package-Manager: portage-2.1.2-r12
---

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index 1e6a294ce8a3..8ec3d899065a 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,6 +1,10 @@
 # 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.14 2007/03/08 00:08:26 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.15 2007/03/08 03:00:41 nichoj Exp $
+
+  08 Mar 2007; Joshua Nichols <nichoj@gentoo.org>
+  files/jruby-0.9.8-old_jline.patch:
+  Fixed bad patch.
 
 *jruby-0.9.8 (08 Mar 2007)
 
diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest
index 7a78427bbbf0..1219d97fc23b 100644
--- a/dev-java/jruby/Manifest
+++ b/dev-java/jruby/Manifest
@@ -10,10 +10,10 @@ AUX jruby-0.9.2-old_jline.patch 876 RMD160 63d9605afd243752b92f17e4637c1419fbf9d
 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 1020 RMD160 8bdf0893d1e36a4aeb7fa909123f3f3007b6b548 SHA1 b5932e73a78c3798d2002c926eff255b98a173bf SHA256 b4fcc4065eec04fc119b81404e27d627e3bcd1f46e8314cd782d67f2605d928a
-MD5 e7c7e9eee8434ad42fd04b29a5d4418e files/jruby-0.9.8-old_jline.patch 1020
-RMD160 8bdf0893d1e36a4aeb7fa909123f3f3007b6b548 files/jruby-0.9.8-old_jline.patch 1020
-SHA256 b4fcc4065eec04fc119b81404e27d627e3bcd1f46e8314cd782d67f2605d928a files/jruby-0.9.8-old_jline.patch 1020
+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
 DIST jruby-src-0.7.0.tar.gz 1872867 RMD160 6fcff75d74c3a93e18c3a424761afc00674070cb SHA1 a874cd90e1937ea757d6bd7d5ec85feee8f0db2a SHA256 4e200a32b0582021e9fbc93faaa16f25198cf496c44d4df635e9282dde647dce
 DIST jruby-src-0.9.2.tar.gz 4696196 RMD160 cadcd4b1b3fab3695f60c854257a5e45d0fa892f SHA1 d561dcbe6b1611dc7cf0b431b03f5a26c30eba0c SHA256 306276034c7d9dd37618ff31aa3a600bd38371edb8d2e0fb58dfa54af879e132
 DIST jruby-src-0.9.8.tar.gz 4671287 RMD160 b0e7a17462d4b0ac47edb7adc1595336f1bc5a35 SHA1 f76130ea2927eb4daf0cd7d7920a09fb501b45fe SHA256 a85fbd888b4c4ca740e18937acb92885045b3366bcd0eea7958c432cbe279871
@@ -29,10 +29,10 @@ EBUILD jruby-0.9.8.ebuild 2420 RMD160 882dc8b564e05487d401aee97d841f573e94a948 S
 MD5 25c99e98702af123ae5e7f174b39e2f5 jruby-0.9.8.ebuild 2420
 RMD160 882dc8b564e05487d401aee97d841f573e94a948 jruby-0.9.8.ebuild 2420
 SHA256 508c2578c336f62da9906ac6167766417ba3b6ec1b691b2f9d1f2b3103ae9bae jruby-0.9.8.ebuild 2420
-MISC ChangeLog 2199 RMD160 b71d032f8baf5eb90638f8d32179c352d5007e2b SHA1 e30490cf51521a03373b3ce3c0301b9798462292 SHA256 c827f218d460400ce1332d783b02f6c9b6f6b09e5cd65e8e387f75c81e09020b
-MD5 cbed2d3ff7e70f4abf9d1d22bd19268e ChangeLog 2199
-RMD160 b71d032f8baf5eb90638f8d32179c352d5007e2b ChangeLog 2199
-SHA256 c827f218d460400ce1332d783b02f6c9b6f6b09e5cd65e8e387f75c81e09020b ChangeLog 2199
+MISC ChangeLog 2306 RMD160 50800856ce62ae30527557ba9d2247a660626916 SHA1 14ddb57cc6ec22b674d65b0815b2b474ca00be7f SHA256 f6b85ebcaf59f0ec91a85c17b0345dc29b5319918b54b81835cffaa125095a7a
+MD5 290b51f3d9a7b55740222fd0f3fae74b ChangeLog 2306
+RMD160 50800856ce62ae30527557ba9d2247a660626916 ChangeLog 2306
+SHA256 f6b85ebcaf59f0ec91a85c17b0345dc29b5319918b54b81835cffaa125095a7a ChangeLog 2306
 MISC metadata.xml 252 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 SHA1 7a38c8eea607b775e3b67757b0deda944aa27c65 SHA256 530d1e67c69f08b473ce1a5e7bbab5682e6deee068b27dbb57d459ca61c1290a
 MD5 04e248f270fb5cf8193c02ebd018d503 metadata.xml 252
 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 metadata.xml 252
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
index 49a82dfa9a4d..ec0fd57bd88a 100644
--- a/dev-java/jruby/files/jruby-0.9.8-old_jline.patch
+++ b/dev-java/jruby/files/jruby-0.9.8-old_jline.patch
@@ -1,7 +1,8 @@
+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 08:48:25.000000000 -0500
-@@ -85,11 +85,11 @@
++++ 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);
@@ -11,7 +12,5 @@ diff -ru jruby-0.9.8/src/org/jruby/ext/Readline.java jruby-0.9.8-patched/src/org
 -        ((CandidateListCompletionHandler) readline.getCompletionHandler()).setAlwaysIncludeNewline(false);
 +        //((CandidateListCompletionHandler) readline.getCompletionHandler()).setAlwaysIncludeNewline(false);
          if (currentCompletor == null)
-            currentCompletor = new RubyFileNameCompletor();
+             currentCompletor = new RubyFileNameCompletor();
          readline.addCompletor(currentCompletor);
-         history = readline.getHistory();
-         readline.setHistory(history);