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

Package-Manager: portage-2.1_pre3-r1

12 files changed, 248 insertions, 3 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"
+}
diff --git a/dev-db/oracle-instantclient-jdbc/ChangeLog b/dev-db/oracle-instantclient-jdbc/ChangeLog
index 61969d2d9f8b..b3b4f8a9e4a6 100644
--- a/dev-db/oracle-instantclient-jdbc/ChangeLog
+++ b/dev-db/oracle-instantclient-jdbc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/oracle-instantclient-jdbc
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/ChangeLog,v 1.7 2006/01/07 22:34:37 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/ChangeLog,v 1.8 2006/01/08 20:32:57 dertobi123 Exp $
+
+*oracle-instantclient-jdbc-10.2.0.1-r1 (08 Jan 2006)
+
+  08 Jan 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  +oracle-instantclient-jdbc-10.2.0.1-r1.ebuild:
+  Added amd64 support, many thanks to Danny van Dyk <kugelfang@gentoo.org>.
+  Fixes bug #102171.
 
 *oracle-instantclient-jdbc-10.2.0.1 (07 Jan 2006)
 
diff --git a/dev-db/oracle-instantclient-jdbc/Manifest b/dev-db/oracle-instantclient-jdbc/Manifest
index 6f7d65e766ff..c3a5342eeb5b 100644
--- a/dev-db/oracle-instantclient-jdbc/Manifest
+++ b/dev-db/oracle-instantclient-jdbc/Manifest
@@ -3,8 +3,10 @@ MD5 7d3e4c7886b1d1ff429ea98a8182faca files/digest-oracle-instantclient-jdbc-10.1
 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 386a4a2d8849fa564ac7e21e213a9d05 files/digest-oracle-instantclient-jdbc-10.2.0.1 94
+MD5 12e7b58aa67df0161935257e2ac97049 files/digest-oracle-instantclient-jdbc-10.2.0.1-r1 193
 MD5 9f5d6b0af6c2271c1e2bbf0518bcc925 metadata.xml 388
 MD5 f6fd68779ad5a0533253db89d8236312 oracle-instantclient-jdbc-10.1.0.2_p2.ebuild 1376
 MD5 c1e2ee3cc253ee357784775da7cd5034 oracle-instantclient-jdbc-10.1.0.3.ebuild 1321
 MD5 be9bc6a14a8b106d699cbb1d25eaeb57 oracle-instantclient-jdbc-10.1.0.4.ebuild 1268
+MD5 b7c51103523e7df67b8e81755f160e87 oracle-instantclient-jdbc-10.2.0.1-r1.ebuild 1438
 MD5 274696c1841570c0b0f5c7cba8404209 oracle-instantclient-jdbc-10.2.0.1.ebuild 1263
diff --git a/dev-db/oracle-instantclient-jdbc/files/digest-oracle-instantclient-jdbc-10.2.0.1-r1 b/dev-db/oracle-instantclient-jdbc/files/digest-oracle-instantclient-jdbc-10.2.0.1-r1
new file mode 100644
index 000000000000..681217555206
--- /dev/null
+++ b/dev-db/oracle-instantclient-jdbc/files/digest-oracle-instantclient-jdbc-10.2.0.1-r1
@@ -0,0 +1,2 @@
+MD5 3bd163e4de86f0fdf9662205392129f9 instantclient-jdbc-linux-x86-64-10.2.0.1-20051025.zip 1490157
+MD5 f0197bbb83131fbe01de41df609e24cd instantclient-jdbc-linux32-10.2.0.1-20050713.zip 1479431
diff --git a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.2.0.1-r1.ebuild b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.2.0.1-r1.ebuild
new file mode 100644
index 000000000000..b38629f929b3
--- /dev/null
+++ b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.2.0.1-r1.ebuild
@@ -0,0 +1,54 @@
+# 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-jdbc/oracle-instantclient-jdbc-10.2.0.1-r1.ebuild,v 1.1 2006/01/08 20:32:57 dertobi123 Exp $
+
+inherit eutils
+
+MY_P_x86="${PN/oracle-/}-linux32-${PV}-20050713"
+MY_P_amd64="${PN/oracle-/}-linux-x86-64-${PV}-20051025"
+
+
+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="x86? ( ${MY_P_x86}.zip )
+		 amd64? ( ${MY_P_amd64}.zip )"
+
+LICENSE="OTN"
+SLOT="${KV}"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="fetch"
+IUSE=""
+
+DEPEND=">=dev-db/oracle-instantclient-basic-${PV}"
+
+pkg_setup() {
+	MY_P=MY_P_${ARCH}
+	export MY_P=${!MY_P}
+}
+
+
+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}/instantclient_10_2
+	insinto /usr/lib/oracle/${PV}/client/lib
+	doins libheteroxa10.so 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 c88199fc473c..3c70b3b36649 100644
--- a/dev-db/oracle-instantclient-sqlplus/ChangeLog
+++ b/dev-db/oracle-instantclient-sqlplus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/oracle-instantclient-sqlplus
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/ChangeLog,v 1.7 2006/01/07 22:33:19 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/ChangeLog,v 1.8 2006/01/08 20:31:54 dertobi123 Exp $
+
+*oracle-instantclient-sqlplus-10.2.0.1-r1 (08 Jan 2006)
+
+  08 Jan 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  +oracle-instantclient-sqlplus-10.2.0.1-r1.ebuild:
+  Added amd64 support, many thanks to Danny van Dyk <kugelfang@gentoo.org>.
+  Fixes bug #102171.
 
 *oracle-instantclient-sqlplus-10.2.0.1 (07 Jan 2006)
 
diff --git a/dev-db/oracle-instantclient-sqlplus/Manifest b/dev-db/oracle-instantclient-sqlplus/Manifest
index 53c04d243b4e..2c6f87b2150f 100644
--- a/dev-db/oracle-instantclient-sqlplus/Manifest
+++ b/dev-db/oracle-instantclient-sqlplus/Manifest
@@ -3,8 +3,10 @@ MD5 77c18d359283aaf49ec2636bae6693f2 files/digest-oracle-instantclient-sqlplus-1
 MD5 0b0f6d200d7e375101ff9b829a3e8704 files/digest-oracle-instantclient-sqlplus-10.1.0.3 93
 MD5 671ba7486b7d55012869a7c0759f93c2 files/digest-oracle-instantclient-sqlplus-10.1.0.4 96
 MD5 d29a8a8cc29134e4feb1589d3e310330 files/digest-oracle-instantclient-sqlplus-10.2.0.1 96
+MD5 d61b51d7c6eeb4a8ac35e7ef51b0c7da files/digest-oracle-instantclient-sqlplus-10.2.0.1-r1 197
 MD5 9f5d6b0af6c2271c1e2bbf0518bcc925 metadata.xml 388
 MD5 2fee274b7df94902d24814e749e298b7 oracle-instantclient-sqlplus-10.1.0.2_p1.ebuild 1734
 MD5 07be143f368b893ebef31e640d337ded oracle-instantclient-sqlplus-10.1.0.3.ebuild 1666
 MD5 5d2001386557c76a5baf50e0b34fd328 oracle-instantclient-sqlplus-10.1.0.4.ebuild 1587
+MD5 631ee93ec5170d258e1684df1be21eb0 oracle-instantclient-sqlplus-10.2.0.1-r1.ebuild 1784
 MD5 b3dfd83c95245414ca99caf3ec0e4722 oracle-instantclient-sqlplus-10.2.0.1.ebuild 1610
diff --git a/dev-db/oracle-instantclient-sqlplus/files/digest-oracle-instantclient-sqlplus-10.2.0.1-r1 b/dev-db/oracle-instantclient-sqlplus/files/digest-oracle-instantclient-sqlplus-10.2.0.1-r1
new file mode 100644
index 000000000000..c9eca334dc64
--- /dev/null
+++ b/dev-db/oracle-instantclient-sqlplus/files/digest-oracle-instantclient-sqlplus-10.2.0.1-r1
@@ -0,0 +1,2 @@
+MD5 a353edc796b6ef6be288f3f141965116 instantclient-sqlplus-linux-x86-64-10.2.0.1-20051025.zip 788073
+MD5 e24612ea9b33ef7d3eaf0dc55fb2a3d0 instantclient-sqlplus-linux32-10.2.0.1-20050713.zip 739754
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.1-r1.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.1-r1.ebuild
new file mode 100644
index 000000000000..292b6cb23bf7
--- /dev/null
+++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.1-r1.ebuild
@@ -0,0 +1,64 @@
+# 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-sqlplus/oracle-instantclient-sqlplus-10.2.0.1-r1.ebuild,v 1.1 2006/01/08 20:31:54 dertobi123 Exp $
+
+inherit eutils
+
+MY_P_x86="${PN/oracle-/}-linux32-${PV}-20050713"
+MY_P_amd64="${PN/oracle-/}-linux-x86-64-${PV}-20051025"
+
+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="x86? ( ${MY_P_x86}.zip )
+		 amd64? ( ${MY_P_amd64}.zip )"
+
+LICENSE="OTN"
+SLOT="${KV}"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="fetch"
+IUSE=""
+
+DEPEND=">=dev-db/oracle-instantclient-basic-${PV}"
+
+pkg_setup() {
+	MY_P=MY_P_${ARCH}
+	export MY_P=${!MY_P}
+}
+
+
+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}/instantclient_10_2
+	insinto /usr/lib/oracle/${PV}/client/lib
+	doins glogin.sql libsqlplus.so libsqlplusic.so
+
+	dodir /usr/lib/oracle/${PV}/client/bin
+	cd ${S}/instantclient_10_2
+	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"
+}