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

dev-db/oracle-instantclient-basic/ChangeLog patch | blob | history
dev-db/oracle-instantclient-basic/Manifest patch | blob | history
dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.5.ebuild patch | blob | history
dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3.ebuild patch | blob | history

diff --git a/dev-db/oracle-instantclient-basic/ChangeLog b/dev-db/oracle-instantclient-basic/ChangeLog
index bac62f7e7b855602be1d1ba706280213c8e9ac45..a7b01692e9cf9ee357432a7b31a8afb975861640 100644 (file)
--- 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.27 2007/08/19 14:33:10 angelos Exp $
+# 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 $
+
+  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 multilib handling, bug #208425
 
   19 Aug 2007; Christoph Mende <angelos@gentoo.org>
   oracle-instantclient-basic-10.2.0.3.ebuild:
diff --git a/dev-db/oracle-instantclient-basic/Manifest b/dev-db/oracle-instantclient-basic/Manifest
index 277906d3f21b5be4eca433b4d6174afb439fabac..6172ae57a1bcaf8b29b7aca0252c9aae970ed334 100644 (file)
--- a/dev-db/oracle-instantclient-basic/Manifest
+++ b/dev-db/oracle-instantclient-basic/Manifest
@@ -5,7 +5,7 @@ DIST instantclient-basic-linux32-10.2.0.3-20061115.zip 34556803 RMD160 12ac6ca9f
 DIST instantclient-sdk-linux-x86-64-10.2.0.3-20070103.zip 603137 RMD160 323d6407c664e9fdbc8a7b829e93deffa7871925 SHA1 d3486539a5b9a4721b7a57fd61c7694be4e2c6f1 SHA256 d9da1494a9d19e96bff79c3ff77d079633d18c7d9b462a37eacc9a2a40641912
 DIST instantclient-sdk-linux32-10.1.0.5-20060511.zip 294618 RMD160 f507160d73e61e2a613243d8cc823a902647b1e1 SHA1 6e7186007ce6897c0d05dfad5451d491cac35edd SHA256 3d8b401bbf461f91791b205949a5ea4e8ffbb54f3778372f6d376de7517f8ee4
 DIST instantclient-sdk-linux32-10.2.0.3-20061115.zip 602897 RMD160 06ce90ef1fb7c61e920e3a3e37578f54b3d2db0f SHA1 cb70884b44150f5048c4876e41c58fec8d252705 SHA256 6893a784e1802e18300230dcac1ed2ecd6dc68a7060c02717f73bf268d43f6a5
-EBUILD oracle-instantclient-basic-10.1.0.5.ebuild 2695 RMD160 3babb33278d6646da41f0157017c23cf2fd84126 SHA1 0886fa13b6c17b0127c399e6542139f9d32443e2 SHA256 c796dbd8de471c73b4754f2f868c0419f7f7e9d75a46aaf1f1200beffdeb9b4e
-EBUILD oracle-instantclient-basic-10.2.0.3.ebuild 3362 RMD160 0cb1bc4eba8bab9ba088de3df05c23a74f3d9a7b SHA1 47be872638921324967dfde9eb2570065e77cee9 SHA256 97bdca50baa85a62c395c3d1f5e7699ec5b35b435c3021ddaad346a447df673a
-MISC ChangeLog 5704 RMD160 b1a928fbcb9c47987c5befec4431234a1d3e8e6e SHA1 0b687bcf715f316212ae4666af3dccb54bbe27fa SHA256 516db37f28ae33101e548a59d9ea117999d44a21a7d35afe44cd96e085bccaa8
+EBUILD oracle-instantclient-basic-10.1.0.5.ebuild 2819 RMD160 ca22a5b6bcf12a47c87b8ed365b75e641caf29cc SHA1 75ff885e89039c6893e7501eda8ece246dc79615 SHA256 8ccbb91471d57c52f59a2ee147553d7afbe8480e257f301868b7cf7ace8d0f4b
+EBUILD oracle-instantclient-basic-10.2.0.3.ebuild 3505 RMD160 9240bf4e07ae7daaed5f708263a2cb00ab542449 SHA1 13e138e8c6e66aec1643935c052ef35eb27212fe SHA256 4ad4f91d68a4ac934c98da11822c60663d788a1b9f3cc1c357e24cf2c229281d
+MISC ChangeLog 5893 RMD160 004cde63260c4c4bce8f813363a35734b14cab7f SHA1 9fe011ae1a0eb114202b008710b051c649bcb643 SHA256 89de7670dc87fb2c2129cd21f6d794fe4be5a73dd606b2c0b1be6c4488be9d6d
 MISC metadata.xml 388 RMD160 f12fead3733f8a2760b2f190bcadd9a810e4bbc1 SHA1 f1cf715b4a7a2d39696097b2510967d640948075 SHA256 fa323e9829505e837ae433af3b0ce5e7b97e1aef0ec614baa6c6ba4602def893
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 90c20c4ca8859c4babdaf9c4b89f0c4b694a61ce..657ae95c9688f787d8ddef7e4c0af0739dd3b789 100644 (file)
--- 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-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-basic/oracle-instantclient-basic-10.1.0.5.ebuild,v 1.4 2007/01/31 13:49:45 genone Exp $
+# $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 $
 
 inherit eutils
 
@@ -39,23 +39,23 @@ src_unpack() {
 
 src_install() {
        # library
-       dodir /usr/lib/oracle/${PV}/client/lib
+       dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
        cd ${S}/instantclient10_1
-       insinto /usr/lib/oracle/${PV}/client/lib
+       insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
        doins *.jar *.so *.so.10.1
 
        # fixes symlinks
-       dosym /usr/lib/oracle/${PV}/client/lib/libocci.so.10.1 /usr/lib/oracle/${PV}/client/lib/libocci.so
-       dosym /usr/lib/oracle/${PV}/client/lib/libclntsh.so.10.1 /usr/lib/oracle/${PV}/client/lib/libclntsh.so
+       dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so.10.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so
+       dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so.10.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so
 
        # includes
-       dodir /usr/lib/oracle/${PV}/client/include
-       insinto /usr/lib/oracle/${PV}/client/include
+       dodir /usr/$(get_libdir)/oracle/${PV}/client/include
+       insinto /usr/$(get_libdir)/oracle/${PV}/client/include
        cd ${S}/instantclient10_1/sdk/include
        doins *.h
        # link to original location
        dodir /usr/include/oracle/${PV}/
-       ln -s ${D}/usr/lib/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
@@ -63,9 +63,9 @@ src_install() {
 
        # Add OCI libs to library path
        dodir /etc/env.d
-       echo "ORACLE_HOME=/usr/lib/oracle/${PV}/client" >> ${D}/etc/env.d/50oracle-instantclient-basic
-       echo "LDPATH=/usr/lib/oracle/${PV}/client/lib" >> ${D}/etc/env.d/50oracle-instantclient-basic
-       echo "C_INCLUDE_PATH=/usr/lib/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 80b806448713c3cadd6a13a3dc1293df8de6dcff..04c8e1d57d10bf4806e999b698b56e9df249a7a5 100644 (file)
--- 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-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-basic/oracle-instantclient-basic-10.2.0.3.ebuild,v 1.6 2007/08/19 14:33:10 angelos Exp $
+# $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 $
 
 inherit eutils
 
@@ -58,30 +58,30 @@ src_install() {
        epatch ${FILESDIR}/${P}-makefile.patch
 
        # SDK makefile
-       dodir /usr/lib/oracle/${PV}/client/rdbms/demo
+       dodir /usr/$(get_libdir)/oracle/${PV}/client/rdbms/demo
        cd ${S}/instantclient_10_2/sdk/demo
        mv demo.mk demo_xe.mk
-       insinto /usr/lib/oracle/${PV}/client/rdbms/demo
+       insinto /usr/$(get_libdir)/oracle/${PV}/client/rdbms/demo
        doins demo_xe.mk
 
        # library
-       dodir /usr/lib/oracle/${PV}/client/lib
+       dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
        cd ${S}/instantclient_10_2
-       insinto /usr/lib/oracle/${PV}/client/lib
+       insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
        doins *.jar *.so *.so.10.1
 
        # fixes symlinks
-       dosym /usr/lib/oracle/${PV}/client/lib/libocci.so.10.1 /usr/lib/oracle/${PV}/client/lib/libocci.so
-       dosym /usr/lib/oracle/${PV}/client/lib/libclntsh.so.10.1 /usr/lib/oracle/${PV}/client/lib/libclntsh.so
+       dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so.10.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so
+       dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so.10.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so
 
        # includes
-       dodir /usr/lib/oracle/${PV}/client/include
-       insinto /usr/lib/oracle/${PV}/client/include
+       dodir /usr/$(get_libdir)/oracle/${PV}/client/include
+       insinto /usr/$(get_libdir)/oracle/${PV}/client/include
        cd ${S}/instantclient_10_2/sdk/include
        doins *.h
        # link to original location
        dodir /usr/include/oracle/${PV}/
-       ln -s ${D}/usr/lib/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
@@ -89,9 +89,9 @@ src_install() {
 
        # Add OCI libs to library path
        dodir /etc/env.d
-       echo "ORACLE_HOME=/usr/lib/oracle/${PV}/client" >> ${D}/etc/env.d/50oracle-instantclient-basic
-       echo "LDPATH=/usr/lib/oracle/${PV}/client/lib" >> ${D}/etc/env.d/50oracle-instantclient-basic
-       echo "C_INCLUDE_PATH=/usr/lib/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() {
Unnamed repository; edit this file 'description' to name the repository.