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.

Package-Manager: portage-2.1.2_pre1

6 files changed, 192 insertions, 18 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/Manifest b/dev-java/gnu-classpath-inetlib/Manifest
index 325531072677..0febe9cb132c 100644
--- a/dev-java/gnu-classpath-inetlib/Manifest
+++ b/dev-java/gnu-classpath-inetlib/Manifest
@@ -1,25 +1,33 @@
+AUX gnu-classpath-inetlib-1.0-jdk15.patch 3035 RMD160 267b766def47190719942efcae991cfec107981e SHA1 a4bcdb580da639c05b7789ca9e835c0eb8728181 SHA256 c8cc12545a6ae37fc510b338dd8470ac1d704baf135b6c4dec51fb9a254cfd30
+MD5 a8b9ea912b3634be0f6bd77a120f999f files/gnu-classpath-inetlib-1.0-jdk15.patch 3035
+RMD160 267b766def47190719942efcae991cfec107981e files/gnu-classpath-inetlib-1.0-jdk15.patch 3035
+SHA256 c8cc12545a6ae37fc510b338dd8470ac1d704baf135b6c4dec51fb9a254cfd30 files/gnu-classpath-inetlib-1.0-jdk15.patch 3035
+AUX gnu-classpath-inetlib-1.1-jdk15.patch 3932 RMD160 94738b692c0a9dfad3d38bf470c1429b88fd8df9 SHA1 e502ab408121df6283880262682e79c34258336c SHA256 98cafdb45968673a3378b1c031f15be7519add216a5fd19d8ad672bc3c6b1129
+MD5 c2f580e2f866619f1e6f5097c83c6f45 files/gnu-classpath-inetlib-1.1-jdk15.patch 3932
+RMD160 94738b692c0a9dfad3d38bf470c1429b88fd8df9 files/gnu-classpath-inetlib-1.1-jdk15.patch 3932
+SHA256 98cafdb45968673a3378b1c031f15be7519add216a5fd19d8ad672bc3c6b1129 files/gnu-classpath-inetlib-1.1-jdk15.patch 3932
 DIST inetlib-1.0.tar.gz 151002 RMD160 c3dc231e02268e1a6bbb4a17bc3409c23995ef8e SHA1 6f5e6ab6237024c12778f4eae4cef757a79a207a SHA256 f59a46051b01dd01f04d0cc677d95a6c02b3389787d59a63b0f74bef20f887f8
 DIST inetlib-1.1.tar.gz 177251 RMD160 0cc424a46105798ea71cb8793bc4ba60a16603b7 SHA1 125e5529746f1c15bdeb42c909d8e5bc57f9533b SHA256 2b30cad60f3136b04f9ae4a906da8ac964654dacd3281097ec3558e67c9a51a0
 EBUILD gnu-classpath-inetlib-1.0-r1.ebuild 1639 RMD160 367c95f54506f08b4063ff9ea5fdadb4e49fa522 SHA1 026a917ff3edc9be78e50544513ea1464f1b84d5 SHA256 06ccd3aff1ba1584ff6f451b3ff59f4617a09bdd91bc41f57f7c8fb459d46927
 MD5 c969ae28cf043c7f99fe3f546fef9fbd gnu-classpath-inetlib-1.0-r1.ebuild 1639
 RMD160 367c95f54506f08b4063ff9ea5fdadb4e49fa522 gnu-classpath-inetlib-1.0-r1.ebuild 1639
 SHA256 06ccd3aff1ba1584ff6f451b3ff59f4617a09bdd91bc41f57f7c8fb459d46927 gnu-classpath-inetlib-1.0-r1.ebuild 1639
-EBUILD gnu-classpath-inetlib-1.0-r2.ebuild 1653 RMD160 eb727654863b487708594d1c951136bb76664efd SHA1 38d70f1c24dcc29eb5fb597a9d828c0de0f4f22a SHA256 49ce217ccd66601260c92529a5b4449c9999905a28035962dceb980eb67be3a9
-MD5 17acf685fddcebb073c390be42257043 gnu-classpath-inetlib-1.0-r2.ebuild 1653
-RMD160 eb727654863b487708594d1c951136bb76664efd gnu-classpath-inetlib-1.0-r2.ebuild 1653
-SHA256 49ce217ccd66601260c92529a5b4449c9999905a28035962dceb980eb67be3a9 gnu-classpath-inetlib-1.0-r2.ebuild 1653
+EBUILD gnu-classpath-inetlib-1.0-r2.ebuild 1695 RMD160 94e4cecded0a530ce8fd2d9801cda8f24985fe9c SHA1 9bb5d5dfb0dbcd82e1547d0803a7883c7f216ffa SHA256 99a8ce6bd34023418416e14db0127839122dd44f85f51e4b5e52de1c83d3fe5c
+MD5 e0a9f785d2a48b7e63a8dc02970e18d0 gnu-classpath-inetlib-1.0-r2.ebuild 1695
+RMD160 94e4cecded0a530ce8fd2d9801cda8f24985fe9c gnu-classpath-inetlib-1.0-r2.ebuild 1695
+SHA256 99a8ce6bd34023418416e14db0127839122dd44f85f51e4b5e52de1c83d3fe5c gnu-classpath-inetlib-1.0-r2.ebuild 1695
 EBUILD gnu-classpath-inetlib-1.1-r1.ebuild 1278 RMD160 df35adeba7403973021ba6607e3133e5c0f1de8c SHA1 348f47f54280bd5099222df5d5e0295c0c636a4a SHA256 02b0f6ddafa23658b53aca97d1586f60ac6c9bf5057795394562b7ab9098e110
 MD5 d391dba35f7f6f70683b40b62d0cee05 gnu-classpath-inetlib-1.1-r1.ebuild 1278
 RMD160 df35adeba7403973021ba6607e3133e5c0f1de8c gnu-classpath-inetlib-1.1-r1.ebuild 1278
 SHA256 02b0f6ddafa23658b53aca97d1586f60ac6c9bf5057795394562b7ab9098e110 gnu-classpath-inetlib-1.1-r1.ebuild 1278
-EBUILD gnu-classpath-inetlib-1.1-r2.ebuild 1250 RMD160 1a4a99ab59a76bae662ccf856c7f91ba6d1603d5 SHA1 3f4998bdd33c934292ff022d5df2720e0092539f SHA256 a910bfc5e5868e307a0e918a0ba4358d33a98d69a258d4dda1a7d6403ee84e5b
-MD5 4883d72d31725ba58ba03cd16c71fa58 gnu-classpath-inetlib-1.1-r2.ebuild 1250
-RMD160 1a4a99ab59a76bae662ccf856c7f91ba6d1603d5 gnu-classpath-inetlib-1.1-r2.ebuild 1250
-SHA256 a910bfc5e5868e307a0e918a0ba4358d33a98d69a258d4dda1a7d6403ee84e5b gnu-classpath-inetlib-1.1-r2.ebuild 1250
-MISC ChangeLog 503 RMD160 7baa0c5cf75ad410376d1a7899a275aa7165c640 SHA1 4817331921356f92405570f071e024c9a5fde473 SHA256 59c0508cda557223fb9ffe021eb0d09548bf105614b88b284febf2cd4a21e0dd
-MD5 26a7b8a6088307fe4882f81e34456ff5 ChangeLog 503
-RMD160 7baa0c5cf75ad410376d1a7899a275aa7165c640 ChangeLog 503
-SHA256 59c0508cda557223fb9ffe021eb0d09548bf105614b88b284febf2cd4a21e0dd ChangeLog 503
+EBUILD gnu-classpath-inetlib-1.1-r2.ebuild 1294 RMD160 f6eb3cd4a015cbdd00bf55cdad74dc63ddd42367 SHA1 4adca77de7412ae4880f55c93eb2b103e6417d25 SHA256 0b87a08c32fa31c892a8a4192067edcd1585d8f167dcb91d3e4d30ff202f5431
+MD5 0feb8937cae644aba9ab3a3e59e1ff18 gnu-classpath-inetlib-1.1-r2.ebuild 1294
+RMD160 f6eb3cd4a015cbdd00bf55cdad74dc63ddd42367 gnu-classpath-inetlib-1.1-r2.ebuild 1294
+SHA256 0b87a08c32fa31c892a8a4192067edcd1585d8f167dcb91d3e4d30ff202f5431 gnu-classpath-inetlib-1.1-r2.ebuild 1294
+MISC ChangeLog 1023 RMD160 bb3883c92f82de44ace767f733584aaf82806331 SHA1 43345527ce477cc0047e812a5680eb19b64a7b9e SHA256 c7c89490f8a121492c8ca2d9c74ab8ba97019abb0c00b266bd1e3b69b1a2d303
+MD5 06e94fcf79c9187034aa351b88992bb8 ChangeLog 1023
+RMD160 bb3883c92f82de44ace767f733584aaf82806331 ChangeLog 1023
+SHA256 c7c89490f8a121492c8ca2d9c74ab8ba97019abb0c00b266bd1e3b69b1a2d303 ChangeLog 1023
 MISC metadata.xml 430 RMD160 d3f7cd9542b083b9cacda3e678a8faf76a85b9a5 SHA1 40dc1cf7659e11765df7cfb0ced41eec6f3bf537 SHA256 bef2fad85b9f4da5e38421c1bfd3a81a6c5a3a12a5077eefae398c0dfe5b718b
 MD5 cae9047aa616f454f13653091a077f60 metadata.xml 430
 RMD160 d3f7cd9542b083b9cacda3e678a8faf76a85b9a5 metadata.xml 430
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
 }