diff options
3 files changed, 28 insertions, 23 deletions
diff --git a/dev-db/oracle-instantclient-basic/ChangeLog b/dev-db/oracle-instantclient-basic/ChangeLog index a7b01692e9cf..0a14e41a8eb9 100644 --- a/dev-db/oracle-instantclient-basic/ChangeLog +++ b/dev-db/oracle-instantclient-basic/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-db/oracle-instantclient-basic # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.28 2008/03/08 20:50:47 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.29 2008/03/08 20:54:26 dertobi123 Exp $ + + 08 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org> + oracle-instantclient-basic-10.1.0.5.ebuild, + oracle-instantclient-basic-10.2.0.3.ebuild: + Fix qouting 08 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org> oracle-instantclient-basic-10.1.0.5.ebuild, diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.5.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.5.ebuild index 657ae95c9688..b20d935bd3d9 100644 --- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.5.ebuild +++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.5.ebuild @@ -1,6 +1,6 @@ # 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-basic/oracle-instantclient-basic-10.1.0.5.ebuild,v 1.5 2008/03/08 20:50:47 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.5.ebuild,v 1.6 2008/03/08 20:54:26 dertobi123 Exp $ inherit eutils @@ -33,14 +33,14 @@ pkg_nofetch() { } src_unpack() { - unzip ${DISTDIR}/${MY_P}.zip || die "unsuccesful unzip ${MY_P}.zip" - unzip ${DISTDIR}/${MY_PSDK}.zip || die "unsuccesful unzip ${MY_PSDK}.zip" + 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/$(get_libdir)/oracle/${PV}/client/lib - cd ${S}/instantclient10_1 + cd "${S}"/instantclient10_1 insinto /usr/$(get_libdir)/oracle/${PV}/client/lib doins *.jar *.so *.so.10.1 @@ -51,21 +51,21 @@ src_install() { # includes dodir /usr/$(get_libdir)/oracle/${PV}/client/include insinto /usr/$(get_libdir)/oracle/${PV}/client/include - cd ${S}/instantclient10_1/sdk/include + cd "${S}"/instantclient10_1/sdk/include doins *.h # link to original location dodir /usr/include/oracle/${PV}/ - ln -s ${D}/usr/$(get_libdir)/oracle/${PV}/client/include ${D}/usr/include/oracle/${PV}/client + ln -s "${D}"/usr/$(get_libdir)/oracle/${PV}/client/include "${D}"/usr/include/oracle/${PV}/client # share info - cd ${S}/instantclient10_1/sdk/demo + cd "${S}"/instantclient10_1/sdk/demo dodoc * # Add OCI libs to library path dodir /etc/env.d - echo "ORACLE_HOME=/usr/$(get_libdir)/oracle/${PV}/client" >> ${D}/etc/env.d/50oracle-instantclient-basic - echo "LDPATH=/usr/$(get_libdir)/oracle/${PV}/client/lib" >> ${D}/etc/env.d/50oracle-instantclient-basic - echo "C_INCLUDE_PATH=/usr/$(get_libdir)/oracle/${PV}/client/include" >> ${D}/etc/env.d/50oracle-instantclient-basic + echo "ORACLE_HOME=/usr/$(get_libdir)/oracle/${PV}/client" >> "${D}"/etc/env.d/50oracle-instantclient-basic + echo "LDPATH=/usr/$(get_libdir)/oracle/${PV}/client/lib" >> "${D}"/etc/env.d/50oracle-instantclient-basic + echo "C_INCLUDE_PATH=/usr/$(get_libdir)/oracle/${PV}/client/include" >> "${D}"/etc/env.d/50oracle-instantclient-basic } 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 04c8e1d57d10..57718c280559 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-2008 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.7 2008/03/08 20:50:47 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3.ebuild,v 1.8 2008/03/08 20:54:26 dertobi123 Exp $ inherit eutils @@ -49,24 +49,24 @@ pkg_nofetch() { } src_unpack() { - unzip ${DISTDIR}/${MY_P}.zip || die "unsuccesful unzip ${MY_P}.zip" - unzip ${DISTDIR}/${MY_PSDK}.zip || die "unsuccesful unzip ${MY_PSDK}.zip" + unzip "${DISTDIR}"/${MY_P}.zip || die "unsuccesful unzip ${MY_P}.zip" + unzip "${DISTDIR}"/${MY_PSDK}.zip || die "unsuccesful unzip ${MY_PSDK}.zip" } src_install() { # Patch the SDK makefile - epatch ${FILESDIR}/${P}-makefile.patch + epatch "${FILESDIR}"/${P}-makefile.patch # SDK makefile dodir /usr/$(get_libdir)/oracle/${PV}/client/rdbms/demo - cd ${S}/instantclient_10_2/sdk/demo + cd "${S}"/instantclient_10_2/sdk/demo mv demo.mk demo_xe.mk insinto /usr/$(get_libdir)/oracle/${PV}/client/rdbms/demo doins demo_xe.mk # library dodir /usr/$(get_libdir)/oracle/${PV}/client/lib - cd ${S}/instantclient_10_2 + cd "${S}"/instantclient_10_2 insinto /usr/$(get_libdir)/oracle/${PV}/client/lib doins *.jar *.so *.so.10.1 @@ -77,21 +77,21 @@ src_install() { # includes dodir /usr/$(get_libdir)/oracle/${PV}/client/include insinto /usr/$(get_libdir)/oracle/${PV}/client/include - cd ${S}/instantclient_10_2/sdk/include + cd "${S}"/instantclient_10_2/sdk/include doins *.h # link to original location dodir /usr/include/oracle/${PV}/ - ln -s ${D}/usr/$(get_libdir)/oracle/${PV}/client/include ${D}/usr/include/oracle/${PV}/client + ln -s "${D}"/usr/$(get_libdir)/oracle/${PV}/client/include "${D}"/usr/include/oracle/${PV}/client # share info - cd ${S}/instantclient_10_2/sdk/demo + cd "${S}"/instantclient_10_2/sdk/demo dodoc * # Add OCI libs to library path dodir /etc/env.d - echo "ORACLE_HOME=/usr/$(get_libdir)/oracle/${PV}/client" >> ${D}/etc/env.d/50oracle-instantclient-basic - echo "LDPATH=/usr/$(get_libdir)/oracle/${PV}/client/lib" >> ${D}/etc/env.d/50oracle-instantclient-basic - echo "C_INCLUDE_PATH=/usr/$(get_libdir)/oracle/${PV}/client/include" >> ${D}/etc/env.d/50oracle-instantclient-basic + echo "ORACLE_HOME=/usr/$(get_libdir)/oracle/${PV}/client" >> "${D}"/etc/env.d/50oracle-instantclient-basic + echo "LDPATH=/usr/$(get_libdir)/oracle/${PV}/client/lib" >> "${D}"/etc/env.d/50oracle-instantclient-basic + echo "C_INCLUDE_PATH=/usr/$(get_libdir)/oracle/${PV}/client/include" >> "${D}"/etc/env.d/50oracle-instantclient-basic } pkg_postinst() { |