Version bump

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

13 files changed, 59 insertions, 556 deletions

diff --git a/dev-db/oracle-instantclient-basic/ChangeLog b/dev-db/oracle-instantclient-basic/ChangeLog
index 09c491cec200..68a4d808d46b 100644
--- a/dev-db/oracle-instantclient-basic/ChangeLog
+++ b/dev-db/oracle-instantclient-basic/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/oracle-instantclient-basic
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.41 2010/01/26 19:08:58 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.42 2010/11/12 18:16:24 dertobi123 Exp $
+
+*oracle-instantclient-basic-11.2.0.2 (12 Nov 2010)
+
+  12 Nov 2010; Tobias Scherbaum <dertobi123@gentoo.org>
+  -oracle-instantclient-basic-11.1.0.7.0.ebuild,
+  -oracle-instantclient-basic-11.2.0.0.2-r1.ebuild,
+  -oracle-instantclient-basic-11.2.0.1-r1.ebuild,
+  +oracle-instantclient-basic-11.2.0.2.ebuild:
+  Version bump
 
 *oracle-instantclient-basic-11.2.0.1-r1 (26 Jan 2010)
 *oracle-instantclient-basic-11.2.0.0.2-r1 (26 Jan 2010)
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.1.0.7.0.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.1.0.7.0.ebuild
deleted file mode 100644
index a1333687a8de..000000000000
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.1.0.7.0.ebuild
+++ /dev/null
@@ -1,113 +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-basic/oracle-instantclient-basic-11.1.0.7.0.ebuild,v 1.5 2009/12/31 10:24:17 dertobi123 Exp $
-
-inherit eutils
-
-MY_P_x86="${PN/oracle-/}-linux32-${PV/7.0/7}"
-MY_PSDK_x86="${MY_P_x86/basic/sdk}"
-
-MY_PBASE_amd64="${PN/oracle-instantclient-/}-${PV}-linux-x86_64"
-MY_P_amd64="${PN/oracle-instantclient-/}-${PV/7.0/70}-linux-x86_64"
-MY_PSDK_amd64="${MY_PBASE_amd64/basic/sdk}"
-
-DESCRIPTION="Oracle 11g client installation for Linux with SDK"
-HOMEPAGE="http://www.oracle.com/technology/tech/oci/instantclient/index.html"
-SRC_URI="amd64? ( ${MY_P_amd64}.zip ${MY_PSDK_amd64}.zip )
-		 x86? ( ${MY_P_x86}.zip ${MY_PSDK_x86}.zip )"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="fetch"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/libaio"
-
-S="${WORKDIR}"
-
-my_arch() {
-	MY_P=MY_P_${ARCH}
-	export MY_P=${!MY_P}
-	MY_PSDK=MY_PSDK_${ARCH}
-	export MY_PSDK=${!MY_PSDK}
-}
-
-pkg_setup() {
-	my_arch
-}
-
-pkg_nofetch() {
-	my_arch
-	eerror "Please go to:"
-	eerror "  ${HOMEPAGE}"
-	eerror "select your platform and download the"
-	eerror "Basic client package with SDK, which are:"
-	eerror "  ${MY_P}.zip"
-	eerror "  ${MY_PSDK}.zip"
-	eerror "Then after downloading put them in:"
-	eerror "  ${DISTDIR}"
-}
-
-src_unpack() {
-	unzip "${DISTDIR}"/${MY_P}.zip || die "unsuccesful unzip ${MY_P}.zip"
-	unzip "${DISTDIR}"/${MY_PSDK}.zip || die "unsuccesful unzip ${MY_PSDK}.zip"
-}
-
-src_install() {
-	# SDK makefile
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/rdbms/demo
-	cd "${S}"/instantclient_11_1/sdk/demo
-	mv demo.mk demo_xe.mk
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/rdbms/demo
-	doins demo_xe.mk
-
-	# library
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
-	cd "${S}"/instantclient_11_1
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
-	doins *.jar *.so *.so.11.1
-
-	# fixes symlinks
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so.11.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so.11.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/include /usr/$(get_libdir)/oracle/${PV}/client/rdbms/public
-
-	# includes
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/include
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/include
-	cd "${S}"/instantclient_11_1/sdk/include
-	doins *.h
-	# link to original location
-	dodir /usr/include/oracle/${PV}/
-	ln -s "${D}"/usr/$(get_libdir)/oracle/${PV}/client/include "${D}"/usr/include/oracle/${PV}/client
-
-	# share info
-	cd "${S}"/instantclient_11_1/sdk/demo
-	dodoc *
-
-	# Add OCI libs to library path
-	dodir /etc/env.d
-	echo "ORACLE_HOME=/usr/$(get_libdir)/oracle/${PV}/client" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-	echo "LDPATH=/usr/$(get_libdir)/oracle/${PV}/client/lib" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-	echo "C_INCLUDE_PATH=/usr/$(get_libdir)/oracle/${PV}/client/include" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-	echo "TNS_ADMIN=/etc/oracle/" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-
-	# create path for tnsnames.ora
-	dodir /etc/oracle
-}
-
-pkg_postinst() {
-	elog "The Basic client package for Oracle 11g has been installed."
-	elog "You may also wish to install the oracle-instantclient-jdbc (for"
-	elog "supplemental JDBC functionality with Oracle) and the"
-	elog "oracle-instantclient-sqlplus (for running the SQL*Plus application)"
-	elog "packages as well."
-	elog
-	elog "Examples are located in /usr/share/doc/${PF}/"
-	elog
-	elog "TNS_ADMIN has been set to "${ROOT}"etc/oracle by default, put your"
-	elog "tnsnames.ora there or configure TNS_ADMIN to point to"
-	elog "your user specific configuration."
-}
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.0.2-r1.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.0.2-r1.ebuild
deleted file mode 100644
index 15c5d5163172..000000000000
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.0.2-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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-basic/oracle-instantclient-basic-11.2.0.0.2-r1.ebuild,v 1.1 2010/01/26 19:08:58 dertobi123 Exp $
-
-inherit eutils
-
-MY_PBASE_amd64="${PN/oracle-instantclient-/oracle-instantclient11.2-}-${PV}-1.x86_64"
-MY_P_amd64="${PN/oracle-instantclient-/oracle-instantclient11.2-}-${PV}-1.x86_64"
-MY_PSDK_amd64="${MY_PBASE_amd64/basic/devel}"
-
-DESCRIPTION="Oracle 11g client installation for Linux with SDK"
-HOMEPAGE="http://www.oracle.com/technology/tech/oci/instantclient/index.html"
-SRC_URI="amd64? ( ${MY_P_amd64}.zip ${MY_PSDK_amd64}.zip )"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-RESTRICT="fetch"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/libaio"
-
-S="${WORKDIR}"
-
-my_arch() {
-	MY_P=MY_P_${ARCH}
-	export MY_P=${!MY_P}
-	MY_PSDK=MY_PSDK_${ARCH}
-	export MY_PSDK=${!MY_PSDK}
-}
-
-pkg_setup() {
-	my_arch
-}
-
-pkg_nofetch() {
-	my_arch
-	eerror "Please go to:"
-	eerror "  ${HOMEPAGE}"
-	eerror "select your platform and download the"
-	eerror "Basic client package with SDK, which are:"
-	eerror "  ${MY_P}.zip"
-	eerror "  ${MY_PSDK}.zip"
-	eerror "Then after downloading put them in:"
-	eerror "  ${DISTDIR}"
-}
-
-src_unpack() {
-	unzip "${DISTDIR}"/${MY_P}.zip || die "unsuccesful unzip ${MY_P}.zip"
-	unzip "${DISTDIR}"/${MY_PSDK}.zip || die "unsuccesful unzip ${MY_PSDK}.zip"
-}
-
-src_install() {
-	# SDK makefile
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/rdbms/demo
-	cd "${S}"/instantclient_11_2/sdk/demo
-	mv demo.mk demo_xe.mk
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/rdbms/demo
-	doins demo_xe.mk
-
-	# library
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
-	cd "${S}"/instantclient_11_2
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
-	doins *.jar *.so *.so.11.1
-
-	# fixes symlinks
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so.11.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so.11.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/include /usr/$(get_libdir)/oracle/${PV}/client/rdbms/public
-
-	# includes
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/include
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/include
-	cd "${S}"/instantclient_11_2/sdk/include
-	# Remove ldap.h, #299562
-	rm ldap.h || die "rm failed"
-	doins *.h
-	# link to original location
-	dodir /usr/include/oracle/${PV}/
-	ln -s "${D}"/usr/$(get_libdir)/oracle/${PV}/client/include "${D}"/usr/include/oracle/${PV}/client
-
-	# share info
-	cd "${S}"/instantclient_11_2/sdk/demo
-	dodoc *
-
-	# Add OCI libs to library path
-	dodir /etc/env.d
-	echo "ORACLE_HOME=/usr/$(get_libdir)/oracle/${PV}/client" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-	echo "LDPATH=/usr/$(get_libdir)/oracle/${PV}/client/lib" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-	echo "C_INCLUDE_PATH=/usr/$(get_libdir)/oracle/${PV}/client/include" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-	echo "TNS_ADMIN=/etc/oracle/" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-
-	# create path for tnsnames.ora
-	dodir /etc/oracle
-}
-
-pkg_postinst() {
-	elog "The Basic client package for Oracle 11g has been installed."
-	elog "You may also wish to install the oracle-instantclient-jdbc (for"
-	elog "supplemental JDBC functionality with Oracle) and the"
-	elog "oracle-instantclient-sqlplus (for running the SQL*Plus application)"
-	elog "packages as well."
-	elog
-	elog "Examples are located in /usr/share/doc/${PF}/"
-	elog
-	elog "TNS_ADMIN has been set to "${ROOT}"etc/oracle by default, put your"
-	elog "tnsnames.ora there or configure TNS_ADMIN to point to"
-	elog "your user specific configuration."
-}
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.1-r1.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.2.ebuild
index f817d7d3d81e..9b62a6453a80 100644
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.1-r1.ebuild
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.2.ebuild
@@ -1,19 +1,24 @@
 # 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-basic/oracle-instantclient-basic-11.2.0.1-r1.ebuild,v 1.1 2010/01/26 19:08:58 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.2.ebuild,v 1.1 2010/11/12 18:16:24 dertobi123 Exp $
 
 inherit eutils
 
-MY_P_x86="${PN/oracle-/}-linux32-${PV}"
+MY_P_x86="${PN/oracle-/}-linux32-${PV}.0"
 MY_PSDK_x86="${MY_P_x86/basic/sdk}"
 
+MY_PBASE_amd64="${PN/oracle-instantclient-basic/instantclient-basic-linux}-x86-64-${PV}.0"
+MY_P_amd64="${PN/oracle-instantclient-basic/instantclient-basic-linux}-x86-64-${PV}.0"
+MY_PSDK_amd64="${MY_PBASE_amd64/basic/sdk}"
+
 DESCRIPTION="Oracle 11g client installation for Linux with SDK"
-HOMEPAGE="http://www.oracle.com/technology/tech/oci/instantclient/index.html"
-SRC_URI="x86? ( ${MY_P_x86}.zip ${MY_PSDK_x86}.zip )"
+HOMEPAGE="http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html"
+SRC_URI="x86? ( ${MY_P_x86}.zip ${MY_PSDK_x86}.zip )
+		 amd64? ( ${MY_P_amd64}.zip ${MY_PSDK_amd64}.zip )"
 
 LICENSE="OTN"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* ~x86 ~amd64"
 RESTRICT="fetch"
 IUSE=""
 
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=""
 
diff --git a/dev-db/oracle-instantclient-sqlplus/ChangeLog b/dev-db/oracle-instantclient-sqlplus/ChangeLog
index 96bd2a4603c5..0492fc0aba1c 100644
--- a/dev-db/oracle-instantclient-sqlplus/ChangeLog
+++ b/dev-db/oracle-instantclient-sqlplus/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-db/oracle-instantclient-sqlplus
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/ChangeLog,v 1.27 2009/12/31 10:41:57 dertobi123 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/ChangeLog,v 1.28 2010/11/12 18:19:42 dertobi123 Exp $
+
+*oracle-instantclient-sqlplus-11.2.0.2 (12 Nov 2010)
+
+  12 Nov 2010; Tobias Scherbaum <dertobi123@gentoo.org>
+  -oracle-instantclient-sqlplus-10.2.0.3-r1.ebuild,
+  -oracle-instantclient-sqlplus-11.1.0.7.0-r1.ebuild,
+  -oracle-instantclient-sqlplus-11.2.0.0.2.ebuild,
+  -oracle-instantclient-sqlplus-11.2.0.1.ebuild,
+  +oracle-instantclient-sqlplus-11.2.0.2.ebuild:
+  Version bump
 
 *oracle-instantclient-sqlplus-11.2.0.1 (31 Dec 2009)
 *oracle-instantclient-sqlplus-11.2.0.0.2 (31 Dec 2009)
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.3-r1.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.3-r1.ebuild
deleted file mode 100644
index 16df5ce1be15..000000000000
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.3-r1.ebuild
+++ /dev/null
@@ -1,71 +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-sqlplus/oracle-instantclient-sqlplus-10.2.0.3-r1.ebuild,v 1.2 2009/05/05 23:34:59 mr_bones_ Exp $
-
-inherit eutils
-
-MY_P_x86="${PN/oracle-/}-linux32-${PV}-20061115"
-MY_P_amd64="${PN/oracle-/}-linux-x86-64-${PV}-20070103"
-
-S=${WORKDIR}
-DESCRIPTION="Oracle 10g client installation for Linux: SQL*Plus"
-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 "select your platform and download the"
-	eerror "SQL*Plus 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_10_2
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
-	doins libsqlplus.so libsqlplusic.so
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/sqlplus/admin/
-	doins glogin.sql
-
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/bin
-	cd "${S}"/instantclient_10_2
-	exeinto /usr/$(get_libdir)/oracle/${PV}/client/bin
-	doexe sqlplus
-
-	dodir /usr/bin
-	dosym "${D}"/usr/$(get_libdir)/oracle/${PV}/client/bin/sqlplus /usr/bin/sqlplus
-}
-
-pkg_postinst() {
-	elog "The SQL*Plus package for Oracle 10g has been installed."
-	elog "You may wish to install the oracle-instantclient-jdbc (for"
-	elog "the supplemental JDBC functionality) package as well."
-	elog
-	elog "If you have any questions, be sure to read the README:"
-	elog "http://otn.oracle.com/docs/tech/sql_plus/10102/readme_ic.htm"
-	elog
-	elog "oracle-instantclient-* packages aren't installed in different"
-	elog "SLOTs any longer. You may want to uninstall older versions."
-}
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.1.0.7.0-r1.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.1.0.7.0-r1.ebuild
deleted file mode 100644
index 1608b673c0f8..000000000000
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.1.0.7.0-r1.ebuild
+++ /dev/null
@@ -1,68 +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-sqlplus/oracle-instantclient-sqlplus-11.1.0.7.0-r1.ebuild,v 1.1 2009/05/04 17:00:05 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: SQL*Plus"
-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 "select your platform and download the"
-	eerror "SQL*Plus 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 libsqlplus.so libsqlplusic.so
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/sqlplus/admin/
-	doins glogin.sql
-
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/bin
-	cd "${S}"/instantclient_11_1
-	exeinto /usr/$(get_libdir)/oracle/${PV}/client/bin
-	doexe sqlplus
-
-	dodir /usr/bin
-	dosym "${D}"/usr/$(get_libdir)/oracle/${PV}/client/bin/sqlplus /usr/bin/sqlplus
-}
-
-pkg_postinst() {
-	elog "The SQL*Plus package for Oracle 11g has been installed."
-	elog "You may wish to install the oracle-instantclient-jdbc (for"
-	elog "the supplemental JDBC functionality) package as well."
-	elog
-	elog "If you have any questions, be sure to read the README:"
-	elog "http://otn.oracle.com/docs/tech/sql_plus/10102/readme_ic.htm"
-}
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.1.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.1.ebuild
deleted file mode 100644
index d1b38d6a799f..000000000000
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.1.ebuild
+++ /dev/null
@@ -1,66 +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-sqlplus/oracle-instantclient-sqlplus-11.2.0.1.ebuild,v 1.1 2009/12/31 10:41:57 dertobi123 Exp $
-
-inherit eutils
-
-MY_P_x86="${PN/oracle-/}-linux32-${PV}"
-
-S="${WORKDIR}"
-DESCRIPTION="Oracle 11g client installation for Linux: SQL*Plus"
-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 "select your platform and download the"
-	eerror "SQL*Plus 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 libsqlplus.so libsqlplusic.so
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/sqlplus/admin/
-	doins glogin.sql
-
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/bin
-	cd "${S}"/instantclient_11_2
-	exeinto /usr/$(get_libdir)/oracle/${PV}/client/bin
-	doexe sqlplus
-
-	dodir /usr/bin
-	dosym "${D}"/usr/$(get_libdir)/oracle/${PV}/client/bin/sqlplus /usr/bin/sqlplus
-}
-
-pkg_postinst() {
-	elog "The SQL*Plus package for Oracle 11g has been installed."
-	elog "You may wish to install the oracle-instantclient-jdbc (for"
-	elog "the supplemental JDBC functionality) package as well."
-	elog
-	elog "If you have any questions, be sure to read the README:"
-	elog "http://otn.oracle.com/docs/tech/sql_plus/10102/readme_ic.htm"
-}
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.0.2.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.2.ebuild
index 0c5dcccbf2c0..ee15d0b54698 100644
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.0.2.ebuild
+++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.2.ebuild
@@ -1,19 +1,21 @@
-# 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-sqlplus/oracle-instantclient-sqlplus-11.2.0.0.2.ebuild,v 1.1 2009/12/31 10:41:57 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.2.ebuild,v 1.1 2010/11/12 18:19:42 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: SQL*Plus"
 HOMEPAGE="http://www.oracle.com/technology/tech/oci/instantclient/index.html"
-SRC_URI="amd64? ( ${MY_P_amd64}.zip )"
+SRC_URI="x86? ( ${MY_P_x86}.zip )
+         amd64? ( ${MY_P_amd64}.zip )"
 
 LICENSE="OTN"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="~x86 ~amd64"
 RESTRICT="fetch"
 IUSE=""