puretls no longer uses packed jars. fixes #63266.

4 files changed, 33 insertions, 22 deletions

diff --git a/dev-java/puretls/ChangeLog b/dev-java/puretls/ChangeLog
index 7cfa0b55540c..a4c082045c6f 100644
--- a/dev-java/puretls/ChangeLog
+++ b/dev-java/puretls/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/puretls
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/puretls/ChangeLog,v 1.4 2004/10/22 09:50:36 absinthe Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/puretls/ChangeLog,v 1.5 2005/01/03 21:34:25 luckyduck Exp $
+
+  03 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> puretls-0.94_beta4.ebuild:
+  Package puretls no longer uses packed jars. Fixes #63266.
 
   22 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
   puretls-0.94_beta4.ebuild:
diff --git a/dev-java/puretls/Manifest b/dev-java/puretls/Manifest
index 4c49f6cef013..64f554152f0a 100644
--- a/dev-java/puretls/Manifest
+++ b/dev-java/puretls/Manifest
@@ -1,4 +1,4 @@
+MD5 284c3d8bc3101a254caa8efd15c97808 puretls-0.94_beta4.ebuild 1301
 MD5 3fdf05b53a119ce1409d4dddb6d463c5 ChangeLog 713
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 c1c5c272601e3aa90991e9650b5c5092 puretls-0.94_beta4.ebuild 1240
-MD5 72e5e38066c9bd32bb64a5fbb7487db9 files/digest-puretls-0.94_beta4 213
+MD5 43e263db222e5890f2e0729a94f7c380 files/digest-puretls-0.94_beta4 65
diff --git a/dev-java/puretls/files/digest-puretls-0.94_beta4 b/dev-java/puretls/files/digest-puretls-0.94_beta4
index 14000fc83153..93c26742fc13 100644
--- a/dev-java/puretls/files/digest-puretls-0.94_beta4
+++ b/dev-java/puretls/files/digest-puretls-0.94_beta4
@@ -1,3 +1 @@
 MD5 b2e4e947af30387b86dbf3473fdbd103 puretls-0.9b4.tar.gz 218494
-MD5 ac4080eee24b1cf0a476cee4fe501149 Cryptix-asn1-20011119.tar.gz 385460
-MD5 7a3545ede3fff5c89eba601fea03791a cryptix32-20001002-r3.2.0.zip 2005827
diff --git a/dev-java/puretls/puretls-0.94_beta4.ebuild b/dev-java/puretls/puretls-0.94_beta4.ebuild
index 1a27d4f11fdb..2746cad692b6 100644
--- a/dev-java/puretls/puretls-0.94_beta4.ebuild
+++ b/dev-java/puretls/puretls-0.94_beta4.ebuild
@@ -1,40 +1,50 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/puretls/puretls-0.94_beta4.ebuild,v 1.4 2004/10/22 09:50:36 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/puretls/puretls-0.94_beta4.ebuild,v 1.5 2005/01/03 21:34:25 luckyduck Exp $
 
 inherit java-pkg
 
 DESCRIPTION="PureTLS is a free Java-only implementation of the SSLv3 and TLSv1 (RFC2246) protocols"
 HOMEPAGE="http://www.rtfm.com/puretls/"
-SRC_URI="mirror://gentoo/puretls-0.9b4.tar.gz
-	mirror://gentoo/Cryptix-asn1-20011119.tar.gz
-	mirror://gentoo/cryptix32-20001002-r3.2.0.zip"
+SRC_URI="mirror://gentoo/puretls-0.9b4.tar.gz"
 LICENSE="puretls"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="doc"
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jdk-1.4"
+IUSE="doc jikes"
+DEPEND=">=virtual/jdk-1.4
+	=dev-java/cryptix-asn1-bin-20011119
+	=dev-java/cryptix-3.2.0"
+RDEPEND=">=virtual/jre-1.4"
 
 S=${WORKDIR}/${PN}-0.9b4
 
 src_unpack() {
-	unpack puretls-0.9b4.tar.gz
-	mkdir ${S}/cryptix
-	cd ${S}/cryptix
-	unpack cryptix32-20001002-r3.2.0.zip && unpack Cryptix-asn1-20011119.tar.gz
+	unpack ${A}
 	cd ${S}
+
+	java-pkg_jar-from cryptix-asn1-bin
+	java-pkg_jar-from cryptix-3.2
 	echo "jdk.version=1.4" >> build.properties
-	echo "cryptix.jar=cryptix/cryptix32.jar" >> build.properties
-	echo "cryptix-asn1.jar=cryptix/Cryptix-asn1-20011119/cryptix-asn1.jar" >> build.properties
+	echo "cryptix.jar=cryptix32.jar" >> build.properties
+	echo "cryptix-asn1.jar=cryptix-asn1.jar" >> build.properties
 }
 
 src_compile() {
-	ant  || die "Unable to compile"
+	local antflags="compile"
+	if use doc; then
+		antflags="${antflags} javadoc"
+	fi
+	if use jikes; then
+		antflags="${antflags} -Dbuild.compiler=jikes"
+	fi
+	ant ${antflags} || die "Unable to compile"
 }
 
 src_install () {
 	java-pkg_dojar ${S}/build/${PN}.jar
+
 	dodoc ChangeLog CREDITS INSTALL LICENSE README
-	use doc && java-pkg_dohtml -r ${S}/build/doc/*
+	if use doc; then
+		java-pkg_dohtml -r ${S}/build/doc/api/*
+	fi
 }