From 9c98cb6bed7c382027b47f14485d47829b0cf0ac Mon Sep 17 00:00:00 2001 From: Don Seiler Date: Mon, 21 Jun 2004 18:27:18 +0000 Subject: 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. --- dev-db/oracle-instantclient-sqlplus/ChangeLog | 11 +++- dev-db/oracle-instantclient-sqlplus/Manifest | 6 ++- .../digest-oracle-instantclient-sqlplus-10.1.0.2 | 1 - ...digest-oracle-instantclient-sqlplus-10.1.0.2_p1 | 1 + .../oracle-instantclient-sqlplus-10.1.0.2.ebuild | 50 ----------------- ...oracle-instantclient-sqlplus-10.1.0.2_p1.ebuild | 62 ++++++++++++++++++++++ 6 files changed, 77 insertions(+), 54 deletions(-) delete mode 100644 dev-db/oracle-instantclient-sqlplus/files/digest-oracle-instantclient-sqlplus-10.1.0.2 create mode 100644 dev-db/oracle-instantclient-sqlplus/files/digest-oracle-instantclient-sqlplus-10.1.0.2_p1 delete mode 100644 dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.2.ebuild create mode 100644 dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.2_p1.ebuild 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 + -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..731522a030fe 100644 --- a/dev-db/oracle-instantclient-sqlplus/Manifest +++ b/dev-db/oracle-instantclient-sqlplus/Manifest @@ -1,4 +1,6 @@ -MD5 790b6324a4fd03b15ae999074e585387 oracle-instantclient-sqlplus-10.1.0.2.ebuild 1387 -MD5 368281449db2fa62c445deee2ce3f23c ChangeLog 484 +MD5 f8bf80c7101732f22a7deadc40088c38 ChangeLog 483 MD5 be21f1b8658247ec78eba9d3e7c37537 metadata.xml 422 +MD5 83d0d523bdcfd00f2692cfe449b40f9d oracle-instantclient-sqlplus-10.1.0.2.ebuild 1386 +MD5 645f1aa1ee5e7cb8f9047388fa258feb oracle-instantclient-sqlplus-10.1.0.2_p1.ebuild 1553 MD5 77c18d359283aaf49ec2636bae6693f2 files/digest-oracle-instantclient-sqlplus-10.1.0.2 93 +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 deleted file mode 100644 index ebd91256b849..000000000000 --- a/dev-db/oracle-instantclient-sqlplus/files/digest-oracle-instantclient-sqlplus-10.1.0.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 6b4896bb3ab20bb2005c3b94b58285db oracle-instantclient-sqlplus-10.1.0.2-1.i386.rpm 321157 diff --git a/dev-db/oracle-instantclient-sqlplus/files/digest-oracle-instantclient-sqlplus-10.1.0.2_p1 b/dev-db/oracle-instantclient-sqlplus/files/digest-oracle-instantclient-sqlplus-10.1.0.2_p1 new file mode 100644 index 000000000000..ebd91256b849 --- /dev/null +++ b/dev-db/oracle-instantclient-sqlplus/files/digest-oracle-instantclient-sqlplus-10.1.0.2_p1 @@ -0,0 +1 @@ +MD5 6b4896bb3ab20bb2005c3b94b58285db oracle-instantclient-sqlplus-10.1.0.2-1.i386.rpm 321157 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.ebuild deleted file mode 100644 index 19a67606bc02..000000000000 --- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# 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 $ - -inherit eutils - -MY_P="${P}-1.i386" - -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="${MY_P}.rpm" - -LICENSE="OTN" -SLOT="${KV}" -KEYWORDS="~x86" -RESTRICT="fetch" -IUSE="" - -DEPEND="app-arch/rpm2targz - =dev-db/oracle-instantclient-basic-10.1.0.2" - -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() { - rpm2targz ${DISTDIR}/${MY_P}.rpm - tar zxf ${WORKDIR}/${MY_P}.tar.gz 2>/dev/null -} - -src_install() { - mv ${S}/usr ${D} - dosym /usr/lib/oracle/${PV}/client/bin/sqlplus /usr/bin/sqlplus -} - -pkg_postinst() { - echo - 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" - echo -} diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.2_p1.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.2_p1.ebuild new file mode 100644 index 000000000000..9d3722e9cdf3 --- /dev/null +++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.2_p1.ebuild @@ -0,0 +1,62 @@ +# 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_p1.ebuild,v 1.1 2004/06/21 18:27:18 rizzo Exp $ + +inherit eutils + +MY_PV=${PV/_p/-} +MY_P="${PN}-${MY_PV}.i386" + + +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="${MY_P}.rpm" + +LICENSE="OTN" +SLOT="${KV}" +KEYWORDS="~x86" +RESTRICT="fetch" +IUSE="" + +DEPEND="app-arch/rpm2targz + >=dev-db/oracle-instantclient-basic-10.1.0.2" + +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() { + rpm2targz ${DISTDIR}/${MY_P}.rpm + tar zxf ${WORKDIR}/${MY_P}.tar.gz 2>/dev/null +} + +src_install() { + 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() { + echo + 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" + echo +} -- cgit v1.2.3-65-gdbad