Version bump, bug #236727. Rename the javadoc distfile to 10.2.0.1 which is correct and allows sharing with other versions using it, bug #236725. Both thanks to Chris Gianelloni <wolf31o2@wolf31o2.org>.

(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r4 x86_64)

3 files changed, 136 insertions, 3 deletions

diff --git a/dev-java/jdbc-oracle-bin/ChangeLog b/dev-java/jdbc-oracle-bin/ChangeLog
index 5d4af436f974..1e19009fae30 100644
--- a/dev-java/jdbc-oracle-bin/ChangeLog
+++ b/dev-java/jdbc-oracle-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/jdbc-oracle-bin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-oracle-bin/ChangeLog,v 1.4 2008/07/08 06:00:07 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-oracle-bin/ChangeLog,v 1.5 2008/09/06 13:07:29 caster Exp $
+
+*jdbc-oracle-bin-10.2.0.4 (06 Sep 2008)
+
+  06 Sep 2008; Vlastimil Babka <caster@gentoo.org>
+  jdbc-oracle-bin-10.2.0.3.ebuild, +jdbc-oracle-bin-10.2.0.4.ebuild:
+  Version bump, bug #236727. Rename the javadoc distfile to 10.2.0.1 which
+  is correct and allows sharing with other versions using it, bug #236725.
+  Both thanks to Chris Gianelloni <wolf31o2@wolf31o2.org>.
 
   08 Jul 2008; Christian Faulhammer <opfer@gentoo.org>
   jdbc-oracle-bin-10.2.0.3.ebuild:
diff --git a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild
index ecf3fc6be749..e66da0d92339 100644
--- a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild
+++ b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild,v 1.3 2008/07/08 06:00:07 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild,v 1.4 2008/09/06 13:07:29 caster Exp $
 
 inherit java-pkg-2
 
@@ -19,7 +19,7 @@ file_main="${P}-${file_main_orig}"
 file_main_dms="${P}-${file_main_dms_orig}"
 file_main_debug="${P}-${file_main_debug_orig}"
 file_main_dms_debug="${P}-${file_main_dms_debug_orig}"
-file_doc="${P}-${file_doc_orig}"
+file_doc="${PN}-10.2.0.1-${file_doc_orig}"
 file_demo="${P}-${file_demo_orig}"
 file_nls="${P}-${file_nls_orig}"
 file_ons="${P}-${file_ons_orig}"
diff --git a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.4.ebuild b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.4.ebuild
new file mode 100644
index 000000000000..64615f71005a
--- /dev/null
+++ b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.4.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.4.ebuild,v 1.1 2008/09/06 13:07:29 caster Exp $
+
+inherit java-pkg-2
+
+IUSE="debug dms doc examples nls ons"
+
+file_main_orig="ojdbc14.jar"
+file_main_dms_orig="ojdbc14dms.jar"
+file_main_debug_orig="ojdbc14_g.jar"
+file_main_dms_debug_orig="ojdbc14dms_g.jar"
+file_doc_orig="javadoc.zip"
+file_demo_orig="demo.tar"
+file_nls_orig="orai18n.jar"
+file_ons_orig="ons.jar"
+
+file_main="${P}-${file_main_orig}"
+file_main_dms="${P}-${file_main_dms_orig}"
+file_main_debug="${P}-${file_main_debug_orig}"
+file_main_dms_debug="${P}-${file_main_dms_debug_orig}"
+file_doc="${PN}-10.2.0.1-${file_doc_orig}"
+file_demo="${P}-${file_demo_orig}"
+file_nls="${P}-${file_nls_orig}"
+file_ons="${PN}-10.2.0.3-${file_ons_orig}"
+
+DESCRIPTION="JDBC 3.0 Drivers for Oracle"
+HOMEPAGE="http://www.oracle.com/technology/software/tech/java/sqlj_jdbc/index.html"
+DOWNLOAD_PAGE="http://www.oracle.com/technology/software/tech/java/sqlj_jdbc/htdocs/jdbc_10201.html"
+SRC_URI="
+	!dms? (
+		!debug? ( ${file_main} )
+		debug? ( ${file_main_debug} )
+	)
+	dms? (
+		!debug? ( ${file_main_dms} )
+		debug? ( ${file_main_dms_debug} )
+	)
+	doc? ( ${file_doc} )
+	examples? ( ${file_demo} )
+	nls? ( ${file_nls} )
+	ons? ( ${file_ons} )"
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="oracle-jdbc"
+SLOT="10.2"
+DEPEND="doc? ( app-arch/unzip )"
+RDEPEND=">=virtual/jre-1.4"
+RESTRICT="fetch"
+
+S="${WORKDIR}"
+
+determine_files() {
+	if use dms; then
+		if use debug; then
+			file_main_used=${file_main_dms_debug}
+			file_main_used_orig=${file_main_dms_debug_orig}
+		else
+			file_main_used=${file_main_dms}
+			file_main_used_orig=${file_main_dms_orig}
+		fi
+	else
+		if use debug; then
+			file_main_used=${file_main_debug}
+			file_main_used_orig=${file_main_debug_orig}
+		else
+			file_main_used=${file_main}
+			file_main_used_orig=${file_main_orig}
+		fi
+	fi
+}
+
+pkg_nofetch() {
+	determine_files
+	einfo
+	einfo " Because of license terms and file name conventions, please:"
+	einfo
+	einfo " 1. Visit ${DOWNLOAD_PAGE}"
+	einfo "    (you may need to create an account on Oracle's site)"
+	einfo " 2. Download the appropriate files:"
+	einfo "    - ${file_main_used_orig}"
+	use doc && einfo "    - ${file_doc_orig}"
+	use examples && einfo "    - ${file_demo_orig}"
+	use nls && einfo "    - ${file_nls_orig}"
+	use ons && einfo "    - ${file_ons_orig}"
+	einfo " 3. Rename the files:"
+	einfo "    - ${file_main_used_orig} --> ${file_main_used}"
+	use doc && einfo "    - ${file_doc_orig} --> ${file_doc}"
+	use examples && einfo "    - ${file_demo_orig} --> ${file_demo}"
+	use nls && einfo "    - ${file_nls_orig} --> ${file_nls}"
+	use ons && einfo "    - ${file_ons_orig} --> ${file_ons}"
+	einfo " 4. Place the files in ${DISTDIR}"
+	einfo " 5. Resume the installation."
+	einfo
+}
+
+src_unpack() {
+	determine_files
+	cp "${DISTDIR}/${file_main_used}" ${PN}.jar || die
+
+	if use nls; then
+		cp "${DISTDIR}/${file_nls}" ${file_nls_orig} || die
+	fi
+
+	if use ons; then
+		cp "${DISTDIR}/${file_ons}" ${file_ons_orig} || die
+	fi
+
+	if use doc; then
+		mkdir "${S}/javadoc" && cd "${S}/javadoc"
+		unpack ${file_doc}
+	fi
+
+	if use examples; then
+		cd "${S}"
+		unpack ${file_demo}
+		mv Samples-Readme.txt samples/ || die
+	fi
+}
+
+src_install() {
+	java-pkg_dojar *.jar
+
+	use doc && java-pkg_dojavadoc javadoc
+	use examples && java-pkg_doexamples samples
+}