new version

8 files changed, 126 insertions, 23 deletions

diff --git a/dev-db/oracle-instantclient-jdbc/ChangeLog b/dev-db/oracle-instantclient-jdbc/ChangeLog
index abf5e0168f23..74ea96c1f6c6 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/ChangeLog,v 1.3 2004/06/24 21:58:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/ChangeLog,v 1.4 2004/12/22 00:26:12 radek Exp $
+
+*oracle-instantclient-jdbc-10.1.0.3 (21 Dec 2004)
+
+  21 Dec 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  +oracle-instantclient-jdbc-10.1.0.3.ebuild:
+  Version bump. Also changed slightly number scheme to keep ebuild simpler.
 
 *oracle-instantclient-jdbc-10.1.0.2_p2 (21 Jun 2004)
 
diff --git a/dev-db/oracle-instantclient-jdbc/Manifest b/dev-db/oracle-instantclient-jdbc/Manifest
index a26dc2ec5cf3..271de3faa124 100644
--- a/dev-db/oracle-instantclient-jdbc/Manifest
+++ b/dev-db/oracle-instantclient-jdbc/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 c54c2b2897df45205bad8b9c1c6567c1 oracle-instantclient-jdbc-10.1.0.2_p2.ebuild 1374
-MD5 71700bab58f376aec6ae1c71ec8bb9de ChangeLog 805
+MD5 7c5ab2168c429893ec9cb11bf70a8a00 oracle-instantclient-jdbc-10.1.0.3.ebuild 1322
+MD5 bf1febd1a81ae3a5678e9e645f378329 ChangeLog 1033
 MD5 0cde0af1778937296983dc2cd11a03fe metadata.xml 351
+MD5 71cef383c61956b0de73640fc392cc06 files/digest-oracle-instantclient-jdbc-10.1.0.3 91
 MD5 7d3e4c7886b1d1ff429ea98a8182faca files/digest-oracle-instantclient-jdbc-10.1.0.2_p2 91
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBw0j6I1lqEGTUzyQRAjOnAKCSREeN3bbzbgx1AXxFx+71VLR6xgCguJSB
-6wiuQyZSJMRgpsvHgHCXJTE=
-=gnji
------END PGP SIGNATURE-----
diff --git a/dev-db/oracle-instantclient-jdbc/files/digest-oracle-instantclient-jdbc-10.1.0.3 b/dev-db/oracle-instantclient-jdbc/files/digest-oracle-instantclient-jdbc-10.1.0.3
new file mode 100644
index 000000000000..7c82349ddfb4
--- /dev/null
+++ b/dev-db/oracle-instantclient-jdbc/files/digest-oracle-instantclient-jdbc-10.1.0.3
@@ -0,0 +1 @@
+MD5 f7d503c8d443d73d17845c64fd7cecea oracle-instantclient-jdbc-10.1.0.3-1.i386.rpm 4578185
diff --git a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.3.ebuild b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.3.ebuild
new file mode 100644
index 000000000000..e0e9637d6928
--- /dev/null
+++ b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2004 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.3.ebuild,v 1.1 2004/12/22 00:26:12 radek Exp $
+
+inherit eutils
+
+MY_P="${P}-1.i386"
+
+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}.rpm"
+
+LICENSE="OTN"
+SLOT="${KV}"
+KEYWORDS="~x86"
+RESTRICT="fetch"
+IUSE=""
+
+DEPEND="app-arch/rpm2targz
+		>=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() {
+	rpm2targz ${DISTDIR}/${MY_P}.rpm
+	tar zxf ${WORKDIR}/${MY_P}.tar.gz
+}
+
+src_install() {
+	dodir /usr/lib/oracle/${PV}/client/lib
+	cd ${S}/usr/lib/oracle/${PV}/client/lib
+	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 e79a3388dd1a..d827dfc7476c 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/ChangeLog,v 1.3 2004/06/24 21:58:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/ChangeLog,v 1.4 2004/12/22 00:28:30 radek Exp $
+
+*oracle-instantclient-sqlplus-10.1.0.3 (21 Dec 2004)
+
+  21 Dec 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  +oracle-instantclient-sqlplus-10.1.0.3.ebuild:
+  Version bump. Also changed slightly number scheme to keep ebuild simpler.
 
 *oracle-instantclient-sqlplus-10.1.0.2_p1 (21 Jun 2004)
 
diff --git a/dev-db/oracle-instantclient-sqlplus/Manifest b/dev-db/oracle-instantclient-sqlplus/Manifest
index 35ea82e7c9a5..f1eb64850e71 100644
--- a/dev-db/oracle-instantclient-sqlplus/Manifest
+++ b/dev-db/oracle-instantclient-sqlplus/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 64d76be63235ae35bc636f0423b40cf3 oracle-instantclient-sqlplus-10.1.0.3.ebuild 1667
 MD5 1779b5c0aac4f4dda70cace0117268db oracle-instantclient-sqlplus-10.1.0.2_p1.ebuild 1732
 MD5 ce8dbec14717b8fc00bd9b6845abab71 ChangeLog 849
 MD5 0cde0af1778937296983dc2cd11a03fe metadata.xml 351
 MD5 77c18d359283aaf49ec2636bae6693f2 files/digest-oracle-instantclient-sqlplus-10.1.0.2_p1 93
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBw0ikI1lqEGTUzyQRAp76AJ9rJ/bEaB9VDoums0dv6OjH+OXP/gCfUgo6
-TewCRrEmQTHhfsH/nN7ZaeQ=
-=7mbV
------END PGP SIGNATURE-----
+MD5 0b0f6d200d7e375101ff9b829a3e8704 files/digest-oracle-instantclient-sqlplus-10.1.0.3 93
diff --git a/dev-db/oracle-instantclient-sqlplus/files/digest-oracle-instantclient-sqlplus-10.1.0.3 b/dev-db/oracle-instantclient-sqlplus/files/digest-oracle-instantclient-sqlplus-10.1.0.3
new file mode 100644
index 000000000000..469d10c861a0
--- /dev/null
+++ b/dev-db/oracle-instantclient-sqlplus/files/digest-oracle-instantclient-sqlplus-10.1.0.3
@@ -0,0 +1 @@
+MD5 44fecdfe938ec2db4db1739add5eecb5 oracle-instantclient-sqlplus-10.1.0.3-1.i386.rpm 321622
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.3.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.3.ebuild
new file mode 100644
index 000000000000..62918607f54e
--- /dev/null
+++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2004 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.3.ebuild,v 1.1 2004/12/22 00:28:30 radek Exp $
+
+inherit eutils
+
+MY_P="${P}-1.i386"
+
+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}.rpm"
+
+LICENSE="OTN"
+SLOT="${KV}"
+KEYWORDS="~x86"
+RESTRICT="fetch"
+IUSE=""
+
+DEPEND="app-arch/rpm2targz
+		>=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() {
+	rpm2targz ${DISTDIR}/${MY_P}.rpm
+	tar zxf ${WORKDIR}/${MY_P}.tar.gz 2>/dev/null
+}
+
+src_install() {
+	dodir /usr/lib/oracle/${PV}/client/lib
+	cd ${S}/usr/lib/oracle/${PV}/client/lib
+	insinto /usr/lib/oracle/${PV}/client/lib
+	doins glogin.sql libsqlplus.so
+
+	dodir /usr/lib/oracle/${PV}/client/bin
+	cd ${S}/usr/lib/oracle/${PV}/client/bin
+	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"
+}