diff options
| author |   Tobias Scherbaum <dertobi123@gentoo.org> | 2008-03-08 21:02:48 +0000 |
|---|---|---|
| committer | Tobias Scherbaum <dertobi123@gentoo.org> | 2008-03-08 21:02:48 +0000 |
| commit | 7523442af9d2950f1f665820af8ba5093efc73d9 (patch) | |
| tree | 9d96e26271aace2af21ea172f35cf1e36a085672 /dev-db | |
| parent | x86 stable, bug #212669 (diff) | |
| download | historical-7523442af9d2950f1f665820af8ba5093efc73d9.tar.gz historical-7523442af9d2950f1f665820af8ba5093efc73d9.tar.bz2 historical-7523442af9d2950f1f665820af8ba5093efc73d9.zip | |
Fix multilib handling, bug #208425. Fix quoting.
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'dev-db')
6 files changed, 46 insertions, 36 deletions
diff --git a/dev-db/oracle-instantclient-jdbc/ChangeLog b/dev-db/oracle-instantclient-jdbc/ChangeLog index 1006cffd9a8e..bee514b0285a 100644 --- 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 bb2fd8efe7fb..cefd316bc972 100644 --- 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 a135bbcdf961..db81f1cde148 100644 --- 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 6de95ed0b1be..1aeb993b18f7 100644 --- 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 5e885c2debd8..d3bc74bb01d5 100644 --- 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 4fa8529ba226..fecd4d0b33b4 100644 --- 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() { |