based on Gustavo Michels work, i did version bump which closes bug #96289

Package-Manager: portage-2.0.51.22-r1

12 files changed, 220 insertions, 13 deletions

diff --git a/dev-db/oracle-instantclient-basic/ChangeLog b/dev-db/oracle-instantclient-basic/ChangeLog
index 6c4f7eef412f..10c8be3411fa 100644
--- a/dev-db/oracle-instantclient-basic/ChangeLog
+++ b/dev-db/oracle-instantclient-basic/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/oracle-instantclient-basic
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.6 2005/01/01 17:39:11 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.7 2005/06/21 19:39:07 radek Exp $
+
+*oracle-instantclient-basic-10.1.0.4 (21 Jun 2005)
+
+  21 Jun 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +oracle-instantclient-basic-10.1.0.4.ebuild:
+  based on Gustavo Michels work, i did version bump which closes bug #96289
 
 *oracle-instantclient-basic-10.1.0.3 (22 Dec 2004)
 
diff --git a/dev-db/oracle-instantclient-basic/Manifest b/dev-db/oracle-instantclient-basic/Manifest
index 53f943c93dc5..01c6a4012ba6 100644
--- a/dev-db/oracle-instantclient-basic/Manifest
+++ b/dev-db/oracle-instantclient-basic/Manifest
@@ -1,8 +1,10 @@
+MD5 0b4fa5db61c7b3402a11399ed2eb0626 oracle-instantclient-basic-10.1.0.3.ebuild 2854
+MD5 203d67d121be57d7114503d35119cdca oracle-instantclient-basic-10.1.0.2_p1-r1.ebuild 1540
+MD5 591903ac6de2ddeb801c25e1c7d68196 oracle-instantclient-basic-10.1.0.4.ebuild 2546
+MD5 ec0dd84ca69c522cdd056f7366f33f36 oracle-instantclient-basic-10.1.0.2_p1.ebuild 1388
 MD5 67d1055275646fb77dce4cd68792c32e ChangeLog 1457
 MD5 396aa9401cdf515a0d3c7fbf9c3e6d3a metadata.xml 351
-MD5 ec0dd84ca69c522cdd056f7366f33f36 oracle-instantclient-basic-10.1.0.2_p1.ebuild 1388
-MD5 203d67d121be57d7114503d35119cdca oracle-instantclient-basic-10.1.0.2_p1-r1.ebuild 1540
-MD5 0b4fa5db61c7b3402a11399ed2eb0626 oracle-instantclient-basic-10.1.0.3.ebuild 2854
-MD5 8531dff3174726242a9e9de77be6b595 files/digest-oracle-instantclient-basic-10.1.0.2_p1-r1 93
-MD5 8531dff3174726242a9e9de77be6b595 files/digest-oracle-instantclient-basic-10.1.0.2_p1 93
 MD5 f34650dcfa5ddf5d3957f0c39dfd2978 files/digest-oracle-instantclient-basic-10.1.0.3 184
+MD5 2ae2e545ecb4e26117f7872200b0e95f files/digest-oracle-instantclient-basic-10.1.0.4 188
+MD5 8531dff3174726242a9e9de77be6b595 files/digest-oracle-instantclient-basic-10.1.0.2_p1 93
+MD5 8531dff3174726242a9e9de77be6b595 files/digest-oracle-instantclient-basic-10.1.0.2_p1-r1 93
diff --git a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.1.0.4 b/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.1.0.4
new file mode 100644
index 000000000000..c160a7aa9ccf
--- /dev/null
+++ b/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.1.0.4
@@ -0,0 +1,2 @@
+MD5 6b72008ceeac068967484b989b47efa7 instantclient-basic-linux32-10.1.0.4-20050525.zip 29879923
+MD5 d0f3769faff09596ce21326c34419bd6 instantclient-sdk-linux32-10.1.0.4-20050525.zip 294567
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.4.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.4.ebuild
new file mode 100644
index 000000000000..fa45ee2d19d9
--- /dev/null
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2005 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.1.0.4.ebuild,v 1.1 2005/06/21 19:39:07 radek Exp $
+
+inherit eutils
+
+MY_P="${PN/oracle-/}-linux32-${PV}-20050525"
+MY_PSDK="${MY_P/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="${MY_P}.zip ${MY_PSDK}.zip"
+
+LICENSE="OTN"
+SLOT="${KV}"
+KEYWORDS="~x86"
+RESTRICT="fetch"
+IUSE=""
+
+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
+	unzip ${DISTDIR}/${MY_PSDK}.zip
+}
+
+src_install() {
+	# library
+	dodir /usr/lib/oracle/${PV}/client/lib
+	cd ${S}/instantclient10_1
+	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}/instantclient10_1/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}/instantclient10_1/sdk/demo
+	dodoc *
+
+	# Add OCI libs to library path
+	dodir /etc/env.d
+	echo "ORACLE_HOME=/usr/lib/oracle/${PV}/client" >> ${D}/etc/env.d/50oracle-instantclient-basic
+	echo "LDPATH=/usr/lib/oracle/${PV}/client/lib" >> ${D}/etc/env.d/50oracle-instantclient-basic
+	echo "C_INCLUDE_PATH=/usr/lib/oracle/${PV}/client/include" >> ${D}/etc/env.d/50oracle-instantclient-basic
+
+}
+
+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 "ORACLE_HOME (and others) are set in /etc/env.d/50oracle-instantclient-basic"
+}
diff --git a/dev-db/oracle-instantclient-jdbc/ChangeLog b/dev-db/oracle-instantclient-jdbc/ChangeLog
index 840bf8e20f96..708362e0c124 100644
--- a/dev-db/oracle-instantclient-jdbc/ChangeLog
+++ b/dev-db/oracle-instantclient-jdbc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/oracle-instantclient-jdbc
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/ChangeLog,v 1.5 2005/01/01 17:39:25 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/ChangeLog,v 1.6 2005/06/21 19:41:24 radek Exp $
+
+*oracle-instantclient-jdbc-10.1.0.4 (21 Jun 2005)
+
+  21 Jun 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +oracle-instantclient-jdbc-10.1.0.4.ebuild:
+  based on Gustavo Michels work, i did version bump which closes bug #96289
 
 *oracle-instantclient-jdbc-10.1.0.3 (21 Dec 2004)
 
diff --git a/dev-db/oracle-instantclient-jdbc/Manifest b/dev-db/oracle-instantclient-jdbc/Manifest
index b97eea98c5d8..ffb9d8fdab1f 100644
--- a/dev-db/oracle-instantclient-jdbc/Manifest
+++ b/dev-db/oracle-instantclient-jdbc/Manifest
@@ -1,6 +1,8 @@
-MD5 07a16af8dbaebb92ad50c0e626254607 ChangeLog 1035
-MD5 396aa9401cdf515a0d3c7fbf9c3e6d3a metadata.xml 351
+MD5 d0c29502c72b61d2f21bae53af8bc359 oracle-instantclient-jdbc-10.1.0.4.ebuild 1273
 MD5 f6fd68779ad5a0533253db89d8236312 oracle-instantclient-jdbc-10.1.0.2_p2.ebuild 1376
 MD5 c1e2ee3cc253ee357784775da7cd5034 oracle-instantclient-jdbc-10.1.0.3.ebuild 1321
+MD5 07a16af8dbaebb92ad50c0e626254607 ChangeLog 1035
+MD5 396aa9401cdf515a0d3c7fbf9c3e6d3a metadata.xml 351
 MD5 71cef383c61956b0de73640fc392cc06 files/digest-oracle-instantclient-jdbc-10.1.0.3 91
+MD5 4c6dbc856c5695a71b9062919c35e3dc files/digest-oracle-instantclient-jdbc-10.1.0.4 94
 MD5 7d3e4c7886b1d1ff429ea98a8182faca files/digest-oracle-instantclient-jdbc-10.1.0.2_p2 91
diff --git a/dev-db/oracle-instantclient-jdbc/files/digest-oracle-instantclient-jdbc-10.1.0.4 b/dev-db/oracle-instantclient-jdbc/files/digest-oracle-instantclient-jdbc-10.1.0.4
new file mode 100644
index 000000000000..8dc0c0e3a3cb
--- /dev/null
+++ b/dev-db/oracle-instantclient-jdbc/files/digest-oracle-instantclient-jdbc-10.1.0.4
@@ -0,0 +1 @@
+MD5 c065b626eb48039e92828ef67f7fb0bc instantclient-jdbc-linux32-10.1.0.4-20050525.zip 4580763
diff --git a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.4.ebuild b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.4.ebuild
new file mode 100644
index 000000000000..12edc4753b6c
--- /dev/null
+++ b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2005 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-10.1.0.4.ebuild,v 1.1 2005/06/21 19:41:24 radek Exp $
+
+inherit eutils
+
+MY_P="${PN/oracle-/}-linux32-${PV}-20050525"
+
+S=${WORKDIR}
+DESCRIPTION="Oracle 10g client installation for Linux: JDBC supplement"
+HOMEPAGE="http://otn.oracle.com/software/tech/oci/instantclient/htdocs/linuxsoft.html"
+SRC_URI="${MY_P}.zip"
+
+LICENSE="OTN"
+SLOT="${KV}"
+KEYWORDS="~x86"
+RESTRICT="fetch"
+IUSE=""
+
+DEPEND=">=dev-db/oracle-instantclient-basic-${PV}"
+
+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/lib/oracle/${PV}/client/lib
+	cd ${S}/instantclient10_1
+	insinto /usr/lib/oracle/${PV}/client/lib
+	doins libheteroxa10.so ocrs12.jar orai18n.jar
+}
+
+pkg_postinst() {
+	einfo "The JDBC supplement package for Oracle 10g has been installed."
+	einfo "You may wish to install the oracle-instantclient-sqlplus (for "
+	einfo "running the SQL*Plus application) package as well."
+}
diff --git a/dev-db/oracle-instantclient-sqlplus/ChangeLog b/dev-db/oracle-instantclient-sqlplus/ChangeLog
index 4a1c3e68d18b..bb6b7ebf6a3a 100644
--- a/dev-db/oracle-instantclient-sqlplus/ChangeLog
+++ b/dev-db/oracle-instantclient-sqlplus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/oracle-instantclient-sqlplus
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/ChangeLog,v 1.5 2005/01/01 17:39:38 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/ChangeLog,v 1.6 2005/06/21 19:42:58 radek Exp $
+
+*oracle-instantclient-sqlplus-10.1.0.4 (21 Jun 2005)
+
+  21 Jun 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +oracle-instantclient-sqlplus-10.1.0.4.ebuild:
+  based on Gustavo Michels work, i did version bump which closes bug #96289
 
 *oracle-instantclient-sqlplus-10.1.0.3 (21 Dec 2004)
 
diff --git a/dev-db/oracle-instantclient-sqlplus/Manifest b/dev-db/oracle-instantclient-sqlplus/Manifest
index 8451ed443259..206c1486bf39 100644
--- a/dev-db/oracle-instantclient-sqlplus/Manifest
+++ b/dev-db/oracle-instantclient-sqlplus/Manifest
@@ -1,6 +1,8 @@
+MD5 07be143f368b893ebef31e640d337ded oracle-instantclient-sqlplus-10.1.0.3.ebuild 1666
+MD5 293710b00d83f8735aeec3126e08bee0 oracle-instantclient-sqlplus-10.1.0.4.ebuild 1586
+MD5 2fee274b7df94902d24814e749e298b7 oracle-instantclient-sqlplus-10.1.0.2_p1.ebuild 1734
 MD5 327765ed25be3467357b06f56bb85919 ChangeLog 1085
 MD5 396aa9401cdf515a0d3c7fbf9c3e6d3a metadata.xml 351
-MD5 2fee274b7df94902d24814e749e298b7 oracle-instantclient-sqlplus-10.1.0.2_p1.ebuild 1734
-MD5 07be143f368b893ebef31e640d337ded oracle-instantclient-sqlplus-10.1.0.3.ebuild 1666
-MD5 0b0f6d200d7e375101ff9b829a3e8704 files/digest-oracle-instantclient-sqlplus-10.1.0.3 93
 MD5 77c18d359283aaf49ec2636bae6693f2 files/digest-oracle-instantclient-sqlplus-10.1.0.2_p1 93
+MD5 0b0f6d200d7e375101ff9b829a3e8704 files/digest-oracle-instantclient-sqlplus-10.1.0.3 93
+MD5 671ba7486b7d55012869a7c0759f93c2 files/digest-oracle-instantclient-sqlplus-10.1.0.4 96
diff --git a/dev-db/oracle-instantclient-sqlplus/files/digest-oracle-instantclient-sqlplus-10.1.0.4 b/dev-db/oracle-instantclient-sqlplus/files/digest-oracle-instantclient-sqlplus-10.1.0.4
new file mode 100644
index 000000000000..33d19582dc17
--- /dev/null
+++ b/dev-db/oracle-instantclient-sqlplus/files/digest-oracle-instantclient-sqlplus-10.1.0.4
@@ -0,0 +1 @@
+MD5 34b6e4a7a0cc0f0e7796ea49de727336 instantclient-sqlplus-linux32-10.1.0.4-20050525.zip 330577
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.4.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.4.ebuild
new file mode 100644
index 000000000000..f53baf866407
--- /dev/null
+++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 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.1.0.4.ebuild,v 1.1 2005/06/21 19:42:58 radek Exp $
+
+inherit eutils
+
+MY_P="${PN/oracle-/}-linux32-${PV}-20050525"
+
+S=${WORKDIR}
+DESCRIPTION="Oracle 10g client installation for Linux: SQL*Plus"
+HOMEPAGE="http://otn.oracle.com/software/tech/oci/instantclient/htdocs/linuxsoft.html"
+SRC_URI="${MY_P}.zip"
+
+LICENSE="OTN"
+SLOT="${KV}"
+KEYWORDS="~x86"
+RESTRICT="fetch"
+IUSE=""
+
+DEPEND=">=dev-db/oracle-instantclient-basic-${PV}"
+
+pkg_nofetch() {
+	eerror "Please go to:"
+	eerror "  ${HOMEPAGE}"
+	eerror "and download the SQL*Plus package.  Put it in:"
+	eerror "  ${DISTDIR}"
+	eerror "after downloading it."
+}
+
+src_unpack() {
+	unzip ${DISTDIR}/${MY_P}.zip
+}
+
+src_install() {
+	dodir /usr/lib/oracle/${PV}/client/lib
+	cd ${S}/instantclient10_1
+	insinto /usr/lib/oracle/${PV}/client/lib
+	doins glogin.sql libsqlplus.so
+
+	dodir /usr/lib/oracle/${PV}/client/bin
+	cd ${S}/instantclient10_1
+	exeinto /usr/lib/oracle/${PV}/client/bin
+	doexe sqlplus
+
+	dodir /usr/bin
+	dosym ${D}/usr/lib/oracle/${PV}/client/bin/sqlplus /usr/bin/sqlplus
+}
+
+pkg_postinst() {
+	einfo "The SQL*Plus package for Oracle 10g has been installed."
+	einfo "You may wish to install the oracle-instantclient-jdbc (for"
+	einfo "the supplemental JDBC functionality) package as well."
+	einfo
+	einfo "If you have any questions, be sure to read the README:"
+	einfo "http://otn.oracle.com/docs/tech/sql_plus/10102/readme_ic.htm"
+}