[gentoo-commits] gentoo-x86 commit in dev-java/jdbc-oracle-bin: ChangeLog jdbc-oracle-bin-10.2.0.3.ebuild jdbc-oracle-bin-10.2.0.4.ebuild

[Vlastimil Babka (caster)]

caster      08/09/06 13:07:29

  Modified:             ChangeLog jdbc-oracle-bin-10.2.0.3.ebuild
  Added:                jdbc-oracle-bin-10.2.0.4.ebuild
  Log:
  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@××××××××.org>.
  (Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r4 x86_64)

Revision  Changes    Path
1.5                  dev-java/jdbc-oracle-bin/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-oracle-bin/ChangeLog?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-oracle-bin/ChangeLog?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-oracle-bin/ChangeLog?r1=1.4&r2=1.5

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jdbc-oracle-bin/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChangeLog	8 Jul 2008 06:00:07 -0000	1.4
+++ ChangeLog	6 Sep 2008 13:07:29 -0000	1.5
@@ -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@g.o>
+  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@××××××××.org>.
 
   08 Jul 2008; Christian Faulhammer <opfer@g.o>
   jdbc-oracle-bin-10.2.0.3.ebuild:



1.4                  dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild?r1=1.3&r2=1.4

Index: jdbc-oracle-bin-10.2.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jdbc-oracle-bin-10.2.0.3.ebuild	8 Jul 2008 06:00:07 -0000	1.3
+++ jdbc-oracle-bin-10.2.0.3.ebuild	6 Sep 2008 13:07:29 -0000	1.4
@@ -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_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}"



1.1                  dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.4.ebuild?rev=1.1&content-type=text/plain

Index: jdbc-oracle-bin-10.2.0.4.ebuild
===================================================================
# 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
}