Patch to fix bug #170663, reported upstream.

Package-Manager: portage-2.1.2.2

4 files changed, 36 insertions, 10 deletions

diff --git a/dev-java/jline/ChangeLog b/dev-java/jline/ChangeLog
index 62da00772b80..8a374ada8f2c 100644
--- a/dev-java/jline/ChangeLog
+++ b/dev-java/jline/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jline
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/ChangeLog,v 1.13 2007/03/11 19:34:03 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/ChangeLog,v 1.14 2007/03/13 15:05:38 caster Exp $
+
+  13 Mar 2007; Vlastimil Babka <caster@gentoo.org>
+  +files/jline-0.9.91-import.patch, jline-0.9.91.ebuild:
+  Patch to fix bug #170663, reported upstream.
 
 *jline-0.9.91 (11 Mar 2007)
 
diff --git a/dev-java/jline/Manifest b/dev-java/jline/Manifest
index 88de5a4e1ead..629073f70383 100644
--- a/dev-java/jline/Manifest
+++ b/dev-java/jline/Manifest
@@ -2,6 +2,10 @@ AUX build-0.9.9.xml 3483 RMD160 31693eabfa651af418938f22175aaf8be3608112 SHA1 d9
 MD5 fea58a669e91ad7cb8adc6e47484c153 files/build-0.9.9.xml 3483
 RMD160 31693eabfa651af418938f22175aaf8be3608112 files/build-0.9.9.xml 3483
 SHA256 36ee2d8d6770f8c6fe0a13a94b8cc86682139f902b911b308528ba04b9c08bb2 files/build-0.9.9.xml 3483
+AUX jline-0.9.91-import.patch 438 RMD160 35c87a8993aad8c574c360baf813ffa6574518f5 SHA1 ea63060041a71b66bfd6d608f2c94df541dc08d6 SHA256 6002cbdcfb1bd2b6401a33d912b9ccc386bd0ec2c2f6dd2b181dd7d0c0a22859
+MD5 dbb52efeb2e5c570d828f003a405cf38 files/jline-0.9.91-import.patch 438
+RMD160 35c87a8993aad8c574c360baf813ffa6574518f5 files/jline-0.9.91-import.patch 438
+SHA256 6002cbdcfb1bd2b6401a33d912b9ccc386bd0ec2c2f6dd2b181dd7d0c0a22859 files/jline-0.9.91-import.patch 438
 AUX maven-build.properties 501 RMD160 2f63480b80c49e7b041505fe61632c4bc1db65b1 SHA1 e9d9e32e457394c377cf3883ee935d92711af914 SHA256 ed14880aca9146984f0b988b66e83c1d77e3367003371570855a9ac5d688dac3
 MD5 4011b934c530b4634e2767807e6cad3d files/maven-build.properties 501
 RMD160 2f63480b80c49e7b041505fe61632c4bc1db65b1 files/maven-build.properties 501
@@ -20,14 +24,14 @@ EBUILD jline-0.9.9-r2.ebuild 1502 RMD160 8f14c2b5edc7f9d66bd05d04a6547f0829a9e3f
 MD5 8f279f89c21cc6ab10184ba467f16f87 jline-0.9.9-r2.ebuild 1502
 RMD160 8f14c2b5edc7f9d66bd05d04a6547f0829a9e3fb jline-0.9.9-r2.ebuild 1502
 SHA256 22ae5e7c76baacb216e516326aa0241380f4ce466196872cdfe0353dbdb880a5 jline-0.9.9-r2.ebuild 1502
-EBUILD jline-0.9.91.ebuild 1683 RMD160 b83bb9729a7f6a153d53cd8b5e63d30d49e62873 SHA1 7df3bc0712134625d669f46edd4b5e6505bc789a SHA256 e42f1768a52c06adadd9228980f9085d368c4a931ff73dfcf97c0c809a4d3fac
-MD5 2943d121994b437075a738af695b7574 jline-0.9.91.ebuild 1683
-RMD160 b83bb9729a7f6a153d53cd8b5e63d30d49e62873 jline-0.9.91.ebuild 1683
-SHA256 e42f1768a52c06adadd9228980f9085d368c4a931ff73dfcf97c0c809a4d3fac jline-0.9.91.ebuild 1683
-MISC ChangeLog 2126 RMD160 5772658ba1d8412239d2f8eba2c4406551a93605 SHA1 b7082a17b3315c6a77ffc5972eb4db5087cbca3a SHA256 5182366dd5e761d0c15d81f771e927cf985b99994bb109952cbda126efaa994c
-MD5 e9013b4375a04b33c23b2284e8dd15ca ChangeLog 2126
-RMD160 5772658ba1d8412239d2f8eba2c4406551a93605 ChangeLog 2126
-SHA256 5182366dd5e761d0c15d81f771e927cf985b99994bb109952cbda126efaa994c ChangeLog 2126
+EBUILD jline-0.9.91.ebuild 1832 RMD160 52533cc028425aae07649054a442fb1c38e6246f SHA1 8b42476c5ae7422d3a4ff233925b910c353c3e55 SHA256 21fd8fad01312084ae25d5186a35632048a399ce62e44717dbccf88e79b4f0c4
+MD5 a28f5539d8f5ab4e9b5d3cad215ec897 jline-0.9.91.ebuild 1832
+RMD160 52533cc028425aae07649054a442fb1c38e6246f jline-0.9.91.ebuild 1832
+SHA256 21fd8fad01312084ae25d5186a35632048a399ce62e44717dbccf88e79b4f0c4 jline-0.9.91.ebuild 1832
+MISC ChangeLog 2282 RMD160 dfd0f612b5478eac48b1a329dceac13c0438ac7a SHA1 a553691fad685a075e39cfdd80d0739aba1d3780 SHA256 95cc5b121ab96f70539121aa02c1ef54a8ec751015dddf07c47c664991b0ecf7
+MD5 fded859ee9b2bd0a77d34bc18ae11222 ChangeLog 2282
+RMD160 dfd0f612b5478eac48b1a329dceac13c0438ac7a ChangeLog 2282
+SHA256 95cc5b121ab96f70539121aa02c1ef54a8ec751015dddf07c47c664991b0ecf7 ChangeLog 2282
 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/jline/files/jline-0.9.91-import.patch b/dev-java/jline/files/jline-0.9.91-import.patch
new file mode 100644
index 000000000000..3f49b5b6e569
--- /dev/null
+++ b/dev-java/jline/files/jline-0.9.91-import.patch
@@ -0,0 +1,13 @@
+diff --git a/src/src/main/java/jline/Terminal.java b/src/src/main/java/jline/Terminal.java
+index b9b9061..3b22995 100644
+--- a/src/src/main/java/jline/Terminal.java
++++ b/src/src/main/java/jline/Terminal.java
+@@ -8,8 +8,6 @@ package jline;
+ 
+ import java.io.*;
+ 
+-import com.sun.jmx.snmp.ThreadContext;
+-
+ /**
+  *  Representation of the input terminal for a platform. Handles
+  *  any initialization that the platform may need to perform
diff --git a/dev-java/jline/jline-0.9.91.ebuild b/dev-java/jline/jline-0.9.91.ebuild
index 0c4bcb7ed351..10af291a8f80 100644
--- a/dev-java/jline/jline-0.9.91.ebuild
+++ b/dev-java/jline/jline-0.9.91.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/jline-0.9.91.ebuild,v 1.1 2007/03/11 19:34:03 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/jline-0.9.91.ebuild,v 1.2 2007/03/13 15:05:38 caster Exp $
 
 JAVA_PKG_IUSE="doc source test"
 
@@ -25,6 +25,11 @@ src_unpack() {
 	unpack ${A}
 	rm ${P}/*.jar
 	cd ${S}
+
+	# byg 170663
+	# http://sourceforge.net/tracker/index.php?func=detail&aid=1679909&group_id=64033&atid=506056
+	epatch ${FILESDIR}/${P}-import.patch
+
 	# we don't support maven for building yet. this build.xml was generated by:
 	# - mvn ant:ant
 	# - tweak build.xml to not load properties from home dir