new version.

4 files changed, 100 insertions, 11 deletions

diff --git a/dev-db/oracle-instantclient-basic/ChangeLog b/dev-db/oracle-instantclient-basic/ChangeLog
index eabda604c46c..1e7c084293d4 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 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.4 2004/11/19 16:33:52 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.5 2004/12/22 00:25:17 radek Exp $
+
+*oracle-instantclient-basic-10.1.0.3 (22 Dec 2004)
+
+  22 Dec 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  +oracle-instantclient-basic-10.1.0.3.ebuild:
+  New version from upstream. ALso two big internal (gentoo) changes:
+  1. includes now sdk/devel packages (its small and almost always needed)
+  2. dont use -p1 ebuild version scheme, because it keeps ebuild simpler
+     and -1.rpm is de facto -rX for ebuild (kind of redundancy).
 
 *oracle-instantclient-basic-10.1.0.2_p1-r1 (19 Nov 2004)
 
diff --git a/dev-db/oracle-instantclient-basic/Manifest b/dev-db/oracle-instantclient-basic/Manifest
index 00a726216797..2cfe76451a22 100644
--- a/dev-db/oracle-instantclient-basic/Manifest
+++ b/dev-db/oracle-instantclient-basic/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 09fd3d50901d029bb1e36330da992c39 oracle-instantclient-basic-10.1.0.3.ebuild 2430
 MD5 f7bbb520c6160d3d9925f4ad16002dc4 oracle-instantclient-basic-10.1.0.2_p1-r1.ebuild 1535
 MD5 200f88ebd39926cabcc1b1bb662aa7e2 oracle-instantclient-basic-10.1.0.2_p1.ebuild 1386
 MD5 3a8160d44a710386e5b007a4e27158b8 ChangeLog 1017
 MD5 0cde0af1778937296983dc2cd11a03fe metadata.xml 351
+MD5 f34650dcfa5ddf5d3957f0c39dfd2978 files/digest-oracle-instantclient-basic-10.1.0.3 184
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBw0jeI1lqEGTUzyQRAvatAKDfrd5WEkcT4M+Y4e2Y8oMCShyxuQCgkiau
-1+RaqJrSsvqjE5KXCBUcNoU=
-=QX1K
------END PGP SIGNATURE-----
diff --git a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.1.0.3 b/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.1.0.3
new file mode 100644
index 000000000000..0169355f2e51
--- /dev/null
+++ b/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.1.0.3
@@ -0,0 +1,2 @@
+MD5 5c7e6cf154959887a6ebb58358f8af33 oracle-instantclient-basic-10.1.0.3-1.i386.rpm 30791288
+MD5 2465ac505f3156267e5f19d525b23157 oracle-instantclient-devel-10.1.0.3-1.i386.rpm 281013
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.3.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.3.ebuild
new file mode 100644
index 000000000000..9b6403aec0ff
--- /dev/null
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.3.ebuild
@@ -0,0 +1,86 @@
+# 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-basic/oracle-instantclient-basic-10.1.0.3.ebuild,v 1.1 2004/12/22 00:25:17 radek Exp $
+
+inherit eutils
+
+MY_P="${P}-1.i386"
+MY_PSDK="${MY_P/basic/devel}"
+
+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}.rpm ${MY_PSDK}.rpm"
+
+LICENSE="OTN"
+SLOT="${KV}"
+KEYWORDS="~x86"
+RESTRICT="fetch"
+IUSE=""
+
+DEPEND="app-arch/rpm2targz"
+
+pkg_nofetch() {
+	eerror "Please go to:"
+	eerror "  ${HOMEPAGE}"
+	eerror "and download the Basic client package with SDK, which are:"
+	eerror "  ${MY_P}.rpm"
+	eerror "  ${MY_PSDK}.rpm"
+	eerror "Then after downloading put them in:"
+	eerror "  ${DISTDIR}"
+}
+
+src_unpack() {
+	rpm2targz ${DISTDIR}/${MY_P}.rpm
+	tar zxf ${WORKDIR}/${MY_P}.tar.gz
+	rpm2targz ${DISTDIR}/${MY_PSDK}.rpm
+	tar zxf ${WORKDIR}/${MY_PSDK}.tar.gz
+
+	# this is needed because of sdk package as we handle symlinks using dosym in src_install
+	rm -f ${S}/usr/lib/oracle/${PV}/client/lib/libclntsh.so
+	rm -f ${S}/usr/lib/oracle/${PV}/client/lib/libocci.so
+}
+
+src_install() {
+	# library
+	dodir /usr/lib/oracle/${PV}/client/lib
+	cd ${S}/usr/lib/oracle/${PV}/client/lib
+	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}/usr/include/oracle/${PV}/client
+	doins *.h
+	# link to oroginal 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}/usr/share/oracle/${PV}/client
+	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"
+}