Added amd64 support, many thanks to Danny van Dyk <kugelfang@gentoo.org>. Fixes bug #102171.

Package-Manager: portage-2.1_pre3-r1

4 files changed, 106 insertions, 1 deletions

diff --git a/dev-db/oracle-instantclient-basic/ChangeLog b/dev-db/oracle-instantclient-basic/ChangeLog
index f6b092d02d3e..4ce277574f72 100644
--- a/dev-db/oracle-instantclient-basic/ChangeLog
+++ b/dev-db/oracle-instantclient-basic/ChangeLog
@@ -1,6 +1,13 @@
 # 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.9 2006/01/07 22:31:35 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.10 2006/01/08 20:30:40 dertobi123 Exp $
+
+*oracle-instantclient-basic-10.2.0.1-r1 (08 Jan 2006)
+
+  08 Jan 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  +oracle-instantclient-basic-10.2.0.1-r1.ebuild:
+  Added amd64 support, many thanks to Danny van Dyk <kugelfang@gentoo.org>
+  Fixes bug #102171.
 
 *oracle-instantclient-basic-10.2.0.1 (07 Jan 2006)
 
diff --git a/dev-db/oracle-instantclient-basic/Manifest b/dev-db/oracle-instantclient-basic/Manifest
index 50dcd48cdbb7..d3228e70bed1 100644
--- a/dev-db/oracle-instantclient-basic/Manifest
+++ b/dev-db/oracle-instantclient-basic/Manifest
@@ -4,9 +4,11 @@ MD5 8531dff3174726242a9e9de77be6b595 files/digest-oracle-instantclient-basic-10.
 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 0e46a4a0a0226507feacb2dac0390e9b files/digest-oracle-instantclient-basic-10.2.0.1 188
+MD5 cb932d397759caa001943bf54d0391f1 files/digest-oracle-instantclient-basic-10.2.0.1-r1 386
 MD5 9f5d6b0af6c2271c1e2bbf0518bcc925 metadata.xml 388
 MD5 203d67d121be57d7114503d35119cdca oracle-instantclient-basic-10.1.0.2_p1-r1.ebuild 1540
 MD5 ec0dd84ca69c522cdd056f7366f33f36 oracle-instantclient-basic-10.1.0.2_p1.ebuild 1388
 MD5 10adce8ab331bfc635e617f48c2a2d51 oracle-instantclient-basic-10.1.0.3.ebuild 2846
 MD5 6474a3c8a32a031c56cc632006c55377 oracle-instantclient-basic-10.1.0.4.ebuild 2672
+MD5 0f265e2c16eee3493cd157ecdd349e30 oracle-instantclient-basic-10.2.0.1-r1.ebuild 2979
 MD5 820eccf4cbfcacb16213d2f8f2951582 oracle-instantclient-basic-10.2.0.1.ebuild 2680
diff --git a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.1-r1 b/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.1-r1
new file mode 100644
index 000000000000..b9aa1330fe4e
--- /dev/null
+++ b/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.1-r1
@@ -0,0 +1,4 @@
+MD5 44c5b53361756eadc470ed307260bf7c instantclient-basic-linux-x86-64-10.2.0.1-20051025.zip 35574833
+MD5 8900afe3666a6443a16bf7b04cd1c4e0 instantclient-basic-linux32-10.2.0.1-20050713.zip 33808746
+MD5 7fde0a75133cc29cd671a9d29619bc55 instantclient-sdk-linux-x86-64-10.2.0.1-20051025.zip 602351
+MD5 9f4196cb13dda122c45a8871e409ae75 instantclient-sdk-linux32-10.2.0.1-20050713.zip 602102
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.1-r1.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.1-r1.ebuild
new file mode 100644
index 000000000000..7bddab4de309
--- /dev/null
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.1-r1.ebuild
@@ -0,0 +1,92 @@
+# 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.1-r1.ebuild,v 1.1 2006/01/08 20:30:40 dertobi123 Exp $
+
+inherit eutils
+
+MY_P_x86="${PN/oracle-/}-linux32-${PV}-20050713"
+MY_PSDK_x86="${MY_P_x86/basic/sdk}"
+
+MY_P_amd64="${PN/oracle-/}-linux-x86-64-${PV}-20051025"
+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="${KV}"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="fetch"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+# RDEPEND does not need unzip
+
+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 *
+
+	# 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"
+}