New an improved version, using insinto to fix permissions problem from bug #46338, and using proper patch numbering. Thanks to Chris Mayo for reporting the bug.

4 files changed, 30 insertions, 9 deletions

diff --git a/dev-db/oracle-instantclient-sqlplus/ChangeLog b/dev-db/oracle-instantclient-sqlplus/ChangeLog
index b49eea4317ef..61faedd07f05 100644
--- a/dev-db/oracle-instantclient-sqlplus/ChangeLog
+++ b/dev-db/oracle-instantclient-sqlplus/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/oracle-instantclient-sqlplus
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/ChangeLog,v 1.1 2004/03/22 21:35:34 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/ChangeLog,v 1.2 2004/06/21 18:27:18 rizzo Exp $
+
+*oracle-instantclient-sqlplus-10.1.0.2_p1 (21 Jun 2004)
+
+  21 Jun 2004; Don Seiler <rizzo@gentoo.org>
+  -oracle-instantclient-sqlplus-10.1.0.2.ebuild,
+  +oracle-instantclient-sqlplus-10.1.0.2_p1.ebuild:
+  New an improved version, using insinto to fix permissions problem from bug
+  #46338, and using proper patch numbering. Thanks to Chris Mayo for reporting
+  the bug.
 
 *oracle-instantclient-sqlplus-10.1.0.2 (22 Mar 2004)
 
diff --git a/dev-db/oracle-instantclient-sqlplus/Manifest b/dev-db/oracle-instantclient-sqlplus/Manifest
index 1d02108df32f..6406f51303d3 100644
--- a/dev-db/oracle-instantclient-sqlplus/Manifest
+++ b/dev-db/oracle-instantclient-sqlplus/Manifest
@@ -1,4 +1,4 @@
-MD5 790b6324a4fd03b15ae999074e585387 oracle-instantclient-sqlplus-10.1.0.2.ebuild 1387
-MD5 368281449db2fa62c445deee2ce3f23c ChangeLog 484
+MD5 b7ff64ef1eef738a6fa2e37c2b6a4ad7 ChangeLog 854
 MD5 be21f1b8658247ec78eba9d3e7c37537 metadata.xml 422
-MD5 77c18d359283aaf49ec2636bae6693f2 files/digest-oracle-instantclient-sqlplus-10.1.0.2 93
+MD5 6467f41fd2f8455344db898dcf2505f0 oracle-instantclient-sqlplus-10.1.0.2_p1.ebuild 1734
+MD5 77c18d359283aaf49ec2636bae6693f2 files/digest-oracle-instantclient-sqlplus-10.1.0.2_p1 93
diff --git a/dev-db/oracle-instantclient-sqlplus/files/digest-oracle-instantclient-sqlplus-10.1.0.2 b/dev-db/oracle-instantclient-sqlplus/files/digest-oracle-instantclient-sqlplus-10.1.0.2_p1
index ebd91256b849..ebd91256b849 100644
--- a/dev-db/oracle-instantclient-sqlplus/files/digest-oracle-instantclient-sqlplus-10.1.0.2
+++ b/dev-db/oracle-instantclient-sqlplus/files/digest-oracle-instantclient-sqlplus-10.1.0.2_p1
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.2.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.2_p1.ebuild
index 19a67606bc02..9d3722e9cdf3 100644
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.2.ebuild
+++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.2_p1.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.2.ebuild,v 1.2 2004/03/22 21:38:56 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.2_p1.ebuild,v 1.1 2004/06/21 18:27:18 rizzo Exp $
 
 inherit eutils
 
-MY_P="${P}-1.i386"
+MY_PV=${PV/_p/-}
+MY_P="${PN}-${MY_PV}.i386"
+
 
 S=${WORKDIR}
 DESCRIPTION="Oracle 10g client installation for Linux: SQL*Plus"
@@ -18,7 +20,7 @@ RESTRICT="fetch"
 IUSE=""
 
 DEPEND="app-arch/rpm2targz
-		=dev-db/oracle-instantclient-basic-10.1.0.2"
+		>=dev-db/oracle-instantclient-basic-10.1.0.2"
 
 pkg_nofetch() {
 	eerror "Please go to:"
@@ -34,8 +36,18 @@ src_unpack() {
 }
 
 src_install() {
-	mv ${S}/usr ${D}
-	dosym /usr/lib/oracle/${PV}/client/bin/sqlplus /usr/bin/sqlplus
+	dodir /usr/lib/oracle/10.1.0.2/client/lib
+	cd ${S}/usr/lib/oracle/10.1.0.2/client/lib
+	insinto /usr/lib/oracle/10.1.0.2/client/lib
+	doins glogin.sql libsqlplus.so
+
+	dodir /usr/lib/oracle/10.1.0.2/client/bin
+	cd ${S}/usr/lib/oracle/10.1.0.2/client/bin
+	exeinto /usr/lib/oracle/10.1.0.2/client/bin
+	doexe sqlplus
+
+	dodir /usr/bin
+	dosym ${D}/usr/lib/oracle/10.1.0.2/client/bin/sqlplus /usr/bin/sqlplus
 }
 
 pkg_postinst() {