Revision bumps to support the new Java system.

Package-Manager: portage-2.1.1

7 files changed, 156 insertions, 63 deletions

diff --git a/dev-java/gnu-classpath-inetlib/ChangeLog b/dev-java/gnu-classpath-inetlib/ChangeLog
index dedc507b2604..30e2aef668ea 100644
--- a/dev-java/gnu-classpath-inetlib/ChangeLog
+++ b/dev-java/gnu-classpath-inetlib/ChangeLog
@@ -1,48 +1,12 @@
 # ChangeLog for dev-java/gnu-classpath-inetlib
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/ChangeLog,v 1.15 2006/06/07 18:00:54 sanchan Exp $
+# 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 $
 
-  07 Jun 2006; Sandro Bonazzola <sanchan@gentoo.org>
-  gnu-classpath-inetlib-1.0-r1.ebuild:
-  Fixed SRC_URI, bug #135899.
+*gnu-classpath-inetlib-1.1-r2 (18 Sep 2006)
+*gnu-classpath-inetlib-1.0-r2 (18 Sep 2006)
 
-  15 May 2006; Petteri Räty <betelgeuse@gentoo.org>
-  gnu-classpath-inetlib-1.0-r1.ebuild, gnu-classpath-inetlib-1.1-r1.ebuild:
-  Changed SRC_URI to use mirror://gnu.
+  18 Sep 2006; Joshua Nichols <nichoj@gentoo.org>
+  +gnu-classpath-inetlib-1.0-r2.ebuild,
+  +gnu-classpath-inetlib-1.1-r2.ebuild:
+  Revision bumps to support the new Java system.
 
-  30 Nov 2005; <nichoj@gentoo.org> gnu-classpath-inetlib-1.0-r1.ebuild:
-  Added ~amd64 keyword (bug 105607). Disabled jikes support due to bug #89711.
-
-*gnu-classpath-inetlib-1.1-r1 (11 Sep 2005)
-*gnu-classpath-inetlib-1.0-r1 (11 Sep 2005)
-
-  11 Sep 2005; Petteri Räty <betelgeuse@gentoo.org>
-  -gnu-classpath-inetlib-1.0.ebuild, +gnu-classpath-inetlib-1.0-r1.ebuild,
-  -gnu-classpath-inetlib-1.1.ebuild, +gnu-classpath-inetlib-1.1-r1.ebuild:
-  Slotted the ebuild.
-
-*gnu-classpath-inetlib-1.1 (20 Oct 2004)
-
-  20 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
-  +gnu-classpath-inetlib-1.1.ebuild:
-  Version bump. Added ~amd64 keywords.
-
-  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
-  gnu-classpath-inetlib-1.0.ebuild:
-  use java-pkg_dohtml instead of dohtml to also install the package-list in
-  case of api docs: #50740
-
-  01 Aug 2004; David Holm <dholm@gentoo.org> gnu-classpath-inetlib-1.0.ebuild:
-  Added to ~ppc.
-
-*gnu-classpath-inetlib-1.0 (01 Aug 2004)
-
-  01 Apr 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
-  gnu-classpath-inetlib-1.0.ebuild: Version bump, submitted by Didier Link
-  <didier.link@wanadoo.fr>. Killed old version.
-
-*gnu-classpath-inetlib-20040331 (01 Apr 2004)
-
-  01 Apr 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
-  gnu-classpath-inetlib-20040331.ebuild: Initial import. Ebuild
-  submitted by myself. No joke.
diff --git a/dev-java/gnu-classpath-inetlib/Manifest b/dev-java/gnu-classpath-inetlib/Manifest
index a61ba54b5a43..0f781653cc6c 100644
--- a/dev-java/gnu-classpath-inetlib/Manifest
+++ b/dev-java/gnu-classpath-inetlib/Manifest
@@ -1,34 +1,38 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST inetlib-1.0.tar.gz 151002
-DIST inetlib-1.1.tar.gz 177251 RMD160 0cc424a46105798ea71cb8793bc4ba60a16603b7 SHA256 2b30cad60f3136b04f9ae4a906da8ac964654dacd3281097ec3558e67c9a51a0
+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 1651 RMD160 f6ea4416355b78608d006300d6bb7bc2de5d77d1 SHA1 cf121d77746be1ddbd32d817c902cce3e2899868 SHA256 f221109a8911a95d482fe87af399c03b90f1c4bfa4f697b406ddc760f756feb9
+MD5 210f6dad7f393ab0c5afc4ca3c68778c gnu-classpath-inetlib-1.0-r2.ebuild 1651
+RMD160 f6ea4416355b78608d006300d6bb7bc2de5d77d1 gnu-classpath-inetlib-1.0-r2.ebuild 1651
+SHA256 f221109a8911a95d482fe87af399c03b90f1c4bfa4f697b406ddc760f756feb9 gnu-classpath-inetlib-1.0-r2.ebuild 1651
 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
-MISC ChangeLog 1873 RMD160 f08c263fe08a9b2b047f8884180b35f14c0fbe2a SHA1 d24a502f8715905889b034606bb44dfc098ce4c2 SHA256 cb7dda0406bcd0238b719d4f0f927aa179aa4c109d4d2bbbdc97d93999ed2607
-MD5 0b8276477827f08557f4733cdc04acf4 ChangeLog 1873
-RMD160 f08c263fe08a9b2b047f8884180b35f14c0fbe2a ChangeLog 1873
-SHA256 cb7dda0406bcd0238b719d4f0f927aa179aa4c109d4d2bbbdc97d93999ed2607 ChangeLog 1873
+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
 MISC metadata.xml 430 RMD160 d3f7cd9542b083b9cacda3e678a8faf76a85b9a5 SHA1 40dc1cf7659e11765df7cfb0ced41eec6f3bf537 SHA256 bef2fad85b9f4da5e38421c1bfd3a81a6c5a3a12a5077eefae398c0dfe5b718b
 MD5 cae9047aa616f454f13653091a077f60 metadata.xml 430
 RMD160 d3f7cd9542b083b9cacda3e678a8faf76a85b9a5 metadata.xml 430
 SHA256 bef2fad85b9f4da5e38421c1bfd3a81a6c5a3a12a5077eefae398c0dfe5b718b metadata.xml 430
-MD5 a2a578355c1f554d3ae84752aaab1c19 files/digest-gnu-classpath-inetlib-1.0-r1 63
-RMD160 89288171e90531e581bba758c802af75fbe6bab9 files/digest-gnu-classpath-inetlib-1.0-r1 63
-SHA256 5ff022d38edbb8c1fe115e2380d839f907197a0c7db78bfe86902c3d88bcb592 files/digest-gnu-classpath-inetlib-1.0-r1 63
+MD5 46aa801a5f5a0d433179e127a1bab49b files/digest-gnu-classpath-inetlib-1.0-r1 235
+RMD160 e309f4c42453602baf2ee08d0862bbc5a5f65c9d files/digest-gnu-classpath-inetlib-1.0-r1 235
+SHA256 2d27b7721d3743b0ca34f8a5d0d6a6352fce0113579653e73499138b533cafef files/digest-gnu-classpath-inetlib-1.0-r1 235
+MD5 46aa801a5f5a0d433179e127a1bab49b files/digest-gnu-classpath-inetlib-1.0-r2 235
+RMD160 e309f4c42453602baf2ee08d0862bbc5a5f65c9d files/digest-gnu-classpath-inetlib-1.0-r2 235
+SHA256 2d27b7721d3743b0ca34f8a5d0d6a6352fce0113579653e73499138b533cafef files/digest-gnu-classpath-inetlib-1.0-r2 235
 MD5 eb2b08694c0bdeed41c430ff8d8e792c files/digest-gnu-classpath-inetlib-1.1-r1 235
 RMD160 c925240dbf9a51c3d4d0dc9b14569d1ae1933a4c files/digest-gnu-classpath-inetlib-1.1-r1 235
 SHA256 dc83250a1ebec0229a1504a07fc3536d4759801d9d95e81a261f2697e6ec9d5e files/digest-gnu-classpath-inetlib-1.1-r1 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEhxOW1c24p4LpXH8RAm/PAJwKXT9c+wzonA+c7FMD8X3V0SCawwCgiVQf
-NSimhFJEWM6MlGIYntWGlUc=
-=+Qfx
------END PGP SIGNATURE-----
+MD5 eb2b08694c0bdeed41c430ff8d8e792c files/digest-gnu-classpath-inetlib-1.1-r2 235
+RMD160 c925240dbf9a51c3d4d0dc9b14569d1ae1933a4c files/digest-gnu-classpath-inetlib-1.1-r2 235
+SHA256 dc83250a1ebec0229a1504a07fc3536d4759801d9d95e81a261f2697e6ec9d5e files/digest-gnu-classpath-inetlib-1.1-r2 235
diff --git a/dev-java/gnu-classpath-inetlib/files/digest-gnu-classpath-inetlib-1.0-r1 b/dev-java/gnu-classpath-inetlib/files/digest-gnu-classpath-inetlib-1.0-r1
index b83aa66f149a..aeb7d457818b 100644
--- a/dev-java/gnu-classpath-inetlib/files/digest-gnu-classpath-inetlib-1.0-r1
+++ b/dev-java/gnu-classpath-inetlib/files/digest-gnu-classpath-inetlib-1.0-r1
@@ -1 +1,3 @@
 MD5 f615733ca01b38d545a4b911678e8952 inetlib-1.0.tar.gz 151002
+RMD160 c3dc231e02268e1a6bbb4a17bc3409c23995ef8e inetlib-1.0.tar.gz 151002
+SHA256 f59a46051b01dd01f04d0cc677d95a6c02b3389787d59a63b0f74bef20f887f8 inetlib-1.0.tar.gz 151002
diff --git a/dev-java/gnu-classpath-inetlib/files/digest-gnu-classpath-inetlib-1.0-r2 b/dev-java/gnu-classpath-inetlib/files/digest-gnu-classpath-inetlib-1.0-r2
new file mode 100644
index 000000000000..aeb7d457818b
--- /dev/null
+++ b/dev-java/gnu-classpath-inetlib/files/digest-gnu-classpath-inetlib-1.0-r2
@@ -0,0 +1,3 @@
+MD5 f615733ca01b38d545a4b911678e8952 inetlib-1.0.tar.gz 151002
+RMD160 c3dc231e02268e1a6bbb4a17bc3409c23995ef8e inetlib-1.0.tar.gz 151002
+SHA256 f59a46051b01dd01f04d0cc677d95a6c02b3389787d59a63b0f74bef20f887f8 inetlib-1.0.tar.gz 151002
diff --git a/dev-java/gnu-classpath-inetlib/files/digest-gnu-classpath-inetlib-1.1-r2 b/dev-java/gnu-classpath-inetlib/files/digest-gnu-classpath-inetlib-1.1-r2
new file mode 100644
index 000000000000..1b2a0f10a56a
--- /dev/null
+++ b/dev-java/gnu-classpath-inetlib/files/digest-gnu-classpath-inetlib-1.1-r2
@@ -0,0 +1,3 @@
+MD5 3f55710cc1d5456bb9a133cfd7164411 inetlib-1.1.tar.gz 177251
+RMD160 0cc424a46105798ea71cb8793bc4ba60a16603b7 inetlib-1.1.tar.gz 177251
+SHA256 2b30cad60f3136b04f9ae4a906da8ac964654dacd3281097ec3558e67c9a51a0 inetlib-1.1.tar.gz 177251
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
new file mode 100644
index 000000000000..fcb4352673f6
--- /dev/null
+++ b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r2.ebuild
@@ -0,0 +1,61 @@
+# 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.1 2006/09/18 01:44:13 nichoj Exp $
+
+inherit java-pkg
+
+MY_PN="inetlib"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Network extensions library for GNU classpath and classpathx"
+HOMEPAGE="http://www.gnu.org/software/classpath/"
+SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="1.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+RDEPEND=">=virtual/jre-1.3
+	>=dev-java/jessie-0.9.7
+	>=dev-java/gnu-crypto-2.0.1"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}"
+S="${WORKDIR}/${MY_P}"
+
+# TODO we could give configure the lib dir on the live filesystem
+# instead of populating ${S}/ext with the jars we need -nichoj
+# TODO fix jikes support. Related to bug #89711
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	mkdir ext && cd ext
+	java-pkg_jar-from jessie
+	java-pkg_jar-from gnu-crypto javax-security.jar javax-security-auth-callback.jar
+	java-pkg_jar-from gnu-crypto javax-security.jar javax-security-sasl.jar
+}
+
+src_compile() {
+	econf \
+		--enable-smtp \
+		--enable-imap \
+		--enable-pop3 \
+		--enable-nntp \
+		--enable-ftp \
+		--enable-gopher \
+		--with-jsse-jar=${S}/ext \
+		--with-javax-security-auth-callback-jar=${S}/ext \
+		--with-javax-security-sasl-jar=${S}/ext \
+		|| die "econf failed"
+	emake || die "emake failed"
+	if use doc ; then
+		emake javadoc || die "emake javadoc failed"
+	fi
+}
+
+src_install() {
+	einstall || die
+	rm -rf ${D}/usr/share/java
+	java-pkg_dojar ${MY_PN}.jar
+	use doc && java-pkg_dohtml -r docs/*
+	dodoc AUTHORS NEWS README
+}
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
new file mode 100644
index 000000000000..0b92c8443d1d
--- /dev/null
+++ b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r2.ebuild
@@ -0,0 +1,56 @@
+# 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 $
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="inetlib"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Network extensions library for GNU classpath and classpathx"
+HOMEPAGE="http://www.gnu.org/software/classpath/"
+SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="1.1"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+RDEPEND=">=virtual/jre-1.3
+	>=dev-java/jessie-0.9.7
+	>=dev-java/gnu-crypto-2.0.1
+	"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}"
+S="${WORKDIR}/${MY_PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S} ; mkdir ext
+	cd ext
+	java-pkg_jar-from jessie
+	java-pkg_jar-from gnu-crypto
+}
+
+
+src_compile() {
+	econf \
+		--enable-smtp \
+		--enable-imap \
+		--enable-pop3 \
+		--enable-nntp \
+		--enable-ftp \
+		--enable-gopher \
+		--with-jsse-jar=${S}/ext \
+		--with-javax-security-jar=${S}/ext \
+		|| die
+	emake || die
+	if use doc ; then
+		make javadoc || die
+	fi
+}
+
+src_install() {
+	einstall || die
+	rm -rf ${D}/usr/share/java
+	java-pkg_dojar inetlib.jar
+	use doc && java-pkg_dohtml -r docs/*
+	dodoc AUTHORS NEWS README
+}