From cd8f4ac34fa2892a82c81eb03246aa71d69bf0a4 Mon Sep 17 00:00:00 2001 From: Tobias Scherbaum Date: Sun, 25 Mar 2007 16:40:53 +0000 Subject: [PATCH] bugs #165834 and #169541 Package-Manager: portage-2.1.2.2 --- dev-db/oracle-instantclient-basic/ChangeLog | 8 +- dev-db/oracle-instantclient-basic/Manifest | 53 +++------ ...digest-oracle-instantclient-basic-10.2.0.2 | 24 ---- ...digest-oracle-instantclient-basic-10.2.0.3 | 6 +- ...nstantclient-basic-10.2.0.3-makefile.patch | 11 ++ ...oracle-instantclient-basic-10.2.0.2.ebuild | 103 ------------------ ...oracle-instantclient-basic-10.2.0.3.ebuild | 12 +- 7 files changed, 48 insertions(+), 169 deletions(-) delete mode 100644 dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.2 create mode 100644 dev-db/oracle-instantclient-basic/files/oracle-instantclient-basic-10.2.0.3-makefile.patch delete mode 100644 dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.2.ebuild diff --git a/dev-db/oracle-instantclient-basic/ChangeLog b/dev-db/oracle-instantclient-basic/ChangeLog index d76eded874a1..1595e512dfa8 100644 --- a/dev-db/oracle-instantclient-basic/ChangeLog +++ b/dev-db/oracle-instantclient-basic/ChangeLog @@ -1,6 +1,12 @@ # 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.23 2007/01/31 13:49:45 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.24 2007/03/25 16:40:52 dertobi123 Exp $ + + 25 Mar 2007; Tobias Scherbaum + +files/oracle-instantclient-basic-10.2.0.3-makefile.patch, + -oracle-instantclient-basic-10.2.0.2.ebuild, + oracle-instantclient-basic-10.2.0.3.ebuild: + bugs #165834 and #169541 31 Jan 2007; Marius Mauch oracle-instantclient-basic-10.1.0.5.ebuild, diff --git a/dev-db/oracle-instantclient-basic/Manifest b/dev-db/oracle-instantclient-basic/Manifest index 93502a2506b7..a8e6fa99da19 100644 --- a/dev-db/oracle-instantclient-basic/Manifest +++ b/dev-db/oracle-instantclient-basic/Manifest @@ -1,36 +1,25 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -DIST instantclient-basic-linux-x86-64-10.2.0.2-20060228.zip 35625985 RMD160 a52a82c9bc831e1e5a0d9af899748ab44171bc84 SHA256 e3894c1e15de6e9e1fd3893c453cdfb23e89b1e9ad3ca90af3c4703a5e01cadc -DIST instantclient-basic-linux-x86-64-10.2.0.3-20070103.zip 36454483 RMD160 fa431168723c9c2fe2182c9e480606db4b88932d SHA1 fd28349cedf225c16a5399362cb4919b7fc3a5e1 SHA256 9195ab13e59365bfef6b2b43732a652d77d7ef8b93019f31104bc13832c6a491 +AUX oracle-instantclient-basic-10.2.0.3-makefile.patch 356 RMD160 5bf8584f2f12f74c5481f9211bbfad65929a0091 SHA1 a02921ad2ff3bf7bfcb1f9b0d58cb3dce8b141e8 SHA256 c28e41b5ac8842cfa6248df8936f0681f00eaa8d99206c640dbdd0fcaedcadf0 +MD5 01c82033019e9a4c189ac7ce203cabb3 files/oracle-instantclient-basic-10.2.0.3-makefile.patch 356 +RMD160 5bf8584f2f12f74c5481f9211bbfad65929a0091 files/oracle-instantclient-basic-10.2.0.3-makefile.patch 356 +SHA256 c28e41b5ac8842cfa6248df8936f0681f00eaa8d99206c640dbdd0fcaedcadf0 files/oracle-instantclient-basic-10.2.0.3-makefile.patch 356 +DIST instantclient-basic-linux-x86-64-10.2.0.3-20070103.zip 36454483 RMD160 74b873d1002fb385c365db56a19007f73fdd0be4 SHA1 a1f93c08713e0bfeee6c0b0fd0663db8bf4633b0 SHA256 952d8b11329fda924105db07283dd85c438cf53a7c62c5519ca62cdbf1f821a2 DIST instantclient-basic-linux32-10.1.0.5-20060511.zip 31413713 RMD160 432bf95f4b3d63456624bde1fe93269693a841c7 SHA1 e9ac1688b85117449eb55bb0012824286f01e4a4 SHA256 3adc1bbb9a563cbc64b5225f9573e924c6a73263d46bc325df2931f7be7fd34a -DIST instantclient-basic-linux32-10.2.0.2-20060331.zip 33901074 RMD160 26f3c7a64bfb3b747b0cb454ea322d97954cb5fb SHA256 ab1d0d0cf3222788ff8add4a1154d2750487c61e64879af68f7ee538ba641ab2 DIST instantclient-basic-linux32-10.2.0.3-20061115.zip 34556803 RMD160 12ac6ca9f94a255ca27de44a2feea6e49c3a4547 SHA1 08092f796c1c362254d18e73c955fd0bff9db78b SHA256 11fce485c405afa4a30f34eba36ad0d566a599617f80dfc565bd08d8c421e1ae -DIST instantclient-basic-linuxppc-10.2.0.2-20060327.zip 35943169 RMD160 174c7e5fbb129488321b73fedb2dec60d3040ef4 SHA256 2701453735b75ed7c805c64848dc1ad2c3882f6fa44a1795e6582bf036c37b33 -DIST instantclient-basic-linuxppc32-10.2.0.2-20060327.zip 34223045 RMD160 727d136483ea26e54663336820bdc2b4fd9d3e50 SHA256 dbe8997d411e7fb6957dd2c0fb2dd34a5295bc62ae9e7918491fde6302c73b7a -DIST instantclient-sdk-linux-x86-64-10.2.0.2-20060228.zip 602431 RMD160 7dc30ab322e743fa672d37fbd25fd46dee465456 SHA256 97de88f06154a197e4013c9a2765a71d50a83d67eca67d933670ef603d27e1df 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.2-20060331.zip 602224 RMD160 99e622d2e09ed04ccefa343f2bc695dc1da89de6 SHA256 8e734c69deaa10be51e3839d7a64e57fd5952703b66cdf5681715bbe147f1ff7 DIST instantclient-sdk-linux32-10.2.0.3-20061115.zip 602897 RMD160 06ce90ef1fb7c61e920e3a3e37578f54b3d2db0f SHA1 cb70884b44150f5048c4876e41c58fec8d252705 SHA256 6893a784e1802e18300230dcac1ed2ecd6dc68a7060c02717f73bf268d43f6a5 -DIST instantclient-sdk-linuxppc-10.2.0.2-20060327.zip 602338 RMD160 8d81cc58e3bd2176ce6bbc7cd0db615907f74148 SHA256 2c81524815e3db184149f38fcbdd87f1b548aa722ffef4d5127b3b30941d216f -DIST instantclient-sdk-linuxppc32-10.2.0.2-20060327.zip 602338 RMD160 b3d535b419d3b5d74a5c49dc867811a690c7eb7d SHA256 a4589149daa269b2ca07c6dfa1e0ee204e471c6ead85438848d17ce11b1c0468 EBUILD oracle-instantclient-basic-10.1.0.5.ebuild 2695 RMD160 3babb33278d6646da41f0157017c23cf2fd84126 SHA1 0886fa13b6c17b0127c399e6542139f9d32443e2 SHA256 c796dbd8de471c73b4754f2f868c0419f7f7e9d75a46aaf1f1200beffdeb9b4e MD5 c87c74399363a64a637d96a26bcc9c8f oracle-instantclient-basic-10.1.0.5.ebuild 2695 RMD160 3babb33278d6646da41f0157017c23cf2fd84126 oracle-instantclient-basic-10.1.0.5.ebuild 2695 SHA256 c796dbd8de471c73b4754f2f868c0419f7f7e9d75a46aaf1f1200beffdeb9b4e oracle-instantclient-basic-10.1.0.5.ebuild 2695 -EBUILD oracle-instantclient-basic-10.2.0.2.ebuild 3259 RMD160 6607e72d5a38303fc1d6a278772c0c372819a15b SHA1 0338648988a715dc37c8fe99bf3b9b784e8c4335 SHA256 8557d33a6c3a0f0be2963a3b0a60251a1a4b5b017e0f50a799f67250092f5106 -MD5 bbf0da287352a776513725216d1f4260 oracle-instantclient-basic-10.2.0.2.ebuild 3259 -RMD160 6607e72d5a38303fc1d6a278772c0c372819a15b oracle-instantclient-basic-10.2.0.2.ebuild 3259 -SHA256 8557d33a6c3a0f0be2963a3b0a60251a1a4b5b017e0f50a799f67250092f5106 oracle-instantclient-basic-10.2.0.2.ebuild 3259 -EBUILD oracle-instantclient-basic-10.2.0.3.ebuild 3105 RMD160 4dd4e32a7663f507a8f5aeb47bbe0a3e91d2b9ef SHA1 81bde231ffdd528d4d41fb962a99c9cbe56a810d SHA256 b143002a7888b127c6de9dcba1fb871a5afe4a0ca8fa4e323acd8d831650e708 -MD5 120d2a2bee25c806ea1a9c1852cc432c oracle-instantclient-basic-10.2.0.3.ebuild 3105 -RMD160 4dd4e32a7663f507a8f5aeb47bbe0a3e91d2b9ef oracle-instantclient-basic-10.2.0.3.ebuild 3105 -SHA256 b143002a7888b127c6de9dcba1fb871a5afe4a0ca8fa4e323acd8d831650e708 oracle-instantclient-basic-10.2.0.3.ebuild 3105 -MISC ChangeLog 5077 RMD160 c7bfbf9324f77a53c2bccab1028c1433dea98874 SHA1 2a94135e94cd157b90d73ab5c71677d389ecf7dc SHA256 d46f6fda6d74ea0373f756e512d6948289fea62f4d57a62627a8e4c98042bdf9 -MD5 da4f918d2081e6523ff24654f0f776a4 ChangeLog 5077 -RMD160 c7bfbf9324f77a53c2bccab1028c1433dea98874 ChangeLog 5077 -SHA256 d46f6fda6d74ea0373f756e512d6948289fea62f4d57a62627a8e4c98042bdf9 ChangeLog 5077 +EBUILD oracle-instantclient-basic-10.2.0.3.ebuild 3367 RMD160 d41604b343faea12616a615f2c4333d5a066c774 SHA1 43598bc2a00377c6e694fe5345285988a6b9682c SHA256 207c0d6bb4883975e3eb4a6c8e48b67335626233e8d6adcbdeacb851fdcbe937 +MD5 573a9cf52737667d6111e87df1515fb1 oracle-instantclient-basic-10.2.0.3.ebuild 3367 +RMD160 d41604b343faea12616a615f2c4333d5a066c774 oracle-instantclient-basic-10.2.0.3.ebuild 3367 +SHA256 207c0d6bb4883975e3eb4a6c8e48b67335626233e8d6adcbdeacb851fdcbe937 oracle-instantclient-basic-10.2.0.3.ebuild 3367 +MISC ChangeLog 5319 RMD160 3ab9ff08a91741535e1cc803de936f73ef542f77 SHA1 76cc703fc81ef5f502845f7b51a62bdcc96f0369 SHA256 49925e299567db9560487bd31b194855d892614c781d672a6a772c79fd6690b1 +MD5 647493a3524383a9ffe612a226546828 ChangeLog 5319 +RMD160 3ab9ff08a91741535e1cc803de936f73ef542f77 ChangeLog 5319 +SHA256 49925e299567db9560487bd31b194855d892614c781d672a6a772c79fd6690b1 ChangeLog 5319 MISC metadata.xml 388 RMD160 f12fead3733f8a2760b2f190bcadd9a810e4bbc1 SHA1 f1cf715b4a7a2d39696097b2510967d640948075 SHA256 fa323e9829505e837ae433af3b0ce5e7b97e1aef0ec614baa6c6ba4602def893 MD5 9f5d6b0af6c2271c1e2bbf0518bcc925 metadata.xml 388 RMD160 f12fead3733f8a2760b2f190bcadd9a810e4bbc1 metadata.xml 388 @@ -38,16 +27,6 @@ SHA256 fa323e9829505e837ae433af3b0ce5e7b97e1aef0ec614baa6c6ba4602def893 metadata MD5 7d67fcac2a86c35bff7bec62169297cc files/digest-oracle-instantclient-basic-10.1.0.5 656 RMD160 78c536ba004882949d35a4bbb608ce282aff7264 files/digest-oracle-instantclient-basic-10.1.0.5 656 SHA256 78d349acd8c97f6b49438bb2a6b3765601fab60c5fcf38160864218babe4a755 files/digest-oracle-instantclient-basic-10.1.0.5 656 -MD5 a03a6a26b09694054a9364eed1eaca40 files/digest-oracle-instantclient-basic-10.2.0.2 2678 -RMD160 13a7cc9859a37691cc884b410f67cac2fb5e8f91 files/digest-oracle-instantclient-basic-10.2.0.2 2678 -SHA256 5e9f035244f876e0a0768fb14a9a743a76f2715fe8204f05e3ad5abcf24e7203 files/digest-oracle-instantclient-basic-10.2.0.2 2678 -MD5 eb3ae79b2597367a0855060278250657 files/digest-oracle-instantclient-basic-10.2.0.3 1342 -RMD160 f3bdfa7558efdc12c1ad5ef22ce948f3de3bf8d3 files/digest-oracle-instantclient-basic-10.2.0.3 1342 -SHA256 5d8a0943e316b1c0214ee9b64e3a010c7edae9e944ecb255ffb7fc6bec5145f1 files/digest-oracle-instantclient-basic-10.2.0.3 1342 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) - -iD8DBQFFwJ8M6J2i8a8J4okRAtg7AKDFkRNZhyThsQKig5aI6fcpCRHFXgCeMIKw -/IyHZH6EERBVpzsjLh2nRIo= -=emc0 ------END PGP SIGNATURE----- +MD5 d4cb547b1d3863645eeae1bd086a13b8 files/digest-oracle-instantclient-basic-10.2.0.3 1342 +RMD160 feaa2bd527b41dbce2538cdda4052d086d835371 files/digest-oracle-instantclient-basic-10.2.0.3 1342 +SHA256 c7a8deb25aecec294903dec367b3e00b16a49bd4efc5f407e794e8b2b9115906 files/digest-oracle-instantclient-basic-10.2.0.3 1342 diff --git a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.2 b/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.2 deleted file mode 100644 index 2796d0d18096..000000000000 --- a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.2 +++ /dev/null @@ -1,24 +0,0 @@ -MD5 9381ed2118b184fecf3ff3c727b7f4d2 instantclient-basic-linux-x86-64-10.2.0.2-20060228.zip 35625985 -RMD160 a52a82c9bc831e1e5a0d9af899748ab44171bc84 instantclient-basic-linux-x86-64-10.2.0.2-20060228.zip 35625985 -SHA256 e3894c1e15de6e9e1fd3893c453cdfb23e89b1e9ad3ca90af3c4703a5e01cadc instantclient-basic-linux-x86-64-10.2.0.2-20060228.zip 35625985 -MD5 5fabaa099cd37c13e4fe1a8bc78a62ff instantclient-basic-linux32-10.2.0.2-20060331.zip 33901074 -RMD160 26f3c7a64bfb3b747b0cb454ea322d97954cb5fb instantclient-basic-linux32-10.2.0.2-20060331.zip 33901074 -SHA256 ab1d0d0cf3222788ff8add4a1154d2750487c61e64879af68f7ee538ba641ab2 instantclient-basic-linux32-10.2.0.2-20060331.zip 33901074 -MD5 140fe38e12f2198ba21e7a55f4356881 instantclient-basic-linuxppc-10.2.0.2-20060327.zip 35943169 -RMD160 174c7e5fbb129488321b73fedb2dec60d3040ef4 instantclient-basic-linuxppc-10.2.0.2-20060327.zip 35943169 -SHA256 2701453735b75ed7c805c64848dc1ad2c3882f6fa44a1795e6582bf036c37b33 instantclient-basic-linuxppc-10.2.0.2-20060327.zip 35943169 -MD5 179383655f22d44072add86cfb9aedc8 instantclient-basic-linuxppc32-10.2.0.2-20060327.zip 34223045 -RMD160 727d136483ea26e54663336820bdc2b4fd9d3e50 instantclient-basic-linuxppc32-10.2.0.2-20060327.zip 34223045 -SHA256 dbe8997d411e7fb6957dd2c0fb2dd34a5295bc62ae9e7918491fde6302c73b7a instantclient-basic-linuxppc32-10.2.0.2-20060327.zip 34223045 -MD5 69e00f9660db93b34f056e2ab31ca05a instantclient-sdk-linux-x86-64-10.2.0.2-20060228.zip 602431 -RMD160 7dc30ab322e743fa672d37fbd25fd46dee465456 instantclient-sdk-linux-x86-64-10.2.0.2-20060228.zip 602431 -SHA256 97de88f06154a197e4013c9a2765a71d50a83d67eca67d933670ef603d27e1df instantclient-sdk-linux-x86-64-10.2.0.2-20060228.zip 602431 -MD5 3f07a45a7f9d50ff4f453e31edef560b instantclient-sdk-linux32-10.2.0.2-20060331.zip 602224 -RMD160 99e622d2e09ed04ccefa343f2bc695dc1da89de6 instantclient-sdk-linux32-10.2.0.2-20060331.zip 602224 -SHA256 8e734c69deaa10be51e3839d7a64e57fd5952703b66cdf5681715bbe147f1ff7 instantclient-sdk-linux32-10.2.0.2-20060331.zip 602224 -MD5 1a6dec03daa3e697417b95910f7fc443 instantclient-sdk-linuxppc-10.2.0.2-20060327.zip 602338 -RMD160 8d81cc58e3bd2176ce6bbc7cd0db615907f74148 instantclient-sdk-linuxppc-10.2.0.2-20060327.zip 602338 -SHA256 2c81524815e3db184149f38fcbdd87f1b548aa722ffef4d5127b3b30941d216f instantclient-sdk-linuxppc-10.2.0.2-20060327.zip 602338 -MD5 57e106314a4c75b0844305ebdbe04345 instantclient-sdk-linuxppc32-10.2.0.2-20060327.zip 602338 -RMD160 b3d535b419d3b5d74a5c49dc867811a690c7eb7d instantclient-sdk-linuxppc32-10.2.0.2-20060327.zip 602338 -SHA256 a4589149daa269b2ca07c6dfa1e0ee204e471c6ead85438848d17ce11b1c0468 instantclient-sdk-linuxppc32-10.2.0.2-20060327.zip 602338 diff --git a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.3 b/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.3 index f2cedca9d8af..3c47d9a01db2 100644 --- a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.3 +++ b/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.3 @@ -1,6 +1,6 @@ -MD5 79f09b31c568097e00663ade58ed1d3b instantclient-basic-linux-x86-64-10.2.0.3-20070103.zip 36454483 -RMD160 fa431168723c9c2fe2182c9e480606db4b88932d instantclient-basic-linux-x86-64-10.2.0.3-20070103.zip 36454483 -SHA256 9195ab13e59365bfef6b2b43732a652d77d7ef8b93019f31104bc13832c6a491 instantclient-basic-linux-x86-64-10.2.0.3-20070103.zip 36454483 +MD5 19178bf1acfa3a5c637b8490214724a7 instantclient-basic-linux-x86-64-10.2.0.3-20070103.zip 36454483 +RMD160 74b873d1002fb385c365db56a19007f73fdd0be4 instantclient-basic-linux-x86-64-10.2.0.3-20070103.zip 36454483 +SHA256 952d8b11329fda924105db07283dd85c438cf53a7c62c5519ca62cdbf1f821a2 instantclient-basic-linux-x86-64-10.2.0.3-20070103.zip 36454483 MD5 5cb04ec2693923ce5bfd21636522274b instantclient-basic-linux32-10.2.0.3-20061115.zip 34556803 RMD160 12ac6ca9f94a255ca27de44a2feea6e49c3a4547 instantclient-basic-linux32-10.2.0.3-20061115.zip 34556803 SHA256 11fce485c405afa4a30f34eba36ad0d566a599617f80dfc565bd08d8c421e1ae instantclient-basic-linux32-10.2.0.3-20061115.zip 34556803 diff --git a/dev-db/oracle-instantclient-basic/files/oracle-instantclient-basic-10.2.0.3-makefile.patch b/dev-db/oracle-instantclient-basic/files/oracle-instantclient-basic-10.2.0.3-makefile.patch new file mode 100644 index 000000000000..80df560a1014 --- /dev/null +++ b/dev-db/oracle-instantclient-basic/files/oracle-instantclient-basic-10.2.0.3-makefile.patch @@ -0,0 +1,11 @@ +--- instantclient_10_2/sdk/demo/demo.mk.orig 2007-02-06 17:51:47.018247041 -0800 ++++ instantclient_10_2/sdk/demo/demo.mk 2007-02-06 17:52:35.374869934 -0800 +@@ -30,7 +30,7 @@ + + ICINCHOME=../ + ICLIBHOME=../../ +-ICLIBPATH=-L$(ICLIBHOME) ++ICLIBPATH=-L$(ICLIBHOME) -L$(ORACLE_HOME)/lib + THREADLIBS=-lthread + CCLIB=$(ICLIBPATH) -locci -lclntsh $(THREADLIBS) + diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.2.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.2.ebuild deleted file mode 100644 index 09c27448a435..000000000000 --- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.2.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2007 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.2.ebuild,v 1.7 2007/01/31 13:49:45 genone Exp $ - -inherit eutils - -MY_P_x86="${PN/oracle-/}-linux32-${PV}-20060331" -MY_PSDK_x86="${MY_P_x86/basic/sdk}" - -MY_P_amd64="${PN/oracle-/}-linux-x86-64-${PV}-20060228" -MY_PSDK_amd64="${MY_P_amd64/basic/sdk}" - -MY_P_ppc="${PN/oracle-/}-linuxppc32-${PV}-20060327" -MY_PSDK_ppc="${MY_P_ppc/basic/sdk}" - -MY_P_ppc64="${PN/oracle-/}-linuxppc-${PV}-20060327" -MY_PSDK_ppc64="${MY_P_ppc64/basic/sdk}" - -S=${WORKDIR} -DESCRIPTION="Oracle 10g client installation for Linux with SDK" -HOMEPAGE="http://www.oracle.com/technology/tech/oci/instantclient/index.html" -SRC_URI="x86? ( ${MY_P_x86}.zip ${MY_PSDK_x86}.zip ) - amd64? ( ${MY_P_amd64}.zip ${MY_PSDK_amd64}.zip ) - ppc? ( ${MY_P_ppc}.zip ${MY_PSDK_ppc}.zip ) - ppc64? ( ${MY_P_ppc64}.zip ${MY_PSDK_ppc64}.zip )" - -LICENSE="OTN" -SLOT="${PV}" -KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86" -RESTRICT="fetch" -IUSE="" - -DEPEND="app-arch/unzip" -RDEPEND="|| ( =sys-libs/libstdc++-v3-3.3* =sys-devel/gcc-3.3* )" - -my_arch() { - MY_P=MY_P_${ARCH} - export MY_P=${!MY_P} - MY_PSDK=MY_PSDK_${ARCH} - export MY_PSDK=${!MY_PSDK} -} - -pkg_setup() { - my_arch -} - -pkg_nofetch() { - my_arch - eerror "Please go to:" - eerror " ${HOMEPAGE}" - eerror "select your platform and download the" - eerror "Basic client package with SDK, which are:" - eerror " ${MY_P}.zip" - eerror " ${MY_PSDK}.zip" - eerror "Then after downloading put them in:" - eerror " ${DISTDIR}" -} - -src_unpack() { - 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/lib/oracle/${PV}/client/lib - cd ${S}/instantclient_10_2 - insinto /usr/lib/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 - - # includes - dodir /usr/lib/oracle/${PV}/client/include - insinto /usr/lib/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 - - # share info - cd ${S}/instantclient_10_2/sdk/demo - dodoc * - - # 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 -} - -pkg_postinst() { - elog "The Basic client page for Oracle 10g has been installed." - elog "You may also wish to install the oracle-instantclient-jdbc (for" - elog "supplemental JDBC functionality with Oracle) and the" - elog "oracle-instantclient-sqlplus (for running the SQL*Plus application)" - elog "packages as well." - elog - elog "Examples are located in /usr/share/doc/${PF}/" -} 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 338cea02fd7b..8cf1f4b24806 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-2007 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.3 2007/01/31 13:49:45 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3.ebuild,v 1.4 2007/03/25 16:40:52 dertobi123 Exp $ inherit eutils @@ -54,6 +54,16 @@ src_unpack() { } src_install() { + # Patch the SDK makefile + epatch ${FILESDIR}/${P}-makefile.patch + + # SDK makefile + dodir /usr/lib/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 + doins demo_xe.mk + # library dodir /usr/lib/oracle/${PV}/client/lib cd ${S}/instantclient_10_2 -- 2.26.2