Fixed so javadocs can be installed with USE=doc. Added ~amd64 keywords.

5 files changed, 70 insertions, 15 deletions

diff --git a/dev-java/jdbc2-stdext/ChangeLog b/dev-java/jdbc2-stdext/ChangeLog
index 378ccb16b421..c466a8c45674 100644
--- a/dev-java/jdbc2-stdext/ChangeLog
+++ b/dev-java/jdbc2-stdext/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jdbc2-stdext
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-stdext/ChangeLog,v 1.5 2004/07/13 17:27:42 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-stdext/ChangeLog,v 1.6 2004/10/20 11:32:45 absinthe Exp $
+
+*jdbc2-stdext-2.0-r1 (20 Oct 2004)
+
+  20 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
+  +jdbc2-stdext-2.0-r1.ebuild, jdbc2-stdext-2.0.ebuild:
+  Fixed so javadocs can be installed with USE=doc. Added ~amd64 keywords.
 
   06 Jul 2004; <SeJo@gentoo.org> jdbc2-stdext-2.0.ebuild:
   added ~ppc keyword
diff --git a/dev-java/jdbc2-stdext/Manifest b/dev-java/jdbc2-stdext/Manifest
index 0559db51cc29..f3146a7ecaba 100644
--- a/dev-java/jdbc2-stdext/Manifest
+++ b/dev-java/jdbc2-stdext/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8a3f393d10195cee02093bd52fa3569a jdbc2-stdext-2.0.ebuild 998
-MD5 7a82af2f8c21eb112b72752e6d6999de ChangeLog 694
+MD5 3ad832d48656eff49cadd50ecda60fe1 ChangeLog 916
+MD5 bc9d15043398b2d40c32e5afbfe079b5 jdbc2-stdext-2.0.ebuild 1009
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 597e38dc714269390780fec256a2c901 jdbc2-stdext-2.0-r1.ebuild 1417
 MD5 1cf846798557bc9abba0fbab0786354d files/digest-jdbc2-stdext-2.0 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBPwTV/rLF9B432nYRAt3wAJ9KirHKK9OQI6viry239mwDrQRYqQCg0My7
-DYyME5x+U8d/kRiqIQR9usw=
-=s3lr
------END PGP SIGNATURE-----
+MD5 73087680fc277d629f6a9acdcf03eda6 files/digest-jdbc2-stdext-2.0-r1 133
diff --git a/dev-java/jdbc2-stdext/files/digest-jdbc2-stdext-2.0-r1 b/dev-java/jdbc2-stdext/files/digest-jdbc2-stdext-2.0-r1
new file mode 100644
index 000000000000..983cdff789cb
--- /dev/null
+++ b/dev-java/jdbc2-stdext/files/digest-jdbc2-stdext-2.0-r1
@@ -0,0 +1,2 @@
+MD5 f5b32e6765aa4eaa33a849414820d17f jdbc2_0-stdext.jar 6727
+MD5 ff3db68986373d047e924e87fa2c8097 jdbc2_0_1-stdext-javadoc.zip 97402
diff --git a/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r1.ebuild b/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r1.ebuild
new file mode 100644
index 000000000000..2980f3c78dc6
--- /dev/null
+++ b/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r1.ebuild,v 1.1 2004/10/20 11:32:45 absinthe Exp $
+
+inherit java-pkg
+
+stdext_bin="jdbc2_0-stdext.jar"
+stdext_doc="jdbc2_0_1-stdext-javadoc.zip"
+
+DESCRIPTION="A standard set of libs for Server-Side JDBC support"
+HOMEPAGE="http://java.sun.com/products/jdbc"
+SRC_URI="${stdext_bin} ${stdext_doc}"
+LICENSE="sun-csl"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="doc"
+RESTRICT="fetch"
+DEPEND="app-arch/unzip"
+RDEPEND=">=virtual/jdk-1.4"
+
+S=${WORKDIR}
+
+pkg_nofetch() {
+	einfo
+	einfo " Due to license restrictions, we cannot fetch the"
+	einfo " distributables automagically."
+	einfo " "
+	einfo " 1. Visit http://java.sun.com/products/jdbc/download.html#spec'"
+	einfo " 2. Select 'JDBC(TM) 2.0 Optional Package Binary'"
+	einfo " 3. Download ${stdext_bin}"
+	einfo " 4. Move to ${DISTDIR}"
+	use doc && einfo " 5. Select 'JDBC(TM) 2.0 Optional Package Documentation'"
+	use doc && einfo " 6. Download ${stdext_doc}"
+	use doc && einfo " 7. Move to ${DISTDIR}"
+	einfo
+	einfo " Run emerge on this package again to complete"
+	einfo
+}
+
+src_unpack() { 
+	if use doc; then
+		cd ${S}
+		unzip ${DISTDIR}/${stdext_doc}
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	if use doc; then
+		java-pkg_dohtml -r ${S}/html/
+	fi
+	java-pkg_dojar ${DISTDIR}/${stdext_bin}
+}
+
diff --git a/dev-java/jdbc2-stdext/jdbc2-stdext-2.0.ebuild b/dev-java/jdbc2-stdext/jdbc2-stdext-2.0.ebuild
index 17b83cc0fbbe..2b93e34aaf5e 100644
--- a/dev-java/jdbc2-stdext/jdbc2-stdext-2.0.ebuild
+++ b/dev-java/jdbc2-stdext/jdbc2-stdext-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-stdext/jdbc2-stdext-2.0.ebuild,v 1.6 2004/09/08 13:09:27 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-stdext/jdbc2-stdext-2.0.ebuild,v 1.7 2004/10/20 11:32:45 absinthe Exp $
 
 inherit java-pkg
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://java.sun.com/products/jdbc"
 SRC_URI="jdbc2_0-stdext.jar"
 LICENSE="sun-csl"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 RESTRICT="fetch"