Version bump, fix #128901. Also added a dependency to a new eselect module to easily switch between Instantclient versions

(Portage version: 2.1_pre7-r4)

4 files changed, 115 insertions, 1 deletions

diff --git a/dev-db/oracle-instantclient-basic/ChangeLog b/dev-db/oracle-instantclient-basic/ChangeLog
index 7c7b6b5a6747..9f1fad5768d8 100644
--- a/dev-db/oracle-instantclient-basic/ChangeLog
+++ b/dev-db/oracle-instantclient-basic/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/oracle-instantclient-basic
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.12 2006/02/13 18:30:52 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.13 2006/04/05 18:56:49 dertobi123 Exp $
+
+*oracle-instantclient-basic-10.2.0.2 (05 Apr 2006)
+
+  05 Apr 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  +oracle-instantclient-basic-10.2.0.2.ebuild:
+  Version bump, fix #128901.
+  Also added a dependency to a new eselect module to easily switch
+  between Instantclient versions
 
   13 Feb 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   oracle-instantclient-basic-10.2.0.1-r1.ebuild:
diff --git a/dev-db/oracle-instantclient-basic/Manifest b/dev-db/oracle-instantclient-basic/Manifest
index 14bf45b6a5eb..17eb6ab1d376 100644
--- a/dev-db/oracle-instantclient-basic/Manifest
+++ b/dev-db/oracle-instantclient-basic/Manifest
@@ -19,6 +19,9 @@ SHA256 3497fdb5b55873bec9a42fcf4f5867cde4871596ead2ff6218d3c153b251b0f3 files/di
 MD5 cb932d397759caa001943bf54d0391f1 files/digest-oracle-instantclient-basic-10.2.0.1-r1 386
 RMD160 2b35184efd593b8b8d37dc21234185b9d0fd022d files/digest-oracle-instantclient-basic-10.2.0.1-r1 386
 SHA256 c6fe225ef7615cf01cd047729e30a53c578e76eee69db2d77d714fdeb9ec3f68 files/digest-oracle-instantclient-basic-10.2.0.1-r1 386
+MD5 f3e8ef76103b2082d71d869aa85ba05d files/digest-oracle-instantclient-basic-10.2.0.2 1342
+RMD160 1a9c106ec6b5a164cd7c8d7a94b969c6b7eb378f files/digest-oracle-instantclient-basic-10.2.0.2 1342
+SHA256 b5e5623109880d8db00848dd831fa007d148258659a9a7fd84185281a4e102f5 files/digest-oracle-instantclient-basic-10.2.0.2 1342
 MD5 9f5d6b0af6c2271c1e2bbf0518bcc925 metadata.xml 388
 RMD160 f12fead3733f8a2760b2f190bcadd9a810e4bbc1 metadata.xml 388
 SHA256 fa323e9829505e837ae433af3b0ce5e7b97e1aef0ec614baa6c6ba4602def893 metadata.xml 388
@@ -40,3 +43,6 @@ SHA256 fcd074cd9469c355f30ec9c76a8d9437884564b30c04a88fe18d5010d09fd09a oracle-i
 MD5 c199aa62820ed740c2a5392fb8844cd4 oracle-instantclient-basic-10.2.0.1.ebuild 2678
 RMD160 a2323b64b7908b954dafa28118426e7c67479d9b oracle-instantclient-basic-10.2.0.1.ebuild 2678
 SHA256 a3fb625cee8569ac4403f010dfd5630fce72a42f54caa228c87da3e733466a13 oracle-instantclient-basic-10.2.0.1.ebuild 2678
+MD5 159a25f87ac5a90eb90917e8dbb464df oracle-instantclient-basic-10.2.0.2.ebuild 2794
+RMD160 ef7e39f994c8e24ec4c102d4c79cf02ea317eded oracle-instantclient-basic-10.2.0.2.ebuild 2794
+SHA256 1e293fc9adaba7314b263164f0b86dfc45d6980fe62ed5604b11226daee9f750 oracle-instantclient-basic-10.2.0.2.ebuild 2794
diff --git a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.2 b/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.2
new file mode 100644
index 000000000000..8bfb4b04ef94
--- /dev/null
+++ b/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.2
@@ -0,0 +1,12 @@
+MD5 9381ed2118b184fecf3ff3c727b7f4d2 instantclient-basic-linux-x86-64-10.2.0.2-20060228.zip 35625985
+RMD160 a52a82c9bc831e1e5a0d9af899748ab44171bc84 instantclient-basic-linux-x86-64-10.2.0.2-20060228.zip 35625985
+SHA256 e3894c1e15de6e9e1fd3893c453cdfb23e89b1e9ad3ca90af3c4703a5e01cadc instantclient-basic-linux-x86-64-10.2.0.2-20060228.zip 35625985
+MD5 5fabaa099cd37c13e4fe1a8bc78a62ff instantclient-basic-linux32-10.2.0.2-20060331.zip 33901074
+RMD160 26f3c7a64bfb3b747b0cb454ea322d97954cb5fb instantclient-basic-linux32-10.2.0.2-20060331.zip 33901074
+SHA256 ab1d0d0cf3222788ff8add4a1154d2750487c61e64879af68f7ee538ba641ab2 instantclient-basic-linux32-10.2.0.2-20060331.zip 33901074
+MD5 69e00f9660db93b34f056e2ab31ca05a instantclient-sdk-linux-x86-64-10.2.0.2-20060228.zip 602431
+RMD160 7dc30ab322e743fa672d37fbd25fd46dee465456 instantclient-sdk-linux-x86-64-10.2.0.2-20060228.zip 602431
+SHA256 97de88f06154a197e4013c9a2765a71d50a83d67eca67d933670ef603d27e1df instantclient-sdk-linux-x86-64-10.2.0.2-20060228.zip 602431
+MD5 3f07a45a7f9d50ff4f453e31edef560b instantclient-sdk-linux32-10.2.0.2-20060331.zip 602224
+RMD160 99e622d2e09ed04ccefa343f2bc695dc1da89de6 instantclient-sdk-linux32-10.2.0.2-20060331.zip 602224
+SHA256 8e734c69deaa10be51e3839d7a64e57fd5952703b66cdf5681715bbe147f1ff7 instantclient-sdk-linux32-10.2.0.2-20060331.zip 602224
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.2.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.2.ebuild
new file mode 100644
index 000000000000..85f7f207dfb0
--- /dev/null
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2006 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-10.2.0.2.ebuild,v 1.1 2006/04/05 18:56:49 dertobi123 Exp $
+
+inherit eutils
+
+MY_P_x86="${PN/oracle-/}-linux32-${PV}-20060331"
+MY_PSDK_x86="${MY_P_x86/basic/sdk}"
+
+MY_P_amd64="${PN/oracle-/}-linux-x86-64-${PV}-20060228"
+MY_PSDK_amd64="${MY_P_amd64/basic/sdk}"
+
+S=${WORKDIR}
+DESCRIPTION="Oracle 10g client installation for Linux with SDK"
+HOMEPAGE="http://otn.oracle.com/software/tech/oci/instantclient/htdocs/linuxsoft.html"
+SRC_URI="x86? ( ${MY_P_x86}.zip ${MY_PSDK_x86}.zip )
+		 amd64? ( ${MY_P_amd64}.zip ${MY_PSDK_amd64}.zip )"
+
+LICENSE="OTN"
+SLOT="${PV}"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="fetch"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND="|| ( =sys-libs/libstdc++-v3-3.3* =sys-devel/gcc-3.3* )
+	app-admin/eselect-oracle"
+
+pkg_setup() {
+	MY_P=MY_P_${ARCH}
+	export MY_P=${!MY_P}
+	MY_PSDK=MY_PSDK_${ARCH}
+	export MY_PSDK=${!MY_PSDK}
+}
+
+pkg_nofetch() {
+	eerror "Please go to:"
+	eerror "  ${HOMEPAGE}"
+	eerror "and download the 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() {
+	# library
+	dodir /usr/lib/oracle/${PV}/client/lib
+	cd ${S}/instantclient_10_2
+	insinto /usr/lib/oracle/${PV}/client/lib
+	doins *.jar *.so *.so.10.1
+
+	# fixes symlinks
+	dosym /usr/lib/oracle/${PV}/client/lib/libocci.so.10.1 /usr/lib/oracle/${PV}/client/lib/libocci.so
+	dosym /usr/lib/oracle/${PV}/client/lib/libclntsh.so.10.1 /usr/lib/oracle/${PV}/client/lib/libclntsh.so
+
+	# includes
+	dodir /usr/lib/oracle/${PV}/client/include
+	insinto /usr/lib/oracle/${PV}/client/include
+	cd ${S}/instantclient_10_2/sdk/include
+	doins *.h
+	# link to original location
+	dodir /usr/include/oracle/${PV}/
+	ln -s ${D}/usr/lib/oracle/${PV}/client/include ${D}/usr/include/oracle/${PV}/client
+
+	# share info
+	cd ${S}/instantclient_10_2/sdk/demo
+	dodoc *
+}
+
+pkg_postinst() {
+	einfo "The Basic client page for Oracle 10g has been installed."
+	einfo "You may also wish to install the oracle-instantclient-jdbc (for"
+	einfo "supplemental JDBC functionality with Oracle) and the"
+	einfo "oracle-instantclient-sqlplus (for running the SQL*Plus application)"
+	einfo "packages as well."
+	einfo
+	einfo "Examples are located in /usr/share/doc/${PF}/"
+	einfo
+	ewarn "A new eselect module has been added to easily switch between"
+	ewarn "different Instantclient versions and to set your ORACLE_HOME"
+	ewarn "See 'eselect oracle help' for reference"
+}