Merged changes from experimental: Does not depend on gnu-classpath any more because jessie can be used as an ssl provide under any vm, dropped jikes support until axxo-overlay gets merged, fixed javadoc creation, CLASSPATH handling and now installs documentation files like README and TODO. Fixes bug #92656.

Package-Manager: portage-2.1_pre3-r1

5 files changed, 103 insertions, 8 deletions

diff --git a/dev-java/jessie/ChangeLog b/dev-java/jessie/ChangeLog
index ebbee76ec5d1..dae43ac41adf 100644
--- a/dev-java/jessie/ChangeLog
+++ b/dev-java/jessie/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/jessie
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jessie/ChangeLog,v 1.11 2004/12/21 19:02:16 karltk Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jessie/ChangeLog,v 1.12 2006/01/06 18:15:03 betelgeuse Exp $
+
+*jessie-1.0.0-r1 (06 Jan 2006)
+
+  06 Jan 2006; Petteri Räty <betelgeuse@gentoo.org>
+  +files/jessie-1.0.0-javadoc.patch, +jessie-1.0.0-r1.ebuild:
+  Merged changes from experimental: Does not depend on gnu-classpath any more
+  because jessie can be used as an ssl provide under any vm, dropped jikes
+  support until axxo-overlay gets merged, fixed javadoc creation, CLASSPATH
+  handling and now installs documentation files like README and TODO. Fixes
+  bug #92656.
 
   18 Dec 2004; Karl Trygve Kalleberg <karltk@gentoo.org> jessie-1.0.0.ebuild:
   Workaround for AWT strangeness in GNU classpath. Fixes #71888.
diff --git a/dev-java/jessie/Manifest b/dev-java/jessie/Manifest
index 9029d37102b2..c2ce8b4f9cef 100644
--- a/dev-java/jessie/Manifest
+++ b/dev-java/jessie/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 7078bfa62b87c106e04004bcaf558f4c ChangeLog 1679
+MD5 c614b4d53c89c67391b2d7e5c0d06fcf files/digest-jessie-1.0.0 64
+MD5 c614b4d53c89c67391b2d7e5c0d06fcf files/digest-jessie-1.0.0-r1 64
+MD5 5f70d8a7822ce83c05a4089c92968a31 files/jessie-1.0.0-javadoc.patch 2893
+MD5 7bca6022b6bb02587bed2a7af8095c52 jessie-1.0.0-r1.ebuild 1381
 MD5 6814ec0b093926d9b8957619607bff0f jessie-1.0.0.ebuild 1159
-MD5 6d7cb45c73e988f904905bf4db05f2dc ChangeLog 1208
 MD5 d7a22352b39820b369e6e067dcac7fff metadata.xml 2204
-MD5 c614b4d53c89c67391b2d7e5c0d06fcf files/digest-jessie-1.0.0 64
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC27KS/rLF9B432nYRAug9AJ9zRnx3K0L6dK1OMDQZjbfKtyIehQCgssXM
-XMrEWkGCFSc+izuw+WCFKSI=
-=/mw6
+iD8DBQFDvrO0QiJ/wx066S4RAkRKAKClr9CZvUc2OLMwkFFbAQosVYqNFgCeLr0B
+Q0yxrll3dcjrNjNqSaLL1/M=
+=Pdud
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jessie/files/digest-jessie-1.0.0-r1 b/dev-java/jessie/files/digest-jessie-1.0.0-r1
new file mode 100644
index 000000000000..e748129e6b71
--- /dev/null
+++ b/dev-java/jessie/files/digest-jessie-1.0.0-r1
@@ -0,0 +1 @@
+MD5 eba2838a9ae10f581ed7f8514242a1c5 jessie-1.0.0.tar.gz 876447
diff --git a/dev-java/jessie/files/jessie-1.0.0-javadoc.patch b/dev-java/jessie/files/jessie-1.0.0-javadoc.patch
new file mode 100644
index 000000000000..ca7f94a781f0
--- /dev/null
+++ b/dev-java/jessie/files/jessie-1.0.0-javadoc.patch
@@ -0,0 +1,24 @@
+diff -ru jessie-1.0.0/Makefile.in jessie-1.0.0-patched/Makefile.in
+--- jessie-1.0.0/Makefile.in	2004-06-09 00:58:58.000000000 -0400
++++ jessie-1.0.0-patched/Makefile.in	2005-09-04 11:22:27.000000000 -0400
+@@ -1857,8 +1857,8 @@
+ 	rm -rf classes
+ 
+ apidoc: .FORCE
+-	-mkdir apidoc
+-	javadoc -d apidoc/ -classpath $(CLASSPATH) -sourcepath $(srcdir) -bottom "<div style=\"float: left;\"><em>Verbatim copying and distribution of this documentation is permitted in any medium.</em></div><div style=\"margin-top: 10px; margin-bottom: 10px; float: right; text-align: right;\"<a href=\"http://metastatic.org/source/jessie/\"><img src=\"http://metastatic.org/images/jessie-small.png\" width=\"150\" height=\"52\" alt=\"Jessie: A Free Software Implementation of the JSSE\" style=\"border: none;\" /></a></div>" -windowtitle "Jessie API documentation, version $(VERSION)" -link http://www.gnu.org/software/gnu-crypto/api/ -link http://java.sun.com/j2se/1.4.2/docs/api/ -breakiterator -group "JSSE API" javax.net:javax.net.ssl:javax.security.cert -group "Jessie Provider" org.metastatic.jessie:org.metastatic.jessie.https javax.net javax.net.ssl javax.security.cert org.metastatic.jessie org.metastatic.jessie.https
++	-mkdir -p apidoc
++	javadoc -d apidoc/ -classpath $(CLASSPATH) -sourcepath $(srcdir) -bottom "<div style=\"float: left;\"><em>Verbatim copying and distribution of this documentation is permitted in any medium.</em></div><div style=\"margin-top: 10px; margin-bottom: 10px; float: right; text-align: right;\"<a href=\"http://metastatic.org/source/jessie/\"><img src=\"http://metastatic.org/images/jessie-small.png\" width=\"150\" height=\"52\" alt=\"Jessie: A Free Software Implementation of the JSSE\" style=\"border: none;\" /></a></div>" -windowtitle "Jessie API documentation, version $(VERSION)" -link http://www.gnu.org/software/gnu-crypto/manual/api/ -link http://java.sun.com/j2se/1.4.2/docs/api/ -breakiterator -group "JSSE API" javax.net:javax.net.ssl:javax.security.cert -group "Jessie Provider" org.metastatic.jessie:org.metastatic.jessie.https javax.net javax.net.ssl javax.security.cert org.metastatic.jessie org.metastatic.jessie.https
+ 
+ gjdoc: gjdoccatalog.xml .FORCE
+ 	-mkdir -p apidoc-xml apidoc/common
+diff -ru jessie-1.0.0/javax/net/SocketFactory.java jessie-1.0.0-patched/javax/net/SocketFactory.java
+--- jessie-1.0.0/javax/net/SocketFactory.java	2003-10-15 19:36:40.000000000 -0400
++++ jessie-1.0.0-patched/javax/net/SocketFactory.java	2005-09-04 11:23:18.000000000 -0400
+@@ -154,5 +154,5 @@
+    * @return A socket connected to <i>host</i> on <i>port</i>.
+    * @throws IOException If a network error occurs.
+    */
+-  public abstract Socket createSocket(InetAddress hast, int port, InetAddress localHost, int localPort) throws IOException;
++  public abstract Socket createSocket(InetAddress host, int port, InetAddress localHost, int localPort) throws IOException;
+ }
diff --git a/dev-java/jessie/jessie-1.0.0-r1.ebuild b/dev-java/jessie/jessie-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..3d6781aa2072
--- /dev/null
+++ b/dev-java/jessie/jessie-1.0.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jessie/jessie-1.0.0-r1.ebuild,v 1.1 2006/01/06 18:15:03 betelgeuse Exp $
+
+inherit java-pkg eutils
+
+DESCRIPTION="Free JSSE implementation"
+HOMEPAGE="http://www.nongnu.org/jessie"
+SRC_URI="http://syzygy.metastatic.org/jessie/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc ssl"
+#IUSE="doc jikes ssl"
+
+RDEPEND=">=virtual/jre-1.4
+	ssl? ( dev-java/gnu-crypto )"
+
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+# Jikes needs to learn how to get system libraries so it can play nice.
+# Until then, we're going to disable jikes support
+#	jikes? ( >=dev-java/jikes-1.19 )
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# TODO file upstream
+	# without this, make apidoc fails (a URL has changed)
+	epatch "${FILESDIR}/${P}-javadoc.patch"
+}
+
+src_compile() {
+
+	local MY_CLASSPATH="${CLASSPATH}"
+	use ssl && MY_CLASSPATH="${MY_CLASSPATH}:$(java-pkg_getjars gnu-crypto)"
+
+	CLASSPATH="${MY_CLASSPATH}:" econf --with-java-target=1.4 --disable-awt || die
+	emake || die
+
+	if use doc; then
+		 emake apidoc
+		mv apidoc api || die "Renaming apidoc failed."
+	fi
+}
+
+src_install() {
+	einstall || die
+	rm ${D}/usr/share/*.jar
+
+	java-pkg_dojar lib/*.jar
+
+	use doc && java-pkg_dohtml -r api
+
+	dodoc AUTHORS FAQ INSTALL NEWS README THANKS TODO
+}