Added patch to enable compilation with a 1.5 jdk, fixes #94065. Thanks to Mikael Cluseau <nwrk-public@altern.org>.

(Portage version: 2.0.51.22-r1)

5 files changed, 96 insertions, 2 deletions

diff --git a/dev-java/gnu-crypto/ChangeLog b/dev-java/gnu-crypto/ChangeLog
index 3f3357117c4d..5d25ad2e3ffc 100644
--- a/dev-java/gnu-crypto/ChangeLog
+++ b/dev-java/gnu-crypto/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/gnu-crypto
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/ChangeLog,v 1.13 2005/05/27 00:02:46 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/ChangeLog,v 1.14 2005/05/28 23:58:01 luckyduck Exp $
+
+*gnu-crypto-2.0.1-r1 (28 May 2005)
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/gnu-crypto-2.0.1-jdk15.patch, +gnu-crypto-2.0.1-r1.ebuild:
+  Added patch to enable compilation with a 1.5 jdk, fixes #94065. Thanks to
+  Mikael Cluseau <nwrk-public@altern.org>.
 
   27 May 2005; Jan Brinkmann <luckyduck@gentoo.org> gnu-crypto-2.0.1.ebuild:
   stable on ppc
diff --git a/dev-java/gnu-crypto/Manifest b/dev-java/gnu-crypto/Manifest
index 71765a864593..b055cc26c08f 100644
--- a/dev-java/gnu-crypto/Manifest
+++ b/dev-java/gnu-crypto/Manifest
@@ -1,4 +1,7 @@
-MD5 a6714b70768d97591eaa44e8d56baa6c ChangeLog 1376
+MD5 8e52c3a4d20d6826cabc708b86e81fbf gnu-crypto-2.0.1-r1.ebuild 1138
+MD5 d5a0d8ebea16a2b91c5d3757e00fb4f8 ChangeLog 1652
 MD5 f68ccff3a15a74a08ec0f41232d8a6e0 metadata.xml 461
 MD5 879dae0d71e2ef48634db8abb389b0bb gnu-crypto-2.0.1.ebuild 1047
+MD5 a30727b2c8c5fc36a69558733c20d877 files/digest-gnu-crypto-2.0.1-r1 70
 MD5 a30727b2c8c5fc36a69558733c20d877 files/digest-gnu-crypto-2.0.1 70
+MD5 8450af49bee9ffde3a26100560db5842 files/gnu-crypto-2.0.1-jdk15.patch 1551
diff --git a/dev-java/gnu-crypto/files/digest-gnu-crypto-2.0.1-r1 b/dev-java/gnu-crypto/files/digest-gnu-crypto-2.0.1-r1
new file mode 100644
index 000000000000..27fdc694b3d8
--- /dev/null
+++ b/dev-java/gnu-crypto/files/digest-gnu-crypto-2.0.1-r1
@@ -0,0 +1 @@
+MD5 39ac686b8f7ecfb95de7d58c85b8935b gnu-crypto-2.0.1.tar.bz2 3895714
diff --git a/dev-java/gnu-crypto/files/gnu-crypto-2.0.1-jdk15.patch b/dev-java/gnu-crypto/files/gnu-crypto-2.0.1-jdk15.patch
new file mode 100644
index 000000000000..47957cc5ec5f
--- /dev/null
+++ b/dev-java/gnu-crypto/files/gnu-crypto-2.0.1-jdk15.patch
@@ -0,0 +1,30 @@
+diff -Nur gnu-crypto-2.0.1/source/gnu/crypto/sasl/ClientMechanism.java gnu-crypto-2.0.1-new/source/gnu/crypto/sasl/ClientMechanism.java
+--- gnu-crypto-2.0.1/source/gnu/crypto/sasl/ClientMechanism.java	2003-11-21 10:22:10.000000000 +0100
++++ gnu-crypto-2.0.1-new/source/gnu/crypto/sasl/ClientMechanism.java	2005-05-24 16:16:37.493727834 +0200
+@@ -140,9 +140,9 @@
+       return mechanism;

+    }

+ 

+-   public Object getNegotiatedProperty(final String propName) throws SaslException {

++   public Object getNegotiatedProperty(final String propName) {

+       if (!isComplete()) {

+-         throw new IllegalMechanismStateException();

++         throw new IllegalStateException();

+       }

+       if (Sasl.QOP.equals(propName)) {

+          return getNegotiatedQOP();

+diff -Nur gnu-crypto-2.0.1/source/gnu/crypto/sasl/ServerMechanism.java gnu-crypto-2.0.1-new/source/gnu/crypto/sasl/ServerMechanism.java
+--- gnu-crypto-2.0.1/source/gnu/crypto/sasl/ServerMechanism.java	2003-11-21 10:26:14.000000000 +0100
++++ gnu-crypto-2.0.1-new/source/gnu/crypto/sasl/ServerMechanism.java	2005-05-24 16:16:55.503085024 +0200
+@@ -147,9 +147,9 @@
+       return this.authorizationID;

+    }

+ 

+-   public Object getNegotiatedProperty(final String propName) throws SaslException {

++   public Object getNegotiatedProperty(final String propName) {

+       if (!isComplete()) {

+-         throw new IllegalMechanismStateException();

++         throw new IllegalStateException();

+       }

+       if (Sasl.QOP.equals(propName)) {

+          return getNegotiatedQOP();

diff --git a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r1.ebuild b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..3a124ce49f86
--- /dev/null
+++ b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/gnu-crypto-2.0.1-r1.ebuild,v 1.1 2005/05/28 23:58:01 luckyduck Exp $
+
+inherit java-pkg eutils
+
+DESCRIPTION="GNU Crypto cryptographic primitives for Java"
+HOMEPAGE="http://www.gnu.org/software/gnu-crypto/"
+SRC_URI="ftp://ftp.gnupg.org/GnuPG/gnu-crypto/gnu-crypto-2.0.1.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64 ~ppc64"
+IUSE="doc"
+
+DEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-jdk15.patch
+}
+
+src_compile() {
+	# jikes support disabled, doesnt work: #86655
+	econf \
+		--with-jce=yes \
+		--with-sasl=yes \
+		|| die
+	emake || die
+	if use doc ; then
+		emake javadoc || die
+	fi
+}
+
+src_install() {
+	einstall || die
+	rm ${D}/usr/share/*.jar
+
+	java-pkg_dojar source/gnu-crypto.jar
+	java-pkg_dojar jce/javax-crypto.jar
+	java-pkg_dojar security/javax-security.jar
+
+	if use doc ; then
+		java-pkg_dohtml -r api/*
+	fi
+
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
+}
+
+src_test() { :; }