Version bump

(Portage version: 2.1.9.24/cvs/Linux x86_64)

4 files changed, 20 insertions, 114 deletions

diff --git a/dev-db/oracle-instantclient-jdbc/ChangeLog b/dev-db/oracle-instantclient-jdbc/ChangeLog
index 9c0ac625a353..c09ad3059655 100644
--- a/dev-db/oracle-instantclient-jdbc/ChangeLog
+++ b/dev-db/oracle-instantclient-jdbc/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/oracle-instantclient-jdbc
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/ChangeLog,v 1.26 2009/12/31 10:45:09 dertobi123 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/ChangeLog,v 1.27 2010/11/12 18:17:49 dertobi123 Exp $
+
+*oracle-instantclient-jdbc-11.2.0.2 (12 Nov 2010)
+
+  12 Nov 2010; Tobias Scherbaum <dertobi123@gentoo.org>
+  -oracle-instantclient-jdbc-11.1.0.7.0.ebuild,
+  -oracle-instantclient-jdbc-11.2.0.0.2.ebuild,
+  -oracle-instantclient-jdbc-11.2.0.1.ebuild,
+  +oracle-instantclient-jdbc-11.2.0.2.ebuild:
+  Version bump
 
 *oracle-instantclient-jdbc-11.2.0.1 (31 Dec 2009)
 *oracle-instantclient-jdbc-11.2.0.0.2 (31 Dec 2009)
diff --git a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.1.0.7.0.ebuild b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.1.0.7.0.ebuild
deleted file mode 100644
index 0d66d34d8a44..000000000000
--- a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.1.0.7.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.1.0.7.0.ebuild,v 1.2 2008/12/31 09:09:16 dertobi123 Exp $
-
-inherit eutils
-
-MY_P_x86="${PN/oracle-/}-linux32-${PV/7.0/7}"
-MY_P_amd64="${PN/oracle-instantclient-/}-${PV}-linux-x86_64"
-
-S="${WORKDIR}"
-DESCRIPTION="Oracle 11g client installation for Linux: JDBC supplement"
-HOMEPAGE="http://www.oracle.com/technology/tech/oci/instantclient/index.html"
-SRC_URI="amd64? ( ${MY_P_amd64}.zip )
-		 x86? ( ${MY_P_x86}.zip )"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="fetch"
-IUSE=""
-
-RDEPEND=">=dev-db/oracle-instantclient-basic-${PV}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-pkg_setup() {
-	MY_P=MY_P_${ARCH}
-	export MY_P=${!MY_P}
-}
-
-pkg_nofetch() {
-	eerror "Please go to:"
-	eerror "  ${HOMEPAGE}"
-	eerror "and download the JDBC supplemental package.  Put it in:"
-	eerror "  ${DISTDIR}"
-	eerror "after downloading it."
-}
-
-src_unpack() {
-	unzip "${DISTDIR}"/${MY_P}.zip
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
-	cd "${S}"/instantclient_11_1
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
-	doins libheteroxa11.so orai18n.jar
-}
-
-pkg_postinst() {
-	elog "The JDBC supplement package for Oracle 11g has been installed."
-	elog "You may wish to install the oracle-instantclient-sqlplus (for "
-	elog "running the SQL*Plus application) package as well."
-}
diff --git a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.1.ebuild b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.1.ebuild
deleted file mode 100644
index 8d3217a53d20..000000000000
--- a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.1.ebuild,v 1.1 2009/12/31 10:45:09 dertobi123 Exp $
-
-inherit eutils
-
-MY_P_x86="${PN/oracle-/}-linux32-${PV}"
-
-S="${WORKDIR}"
-DESCRIPTION="Oracle 11g client installation for Linux: JDBC supplement"
-HOMEPAGE="http://www.oracle.com/technology/tech/oci/instantclient/index.html"
-SRC_URI="x86? ( ${MY_P_x86}.zip )"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="-* ~x86"
-RESTRICT="fetch"
-IUSE=""
-
-RDEPEND=">=dev-db/oracle-instantclient-basic-${PV}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-pkg_setup() {
-	MY_P=MY_P_${ARCH}
-	export MY_P=${!MY_P}
-}
-
-pkg_nofetch() {
-	eerror "Please go to:"
-	eerror "  ${HOMEPAGE}"
-	eerror "and download the JDBC supplemental package.  Put it in:"
-	eerror "  ${DISTDIR}"
-	eerror "after downloading it."
-}
-
-src_unpack() {
-	unzip "${DISTDIR}"/${MY_P}.zip
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
-	cd "${S}"/instantclient_11_2
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
-	doins libheteroxa11.so orai18n.jar
-}
-
-pkg_postinst() {
-	elog "The JDBC supplement package for Oracle 11g has been installed."
-	elog "You may wish to install the oracle-instantclient-sqlplus (for "
-	elog "running the SQL*Plus application) package as well."
-}
diff --git a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.0.2.ebuild b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.2.ebuild
index 2ce11d534950..8fa2aff32ca8 100644
--- a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.0.2.ebuild
+++ b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.2.ebuild
@@ -1,19 +1,22 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.0.2.ebuild,v 1.1 2009/12/31 10:45:09 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.2.ebuild,v 1.1 2010/11/12 18:17:49 dertobi123 Exp $
 
 inherit eutils
 
-MY_P_amd64="${PN/oracle-instantclient-/oracle-instantclient11.2-}-${PV}-1.x86_64"
+MY_P_x86="${PN/oracle-/}-linux32-${PV}.0"
+MY_P_amd64="${PN/oracle-instantclient-/instantclient-}-linux-x86-64-${PV}.0"
+
 
 S="${WORKDIR}"
 DESCRIPTION="Oracle 11g client installation for Linux: JDBC supplement"
-HOMEPAGE="http://www.oracle.com/technology/tech/oci/instantclient/index.html"
-SRC_URI="amd64? ( ${MY_P_amd64}.zip )"
+HOMEPAGE="http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html"
+SRC_URI="x86? ( ${MY_P_x86}.zip )
+		amd64? ( ${MY_P_amd64}.zip )"
 
 LICENSE="OTN"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="~x86 ~amd64"
 RESTRICT="fetch"
 IUSE=""