bugs #165834 and #169541

(Portage version: 2.1.2.2)

6 files changed, 32 insertions, 132 deletions

diff --git a/dev-db/oracle-instantclient-basic/ChangeLog b/dev-db/oracle-instantclient-basic/ChangeLog
index d76eded874a1..1595e512dfa8 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.23 2007/01/31 13:49:45 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.24 2007/03/25 16:40:52 dertobi123 Exp $
+
+  25 Mar 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  +files/oracle-instantclient-basic-10.2.0.3-makefile.patch,
+  -oracle-instantclient-basic-10.2.0.2.ebuild,
+  oracle-instantclient-basic-10.2.0.3.ebuild:
+  bugs #165834 and #169541
 
   31 Jan 2007; Marius Mauch <genone@gentoo.org>
   oracle-instantclient-basic-10.1.0.5.ebuild,
diff --git a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.2 b/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.2
deleted file mode 100644
index 2796d0d18096..000000000000
--- a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.2
+++ /dev/null
@@ -1,24 +0,0 @@
-MD5 9381ed2118b184fecf3ff3c727b7f4d2 instantclient-basic-linux-x86-64-10.2.0.2-20060228.zip 35625985
-RMD160 a52a82c9bc831e1e5a0d9af899748ab44171bc84 instantclient-basic-linux-x86-64-10.2.0.2-20060228.zip 35625985
-SHA256 e3894c1e15de6e9e1fd3893c453cdfb23e89b1e9ad3ca90af3c4703a5e01cadc instantclient-basic-linux-x86-64-10.2.0.2-20060228.zip 35625985
-MD5 5fabaa099cd37c13e4fe1a8bc78a62ff instantclient-basic-linux32-10.2.0.2-20060331.zip 33901074
-RMD160 26f3c7a64bfb3b747b0cb454ea322d97954cb5fb instantclient-basic-linux32-10.2.0.2-20060331.zip 33901074
-SHA256 ab1d0d0cf3222788ff8add4a1154d2750487c61e64879af68f7ee538ba641ab2 instantclient-basic-linux32-10.2.0.2-20060331.zip 33901074
-MD5 140fe38e12f2198ba21e7a55f4356881 instantclient-basic-linuxppc-10.2.0.2-20060327.zip 35943169
-RMD160 174c7e5fbb129488321b73fedb2dec60d3040ef4 instantclient-basic-linuxppc-10.2.0.2-20060327.zip 35943169
-SHA256 2701453735b75ed7c805c64848dc1ad2c3882f6fa44a1795e6582bf036c37b33 instantclient-basic-linuxppc-10.2.0.2-20060327.zip 35943169
-MD5 179383655f22d44072add86cfb9aedc8 instantclient-basic-linuxppc32-10.2.0.2-20060327.zip 34223045
-RMD160 727d136483ea26e54663336820bdc2b4fd9d3e50 instantclient-basic-linuxppc32-10.2.0.2-20060327.zip 34223045
-SHA256 dbe8997d411e7fb6957dd2c0fb2dd34a5295bc62ae9e7918491fde6302c73b7a instantclient-basic-linuxppc32-10.2.0.2-20060327.zip 34223045
-MD5 69e00f9660db93b34f056e2ab31ca05a instantclient-sdk-linux-x86-64-10.2.0.2-20060228.zip 602431
-RMD160 7dc30ab322e743fa672d37fbd25fd46dee465456 instantclient-sdk-linux-x86-64-10.2.0.2-20060228.zip 602431
-SHA256 97de88f06154a197e4013c9a2765a71d50a83d67eca67d933670ef603d27e1df instantclient-sdk-linux-x86-64-10.2.0.2-20060228.zip 602431
-MD5 3f07a45a7f9d50ff4f453e31edef560b instantclient-sdk-linux32-10.2.0.2-20060331.zip 602224
-RMD160 99e622d2e09ed04ccefa343f2bc695dc1da89de6 instantclient-sdk-linux32-10.2.0.2-20060331.zip 602224
-SHA256 8e734c69deaa10be51e3839d7a64e57fd5952703b66cdf5681715bbe147f1ff7 instantclient-sdk-linux32-10.2.0.2-20060331.zip 602224
-MD5 1a6dec03daa3e697417b95910f7fc443 instantclient-sdk-linuxppc-10.2.0.2-20060327.zip 602338
-RMD160 8d81cc58e3bd2176ce6bbc7cd0db615907f74148 instantclient-sdk-linuxppc-10.2.0.2-20060327.zip 602338
-SHA256 2c81524815e3db184149f38fcbdd87f1b548aa722ffef4d5127b3b30941d216f instantclient-sdk-linuxppc-10.2.0.2-20060327.zip 602338
-MD5 57e106314a4c75b0844305ebdbe04345 instantclient-sdk-linuxppc32-10.2.0.2-20060327.zip 602338
-RMD160 b3d535b419d3b5d74a5c49dc867811a690c7eb7d instantclient-sdk-linuxppc32-10.2.0.2-20060327.zip 602338
-SHA256 a4589149daa269b2ca07c6dfa1e0ee204e471c6ead85438848d17ce11b1c0468 instantclient-sdk-linuxppc32-10.2.0.2-20060327.zip 602338
diff --git a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.3 b/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.3
index f2cedca9d8af..3c47d9a01db2 100644
--- a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.3
+++ b/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.3
@@ -1,6 +1,6 @@
-MD5 79f09b31c568097e00663ade58ed1d3b instantclient-basic-linux-x86-64-10.2.0.3-20070103.zip 36454483
-RMD160 fa431168723c9c2fe2182c9e480606db4b88932d instantclient-basic-linux-x86-64-10.2.0.3-20070103.zip 36454483
-SHA256 9195ab13e59365bfef6b2b43732a652d77d7ef8b93019f31104bc13832c6a491 instantclient-basic-linux-x86-64-10.2.0.3-20070103.zip 36454483
+MD5 19178bf1acfa3a5c637b8490214724a7 instantclient-basic-linux-x86-64-10.2.0.3-20070103.zip 36454483
+RMD160 74b873d1002fb385c365db56a19007f73fdd0be4 instantclient-basic-linux-x86-64-10.2.0.3-20070103.zip 36454483
+SHA256 952d8b11329fda924105db07283dd85c438cf53a7c62c5519ca62cdbf1f821a2 instantclient-basic-linux-x86-64-10.2.0.3-20070103.zip 36454483
 MD5 5cb04ec2693923ce5bfd21636522274b instantclient-basic-linux32-10.2.0.3-20061115.zip 34556803
 RMD160 12ac6ca9f94a255ca27de44a2feea6e49c3a4547 instantclient-basic-linux32-10.2.0.3-20061115.zip 34556803
 SHA256 11fce485c405afa4a30f34eba36ad0d566a599617f80dfc565bd08d8c421e1ae instantclient-basic-linux32-10.2.0.3-20061115.zip 34556803
diff --git a/dev-db/oracle-instantclient-basic/files/oracle-instantclient-basic-10.2.0.3-makefile.patch b/dev-db/oracle-instantclient-basic/files/oracle-instantclient-basic-10.2.0.3-makefile.patch
new file mode 100644
index 000000000000..80df560a1014
--- /dev/null
+++ b/dev-db/oracle-instantclient-basic/files/oracle-instantclient-basic-10.2.0.3-makefile.patch
@@ -0,0 +1,11 @@
+--- instantclient_10_2/sdk/demo/demo.mk.orig	2007-02-06 17:51:47.018247041 -0800
++++ instantclient_10_2/sdk/demo/demo.mk	2007-02-06 17:52:35.374869934 -0800
+@@ -30,7 +30,7 @@
+ 
+ ICINCHOME=../
+ ICLIBHOME=../../
+-ICLIBPATH=-L$(ICLIBHOME)
++ICLIBPATH=-L$(ICLIBHOME) -L$(ORACLE_HOME)/lib
+ THREADLIBS=-lthread
+ CCLIB=$(ICLIBPATH) -locci -lclntsh $(THREADLIBS)
+ 
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.2.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.2.ebuild
deleted file mode 100644
index 09c27448a435..000000000000
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2007 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.2.ebuild,v 1.7 2007/01/31 13:49:45 genone Exp $
-
-inherit eutils
-
-MY_P_x86="${PN/oracle-/}-linux32-${PV}-20060331"
-MY_PSDK_x86="${MY_P_x86/basic/sdk}"
-
-MY_P_amd64="${PN/oracle-/}-linux-x86-64-${PV}-20060228"
-MY_PSDK_amd64="${MY_P_amd64/basic/sdk}"
-
-MY_P_ppc="${PN/oracle-/}-linuxppc32-${PV}-20060327"
-MY_PSDK_ppc="${MY_P_ppc/basic/sdk}"
-
-MY_P_ppc64="${PN/oracle-/}-linuxppc-${PV}-20060327"
-MY_PSDK_ppc64="${MY_P_ppc64/basic/sdk}"
-
-S=${WORKDIR}
-DESCRIPTION="Oracle 10g client installation for Linux with SDK"
-HOMEPAGE="http://www.oracle.com/technology/tech/oci/instantclient/index.html"
-SRC_URI="x86? ( ${MY_P_x86}.zip ${MY_PSDK_x86}.zip )
-		 amd64? ( ${MY_P_amd64}.zip ${MY_PSDK_amd64}.zip )
-		 ppc? ( ${MY_P_ppc}.zip ${MY_PSDK_ppc}.zip )
-		 ppc64? ( ${MY_P_ppc64}.zip ${MY_PSDK_ppc64}.zip )"
-
-LICENSE="OTN"
-SLOT="${PV}"
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
-RESTRICT="fetch"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="|| ( =sys-libs/libstdc++-v3-3.3* =sys-devel/gcc-3.3* )"
-
-my_arch() {
-	MY_P=MY_P_${ARCH}
-	export MY_P=${!MY_P}
-	MY_PSDK=MY_PSDK_${ARCH}
-	export MY_PSDK=${!MY_PSDK}
-}
-
-pkg_setup() {
-	my_arch
-}
-
-pkg_nofetch() {
-	my_arch
-	eerror "Please go to:"
-	eerror "  ${HOMEPAGE}"
-	eerror "select your platform and download the"
-	eerror "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() {
-	elog "The Basic client page for Oracle 10g has been installed."
-	elog "You may also wish to install the oracle-instantclient-jdbc (for"
-	elog "supplemental JDBC functionality with Oracle) and the"
-	elog "oracle-instantclient-sqlplus (for running the SQL*Plus application)"
-	elog "packages as well."
-	elog
-	elog "Examples are located in /usr/share/doc/${PF}/"
-}
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3.ebuild
index 338cea02fd7b..8cf1f4b24806 100644
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3.ebuild
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.3.ebuild,v 1.3 2007/01/31 13:49:45 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3.ebuild,v 1.4 2007/03/25 16:40:52 dertobi123 Exp $
 
 inherit eutils
 
@@ -54,6 +54,16 @@ src_unpack() {
 }
 
 src_install() {
+	# Patch the SDK makefile
+	epatch ${FILESDIR}/${P}-makefile.patch
+
+	# SDK makefile
+	dodir /usr/lib/oracle/${PV}/client/rdbms/demo
+	cd ${S}/instantclient_10_2/sdk/demo
+	mv demo.mk demo_xe.mk
+	insinto /usr/lib/oracle/${PV}/client/rdbms/demo
+	doins demo_xe.mk
+
 	# library
 	dodir /usr/lib/oracle/${PV}/client/lib
 	cd ${S}/instantclient_10_2