projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 43b6062)
Fix multilib handling, bug #208425. Fix quoting.
authorTobias Scherbaum <dertobi123@gentoo.org>
Sat, 8 Mar 2008 21:02:48 +0000 (21:02 +0000)
committerTobias Scherbaum <dertobi123@gentoo.org>
Sat, 8 Mar 2008 21:02:48 +0000 (21:02 +0000)
Package-Manager: portage-2.1.4.4

dev-db/oracle-instantclient-jdbc/ChangeLog patch | blob | history
dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.5.ebuild patch | blob | history
dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.2.0.3.ebuild patch | blob | history
dev-db/oracle-instantclient-sqlplus/ChangeLog patch | blob | history
dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.5.ebuild patch | blob | history
dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.3.ebuild patch | blob | history

diff --git a/dev-db/oracle-instantclient-jdbc/ChangeLog b/dev-db/oracle-instantclient-jdbc/ChangeLog
index 1006cffd9a8e629a60a992a25f88f4acb191dc76..bee514b0285a5f996c7edcb05eba54f93c1ddfa1 100644 (file)
--- a/dev-db/oracle-instantclient-jdbc/ChangeLog
+++ b/dev-db/oracle-instantclient-jdbc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/oracle-instantclient-jdbc
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/ChangeLog,v 1.20 2007/03/27 13:28:47 wolf31o2 Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/ChangeLog,v 1.21 2008/03/08 20:58:03 dertobi123 Exp $
+
+  08 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  oracle-instantclient-jdbc-10.1.0.5.ebuild,
+  oracle-instantclient-jdbc-10.2.0.3.ebuild:
+  Fix multilib handling, bug #208425. Fix quoting.
 
   27 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   oracle-instantclient-jdbc-10.2.0.3.ebuild:
diff --git a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.5.ebuild b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.5.ebuild
index bb2fd8efe7fbb76fe81f30f17f2b39d62ae9d93b..cefd316bc972159469854ca22c1cf306c098c9a2 100644 (file)
--- a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.5.ebuild
+++ b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.1.0.5.ebuild,v 1.3 2007/01/31 13:50:44 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.5.ebuild,v 1.4 2008/03/08 20:58:03 dertobi123 Exp $
 
 inherit eutils
 
@@ -30,13 +30,13 @@ pkg_nofetch() {
 }
 
 src_unpack() {
-       unzip ${DISTDIR}/${MY_P}.zip
+       unzip "${DISTDIR}"/${MY_P}.zip
 }
 
 src_install() {
-       dodir /usr/lib/oracle/${PV}/client/lib
-       cd ${S}/instantclient10_1
-       insinto /usr/lib/oracle/${PV}/client/lib
+       dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
+       cd "${S}"/instantclient10_1
+       insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
        doins libheteroxa10.so ocrs12.jar orai18n.jar
 }
 
diff --git a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.2.0.3.ebuild b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.2.0.3.ebuild
index a135bbcdf961c9136196f4f452270c30ecf2b8a8..db81f1cde14808512211aa564f32305a5e1e92f1 100644 (file)
--- a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.2.0.3.ebuild
+++ b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.2.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.3.ebuild,v 1.5 2007/07/13 06:38:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.2.0.3.ebuild,v 1.6 2008/03/08 20:58:03 dertobi123 Exp $
 
 inherit eutils
 
@@ -37,13 +37,13 @@ pkg_nofetch() {
 }
 
 src_unpack() {
-       unzip ${DISTDIR}/${MY_P}.zip
+       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
+       dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
+       cd "${S}"/instantclient_10_2
+       insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
        doins libheteroxa10.so orai18n.jar
 }
 
diff --git a/dev-db/oracle-instantclient-sqlplus/ChangeLog b/dev-db/oracle-instantclient-sqlplus/ChangeLog
index 6de95ed0b1be93cee1bc96011b15d983a53b91ee..1aeb993b18f728f8342e9d0dd2dd9bf3bd763417 100644 (file)
--- a/dev-db/oracle-instantclient-sqlplus/ChangeLog
+++ b/dev-db/oracle-instantclient-sqlplus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/oracle-instantclient-sqlplus
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/ChangeLog,v 1.20 2007/03/27 13:28:59 wolf31o2 Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/ChangeLog,v 1.21 2008/03/08 21:02:48 dertobi123 Exp $
+
+  08 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  oracle-instantclient-sqlplus-10.1.0.5.ebuild,
+  oracle-instantclient-sqlplus-10.2.0.3.ebuild:
+  Fix multilib handling, bug #208425. Fix quoting.
 
   27 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   oracle-instantclient-sqlplus-10.2.0.3.ebuild:
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.5.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.5.ebuild
index 5e885c2debd8025129304db080c7e4a3cb667654..d3bc74bb01d59f1a9675dbf75fd876d1844292f8 100644 (file)
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.5.ebuild
+++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.1.0.5.ebuild,v 1.3 2007/01/31 13:52:23 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.5.ebuild,v 1.4 2008/03/08 21:02:48 dertobi123 Exp $
 
 inherit eutils
 
@@ -31,22 +31,22 @@ pkg_nofetch() {
 }
 
 src_unpack() {
-       unzip ${DISTDIR}/${MY_P}.zip
+       unzip "${DISTDIR}"/${MY_P}.zip
 }
 
 src_install() {
-       dodir /usr/lib/oracle/${PV}/client/lib
-       cd ${S}/instantclient10_1
-       insinto /usr/lib/oracle/${PV}/client/lib
+       dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
+       cd "${S}"/instantclient10_1
+       insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
        doins glogin.sql libsqlplus.so
 
-       dodir /usr/lib/oracle/${PV}/client/bin
-       cd ${S}/instantclient10_1
-       exeinto /usr/lib/oracle/${PV}/client/bin
+       dodir /usr/$(get_libdir)/oracle/${PV}/client/bin
+       cd "${S}"/instantclient10_1
+       exeinto /usr/$(get_libdir)/oracle/${PV}/client/bin
        doexe sqlplus
 
        dodir /usr/bin
-       dosym ${D}/usr/lib/oracle/${PV}/client/bin/sqlplus /usr/bin/sqlplus
+       dosym "${D}"/usr/$(get_libdir)/oracle/${PV}/client/bin/sqlplus /usr/bin/sqlplus
 }
 
 pkg_postinst() {
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.3.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.3.ebuild
index 4fa8529ba22610ce07e7dd6166cc01501ddbc9bd..fecd4d0b33b49341ed6047657f6b2f2da93f695b 100644 (file)
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.3.ebuild
+++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.3.ebuild,v 1.5 2007/07/13 06:38:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.3.ebuild,v 1.6 2008/03/08 21:02:48 dertobi123 Exp $
 
 inherit eutils
 
@@ -38,22 +38,22 @@ pkg_nofetch() {
 }
 
 src_unpack() {
-       unzip ${DISTDIR}/${MY_P}.zip
+       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
+       dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
+       cd "${S}"/instantclient_10_2
+       insinto /usr/$(get_libdir)/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
+       dodir /usr/$(get_libdir)/oracle/${PV}/client/bin
+       cd "${S}"/instantclient_10_2
+       exeinto /usr/$(get_libdir)/oracle/${PV}/client/bin
        doexe sqlplus
 
        dodir /usr/bin
-       dosym ${D}/usr/lib/oracle/${PV}/client/bin/sqlplus /usr/bin/sqlplus
+       dosym "${D}"/usr/$(get_libdir)/oracle/${PV}/client/bin/sqlplus /usr/bin/sqlplus
 }
 
 pkg_postinst() {
Unnamed repository; edit this file 'description' to name the repository.