Fix building with 1.5+ jdk with patches based on upstream's changes in CVS. Closes bugs #143751 and #148166. Thanks to Taras Ciuriak <taras.ciuriak@gmail.com>, Martin Jansa <Martin.Jansa@mk.cvut.cz> for reporting, and Michael Schnake <schnake@composition.de> for providing the patches.

(Portage version: 2.1.2_pre1)

5 files changed, 172 insertions, 6 deletions

diff --git a/dev-java/gnu-classpath-inetlib/ChangeLog b/dev-java/gnu-classpath-inetlib/ChangeLog
index 30e2aef668ea..d1800cdf4de6 100644
--- a/dev-java/gnu-classpath-inetlib/ChangeLog
+++ b/dev-java/gnu-classpath-inetlib/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/gnu-classpath-inetlib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/ChangeLog,v 1.16 2006/09/18 01:44:13 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/ChangeLog,v 1.17 2006/09/20 11:07:38 caster Exp $
+
+  20 Sep 2006; Vlastimil Babka <caster@gentoo.org>
+  +files/gnu-classpath-inetlib-1.0-jdk15.patch,
+  +files/gnu-classpath-inetlib-1.1-jdk15.patch,
+  gnu-classpath-inetlib-1.0-r2.ebuild, gnu-classpath-inetlib-1.1-r2.ebuild:
+  Fix building with 1.5+ jdk with patches based on upstream's changes in CVS.
+  Closes bugs #143751 and #148166. Thanks to Taras Ciuriak
+  <taras.ciuriak@gmail.com>, Martin Jansa <Martin.Jansa@mk.cvut.cz> for
+  reporting, and Michael Schnake <schnake@composition.de> for providing the
+  patches.
 
 *gnu-classpath-inetlib-1.1-r2 (18 Sep 2006)
 *gnu-classpath-inetlib-1.0-r2 (18 Sep 2006)
diff --git a/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.0-jdk15.patch b/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.0-jdk15.patch
new file mode 100644
index 000000000000..c6db3e2f6956
--- /dev/null
+++ b/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.0-jdk15.patch
@@ -0,0 +1,64 @@
+diff -uNr inetlib-1.0.orig/source/gnu/inet/imap/IMAPConnection.java inetlib-1.0/source/gnu/inet/imap/IMAPConnection.java
+--- inetlib-1.0.orig/source/gnu/inet/imap/IMAPConnection.java	2006-09-19 13:18:21.512067374 +0200
++++ inetlib-1.0/source/gnu/inet/imap/IMAPConnection.java	2006-09-19 13:19:07.024373510 +0200
+@@ -45,7 +45,6 @@
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
+-import java.util.Properties;
+ 
+ import javax.net.ssl.SSLContext;
+ import javax.net.ssl.SSLSocket;
+@@ -555,7 +554,7 @@
+           String[] m = new String[] { mechanism };
+           CallbackHandler ch = new SaslCallbackHandler(username, password);
+           // Avoid lengthy callback procedure for GNU Crypto
+-          Properties p = new Properties();
++          HashMap p = new HashMap();
+           p.put("gnu.crypto.sasl.username", username);
+           p.put("gnu.crypto.sasl.password", password);
+           SaslClient sasl = Sasl.createSaslClient(m, null, "smtp",
+diff -uNr inetlib-1.0.orig/source/gnu/inet/pop3/POP3Connection.java inetlib-1.0/source/gnu/inet/pop3/POP3Connection.java
+--- inetlib-1.0.orig/source/gnu/inet/pop3/POP3Connection.java	2006-09-19 13:18:21.531064997 +0200
++++ inetlib-1.0/source/gnu/inet/pop3/POP3Connection.java	2006-09-19 13:20:28.841137790 +0200
+@@ -39,8 +39,8 @@
+ import java.security.MessageDigest;
+ import java.security.NoSuchAlgorithmException;
+ import java.util.ArrayList;
++import java.util.HashMap;
+ import java.util.List;
+-import java.util.Properties;
+ 
+ import javax.net.ssl.SSLContext;
+ import javax.net.ssl.SSLSocket;
+@@ -220,7 +220,7 @@
+           String[] m = new String[] { mechanism };
+           CallbackHandler ch = new SaslCallbackHandler (username, password);
+           // Avoid lengthy callback procedure for GNU Crypto
+-          Properties p = new Properties ();
++          HashMap p = new HashMap();
+           p.put ("gnu.crypto.sasl.username", username);
+           p.put ("gnu.crypto.sasl.password", password);
+           SaslClient sasl =
+diff -uNr inetlib-1.0.orig/source/gnu/inet/smtp/SMTPConnection.java inetlib-1.0/source/gnu/inet/smtp/SMTPConnection.java
+--- inetlib-1.0.orig/source/gnu/inet/smtp/SMTPConnection.java	2006-09-19 13:18:21.533064747 +0200
++++ inetlib-1.0/source/gnu/inet/smtp/SMTPConnection.java	2006-09-19 13:21:16.996113371 +0200
+@@ -37,8 +37,8 @@
+ import java.security.GeneralSecurityException;
+ import java.util.ArrayList;
+ import java.util.Collections;
++import java.util.HashMap;
+ import java.util.List;
+-import java.util.Properties;
+ 
+ import javax.net.ssl.SSLContext;
+ import javax.net.ssl.SSLSocket;
+@@ -567,7 +567,7 @@
+           String[] m = new String[] { mechanism };
+           CallbackHandler ch = new SaslCallbackHandler (username, password);
+           // Avoid lengthy callback procedure for GNU Crypto
+-          Properties p = new Properties ();
++          HashMap p = new HashMap();
+           p.put ("gnu.crypto.sasl.username", username);
+           p.put ("gnu.crypto.sasl.password", password);
+           SaslClient sasl =
diff --git a/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.1-jdk15.patch b/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.1-jdk15.patch
new file mode 100644
index 000000000000..e717fd4e52c1
--- /dev/null
+++ b/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.1-jdk15.patch
@@ -0,0 +1,87 @@
+diff -uNr inetlib.orig/source/gnu/inet/imap/IMAPConnection.java inetlib/source/gnu/inet/imap/IMAPConnection.java
+--- inetlib.orig/source/gnu/inet/imap/IMAPConnection.java	2006-09-19 10:25:48.402313856 +0200
++++ inetlib/source/gnu/inet/imap/IMAPConnection.java	2006-09-19 10:27:02.775026067 +0200
+@@ -46,7 +46,6 @@
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
+-import java.util.Properties;
+ 
+ import javax.net.ssl.SSLContext;
+ import javax.net.ssl.SSLSocket;
+@@ -653,7 +652,7 @@
+         String[] m = new String[] { mechanism };
+         CallbackHandler ch = new SaslCallbackHandler (username, password);
+         // Avoid lengthy callback procedure for GNU Crypto
+-        Properties p = new Properties ();
++        HashMap p = new HashMap();
+         p.put ("gnu.crypto.sasl.username", username);
+         p.put ("gnu.crypto.sasl.password", password);
+         SaslClient sasl = Sasl.createSaslClient (m, null, "smtp",
+diff -uNr inetlib.orig/source/gnu/inet/nntp/NNTPConnection.java inetlib/source/gnu/inet/nntp/NNTPConnection.java
+--- inetlib.orig/source/gnu/inet/nntp/NNTPConnection.java	2006-09-19 10:25:48.420311609 +0200
++++ inetlib/source/gnu/inet/nntp/NNTPConnection.java	2006-09-19 10:29:02.781039000 +0200
+@@ -42,7 +42,7 @@
+ import java.util.Calendar;
+ import java.util.Date;
+ import java.util.GregorianCalendar;
+-import java.util.Properties;
++import java.util.HashMap;
+ import java.util.TimeZone;
+ 
+ import javax.security.auth.callback.CallbackHandler;
+@@ -1140,7 +1140,7 @@
+     String[] m = new String[] { mechanism };
+     CallbackHandler ch = new SaslCallbackHandler (username, password);
+     // Avoid lengthy callback procedure for GNU Crypto
+-    Properties p = new Properties ();
++    HashMap p = new HashMap();
+     p.put ("gnu.crypto.sasl.username", username);
+     p.put ("gnu.crypto.sasl.password", password);
+     SaslClient sasl =
+diff -uNr inetlib.orig/source/gnu/inet/pop3/POP3Connection.java inetlib/source/gnu/inet/pop3/POP3Connection.java
+--- inetlib.orig/source/gnu/inet/pop3/POP3Connection.java	2006-09-19 10:25:48.426310859 +0200
++++ inetlib/source/gnu/inet/pop3/POP3Connection.java	2006-09-19 10:27:59.374957608 +0200
+@@ -41,10 +41,10 @@
+ import java.security.NoSuchAlgorithmException;
+ import java.util.ArrayList;
+ import java.util.Collections;
++import java.util.HashMap;
+ import java.util.LinkedHashMap;
+ import java.util.List;
+ import java.util.Map;
+-import java.util.Properties;
+ 
+ import javax.net.ssl.SSLContext;
+ import javax.net.ssl.SSLSocket;
+@@ -232,7 +232,7 @@
+         String[] m = new String[] { mechanism };
+         CallbackHandler ch = new SaslCallbackHandler (username, password);
+         // Avoid lengthy callback procedure for GNU Crypto
+-        Properties p = new Properties ();
++        HashMap p = new HashMap();
+         p.put ("gnu.crypto.sasl.username", username);
+         p.put ("gnu.crypto.sasl.password", password);
+         SaslClient sasl =
+diff -uNr inetlib.orig/source/gnu/inet/smtp/SMTPConnection.java inetlib/source/gnu/inet/smtp/SMTPConnection.java
+--- inetlib.orig/source/gnu/inet/smtp/SMTPConnection.java	2006-09-19 10:25:48.428310610 +0200
++++ inetlib/source/gnu/inet/smtp/SMTPConnection.java	2006-09-19 10:26:34.107606132 +0200
+@@ -38,8 +38,8 @@
+ import java.security.GeneralSecurityException;
+ import java.util.ArrayList;
+ import java.util.Collections;
++import java.util.HashMap;
+ import java.util.List;
+-import java.util.Properties;
+ 
+ import javax.net.ssl.SSLContext;
+ import javax.net.ssl.SSLSocket;
+@@ -598,7 +598,7 @@
+         String[] m = new String[] { mechanism };
+         CallbackHandler ch = new SaslCallbackHandler (username, password);
+         // Avoid lengthy callback procedure for GNU Crypto
+-        Properties p = new Properties ();
++        HashMap p = new HashMap();
+         p.put ("gnu.crypto.sasl.username", username);
+         p.put ("gnu.crypto.sasl.password", password);
+         SaslClient sasl =
diff --git a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r2.ebuild b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r2.ebuild
index e6bac5b68777..bc0f838898cc 100644
--- a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r2.ebuild
+++ b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r2.ebuild,v 1.2 2006/09/18 01:55:38 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r2.ebuild,v 1.3 2006/09/20 11:07:38 caster Exp $
 
 inherit java-pkg-2
 
@@ -26,7 +26,9 @@ S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-jdk15.patch"
 
 	mkdir ext && cd ext
 	java-pkg_jar-from jessie
diff --git a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r2.ebuild b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r2.ebuild
index 0b92c8443d1d..7570c74f8ae9 100644
--- a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r2.ebuild
+++ b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r2.ebuild,v 1.1 2006/09/18 01:44:13 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r2.ebuild,v 1.2 2006/09/20 11:07:38 caster Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -23,8 +23,11 @@ S="${WORKDIR}/${MY_PN}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S} ; mkdir ext
-	cd ext
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-jdk15.patch"
+
+	mkdir ext && cd ext
 	java-pkg_jar-from jessie
 	java-pkg_jar-from gnu-crypto
 }