[gentoo-commits] repo/gentoo:master commit in: dev-db/oracle-instantclient/, dev-db/oracle-instantclient/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: dev-db/oracle-instantclient/, dev-db/oracle-instantclient/files/
@ 2018-10-19 16:29 Michael Haubenwallner
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Haubenwallner @ 2018-10-19 16:29 UTC (permalink / raw
  To: gentoo-commits

commit:     5a8db975b241e26c2cfcc52728829b74bfc2e166
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 19 15:43:13 2018 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Fri Oct 19 16:25:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a8db975

dev-db/oracle-instantclient: revbump

Closes: https://bugs.gentoo.org/578402
Closes: https://bugs.gentoo.org/597520
Closes: https://bugs.gentoo.org/652096
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 dev-db/oracle-instantclient/Manifest               |  14 +
 .../files/18.3.0.0-makefile.patch                  |  40 +++
 dev-db/oracle-instantclient/metadata.xml           |  11 +-
 .../oracle-instantclient-18.3.0.0.ebuild           | 342 +++++++++++++++++++++
 4 files changed, 402 insertions(+), 5 deletions(-)

diff --git a/dev-db/oracle-instantclient/Manifest b/dev-db/oracle-instantclient/Manifest
index fd91881793a..ba0c976db9e 100644
--- a/dev-db/oracle-instantclient/Manifest
+++ b/dev-db/oracle-instantclient/Manifest
@@ -1,24 +1,38 @@
 DIST instantclient-basic-linux-12.1.0.2.0.zip 59727331 BLAKE2B 8a4beb891fd6693b74be4f575bff3af7f70cb751a9fbfab80aa145737008cc745f83f2ec349a5959fcaac9aa789210ecd6da88e0eea63d23ce62fcb402274ea8 SHA512 5d93c72c43ba2ca765209f4c1d518b9e93c80ff33625bf0bc33b974413e2b91ab22681e0922d2148fbfa6b6043fe84eee5334aa398e1ee7b1c2663ff2b3bb235
 DIST instantclient-basic-linux-12.2.0.1.0.zip 64594237 BLAKE2B bd74522486ec6be857ed83e23a1a64a2794dc14ac184ef9dd4324fc4b9d0d61be8b6b70e32cfe814c6c8972bc7c9aef1d48a60180b8310d861fa66179027c391 SHA512 35cdd84765f1e020cd1e7fe3a765449bcad1c3b09189ab64f6a969da27d7ff2932bad319037ec066615e672d2b3105d4c36b42ec30ab60d6c577a2796908d22b
+DIST instantclient-basic-linux-18.3.0.0.0dbru.zip 67930600 BLAKE2B 70d9c54a8df66859d40e4374cd3073613fbf3656850373ada6c9707a7076e0d0749e3b1a84e2d46d18643f80020ecf8c525224433c946946787388dc3f57c79c SHA512 3e1bda593c14d14942c7bf8393111792df01bc9d5a15ae0b4010bd29d71bda4ab044dca6741d00185976c70790fc24b5221afc436d33abe6277e7513cb8bd859
 DIST instantclient-basic-linux.x64-12.1.0.2.0.zip 63352239 BLAKE2B 88042fbdccc6b79e8ed82f78f47ac985af413c53b9f2c9654a8ab10008ca9f7cdc4c46a12af5eca6aca47f27bd4d28ee465cd6ed91076268a361faa247440162 SHA512 e4cbdf40f00521651002f0753ead292b7a33352a7dae5d77635fbdb784451a1b9331ad614326dccdea34ecff3d44ddd0932b83c4bd405e69d95c7decae945f2c
 DIST instantclient-basic-linux.x64-12.2.0.1.0.zip 68965195 BLAKE2B 11e4a995f00ec4f218fe08ddd139c6d60b28bd9ffb78ce566be989eb5d229e5186e60406598b78067f480755e49bbeb6675dd3081186599fc0cac89e66a6f2eb SHA512 13f9b80d1021309fa48ca6c9dd6406ba6f97dcd611f786e940db42eeaba40cdf603b108954b9b3195f830e49377593e31b04f8d9310f619418bcd129b39f2ff1
+DIST instantclient-basic-linux.x64-18.3.0.0.0dbru.zip 72794506 BLAKE2B 22db5d69d48c33061db72bdc050e081ec24152c5e4655505c7f75407646f5ffa140aa51f4638ad8e7c5628476bb44358cb061b2d228ab1e36cd9464e49fcf1f6 SHA512 92e607e1711b24ddf10f11ecd3b389795acc544a567a95cb62b624e5913ad11a1707699b5df659f5fb33dae5cd56700036644e643c7edbe51e7a67e57a152ecc
 DIST instantclient-jdbc-linux-12.1.0.2.0.zip 1571004 BLAKE2B 5d6d8f2ad86eff24be192ff0984a92351cb0dbf56619428a3c5c339dc0a5cc0048e2143e252803f5def6f0f111c4f69081d8aa41bc28002361586bef8ecff44b SHA512 ed3e5f831f1ac7351bd6eb7b3c10a09bba0f1989384ff1f041fdf94a5ca6acbf06e8285283f48731be6ece3dce55d307ac31e8bab57548dca0e3b3056060b5b2
 DIST instantclient-jdbc-linux-12.2.0.1.0.zip 1572140 BLAKE2B ac8a5767924a991503d64b7127e801bd09116ff5155a4943db76bf8678bccfd38c35d744d5a1654a51368feef97df39cad8a9b62ceb69f0cdf416af742385dea SHA512 3b57ab454645f8719a75c8778ab33589548018ec09d187ca88252006f44b014d62659a622ae423f79f9bf0f11149cafaa33880e90278c94a847e69e409bd3dca
+DIST instantclient-jdbc-linux-18.3.0.0.0dbru.zip 1574763 BLAKE2B 2ddbb6a6d61c3b6bc3e37b40f786dd86f5efadcf8cbe5b58dec2631b92ebae25065cb29f87ceed9a1f426ada094a9c0ef1887f8ea7b70e66527e9b75e11f213e SHA512 96298e579b6b5a81ae2ef679d6bf9a18f8bd08c33981d0a5b836c20710dc07d15d7964895a3d66c01075a20720d333f766ac439dc4f3867edac473e020eaf065
 DIST instantclient-jdbc-linux.x64-12.1.0.2.0.zip 1571639 BLAKE2B 1e50ff99548aa22e32ae48b629e6a83477cf7ad6d56b622e4c03831b43377841d3892b1f3079148a2a93b42d7d2be2670233c33edebac219f5a71384e43ab495 SHA512 1e6aa33c159d5769d10b16da3c5ff16629dae049c7e7d3ab1504a0ad625968f4d3f655a83ff128bff726c3ed03eab9ef7603c897aad288d1dc4e557c03ac7e2a
 DIST instantclient-jdbc-linux.x64-12.2.0.1.0.zip 1572942 BLAKE2B 3521505368a46046149ae28e2fae0bb85d5a70da33c029c684289a3586341fc0e63b0a88b93cbaa28aacbffaca678260f94658faa2b7e8aa31d1103a41660dac SHA512 79c939442431e14b9f30e94821fc4d8eeb34cd35b887fd8fa90a045357a241a58a53d591d22a5f42b188540c50350b842391a3871c86eb4fe8169ea23001a21a
+DIST instantclient-jdbc-linux.x64-18.3.0.0.0dbru.zip 1575572 BLAKE2B bb9d5ad0064b547a7152d4f9b170c646105b4a0731596fe381f7a2c63b720e36cc5a93eea59ea71aa3405999d972cf962a74063350c468a8d114ad28f5a0be0c SHA512 70ebece929cb11f34fdcb6aea75af3679f22d0b838c3d256d4c7c0249977423625b1244a54ca504b51d24e2f178b1784571e185574cd3db34c2cda8128298b60
 DIST instantclient-odbc-linux-12.1.0.2.0.zip 1100875 BLAKE2B f8b1475962ab8b66b0e24b7bebc74cd13278e2dfe24885e5ef41e051319baee615ed5015a6b7d87e363e8915ff07fde8e17764a8e6aaa4b5b516f266ef1649dd SHA512 ff3b13a338f0acbae07f23d0e54f0ffa803afcda1a798b9cf38ced103201c0698a7240a062fb67af3547c17e906089e236cc3454685ca4645161a8b14414235e
 DIST instantclient-odbc-linux-12.2.0.1.0-2.zip 590200 BLAKE2B 732c07ecd7d19fd425873f2ddec00ffbe3da3b07b05bb902d2e3bcf6bcdcd62c7cecdf2bf2289f2c60df4d6dab3f337729eb7c4aacb64dacf73eadcf3ae3f99a SHA512 78a237d165dab3e991bc9bb495c67913c78b660922bfce872be5c774176eaee2ba2af08798b983ad513a33451cde06fe3a727dec66b91b944dc698bf048c7ef5
+DIST instantclient-odbc-linux-18.3.0.0.0dbru.zip 605026 BLAKE2B 2f7808ef2706c65d1c876e44e7b831ea0629a218347f34dd4b81cce192b45b78b26c9e164b179232b1fceeeeb5f84d807ac6bef1f36fd7d077e620bbb6c093eb SHA512 370d3f34c57e33909642f18104de8b48c2ab0fd1cf679087f8601720ebc1097f64caceb118010b9e8d2f7207cef04210b22a36824de747683c3a1162ccb4f09e
 DIST instantclient-odbc-linux.x64-12.1.0.2.0.zip 1289004 BLAKE2B 674b50e841c66af1d17c5293e3b1909b937664d106864d7709a921ee6f1e46f6571b3c00d064c6ffae0583f4fd84a0e1e7f0b8f635338856c429d9986208c69d SHA512 b6dd02a2566aba66bbdd61e37e00f0c0ec2d466ad969658d4943657642e6e385cb08d0bee3a127b38a7077ec71c8f341aa4696f381e4d9978f807caa1f3ccb91
 DIST instantclient-odbc-linux.x64-12.2.0.1.0-2.zip 634023 BLAKE2B 82cd7683bde15a6ff2c96b6b45da95509a7acf0dc7f6a58a19276a526a397481075fc27a450c1a6ac053a460bf075222a3d5afeba9c33f35cff9365b38eb922a SHA512 48d831c798b455349e1a79cecdeee96652d1911f2371d67c4d280b6595ac253ddff5b052ff2f680b42a5fc77b655ee438837ad4abde3137e251facd22c31cf2e
+DIST instantclient-odbc-linux.x64-18.3.0.0.0dbru.zip 648825 BLAKE2B 1e96b87802c9ccc7d5f6ae2fdab501004e6fe8d4e155503bb983c82cdbfff729263e541689f4c2dbeeabfdd1037f0a97191e3a50842a8488a3267f24fec6b43d SHA512 23ad10a834fd92007147f8a7ad95dd9df4fbd5b786f7e2bb9afd6a12101fb934a40daa81ade914d8d0f59872591a1ae29438f23229b3767ed4ea3ff7cc730f66
+DIST instantclient-precomp-linux-18.3.0.0.0dbru.zip 5200252 BLAKE2B 1d3613de34ccd61fd7c3795170d6d012491bc2c045c39f39db716ac7ce2e68e7e8da84c5b95afa8e50afb97d2fcad8e469f25627b9ec570f58f0b167a2f2348e SHA512 f783b6f346cc4848567a1b7284a93d1bf20a9555fa9cbfd57597b3856444969653cc6d6c3c3e710da6775d39d2efa6399b9e91f4f7458de43b0a404f4f693dd0
+DIST instantclient-precomp-linux.x64-18.3.0.0.0dbru.zip 6403554 BLAKE2B bd8e1b3de4b8c12214ea066be22f7ca18133e62e1d9a70b2710578e967204561cdcc9f719f8c1310e19e94baca367e0aa8c482e637b2f13a51781328b229be92 SHA512 292322eb07e3707cf469cea8390636fb2fae99a50b3b900a9c43b5808ce741cb708541820de5e9aa9c341290ad5015be32d968c43e1a14aebf97dd5fd04fc925
 DIST instantclient-sdk-linux-12.1.0.2.0.zip 667183 BLAKE2B 7dc36af0ea105ea97a961a2332b3643ec22cd64b81adbfc7206fce6e963948d5e59f860b8d4fe1318ed238adfb95effa2a138aec3e017a54bd7ce4c4cf1941be SHA512 fdc0111dba77aa88dc7a39c8d9afbd08c4ffde63890595501915be48a70f6fc623762657a1f3e3b54dd08b0d1e5ce00f99ec5ce40990bb17fab63ae38b986dc9
 DIST instantclient-sdk-linux-12.2.0.1.0.zip 674751 BLAKE2B 385a51450ed05c0e80151545037ed58b08dd400c01c8cbb1140045bc6372d4e1d334854881498a5c5833746c796ff94694d495257748442bd49267cc830fda88 SHA512 b2e53e95aaee283f9077f422c7ea8e961a42decb0f58d438eeb32edb32e8c88321261ffd009ca453b531c4aa22a74b8cf71b9a91754c2bd082c83f644523c72e
+DIST instantclient-sdk-linux-18.3.0.0.0dbru.zip 927121 BLAKE2B 5b53d759cb82c854d67b9bebaffb07e442b62d13367e5acf19af2dec4dbca2ba3ee50c83f89cf6e865121ad039227d898e74fecf43439610254eb43a429422a0 SHA512 6e4ccafb69d047b96dbda2f493c175f005b593472ea3c9a75fed758d2f12d970509d58b32d94f7a59b3d0402a87efaa754e6487af9cde01f7211f0145434c6c9
 DIST instantclient-sdk-linux.x64-12.1.0.2.0.zip 667174 BLAKE2B ad3f85a45fa04a579c7233d549a2c4083f0c07348503baea20f8b5404f097c36aed382d0316fbfcd6ec85f56524c288933613de2fc9fcafe961fed32108e002a SHA512 451918e34c4e41dcaea6d678cf10a20a3fb80be5c060aa1a2890f2eb528e6e4982bfd758598eaa115cd367cde0468f7f0f811bac2ef28671075868857eaf9f2e
 DIST instantclient-sdk-linux.x64-12.2.0.1.0.zip 674743 BLAKE2B fd1ab9b7fb2c3151a30d4f3f01d4003f46f95ae78f822214beed071bd52caddb3df39488d4341cb39a1f9a3259be0bc65b53df7f221055d8540d8fcc531455e9 SHA512 4a62ae1be31514664a0f442f65df633b93bea25f1ebe84e405865b9e363017726075bf2d5b2181600018ee122f74649aaa8ec5b507ee8938e33ae056a7f828b6
+DIST instantclient-sdk-linux.x64-18.3.0.0.0dbru.zip 927118 BLAKE2B 9c6cd889843552cee3e84566d9c1b29369b1e7b20a01fac65676a33d6196b042a4c34cd2df8cf1ec5c8664a403e44e6a283f42912b7e056e093c744bd24ec24f SHA512 c9e1493601ec70541e437ded748f3be24deaa3f1037884fd003907bbab38b3099aef12dda1b9845c3eb3ce3827f743696f5ebe6d8dffe7974088c1329528b729
 DIST instantclient-sqlplus-linux-12.1.0.2.0.zip 828190 BLAKE2B b047e7ea3bbf1390c7ce3ad96c883d6a234798284b91b8ca8de2b086c27128144a0a3fdee2062c826e7e16b5dc263efdaab7e464371ef63deca4d9ffe4f668a7 SHA512 e521f141f0bb4fe62bda6da389a9c1038be879f1456500a9e70ac0a41d4f35cf2051181a03223521aa24ee06a33b67614d3afd91f01099afa0081f2771876d43
 DIST instantclient-sqlplus-linux-12.2.0.1.0.zip 869831 BLAKE2B f6c04823b1a6ac45594f13cc2ef45ab0ed25e5dd68bc33cc6412a578647df4472a71293cadbe1e98ea2983664a083b9b148aea04e717e5039e6def065d1ea583 SHA512 83894a72192ea9ca86d361ba70a6c011f297afa5d186a49fbab7050d9615de300d54b12af8d948fe18a75dcf51bd04f9feaa8460a1c69df9c55f9854e3cee61e
+DIST instantclient-sqlplus-linux-18.3.0.0.0dbru.zip 881315 BLAKE2B 787dd43ffaadd493d8cb3a9a8bbd160f75c51ad07e16d8eb7631e8368b4a8bfe9e574326837724b3573705e1c309cbe0bf364c1b98660534b05f5d72d28b1b11 SHA512 9087e5654143c9da3499fb7f1b8a15b04433cacc0d96257519788b3cd12a0aa480b37fa37fbe55a2f40940ea8da1eeae9881712a87d5942e142c0f29b580e54d
 DIST instantclient-sqlplus-linux.x64-12.1.0.2.0.zip 861284 BLAKE2B fe2c3e3cd90c61aba7220c7782bcb540017aaa82f884b730b0ab3dfce462f866b468cda71106e016f9581a186582701239c282cb52927face949b0c1f8690692 SHA512 ad0af692bcae1231b58c7ea55fa79d85c7a5c9875a805565b1b5956ed30e608d753ac9210f6169ab3ff4e42ac2f1d871ccff47bd2656f7684925136fef1f30c2
 DIST instantclient-sqlplus-linux.x64-12.2.0.1.0.zip 904309 BLAKE2B 5d2dca2c98187674a506808f18ef8032f595d250c2a2577cf0cd7a9d785384a29d612b686575ac15516848792539d362745cc1c8aa321d2c84c10df01c896017 SHA512 7d31a5262138f8ae0429cf08f0743b9c8c7863fc8e6abfa8ef089cee2059da75bf23503f9f1f09c28b82c5209aca27f81da6c890799236307395b59fea3bf012
+DIST instantclient-sqlplus-linux.x64-18.3.0.0.0dbru.zip 915778 BLAKE2B 8d93e462568a5bf5a294a5abcf0a0e30c08e9eef18c01a79b8f716261efbeb14a286d1058ddfa278108daeb49b74a3e296efa83291d7bc03f4ad35428c946701 SHA512 878ac2cf58aaa8cb237779fcd04378c95d738fd444eddd5745838fa86e8cd60f1c2be49f0f4fc3d4b16dca652fe66681ac0907a4aeddec1d9433e63d2f4e5db6
 DIST instantclient-tools-linux-12.1.0.2.0.zip 187088 BLAKE2B 41b68efbbe5925c64a869c71a12a947743e40b7d268c45a1b18c187a8b2179e224cd4ea940248d690b8f334c91afd901c1b3be34b2e8c2748e7f79487890cb60 SHA512 37a9eb3e2fdbbbf32f0fb5d017209db1b62d54efe48a875625e9d6162ea894d93d144358b2360989fa71704b346f86b36f1640a5c98f8aac7c1e6853b2d078fd
 DIST instantclient-tools-linux-12.2.0.1.0.zip 1032131 BLAKE2B 1a5d94b129d2d8a23031daee3882aef0b783c019baa69fcbd2a5d4ca4c97585212580196be158bdccaff2097027ceee881e948604ea2aa15525f36ea16e04ebd SHA512 e547d571bf881e787dc19bf23f82c4396f14dbca35a51a21e4133ff463f3c3c2c308cc2263f55b49ce70604569158266cd88d7ebf8b5cf51c9cd58b2871133e2
+DIST instantclient-tools-linux-18.3.0.0.0dbru.zip 1042756 BLAKE2B 1b1af7abb50b6977e0dd4bc0f2b5e89534cf5bffe216dbe553063761470c45f330f4a72ece428a3e0dc8162cebad3cf0ffa628f4b3879bc434ecda7b7b07570f SHA512 b809b83e2e7dbe19c13611c1eb819fa4648a127ddc8a97abaa794213c7f4b6d28b70956aac4f331389d088c6fccc998d0eda8dc39f2dedc338f3baf03bc3ceac
 DIST instantclient-tools-linux.x64-12.1.0.2.0.zip 203511 BLAKE2B 6482cfa3ba521a5f5ad3e1517037f514daa1f452d8a5b38f0b4c949681a87dc54fe9551f52fcdc4e1ea6d243a808d3bd763147eaa72d9f656274ac7185823754 SHA512 f18ca11300fc20925c72122d03fc00402b9a52b39f7f70cfd3fa97264a1a2a173e7f77059affba98e897546e05c6ac1e3a546ce1c7e63ef049130496d346342b
 DIST instantclient-tools-linux.x64-12.2.0.1.0.zip 1132671 BLAKE2B a9ae6d2cd4e5661cb6a5dbb08cbc08ae4a5c28ce0bcc43db86ebd37997f8b14ec27f76613a1429d9359a765b98b465964bc5d24f1fce1d7964597191be658957 SHA512 1697289fc4b6a37277036dbef1892bd113892fcd3b0f347f0960ef8a1b90f3e91411bb237060e88bfdd418e50600372b710df08d97a4e847fd90d077ed0647d2
+DIST instantclient-tools-linux.x64-18.3.0.0.0dbru.zip 1142609 BLAKE2B 5c915bd940b7bfaa42429710685cfafc5f0189607da2d789f4aaada2bc9d3365ad8e9ee31cc209830fa54b406ffe4b9b2fc2b5e0b6819ff176f7dbb566117a79 SHA512 2c198d9e723b39f7b512217eb08557dfa3c9ae32858acd882df8b9b24beecffe6b44eb089b50341edf01d7e4c0514d4b3de4aa06fa9185aa0538855963c174a4

diff --git a/dev-db/oracle-instantclient/files/18.3.0.0-makefile.patch b/dev-db/oracle-instantclient/files/18.3.0.0-makefile.patch
new file mode 100644
index 00000000000..eb6fc025d78
--- /dev/null
+++ b/dev-db/oracle-instantclient/files/18.3.0.0-makefile.patch
@@ -0,0 +1,40 @@
+Fake demo_xe.mk found in Oracle eXpress Edition,
+known by CPAN DBD::Oracle (bug#165834).
+This provides absolute paths for headers and libraries.
+--- instantclient_18_3/sdk/demo/demo.mk
++++ instantclient_18_3/sdk/demo/demo.mk
+@@ -28,13 +28,18 @@
+ CC=/opt/SunProd/SUNWspro6.1/bin/CC
+ cc=/opt/SunProd/SUNWspro6.1/bin/cc
+ 
+-ICINCHOME=../
+-ICLIBHOME=../../
++ifeq ($(BUILD32),T)
++LIBDIR=lib32
++else
++LIBDIR=lib
++endif
++ICINCHOME=$(ORACLE_HOME)/sdk/include
++ICLIBHOME=$(ORACLE_HOME)/$(LIBDIR)
+ ICLIBPATH=-L$(ICLIBHOME)
+ THREADLIBS=-lthread
+ CCLIB=$(ICLIBPATH) -locci -lclntsh $(THREADLIBS)
+ 
+-CCINCLUDES = -I$(ICINCHOME)include
++CCINCLUDES = -I$(ICINCHOME)
+ 
+ CCFLAGS=$(CCINCLUDES) -D_REENTRANT -g -xs 
+ LDFLAGS=
+@@ -55,10 +60,10 @@
+ OCCIOTTPWD=tiger
+ 
+ .cpp.o:
+-	$(CC) -c -I$(ICINCHOME)include $(CCFLAGS) $<
++	$(CC) -c -I$(ICINCHOME) $(CCFLAGS) $<
+ 
+ .c.o:
+-	$(cc) -c -I$(ICINCHOME)include $(CCFLAGS) $<
++	$(cc) -c -I$(ICINCHOME) $(CCFLAGS) $<
+ 
+ all: clean buildoci $(OCCIDEMO) $(OCCIOBJDEMO)
+ 

diff --git a/dev-db/oracle-instantclient/metadata.xml b/dev-db/oracle-instantclient/metadata.xml
index 4021726b1f0..d13ee6a779f 100644
--- a/dev-db/oracle-instantclient/metadata.xml
+++ b/dev-db/oracle-instantclient/metadata.xml
@@ -5,15 +5,16 @@
 		<email>haubi@gentoo.org</email>
 	</maintainer>
 	<longdescription>
-		Free, light-weight and easily installed Oracle Database libraries
-		and SDKs for building and connecting client applications to local
-		or remote Oracle Databases.
+		Free, light-weight, and easily installed Oracle Database tools,
+		libraries and SDKs for building and connecting applications to
+		an Oracle Database instance.
 	</longdescription>
 	<use>
 		<flag name="jdbc">Support for XA, Internationalization, and RowSet operations under JDBC</flag>
 		<flag name="odbc">Libraries for enabling ODBC applications</flag>
+		<flag name="precomp">"proc" binary and related files to precompile a Pro*C application</flag>
 		<flag name="sdk">Header files and an example makefile for developing Oracle applications</flag>
-		<flag name="sqlplus">Libraries and executable for running SQL*Plus</flag>
-		<flag name="tools">Workload Replay Client</flag>
+		<flag name="sqlplus">The SQL*Plus command line tool for SQL and PL/SQL queries</flag>
+		<flag name="tools">Data Pump, SQL*Loader and Workload Replay Client</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-db/oracle-instantclient/oracle-instantclient-18.3.0.0.ebuild b/dev-db/oracle-instantclient/oracle-instantclient-18.3.0.0.ebuild
new file mode 100644
index 00000000000..0a67edfcb54
--- /dev/null
+++ b/dev-db/oracle-instantclient/oracle-instantclient-18.3.0.0.ebuild
@@ -0,0 +1,342 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit eutils pax-utils multilib-minimal
+
+DESCRIPTION="Oracle 18c Instant Client with SDK"
+HOMEPAGE="https://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html"
+
+MY_SOVER=18.1 # the library soname found in the zip files
+
+IUSE="jdbc odbc precomp +sdk +sqlplus tools"
+REQUIRED_USE="precomp? ( sdk )"
+
+MY_PVM=$(ver_cut 1-2)
+MY_P="instantclient_$(ver_rs 1 _ ${MY_PVM})"
+
+MY_PV=$(ver_cut 1-4)
+MY_PVP=$(ver_cut 5) # p2
+
+MY_PLAT_x86="Linux x86"
+MY_BITS_x86=32
+MY_A_x86="${PN/oracle-/}-basic-linux-${MY_PV}.0dbru.zip"
+MY_A_x86_jdbc="${MY_A_x86/basic/jdbc}"
+MY_A_x86_odbc="${MY_A_x86/basic/odbc}"
+MY_A_x86_precomp="${MY_A_x86/basic/precomp}"
+MY_A_x86_sdk="${MY_A_x86/basic/sdk}"
+MY_A_x86_sqlplus="${MY_A_x86/basic/sqlplus}"
+MY_A_x86_tools="${MY_A_x86/basic/tools}"
+
+MY_PLAT_amd64="Linux x86-64"
+MY_BITS_amd64=64
+MY_A_amd64="${PN/oracle-}-basic-linux.x64-${MY_PV}.0dbru.zip"
+MY_A_amd64_jdbc="${MY_A_amd64/basic/jdbc}"
+MY_A_amd64_odbc="${MY_A_amd64/basic/odbc}"
+MY_A_amd64_precomp="${MY_A_amd64/basic/precomp}"
+MY_A_amd64_sdk="${MY_A_amd64/basic/sdk}"
+MY_A_amd64_sqlplus="${MY_A_amd64/basic/sqlplus}"
+MY_A_amd64_tools="${MY_A_amd64/basic/tools}"
+
+if [[ ${MY_PVP} == p* ]]
+then
+	MY_PVP=-${MY_PVP#p}
+	# Updated 9/22/2017: instantclient-odbc-linux-12.2.0.1.0-2.zip
+	MY_A_x86_odbc="${MY_A_x86_odbc%.zip}${MY_PVP}.zip"
+	MY_A_amd64_odbc="${MY_A_amd64_odbc%.zip}${MY_PVP}.zip"
+fi
+
+SRC_URI="
+	abi_x86_32? (
+		${MY_A_x86}
+		jdbc?    ( ${MY_A_x86_jdbc}    )
+		odbc?    ( ${MY_A_x86_odbc}    )
+		precomp? ( ${MY_A_x86_precomp} )
+		!abi_x86_64? (
+			sdk?     ( ${MY_A_x86_sdk}     )
+			sqlplus? ( ${MY_A_x86_sqlplus} )
+			tools?   ( ${MY_A_x86_tools}   )
+	) )
+	abi_x86_64? (
+		${MY_A_amd64}
+		jdbc?    ( ${MY_A_amd64_jdbc}    )
+		odbc?    ( ${MY_A_amd64_odbc}    )
+		precomp? ( ${MY_A_amd64_precomp} )
+		sdk?     ( ${MY_A_amd64_sdk}     )
+		sqlplus? ( ${MY_A_amd64_sqlplus} )
+		tools?   ( ${MY_A_amd64_tools}   )
+	)
+"
+
+LICENSE="OTN"
+SLOT="0/${MY_SOVER}"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="fetch splitdebug"
+
+DEPEND="app-arch/unzip"
+RDEPEND="
+	>=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]
+	!<dev-db/oracle-instantclient-basic-12
+	!<dev-db/oracle-instantclient-odbc-12
+	!<dev-db/oracle-instantclient-jdbc-12
+	!<dev-db/oracle-instantclient-sqlplus-12
+"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_PREBUILT="usr/lib*/oracle/client/*/*"
+
+set_my_abivars() {
+	if multilib_is_native_abi; then
+		MY_WORKDIR="${WORKDIR}"
+		MY_S="${S}"
+	else
+		MY_WORKDIR="${WORKDIR}/${ABI}"
+		MY_S="${MY_WORKDIR}/${MY_P}"
+	fi
+
+	local abi=${ABI}
+	[[ ${abi} == 'default' ]] && abi=${ARCH}
+	MY_PLAT=MY_PLAT_${abi}          ; MY_PLAT=${!MY_PLAT}         # platform name
+	MY_BITS=MY_BITS_${abi}          ; MY_BITS=${!MY_BITS}         # platform bitwidth
+	MY_A=MY_A_${abi}                ; MY_A=${!MY_A}               # runtime distfile
+	MY_A_jdbc=MY_A_${abi}_jdbc      ; MY_A_jdbc=${!MY_A_jdbc}       # jdbc distfile
+	MY_A_odbc=MY_A_${abi}_odbc      ; MY_A_odbc=${!MY_A_odbc}       # odbc distfile
+	MY_A_precomp=MY_A_${abi}_precomp; MY_A_precomp=${!MY_A_precomp} # precomp distfile
+	MY_A_sdk=MY_A_${abi}_sdk        ; MY_A_sdk=${!MY_A_sdk}         # sdk distfile
+	MY_A_sqlplus=MY_A_${abi}_sqlplus; MY_A_sqlplus=${!MY_A_sqlplus} # sqlplus distfile
+	MY_A_tools=MY_A_${abi}_tools    ; MY_A_tools=${!MY_A_tools}     # tools distfile
+
+	[[ -n ${MY_PLAT} ]]
+}
+
+oic_distfile_status() {
+	: # We must not access DISTDIR in pkg_* phase, bug#612966.
+# Not removing this lines yet, we may eventually specify this feature.
+#	if [[ -r ${DISTDIR}/${1} ]]; then
+#		echo "already here"
+#	else
+#		echo "still absent"
+#	fi
+}
+
+pkg_nofetch() {
+	eerror "Please go to"
+	eerror "  ${HOMEPAGE//overview/downloads}"
+	eerror "  and download"
+	local ABI
+	for ABI in $(multilib_get_enabled_abis)
+	do
+		set_my_abivars || continue
+		eerror "Instant Client for ${MY_PLAT}"
+		# convenient ordering like Linux x86-64 download site
+		eerror "            Basic: $(oic_distfile_status ${MY_A}) ${MY_A}"
+		use sqlplus && multilib_is_native_abi &&
+		eerror "         SQL*Plus: $(oic_distfile_status ${MY_A_sqlplus}) ${MY_A_sqlplus}"
+		use tools && multilib_is_native_abi &&
+		eerror "            Tools: $(oic_distfile_status ${MY_A_tools}) ${MY_A_tools}"
+		use sdk && multilib_is_native_abi &&
+		eerror "              SDK: $(oic_distfile_status ${MY_A_sdk}) ${MY_A_sdk}"
+		use jdbc &&
+		eerror "             JDBC: $(oic_distfile_status ${MY_A_jdbc}) ${MY_A_jdbc}"
+		use odbc &&
+		eerror "             ODBC: $(oic_distfile_status ${MY_A_odbc}) ${MY_A_odbc}"
+		use precomp &&
+		eerror "      Precompiler: $(oic_distfile_status ${MY_A_precomp}) ${MY_A_precomp}"
+	done
+	eerror "After downloading these files (for *all* shown architectures),"
+	eerror "put them in your DISTDIR filesystem directory."
+}
+
+src_unpack() {
+	local ABI
+	for ABI in $(multilib_get_enabled_abis)
+	do
+		set_my_abivars || continue
+		mkdir -p "${MY_WORKDIR}" || die
+		cd "${MY_WORKDIR}" || die
+		unpack ${MY_A}
+		use jdbc    && unpack ${MY_A_jdbc}
+		use odbc    && unpack ${MY_A_odbc}
+		use precomp && unpack ${MY_A_precomp}
+		if multilib_is_native_abi; then
+			use sdk     && unpack ${MY_A_sdk}
+			use sqlplus && unpack ${MY_A_sqlplus}
+			use tools   && unpack ${MY_A_tools}
+		fi
+	done
+}
+
+src_prepare() {
+	if use sdk; then
+		rm sdk/include/ldap.h || die #299562
+		PATCHES=( "${FILESDIR}"/18.3.0.0-makefile.patch )
+	fi
+	default
+}
+
+# silence configure&compile messages from multilib-minimal
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	# all content goes here without version number, bug#578402
+	local oracle_home=/usr/$(get_libdir)/oracle/client
+	local ldpath=
+
+	local ABI
+	for ABI in $(multilib_get_enabled_abis) # last iteration is final ABI
+	do
+		if ! set_my_abivars; then
+			elog "Skipping unsupported ABI ${ABI}."
+			continue
+		fi
+		einfo "Installing runtime for ${MY_PLAT} ..."
+
+		cd "${MY_S}" || die
+
+		# shared libraries
+		into "${oracle_home}"
+		dolib.so lib*$(get_libname)*
+		use precomp && dolib.a cobsqlintf.o
+
+		# ensure to be linkable
+		[[ -e libocci$(get_libname) ]] ||
+		dosym libocci$(get_libname ${MY_SOVER}) \
+			"${oracle_home}"/$(get_libdir)/libocci$(get_libname)
+		[[ -e libclntsh$(get_libname) ]] ||
+		dosym libclntsh$(get_libname ${MY_SOVER}) \
+			"${oracle_home}"/$(get_libdir)/libclntsh$(get_libname)
+
+		# java archives
+		insinto "${oracle_home}"/$(get_libdir)
+		doins *.jar
+
+		# runtime library path
+		ldpath+=${ldpath:+:}${oracle_home}/$(get_libdir)
+
+		# Vanilla filesystem layout does not support multilib
+		# installation, so we need to move the libs into the
+		# ABI specific libdir.  However, ruby-oci8 build system
+		# detects an instantclient along the libraries, and
+		# does expect the sdk right there.
+		use sdk && dosym ../sdk "${oracle_home}"/$(get_libdir)/sdk
+
+		eend $?
+	done
+
+	local DOCS=( BASIC_README )
+	local HTML_DOCS=()
+	local paxbins=( adrci genezi uidrvci )
+	local scripts=()
+
+	if use jdbc; then
+		DOCS+=( JDBC_README )
+	fi
+	if use odbc; then
+		DOCS+=( ODBC_README )
+		HTML_DOCS+=( help )
+		scripts+=( odbc_update_ini.sh )
+	fi
+	if use precomp; then
+		DOCS+=( PRECOMP_README )
+		paxbins+=( sdk/{proc,procob,rtsora} )
+		insinto "${oracle_home}/precomp/admin"
+		doins precomp/admin/{pcs,pcb}cfg.cfg
+	fi
+	if use sdk; then
+		einfo "Installing SDK ..."
+		DOCS+=( sdk/SDK_README )
+		scripts+=( sdk/ott )
+		insinto "${oracle_home}"/$(get_libdir)
+		doins sdk/ottclasses.zip
+		insinto "${oracle_home}"/sdk
+		doins -r sdk/{admin,demo,include}
+
+		# The build system in DBD::Oracle perl module would detect
+		# an instantclient along the sharedlibs in ORACLE_HOME, which
+		# we cannot provide. But it also knows Oracle eXpress Edition's
+		# layout - which we emulate enough here to let DBD::Oracle work.
+		dosym ../../sdk/demo/demo.mk "${oracle_home}"/rdbms/demo/demo_xe.mk
+
+		# some build systems expect the headers here, also see bug#652096
+		dosym "${oracle_home}"/sdk/include /usr/include/oracle/${MY_PVM}/client
+
+		eend $?
+	fi
+	if use sqlplus; then
+		DOCS+=( SQLPLUS_README )
+		paxbins+=( sqlplus )
+		insinto "${oracle_home}"/sqlplus/admin
+		doins glogin.sql
+		dosym "${oracle_home}"/bin/sqlplus /usr/bin/sqlplus
+	fi
+	if use tools; then
+		DOCS+=( TOOLS_README )
+		paxbins+=( exp expdp imp impdp sqlldr wrc )
+	fi
+
+	einfo "Installing binaries for ${MY_PLAT} ..."
+	into "${oracle_home}"
+	dobin ${paxbins[*]} ${scripts[*]}
+	pushd "${ED}${oracle_home}/bin" >/dev/null || die
+	pax-mark -c ${paxbins[*]#*/} || die
+	popd >/dev/null || die
+	eend $?
+
+	einstalldocs
+
+	# create path for tnsnames.ora
+	insinto /etc/oracle
+	doins "${FILESDIR}"/tnsnames.ora.sample
+
+	# Add OCI libs to library path
+	{
+		echo "# ${EPREFIX}/etc/env.d/50${PN}"
+		echo "# Do not edit this file, but 99${PN} instead"
+		echo
+		echo "ORACLE_HOME=${EPREFIX}${oracle_home}"
+		echo "LDPATH=${ldpath}"
+		echo "TNS_ADMIN=${EPREFIX}/etc/oracle/"
+	} > "${T}"/50${PN}
+
+	doenvd "${T}"/50${PN}
+
+	# ensure ORACLE_HOME/lib exists
+	[[ -e ${ED}${oracle_home}/lib/. ]] ||
+	dosym $(get_libdir) "${oracle_home#/}"/lib
+}
+
+pkg_preinst() {
+	if [[ -r ${EROOT}/etc/env.d/99${PN} ]]; then
+		cp "${EROOT}/etc/env.d/99${PN}" "${ED}/etc/env.d/" || die
+	else
+		{
+			echo "# ${EPREFIX}/etc/env.d/99${PN}"
+			echo "# Configure system-wide defaults for your Oracle Instant Client here"
+			echo
+			echo "#$(grep '^ORACLE_HOME=' "${ED}/etc/env.d/50${PN}")"
+			echo "#$(grep '^TNS_ADMIN=' "${ED}/etc/env.d/50${PN}")"
+			echo "#NLS_LANG="
+		} > "${ED}/etc/env.d/99${PN}"
+	fi
+}
+
+pkg_postinst() {
+	elog "${P} does not provide an sqlnet.ora"
+	elog "configuration file, redirecting oracle diagnostics for database-"
+	elog "and network-issues into ~USER/oradiag_USER/ instead."
+	elog "It should be safe to ignore this message in sqlnet.log there:"
+	elog "   Directory does not exist for read/write [ORACLE_HOME/client/log] []"
+	elog "See https://bugs.gentoo.org/show_bug.cgi?id=465252 for reference."
+	elog "If you want to directly analyse low-level debug info or don't want"
+	elog "to see it at all, so you really need an sqlnet.ora file, please"
+	elog "consult http://search.oracle.com/search/search?q=sqlnet.ora"
+	elog ""
+	elog "TNS_ADMIN has been set to ${EPREFIX}/etc/oracle by default,"
+	elog "put your tnsnames.ora there or configure TNS_ADMIN"
+	elog "to point to your user specific configuration."
+	ewarn "Please re-source your shell settings for ORACLE_HOME"
+	ewarn "  changes, such as: source ${EPREFIX}/etc/profile"
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-db/oracle-instantclient/, dev-db/oracle-instantclient/files/
@ 2018-10-22 12:24 Michael Haubenwallner
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Haubenwallner @ 2018-10-22 12:24 UTC (permalink / raw
  To: gentoo-commits

commit:     e1a42dfb7912831eb273d0356822b3870f5fdb7a
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 22 12:21:17 2018 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Oct 22 12:22:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1a42dfb

dev-db/oracle-instantclient: fix precomp install

With credits to Stefan Gast in bug#597520, tweak paths in
demo_proc_ic.mk and pcscfg.cfg, move the latter to /etc/oracle/,
and do not install the Pro*COBOL precompiler, but Pro*C only.
Also, use relative paths for symlinks.
Closes https://bugs.gentoo.org/597520

Package-Manager: Portage-2.3.49, Repoman-2.3.10
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 .../files/18.3.0.0-makefile.patch                  |   2 +-
 .../files/18.3.0.0-proc-makefile.patch             |  27 ++
 .../oracle-instantclient-18.3.0.0-r1.ebuild        | 375 +++++++++++++++++++++
 3 files changed, 403 insertions(+), 1 deletion(-)

diff --git a/dev-db/oracle-instantclient/files/18.3.0.0-makefile.patch b/dev-db/oracle-instantclient/files/18.3.0.0-makefile.patch
index eb6fc025d78..bc4445fe354 100644
--- a/dev-db/oracle-instantclient/files/18.3.0.0-makefile.patch
+++ b/dev-db/oracle-instantclient/files/18.3.0.0-makefile.patch
@@ -14,7 +14,7 @@ This provides absolute paths for headers and libraries.
 +else
 +LIBDIR=lib
 +endif
-+ICINCHOME=$(ORACLE_HOME)/sdk/include
++ICINCHOME=$(ORACLE_HOME)/include
 +ICLIBHOME=$(ORACLE_HOME)/$(LIBDIR)
  ICLIBPATH=-L$(ICLIBHOME)
  THREADLIBS=-lthread

diff --git a/dev-db/oracle-instantclient/files/18.3.0.0-proc-makefile.patch b/dev-db/oracle-instantclient/files/18.3.0.0-proc-makefile.patch
new file mode 100644
index 00000000000..a197c2c7236
--- /dev/null
+++ b/dev-db/oracle-instantclient/files/18.3.0.0-proc-makefile.patch
@@ -0,0 +1,27 @@
+--- instantclient_18_3/sdk/demo/demo_proc_ic.mk.orig	2018-10-22 13:34:44.302293002 +0200
++++ instantclient_18_3/sdk/demo/demo_proc_ic.mk	2018-10-22 13:38:55.015321571 +0200
+@@ -37,8 +37,13 @@
+ cc=/usr/bin/gcc
+ 
+ # InstantClient Directories.
+-ICSDKHOME=../
+-ICLIBHOME=../../
++ifeq ($(BUILD32),T)
++LIBDIR=lib32
++else
++LIBDIR=lib
++endif
++ICSDKHOME=$(ORACLE_HOME)/
++ICLIBHOME=$(ORACLE_HOME)/$(LIBDIR)
+ 
+ MKLINK=ln
+ REMOVE=rm -rf
+@@ -48,7 +53,7 @@
+ MAKEFILE=demo_proc_ic.mk
+ PROCDEMO=procdemo
+ 
+-PROC=$(ICSDKHOME)proc
++PROC=$(ICSDKHOME)bin/proc
+ SO_EXT=.so
+ I_SYM=-I
+ 

diff --git a/dev-db/oracle-instantclient/oracle-instantclient-18.3.0.0-r1.ebuild b/dev-db/oracle-instantclient/oracle-instantclient-18.3.0.0-r1.ebuild
new file mode 100644
index 00000000000..160831003b5
--- /dev/null
+++ b/dev-db/oracle-instantclient/oracle-instantclient-18.3.0.0-r1.ebuild
@@ -0,0 +1,375 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit eutils pax-utils multilib-minimal
+
+DESCRIPTION="Oracle 18c Instant Client with SDK"
+HOMEPAGE="https://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html"
+
+MY_SOVER=18.1 # the library soname found in the zip files
+
+IUSE="jdbc odbc precomp +sdk +sqlplus tools"
+REQUIRED_USE="precomp? ( sdk )"
+
+MY_PVM=$(ver_cut 1-2)
+MY_P="instantclient_$(ver_rs 1 _ ${MY_PVM})"
+
+MY_PV=$(ver_cut 1-4)
+MY_PVP=$(ver_cut 5) # p2
+
+MY_PLAT_x86="Linux x86"
+MY_BITS_x86=32
+MY_A_x86="${PN/oracle-/}-basic-linux-${MY_PV}.0dbru.zip"
+MY_A_x86_jdbc="${MY_A_x86/basic/jdbc}"
+MY_A_x86_odbc="${MY_A_x86/basic/odbc}"
+MY_A_x86_precomp="${MY_A_x86/basic/precomp}"
+MY_A_x86_sdk="${MY_A_x86/basic/sdk}"
+MY_A_x86_sqlplus="${MY_A_x86/basic/sqlplus}"
+MY_A_x86_tools="${MY_A_x86/basic/tools}"
+
+MY_PLAT_amd64="Linux x86-64"
+MY_BITS_amd64=64
+MY_A_amd64="${PN/oracle-}-basic-linux.x64-${MY_PV}.0dbru.zip"
+MY_A_amd64_jdbc="${MY_A_amd64/basic/jdbc}"
+MY_A_amd64_odbc="${MY_A_amd64/basic/odbc}"
+MY_A_amd64_precomp="${MY_A_amd64/basic/precomp}"
+MY_A_amd64_sdk="${MY_A_amd64/basic/sdk}"
+MY_A_amd64_sqlplus="${MY_A_amd64/basic/sqlplus}"
+MY_A_amd64_tools="${MY_A_amd64/basic/tools}"
+
+if [[ ${MY_PVP} == p* ]]
+then
+	MY_PVP=-${MY_PVP#p}
+	# Updated 9/22/2017: instantclient-odbc-linux-12.2.0.1.0-2.zip
+	MY_A_x86_odbc="${MY_A_x86_odbc%.zip}${MY_PVP}.zip"
+	MY_A_amd64_odbc="${MY_A_amd64_odbc%.zip}${MY_PVP}.zip"
+fi
+
+SRC_URI="
+	abi_x86_32? (
+		${MY_A_x86}
+		jdbc?    ( ${MY_A_x86_jdbc}    )
+		odbc?    ( ${MY_A_x86_odbc}    )
+		precomp? ( ${MY_A_x86_precomp} )
+		!abi_x86_64? (
+			sdk?     ( ${MY_A_x86_sdk}     )
+			sqlplus? ( ${MY_A_x86_sqlplus} )
+			tools?   ( ${MY_A_x86_tools}   )
+	) )
+	abi_x86_64? (
+		${MY_A_amd64}
+		jdbc?    ( ${MY_A_amd64_jdbc}    )
+		odbc?    ( ${MY_A_amd64_odbc}    )
+		precomp? ( ${MY_A_amd64_precomp} )
+		sdk?     ( ${MY_A_amd64_sdk}     )
+		sqlplus? ( ${MY_A_amd64_sqlplus} )
+		tools?   ( ${MY_A_amd64_tools}   )
+	)
+"
+
+LICENSE="OTN"
+SLOT="0/${MY_SOVER}"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="fetch splitdebug"
+
+DEPEND="app-arch/unzip"
+RDEPEND="
+	>=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]
+	!<dev-db/oracle-instantclient-basic-12
+	!<dev-db/oracle-instantclient-odbc-12
+	!<dev-db/oracle-instantclient-jdbc-12
+	!<dev-db/oracle-instantclient-sqlplus-12
+"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_PREBUILT="usr/lib*/oracle/client/*/*"
+
+set_my_abivars() {
+	if multilib_is_native_abi; then
+		MY_WORKDIR="${WORKDIR}"
+		MY_S="${S}"
+	else
+		MY_WORKDIR="${WORKDIR}/${ABI}"
+		MY_S="${MY_WORKDIR}/${MY_P}"
+	fi
+
+	local abi=${ABI}
+	[[ ${abi} == 'default' ]] && abi=${ARCH}
+	MY_PLAT=MY_PLAT_${abi}          ; MY_PLAT=${!MY_PLAT}         # platform name
+	MY_BITS=MY_BITS_${abi}          ; MY_BITS=${!MY_BITS}         # platform bitwidth
+	MY_A=MY_A_${abi}                ; MY_A=${!MY_A}               # runtime distfile
+	MY_A_jdbc=MY_A_${abi}_jdbc      ; MY_A_jdbc=${!MY_A_jdbc}       # jdbc distfile
+	MY_A_odbc=MY_A_${abi}_odbc      ; MY_A_odbc=${!MY_A_odbc}       # odbc distfile
+	MY_A_precomp=MY_A_${abi}_precomp; MY_A_precomp=${!MY_A_precomp} # precomp distfile
+	MY_A_sdk=MY_A_${abi}_sdk        ; MY_A_sdk=${!MY_A_sdk}         # sdk distfile
+	MY_A_sqlplus=MY_A_${abi}_sqlplus; MY_A_sqlplus=${!MY_A_sqlplus} # sqlplus distfile
+	MY_A_tools=MY_A_${abi}_tools    ; MY_A_tools=${!MY_A_tools}     # tools distfile
+
+	[[ -n ${MY_PLAT} ]]
+}
+
+oic_distfile_status() {
+	: # We must not access DISTDIR in pkg_* phase, bug#612966.
+# Not removing this lines yet, we may eventually specify this feature.
+#	if [[ -r ${DISTDIR}/${1} ]]; then
+#		echo "already here"
+#	else
+#		echo "still absent"
+#	fi
+}
+
+pkg_nofetch() {
+	eerror "Please go to"
+	eerror "  ${HOMEPAGE//overview/downloads}"
+	eerror "  and download"
+	local ABI
+	for ABI in $(multilib_get_enabled_abis)
+	do
+		set_my_abivars || continue
+		eerror "Instant Client for ${MY_PLAT}"
+		# convenient ordering like Linux x86-64 download site
+		eerror "            Basic: $(oic_distfile_status ${MY_A}) ${MY_A}"
+		use sqlplus && multilib_is_native_abi &&
+		eerror "         SQL*Plus: $(oic_distfile_status ${MY_A_sqlplus}) ${MY_A_sqlplus}"
+		use tools && multilib_is_native_abi &&
+		eerror "            Tools: $(oic_distfile_status ${MY_A_tools}) ${MY_A_tools}"
+		use sdk && multilib_is_native_abi &&
+		eerror "              SDK: $(oic_distfile_status ${MY_A_sdk}) ${MY_A_sdk}"
+		use jdbc &&
+		eerror "             JDBC: $(oic_distfile_status ${MY_A_jdbc}) ${MY_A_jdbc}"
+		use odbc &&
+		eerror "             ODBC: $(oic_distfile_status ${MY_A_odbc}) ${MY_A_odbc}"
+		use precomp &&
+		eerror "      Precompiler: $(oic_distfile_status ${MY_A_precomp}) ${MY_A_precomp}"
+	done
+	eerror "After downloading these files (for *all* shown architectures),"
+	eerror "put them in your DISTDIR filesystem directory."
+}
+
+src_unpack() {
+	local ABI
+	for ABI in $(multilib_get_enabled_abis)
+	do
+		set_my_abivars || continue
+		mkdir -p "${MY_WORKDIR}" || die
+		cd "${MY_WORKDIR}" || die
+		unpack ${MY_A}
+		use jdbc    && unpack ${MY_A_jdbc}
+		use odbc    && unpack ${MY_A_odbc}
+		use precomp && unpack ${MY_A_precomp}
+		if multilib_is_native_abi; then
+			use sdk     && unpack ${MY_A_sdk}
+			use sqlplus && unpack ${MY_A_sqlplus}
+			use tools   && unpack ${MY_A_tools}
+		fi
+	done
+}
+
+src_prepare() {
+	local PATCHES=()
+	if use precomp; then
+		PATCHES+=( "${FILESDIR}"/18.3.0.0-proc-makefile.patch )
+		# Not supporting COBOL for now
+		rm -f sdk/demo/*procob*
+	fi
+	if use sdk; then
+		PATCHES+=( "${FILESDIR}"/18.3.0.0-makefile.patch )
+		rm sdk/include/ldap.h || die #299562
+	fi
+	default
+}
+
+# silence configure&compile messages from multilib-minimal
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	# all content goes here without version number, bug#578402
+	local oracle_home=/usr/$(get_libdir)/oracle/client
+	local oracle_home_to_root=../../../.. # for dosym
+	local ldpath=
+
+	local ABI
+	for ABI in $(multilib_get_enabled_abis) # last iteration is final ABI
+	do
+		if ! set_my_abivars; then
+			elog "Skipping unsupported ABI ${ABI}."
+			continue
+		fi
+		einfo "Installing runtime for ${MY_PLAT} ..."
+
+		cd "${MY_S}" || die
+
+		# shared libraries
+		into "${oracle_home}"
+		dolib.so lib*$(get_libname)*
+		use precomp && dolib.a cobsqlintf.o
+
+		# ensure to be linkable
+		[[ -e libocci$(get_libname) ]] ||
+		dosym libocci$(get_libname ${MY_SOVER}) \
+			"${oracle_home}"/$(get_libdir)/libocci$(get_libname)
+		[[ -e libclntsh$(get_libname) ]] ||
+		dosym libclntsh$(get_libname ${MY_SOVER}) \
+			"${oracle_home}"/$(get_libdir)/libclntsh$(get_libname)
+
+		# java archives
+		insinto "${oracle_home}"/$(get_libdir)
+		doins *.jar
+
+		# runtime library path
+		ldpath+=${ldpath:+:}${oracle_home}/$(get_libdir)
+
+		# Vanilla filesystem layout does not support multilib
+		# installation, so we need to move the libs into the
+		# ABI specific libdir.  However, ruby-oci8 build system
+		# detects an instantclient along the libraries, and
+		# does expect the sdk right there.
+		use sdk && dosym ../sdk "${oracle_home}"/$(get_libdir)/sdk
+
+		eend $?
+	done
+
+	local DOCS=( BASIC_README )
+	local HTML_DOCS=()
+	local paxbins=( adrci genezi uidrvci )
+	local scripts=()
+
+	if use jdbc; then
+		DOCS+=( JDBC_README )
+	fi
+	if use odbc; then
+		DOCS+=( ODBC_README )
+		HTML_DOCS+=( help )
+		scripts+=( odbc_update_ini.sh )
+	fi
+	if use precomp; then
+		DOCS+=( PRECOMP_README )
+		paxbins+=( sdk/proc )
+		# Install pcscfg.cfg into /etc/oracle, as the user probably
+		# wants to add the include path for the compiler headers
+		# here and we do not want this to be overwritten.
+		insinto /etc/oracle
+		doins precomp/admin/pcscfg.cfg
+		sed -i -e "s%^sys_include=.*%sys_include=(${oracle_home}/include,${EPREFIX}/usr/include)%" \
+			"${ED}"/etc/oracle/pcscfg.cfg || die
+		dosym ../../${oracle_home_to_root}/etc/oracle/pcscfg.cfg "${oracle_home}/precomp/admin/pcscfg.cfg"
+		dosym ../.."${oracle_home}"/bin/proc /usr/bin/proc
+		# Not supporting COBOL for now
+		# paxbins+=( sdk/{procob,rtsora} )
+		# doins precomp/admin/pcbcfg.cfg
+	fi
+	if use sdk; then
+		einfo "Installing SDK ..."
+		DOCS+=( sdk/SDK_README )
+		scripts+=( sdk/ott )
+		insinto "${oracle_home}"/$(get_libdir)
+		doins sdk/ottclasses.zip
+		insinto "${oracle_home}"/sdk
+		doins -r sdk/{admin,demo,include}
+		dosym sdk/include "${oracle_home}"/include
+
+		# The build system in DBD::Oracle perl module would detect
+		# an instantclient along the sharedlibs in ORACLE_HOME, which
+		# we cannot provide. But it also knows Oracle eXpress Edition's
+		# layout - which we emulate enough here to let DBD::Oracle work.
+		dosym ../../sdk/demo/demo.mk "${oracle_home}"/rdbms/demo/demo_xe.mk
+
+		# some build systems expect the headers here, also see bug#652096
+		dosym ../../../.."${oracle_home}"/sdk/include /usr/include/oracle/${MY_PVM}/client
+
+		eend $?
+	fi
+	if use sqlplus; then
+		DOCS+=( SQLPLUS_README )
+		paxbins+=( sqlplus )
+		insinto "${oracle_home}"/sqlplus/admin
+		doins glogin.sql
+		dosym ../.."${oracle_home}"/bin/sqlplus /usr/bin/sqlplus
+	fi
+	if use tools; then
+		DOCS+=( TOOLS_README )
+		paxbins+=( exp expdp imp impdp sqlldr wrc )
+	fi
+
+	einfo "Installing binaries for ${MY_PLAT} ..."
+	into "${oracle_home}"
+	dobin ${paxbins[*]} ${scripts[*]}
+	pushd "${ED}${oracle_home}/bin" >/dev/null || die
+	pax-mark -c ${paxbins[*]#*/} || die
+	popd >/dev/null || die
+	eend $?
+
+	einstalldocs
+
+	# create path for tnsnames.ora
+	insinto /etc/oracle
+	doins "${FILESDIR}"/tnsnames.ora.sample
+
+	# Add OCI libs to library path
+	{
+		echo "# ${EPREFIX}/etc/env.d/50${PN}"
+		echo "# Do not edit this file, but 99${PN} instead"
+		echo
+		echo "ORACLE_HOME=${EPREFIX}${oracle_home}"
+		echo "LDPATH=${ldpath}"
+		echo "TNS_ADMIN=${EPREFIX}/etc/oracle/"
+	} > "${T}"/50${PN}
+
+	doenvd "${T}"/50${PN}
+
+	# ensure ORACLE_HOME/lib exists
+	[[ -e ${ED}${oracle_home}/lib/. ]] ||
+	dosym $(get_libdir) "${oracle_home#/}"/lib
+}
+
+pkg_preinst() {
+	if [[ -r ${EROOT}/etc/env.d/99${PN} ]]; then
+		cp "${EROOT}/etc/env.d/99${PN}" "${ED}/etc/env.d/" || die
+	else
+		{
+			echo "# ${EPREFIX}/etc/env.d/99${PN}"
+			echo "# Configure system-wide defaults for your Oracle Instant Client here"
+			echo
+			echo "#$(grep '^ORACLE_HOME=' "${ED}/etc/env.d/50${PN}")"
+			echo "#$(grep '^TNS_ADMIN=' "${ED}/etc/env.d/50${PN}")"
+			echo "#NLS_LANG="
+		} > "${ED}/etc/env.d/99${PN}"
+	fi
+}
+
+pkg_postinst() {
+	elog "${P} does not provide an sqlnet.ora"
+	elog "configuration file, redirecting oracle diagnostics for database-"
+	elog "and network-issues into ~USER/oradiag_USER/ instead."
+	elog "It should be safe to ignore this message in sqlnet.log there:"
+	elog "   Directory does not exist for read/write [ORACLE_HOME/client/log] []"
+	elog "See https://bugs.gentoo.org/show_bug.cgi?id=465252 for reference."
+	elog "If you want to directly analyse low-level debug info or don't want"
+	elog "to see it at all, so you really need an sqlnet.ora file, please"
+	elog "consult http://search.oracle.com/search/search?q=sqlnet.ora"
+	elog ""
+	elog "TNS_ADMIN has been set to ${EPREFIX}/etc/oracle by default,"
+	elog "put your tnsnames.ora there or configure TNS_ADMIN"
+	elog "to point to your user specific configuration."
+	if use precomp; then
+		elog ""
+		elog "The proc precompiler uses the system library headers, which in"
+		elog "turn include the headers of the used compiler."
+		elog "To make proc work, please add the compiler header path of your"
+		elog "preferred compiler to sys_include in:"
+		elog "  ${EPREFIX}/etc/oracle/pcscfg.cfg"
+		elog "Remember to update this setting when you switch or update the"
+		elog "compiler."
+		elog "For gcc, the headers are usually found in a path matching the"
+		elog "following pattern:"
+		elog "  ${EPREFIX}/usr/lib/gcc/*/*/include"
+		elog "The exact details depend on the architecture and the version of"
+		elog "the compiler to be used."
+	fi
+	ewarn "Please re-source your shell settings for ORACLE_HOME"
+	ewarn "  changes, such as: source ${EPREFIX}/etc/profile"
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-db/oracle-instantclient/, dev-db/oracle-instantclient/files/
@ 2019-07-31 14:29 Michael Haubenwallner
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Haubenwallner @ 2019-07-31 14:29 UTC (permalink / raw
  To: gentoo-commits

commit:     a5411c08059b409a9a415e293de546e3a057b0aa
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 14:07:52 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 14:28:39 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5411c08

dev-db/oracle-instantclient: old

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 dev-db/oracle-instantclient/Manifest               |  24 --
 .../files/12.1.0.2-makefile.patch                  |  57 ----
 .../oracle-instantclient-12.1.0.2.ebuild           | 303 -----------------
 .../oracle-instantclient-12.2.0.1_p2.ebuild        | 315 -----------------
 .../oracle-instantclient-18.3.0.0-r1.ebuild        | 375 ---------------------
 .../oracle-instantclient-18.3.0.0.ebuild           | 342 -------------------
 6 files changed, 1416 deletions(-)

diff --git a/dev-db/oracle-instantclient/Manifest b/dev-db/oracle-instantclient/Manifest
index cf06bc7842c..4eede588a59 100644
--- a/dev-db/oracle-instantclient/Manifest
+++ b/dev-db/oracle-instantclient/Manifest
@@ -1,27 +1,15 @@
-DIST instantclient-basic-linux-12.1.0.2.0.zip 59727331 BLAKE2B 8a4beb891fd6693b74be4f575bff3af7f70cb751a9fbfab80aa145737008cc745f83f2ec349a5959fcaac9aa789210ecd6da88e0eea63d23ce62fcb402274ea8 SHA512 5d93c72c43ba2ca765209f4c1d518b9e93c80ff33625bf0bc33b974413e2b91ab22681e0922d2148fbfa6b6043fe84eee5334aa398e1ee7b1c2663ff2b3bb235
-DIST instantclient-basic-linux-12.2.0.1.0.zip 64594237 BLAKE2B bd74522486ec6be857ed83e23a1a64a2794dc14ac184ef9dd4324fc4b9d0d61be8b6b70e32cfe814c6c8972bc7c9aef1d48a60180b8310d861fa66179027c391 SHA512 35cdd84765f1e020cd1e7fe3a765449bcad1c3b09189ab64f6a969da27d7ff2932bad319037ec066615e672d2b3105d4c36b42ec30ab60d6c577a2796908d22b
 DIST instantclient-basic-linux-18.3.0.0.0dbru.zip 67930600 BLAKE2B 70d9c54a8df66859d40e4374cd3073613fbf3656850373ada6c9707a7076e0d0749e3b1a84e2d46d18643f80020ecf8c525224433c946946787388dc3f57c79c SHA512 3e1bda593c14d14942c7bf8393111792df01bc9d5a15ae0b4010bd29d71bda4ab044dca6741d00185976c70790fc24b5221afc436d33abe6277e7513cb8bd859
 DIST instantclient-basic-linux-19.3.0.0.0dbru.zip 69597591 BLAKE2B 4ac954c027a83c1a05b502203f1465bb29bb4e58486a98bec7848d9ae0bed6835fdc6bb5f889cc9dadc815d47e5e06258c11a6ab1fd045bd7a878858f3d1164b SHA512 d9a7c664cae598344ec7b9e9c43def9626dcc0d54d478843a5145dfb3dad5df51121c5b2e9f4bb48a240611981f7721441344649d1f267b667356271ac778beb
-DIST instantclient-basic-linux.x64-12.1.0.2.0.zip 63352239 BLAKE2B 88042fbdccc6b79e8ed82f78f47ac985af413c53b9f2c9654a8ab10008ca9f7cdc4c46a12af5eca6aca47f27bd4d28ee465cd6ed91076268a361faa247440162 SHA512 e4cbdf40f00521651002f0753ead292b7a33352a7dae5d77635fbdb784451a1b9331ad614326dccdea34ecff3d44ddd0932b83c4bd405e69d95c7decae945f2c
-DIST instantclient-basic-linux.x64-12.2.0.1.0.zip 68965195 BLAKE2B 11e4a995f00ec4f218fe08ddd139c6d60b28bd9ffb78ce566be989eb5d229e5186e60406598b78067f480755e49bbeb6675dd3081186599fc0cac89e66a6f2eb SHA512 13f9b80d1021309fa48ca6c9dd6406ba6f97dcd611f786e940db42eeaba40cdf603b108954b9b3195f830e49377593e31b04f8d9310f619418bcd129b39f2ff1
 DIST instantclient-basic-linux.x64-18.3.0.0.0dbru.zip 72794506 BLAKE2B 22db5d69d48c33061db72bdc050e081ec24152c5e4655505c7f75407646f5ffa140aa51f4638ad8e7c5628476bb44358cb061b2d228ab1e36cd9464e49fcf1f6 SHA512 92e607e1711b24ddf10f11ecd3b389795acc544a567a95cb62b624e5913ad11a1707699b5df659f5fb33dae5cd56700036644e643c7edbe51e7a67e57a152ecc
 DIST instantclient-basic-linux.x64-18.5.0.0.0dbru.zip 72902980 BLAKE2B 23fd9885309507183758cf817b0d68342633ad08eb627f4136b967cf38e1910cefa905f17ffea7c929fafe2232eca71ee66a15153f202eb0d03236a1b21cdc30 SHA512 10e6f91dfe07ee4788a5f70ce65affe141061e7b1d6ea0eab6583bd2aed47d7281824e91da2103c53f15e49f02b94add8c3d524494cd4eacded90b2d1cc8743b
 DIST instantclient-basic-linux.x64-19.3.0.0.0dbru.zip 75106438 BLAKE2B d3738c6a92251c75bf39afa996eecfeb9052c6cb6a8cd2080755c8108559257c4aaf660b6a12a1127228122836c85d15d84bb322d49921184ec67ee32ffbfddc SHA512 13ddda55c88fe72e761d9b9ce5bc5ccda4df0bd5ca6237efed34e6dfebf10866b116f3aa7eaf023a73458406584a4e57ecde825bf996fc0e844c030e4d8a3bba
-DIST instantclient-jdbc-linux-12.1.0.2.0.zip 1571004 BLAKE2B 5d6d8f2ad86eff24be192ff0984a92351cb0dbf56619428a3c5c339dc0a5cc0048e2143e252803f5def6f0f111c4f69081d8aa41bc28002361586bef8ecff44b SHA512 ed3e5f831f1ac7351bd6eb7b3c10a09bba0f1989384ff1f041fdf94a5ca6acbf06e8285283f48731be6ece3dce55d307ac31e8bab57548dca0e3b3056060b5b2
-DIST instantclient-jdbc-linux-12.2.0.1.0.zip 1572140 BLAKE2B ac8a5767924a991503d64b7127e801bd09116ff5155a4943db76bf8678bccfd38c35d744d5a1654a51368feef97df39cad8a9b62ceb69f0cdf416af742385dea SHA512 3b57ab454645f8719a75c8778ab33589548018ec09d187ca88252006f44b014d62659a622ae423f79f9bf0f11149cafaa33880e90278c94a847e69e409bd3dca
 DIST instantclient-jdbc-linux-18.3.0.0.0dbru.zip 1574763 BLAKE2B 2ddbb6a6d61c3b6bc3e37b40f786dd86f5efadcf8cbe5b58dec2631b92ebae25065cb29f87ceed9a1f426ada094a9c0ef1887f8ea7b70e66527e9b75e11f213e SHA512 96298e579b6b5a81ae2ef679d6bf9a18f8bd08c33981d0a5b836c20710dc07d15d7964895a3d66c01075a20720d333f766ac439dc4f3867edac473e020eaf065
 DIST instantclient-jdbc-linux-19.3.0.0.0dbru.zip 1577507 BLAKE2B 2347eb36b1dbe7552753be35b2656edbb43140768379abb8e5c94be7fb3f66fa139becb332d328d8e7f0b7f0b4e32d86703d1760dba36f53471a5b6b3c9b2341 SHA512 66c60f97994a1f45b0ef9e1600da6de319476a6ec4f6a0c9a04516d86e9d89fde1cdfd3bbd8279df125f96326f52875a1daef2ecbb6525fa26482eb637133205
-DIST instantclient-jdbc-linux.x64-12.1.0.2.0.zip 1571639 BLAKE2B 1e50ff99548aa22e32ae48b629e6a83477cf7ad6d56b622e4c03831b43377841d3892b1f3079148a2a93b42d7d2be2670233c33edebac219f5a71384e43ab495 SHA512 1e6aa33c159d5769d10b16da3c5ff16629dae049c7e7d3ab1504a0ad625968f4d3f655a83ff128bff726c3ed03eab9ef7603c897aad288d1dc4e557c03ac7e2a
-DIST instantclient-jdbc-linux.x64-12.2.0.1.0.zip 1572942 BLAKE2B 3521505368a46046149ae28e2fae0bb85d5a70da33c029c684289a3586341fc0e63b0a88b93cbaa28aacbffaca678260f94658faa2b7e8aa31d1103a41660dac SHA512 79c939442431e14b9f30e94821fc4d8eeb34cd35b887fd8fa90a045357a241a58a53d591d22a5f42b188540c50350b842391a3871c86eb4fe8169ea23001a21a
 DIST instantclient-jdbc-linux.x64-18.3.0.0.0dbru.zip 1575572 BLAKE2B bb9d5ad0064b547a7152d4f9b170c646105b4a0731596fe381f7a2c63b720e36cc5a93eea59ea71aa3405999d972cf962a74063350c468a8d114ad28f5a0be0c SHA512 70ebece929cb11f34fdcb6aea75af3679f22d0b838c3d256d4c7c0249977423625b1244a54ca504b51d24e2f178b1784571e185574cd3db34c2cda8128298b60
 DIST instantclient-jdbc-linux.x64-18.5.0.0.0dbru.zip 1578269 BLAKE2B 88047325934da02e81e907c9c4caee540cb06da7d7c08562e90781c2f6004940ba20131d971018fe237cc09cfef010fdf6f912b2309006396315ad67c17b10b6 SHA512 e46a4326f61863a63be333bd588571bc037edd2de1f2462b799e17c65ca8556aeaf42e2eed3a7226bf8c89479b4a723fc6cf6582a65b5ee8a827ffdad1c06bc8
 DIST instantclient-jdbc-linux.x64-19.3.0.0.0dbru.zip 1578033 BLAKE2B 18c9fcca1282c316c67bf86258154d94a26d81779c1d36e782dd55d91fbaf40f03f1e403db9beefe114a27f09fd3d2bcfc643cf3e9a02ae68a5bc3d2eee51c16 SHA512 58813681a74286a7f080f729e3a237584a091487401af08619e2b4349323bf3def8cce22eb550d8ee5675e9a4c7ddddab8fa493bdd8c89981aff3ef0f65d1eb3
-DIST instantclient-odbc-linux-12.1.0.2.0.zip 1100875 BLAKE2B f8b1475962ab8b66b0e24b7bebc74cd13278e2dfe24885e5ef41e051319baee615ed5015a6b7d87e363e8915ff07fde8e17764a8e6aaa4b5b516f266ef1649dd SHA512 ff3b13a338f0acbae07f23d0e54f0ffa803afcda1a798b9cf38ced103201c0698a7240a062fb67af3547c17e906089e236cc3454685ca4645161a8b14414235e
-DIST instantclient-odbc-linux-12.2.0.1.0-2.zip 590200 BLAKE2B 732c07ecd7d19fd425873f2ddec00ffbe3da3b07b05bb902d2e3bcf6bcdcd62c7cecdf2bf2289f2c60df4d6dab3f337729eb7c4aacb64dacf73eadcf3ae3f99a SHA512 78a237d165dab3e991bc9bb495c67913c78b660922bfce872be5c774176eaee2ba2af08798b983ad513a33451cde06fe3a727dec66b91b944dc698bf048c7ef5
 DIST instantclient-odbc-linux-18.3.0.0.0dbru.zip 605026 BLAKE2B 2f7808ef2706c65d1c876e44e7b831ea0629a218347f34dd4b81cce192b45b78b26c9e164b179232b1fceeeeb5f84d807ac6bef1f36fd7d077e620bbb6c093eb SHA512 370d3f34c57e33909642f18104de8b48c2ab0fd1cf679087f8601720ebc1097f64caceb118010b9e8d2f7207cef04210b22a36824de747683c3a1162ccb4f09e
 DIST instantclient-odbc-linux-19.3.0.0.0dbru.zip 600586 BLAKE2B ec76518290f306f41305b12da317ad6de8a73f5049ca6e06fb0e4197ecc9dc8f9855c469fa36e309615a749150580d3ff89a35bfe5878c6441fe4f6218ce3410 SHA512 77aa6c1c5f5a93b86e4e529656ab1b2eaa1e008e343d17193a074e758fc270a5b12d641a959c51b00d5cbc7a2b562c590e662701e66e295d218995ff266f005b
-DIST instantclient-odbc-linux.x64-12.1.0.2.0.zip 1289004 BLAKE2B 674b50e841c66af1d17c5293e3b1909b937664d106864d7709a921ee6f1e46f6571b3c00d064c6ffae0583f4fd84a0e1e7f0b8f635338856c429d9986208c69d SHA512 b6dd02a2566aba66bbdd61e37e00f0c0ec2d466ad969658d4943657642e6e385cb08d0bee3a127b38a7077ec71c8f341aa4696f381e4d9978f807caa1f3ccb91
-DIST instantclient-odbc-linux.x64-12.2.0.1.0-2.zip 634023 BLAKE2B 82cd7683bde15a6ff2c96b6b45da95509a7acf0dc7f6a58a19276a526a397481075fc27a450c1a6ac053a460bf075222a3d5afeba9c33f35cff9365b38eb922a SHA512 48d831c798b455349e1a79cecdeee96652d1911f2371d67c4d280b6595ac253ddff5b052ff2f680b42a5fc77b655ee438837ad4abde3137e251facd22c31cf2e
 DIST instantclient-odbc-linux.x64-18.3.0.0.0dbru.zip 648825 BLAKE2B 1e96b87802c9ccc7d5f6ae2fdab501004e6fe8d4e155503bb983c82cdbfff729263e541689f4c2dbeeabfdd1037f0a97191e3a50842a8488a3267f24fec6b43d SHA512 23ad10a834fd92007147f8a7ad95dd9df4fbd5b786f7e2bb9afd6a12101fb934a40daa81ade914d8d0f59872591a1ae29438f23229b3767ed4ea3ff7cc730f66
 DIST instantclient-odbc-linux.x64-18.5.0.0.0dbru.zip 651470 BLAKE2B c5e7d794137fafb97ecb5fb647a640e59490270787c16f972882c03b34c4f404717f6f87e8501252f415a85b8d92031bba9910eb034c92c4f7fac37f66a3fe43 SHA512 b9e066af00b263b348f1e7a26dbf5672f01be79115bd75a47e2cff95f32fb412a8d03736e1c5ac663847a2d75ea5606cdb1fc27434f7690120c462f8eb15a6cf
 DIST instantclient-odbc-linux.x64-19.3.0.0.0dbru.zip 638697 BLAKE2B 2a9077243a4718c7af4abc2c36b7ca3e2993acb904dd9873c91bf8c0010ebaf18d6864a6b488eaa3a66d6fa42f83d099367533dad65d228db6e21e2b4e23a6df SHA512 dc148301d7e0ce7d74d90619f4f6aa03a26d61033d36803de7623ad64ddd5da1b34e24704ec1cf948ec341ba91e96c1bc08a5b62da79555d248f245ae75e776d
@@ -30,30 +18,18 @@ DIST instantclient-precomp-linux-19.3.0.0.0dbru.zip 5183647 BLAKE2B 79a37d25e573
 DIST instantclient-precomp-linux.x64-18.3.0.0.0dbru.zip 6403554 BLAKE2B bd8e1b3de4b8c12214ea066be22f7ca18133e62e1d9a70b2710578e967204561cdcc9f719f8c1310e19e94baca367e0aa8c482e637b2f13a51781328b229be92 SHA512 292322eb07e3707cf469cea8390636fb2fae99a50b3b900a9c43b5808ce741cb708541820de5e9aa9c341290ad5015be32d968c43e1a14aebf97dd5fd04fc925
 DIST instantclient-precomp-linux.x64-18.5.0.0.0dbru.zip 6401804 BLAKE2B 9098fa6966023e4cc48e9c4fe60aef5e7c4d15a5200fcf92716fc224fa741cb6bd41bbe58a1820ab4c4c95b5be2faee8f0d85dcf6d5c0f14c51943fd67b32856 SHA512 e44ddacecbcc7311f59490116fe44f0d9b303c0a669d9ecf43926bb5627b0a767400bd51e8ec1162d088ff52022d2fa0d2f4e9d83e7efc0e40b0c02679c1b109
 DIST instantclient-precomp-linux.x64-19.3.0.0.0dbru.zip 6225945 BLAKE2B 1a17f20b7147496047f31cfeee56efb74c7daface1c7e6bab2a67258d410723b9e70b771fa9df9e16c2c27c831e97d538a69854e565ebd313f528a7f57a2f358 SHA512 6db99e0df10d439e93813ecdb27e5961232ab64a480b6aa0ee5e00a43e08bae2ade64b2abb60cad58e3139609f81835bde53d91ab35dedf427d3122d65c184b6
-DIST instantclient-sdk-linux-12.1.0.2.0.zip 667183 BLAKE2B 7dc36af0ea105ea97a961a2332b3643ec22cd64b81adbfc7206fce6e963948d5e59f860b8d4fe1318ed238adfb95effa2a138aec3e017a54bd7ce4c4cf1941be SHA512 fdc0111dba77aa88dc7a39c8d9afbd08c4ffde63890595501915be48a70f6fc623762657a1f3e3b54dd08b0d1e5ce00f99ec5ce40990bb17fab63ae38b986dc9
-DIST instantclient-sdk-linux-12.2.0.1.0.zip 674751 BLAKE2B 385a51450ed05c0e80151545037ed58b08dd400c01c8cbb1140045bc6372d4e1d334854881498a5c5833746c796ff94694d495257748442bd49267cc830fda88 SHA512 b2e53e95aaee283f9077f422c7ea8e961a42decb0f58d438eeb32edb32e8c88321261ffd009ca453b531c4aa22a74b8cf71b9a91754c2bd082c83f644523c72e
 DIST instantclient-sdk-linux-18.3.0.0.0dbru.zip 927121 BLAKE2B 5b53d759cb82c854d67b9bebaffb07e442b62d13367e5acf19af2dec4dbca2ba3ee50c83f89cf6e865121ad039227d898e74fecf43439610254eb43a429422a0 SHA512 6e4ccafb69d047b96dbda2f493c175f005b593472ea3c9a75fed758d2f12d970509d58b32d94f7a59b3d0402a87efaa754e6487af9cde01f7211f0145434c6c9
 DIST instantclient-sdk-linux-19.3.0.0.0dbru.zip 932301 BLAKE2B 6c5cfe55a651b9364da3f24d5739813e1b8165fad6434b7a09da2acdeddda408ab4fb37aa34851a537a000a4a7718fbe41ccf8b5fd51aa1bb4fd2e8ec0db33f9 SHA512 8dda8500ffa9eac966f54818d1c19b7d8b878f09c0664e03cfcc8ee8e5b061de566e6b411d15c5db58ef0e97374c2311d16fffd6b4c124dc06bdfd8fa8916b7b
-DIST instantclient-sdk-linux.x64-12.1.0.2.0.zip 667174 BLAKE2B ad3f85a45fa04a579c7233d549a2c4083f0c07348503baea20f8b5404f097c36aed382d0316fbfcd6ec85f56524c288933613de2fc9fcafe961fed32108e002a SHA512 451918e34c4e41dcaea6d678cf10a20a3fb80be5c060aa1a2890f2eb528e6e4982bfd758598eaa115cd367cde0468f7f0f811bac2ef28671075868857eaf9f2e
-DIST instantclient-sdk-linux.x64-12.2.0.1.0.zip 674743 BLAKE2B fd1ab9b7fb2c3151a30d4f3f01d4003f46f95ae78f822214beed071bd52caddb3df39488d4341cb39a1f9a3259be0bc65b53df7f221055d8540d8fcc531455e9 SHA512 4a62ae1be31514664a0f442f65df633b93bea25f1ebe84e405865b9e363017726075bf2d5b2181600018ee122f74649aaa8ec5b507ee8938e33ae056a7f828b6
 DIST instantclient-sdk-linux.x64-18.3.0.0.0dbru.zip 927118 BLAKE2B 9c6cd889843552cee3e84566d9c1b29369b1e7b20a01fac65676a33d6196b042a4c34cd2df8cf1ec5c8664a403e44e6a283f42912b7e056e093c744bd24ec24f SHA512 c9e1493601ec70541e437ded748f3be24deaa3f1037884fd003907bbab38b3099aef12dda1b9845c3eb3ce3827f743696f5ebe6d8dffe7974088c1329528b729
 DIST instantclient-sdk-linux.x64-18.5.0.0.0dbru.zip 929988 BLAKE2B 942f99fbea74e253a0be1677cfe40d79a26cb7a6442631d626648a65aa4f20b730e4f1ff13effcce5c4befd2ce50ab038f88b61c6f05ccad262568b209b3048f SHA512 7adc9e315c7c8784e4648a97fa54e03eb26a05b7b35a1f5cf1105898701b31fdc22f0011b1ae192752adcf3ec9798ba635bb9a9a5d4bc768a9a519c3564a9375
 DIST instantclient-sdk-linux.x64-19.3.0.0.0dbru.zip 932294 BLAKE2B 26ea1ce34209c1dc92101e211f009ecd20cfdad4d88e946844cbd1f2b1f4365c7dd273e7079be1dc807c38393035847e47800d65b0ecebb3a705cc6cac092a0d SHA512 ec3527a8371bb9644f4912b8190cfde53bf2afd8bf2ec7376bad97dc4d4b37f010a5e0d30567e2398f51c07affeeb15515347df095587a9cff84ef657b7e8c6e
-DIST instantclient-sqlplus-linux-12.1.0.2.0.zip 828190 BLAKE2B b047e7ea3bbf1390c7ce3ad96c883d6a234798284b91b8ca8de2b086c27128144a0a3fdee2062c826e7e16b5dc263efdaab7e464371ef63deca4d9ffe4f668a7 SHA512 e521f141f0bb4fe62bda6da389a9c1038be879f1456500a9e70ac0a41d4f35cf2051181a03223521aa24ee06a33b67614d3afd91f01099afa0081f2771876d43
-DIST instantclient-sqlplus-linux-12.2.0.1.0.zip 869831 BLAKE2B f6c04823b1a6ac45594f13cc2ef45ab0ed25e5dd68bc33cc6412a578647df4472a71293cadbe1e98ea2983664a083b9b148aea04e717e5039e6def065d1ea583 SHA512 83894a72192ea9ca86d361ba70a6c011f297afa5d186a49fbab7050d9615de300d54b12af8d948fe18a75dcf51bd04f9feaa8460a1c69df9c55f9854e3cee61e
 DIST instantclient-sqlplus-linux-18.3.0.0.0dbru.zip 881315 BLAKE2B 787dd43ffaadd493d8cb3a9a8bbd160f75c51ad07e16d8eb7631e8368b4a8bfe9e574326837724b3573705e1c309cbe0bf364c1b98660534b05f5d72d28b1b11 SHA512 9087e5654143c9da3499fb7f1b8a15b04433cacc0d96257519788b3cd12a0aa480b37fa37fbe55a2f40940ea8da1eeae9881712a87d5942e142c0f29b580e54d
 DIST instantclient-sqlplus-linux-19.3.0.0.0dbru.zip 883462 BLAKE2B c3891a6ea525add3030372bb96b57e31b3a2743dd5bddbf12d4e2d43b7732b244c265a15423ae48d93db609f37a449233c8c16f5fd7c1d345b6ef42c217bb8d2 SHA512 521b80d47320b4ea51a68bee8f05fa51fa5e74690e62817d1fdb5471eaed577cad6bd5364e18fa5c18dc0cf56b99e33b62488a93c176d860e471ce2a7e9facca
-DIST instantclient-sqlplus-linux.x64-12.1.0.2.0.zip 861284 BLAKE2B fe2c3e3cd90c61aba7220c7782bcb540017aaa82f884b730b0ab3dfce462f866b468cda71106e016f9581a186582701239c282cb52927face949b0c1f8690692 SHA512 ad0af692bcae1231b58c7ea55fa79d85c7a5c9875a805565b1b5956ed30e608d753ac9210f6169ab3ff4e42ac2f1d871ccff47bd2656f7684925136fef1f30c2
-DIST instantclient-sqlplus-linux.x64-12.2.0.1.0.zip 904309 BLAKE2B 5d2dca2c98187674a506808f18ef8032f595d250c2a2577cf0cd7a9d785384a29d612b686575ac15516848792539d362745cc1c8aa321d2c84c10df01c896017 SHA512 7d31a5262138f8ae0429cf08f0743b9c8c7863fc8e6abfa8ef089cee2059da75bf23503f9f1f09c28b82c5209aca27f81da6c890799236307395b59fea3bf012
 DIST instantclient-sqlplus-linux.x64-18.3.0.0.0dbru.zip 915778 BLAKE2B 8d93e462568a5bf5a294a5abcf0a0e30c08e9eef18c01a79b8f716261efbeb14a286d1058ddfa278108daeb49b74a3e296efa83291d7bc03f4ad35428c946701 SHA512 878ac2cf58aaa8cb237779fcd04378c95d738fd444eddd5745838fa86e8cd60f1c2be49f0f4fc3d4b16dca652fe66681ac0907a4aeddec1d9433e63d2f4e5db6
 DIST instantclient-sqlplus-linux.x64-18.5.0.0.0dbru.zip 918469 BLAKE2B 14efa748e7a892334610fa7a615c56b07e25873d5761408b9cac642af11ae2d97062b8014e4c7dee06dc37676d7c9d1a409d80f50b9d162210e073c1c4ef67d5 SHA512 8c2866ad092893647086adc554c7fab3c9bdc5429c9e0715d68717065fe12f106d228a2f241fe76bdc677a4adfa6eb01b0d866fab2bebbb1491a087a4b9d4a50
 DIST instantclient-sqlplus-linux.x64-19.3.0.0.0dbru.zip 910409 BLAKE2B e05c8dd3c545842989a2650013ff7ac8b06b41bef07efcd312ff66c51929942e3336bc9bd9a53a197088433b2cdbcb5bfbf4b2f4e1a40d68cfe559207737446e SHA512 34320712009ea724edd71f04bb72dd58fb99d34b1a357e238c04c9a55c7120eafc8c675558755a85587c7e75801dde2a7f8fc54795dd7e3e61568f8cf27d791d
-DIST instantclient-tools-linux-12.1.0.2.0.zip 187088 BLAKE2B 41b68efbbe5925c64a869c71a12a947743e40b7d268c45a1b18c187a8b2179e224cd4ea940248d690b8f334c91afd901c1b3be34b2e8c2748e7f79487890cb60 SHA512 37a9eb3e2fdbbbf32f0fb5d017209db1b62d54efe48a875625e9d6162ea894d93d144358b2360989fa71704b346f86b36f1640a5c98f8aac7c1e6853b2d078fd
-DIST instantclient-tools-linux-12.2.0.1.0.zip 1032131 BLAKE2B 1a5d94b129d2d8a23031daee3882aef0b783c019baa69fcbd2a5d4ca4c97585212580196be158bdccaff2097027ceee881e948604ea2aa15525f36ea16e04ebd SHA512 e547d571bf881e787dc19bf23f82c4396f14dbca35a51a21e4133ff463f3c3c2c308cc2263f55b49ce70604569158266cd88d7ebf8b5cf51c9cd58b2871133e2
 DIST instantclient-tools-linux-18.3.0.0.0dbru.zip 1042756 BLAKE2B 1b1af7abb50b6977e0dd4bc0f2b5e89534cf5bffe216dbe553063761470c45f330f4a72ece428a3e0dc8162cebad3cf0ffa628f4b3879bc434ecda7b7b07570f SHA512 b809b83e2e7dbe19c13611c1eb819fa4648a127ddc8a97abaa794213c7f4b6d28b70956aac4f331389d088c6fccc998d0eda8dc39f2dedc338f3baf03bc3ceac
 DIST instantclient-tools-linux-19.3.0.0.0dbru.zip 1018792 BLAKE2B e24a264d59a4e29b8dcf56dfd09c80571612f465c8e2e91514c076553f27a0b07e66bb2ac0f3fcd6150c8a04ba861de04576e45ca1c03d173149296c029b8fcb SHA512 33103d934dec1bb6e34fb3f15cbbfba2ceec724334ca89bc55df3953779b3f4d45d70e7c9d1734481f366bb2e7e8ab58bef063415571acdf07022f193558ed54
-DIST instantclient-tools-linux.x64-12.1.0.2.0.zip 203511 BLAKE2B 6482cfa3ba521a5f5ad3e1517037f514daa1f452d8a5b38f0b4c949681a87dc54fe9551f52fcdc4e1ea6d243a808d3bd763147eaa72d9f656274ac7185823754 SHA512 f18ca11300fc20925c72122d03fc00402b9a52b39f7f70cfd3fa97264a1a2a173e7f77059affba98e897546e05c6ac1e3a546ce1c7e63ef049130496d346342b
-DIST instantclient-tools-linux.x64-12.2.0.1.0.zip 1132671 BLAKE2B a9ae6d2cd4e5661cb6a5dbb08cbc08ae4a5c28ce0bcc43db86ebd37997f8b14ec27f76613a1429d9359a765b98b465964bc5d24f1fce1d7964597191be658957 SHA512 1697289fc4b6a37277036dbef1892bd113892fcd3b0f347f0960ef8a1b90f3e91411bb237060e88bfdd418e50600372b710df08d97a4e847fd90d077ed0647d2
 DIST instantclient-tools-linux.x64-18.3.0.0.0dbru.zip 1142609 BLAKE2B 5c915bd940b7bfaa42429710685cfafc5f0189607da2d789f4aaada2bc9d3365ad8e9ee31cc209830fa54b406ffe4b9b2fc2b5e0b6819ff176f7dbb566117a79 SHA512 2c198d9e723b39f7b512217eb08557dfa3c9ae32858acd882df8b9b24beecffe6b44eb089b50341edf01d7e4c0514d4b3de4aa06fa9185aa0538855963c174a4
 DIST instantclient-tools-linux.x64-18.5.0.0.0dbru.zip 1143747 BLAKE2B af5e70e1add6ca2042a213b5038a805ea3d6074703d5a677798684f60f681d6f7b642154d87a02fe973b5b12295ea9ef6f64c45836ceee66ce67d4e4498417b6 SHA512 7bbacdb1fa062c40b2389599ab522b02d63e68731d461fe45446685642b932ee741b8c9e0fde189d8f741db4131f6ac72c8124612e8668a00f90ed7c594fff50
 DIST instantclient-tools-linux.x64-19.3.0.0.0dbru.zip 1085243 BLAKE2B abcdf61f01e2bc67610043f1a66015050908f2c09f6aa8b615fd9e8b19a94a161d20b372119bc1bfc1a8ca8511a3859f67c48a39a3c2509fa326a350d7614721 SHA512 33df3a1c19d55ba94e0851bb4eaa83e0bfa72a132de2f5b98bb2a1b0528abee319b20211c7f08719c58250579506cda5c1f4de726f7b1e7c1c484dcb3986e43b

diff --git a/dev-db/oracle-instantclient/files/12.1.0.2-makefile.patch b/dev-db/oracle-instantclient/files/12.1.0.2-makefile.patch
deleted file mode 100644
index 999d8c35f0d..00000000000
--- a/dev-db/oracle-instantclient/files/12.1.0.2-makefile.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Fake demo_xe.mk found in Oracle eXpress Edition,
-known by CPAN DBD::Oracle (bug#165834).
-This provides absolute paths for headers and libraries.
-
-Paranoia drops those REMOVE lines.
---- instantclient_12_1/sdk/demo/demo.mk
-+++ instantclient_12_1/sdk/demo/demo.mk
-@@ -28,8 +28,9 @@
- CC=/opt/SunProd/SUNWspro6.1/bin/CC
- cc=/opt/SunProd/SUNWspro6.1/bin/cc
- 
--ICINCHOME=../
--ICLIBHOME=../../
-+LIBDIR=lib
-+ICINCHOME=$(ORACLE_HOME)/
-+ICLIBHOME=$(ORACLE_HOME)/$(LIBDIR)
- ICLIBPATH=-L$(ICLIBHOME)
- THREADLIBS=-lthread
- CCLIB=$(ICLIBPATH) -locci -lclntsh $(THREADLIBS)
-@@ -64,18 +65,18 @@
- all: clean buildoci $(OCCIDEMO) $(OCCIOBJDEMO)
- 
- buildoci: $(CLNCACHE) $(LIBCLNT) $(CDEMOOBJS)
--	$(MKLINK) $(ICLIBHOME)libclntsh$(SO_EXT).12.1 $(ICLIBHOME)libclntsh$(SO_EXT)
--	$(MKLINK) $(ICLIBHOME)libocci$(SO_EXT).12.1 $(ICLIBHOME)libocci$(SO_EXT)
-+#	$(MKLINK) $(ICLIBHOME)libclntsh$(SO_EXT).12.1 $(ICLIBHOME)libclntsh$(SO_EXT)
-+#	$(MKLINK) $(ICLIBHOME)libocci$(SO_EXT).12.1 $(ICLIBHOME)libocci$(SO_EXT)
- 	$(CC) -o $(CDEMOEXE) $(LDFLAGS) $(CDEMOOBJS) $(CCLIB)
--	$(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
--	$(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
-+#	$(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
-+#	$(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
- 
- buildocci: $(CLNCACHE) $(LIBCLNT) $(OBJS)
--	$(MKLINK) $(ICLIBHOME)libclntsh$(SO_EXT).12.1 $(ICLIBHOME)libclntsh$(SO_EXT)
--	$(MKLINK) $(ICLIBHOME)libocci$(SO_EXT).12.1 $(ICLIBHOME)libocci$(SO_EXT)
-+#	$(MKLINK) $(ICLIBHOME)libclntsh$(SO_EXT).12.1 $(ICLIBHOME)libclntsh$(SO_EXT)
-+#	$(MKLINK) $(ICLIBHOME)libocci$(SO_EXT).12.1 $(ICLIBHOME)libocci$(SO_EXT)
- 	$(CC) -o $(EXE) $(LDFLAGS) $(OBJS) $(CCLIB)
--	$(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
--	$(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
-+#	$(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
-+#	$(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
- 
- $(OCCIDEMO):
- 	$(MAKE) -f $(MAKEFILE) buildocci OBJS=$@.o EXE=$@
-@@ -93,8 +94,8 @@
- 
- cleancache:
- 	$(REMOVE) $(CACHEDIR)
--	$(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
--	$(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
-+#	$(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
-+#	$(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
- 
- clean: $(CLNCACHE)
- 	$(REMOVE) cdemo81 cdemo81.o occidml occidml.o occiobj occiobj.o occiobjo* occiobjm* occiobj.h occiobjout.type

diff --git a/dev-db/oracle-instantclient/oracle-instantclient-12.1.0.2.ebuild b/dev-db/oracle-instantclient/oracle-instantclient-12.1.0.2.ebuild
deleted file mode 100644
index a9ec364908a..00000000000
--- a/dev-db/oracle-instantclient/oracle-instantclient-12.1.0.2.ebuild
+++ /dev/null
@@ -1,303 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils versionator pax-utils multilib-minimal
-
-MY_PVM=$(get_version_component_range 1-2)
-
-MY_PLAT_x86="Linux x86"
-MY_BITS_x86=32
-MY_A_x86="${PN/oracle-/}-basic-linux-${PV}.0.zip"
-MY_A_x86_sdk="${MY_A_x86/basic/sdk}"
-MY_A_x86_odbc="${MY_A_x86/basic/odbc}"
-MY_A_x86_jdbc="${MY_A_x86/basic/jdbc}"
-MY_A_x86_sqlplus="${MY_A_x86/basic/sqlplus}"
-MY_A_x86_tools="${MY_A_x86/basic/tools}"
-
-MY_PLAT_amd64="Linux x86-64"
-MY_BITS_amd64=64
-MY_A_amd64="${PN/oracle-}-basic-linux.x64-${PV}.0.zip"
-MY_A_amd64_sdk="${MY_A_amd64/basic/sdk}"
-MY_A_amd64_odbc="${MY_A_amd64/basic/odbc}"
-MY_A_amd64_jdbc="${MY_A_amd64/basic/jdbc}"
-MY_A_amd64_sqlplus="${MY_A_amd64/basic/sqlplus}"
-MY_A_amd64_tools="${MY_A_amd64/basic/tools}"
-
-DESCRIPTION="Oracle 12c Instant Client with SDK"
-HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html"
-SRC_URI="
-	abi_x86_32? (
-		${MY_A_x86}
-		odbc? ( ${MY_A_x86_odbc} )
-		jdbc? ( ${MY_A_x86_jdbc} )
-		!abi_x86_64? (
-			sdk?     ( ${MY_A_x86_sdk}     )
-			sqlplus? ( ${MY_A_x86_sqlplus} )
-			tools?   ( ${MY_A_x86_tools}   )
-	) )
-	abi_x86_64? (
-		${MY_A_amd64}
-		odbc?    ( ${MY_A_amd64_odbc}    )
-		jdbc?    ( ${MY_A_amd64_jdbc}    )
-		sdk?     ( ${MY_A_amd64_sdk}     )
-		sqlplus? ( ${MY_A_amd64_sqlplus} )
-		tools?   ( ${MY_A_amd64_tools}   )
-	)
-"
-
-LICENSE="OTN"
-SLOT="0/${MY_PVM}"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="fetch splitdebug"
-IUSE="jdbc odbc +sdk +sqlplus tools"
-
-DEPEND="app-arch/unzip"
-RDEPEND="
-	>=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]
-	!<dev-db/oracle-instantclient-basic-12
-	!<dev-db/oracle-instantclient-odbc-12
-	!<dev-db/oracle-instantclient-jdbc-12
-	!<dev-db/oracle-instantclient-sqlplus-12
-"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="usr/lib*/oracle/*/client/lib*/lib*"
-
-set_my_abivars() {
-	S="${WORKDIR}/${ABI}/instantclient_$(
-		replace_version_separator 1 "_" "${MY_PVM}"
-	)"
-
-	local abi=${ABI}
-	[[ ${abi} == 'default' ]] && abi=${ARCH}
-	MY_PLAT=MY_PLAT_${abi}          ; MY_PLAT=${!MY_PLAT}         # platform name
-	MY_BITS=MY_BITS_${abi}          ; MY_BITS=${!MY_BITS}         # platform bitwidth
-	MY_A=MY_A_${abi}                ; MY_A=${!MY_A}               # runtime distfile
-	MY_A_sdk=MY_A_${abi}_sdk        ; MY_A_sdk=${!MY_A_sdk}         # sdk distfile
-	MY_A_odbc=MY_A_${abi}_odbc      ; MY_A_odbc=${!MY_A_odbc}       # odbc distfile
-	MY_A_jdbc=MY_A_${abi}_jdbc      ; MY_A_jdbc=${!MY_A_jdbc}       # jdbc distfile
-	MY_A_sqlplus=MY_A_${abi}_sqlplus; MY_A_sqlplus=${!MY_A_sqlplus} # sqlplus distfile
-	MY_A_tools=MY_A_${abi}_tools    ; MY_A_tools=${!MY_A_tools}     # tools distfile
-
-	[[ -n ${MY_PLAT} ]]
-}
-
-oic_distfile_status() {
-	if [[ -r ${DISTDIR}/${1} ]]; then
-		echo "already here"
-	else
-		echo "still absent"
-	fi
-}
-
-pkg_nofetch() {
-	eerror "Please go to"
-	eerror "  ${HOMEPAGE%/*}/index-097480.html"
-	eerror "  and download"
-	local ABI
-	for ABI in $(multilib_get_enabled_abis)
-	do
-		set_my_abivars || continue
-		eerror "Instant Client for ${MY_PLAT}"
-		eerror "    Basic: ($(oic_distfile_status ${MY_A})) ${MY_A}"
-		use odbc &&
-		eerror "     ODBC: ($(oic_distfile_status ${MY_A_odbc})) ${MY_A_odbc}"
-		use jdbc &&
-		eerror "     JDBC: ($(oic_distfile_status ${MY_A_jdbc})) ${MY_A_jdbc}"
-		if multilib_is_native_abi; then
-			use sdk &&
-			eerror "      SDK: ($(oic_distfile_status ${MY_A_sdk})) ${MY_A_sdk}"
-			use sqlplus &&
-			eerror " SQL*Plus: ($(oic_distfile_status ${MY_A_sqlplus})) ${MY_A_sqlplus}"
-			use tools &&
-			eerror "      WRC: ($(oic_distfile_status ${MY_A_tools})) ${MY_A_tools}"
-		fi
-	done
-	eerror "After downloading these files (for *all* shown architectures), put them in:"
-	eerror "    ${DISTDIR}/"
-}
-
-src_unpack() {
-	local ABI
-	for ABI in $(multilib_get_enabled_abis)
-	do
-		set_my_abivars || continue
-		mkdir "${WORKDIR}"/${ABI} || die
-		cd "${WORKDIR}"/${ABI} || die
-		unpack ${MY_A}
-		use odbc && unpack ${MY_A_odbc}
-		use jdbc && unpack ${MY_A_jdbc}
-		if multilib_is_native_abi; then
-			use sdk     && unpack ${MY_A_sdk}
-			use sqlplus && unpack ${MY_A_sqlplus}
-			use tools   && unpack ${MY_A_tools}
-		fi
-	done
-}
-
-src_prepare() {
-	use sdk && PATCHES=( "${FILESDIR}"/12.1.0.2-makefile.patch )
-	default
-}
-
-# silence configure&compile messages from multilib-minimal
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	# all content goes here
-	local oracle_home=usr/$(get_libdir)/oracle/${MY_PVM}/client
-	into "/${oracle_home}"
-
-	local ldpath= ABI
-	for ABI in $(multilib_get_enabled_abis) # last iteration is final ABI
-	do
-		if ! set_my_abivars; then
-			elog "Skipping unsupported ABI ${ABI}."
-			continue
-		fi
-		einfo "Installing runtime for ${MY_PLAT} ..."
-
-		cd "${S}" || die
-
-		# shared libraries
-		dolib.so lib*$(get_libname)*
-
-		# ensure to be linkable
-		[[ -e libocci$(get_libname) ]] ||
-		dosym libocci$(get_libname ${MY_PVM}) \
-			"/${oracle_home}"/$(get_libdir)/libocci$(get_libname)
-		[[ -e libclntsh$(get_libname) ]] ||
-		dosym libclntsh$(get_libname ${MY_PVM}) \
-			"/${oracle_home}"/$(get_libdir)/libclntsh$(get_libname)
-
-		# java archives
-		insinto "/${oracle_home}"/$(get_libdir)
-		doins *.jar
-
-		# runtime library path
-		ldpath+=${ldpath:+:}/${oracle_home}/$(get_libdir)
-
-		eend $?
-	done
-
-	local DOCS=()
-	local HTML_DOCS=()
-	local paxbins=( adrci genezi uidrvci )
-	local scripts=()
-
-	use sqlplus && paxbins+=( sqlplus )
-	use tools   && paxbins+=( wrc )
-
-	if use odbc; then
-		scripts+=( odbc_update_ini.sh )
-		HTML_DOCS+=( ODBC_IC_Readme_Unix.html help )
-	fi
-
-	einfo "Installing binaries for ${MY_PLAT} ..."
-	dobin ${paxbins[@]} ${scripts}
-	cd "${ED}${oracle_home}"/bin || die
-	pax-mark -c ${paxbins[@]} || die
-	cd "${S}" || die
-	eend $?
-
-	if use sqlplus; then
-		insinto "/${oracle_home}"/sqlplus/admin
-		doins glogin.sql
-		dosym "/${oracle_home}"/bin/sqlplus /usr/bin/sqlplus
-	fi
-
-	if use sdk; then
-		einfo "Installing SDK ..."
-
-		DOCS+=( sdk/demo )
-		cd "${S}"/sdk || die
-
-		# SDK makefile, for #165834
-		# As we change the relative filesystem layout compared
-		# to vanilla instantclient.zip content, it feels easier
-		# to fake the layout found in Oracle eXpress Edition.
-		# Both layouts are known to DBD::Oracle (cpan).
-		insinto "/${oracle_home}"/rdbms/demo
-		newins demo/demo.mk demo_xe.mk
-
-		# Remove ldap.h, #299562
-		rm include/ldap.h || die
-		# DBD::Oracle needs rdbms/public as real directory
-		insinto "/${oracle_home}"/rdbms/public
-		doins include/*.h
-		dosym rdbms/public "/${oracle_home}"/include
-		# ruby-oci8 expects the headers here
-		dosym "/${oracle_home}"/rdbms/public /usr/include/oracle/${MY_PVM}/client
-
-		# ott
-		insinto "/${oracle_home}"/$(get_libdir)
-		dobin ott
-		doins *.zip
-
-		# more files found in the zip
-		insinto "/${oracle_home}"/admin
-		doins admin/oraaccess.xsd
-
-		eend $?
-	fi
-
-	cd "${S}" || die
-	einstalldocs
-
-	# create path for tnsnames.ora
-	insinto /etc/oracle
-	doins "${FILESDIR}"/tnsnames.ora.sample
-
-	# Add OCI libs to library path
-	{
-		echo "# ${EPREFIX}/etc/env.d/50${PN}"
-		echo "# Do not edit this file, but 99${PN} instead"
-		echo
-		echo "ORACLE_HOME=${EPREFIX}/${oracle_home}"
-		echo "LDPATH=${ldpath}"
-		echo "TNS_ADMIN=/etc/oracle/"
-	} > "${T}"/50${PN}
-
-	doenvd "${T}"/50${PN}
-
-	# ensure ORACLE_HOME/lib exists
-	[[ -e ${ED}${oracle_home}/lib/. ]] ||
-	dosym $(get_libdir) "${oracle_home}"/lib
-}
-
-pkg_preinst() {
-	if [[ -r ${EROOT}/etc/env.d/99${PN} ]]; then
-		cp "${EROOT}/etc/env.d/99${PN}" "${ED}/etc/env.d/" || die
-	else
-		{
-			echo "# ${EPREFIX}/etc/env.d/99${PN}"
-			echo "# Configure system-wide defaults for your Oracle Instant Client here"
-			echo
-			echo "#$(grep '^ORACLE_HOME=' "${ED}/etc/env.d/50${PN}")"
-			echo "#$(grep '^TNS_ADMIN=' "${ED}/etc/env.d/50${PN}")"
-			echo "#NLS_LANG="
-		} > "${ED}/etc/env.d/99${PN}"
-	fi
-}
-
-pkg_postinst() {
-	elog "${P} does not provide an sqlnet.ora"
-	elog "configuration file, redirecting oracle diagnostics for database-"
-	elog "and network-issues into ~USER/oradiag_USER/ instead."
-	elog "It should be safe to ignore this message in sqlnet.log there:"
-	elog "   Directory does not exist for read/write [ORACLE_HOME/client/log] []"
-	elog "See https://bugs.gentoo.org/show_bug.cgi?id=465252 for reference."
-	elog "If you want to directly analyse low-level debug info or don't want"
-	elog "to see it at all, so you really need an sqlnet.ora file, please"
-	elog "consult http://search.oracle.com/search/search?q=sqlnet.ora"
-	elog ""
-	elog "TNS_ADMIN has been set to ${EROOT}etc/oracle by default,"
-	elog "put your tnsnames.ora there or configure TNS_ADMIN"
-	elog "to point to your user specific configuration."
-	ewarn "Please re-source your shell settings for ORACLE_HOME"
-	ewarn "  changes, such as: source /etc/profile"
-}

diff --git a/dev-db/oracle-instantclient/oracle-instantclient-12.2.0.1_p2.ebuild b/dev-db/oracle-instantclient/oracle-instantclient-12.2.0.1_p2.ebuild
deleted file mode 100644
index 9bac87e4975..00000000000
--- a/dev-db/oracle-instantclient/oracle-instantclient-12.2.0.1_p2.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils versionator pax-utils multilib-minimal
-
-MY_PVM=$(get_version_component_range 1-2)
-MYLIB_PVM=12.1
-
-MY_PV=$(get_version_component_range 1-4)
-MY_PVP=$(get_version_component_range 5) # p2
-
-MY_PLAT_x86="Linux x86"
-MY_BITS_x86=32
-MY_A_x86="${PN/oracle-/}-basic-linux-${MY_PV}.0.zip"
-MY_A_x86_sdk="${MY_A_x86/basic/sdk}"
-MY_A_x86_odbc="${MY_A_x86/basic/odbc}"
-MY_A_x86_jdbc="${MY_A_x86/basic/jdbc}"
-MY_A_x86_sqlplus="${MY_A_x86/basic/sqlplus}"
-MY_A_x86_tools="${MY_A_x86/basic/tools}"
-
-MY_PLAT_amd64="Linux x86-64"
-MY_BITS_amd64=64
-MY_A_amd64="${PN/oracle-}-basic-linux.x64-${MY_PV}.0.zip"
-MY_A_amd64_sdk="${MY_A_amd64/basic/sdk}"
-MY_A_amd64_odbc="${MY_A_amd64/basic/odbc}"
-MY_A_amd64_jdbc="${MY_A_amd64/basic/jdbc}"
-MY_A_amd64_sqlplus="${MY_A_amd64/basic/sqlplus}"
-MY_A_amd64_tools="${MY_A_amd64/basic/tools}"
-
-if [[ ${MY_PVP} == p* ]]
-then
-	MY_PVP=-${MY_PVP#p}
-	# Updated 9/22/2017: instantclient-odbc-linux-12.2.0.1.0-2.zip
-	MY_A_x86_odbc="${MY_A_x86_odbc%.zip}${MY_PVP}.zip"
-	MY_A_amd64_odbc="${MY_A_amd64_odbc%.zip}${MY_PVP}.zip"
-fi
-
-DESCRIPTION="Oracle 12c Instant Client with SDK"
-HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html"
-SRC_URI="
-	abi_x86_32? (
-		${MY_A_x86}
-		odbc? ( ${MY_A_x86_odbc} )
-		jdbc? ( ${MY_A_x86_jdbc} )
-		!abi_x86_64? (
-			sdk?     ( ${MY_A_x86_sdk}     )
-			sqlplus? ( ${MY_A_x86_sqlplus} )
-			tools?   ( ${MY_A_x86_tools}   )
-	) )
-	abi_x86_64? (
-		${MY_A_amd64}
-		odbc?    ( ${MY_A_amd64_odbc}    )
-		jdbc?    ( ${MY_A_amd64_jdbc}    )
-		sdk?     ( ${MY_A_amd64_sdk}     )
-		sqlplus? ( ${MY_A_amd64_sqlplus} )
-		tools?   ( ${MY_A_amd64_tools}   )
-	)
-"
-
-LICENSE="OTN"
-SLOT="0/${MYLIB_PVM}"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="fetch splitdebug"
-IUSE="jdbc odbc +sdk +sqlplus tools"
-
-DEPEND="app-arch/unzip"
-RDEPEND="
-	>=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]
-	!<dev-db/oracle-instantclient-basic-12
-	!<dev-db/oracle-instantclient-odbc-12
-	!<dev-db/oracle-instantclient-jdbc-12
-	!<dev-db/oracle-instantclient-sqlplus-12
-"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="usr/lib*/oracle/*/client/lib*/lib*"
-
-set_my_abivars() {
-	S="${WORKDIR}/${ABI}/instantclient_$(
-		replace_version_separator 1 "_" "${MY_PVM}"
-	)"
-
-	local abi=${ABI}
-	[[ ${abi} == 'default' ]] && abi=${ARCH}
-	MY_PLAT=MY_PLAT_${abi}          ; MY_PLAT=${!MY_PLAT}         # platform name
-	MY_BITS=MY_BITS_${abi}          ; MY_BITS=${!MY_BITS}         # platform bitwidth
-	MY_A=MY_A_${abi}                ; MY_A=${!MY_A}               # runtime distfile
-	MY_A_sdk=MY_A_${abi}_sdk        ; MY_A_sdk=${!MY_A_sdk}         # sdk distfile
-	MY_A_odbc=MY_A_${abi}_odbc      ; MY_A_odbc=${!MY_A_odbc}       # odbc distfile
-	MY_A_jdbc=MY_A_${abi}_jdbc      ; MY_A_jdbc=${!MY_A_jdbc}       # jdbc distfile
-	MY_A_sqlplus=MY_A_${abi}_sqlplus; MY_A_sqlplus=${!MY_A_sqlplus} # sqlplus distfile
-	MY_A_tools=MY_A_${abi}_tools    ; MY_A_tools=${!MY_A_tools}     # tools distfile
-
-	[[ -n ${MY_PLAT} ]]
-}
-
-oic_distfile_status() {
-	if [[ -r ${DISTDIR}/${1} ]]; then
-		echo "already here"
-	else
-		echo "still absent"
-	fi
-}
-
-pkg_nofetch() {
-	eerror "Please go to"
-	eerror "  ${HOMEPAGE%/*}/index-097480.html"
-	eerror "  and download"
-	local ABI
-	for ABI in $(multilib_get_enabled_abis)
-	do
-		set_my_abivars || continue
-		eerror "Instant Client for ${MY_PLAT}"
-		eerror "    Basic: ($(oic_distfile_status ${MY_A})) ${MY_A}"
-		use odbc &&
-		eerror "     ODBC: ($(oic_distfile_status ${MY_A_odbc})) ${MY_A_odbc}"
-		use jdbc &&
-		eerror "     JDBC: ($(oic_distfile_status ${MY_A_jdbc})) ${MY_A_jdbc}"
-		if multilib_is_native_abi; then
-			use sdk &&
-			eerror "      SDK: ($(oic_distfile_status ${MY_A_sdk})) ${MY_A_sdk}"
-			use sqlplus &&
-			eerror " SQL*Plus: ($(oic_distfile_status ${MY_A_sqlplus})) ${MY_A_sqlplus}"
-			use tools &&
-			eerror "      WRC: ($(oic_distfile_status ${MY_A_tools})) ${MY_A_tools}"
-		fi
-	done
-	eerror "After downloading these files (for *all* shown architectures), put them in:"
-	eerror "    ${DISTDIR}/"
-}
-
-src_unpack() {
-	local ABI
-	for ABI in $(multilib_get_enabled_abis)
-	do
-		set_my_abivars || continue
-		mkdir "${WORKDIR}"/${ABI} || die
-		cd "${WORKDIR}"/${ABI} || die
-		unpack ${MY_A}
-		use odbc && unpack ${MY_A_odbc}
-		use jdbc && unpack ${MY_A_jdbc}
-		if multilib_is_native_abi; then
-			use sdk     && unpack ${MY_A_sdk}
-			use sqlplus && unpack ${MY_A_sqlplus}
-			use tools   && unpack ${MY_A_tools}
-		fi
-	done
-}
-
-src_prepare() {
-	use sdk && PATCHES=( "${FILESDIR}"/12.1.0.2-makefile.patch )
-	default
-}
-
-# silence configure&compile messages from multilib-minimal
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	# all content goes here
-	local oracle_home=usr/$(get_libdir)/oracle/${MY_PVM}/client
-	into "/${oracle_home}"
-
-	local ldpath= ABI
-	for ABI in $(multilib_get_enabled_abis) # last iteration is final ABI
-	do
-		if ! set_my_abivars; then
-			elog "Skipping unsupported ABI ${ABI}."
-			continue
-		fi
-		einfo "Installing runtime for ${MY_PLAT} ..."
-
-		cd "${S}" || die
-
-		# shared libraries
-		dolib.so lib*$(get_libname)*
-
-		# ensure to be linkable
-		[[ -e libocci$(get_libname) ]] ||
-		dosym libocci$(get_libname ${MYLIB_PVM}) \
-			"/${oracle_home}"/$(get_libdir)/libocci$(get_libname)
-		[[ -e libclntsh$(get_libname) ]] ||
-		dosym libclntsh$(get_libname ${MYLIB_PVM}) \
-			"/${oracle_home}"/$(get_libdir)/libclntsh$(get_libname)
-
-		# java archives
-		insinto "/${oracle_home}"/$(get_libdir)
-		doins *.jar
-
-		# runtime library path
-		ldpath+=${ldpath:+:}/${oracle_home}/$(get_libdir)
-
-		eend $?
-	done
-
-	local DOCS=()
-	local HTML_DOCS=()
-	local paxbins=( adrci genezi uidrvci )
-	local scripts=()
-
-	use sqlplus && paxbins+=( sqlplus )
-	use tools   && paxbins+=( wrc )
-
-	if use odbc; then
-		scripts+=( odbc_update_ini.sh )
-		HTML_DOCS+=( ODBC_IC_Readme_Unix.html help )
-	fi
-
-	einfo "Installing binaries for ${MY_PLAT} ..."
-	dobin ${paxbins[@]} ${scripts}
-	cd "${ED}${oracle_home}"/bin || die
-	pax-mark -c ${paxbins[@]} || die
-	cd "${S}" || die
-	eend $?
-
-	if use sqlplus; then
-		insinto "/${oracle_home}"/sqlplus/admin
-		doins glogin.sql
-		dosym "/${oracle_home}"/bin/sqlplus /usr/bin/sqlplus
-	fi
-
-	if use sdk; then
-		einfo "Installing SDK ..."
-
-		DOCS+=( sdk/demo )
-		cd "${S}"/sdk || die
-
-		# SDK makefile, for #165834
-		# As we change the relative filesystem layout compared
-		# to vanilla instantclient.zip content, it feels easier
-		# to fake the layout found in Oracle eXpress Edition.
-		# Both layouts are known to DBD::Oracle (cpan).
-		insinto "/${oracle_home}"/rdbms/demo
-		newins demo/demo.mk demo_xe.mk
-
-		# Remove ldap.h, #299562
-		rm include/ldap.h || die
-		# DBD::Oracle needs rdbms/public as real directory
-		insinto "/${oracle_home}"/rdbms/public
-		doins include/*.h
-		dosym rdbms/public "/${oracle_home}"/include
-		# ruby-oci8 expects the headers here
-		dosym "/${oracle_home}"/rdbms/public /usr/include/oracle/${MYLIB_PVM}/client
-
-		# ott
-		insinto "/${oracle_home}"/$(get_libdir)
-		dobin ott
-		doins *.zip
-
-		# more files found in the zip
-		insinto "/${oracle_home}"/admin
-		doins admin/oraaccess.xsd
-
-		eend $?
-	fi
-
-	cd "${S}" || die
-	einstalldocs
-
-	# create path for tnsnames.ora
-	insinto /etc/oracle
-	doins "${FILESDIR}"/tnsnames.ora.sample
-
-	# Add OCI libs to library path
-	{
-		echo "# ${EPREFIX}/etc/env.d/50${PN}"
-		echo "# Do not edit this file, but 99${PN} instead"
-		echo
-		echo "ORACLE_HOME=${EPREFIX}/${oracle_home}"
-		echo "LDPATH=${ldpath}"
-		echo "TNS_ADMIN=/etc/oracle/"
-	} > "${T}"/50${PN}
-
-	doenvd "${T}"/50${PN}
-
-	# ensure ORACLE_HOME/lib exists
-	[[ -e ${ED}${oracle_home}/lib/. ]] ||
-	dosym $(get_libdir) "${oracle_home}"/lib
-}
-
-pkg_preinst() {
-	if [[ -r ${EROOT}/etc/env.d/99${PN} ]]; then
-		cp "${EROOT}/etc/env.d/99${PN}" "${ED}/etc/env.d/" || die
-	else
-		{
-			echo "# ${EPREFIX}/etc/env.d/99${PN}"
-			echo "# Configure system-wide defaults for your Oracle Instant Client here"
-			echo
-			echo "#$(grep '^ORACLE_HOME=' "${ED}/etc/env.d/50${PN}")"
-			echo "#$(grep '^TNS_ADMIN=' "${ED}/etc/env.d/50${PN}")"
-			echo "#NLS_LANG="
-		} > "${ED}/etc/env.d/99${PN}"
-	fi
-}
-
-pkg_postinst() {
-	elog "${P} does not provide an sqlnet.ora"
-	elog "configuration file, redirecting oracle diagnostics for database-"
-	elog "and network-issues into ~USER/oradiag_USER/ instead."
-	elog "It should be safe to ignore this message in sqlnet.log there:"
-	elog "   Directory does not exist for read/write [ORACLE_HOME/client/log] []"
-	elog "See https://bugs.gentoo.org/show_bug.cgi?id=465252 for reference."
-	elog "If you want to directly analyse low-level debug info or don't want"
-	elog "to see it at all, so you really need an sqlnet.ora file, please"
-	elog "consult http://search.oracle.com/search/search?q=sqlnet.ora"
-	elog ""
-	elog "TNS_ADMIN has been set to ${EROOT}etc/oracle by default,"
-	elog "put your tnsnames.ora there or configure TNS_ADMIN"
-	elog "to point to your user specific configuration."
-	ewarn "Please re-source your shell settings for ORACLE_HOME"
-	ewarn "  changes, such as: source /etc/profile"
-}

diff --git a/dev-db/oracle-instantclient/oracle-instantclient-18.3.0.0-r1.ebuild b/dev-db/oracle-instantclient/oracle-instantclient-18.3.0.0-r1.ebuild
deleted file mode 100644
index 160831003b5..00000000000
--- a/dev-db/oracle-instantclient/oracle-instantclient-18.3.0.0-r1.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit eutils pax-utils multilib-minimal
-
-DESCRIPTION="Oracle 18c Instant Client with SDK"
-HOMEPAGE="https://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html"
-
-MY_SOVER=18.1 # the library soname found in the zip files
-
-IUSE="jdbc odbc precomp +sdk +sqlplus tools"
-REQUIRED_USE="precomp? ( sdk )"
-
-MY_PVM=$(ver_cut 1-2)
-MY_P="instantclient_$(ver_rs 1 _ ${MY_PVM})"
-
-MY_PV=$(ver_cut 1-4)
-MY_PVP=$(ver_cut 5) # p2
-
-MY_PLAT_x86="Linux x86"
-MY_BITS_x86=32
-MY_A_x86="${PN/oracle-/}-basic-linux-${MY_PV}.0dbru.zip"
-MY_A_x86_jdbc="${MY_A_x86/basic/jdbc}"
-MY_A_x86_odbc="${MY_A_x86/basic/odbc}"
-MY_A_x86_precomp="${MY_A_x86/basic/precomp}"
-MY_A_x86_sdk="${MY_A_x86/basic/sdk}"
-MY_A_x86_sqlplus="${MY_A_x86/basic/sqlplus}"
-MY_A_x86_tools="${MY_A_x86/basic/tools}"
-
-MY_PLAT_amd64="Linux x86-64"
-MY_BITS_amd64=64
-MY_A_amd64="${PN/oracle-}-basic-linux.x64-${MY_PV}.0dbru.zip"
-MY_A_amd64_jdbc="${MY_A_amd64/basic/jdbc}"
-MY_A_amd64_odbc="${MY_A_amd64/basic/odbc}"
-MY_A_amd64_precomp="${MY_A_amd64/basic/precomp}"
-MY_A_amd64_sdk="${MY_A_amd64/basic/sdk}"
-MY_A_amd64_sqlplus="${MY_A_amd64/basic/sqlplus}"
-MY_A_amd64_tools="${MY_A_amd64/basic/tools}"
-
-if [[ ${MY_PVP} == p* ]]
-then
-	MY_PVP=-${MY_PVP#p}
-	# Updated 9/22/2017: instantclient-odbc-linux-12.2.0.1.0-2.zip
-	MY_A_x86_odbc="${MY_A_x86_odbc%.zip}${MY_PVP}.zip"
-	MY_A_amd64_odbc="${MY_A_amd64_odbc%.zip}${MY_PVP}.zip"
-fi
-
-SRC_URI="
-	abi_x86_32? (
-		${MY_A_x86}
-		jdbc?    ( ${MY_A_x86_jdbc}    )
-		odbc?    ( ${MY_A_x86_odbc}    )
-		precomp? ( ${MY_A_x86_precomp} )
-		!abi_x86_64? (
-			sdk?     ( ${MY_A_x86_sdk}     )
-			sqlplus? ( ${MY_A_x86_sqlplus} )
-			tools?   ( ${MY_A_x86_tools}   )
-	) )
-	abi_x86_64? (
-		${MY_A_amd64}
-		jdbc?    ( ${MY_A_amd64_jdbc}    )
-		odbc?    ( ${MY_A_amd64_odbc}    )
-		precomp? ( ${MY_A_amd64_precomp} )
-		sdk?     ( ${MY_A_amd64_sdk}     )
-		sqlplus? ( ${MY_A_amd64_sqlplus} )
-		tools?   ( ${MY_A_amd64_tools}   )
-	)
-"
-
-LICENSE="OTN"
-SLOT="0/${MY_SOVER}"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="fetch splitdebug"
-
-DEPEND="app-arch/unzip"
-RDEPEND="
-	>=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]
-	!<dev-db/oracle-instantclient-basic-12
-	!<dev-db/oracle-instantclient-odbc-12
-	!<dev-db/oracle-instantclient-jdbc-12
-	!<dev-db/oracle-instantclient-sqlplus-12
-"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_PREBUILT="usr/lib*/oracle/client/*/*"
-
-set_my_abivars() {
-	if multilib_is_native_abi; then
-		MY_WORKDIR="${WORKDIR}"
-		MY_S="${S}"
-	else
-		MY_WORKDIR="${WORKDIR}/${ABI}"
-		MY_S="${MY_WORKDIR}/${MY_P}"
-	fi
-
-	local abi=${ABI}
-	[[ ${abi} == 'default' ]] && abi=${ARCH}
-	MY_PLAT=MY_PLAT_${abi}          ; MY_PLAT=${!MY_PLAT}         # platform name
-	MY_BITS=MY_BITS_${abi}          ; MY_BITS=${!MY_BITS}         # platform bitwidth
-	MY_A=MY_A_${abi}                ; MY_A=${!MY_A}               # runtime distfile
-	MY_A_jdbc=MY_A_${abi}_jdbc      ; MY_A_jdbc=${!MY_A_jdbc}       # jdbc distfile
-	MY_A_odbc=MY_A_${abi}_odbc      ; MY_A_odbc=${!MY_A_odbc}       # odbc distfile
-	MY_A_precomp=MY_A_${abi}_precomp; MY_A_precomp=${!MY_A_precomp} # precomp distfile
-	MY_A_sdk=MY_A_${abi}_sdk        ; MY_A_sdk=${!MY_A_sdk}         # sdk distfile
-	MY_A_sqlplus=MY_A_${abi}_sqlplus; MY_A_sqlplus=${!MY_A_sqlplus} # sqlplus distfile
-	MY_A_tools=MY_A_${abi}_tools    ; MY_A_tools=${!MY_A_tools}     # tools distfile
-
-	[[ -n ${MY_PLAT} ]]
-}
-
-oic_distfile_status() {
-	: # We must not access DISTDIR in pkg_* phase, bug#612966.
-# Not removing this lines yet, we may eventually specify this feature.
-#	if [[ -r ${DISTDIR}/${1} ]]; then
-#		echo "already here"
-#	else
-#		echo "still absent"
-#	fi
-}
-
-pkg_nofetch() {
-	eerror "Please go to"
-	eerror "  ${HOMEPAGE//overview/downloads}"
-	eerror "  and download"
-	local ABI
-	for ABI in $(multilib_get_enabled_abis)
-	do
-		set_my_abivars || continue
-		eerror "Instant Client for ${MY_PLAT}"
-		# convenient ordering like Linux x86-64 download site
-		eerror "            Basic: $(oic_distfile_status ${MY_A}) ${MY_A}"
-		use sqlplus && multilib_is_native_abi &&
-		eerror "         SQL*Plus: $(oic_distfile_status ${MY_A_sqlplus}) ${MY_A_sqlplus}"
-		use tools && multilib_is_native_abi &&
-		eerror "            Tools: $(oic_distfile_status ${MY_A_tools}) ${MY_A_tools}"
-		use sdk && multilib_is_native_abi &&
-		eerror "              SDK: $(oic_distfile_status ${MY_A_sdk}) ${MY_A_sdk}"
-		use jdbc &&
-		eerror "             JDBC: $(oic_distfile_status ${MY_A_jdbc}) ${MY_A_jdbc}"
-		use odbc &&
-		eerror "             ODBC: $(oic_distfile_status ${MY_A_odbc}) ${MY_A_odbc}"
-		use precomp &&
-		eerror "      Precompiler: $(oic_distfile_status ${MY_A_precomp}) ${MY_A_precomp}"
-	done
-	eerror "After downloading these files (for *all* shown architectures),"
-	eerror "put them in your DISTDIR filesystem directory."
-}
-
-src_unpack() {
-	local ABI
-	for ABI in $(multilib_get_enabled_abis)
-	do
-		set_my_abivars || continue
-		mkdir -p "${MY_WORKDIR}" || die
-		cd "${MY_WORKDIR}" || die
-		unpack ${MY_A}
-		use jdbc    && unpack ${MY_A_jdbc}
-		use odbc    && unpack ${MY_A_odbc}
-		use precomp && unpack ${MY_A_precomp}
-		if multilib_is_native_abi; then
-			use sdk     && unpack ${MY_A_sdk}
-			use sqlplus && unpack ${MY_A_sqlplus}
-			use tools   && unpack ${MY_A_tools}
-		fi
-	done
-}
-
-src_prepare() {
-	local PATCHES=()
-	if use precomp; then
-		PATCHES+=( "${FILESDIR}"/18.3.0.0-proc-makefile.patch )
-		# Not supporting COBOL for now
-		rm -f sdk/demo/*procob*
-	fi
-	if use sdk; then
-		PATCHES+=( "${FILESDIR}"/18.3.0.0-makefile.patch )
-		rm sdk/include/ldap.h || die #299562
-	fi
-	default
-}
-
-# silence configure&compile messages from multilib-minimal
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	# all content goes here without version number, bug#578402
-	local oracle_home=/usr/$(get_libdir)/oracle/client
-	local oracle_home_to_root=../../../.. # for dosym
-	local ldpath=
-
-	local ABI
-	for ABI in $(multilib_get_enabled_abis) # last iteration is final ABI
-	do
-		if ! set_my_abivars; then
-			elog "Skipping unsupported ABI ${ABI}."
-			continue
-		fi
-		einfo "Installing runtime for ${MY_PLAT} ..."
-
-		cd "${MY_S}" || die
-
-		# shared libraries
-		into "${oracle_home}"
-		dolib.so lib*$(get_libname)*
-		use precomp && dolib.a cobsqlintf.o
-
-		# ensure to be linkable
-		[[ -e libocci$(get_libname) ]] ||
-		dosym libocci$(get_libname ${MY_SOVER}) \
-			"${oracle_home}"/$(get_libdir)/libocci$(get_libname)
-		[[ -e libclntsh$(get_libname) ]] ||
-		dosym libclntsh$(get_libname ${MY_SOVER}) \
-			"${oracle_home}"/$(get_libdir)/libclntsh$(get_libname)
-
-		# java archives
-		insinto "${oracle_home}"/$(get_libdir)
-		doins *.jar
-
-		# runtime library path
-		ldpath+=${ldpath:+:}${oracle_home}/$(get_libdir)
-
-		# Vanilla filesystem layout does not support multilib
-		# installation, so we need to move the libs into the
-		# ABI specific libdir.  However, ruby-oci8 build system
-		# detects an instantclient along the libraries, and
-		# does expect the sdk right there.
-		use sdk && dosym ../sdk "${oracle_home}"/$(get_libdir)/sdk
-
-		eend $?
-	done
-
-	local DOCS=( BASIC_README )
-	local HTML_DOCS=()
-	local paxbins=( adrci genezi uidrvci )
-	local scripts=()
-
-	if use jdbc; then
-		DOCS+=( JDBC_README )
-	fi
-	if use odbc; then
-		DOCS+=( ODBC_README )
-		HTML_DOCS+=( help )
-		scripts+=( odbc_update_ini.sh )
-	fi
-	if use precomp; then
-		DOCS+=( PRECOMP_README )
-		paxbins+=( sdk/proc )
-		# Install pcscfg.cfg into /etc/oracle, as the user probably
-		# wants to add the include path for the compiler headers
-		# here and we do not want this to be overwritten.
-		insinto /etc/oracle
-		doins precomp/admin/pcscfg.cfg
-		sed -i -e "s%^sys_include=.*%sys_include=(${oracle_home}/include,${EPREFIX}/usr/include)%" \
-			"${ED}"/etc/oracle/pcscfg.cfg || die
-		dosym ../../${oracle_home_to_root}/etc/oracle/pcscfg.cfg "${oracle_home}/precomp/admin/pcscfg.cfg"
-		dosym ../.."${oracle_home}"/bin/proc /usr/bin/proc
-		# Not supporting COBOL for now
-		# paxbins+=( sdk/{procob,rtsora} )
-		# doins precomp/admin/pcbcfg.cfg
-	fi
-	if use sdk; then
-		einfo "Installing SDK ..."
-		DOCS+=( sdk/SDK_README )
-		scripts+=( sdk/ott )
-		insinto "${oracle_home}"/$(get_libdir)
-		doins sdk/ottclasses.zip
-		insinto "${oracle_home}"/sdk
-		doins -r sdk/{admin,demo,include}
-		dosym sdk/include "${oracle_home}"/include
-
-		# The build system in DBD::Oracle perl module would detect
-		# an instantclient along the sharedlibs in ORACLE_HOME, which
-		# we cannot provide. But it also knows Oracle eXpress Edition's
-		# layout - which we emulate enough here to let DBD::Oracle work.
-		dosym ../../sdk/demo/demo.mk "${oracle_home}"/rdbms/demo/demo_xe.mk
-
-		# some build systems expect the headers here, also see bug#652096
-		dosym ../../../.."${oracle_home}"/sdk/include /usr/include/oracle/${MY_PVM}/client
-
-		eend $?
-	fi
-	if use sqlplus; then
-		DOCS+=( SQLPLUS_README )
-		paxbins+=( sqlplus )
-		insinto "${oracle_home}"/sqlplus/admin
-		doins glogin.sql
-		dosym ../.."${oracle_home}"/bin/sqlplus /usr/bin/sqlplus
-	fi
-	if use tools; then
-		DOCS+=( TOOLS_README )
-		paxbins+=( exp expdp imp impdp sqlldr wrc )
-	fi
-
-	einfo "Installing binaries for ${MY_PLAT} ..."
-	into "${oracle_home}"
-	dobin ${paxbins[*]} ${scripts[*]}
-	pushd "${ED}${oracle_home}/bin" >/dev/null || die
-	pax-mark -c ${paxbins[*]#*/} || die
-	popd >/dev/null || die
-	eend $?
-
-	einstalldocs
-
-	# create path for tnsnames.ora
-	insinto /etc/oracle
-	doins "${FILESDIR}"/tnsnames.ora.sample
-
-	# Add OCI libs to library path
-	{
-		echo "# ${EPREFIX}/etc/env.d/50${PN}"
-		echo "# Do not edit this file, but 99${PN} instead"
-		echo
-		echo "ORACLE_HOME=${EPREFIX}${oracle_home}"
-		echo "LDPATH=${ldpath}"
-		echo "TNS_ADMIN=${EPREFIX}/etc/oracle/"
-	} > "${T}"/50${PN}
-
-	doenvd "${T}"/50${PN}
-
-	# ensure ORACLE_HOME/lib exists
-	[[ -e ${ED}${oracle_home}/lib/. ]] ||
-	dosym $(get_libdir) "${oracle_home#/}"/lib
-}
-
-pkg_preinst() {
-	if [[ -r ${EROOT}/etc/env.d/99${PN} ]]; then
-		cp "${EROOT}/etc/env.d/99${PN}" "${ED}/etc/env.d/" || die
-	else
-		{
-			echo "# ${EPREFIX}/etc/env.d/99${PN}"
-			echo "# Configure system-wide defaults for your Oracle Instant Client here"
-			echo
-			echo "#$(grep '^ORACLE_HOME=' "${ED}/etc/env.d/50${PN}")"
-			echo "#$(grep '^TNS_ADMIN=' "${ED}/etc/env.d/50${PN}")"
-			echo "#NLS_LANG="
-		} > "${ED}/etc/env.d/99${PN}"
-	fi
-}
-
-pkg_postinst() {
-	elog "${P} does not provide an sqlnet.ora"
-	elog "configuration file, redirecting oracle diagnostics for database-"
-	elog "and network-issues into ~USER/oradiag_USER/ instead."
-	elog "It should be safe to ignore this message in sqlnet.log there:"
-	elog "   Directory does not exist for read/write [ORACLE_HOME/client/log] []"
-	elog "See https://bugs.gentoo.org/show_bug.cgi?id=465252 for reference."
-	elog "If you want to directly analyse low-level debug info or don't want"
-	elog "to see it at all, so you really need an sqlnet.ora file, please"
-	elog "consult http://search.oracle.com/search/search?q=sqlnet.ora"
-	elog ""
-	elog "TNS_ADMIN has been set to ${EPREFIX}/etc/oracle by default,"
-	elog "put your tnsnames.ora there or configure TNS_ADMIN"
-	elog "to point to your user specific configuration."
-	if use precomp; then
-		elog ""
-		elog "The proc precompiler uses the system library headers, which in"
-		elog "turn include the headers of the used compiler."
-		elog "To make proc work, please add the compiler header path of your"
-		elog "preferred compiler to sys_include in:"
-		elog "  ${EPREFIX}/etc/oracle/pcscfg.cfg"
-		elog "Remember to update this setting when you switch or update the"
-		elog "compiler."
-		elog "For gcc, the headers are usually found in a path matching the"
-		elog "following pattern:"
-		elog "  ${EPREFIX}/usr/lib/gcc/*/*/include"
-		elog "The exact details depend on the architecture and the version of"
-		elog "the compiler to be used."
-	fi
-	ewarn "Please re-source your shell settings for ORACLE_HOME"
-	ewarn "  changes, such as: source ${EPREFIX}/etc/profile"
-}

diff --git a/dev-db/oracle-instantclient/oracle-instantclient-18.3.0.0.ebuild b/dev-db/oracle-instantclient/oracle-instantclient-18.3.0.0.ebuild
deleted file mode 100644
index 0a67edfcb54..00000000000
--- a/dev-db/oracle-instantclient/oracle-instantclient-18.3.0.0.ebuild
+++ /dev/null
@@ -1,342 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit eutils pax-utils multilib-minimal
-
-DESCRIPTION="Oracle 18c Instant Client with SDK"
-HOMEPAGE="https://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html"
-
-MY_SOVER=18.1 # the library soname found in the zip files
-
-IUSE="jdbc odbc precomp +sdk +sqlplus tools"
-REQUIRED_USE="precomp? ( sdk )"
-
-MY_PVM=$(ver_cut 1-2)
-MY_P="instantclient_$(ver_rs 1 _ ${MY_PVM})"
-
-MY_PV=$(ver_cut 1-4)
-MY_PVP=$(ver_cut 5) # p2
-
-MY_PLAT_x86="Linux x86"
-MY_BITS_x86=32
-MY_A_x86="${PN/oracle-/}-basic-linux-${MY_PV}.0dbru.zip"
-MY_A_x86_jdbc="${MY_A_x86/basic/jdbc}"
-MY_A_x86_odbc="${MY_A_x86/basic/odbc}"
-MY_A_x86_precomp="${MY_A_x86/basic/precomp}"
-MY_A_x86_sdk="${MY_A_x86/basic/sdk}"
-MY_A_x86_sqlplus="${MY_A_x86/basic/sqlplus}"
-MY_A_x86_tools="${MY_A_x86/basic/tools}"
-
-MY_PLAT_amd64="Linux x86-64"
-MY_BITS_amd64=64
-MY_A_amd64="${PN/oracle-}-basic-linux.x64-${MY_PV}.0dbru.zip"
-MY_A_amd64_jdbc="${MY_A_amd64/basic/jdbc}"
-MY_A_amd64_odbc="${MY_A_amd64/basic/odbc}"
-MY_A_amd64_precomp="${MY_A_amd64/basic/precomp}"
-MY_A_amd64_sdk="${MY_A_amd64/basic/sdk}"
-MY_A_amd64_sqlplus="${MY_A_amd64/basic/sqlplus}"
-MY_A_amd64_tools="${MY_A_amd64/basic/tools}"
-
-if [[ ${MY_PVP} == p* ]]
-then
-	MY_PVP=-${MY_PVP#p}
-	# Updated 9/22/2017: instantclient-odbc-linux-12.2.0.1.0-2.zip
-	MY_A_x86_odbc="${MY_A_x86_odbc%.zip}${MY_PVP}.zip"
-	MY_A_amd64_odbc="${MY_A_amd64_odbc%.zip}${MY_PVP}.zip"
-fi
-
-SRC_URI="
-	abi_x86_32? (
-		${MY_A_x86}
-		jdbc?    ( ${MY_A_x86_jdbc}    )
-		odbc?    ( ${MY_A_x86_odbc}    )
-		precomp? ( ${MY_A_x86_precomp} )
-		!abi_x86_64? (
-			sdk?     ( ${MY_A_x86_sdk}     )
-			sqlplus? ( ${MY_A_x86_sqlplus} )
-			tools?   ( ${MY_A_x86_tools}   )
-	) )
-	abi_x86_64? (
-		${MY_A_amd64}
-		jdbc?    ( ${MY_A_amd64_jdbc}    )
-		odbc?    ( ${MY_A_amd64_odbc}    )
-		precomp? ( ${MY_A_amd64_precomp} )
-		sdk?     ( ${MY_A_amd64_sdk}     )
-		sqlplus? ( ${MY_A_amd64_sqlplus} )
-		tools?   ( ${MY_A_amd64_tools}   )
-	)
-"
-
-LICENSE="OTN"
-SLOT="0/${MY_SOVER}"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="fetch splitdebug"
-
-DEPEND="app-arch/unzip"
-RDEPEND="
-	>=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]
-	!<dev-db/oracle-instantclient-basic-12
-	!<dev-db/oracle-instantclient-odbc-12
-	!<dev-db/oracle-instantclient-jdbc-12
-	!<dev-db/oracle-instantclient-sqlplus-12
-"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_PREBUILT="usr/lib*/oracle/client/*/*"
-
-set_my_abivars() {
-	if multilib_is_native_abi; then
-		MY_WORKDIR="${WORKDIR}"
-		MY_S="${S}"
-	else
-		MY_WORKDIR="${WORKDIR}/${ABI}"
-		MY_S="${MY_WORKDIR}/${MY_P}"
-	fi
-
-	local abi=${ABI}
-	[[ ${abi} == 'default' ]] && abi=${ARCH}
-	MY_PLAT=MY_PLAT_${abi}          ; MY_PLAT=${!MY_PLAT}         # platform name
-	MY_BITS=MY_BITS_${abi}          ; MY_BITS=${!MY_BITS}         # platform bitwidth
-	MY_A=MY_A_${abi}                ; MY_A=${!MY_A}               # runtime distfile
-	MY_A_jdbc=MY_A_${abi}_jdbc      ; MY_A_jdbc=${!MY_A_jdbc}       # jdbc distfile
-	MY_A_odbc=MY_A_${abi}_odbc      ; MY_A_odbc=${!MY_A_odbc}       # odbc distfile
-	MY_A_precomp=MY_A_${abi}_precomp; MY_A_precomp=${!MY_A_precomp} # precomp distfile
-	MY_A_sdk=MY_A_${abi}_sdk        ; MY_A_sdk=${!MY_A_sdk}         # sdk distfile
-	MY_A_sqlplus=MY_A_${abi}_sqlplus; MY_A_sqlplus=${!MY_A_sqlplus} # sqlplus distfile
-	MY_A_tools=MY_A_${abi}_tools    ; MY_A_tools=${!MY_A_tools}     # tools distfile
-
-	[[ -n ${MY_PLAT} ]]
-}
-
-oic_distfile_status() {
-	: # We must not access DISTDIR in pkg_* phase, bug#612966.
-# Not removing this lines yet, we may eventually specify this feature.
-#	if [[ -r ${DISTDIR}/${1} ]]; then
-#		echo "already here"
-#	else
-#		echo "still absent"
-#	fi
-}
-
-pkg_nofetch() {
-	eerror "Please go to"
-	eerror "  ${HOMEPAGE//overview/downloads}"
-	eerror "  and download"
-	local ABI
-	for ABI in $(multilib_get_enabled_abis)
-	do
-		set_my_abivars || continue
-		eerror "Instant Client for ${MY_PLAT}"
-		# convenient ordering like Linux x86-64 download site
-		eerror "            Basic: $(oic_distfile_status ${MY_A}) ${MY_A}"
-		use sqlplus && multilib_is_native_abi &&
-		eerror "         SQL*Plus: $(oic_distfile_status ${MY_A_sqlplus}) ${MY_A_sqlplus}"
-		use tools && multilib_is_native_abi &&
-		eerror "            Tools: $(oic_distfile_status ${MY_A_tools}) ${MY_A_tools}"
-		use sdk && multilib_is_native_abi &&
-		eerror "              SDK: $(oic_distfile_status ${MY_A_sdk}) ${MY_A_sdk}"
-		use jdbc &&
-		eerror "             JDBC: $(oic_distfile_status ${MY_A_jdbc}) ${MY_A_jdbc}"
-		use odbc &&
-		eerror "             ODBC: $(oic_distfile_status ${MY_A_odbc}) ${MY_A_odbc}"
-		use precomp &&
-		eerror "      Precompiler: $(oic_distfile_status ${MY_A_precomp}) ${MY_A_precomp}"
-	done
-	eerror "After downloading these files (for *all* shown architectures),"
-	eerror "put them in your DISTDIR filesystem directory."
-}
-
-src_unpack() {
-	local ABI
-	for ABI in $(multilib_get_enabled_abis)
-	do
-		set_my_abivars || continue
-		mkdir -p "${MY_WORKDIR}" || die
-		cd "${MY_WORKDIR}" || die
-		unpack ${MY_A}
-		use jdbc    && unpack ${MY_A_jdbc}
-		use odbc    && unpack ${MY_A_odbc}
-		use precomp && unpack ${MY_A_precomp}
-		if multilib_is_native_abi; then
-			use sdk     && unpack ${MY_A_sdk}
-			use sqlplus && unpack ${MY_A_sqlplus}
-			use tools   && unpack ${MY_A_tools}
-		fi
-	done
-}
-
-src_prepare() {
-	if use sdk; then
-		rm sdk/include/ldap.h || die #299562
-		PATCHES=( "${FILESDIR}"/18.3.0.0-makefile.patch )
-	fi
-	default
-}
-
-# silence configure&compile messages from multilib-minimal
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	# all content goes here without version number, bug#578402
-	local oracle_home=/usr/$(get_libdir)/oracle/client
-	local ldpath=
-
-	local ABI
-	for ABI in $(multilib_get_enabled_abis) # last iteration is final ABI
-	do
-		if ! set_my_abivars; then
-			elog "Skipping unsupported ABI ${ABI}."
-			continue
-		fi
-		einfo "Installing runtime for ${MY_PLAT} ..."
-
-		cd "${MY_S}" || die
-
-		# shared libraries
-		into "${oracle_home}"
-		dolib.so lib*$(get_libname)*
-		use precomp && dolib.a cobsqlintf.o
-
-		# ensure to be linkable
-		[[ -e libocci$(get_libname) ]] ||
-		dosym libocci$(get_libname ${MY_SOVER}) \
-			"${oracle_home}"/$(get_libdir)/libocci$(get_libname)
-		[[ -e libclntsh$(get_libname) ]] ||
-		dosym libclntsh$(get_libname ${MY_SOVER}) \
-			"${oracle_home}"/$(get_libdir)/libclntsh$(get_libname)
-
-		# java archives
-		insinto "${oracle_home}"/$(get_libdir)
-		doins *.jar
-
-		# runtime library path
-		ldpath+=${ldpath:+:}${oracle_home}/$(get_libdir)
-
-		# Vanilla filesystem layout does not support multilib
-		# installation, so we need to move the libs into the
-		# ABI specific libdir.  However, ruby-oci8 build system
-		# detects an instantclient along the libraries, and
-		# does expect the sdk right there.
-		use sdk && dosym ../sdk "${oracle_home}"/$(get_libdir)/sdk
-
-		eend $?
-	done
-
-	local DOCS=( BASIC_README )
-	local HTML_DOCS=()
-	local paxbins=( adrci genezi uidrvci )
-	local scripts=()
-
-	if use jdbc; then
-		DOCS+=( JDBC_README )
-	fi
-	if use odbc; then
-		DOCS+=( ODBC_README )
-		HTML_DOCS+=( help )
-		scripts+=( odbc_update_ini.sh )
-	fi
-	if use precomp; then
-		DOCS+=( PRECOMP_README )
-		paxbins+=( sdk/{proc,procob,rtsora} )
-		insinto "${oracle_home}/precomp/admin"
-		doins precomp/admin/{pcs,pcb}cfg.cfg
-	fi
-	if use sdk; then
-		einfo "Installing SDK ..."
-		DOCS+=( sdk/SDK_README )
-		scripts+=( sdk/ott )
-		insinto "${oracle_home}"/$(get_libdir)
-		doins sdk/ottclasses.zip
-		insinto "${oracle_home}"/sdk
-		doins -r sdk/{admin,demo,include}
-
-		# The build system in DBD::Oracle perl module would detect
-		# an instantclient along the sharedlibs in ORACLE_HOME, which
-		# we cannot provide. But it also knows Oracle eXpress Edition's
-		# layout - which we emulate enough here to let DBD::Oracle work.
-		dosym ../../sdk/demo/demo.mk "${oracle_home}"/rdbms/demo/demo_xe.mk
-
-		# some build systems expect the headers here, also see bug#652096
-		dosym "${oracle_home}"/sdk/include /usr/include/oracle/${MY_PVM}/client
-
-		eend $?
-	fi
-	if use sqlplus; then
-		DOCS+=( SQLPLUS_README )
-		paxbins+=( sqlplus )
-		insinto "${oracle_home}"/sqlplus/admin
-		doins glogin.sql
-		dosym "${oracle_home}"/bin/sqlplus /usr/bin/sqlplus
-	fi
-	if use tools; then
-		DOCS+=( TOOLS_README )
-		paxbins+=( exp expdp imp impdp sqlldr wrc )
-	fi
-
-	einfo "Installing binaries for ${MY_PLAT} ..."
-	into "${oracle_home}"
-	dobin ${paxbins[*]} ${scripts[*]}
-	pushd "${ED}${oracle_home}/bin" >/dev/null || die
-	pax-mark -c ${paxbins[*]#*/} || die
-	popd >/dev/null || die
-	eend $?
-
-	einstalldocs
-
-	# create path for tnsnames.ora
-	insinto /etc/oracle
-	doins "${FILESDIR}"/tnsnames.ora.sample
-
-	# Add OCI libs to library path
-	{
-		echo "# ${EPREFIX}/etc/env.d/50${PN}"
-		echo "# Do not edit this file, but 99${PN} instead"
-		echo
-		echo "ORACLE_HOME=${EPREFIX}${oracle_home}"
-		echo "LDPATH=${ldpath}"
-		echo "TNS_ADMIN=${EPREFIX}/etc/oracle/"
-	} > "${T}"/50${PN}
-
-	doenvd "${T}"/50${PN}
-
-	# ensure ORACLE_HOME/lib exists
-	[[ -e ${ED}${oracle_home}/lib/. ]] ||
-	dosym $(get_libdir) "${oracle_home#/}"/lib
-}
-
-pkg_preinst() {
-	if [[ -r ${EROOT}/etc/env.d/99${PN} ]]; then
-		cp "${EROOT}/etc/env.d/99${PN}" "${ED}/etc/env.d/" || die
-	else
-		{
-			echo "# ${EPREFIX}/etc/env.d/99${PN}"
-			echo "# Configure system-wide defaults for your Oracle Instant Client here"
-			echo
-			echo "#$(grep '^ORACLE_HOME=' "${ED}/etc/env.d/50${PN}")"
-			echo "#$(grep '^TNS_ADMIN=' "${ED}/etc/env.d/50${PN}")"
-			echo "#NLS_LANG="
-		} > "${ED}/etc/env.d/99${PN}"
-	fi
-}
-
-pkg_postinst() {
-	elog "${P} does not provide an sqlnet.ora"
-	elog "configuration file, redirecting oracle diagnostics for database-"
-	elog "and network-issues into ~USER/oradiag_USER/ instead."
-	elog "It should be safe to ignore this message in sqlnet.log there:"
-	elog "   Directory does not exist for read/write [ORACLE_HOME/client/log] []"
-	elog "See https://bugs.gentoo.org/show_bug.cgi?id=465252 for reference."
-	elog "If you want to directly analyse low-level debug info or don't want"
-	elog "to see it at all, so you really need an sqlnet.ora file, please"
-	elog "consult http://search.oracle.com/search/search?q=sqlnet.ora"
-	elog ""
-	elog "TNS_ADMIN has been set to ${EPREFIX}/etc/oracle by default,"
-	elog "put your tnsnames.ora there or configure TNS_ADMIN"
-	elog "to point to your user specific configuration."
-	ewarn "Please re-source your shell settings for ORACLE_HOME"
-	ewarn "  changes, such as: source ${EPREFIX}/etc/profile"
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-db/oracle-instantclient/, dev-db/oracle-instantclient/files/
@ 2021-09-28  1:45 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-09-28  1:45 UTC (permalink / raw
  To: gentoo-commits

commit:     37f7f7954557bd2600b45b03960d677cd073b7fb
Author:     Marco Genasci <fedeliallalinea <AT> gmail <DOT> com>
AuthorDate: Mon Aug 23 15:54:40 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 28 01:45:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f7f795

dev-db/oracle-instantclient: bump version to 21.3.0.0.0

Closes: https://bugs.gentoo.org/809827
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Marco Genasci <fedeliallalinea <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22082
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-db/oracle-instantclient/Manifest               |  14 +
 .../files/21.3.0.0.0-makefile.patch                |  22 ++
 .../oracle-instantclient-21.3.0.0.0.ebuild         | 340 +++++++++++++++++++++
 3 files changed, 376 insertions(+)

diff --git a/dev-db/oracle-instantclient/Manifest b/dev-db/oracle-instantclient/Manifest
index 7fc01ec5f92..9397aa443e4 100644
--- a/dev-db/oracle-instantclient/Manifest
+++ b/dev-db/oracle-instantclient/Manifest
@@ -3,75 +3,89 @@ DIST instantclient-basic-linux-19.11.0.0.0dbru.zip 70336706 BLAKE2B 061f6abc83ba
 DIST instantclient-basic-linux-19.3.0.0.0dbru.zip 69597591 BLAKE2B 4ac954c027a83c1a05b502203f1465bb29bb4e58486a98bec7848d9ae0bed6835fdc6bb5f889cc9dadc815d47e5e06258c11a6ab1fd045bd7a878858f3d1164b SHA512 d9a7c664cae598344ec7b9e9c43def9626dcc0d54d478843a5145dfb3dad5df51121c5b2e9f4bb48a240611981f7721441344649d1f267b667356271ac778beb
 DIST instantclient-basic-linux-19.5.0.0.0dbru.zip 69646008 BLAKE2B ad598da8040473e54b5134373c9a091c8fba3e13c7a1b4fe0d6b07cad36003236494432c246e79e9b09ab1cd7e38f0c5582b7db14d1d9860c8026aab26fcd5ea SHA512 1b6e7983469cc8873b17f1753ab147d6c23d7c664f2971a603910130526aeb60b0de9180fbccc01f7c952888c80afdfd7a090058e934b269c4a0a1aa9096388c
 DIST instantclient-basic-linux-19.6.0.0.0dbru.zip 69922395 BLAKE2B b8eb7f1f56ab8eff9a08098e65fe38f52f72951602917e2eaa30cdef4f6968f831deeeda16c89cdde5d2a0d443f5dc4aca773abaf614e66fa581da1a4757d717 SHA512 4782cf41ff9da3d52ffe021e7c20bf2d1fce6075edb74e765899268b60005468e8353bf3147cbbc07ae03a7a0f06828e9ef37b00a8492aacc349c3b57ce32f3f
+DIST instantclient-basic-linux-21.3.0.0.0.zip 74751697 BLAKE2B f9b29d1c98a55946670ce6a5c674f2c9e6a8d6152b0f4d335f41ad9479b0a2bcf9ba791aeba894161c64c5e088b458506c068d4ece386956158cb09f27f91b07 SHA512 b8599ebe0cf867336b1dfb4edb974b934ed29e96aa7b7a866b93c8d8271c8dfacc693b884a9e422272098e09b4c5a2d6badb11fffb57b43ca4eb15907878bb99
 DIST instantclient-basic-linux.x64-18.3.0.0.0dbru.zip 72794506 BLAKE2B 22db5d69d48c33061db72bdc050e081ec24152c5e4655505c7f75407646f5ffa140aa51f4638ad8e7c5628476bb44358cb061b2d228ab1e36cd9464e49fcf1f6 SHA512 92e607e1711b24ddf10f11ecd3b389795acc544a567a95cb62b624e5913ad11a1707699b5df659f5fb33dae5cd56700036644e643c7edbe51e7a67e57a152ecc
 DIST instantclient-basic-linux.x64-18.5.0.0.0dbru.zip 72902980 BLAKE2B 23fd9885309507183758cf817b0d68342633ad08eb627f4136b967cf38e1910cefa905f17ffea7c929fafe2232eca71ee66a15153f202eb0d03236a1b21cdc30 SHA512 10e6f91dfe07ee4788a5f70ce65affe141061e7b1d6ea0eab6583bd2aed47d7281824e91da2103c53f15e49f02b94add8c3d524494cd4eacded90b2d1cc8743b
 DIST instantclient-basic-linux.x64-19.11.0.0.0dbru.zip 75943090 BLAKE2B 6e081d22af1161d1505847c6918cc618f92810d7803f2bb13b3c58f2e8c5bb3aa70d2006fbd1fcc193d3719ecf224c3541f3dc5c5ccfc6105a10c54c51ddd2c9 SHA512 0f7242a1becb062b6c55202587360895529e7ec277b0e41e27466dc01caf4b97cf0a256d0ccb9b71fb86b4802d9c427e0428f0419260b609d94472f89f7f33e6
 DIST instantclient-basic-linux.x64-19.3.0.0.0dbru.zip 75106438 BLAKE2B d3738c6a92251c75bf39afa996eecfeb9052c6cb6a8cd2080755c8108559257c4aaf660b6a12a1127228122836c85d15d84bb322d49921184ec67ee32ffbfddc SHA512 13ddda55c88fe72e761d9b9ce5bc5ccda4df0bd5ca6237efed34e6dfebf10866b116f3aa7eaf023a73458406584a4e57ecde825bf996fc0e844c030e4d8a3bba
 DIST instantclient-basic-linux.x64-19.5.0.0.0dbru.zip 75169949 BLAKE2B a2f63542408a26b52389734282268cc471b4e995242ce53a52bcbfdb7eb7174bca06f26c1d2291dfd797dab860c18c56f38e4a930486436de36f171ab30093a3 SHA512 7860d27392c4601969a480199f263fbda0f0952a2dcab36efcbdf501568b624c6219d4966a8ff4936b6657b865fd9130f5fdab6bdceec2a45f54fe448f94db4e
 DIST instantclient-basic-linux.x64-19.6.0.0.0dbru.zip 75462547 BLAKE2B c75747d3e03e1dbd8031dad41486261a74ae16b414f0e888b1596dfac752e7ed3bf04379b1b48a6107648fbd8de0207ebbfe306bbced2b5b9f5f6502c11ac4f0 SHA512 41dd2b7645f231a9c8a3e69e75bd679e8c9ad4e772777849b4a44f80c18a70ece92d400c3369de917c897bd2e4b9c59fa73fe36b5559831e508ab65965f9e278
+DIST instantclient-basic-linux.x64-21.3.0.0.0.zip 79375865 BLAKE2B 2215829c6f7df463d0cd1108755976eb5cc6d4fdf41201687236131151d2068a9e3c8762bfdac65ce2890c57cdb2fea6684e6012d836f232a8ff3cb93223deec SHA512 812dd6bb3a3c24b87e40a3df0c2a0dcfe1b5e27524b8e1622c533d8561cd4d674e9d90b8e66f571ee21bf3d1e152092ee986b6ff226d51674f1253f1ffb97ae4
 DIST instantclient-jdbc-linux-18.3.0.0.0dbru.zip 1574763 BLAKE2B 2ddbb6a6d61c3b6bc3e37b40f786dd86f5efadcf8cbe5b58dec2631b92ebae25065cb29f87ceed9a1f426ada094a9c0ef1887f8ea7b70e66527e9b75e11f213e SHA512 96298e579b6b5a81ae2ef679d6bf9a18f8bd08c33981d0a5b836c20710dc07d15d7964895a3d66c01075a20720d333f766ac439dc4f3867edac473e020eaf065
 DIST instantclient-jdbc-linux-19.11.0.0.0dbru.zip 1577534 BLAKE2B 954049186c80028567f5ec0bb30aa28f6d9092d8c8be7cfef67f94e397dc26b935cfbbf75bee3b32e56c3697fb5a7e3181f9948ef91177af68c648e102a7db77 SHA512 5717137a6ebf28669347dd6f03f61b7242a332b927b55502b9019d108714c77e3dd31894f6d5260df6553604b0255b657aed46b63262db9f2e7153c067387e0e
 DIST instantclient-jdbc-linux-19.3.0.0.0dbru.zip 1577507 BLAKE2B 2347eb36b1dbe7552753be35b2656edbb43140768379abb8e5c94be7fb3f66fa139becb332d328d8e7f0b7f0b4e32d86703d1760dba36f53471a5b6b3c9b2341 SHA512 66c60f97994a1f45b0ef9e1600da6de319476a6ec4f6a0c9a04516d86e9d89fde1cdfd3bbd8279df125f96326f52875a1daef2ecbb6525fa26482eb637133205
 DIST instantclient-jdbc-linux-19.5.0.0.0dbru.zip 1577511 BLAKE2B 59ecabee9e38d98aa9627a01fc5f3fab9c6c3afc44d8f44c7f231b8e2582852be06761fc03ccad0c7041d1910bd4d914aa6a7e494697844efbc1e62cf95bdd00 SHA512 d1198ece5e6bfc9ca8becfad4990246bc31c53d24f7fec886da979eaece60d53211ab3a6e792f9c8adbe866e3c4b990bfcce1e9ccd4271bf2e036b701a32d7c6
 DIST instantclient-jdbc-linux-19.6.0.0.0dbru.zip 1577514 BLAKE2B 8c8e9e762fdd1a3369aa668d4afeaf23c05100f4e74732b02d47b1056163aaf7d7f96fe51685f02ffe94aa730b4bc3c24f930af9739dfb8ca192b3e64003e73f SHA512 f57d7d3597f3c89396f2b185746ecd72e291c2db6e733adbd51bac32879390395bd3dfa3ac648a8f78aa472b767a8685d090ac49f85c2f68686b6a85fb138b27
+DIST instantclient-jdbc-linux-21.3.0.0.0.zip 1578398 BLAKE2B 42fbcd9946ff87f438297751febcaef4d361d36ac9d6538bc52f988f98c51531efb3a2721ba5c3859bf7f8e9092667704c206cc373d6ad099c1e6048077b3662 SHA512 3bb62dbe0738f6800945858acf56780d8049af0d6c6466e926c7173deaecf3dcd277f9a7e57f3b89aef08e73a585b57eded7175809ddf8a53402523ba392c1d5
 DIST instantclient-jdbc-linux.x64-18.3.0.0.0dbru.zip 1575572 BLAKE2B bb9d5ad0064b547a7152d4f9b170c646105b4a0731596fe381f7a2c63b720e36cc5a93eea59ea71aa3405999d972cf962a74063350c468a8d114ad28f5a0be0c SHA512 70ebece929cb11f34fdcb6aea75af3679f22d0b838c3d256d4c7c0249977423625b1244a54ca504b51d24e2f178b1784571e185574cd3db34c2cda8128298b60
 DIST instantclient-jdbc-linux.x64-18.5.0.0.0dbru.zip 1578269 BLAKE2B 88047325934da02e81e907c9c4caee540cb06da7d7c08562e90781c2f6004940ba20131d971018fe237cc09cfef010fdf6f912b2309006396315ad67c17b10b6 SHA512 e46a4326f61863a63be333bd588571bc037edd2de1f2462b799e17c65ca8556aeaf42e2eed3a7226bf8c89479b4a723fc6cf6582a65b5ee8a827ffdad1c06bc8
 DIST instantclient-jdbc-linux.x64-19.11.0.0.0dbru.zip 1578059 BLAKE2B f5db4ab8b4424d21bb685b43012f71a228fdf1444e055b44dcf029b3beeefcca96aaddc496ac5912d4b337ec5d2bbd959df6083c18f7921811e996a2d73e5af6 SHA512 b2f906ae887f0421ff2edb80a70d0ede1fa624792e45ebfd205ade3f24dcd3cbc596c3ee64c39d7143810a2a11fafc649ad46cb5549d519dd3a1ffb7476fb537
 DIST instantclient-jdbc-linux.x64-19.3.0.0.0dbru.zip 1578033 BLAKE2B 18c9fcca1282c316c67bf86258154d94a26d81779c1d36e782dd55d91fbaf40f03f1e403db9beefe114a27f09fd3d2bcfc643cf3e9a02ae68a5bc3d2eee51c16 SHA512 58813681a74286a7f080f729e3a237584a091487401af08619e2b4349323bf3def8cce22eb550d8ee5675e9a4c7ddddab8fa493bdd8c89981aff3ef0f65d1eb3
 DIST instantclient-jdbc-linux.x64-19.5.0.0.0dbru.zip 1578023 BLAKE2B 2919f4d5a304d16b284151c620134dfcb934251a35837aba2286bb9e1b1e79179642c4331a19994d0fde55ec2859dfd5a7a56167f2b07cd0939f5c85e9448721 SHA512 c62793038b154a10dbff738e31d9e0af4e7dd0435aa51b1839e49be528d8a7b567447b735d400c3327a28cace5b9e22b92d4d9eec0eec0ce77e9f6d7831007d0
 DIST instantclient-jdbc-linux.x64-19.6.0.0.0dbru.zip 1578022 BLAKE2B d7fc065f6cdd7d1856651f295762565f8c826e5e74c350287f8fb325b622dcbcab04f1bdb9b68e67a458b1ae1c26275f2926c9f98b61da00040a6c31c854329b SHA512 68824d2e4f4881da7653ddf6e09e7d32aeb53dc5e59b90647c33706f09081debc27b517714ee5af2af3ce25ee53ca664a17c5ca7e4695038a3bea1db82236071
+DIST instantclient-jdbc-linux.x64-21.3.0.0.0.zip 1578995 BLAKE2B 9913c62abe55d5c5ebe7e9feeb9051b7833d33e3a7bc8b96667336d2ecb8bd8766d268f2eef2f2de247b0edf1d3abb65c56316a3d11b14ebcf782a3c75ed332e SHA512 8d2b7344c99ec0744e147c899e252f34fd29b7dff49b2bbe5497836130fd8e9d01f874b33ddaf7a8cca442d62eb7da56ed547120ffd409bb4731a9b56166bb42
 DIST instantclient-odbc-linux-18.3.0.0.0dbru.zip 605026 BLAKE2B 2f7808ef2706c65d1c876e44e7b831ea0629a218347f34dd4b81cce192b45b78b26c9e164b179232b1fceeeeb5f84d807ac6bef1f36fd7d077e620bbb6c093eb SHA512 370d3f34c57e33909642f18104de8b48c2ab0fd1cf679087f8601720ebc1097f64caceb118010b9e8d2f7207cef04210b22a36824de747683c3a1162ccb4f09e
 DIST instantclient-odbc-linux-19.11.0.0.0dbru.zip 600428 BLAKE2B b4bcb4131bab1fac2650bee8cf1db4f389e89bbf0e310f9df2a9f1ce29ebf35f8056e350175ceb406e82bd077825cb4e6ad405c5ec00929f2db2630e99630006 SHA512 9a21c2dc06b6e1c4ae7305ce248cbfe45e4ad830a48f3e088be11065471beda002fd5a6bcca71f5095ad70186d742bddffc82bdb79a4368e89c59bfd3f04af4b
 DIST instantclient-odbc-linux-19.3.0.0.0dbru.zip 600586 BLAKE2B ec76518290f306f41305b12da317ad6de8a73f5049ca6e06fb0e4197ecc9dc8f9855c469fa36e309615a749150580d3ff89a35bfe5878c6441fe4f6218ce3410 SHA512 77aa6c1c5f5a93b86e4e529656ab1b2eaa1e008e343d17193a074e758fc270a5b12d641a959c51b00d5cbc7a2b562c590e662701e66e295d218995ff266f005b
 DIST instantclient-odbc-linux-19.5.0.0.0dbru.zip 600590 BLAKE2B 6bfa2fa4e8e7ff5f2ea25c21ecacef97e9a1e403504d101a7c516b51eff814b5ee5dad36dcbb68be07324f560f3126ebd932e54b4834766cd8cc6f5705939da2 SHA512 bcb832d1d2011139cbc6afa68c34a5d747478db0b719c12211068396367c240d93f594f7533009b4a876484bf1894deec44a16cd5ca65ced353573d1068bb567
 DIST instantclient-odbc-linux-19.6.0.0.0dbru.zip 600498 BLAKE2B 0560d7038f0171428bca92ea78bcde6ae9169dde994d2cc4220f733ba9b7c198fbfa61db22f30f62a68ace44314c280976b0572ccf190d60bcc9c23a0ede3b60 SHA512 e6c1fd3f1545cf83da5ab9fc0781ee711434134d88836b045ec7ccf510a842a773b76365177aecd7ccc711a3aa6ec753dad94fa637c9df5bff22089babe7d824
+DIST instantclient-odbc-linux-21.3.0.0.0.zip 760101 BLAKE2B 68a96fa5e24f5d44f64eabfd142280d620423f15fff62b10094b4425b520a2a31ba54fe6bce2d723700d38ce5a579d31a1c49ef6928eb6f4e342c7c8d98a49aa SHA512 e2e4cf126652580bf2d8f8ace7694881382b745a7adfabbba0c3e6fddcbb9ca7e300b0d18b19c8da029ca8f33c5f8f95baa141da20659ba49c9a8e6f4848b2db
 DIST instantclient-odbc-linux.x64-18.3.0.0.0dbru.zip 648825 BLAKE2B 1e96b87802c9ccc7d5f6ae2fdab501004e6fe8d4e155503bb983c82cdbfff729263e541689f4c2dbeeabfdd1037f0a97191e3a50842a8488a3267f24fec6b43d SHA512 23ad10a834fd92007147f8a7ad95dd9df4fbd5b786f7e2bb9afd6a12101fb934a40daa81ade914d8d0f59872591a1ae29438f23229b3767ed4ea3ff7cc730f66
 DIST instantclient-odbc-linux.x64-18.5.0.0.0dbru.zip 651470 BLAKE2B c5e7d794137fafb97ecb5fb647a640e59490270787c16f972882c03b34c4f404717f6f87e8501252f415a85b8d92031bba9910eb034c92c4f7fac37f66a3fe43 SHA512 b9e066af00b263b348f1e7a26dbf5672f01be79115bd75a47e2cff95f32fb412a8d03736e1c5ac663847a2d75ea5606cdb1fc27434f7690120c462f8eb15a6cf
 DIST instantclient-odbc-linux.x64-19.11.0.0.0dbru.zip 638686 BLAKE2B c9fa1b8988d85870bb4c2d9cb5c34c1572079c36a51da0ef726250f03ca0b53dbc19990582358011f099ca183d6148f8110cf80c1a17917549f6e38be503f706 SHA512 7d92ff08ea48de0e981cadad15a3c392749b3e20331b25f00f2f96ef7cc11a9802408f18dbfbf36366b0122d6c8fd256d43297c3bd87b4304b0479b1593e35fc
 DIST instantclient-odbc-linux.x64-19.3.0.0.0dbru.zip 638697 BLAKE2B 2a9077243a4718c7af4abc2c36b7ca3e2993acb904dd9873c91bf8c0010ebaf18d6864a6b488eaa3a66d6fa42f83d099367533dad65d228db6e21e2b4e23a6df SHA512 dc148301d7e0ce7d74d90619f4f6aa03a26d61033d36803de7623ad64ddd5da1b34e24704ec1cf948ec341ba91e96c1bc08a5b62da79555d248f245ae75e776d
 DIST instantclient-odbc-linux.x64-19.5.0.0.0dbru.zip 638692 BLAKE2B 6ab7357ee95d806ab60de2da2a82414aa2f5f0e7527cc4f44a4028a52a01abb334ac8c4076e5f26a6d0444943e46f6c1da7843d31ff7b1c1a9d31cf13a017c9b SHA512 ac145a24ed2a2287d28c45e16f87509786f044588443b470e4155351576bc5a7d94c845f6af38a58f1a5bd82a57a4b69a8719f46cc85b1f0c4173ab3ee927fbb
 DIST instantclient-odbc-linux.x64-19.6.0.0.0dbru.zip 638654 BLAKE2B ae618640b281852e48bb5c3bb6776c7445e824d98fa96c1308f71bfbf7ac81b65119af31a92c1909e2243956ad0457c21060618265bbb78aa1be8c008ce2fc32 SHA512 f0f02c067ec1250402dde3959de527fa7b85709c225a974c6867be5d24471e8da744a1707f52183987ea91e55c69fdc92459ce7b9979ee1ad1f4604963a7dac9
+DIST instantclient-odbc-linux.x64-21.3.0.0.0.zip 798599 BLAKE2B d020c68895dbb59e53e2e7ebc599e9016dee123dc03d3ce5f9263e721fa7664ecc6fc8b49b0b498a87b0d24bf74e79854edd66c2b2e7a9367be8e1e9c2cbe159 SHA512 0bf756458f3a856bbe6942d1f4bc30a7261ce3da7524ab8b71f77d9f367767ad75e8ed83e4de18bed1eb8d597f2aa0efe0c713a2e407e801e7ce3f83e152361b
 DIST instantclient-precomp-linux-18.3.0.0.0dbru.zip 5200252 BLAKE2B 1d3613de34ccd61fd7c3795170d6d012491bc2c045c39f39db716ac7ce2e68e7e8da84c5b95afa8e50afb97d2fcad8e469f25627b9ec570f58f0b167a2f2348e SHA512 f783b6f346cc4848567a1b7284a93d1bf20a9555fa9cbfd57597b3856444969653cc6d6c3c3e710da6775d39d2efa6399b9e91f4f7458de43b0a404f4f693dd0
 DIST instantclient-precomp-linux-19.11.0.0.0dbru.zip 5194893 BLAKE2B cbfda89f2f97728234aa3aa58d13289be66db0127f1e73675ea2fae348d8dff28e86b85b0a5a8f372dc155a07d6aa71f2096ef5b3cdc3082ca80c107fac06f4b SHA512 196ea51fc11d59212e274669e623d86cd91c6a8d7425cab5a08044d216b118ef2e4597e0c2a904579f35de87b5fb87f9d6a6eeab927af5878c3a7e1e504730b5
 DIST instantclient-precomp-linux-19.3.0.0.0dbru.zip 5183647 BLAKE2B 79a37d25e5731978911d643bdd19c0b0f1f66b153ed7164358fe2038a987594a73a8aacbc2fd8c542557a099e52931666cc9df5d5fb1af30e3fd365378fd505b SHA512 a6f7d7f82d657bb32431aa81c4dfa1fb3ea31aaa6df9781e19fc78c2ef25bf168420c95e3d9fa8f4aa3912afd3fc98eaa45f63a28ddaa091c4e50360802735b3
 DIST instantclient-precomp-linux-19.5.0.0.0dbru.zip 5184902 BLAKE2B d9dd690b9aef42bb1c358540dd57357ab78b7f2c13014e017d70116a41a20f4d9a520436a8eaa46e007802ca49f8383853c832fadbc50ddc8e6119a491b0c880 SHA512 5cd41a92485fed47ca9297ae27078cb0eb6d3b4c4f7f348908e6d199ce8255617948637a362f1984bd75346e12d28f25ccdf7df1c376b669f9e7b57a9ee97cc9
 DIST instantclient-precomp-linux-19.6.0.0.0dbru.zip 5187123 BLAKE2B 29d0b54cf0575c242a3a8e742dca9771bacfb43870fa8a7c9ea6a15f51d951634b2c464c5e5b87cb0dbd63f95098812c0ed11edfb6999bd50155199aa3a6106a SHA512 2443ec5940f0bdcc151c913c42de58b0f30c052c8cfc13edd82771420d8393b6332d92a0cfa52afb8937e555624e871e3a2c0494c23770724c44081ea29fe353
+DIST instantclient-precomp-linux-21.3.0.0.0.zip 5290951 BLAKE2B 3df4c41019315119d63ec780b9ae23d48823ecb2b9aa61a923c87c3e1f30fd97266030bbbc898d59b402931e02e8b3dcedfb6b96bd41381b583da2b380526f5d SHA512 b1fb267c373410c3c24fbdc4102b3395beaf0609ec3439f730a31ba43c5f2e1b276ce6e7df04de0d542c211dfef3ecadfccfe33f1472653feb42fb25a9dc700a
 DIST instantclient-precomp-linux.x64-18.3.0.0.0dbru.zip 6403554 BLAKE2B bd8e1b3de4b8c12214ea066be22f7ca18133e62e1d9a70b2710578e967204561cdcc9f719f8c1310e19e94baca367e0aa8c482e637b2f13a51781328b229be92 SHA512 292322eb07e3707cf469cea8390636fb2fae99a50b3b900a9c43b5808ce741cb708541820de5e9aa9c341290ad5015be32d968c43e1a14aebf97dd5fd04fc925
 DIST instantclient-precomp-linux.x64-18.5.0.0.0dbru.zip 6401804 BLAKE2B 9098fa6966023e4cc48e9c4fe60aef5e7c4d15a5200fcf92716fc224fa741cb6bd41bbe58a1820ab4c4c95b5be2faee8f0d85dcf6d5c0f14c51943fd67b32856 SHA512 e44ddacecbcc7311f59490116fe44f0d9b303c0a669d9ecf43926bb5627b0a767400bd51e8ec1162d088ff52022d2fa0d2f4e9d83e7efc0e40b0c02679c1b109
 DIST instantclient-precomp-linux.x64-19.11.0.0.0dbru.zip 6254880 BLAKE2B 0035623721a12c096a38ee64bc41465682214763f123ce9c529c61b6081c6de54bd7835f8b4ef07dca5eafda5354a77fa589c7c54cde412e1bdd4f313e58b3bb SHA512 d322b7896992cef8e48cc48acc68a5730d2a04ba0af5130eafa6ada79b64b16a4bd8cfaa02a28587d0871713579a5215ff46162499cd1f422252ef8dab61b7ab
 DIST instantclient-precomp-linux.x64-19.3.0.0.0dbru.zip 6225945 BLAKE2B 1a17f20b7147496047f31cfeee56efb74c7daface1c7e6bab2a67258d410723b9e70b771fa9df9e16c2c27c831e97d538a69854e565ebd313f528a7f57a2f358 SHA512 6db99e0df10d439e93813ecdb27e5961232ab64a480b6aa0ee5e00a43e08bae2ade64b2abb60cad58e3139609f81835bde53d91ab35dedf427d3122d65c184b6
 DIST instantclient-precomp-linux.x64-19.5.0.0.0dbru.zip 6226878 BLAKE2B 5f1606d5e9bb8900b4181e781b270d6dc28b72def6f77edfb8ba241ca4b955c9f9fd2b61b8f4c97eb20845ae3397af7be8a574f175095b68478f299220f2332e SHA512 a4b200444efa597ee66b858f3eefd135fc36f038502301f9a1636ffdb6955c1bfca1fad278b57a0dad2fc90979eed4750d9ef631b64ed65495d5c600ea36cbb6
 DIST instantclient-precomp-linux.x64-19.6.0.0.0dbru.zip 6229434 BLAKE2B 9d0f5ee6f18fe7d9caf80765e8367d72c2336c7022e9fe35ddd284e13229280652c1daf816d14556f614c256a594e92dad35736a56e4d8ba535b68a47d63dda7 SHA512 ea98cf319c1c5937e2e95acfb474c83897a595e804dd3e2a3698a4584e37aa54f2b59e6990f4f9b1c947d8a39ef24e502037d85178ff02e84ee76c4f794952d8
+DIST instantclient-precomp-linux.x64-21.3.0.0.0.zip 6386663 BLAKE2B fea4e0465330d4309791f9ca58ae169b1ff2cd1f17b003210aab1fe4faa92d6e48ee20bbf7d84f44f437bf5297c69c9c2b5a2e3cfb687c8010f8ba75bb928c9f SHA512 8235236175f35d4634005249ccbe0ea5dec4078fd795545184578cefbb8d45663731c507baac4a952fb9603272aa3ff58197eb23801894bbd240cf5736460d57
 DIST instantclient-sdk-linux-18.3.0.0.0dbru.zip 927121 BLAKE2B 5b53d759cb82c854d67b9bebaffb07e442b62d13367e5acf19af2dec4dbca2ba3ee50c83f89cf6e865121ad039227d898e74fecf43439610254eb43a429422a0 SHA512 6e4ccafb69d047b96dbda2f493c175f005b593472ea3c9a75fed758d2f12d970509d58b32d94f7a59b3d0402a87efaa754e6487af9cde01f7211f0145434c6c9
 DIST instantclient-sdk-linux-19.11.0.0.0dbru.zip 933913 BLAKE2B 08cb6c94cd152f58fe9e52874b40dec56a6f7d3c9913122303b46f75ae2df0e13fff1a375136b6fffabe9ee7a7d844a2b95b1be380b6d957338b09a15c9fe83a SHA512 8d7aff3d066f423021a5babda86b1b378333966fd892146bf46a967495180fc099e9766deab27d81735fee845ab43ee48d8815fd96a73e3a235c4fde74952e40
 DIST instantclient-sdk-linux-19.3.0.0.0dbru.zip 932301 BLAKE2B 6c5cfe55a651b9364da3f24d5739813e1b8165fad6434b7a09da2acdeddda408ab4fb37aa34851a537a000a4a7718fbe41ccf8b5fd51aa1bb4fd2e8ec0db33f9 SHA512 8dda8500ffa9eac966f54818d1c19b7d8b878f09c0664e03cfcc8ee8e5b061de566e6b411d15c5db58ef0e97374c2311d16fffd6b4c124dc06bdfd8fa8916b7b
 DIST instantclient-sdk-linux-19.5.0.0.0dbru.zip 932492 BLAKE2B 35a8cf7186c754c957738a6a1f815f11a523fe7100ade7ceb646976f5ddea90aa0ca9ff435600f36cad774d7d72a96d9305c7344d8cf8639d84f41611bfd05f7 SHA512 9f9cf54d09b807ba9d3c96bf242aac293b95a9d4b19100cd64a5e84769db0b9541fea09de57a98b76d0500c68fbf2ef660a415c780812ae7b693064484e43ada
 DIST instantclient-sdk-linux-19.6.0.0.0dbru.zip 932525 BLAKE2B c27b3f474372fd2a08b811c519cf0bbad6197c26407e6a90006ac21ad153a2af68ef6a33b7e7ed28439e2a6481df36e37663faeb314ccc4d08e3ff76ea1e23bc SHA512 ecad27fb94d22aaa6ef797dadbeac4eb4275b7ce904c3e5759342fec73d2d2131d41abf17fbef0a6bdc55a5f78e78d6dba70507db819a3ffa9c4213a8e494614
+DIST instantclient-sdk-linux-21.3.0.0.0.zip 1000869 BLAKE2B 3e3f01da8218dad9de699b587ecd37dc465bd5779c7d6919149bcd947e9e9575d35727fe7d1251db8df12214a399b665c62be9e790dbaeaa895b2442ffcdd8fd SHA512 dd88433810e5b72d96747e57b34f7880607fdd0250d04972afed9a9f20c27ce1b74d7030b4de60e03621f98117b7ee93062c6c750b5c2dd104668a0afd45cd47
 DIST instantclient-sdk-linux.x64-18.3.0.0.0dbru.zip 927118 BLAKE2B 9c6cd889843552cee3e84566d9c1b29369b1e7b20a01fac65676a33d6196b042a4c34cd2df8cf1ec5c8664a403e44e6a283f42912b7e056e093c744bd24ec24f SHA512 c9e1493601ec70541e437ded748f3be24deaa3f1037884fd003907bbab38b3099aef12dda1b9845c3eb3ce3827f743696f5ebe6d8dffe7974088c1329528b729
 DIST instantclient-sdk-linux.x64-18.5.0.0.0dbru.zip 929988 BLAKE2B 942f99fbea74e253a0be1677cfe40d79a26cb7a6442631d626648a65aa4f20b730e4f1ff13effcce5c4befd2ce50ab038f88b61c6f05ccad262568b209b3048f SHA512 7adc9e315c7c8784e4648a97fa54e03eb26a05b7b35a1f5cf1105898701b31fdc22f0011b1ae192752adcf3ec9798ba635bb9a9a5d4bc768a9a519c3564a9375
 DIST instantclient-sdk-linux.x64-19.11.0.0.0dbru.zip 933906 BLAKE2B 7d15f4c5a53708fd311ca75c35db5cf1241070217c21acf05f181ad07259135fd64eeb8f84582ce1faa6bbdd9c3fc29c07e44d82ff60fe1bbb9acaf7f70612c3 SHA512 d964612f0bb571c5c1fe78d14f861b2189d917d23e9be936faa637d5a2f8b530dc93a1ae0130346b70897bd1382f23953ff3e7f3163a580b7c6058675ac5fcf2
 DIST instantclient-sdk-linux.x64-19.3.0.0.0dbru.zip 932294 BLAKE2B 26ea1ce34209c1dc92101e211f009ecd20cfdad4d88e946844cbd1f2b1f4365c7dd273e7079be1dc807c38393035847e47800d65b0ecebb3a705cc6cac092a0d SHA512 ec3527a8371bb9644f4912b8190cfde53bf2afd8bf2ec7376bad97dc4d4b37f010a5e0d30567e2398f51c07affeeb15515347df095587a9cff84ef657b7e8c6e
 DIST instantclient-sdk-linux.x64-19.5.0.0.0dbru.zip 932481 BLAKE2B 6a62e3c2a2889b5534133882c47aefc957c3e261c0ba7c161baed32657de0d15317356719ed9b354919fec8936dfb99044b707e83ae5ecd9d3359955e6de0005 SHA512 0f6521cc2c0430d15efe80fcece7b802146418591ae52b062f3571a85a60a8d8912b8d484e36360bc7428c0fe1e18043fac5bc7b3d484cdca9737931c1e72ffc
 DIST instantclient-sdk-linux.x64-19.6.0.0.0dbru.zip 932514 BLAKE2B 8388f312a3790cd9bd7307fae8226867eae159a93099d418f430101b6b87ab9d081c74f1d31f2fa8f33e50bf3e643bcc21aae57dbc6e913fc4178ab6688e3f44 SHA512 a47d1a2d99419c383e1cb4ab236beb35d067552e6f88eba65fe38e26ce8afc2d45c0ca482b1f9f1c38337678880d60f8b73a72a5137b06c984bc930bc05c48d9
+DIST instantclient-sdk-linux.x64-21.3.0.0.0.zip 1000777 BLAKE2B b593e3ef880a22d712a4e2b0c51f2f68e5d9ab6c3e4124b32de643eab7d3b41b6d5eb46f4ac98af743d90343d29975760048af5b7be0919c40a9b84217b31939 SHA512 5372c151a5b45bb2cdf80c47ea65b4d8ad849cc5a50818917484b952e03c344f2d7f1896a13d51ad9daf7fa9c43226aa011dca03161d6976375f239f782bdd23
 DIST instantclient-sqlplus-linux-18.3.0.0.0dbru.zip 881315 BLAKE2B 787dd43ffaadd493d8cb3a9a8bbd160f75c51ad07e16d8eb7631e8368b4a8bfe9e574326837724b3573705e1c309cbe0bf364c1b98660534b05f5d72d28b1b11 SHA512 9087e5654143c9da3499fb7f1b8a15b04433cacc0d96257519788b3cd12a0aa480b37fa37fbe55a2f40940ea8da1eeae9881712a87d5942e142c0f29b580e54d
 DIST instantclient-sqlplus-linux-19.11.0.0.0dbru.zip 884155 BLAKE2B f681321cc43646af74eda4d6da102587123e0f3fb423d978066f014c4729ed046806f9c49cae6928704b4993459089e8d8c1ab4fb1aab912cd6fa7ee27382fe3 SHA512 1f4bc70b070c9a0597f1433913018021e87a7b059784a56e47842afd8a501039def6591f4e7a009f3f4598f23c45aa807578a74082174862ecb444b1855f7b22
 DIST instantclient-sqlplus-linux-19.3.0.0.0dbru.zip 883462 BLAKE2B c3891a6ea525add3030372bb96b57e31b3a2743dd5bddbf12d4e2d43b7732b244c265a15423ae48d93db609f37a449233c8c16f5fd7c1d345b6ef42c217bb8d2 SHA512 521b80d47320b4ea51a68bee8f05fa51fa5e74690e62817d1fdb5471eaed577cad6bd5364e18fa5c18dc0cf56b99e33b62488a93c176d860e471ce2a7e9facca
 DIST instantclient-sqlplus-linux-19.5.0.0.0dbru.zip 883548 BLAKE2B 43f6896f392b5d765506e7220ca74372603760dadd89a430a9e840afe85575c911ce326a5ced1b634d240a279491fb54a3df39f2289c30f736f3a70541dafb06 SHA512 eababf946085a114a91065b03a0d36a03b5d8442f0029b13dc95f698c086e8aaea64184d9a899b36ecec0f24943d0340aba400cb3fdd52f93367ecca76ccfcbe
 DIST instantclient-sqlplus-linux-19.6.0.0.0dbru.zip 883975 BLAKE2B f4b5949159bd9df48b3749c6119f3188e011598795fcdf3f0164b7a04e19c0899acfe11411678577e67aa79cd209d7da5aac1cfcb4ced9b1e96b709415bc9821 SHA512 72e4ea40c02be6b1c41729e4fad404a8dc53dacb31ca027e44a4152b83972e2ffe41c68c3682e7da8bf35bf9eafff0fc964da0f24097dc9b5cf4c247a952c025
+DIST instantclient-sqlplus-linux-21.3.0.0.0.zip 909623 BLAKE2B 181da5e352dfea2ee1d87e138601f8b84ae2df278deb1c205bf25e5958a32da13252c8455a8aeb9941de2fc3752fd0510c53f196e8755bedae24e704cb4197a3 SHA512 e4417bccf0abbbfe16fce06b1a18c6e4f58ede1b87a1ab6407f74e3b926aa9d9b4d390c881bd578f95ed4fec6980e8b28cb9f624b8480e1ffac6dc599dcf49a7
 DIST instantclient-sqlplus-linux.x64-18.3.0.0.0dbru.zip 915778 BLAKE2B 8d93e462568a5bf5a294a5abcf0a0e30c08e9eef18c01a79b8f716261efbeb14a286d1058ddfa278108daeb49b74a3e296efa83291d7bc03f4ad35428c946701 SHA512 878ac2cf58aaa8cb237779fcd04378c95d738fd444eddd5745838fa86e8cd60f1c2be49f0f4fc3d4b16dca652fe66681ac0907a4aeddec1d9433e63d2f4e5db6
 DIST instantclient-sqlplus-linux.x64-18.5.0.0.0dbru.zip 918469 BLAKE2B 14efa748e7a892334610fa7a615c56b07e25873d5761408b9cac642af11ae2d97062b8014e4c7dee06dc37676d7c9d1a409d80f50b9d162210e073c1c4ef67d5 SHA512 8c2866ad092893647086adc554c7fab3c9bdc5429c9e0715d68717065fe12f106d228a2f241fe76bdc677a4adfa6eb01b0d866fab2bebbb1491a087a4b9d4a50
 DIST instantclient-sqlplus-linux.x64-19.11.0.0.0dbru.zip 911265 BLAKE2B 78215f683458147792be3182eaf9edfde5943e8e470a7bcbe09c82c298df709bc7cdf919e349a9130b8d6313f2f8a1d04ad9b5b3c5ad91d49802ad14c3f15515 SHA512 dd1343ae49917a031cbd8d757d11da46354f157f46dd651afcde09b4b74a9e02008c6370eabf6bd313190629944cc075d6fbd893b491ad3505b7a05dbeecd963
 DIST instantclient-sqlplus-linux.x64-19.3.0.0.0dbru.zip 910409 BLAKE2B e05c8dd3c545842989a2650013ff7ac8b06b41bef07efcd312ff66c51929942e3336bc9bd9a53a197088433b2cdbcb5bfbf4b2f4e1a40d68cfe559207737446e SHA512 34320712009ea724edd71f04bb72dd58fb99d34b1a357e238c04c9a55c7120eafc8c675558755a85587c7e75801dde2a7f8fc54795dd7e3e61568f8cf27d791d
 DIST instantclient-sqlplus-linux.x64-19.5.0.0.0dbru.zip 910437 BLAKE2B dc204e6dfc4ab8d22720067b6238ffff773a5db6522b2066306bbbfa8645cc62f952126b2f4bc548dc0096695914d7ca44c7b299f59a609c363739fca1be76e6 SHA512 83a8b7004585ea3a31f7abd55615c983963b3df2ed030e54057ab897442b38ce41fe66c2754ad034b37c588090fe478549db371b809e457846ca537b25b2fdb8
 DIST instantclient-sqlplus-linux.x64-19.6.0.0.0dbru.zip 910905 BLAKE2B c1bed01f662ba15b80b6fb4bfb461bbdb7033183d7bf60823b1a6d6aeb7ecab4cd68c1cc889c61f11f5173c13d617494e7922fd84fb5757bf08396175c3ff68e SHA512 6140a8b9fbd78e2d199063dd70e441737079c54d4ed115a404a77ca2cd7503babf059b7c9ade5605dc2c5ffd9e058ac26a9e159f47f252e1399afb51608f8ce0
+DIST instantclient-sqlplus-linux.x64-21.3.0.0.0.zip 936305 BLAKE2B b6021f3ab3badb282f1a13a93beee6caa093b905efe6a647cc8ec9ea84eb3f7de4d9885692fd8d965608ba89964d13b5427af0f8710711f673ec97c528a6063c SHA512 9c6e87b4d319fc2bc35b2bd492b9608023d0f90b6230a66c75d9cd4d9fdea9b5dab178751cd188f9d1368f639d40f342ef1c71773dc4f9e9d8a199f4b46deaee
 DIST instantclient-tools-linux-18.3.0.0.0dbru.zip 1042756 BLAKE2B 1b1af7abb50b6977e0dd4bc0f2b5e89534cf5bffe216dbe553063761470c45f330f4a72ece428a3e0dc8162cebad3cf0ffa628f4b3879bc434ecda7b7b07570f SHA512 b809b83e2e7dbe19c13611c1eb819fa4648a127ddc8a97abaa794213c7f4b6d28b70956aac4f331389d088c6fccc998d0eda8dc39f2dedc338f3baf03bc3ceac
 DIST instantclient-tools-linux-19.11.0.0.0dbru.zip 1020021 BLAKE2B e2a615e0ffb4608af05931a8b49406c85db5d549761319c7116395fae206fe6cc0cf56b49e6c3968419e63616f2d07ad6ec3ed70c862fb2394b8dc0ce9f6dbb0 SHA512 255593c1e62a11f41793619c856d316815d77fa83cc9efee1d5366dc86b32e9909b042f7ac81ad693aafb8c34cdcc8faa7eebf816a90d037d36ce461df33f469
 DIST instantclient-tools-linux-19.3.0.0.0dbru.zip 1018792 BLAKE2B e24a264d59a4e29b8dcf56dfd09c80571612f465c8e2e91514c076553f27a0b07e66bb2ac0f3fcd6150c8a04ba861de04576e45ca1c03d173149296c029b8fcb SHA512 33103d934dec1bb6e34fb3f15cbbfba2ceec724334ca89bc55df3953779b3f4d45d70e7c9d1734481f366bb2e7e8ab58bef063415571acdf07022f193558ed54
 DIST instantclient-tools-linux-19.5.0.0.0dbru.zip 1018855 BLAKE2B 273d2abbee9d1a54d4ee4c1aa69c66fb7e8df97892ae66406ecbd941a4bcd2e5cc592d39b9d92856b4d211d8aa7361d39c0d5e875505fa5aabc39fa724df0347 SHA512 39e143a03ea428e84d5b124ed00edebb1d5de2b5a69f7614b171ae4e67d6fc7d2638a943fca78a52d0b548b6d300b30143b532604bcfc00f362100a0ac01795d
 DIST instantclient-tools-linux-19.6.0.0.0dbru.zip 1018444 BLAKE2B a29a10a7a98c8c8939263122dfba8fab3fe1101d48693c78cd75a5cecaecbc9a9f57319a13b09a8f87559c2e00e7205f17b6e01711213bd11c5db4914c853ed3 SHA512 ae7402555f61c2badeffb0cb5f2979142ea2e6b54c26d9b3a803b4babc14d176d3c787902b0323bc84dd5d9b273a4653d30e32d1578ac8e152e7280839e9dea6
+DIST instantclient-tools-linux-21.3.0.0.0.zip 1083935 BLAKE2B e0caed4063d3322322beea599053fc40f1e08470d03c4bbe7cb5b46e5f4ba4759d313ea714806facd35d24924cb83e6d9d7d3a44bcf1da62c6c80d0321f33ce9 SHA512 301c126a3d2fefe36400c2287515ff6716a68a3273ae1450393d04509447d68e3bd2cc0412c5c078923421ff80534c3fa56123df61fbf92ea42965e3eed80bce
 DIST instantclient-tools-linux.x64-18.3.0.0.0dbru.zip 1142609 BLAKE2B 5c915bd940b7bfaa42429710685cfafc5f0189607da2d789f4aaada2bc9d3365ad8e9ee31cc209830fa54b406ffe4b9b2fc2b5e0b6819ff176f7dbb566117a79 SHA512 2c198d9e723b39f7b512217eb08557dfa3c9ae32858acd882df8b9b24beecffe6b44eb089b50341edf01d7e4c0514d4b3de4aa06fa9185aa0538855963c174a4
 DIST instantclient-tools-linux.x64-18.5.0.0.0dbru.zip 1143747 BLAKE2B af5e70e1add6ca2042a213b5038a805ea3d6074703d5a677798684f60f681d6f7b642154d87a02fe973b5b12295ea9ef6f64c45836ceee66ce67d4e4498417b6 SHA512 7bbacdb1fa062c40b2389599ab522b02d63e68731d461fe45446685642b932ee741b8c9e0fde189d8f741db4131f6ac72c8124612e8668a00f90ed7c594fff50
 DIST instantclient-tools-linux.x64-19.11.0.0.0dbru.zip 1085194 BLAKE2B 321e1cd7704f6a5ad33a9ca0eed35feb4d8e4a3ac2b5a5d11f992569f0024ae8ef5b8fb42b02d627ee4a81d2ae9170367ba7107e0f975f89d189c576eef45edd SHA512 d355b0a457ede28b20004b4709ada5bb2c2c8a72a20a19df07bc4fb8607f78ed4d24bbf07a9f2157873b544de7a43406faa27374a0f2d6a47d63f36478e97d3e
 DIST instantclient-tools-linux.x64-19.3.0.0.0dbru.zip 1085243 BLAKE2B abcdf61f01e2bc67610043f1a66015050908f2c09f6aa8b615fd9e8b19a94a161d20b372119bc1bfc1a8ca8511a3859f67c48a39a3c2509fa326a350d7614721 SHA512 33df3a1c19d55ba94e0851bb4eaa83e0bfa72a132de2f5b98bb2a1b0528abee319b20211c7f08719c58250579506cda5c1f4de726f7b1e7c1c484dcb3986e43b
 DIST instantclient-tools-linux.x64-19.5.0.0.0dbru.zip 1085242 BLAKE2B 8d540be2f491d5c5a5e36808332e2a0d28092cb450dff6293851644ea11b8de0f376c87d2cfeea383d0f636e33ed196a89740e3d1ec060b75dc96bd291e18319 SHA512 fde38a0c935be334c96de339f84bbdc15ec956c753395a7a29c2b0d16c301e1fd0accb3d5fdc44082adf36934a7f6a1a2bae7a035d47c949337339bdec615d76
 DIST instantclient-tools-linux.x64-19.6.0.0.0dbru.zip 1083396 BLAKE2B ee38d11929aa76788777b7f5315c56e3ae1df32af210fbbc91c9d45c9b608598b865d9a1c60534c00c54daa8f638cc89fcd22f16212f99d624b9a39e2325c289 SHA512 0ff7dbaa402a417bc389eb15aa1c199fa39bdbc43bce5757213edc2f2b0f9b1fd40f90e2dfd929312e8cf82fb128dc5adc1dc78cd9767cf2028724f9239d3bc8
+DIST instantclient-tools-linux.x64-21.3.0.0.0.zip 1149632 BLAKE2B 3ad6ee973f813733e48c58f9a18d1dad321f9fb886d9460c2bc8f9d766d5a021722b34d9d9ea0ffb7a8466a38f5cf816bc55767b668e5cb5ee59b549fe4fc4ca SHA512 4c47b51f4801cab6d71a201c12ddb7a30616050584630107968a50457d4eca0e92f3344505bdd8f36481924a21a508d476c9f26ed111bad846f4a8feab98110d

diff --git a/dev-db/oracle-instantclient/files/21.3.0.0.0-makefile.patch b/dev-db/oracle-instantclient/files/21.3.0.0.0-makefile.patch
new file mode 100644
index 00000000000..44799548e51
--- /dev/null
+++ b/dev-db/oracle-instantclient/files/21.3.0.0.0-makefile.patch
@@ -0,0 +1,22 @@
+diff --color -Naru a/sdk/demo/demo.mk b/sdk/demo/demo.mk
+--- a/sdk/demo/demo.mk	2021-08-22 17:20:17.232777697 +0200
++++ b/sdk/demo/demo.mk	2021-08-22 17:24:49.800783794 +0200
+@@ -43,10 +43,15 @@
+ CC=/opt/SunProd/SUNWspro6.1/bin/CC
+ cc=/opt/SunProd/SUNWspro6.1/bin/cc
+ 
+-ICINCHOME=../
+-ICLIBHOME=../../
++ifeq ($(BUILD32),T)
++LIBDIR=lib32
++else
++LIBDIR=lib
++endif
++ICINCHOME=$(ORACLE_HOME)/include
++ICLIBHOME=$(ORACLE_HOME)/$(LIBDIR)
+ ICLIBPATH=-L$(ICLIBHOME)
+-CCINCLUDES=-I$(ICINCHOME)include
++CCINCLUDES=-I$(ICINCHOME)
+ 
+ THREADLIBS=-lthread
+ CCLIB=$(ICLIBPATH) -locci -lclntsh $(THREADLIBS)

diff --git a/dev-db/oracle-instantclient/oracle-instantclient-21.3.0.0.0.ebuild b/dev-db/oracle-instantclient/oracle-instantclient-21.3.0.0.0.ebuild
new file mode 100644
index 00000000000..232fbe4a0f7
--- /dev/null
+++ b/dev-db/oracle-instantclient/oracle-instantclient-21.3.0.0.0.ebuild
@@ -0,0 +1,340 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit pax-utils multilib-minimal
+
+DESCRIPTION="Oracle 18c Instant Client with SDK"
+HOMEPAGE="https://www.oracle.com/database/technologies/instant-client.html"
+
+MY_SOVER=21.1 # the library soname found in the zip files
+
+IUSE="jdbc odbc precomp +sdk +sqlplus tools"
+REQUIRED_USE="precomp? ( sdk )"
+
+MY_PVM=$(ver_cut 1-2)
+MY_P="instantclient_$(ver_rs 1 _ ${MY_PVM})"
+
+MY_PVP=$(ver_cut 5) # p2
+
+MY_URI="https://download.oracle.com/otn_software/linux/instantclient/$(ver_rs 1-5 '' $(ver_cut 1-5))"
+MY_PLAT_x86="Linux x86"
+MY_BITS_x86=32
+MY_A_x86="${MY_URI}/${PN/oracle-/}-basic-linux-${PV}.zip"
+MY_A_x86_jdbc="${MY_A_x86/basic/jdbc}"
+MY_A_x86_odbc="${MY_A_x86/basic/odbc}"
+MY_A_x86_precomp="${MY_A_x86/basic/precomp}"
+MY_A_x86_sdk="${MY_A_x86/basic/sdk}"
+MY_A_x86_sqlplus="${MY_A_x86/basic/sqlplus}"
+MY_A_x86_tools="${MY_A_x86/basic/tools}"
+
+MY_PLAT_amd64="Linux x86-64"
+MY_BITS_amd64=64
+MY_A_amd64="${MY_URI}/${PN/oracle-}-basic-linux.x64-${PV}.zip"
+MY_A_amd64_jdbc="${MY_A_amd64/basic/jdbc}"
+MY_A_amd64_odbc="${MY_A_amd64/basic/odbc}"
+MY_A_amd64_precomp="${MY_A_amd64/basic/precomp}"
+MY_A_amd64_sdk="${MY_A_amd64/basic/sdk}"
+MY_A_amd64_sqlplus="${MY_A_amd64/basic/sqlplus}"
+MY_A_amd64_tools="${MY_A_amd64/basic/tools}"
+
+if [[ ${MY_PVP} == p* ]]
+then
+	MY_PVP=-${MY_PVP#p}
+	# Updated 9/22/2017: instantclient-odbc-linux-12.2.0.1.0-2.zip
+	MY_A_x86_odbc="${MY_URI}/${MY_A_x86_odbc%.zip}${MY_PVP}.zip"
+	MY_A_amd64_odbc="${MY_URI}/${MY_A_amd64_odbc%.zip}${MY_PVP}.zip"
+fi
+
+SRC_URI="
+	abi_x86_32? (
+		${MY_A_x86}
+		jdbc?    ( ${MY_A_x86_jdbc}    )
+		odbc?    ( ${MY_A_x86_odbc}    )
+		precomp? ( ${MY_A_x86_precomp} )
+		!abi_x86_64? (
+			sdk?     ( ${MY_A_x86_sdk}     )
+			sqlplus? ( ${MY_A_x86_sqlplus} )
+			tools?   ( ${MY_A_x86_tools}   )
+	) )
+	abi_x86_64? (
+		${MY_A_amd64}
+		jdbc?    ( ${MY_A_amd64_jdbc}    )
+		odbc?    ( ${MY_A_amd64_odbc}    )
+		precomp? ( ${MY_A_amd64_precomp} )
+		sdk?     ( ${MY_A_amd64_sdk}     )
+		sqlplus? ( ${MY_A_amd64_sqlplus} )
+		tools?   ( ${MY_A_amd64_tools}   )
+	)
+"
+
+LICENSE="OTN"
+SLOT="0/${MY_SOVER}"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror splitdebug test"
+
+DEPEND="app-arch/unzip"
+RDEPEND="
+	>=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]
+	!<dev-db/oracle-instantclient-basic-12
+	!<dev-db/oracle-instantclient-odbc-12
+	!<dev-db/oracle-instantclient-jdbc-12
+	!<dev-db/oracle-instantclient-sqlplus-12
+	odbc? ( dev-db/unixODBC )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_PREBUILT="usr/lib*/oracle/client/*/*"
+
+set_my_abivars() {
+	if multilib_is_native_abi; then
+		MY_WORKDIR="${WORKDIR}"
+		MY_S="${S}"
+	else
+		MY_WORKDIR="${WORKDIR}/${ABI}"
+		MY_S="${MY_WORKDIR}/${MY_P}"
+	fi
+
+	local abi=${ABI}
+	[[ ${abi} == 'default' ]] && abi=${ARCH}
+	MY_PLAT=MY_PLAT_${abi}          ; MY_PLAT=${!MY_PLAT}         # platform name
+	MY_BITS=MY_BITS_${abi}          ; MY_BITS=${!MY_BITS}         # platform bitwidth
+	MY_A=MY_A_${abi}                ; MY_A=${!MY_A##*/}               # runtime distfile
+	MY_A_jdbc=MY_A_${abi}_jdbc      ; MY_A_jdbc=${!MY_A_jdbc##*/}       # jdbc distfile
+	MY_A_odbc=MY_A_${abi}_odbc      ; MY_A_odbc=${!MY_A_odbc##*/}       # odbc distfile
+	MY_A_precomp=MY_A_${abi}_precomp; MY_A_precomp=${!MY_A_precomp##*/} # precomp distfile
+	MY_A_sdk=MY_A_${abi}_sdk        ; MY_A_sdk=${!MY_A_sdk##*/}         # sdk distfile
+	MY_A_sqlplus=MY_A_${abi}_sqlplus; MY_A_sqlplus=${!MY_A_sqlplus##*/} # sqlplus distfile
+	MY_A_tools=MY_A_${abi}_tools    ; MY_A_tools=${!MY_A_tools##*/}     # tools distfile
+
+	[[ -n ${MY_PLAT} ]]
+}
+
+src_unpack() {
+	local ABI
+	for ABI in $(multilib_get_enabled_abis)
+	do
+		set_my_abivars || continue
+		mkdir -p "${MY_WORKDIR}" || die
+		cd "${MY_WORKDIR}" || die
+		unpack ${MY_A}
+		use jdbc    && unpack ${MY_A_jdbc}
+		use odbc    && unpack ${MY_A_odbc}
+		use precomp && unpack ${MY_A_precomp}
+		if multilib_is_native_abi; then
+			use sdk     && unpack ${MY_A_sdk}
+			use sqlplus && unpack ${MY_A_sqlplus}
+			use tools   && unpack ${MY_A_tools}
+		fi
+	done
+}
+
+src_prepare() {
+	local PATCHES=()
+	if use precomp; then
+		# Not supporting COBOL for now
+		rm -f sdk/demo/*procob*
+	fi
+	if use sdk; then
+		PATCHES+=( "${FILESDIR}"/21.3.0.0.0-makefile.patch )
+		rm sdk/include/ldap.h || die #299562
+	fi
+	default
+}
+
+# silence configure&compile messages from multilib-minimal
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	# all content goes here without version number, bug#578402
+	local oracle_home=/usr/$(get_libdir)/oracle/client
+	local oracle_home_to_root=../../../.. # for dosym
+	local ldpath=
+
+	local ABI
+	for ABI in $(multilib_get_enabled_abis) # last iteration is final ABI
+	do
+		if ! set_my_abivars; then
+			elog "Skipping unsupported ABI ${ABI}."
+			continue
+		fi
+		einfo "Installing runtime for ${MY_PLAT} ..."
+
+		cd "${MY_S}" || die
+
+		# shared libraries
+		into "${oracle_home}"
+		dolib.so lib*$(get_libname)*
+		use precomp && dolib.a cobsqlintf.o
+
+		# ensure to be linkable
+		[[ -e libocci$(get_libname) ]] ||
+		dosym libocci$(get_libname ${MY_SOVER}) \
+			"${oracle_home}"/$(get_libdir)/libocci$(get_libname)
+		[[ -e libclntsh$(get_libname) ]] ||
+		dosym libclntsh$(get_libname ${MY_SOVER}) \
+			"${oracle_home}"/$(get_libdir)/libclntsh$(get_libname)
+
+		# java archives
+		insinto "${oracle_home}"/$(get_libdir)
+		doins *.jar
+
+		# runtime library path
+		ldpath+=${ldpath:+:}${oracle_home}/$(get_libdir)
+
+		# Vanilla filesystem layout does not support multilib
+		# installation, so we need to move the libs into the
+		# ABI specific libdir.  However, ruby-oci8 build system
+		# detects an instantclient along the shared libraries,
+		# and does expect the sdk right there.
+		use sdk && dosym ../sdk "${oracle_home}"/$(get_libdir)/sdk
+
+		eend $?
+	done
+
+	local DOCS=( BASIC_README )
+	local HTML_DOCS=()
+	local paxbins=( adrci genezi uidrvci )
+	local scripts=()
+
+	if use jdbc; then
+		DOCS+=( JDBC_README )
+	fi
+	if use odbc; then
+		DOCS+=( ODBC_README )
+		HTML_DOCS+=( help )
+		scripts+=( odbc_update_ini.sh )
+	fi
+	if use precomp; then
+		DOCS+=( PRECOMP_README )
+		paxbins+=( sdk/proc )
+		# Install pcscfg.cfg into /etc/oracle, as the user probably
+		# wants to add the include path for the compiler headers
+		# here and we do not want this to be overwritten.
+		insinto /etc/oracle
+		doins precomp/admin/pcscfg.cfg
+		sed -i -e "s%^sys_include=.*%sys_include=(${oracle_home}/sdk/include,${EPREFIX}/usr/include)%" \
+			"${ED}"/etc/oracle/pcscfg.cfg || die
+		dosym ../../${oracle_home_to_root}/etc/oracle/pcscfg.cfg "${oracle_home}/precomp/admin/pcscfg.cfg"
+		dosym ../.."${oracle_home}"/bin/proc /usr/bin/proc
+		# Not supporting COBOL for now
+		# paxbins+=( sdk/{procob,rtsora} )
+		# doins precomp/admin/pcbcfg.cfg
+	fi
+	if use sdk; then
+		einfo "Installing SDK ..."
+		DOCS+=( SDK_README )
+		scripts+=( sdk/ott )
+		insinto "${oracle_home}"/$(get_libdir)
+		doins sdk/ottclasses.zip
+		insinto "${oracle_home}"/sdk
+		doins -r sdk/{admin,demo,include}
+		# Some build systems simply expect ORACLE_HOME/include.
+		dosym sdk/include "${oracle_home}"/include
+		# Some build systems do not know the instant client,
+		# expecting headers in rdbms/public, see bug#669316.
+		# Additionally, some (probably older ruby-oci8) do
+		# require rdbms/public to be a real directory.
+		insinto "${oracle_home}"/rdbms/public
+		doins -r sdk/include/*
+		# Others (like the DBD::Oracle perl module) know the Oracle
+		# eXpress Edition's client, parsing an rdbms/demo/demo_xe.mk.
+		dosym ../../sdk/demo/demo.mk "${oracle_home}"/rdbms/demo/demo_xe.mk
+		# And some do expect /usr/include/oracle/<ver>/client/include,
+		# querying 'sqlplus' for the version number, also see bug#652096.
+		dosym ../../../.."${oracle_home}"/sdk/include /usr/include/oracle/${MY_PVM}/client
+		eend $?
+	fi
+	if use sqlplus; then
+		DOCS+=( SQLPLUS_README )
+		paxbins+=( sqlplus )
+		insinto "${oracle_home}"/sqlplus/admin
+		doins glogin.sql
+		dosym ../.."${oracle_home}"/bin/sqlplus /usr/bin/sqlplus
+	fi
+	if use tools; then
+		DOCS+=( TOOLS_README )
+		paxbins+=( exp expdp imp impdp sqlldr wrc )
+	fi
+
+	einfo "Installing binaries for ${MY_PLAT} ..."
+	into "${oracle_home}"
+	dobin ${paxbins[*]} ${scripts[*]}
+	pushd "${ED}${oracle_home}/bin" >/dev/null || die
+	pax-mark -c ${paxbins[*]#*/} || die
+	popd >/dev/null || die
+	eend $?
+
+	einstalldocs
+
+	# create path for tnsnames.ora
+	insinto /etc/oracle
+	doins "${FILESDIR}"/tnsnames.ora.sample
+
+	# Add OCI libs to library path
+	{
+		echo "# ${EPREFIX}/etc/env.d/50${PN}"
+		echo "# Do not edit this file, but 99${PN} instead"
+		echo
+		echo "ORACLE_HOME=${EPREFIX}${oracle_home}"
+		echo "LDPATH=${ldpath}"
+		echo "TNS_ADMIN=${EPREFIX}/etc/oracle/"
+	} > "${T}"/50${PN}
+
+	doenvd "${T}"/50${PN}
+
+	# ensure ORACLE_HOME/lib exists
+	[[ -e ${ED}${oracle_home}/lib/. ]] ||
+	dosym $(get_libdir) "${oracle_home#/}"/lib
+}
+
+pkg_preinst() {
+	if [[ -r ${EROOT}/etc/env.d/99${PN} ]]; then
+		cp "${EROOT}/etc/env.d/99${PN}" "${ED}/etc/env.d/" || die
+	else
+		{
+			echo "# ${EPREFIX}/etc/env.d/99${PN}"
+			echo "# Configure system-wide defaults for your Oracle Instant Client here"
+			echo
+			echo "#$(grep '^ORACLE_HOME=' "${ED}/etc/env.d/50${PN}")"
+			echo "#$(grep '^TNS_ADMIN=' "${ED}/etc/env.d/50${PN}")"
+			echo "#NLS_LANG="
+		} > "${ED}/etc/env.d/99${PN}"
+	fi
+}
+
+pkg_postinst() {
+	elog "${P} does not provide an sqlnet.ora"
+	elog "configuration file, redirecting oracle diagnostics for database-"
+	elog "and network-issues into ~USER/oradiag_USER/ instead."
+	elog "It should be safe to ignore this message in sqlnet.log there:"
+	elog "   Directory does not exist for read/write [ORACLE_HOME/client/log] []"
+	elog "See https://bugs.gentoo.org/show_bug.cgi?id=465252 for reference."
+	elog "If you want to directly analyse low-level debug info or don't want"
+	elog "to see it at all, so you really need an sqlnet.ora file, please"
+	elog "consult http://search.oracle.com/search/search?q=sqlnet.ora"
+	elog ""
+	elog "TNS_ADMIN has been set to ${EPREFIX}/etc/oracle by default,"
+	elog "put your tnsnames.ora there or configure TNS_ADMIN"
+	elog "to point to your user specific configuration."
+	if use precomp; then
+		elog ""
+		elog "The proc precompiler uses the system library headers, which in"
+		elog "turn include the headers of the used compiler."
+		elog "To make proc work, please add the compiler header path of your"
+		elog "preferred compiler to sys_include in:"
+		elog "  ${EPREFIX}/etc/oracle/pcscfg.cfg"
+		elog "Remember to update this setting when you switch or update the"
+		elog "compiler."
+		elog "For gcc, the headers are usually found in a path matching the"
+		elog "following pattern:"
+		elog "  ${EPREFIX}/usr/lib/gcc/*/*/include"
+		elog "The exact details depend on the architecture and the version of"
+		elog "the compiler to be used."
+	fi
+	ewarn "Please re-source your shell settings for ORACLE_HOME"
+	ewarn "  changes, such as: source ${EPREFIX}/etc/profile"
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-db/oracle-instantclient/, dev-db/oracle-instantclient/files/
@ 2024-03-29  7:40 Joonas Niilola
  0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2024-03-29  7:40 UTC (permalink / raw
  To: gentoo-commits

commit:     3a775faebf8a65b66aed34fcad1efca92ecc7979
Author:     Marco Genasci <fedeliallalinea <AT> gmail <DOT> com>
AuthorDate: Mon Feb 19 08:43:50 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Mar 29 07:38:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a775fae

dev-db/oracle-instantclient: bump version to 21.13.0.0.0

In this version:
- removed multilib support
- removed ~x86 keywords (no available upstream)

Signed-off-by: Marco Genasci <fedeliallalinea <AT> gmail.com>
Closes: https://bugs.gentoo.org/923253
Closes: https://github.com/gentoo/gentoo/pull/35422
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-db/oracle-instantclient/Manifest               |   7 +
 .../files/21.13.0.0.0-makefile.patch               |  22 ++
 .../oracle-instantclient-21.13.0.0.0.ebuild        | 310 +++++++++++++++++++++
 3 files changed, 339 insertions(+)

diff --git a/dev-db/oracle-instantclient/Manifest b/dev-db/oracle-instantclient/Manifest
index a06d0dbd82d1..b2d2676606de 100644
--- a/dev-db/oracle-instantclient/Manifest
+++ b/dev-db/oracle-instantclient/Manifest
@@ -1,28 +1,35 @@
 DIST instantclient-basic-linux-19.11.0.0.0dbru.zip 70336706 BLAKE2B 061f6abc83bab7f2e6712e33274783f96caee3d97629d39cacd925af658f737a072207449468e05f89672bcfc7ff98f81d7d9c92a8f844664ce97b4c6afabf27 SHA512 da4db9c64c0f92c2b78cc6b26ff710e3330e937395d62942625921401042af27fdf80d25eb3748c97f4281442ddb72f3ddc5f68171a89ae289f3d2f492c56ef7
 DIST instantclient-basic-linux-21.3.0.0.0.zip 74751697 BLAKE2B f9b29d1c98a55946670ce6a5c674f2c9e6a8d6152b0f4d335f41ad9479b0a2bcf9ba791aeba894161c64c5e088b458506c068d4ece386956158cb09f27f91b07 SHA512 b8599ebe0cf867336b1dfb4edb974b934ed29e96aa7b7a866b93c8d8271c8dfacc693b884a9e422272098e09b4c5a2d6badb11fffb57b43ca4eb15907878bb99
 DIST instantclient-basic-linux.x64-19.11.0.0.0dbru.zip 75943090 BLAKE2B 6e081d22af1161d1505847c6918cc618f92810d7803f2bb13b3c58f2e8c5bb3aa70d2006fbd1fcc193d3719ecf224c3541f3dc5c5ccfc6105a10c54c51ddd2c9 SHA512 0f7242a1becb062b6c55202587360895529e7ec277b0e41e27466dc01caf4b97cf0a256d0ccb9b71fb86b4802d9c427e0428f0419260b609d94472f89f7f33e6
+DIST instantclient-basic-linux.x64-21.13.0.0.0dbru.zip 83761712 BLAKE2B d7922bb6372bfb5a2c251f373ebf84130ec235ec95fa83a347aadf325f90f3be746de5c031035af7496ba728d75269434137090eb538790149ed051b23ebd63a SHA512 e2cf006fc542917367dbcf82287ac3a4614a5238d2d2dcf8f998fc0b91b3a3177aa2296bdbbea277d68dfe523f72ed32a2bca7dbc113a16bdaf5fe7982742aa3
 DIST instantclient-basic-linux.x64-21.3.0.0.0.zip 79375865 BLAKE2B 2215829c6f7df463d0cd1108755976eb5cc6d4fdf41201687236131151d2068a9e3c8762bfdac65ce2890c57cdb2fea6684e6012d836f232a8ff3cb93223deec SHA512 812dd6bb3a3c24b87e40a3df0c2a0dcfe1b5e27524b8e1622c533d8561cd4d674e9d90b8e66f571ee21bf3d1e152092ee986b6ff226d51674f1253f1ffb97ae4
 DIST instantclient-jdbc-linux-19.11.0.0.0dbru.zip 1577534 BLAKE2B 954049186c80028567f5ec0bb30aa28f6d9092d8c8be7cfef67f94e397dc26b935cfbbf75bee3b32e56c3697fb5a7e3181f9948ef91177af68c648e102a7db77 SHA512 5717137a6ebf28669347dd6f03f61b7242a332b927b55502b9019d108714c77e3dd31894f6d5260df6553604b0255b657aed46b63262db9f2e7153c067387e0e
 DIST instantclient-jdbc-linux-21.3.0.0.0.zip 1578398 BLAKE2B 42fbcd9946ff87f438297751febcaef4d361d36ac9d6538bc52f988f98c51531efb3a2721ba5c3859bf7f8e9092667704c206cc373d6ad099c1e6048077b3662 SHA512 3bb62dbe0738f6800945858acf56780d8049af0d6c6466e926c7173deaecf3dcd277f9a7e57f3b89aef08e73a585b57eded7175809ddf8a53402523ba392c1d5
 DIST instantclient-jdbc-linux.x64-19.11.0.0.0dbru.zip 1578059 BLAKE2B f5db4ab8b4424d21bb685b43012f71a228fdf1444e055b44dcf029b3beeefcca96aaddc496ac5912d4b337ec5d2bbd959df6083c18f7921811e996a2d73e5af6 SHA512 b2f906ae887f0421ff2edb80a70d0ede1fa624792e45ebfd205ade3f24dcd3cbc596c3ee64c39d7143810a2a11fafc649ad46cb5549d519dd3a1ffb7476fb537
+DIST instantclient-jdbc-linux.x64-21.13.0.0.0dbru.zip 1579013 BLAKE2B 3a3623fdddd8612c64ad42347c3272923753937d137f6af44b1211540dff0df495793caeb069ea1eb731e25d022728c2dca41eae8123af81070ffb30b509ef68 SHA512 634fdabfa4a2a90b436ff6fbe7227c0667a035a86aa51bb8d1ce3bb9b6a62a8285d3845cc58d29b5ec0a53c66c0314f63fff9412de8b25f4837428ad7863e9c4
 DIST instantclient-jdbc-linux.x64-21.3.0.0.0.zip 1578995 BLAKE2B 9913c62abe55d5c5ebe7e9feeb9051b7833d33e3a7bc8b96667336d2ecb8bd8766d268f2eef2f2de247b0edf1d3abb65c56316a3d11b14ebcf782a3c75ed332e SHA512 8d2b7344c99ec0744e147c899e252f34fd29b7dff49b2bbe5497836130fd8e9d01f874b33ddaf7a8cca442d62eb7da56ed547120ffd409bb4731a9b56166bb42
 DIST instantclient-odbc-linux-19.11.0.0.0dbru.zip 600428 BLAKE2B b4bcb4131bab1fac2650bee8cf1db4f389e89bbf0e310f9df2a9f1ce29ebf35f8056e350175ceb406e82bd077825cb4e6ad405c5ec00929f2db2630e99630006 SHA512 9a21c2dc06b6e1c4ae7305ce248cbfe45e4ad830a48f3e088be11065471beda002fd5a6bcca71f5095ad70186d742bddffc82bdb79a4368e89c59bfd3f04af4b
 DIST instantclient-odbc-linux-21.3.0.0.0.zip 760101 BLAKE2B 68a96fa5e24f5d44f64eabfd142280d620423f15fff62b10094b4425b520a2a31ba54fe6bce2d723700d38ce5a579d31a1c49ef6928eb6f4e342c7c8d98a49aa SHA512 e2e4cf126652580bf2d8f8ace7694881382b745a7adfabbba0c3e6fddcbb9ca7e300b0d18b19c8da029ca8f33c5f8f95baa141da20659ba49c9a8e6f4848b2db
 DIST instantclient-odbc-linux.x64-19.11.0.0.0dbru.zip 638686 BLAKE2B c9fa1b8988d85870bb4c2d9cb5c34c1572079c36a51da0ef726250f03ca0b53dbc19990582358011f099ca183d6148f8110cf80c1a17917549f6e38be503f706 SHA512 7d92ff08ea48de0e981cadad15a3c392749b3e20331b25f00f2f96ef7cc11a9802408f18dbfbf36366b0122d6c8fd256d43297c3bd87b4304b0479b1593e35fc
+DIST instantclient-odbc-linux.x64-21.13.0.0.0dbru.zip 798628 BLAKE2B 1cc41d2f1538924debbe0ee04c251abda45be769097103c8782c946772e8ab3c3734f443b5d910d29a308e9a3470fb1c72f5e72b208e347164f8fd44cabe1d5f SHA512 65551dbe35c5ac5bd709973147ef3a1a6cead8f21f4a5675cad6b8b5fc670f0eb0c897fcdeb2f421b1005c1c2763e3c4090c81fa73122f146411a27cdfbdd042
 DIST instantclient-odbc-linux.x64-21.3.0.0.0.zip 798599 BLAKE2B d020c68895dbb59e53e2e7ebc599e9016dee123dc03d3ce5f9263e721fa7664ecc6fc8b49b0b498a87b0d24bf74e79854edd66c2b2e7a9367be8e1e9c2cbe159 SHA512 0bf756458f3a856bbe6942d1f4bc30a7261ce3da7524ab8b71f77d9f367767ad75e8ed83e4de18bed1eb8d597f2aa0efe0c713a2e407e801e7ce3f83e152361b
 DIST instantclient-precomp-linux-19.11.0.0.0dbru.zip 5194893 BLAKE2B cbfda89f2f97728234aa3aa58d13289be66db0127f1e73675ea2fae348d8dff28e86b85b0a5a8f372dc155a07d6aa71f2096ef5b3cdc3082ca80c107fac06f4b SHA512 196ea51fc11d59212e274669e623d86cd91c6a8d7425cab5a08044d216b118ef2e4597e0c2a904579f35de87b5fb87f9d6a6eeab927af5878c3a7e1e504730b5
 DIST instantclient-precomp-linux-21.3.0.0.0.zip 5290951 BLAKE2B 3df4c41019315119d63ec780b9ae23d48823ecb2b9aa61a923c87c3e1f30fd97266030bbbc898d59b402931e02e8b3dcedfb6b96bd41381b583da2b380526f5d SHA512 b1fb267c373410c3c24fbdc4102b3395beaf0609ec3439f730a31ba43c5f2e1b276ce6e7df04de0d542c211dfef3ecadfccfe33f1472653feb42fb25a9dc700a
 DIST instantclient-precomp-linux.x64-19.11.0.0.0dbru.zip 6254880 BLAKE2B 0035623721a12c096a38ee64bc41465682214763f123ce9c529c61b6081c6de54bd7835f8b4ef07dca5eafda5354a77fa589c7c54cde412e1bdd4f313e58b3bb SHA512 d322b7896992cef8e48cc48acc68a5730d2a04ba0af5130eafa6ada79b64b16a4bd8cfaa02a28587d0871713579a5215ff46162499cd1f422252ef8dab61b7ab
+DIST instantclient-precomp-linux.x64-21.13.0.0.0dbru.zip 6389884 BLAKE2B 81921e1fb2cda680c1eafca4edc82c69fcb1afe2d573cdfefdd24fd50568cedf3c3992542486aad5acac083679221a14696c19ea6fc016ec8d0c7c8cb1cf7349 SHA512 1552723385e502bafa39853e12781cea3ef5d7a5407040fd8bf6ee878d1246dc8f976192861f60dbd71da1c854271953f98604d707393ce688b1fc726245f88e
 DIST instantclient-precomp-linux.x64-21.3.0.0.0.zip 6386663 BLAKE2B fea4e0465330d4309791f9ca58ae169b1ff2cd1f17b003210aab1fe4faa92d6e48ee20bbf7d84f44f437bf5297c69c9c2b5a2e3cfb687c8010f8ba75bb928c9f SHA512 8235236175f35d4634005249ccbe0ea5dec4078fd795545184578cefbb8d45663731c507baac4a952fb9603272aa3ff58197eb23801894bbd240cf5736460d57
 DIST instantclient-sdk-linux-19.11.0.0.0dbru.zip 933913 BLAKE2B 08cb6c94cd152f58fe9e52874b40dec56a6f7d3c9913122303b46f75ae2df0e13fff1a375136b6fffabe9ee7a7d844a2b95b1be380b6d957338b09a15c9fe83a SHA512 8d7aff3d066f423021a5babda86b1b378333966fd892146bf46a967495180fc099e9766deab27d81735fee845ab43ee48d8815fd96a73e3a235c4fde74952e40
 DIST instantclient-sdk-linux-21.3.0.0.0.zip 1000869 BLAKE2B 3e3f01da8218dad9de699b587ecd37dc465bd5779c7d6919149bcd947e9e9575d35727fe7d1251db8df12214a399b665c62be9e790dbaeaa895b2442ffcdd8fd SHA512 dd88433810e5b72d96747e57b34f7880607fdd0250d04972afed9a9f20c27ce1b74d7030b4de60e03621f98117b7ee93062c6c750b5c2dd104668a0afd45cd47
 DIST instantclient-sdk-linux.x64-19.11.0.0.0dbru.zip 933906 BLAKE2B 7d15f4c5a53708fd311ca75c35db5cf1241070217c21acf05f181ad07259135fd64eeb8f84582ce1faa6bbdd9c3fc29c07e44d82ff60fe1bbb9acaf7f70612c3 SHA512 d964612f0bb571c5c1fe78d14f861b2189d917d23e9be936faa637d5a2f8b530dc93a1ae0130346b70897bd1382f23953ff3e7f3163a580b7c6058675ac5fcf2
+DIST instantclient-sdk-linux.x64-21.13.0.0.0dbru.zip 1001591 BLAKE2B 36f3c40da230b66edc9c9462020f6070b7610ea55d20ffc0f2ef3e1729a4ed09edf0d105136939bd6d30ac5a5323fd43efe7327214d7b9d39480fdb553f1480e SHA512 b0d040e0d4e0dc59a35efed58162ec9cb8b1c0440a7d499bffca2da11c9a62ecf91ad5ac840bb5f35da1bbadb552bee757b0cffd8fef71dfadf44ff5f52ce4c3
 DIST instantclient-sdk-linux.x64-21.3.0.0.0.zip 1000777 BLAKE2B b593e3ef880a22d712a4e2b0c51f2f68e5d9ab6c3e4124b32de643eab7d3b41b6d5eb46f4ac98af743d90343d29975760048af5b7be0919c40a9b84217b31939 SHA512 5372c151a5b45bb2cdf80c47ea65b4d8ad849cc5a50818917484b952e03c344f2d7f1896a13d51ad9daf7fa9c43226aa011dca03161d6976375f239f782bdd23
 DIST instantclient-sqlplus-linux-19.11.0.0.0dbru.zip 884155 BLAKE2B f681321cc43646af74eda4d6da102587123e0f3fb423d978066f014c4729ed046806f9c49cae6928704b4993459089e8d8c1ab4fb1aab912cd6fa7ee27382fe3 SHA512 1f4bc70b070c9a0597f1433913018021e87a7b059784a56e47842afd8a501039def6591f4e7a009f3f4598f23c45aa807578a74082174862ecb444b1855f7b22
 DIST instantclient-sqlplus-linux-21.3.0.0.0.zip 909623 BLAKE2B 181da5e352dfea2ee1d87e138601f8b84ae2df278deb1c205bf25e5958a32da13252c8455a8aeb9941de2fc3752fd0510c53f196e8755bedae24e704cb4197a3 SHA512 e4417bccf0abbbfe16fce06b1a18c6e4f58ede1b87a1ab6407f74e3b926aa9d9b4d390c881bd578f95ed4fec6980e8b28cb9f624b8480e1ffac6dc599dcf49a7
 DIST instantclient-sqlplus-linux.x64-19.11.0.0.0dbru.zip 911265 BLAKE2B 78215f683458147792be3182eaf9edfde5943e8e470a7bcbe09c82c298df709bc7cdf919e349a9130b8d6313f2f8a1d04ad9b5b3c5ad91d49802ad14c3f15515 SHA512 dd1343ae49917a031cbd8d757d11da46354f157f46dd651afcde09b4b74a9e02008c6370eabf6bd313190629944cc075d6fbd893b491ad3505b7a05dbeecd963
+DIST instantclient-sqlplus-linux.x64-21.13.0.0.0dbru.zip 936856 BLAKE2B b4217412ed0b6f2d5cdff92c4e35a1bde119afaf0e6a5eb543d9b916a6d88fd358ee3396a4cddf2a5bd32252119a20047feaa6118cb086c6b0efc282f51ad080 SHA512 963535debcb8f811b0e2d5da03fdd7024ee6d8963d8d0450721b351a420042e1d3948fb4423dea0b6a3f7f4196ab054a99c202586adf73362640316b7a7171af
 DIST instantclient-sqlplus-linux.x64-21.3.0.0.0.zip 936305 BLAKE2B b6021f3ab3badb282f1a13a93beee6caa093b905efe6a647cc8ec9ea84eb3f7de4d9885692fd8d965608ba89964d13b5427af0f8710711f673ec97c528a6063c SHA512 9c6e87b4d319fc2bc35b2bd492b9608023d0f90b6230a66c75d9cd4d9fdea9b5dab178751cd188f9d1368f639d40f342ef1c71773dc4f9e9d8a199f4b46deaee
 DIST instantclient-tools-linux-19.11.0.0.0dbru.zip 1020021 BLAKE2B e2a615e0ffb4608af05931a8b49406c85db5d549761319c7116395fae206fe6cc0cf56b49e6c3968419e63616f2d07ad6ec3ed70c862fb2394b8dc0ce9f6dbb0 SHA512 255593c1e62a11f41793619c856d316815d77fa83cc9efee1d5366dc86b32e9909b042f7ac81ad693aafb8c34cdcc8faa7eebf816a90d037d36ce461df33f469
 DIST instantclient-tools-linux-21.3.0.0.0.zip 1083935 BLAKE2B e0caed4063d3322322beea599053fc40f1e08470d03c4bbe7cb5b46e5f4ba4759d313ea714806facd35d24924cb83e6d9d7d3a44bcf1da62c6c80d0321f33ce9 SHA512 301c126a3d2fefe36400c2287515ff6716a68a3273ae1450393d04509447d68e3bd2cc0412c5c078923421ff80534c3fa56123df61fbf92ea42965e3eed80bce
 DIST instantclient-tools-linux.x64-19.11.0.0.0dbru.zip 1085194 BLAKE2B 321e1cd7704f6a5ad33a9ca0eed35feb4d8e4a3ac2b5a5d11f992569f0024ae8ef5b8fb42b02d627ee4a81d2ae9170367ba7107e0f975f89d189c576eef45edd SHA512 d355b0a457ede28b20004b4709ada5bb2c2c8a72a20a19df07bc4fb8607f78ed4d24bbf07a9f2157873b544de7a43406faa27374a0f2d6a47d63f36478e97d3e
+DIST instantclient-tools-linux.x64-21.13.0.0.0dbru.zip 1150015 BLAKE2B f0263bd528e26658e4ee2f79365d3d891dcb25ef156486a3d39dc4aa819d77784e4638ab970375c9a85604f404930d8cd939a20f6adbcc8d9652bbfac74d91b0 SHA512 8b62c07ceeef342da835ba0d58802beecff366cb89142547732b368f8757e3017eaead4746816f37cbbe0ef053df8de2cadc4f6bed9307b92b15a27bf1523dc3
 DIST instantclient-tools-linux.x64-21.3.0.0.0.zip 1149632 BLAKE2B 3ad6ee973f813733e48c58f9a18d1dad321f9fb886d9460c2bc8f9d766d5a021722b34d9d9ea0ffb7a8466a38f5cf816bc55767b668e5cb5ee59b549fe4fc4ca SHA512 4c47b51f4801cab6d71a201c12ddb7a30616050584630107968a50457d4eca0e92f3344505bdd8f36481924a21a508d476c9f26ed111bad846f4a8feab98110d

diff --git a/dev-db/oracle-instantclient/files/21.13.0.0.0-makefile.patch b/dev-db/oracle-instantclient/files/21.13.0.0.0-makefile.patch
new file mode 100644
index 000000000000..907d43494bf7
--- /dev/null
+++ b/dev-db/oracle-instantclient/files/21.13.0.0.0-makefile.patch
@@ -0,0 +1,22 @@
+diff --color -Naru a/sdk/demo/demo.mk b/sdk/demo/demo.mk
+--- a/sdk/demo/demo.mk	2021-08-22 17:20:17.232777697 +0200
++++ b/sdk/demo/demo.mk	2021-08-22 17:24:49.800783794 +0200
+@@ -43,10 +43,15 @@
+ CC=/opt/SunProd/SUNWspro6.1/bin/CC
+ cc=/opt/SunProd/SUNWspro6.1/bin/cc
+ 
+-ICINCHOME=../
+-ICLIBHOME=../../
++ifeq ($(BUILD32),T)
++LIBDIR=lib
++else
++LIBDIR=lib64
++endif
++ICINCHOME=$(ORACLE_HOME)/include
++ICLIBHOME=$(ORACLE_HOME)/$(LIBDIR)
+ ICLIBPATH=-L$(ICLIBHOME)
+-CCINCLUDES=-I$(ICINCHOME)include
++CCINCLUDES=-I$(ICINCHOME)
+ 
+ THREADLIBS=-lthread
+ CCLIB=$(ICLIBPATH) -locci -lclntsh $(THREADLIBS)

diff --git a/dev-db/oracle-instantclient/oracle-instantclient-21.13.0.0.0.ebuild b/dev-db/oracle-instantclient/oracle-instantclient-21.13.0.0.0.ebuild
new file mode 100644
index 000000000000..405f63eaceca
--- /dev/null
+++ b/dev-db/oracle-instantclient/oracle-instantclient-21.13.0.0.0.ebuild
@@ -0,0 +1,310 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pax-utils
+
+DESCRIPTION="Oracle 21c Instant Client with SDK"
+HOMEPAGE="https://www.oracle.com/database/technologies/instant-client.html"
+
+MY_SOVER=21.1 # the library soname found in the zip files
+
+IUSE="jdbc odbc precomp +sdk +sqlplus tools"
+REQUIRED_USE="precomp? ( sdk )"
+
+MY_PVM=$(ver_cut 1-2)
+MY_P="instantclient_$(ver_rs 1 _ ${MY_PVM})"
+
+MY_PVP=$(ver_cut 5) # p2
+
+MY_URI="https://download.oracle.com/otn_software/linux/instantclient/$(ver_rs 1-5 '' $(ver_cut 1-5))"
+
+# MY_PLAT_x86="Linux x86"
+# MY_BITS_x86=32
+# MY_A_x86="${MY_URI}/${PN/oracle-/}-basic-linux-${PV}.zip"
+# MY_A_x86_jdbc="${MY_A_x86/basic/jdbc}"
+# MY_A_x86_odbc="${MY_A_x86/basic/odbc}"
+# MY_A_x86_precomp="${MY_A_x86/basic/precomp}"
+# MY_A_x86_sdk="${MY_A_x86/basic/sdk}"
+# MY_A_x86_sqlplus="${MY_A_x86/basic/sqlplus}"
+# MY_A_x86_tools="${MY_A_x86/basic/tools}"
+
+MY_PLAT_amd64="Linux x86-64"
+MY_BITS_amd64=64
+MY_A_amd64="${MY_URI}/${PN/oracle-}-basic-linux.x64-${PV}dbru.zip"
+MY_A_amd64_jdbc="${MY_A_amd64/basic/jdbc}"
+MY_A_amd64_odbc="${MY_A_amd64/basic/odbc}"
+MY_A_amd64_precomp="${MY_A_amd64/basic/precomp}"
+MY_A_amd64_sdk="${MY_A_amd64/basic/sdk}"
+MY_A_amd64_sqlplus="${MY_A_amd64/basic/sqlplus}"
+MY_A_amd64_tools="${MY_A_amd64/basic/tools}"
+
+if [[ ${MY_PVP} == p* ]]
+then
+	MY_PVP=-${MY_PVP#p}
+	# Updated 9/22/2017: instantclient-odbc-linux-12.2.0.1.0-2.zip
+	MY_A_x86_odbc="${MY_URI}/${MY_A_x86_odbc%.zip}${MY_PVP}.zip"
+	MY_A_amd64_odbc="${MY_URI}/${MY_A_amd64_odbc%.zip}${MY_PVP}.zip"
+fi
+
+#SRC_URI="
+# 	x86? (
+# 		${MY_A_x86}
+# 		jdbc?    ( ${MY_A_x86_jdbc}    )
+# 		odbc?    ( ${MY_A_x86_odbc}    )
+# 		precomp? ( ${MY_A_x86_precomp} )
+# 		!abi_x86_64? (
+# 			sdk?     ( ${MY_A_x86_sdk}     )
+# 			sqlplus? ( ${MY_A_x86_sqlplus} )
+# 			tools?   ( ${MY_A_x86_tools}   )
+# 	) )
+SRC_URI="
+	amd64? (
+		${MY_A_amd64}
+		jdbc?    ( ${MY_A_amd64_jdbc}    )
+		odbc?    ( ${MY_A_amd64_odbc}    )
+		precomp? ( ${MY_A_amd64_precomp} )
+		sdk?     ( ${MY_A_amd64_sdk}     )
+		sqlplus? ( ${MY_A_amd64_sqlplus} )
+		tools?   ( ${MY_A_amd64_tools}   )
+	)
+"
+
+LICENSE="OTN"
+SLOT="0/${MY_SOVER}"
+KEYWORDS="~amd64"
+RESTRICT="mirror splitdebug test"
+
+RDEPEND="
+	>=dev-libs/libaio-0.3.109-r5
+	odbc? ( dev-db/unixODBC )
+"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_PREBUILT="usr/lib*/oracle/client/*/*"
+
+src_unpack() {
+	local ABI=${ARCH}
+	MY_WORKDIR="${WORKDIR}"
+	MY_S="${S}"
+	MY_PLAT=MY_PLAT_${ABI}          ; MY_PLAT=${!MY_PLAT}         # platform name
+	MY_BITS=MY_BITS_${ABI}          ; MY_BITS=${!MY_BITS}         # platform bitwidth
+	MY_A=MY_A_${ABI}                ; MY_A=${!MY_A##*/}               # runtime distfile
+	MY_A_jdbc=MY_A_${ABI}_jdbc      ; MY_A_jdbc=${!MY_A_jdbc##*/}       # jdbc distfile
+	MY_A_odbc=MY_A_${ABI}_odbc      ; MY_A_odbc=${!MY_A_odbc##*/}       # odbc distfile
+	MY_A_precomp=MY_A_${ABI}_precomp; MY_A_precomp=${!MY_A_precomp##*/} # precomp distfile
+	MY_A_sdk=MY_A_${ABI}_sdk        ; MY_A_sdk=${!MY_A_sdk##*/}         # sdk distfile
+	MY_A_sqlplus=MY_A_${ABI}_sqlplus; MY_A_sqlplus=${!MY_A_sqlplus##*/} # sqlplus distfile
+	MY_A_tools=MY_A_${ABI}_tools    ; MY_A_tools=${!MY_A_tools##*/}     # tools distfile
+
+	mkdir -p "${MY_WORKDIR}" || die
+	cd "${MY_WORKDIR}" || die
+	unpack ${MY_A}
+	use jdbc    && unpack ${MY_A_jdbc}
+	use odbc    && unpack ${MY_A_odbc}
+	use precomp && unpack ${MY_A_precomp}
+	use sdk     && unpack ${MY_A_sdk}
+	use sqlplus && unpack ${MY_A_sqlplus}
+	use tools   && unpack ${MY_A_tools}
+}
+
+src_prepare() {
+	local PATCHES=()
+	if use precomp; then
+		# Not supporting COBOL for now
+		rm -f sdk/demo/*procob*
+	fi
+	if use sdk; then
+		PATCHES+=( "${FILESDIR}"/21.13.0.0.0-makefile.patch )
+		rm sdk/include/ldap.h || die #299562
+	fi
+	default
+}
+
+# silence configure&compile messages from multilib-minimal
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	# all content goes here without version number, bug#578402
+	local oracle_home=/usr/$(get_libdir)/oracle/client
+	local oracle_home_to_root=../../../.. # for dosym
+	local ldpath=
+
+	local ABI=${ARCH}
+
+	einfo "Installing runtime for ${MY_PLAT} ..."
+
+	cd "${MY_S}" || die
+
+	# shared libraries
+	into "${oracle_home}"
+	dolib.so lib*.so*
+	use precomp && dolib.a cobsqlintf.o
+
+	# ensure to be linkable
+	[[ -e libocci.so ]] ||
+	dosym libocci.so.${MY_SOVER} \
+		"${oracle_home}"/$(get_libdir)/libocci.so
+	[[ -e libclntsh.so ]] ||
+	dosym libclntsh.so.${MY_SOVER} \
+		"${oracle_home}"/$(get_libdir)/libclntsh.so
+
+	# java archives
+	insinto "${oracle_home}"/$(get_libdir)
+	doins *.jar
+
+	# runtime library path
+	ldpath+=${ldpath:+:}${oracle_home}/$(get_libdir)
+
+	# Vanilla filesystem layout does not support multilib
+	# installation, so we need to move the libs into the
+	# ABI specific libdir.  However, ruby-oci8 build system
+	# detects an instantclient along the shared libraries,
+	# and does expect the sdk right there.
+	use sdk && dosym ../sdk "${oracle_home}"/$(get_libdir)/sdk
+
+	local DOCS=( BASIC_README )
+	local HTML_DOCS=()
+	local paxbins=( adrci genezi uidrvci )
+	local scripts=()
+
+	if use jdbc; then
+		DOCS+=( JDBC_README )
+	fi
+	if use odbc; then
+		DOCS+=( ODBC_README )
+		HTML_DOCS+=( help )
+		scripts+=( odbc_update_ini.sh )
+	fi
+	if use precomp; then
+		DOCS+=( PRECOMP_README )
+		paxbins+=( sdk/proc )
+		# Install pcscfg.cfg into /etc/oracle, as the user probably
+		# wants to add the include path for the compiler headers
+		# here and we do not want this to be overwritten.
+		insinto /etc/oracle
+		doins precomp/admin/pcscfg.cfg
+		sed -i -e "s%^sys_include=.*%sys_include=(${oracle_home}/sdk/include,${EPREFIX}/usr/include)%" \
+			"${ED}"/etc/oracle/pcscfg.cfg || die
+		dosym ../../${oracle_home_to_root}/etc/oracle/pcscfg.cfg "${oracle_home}/precomp/admin/pcscfg.cfg"
+		dosym ../.."${oracle_home}"/bin/proc /usr/bin/proc
+		# Not supporting COBOL for now
+		# paxbins+=( sdk/{procob,rtsora} )
+		# doins precomp/admin/pcbcfg.cfg
+	fi
+	if use sdk; then
+		einfo "Installing SDK ..."
+		DOCS+=( SDK_README )
+		scripts+=( sdk/ott )
+		insinto "${oracle_home}"/$(get_libdir)
+		doins sdk/ottclasses.zip
+		insinto "${oracle_home}"/sdk
+		doins -r sdk/{admin,demo,include}
+		# Some build systems simply expect ORACLE_HOME/include.
+		dosym sdk/include "${oracle_home}"/include
+		# Some build systems do not know the instant client,
+		# expecting headers in rdbms/public, see bug#669316.
+		# Additionally, some (probably older ruby-oci8) do
+		# require rdbms/public to be a real directory.
+		insinto "${oracle_home}"/rdbms/public
+		doins -r sdk/include/*
+		# Others (like the DBD::Oracle perl module) know the Oracle
+		# eXpress Edition's client, parsing an rdbms/demo/demo_xe.mk.
+		dosym ../../sdk/demo/demo.mk "${oracle_home}"/rdbms/demo/demo_xe.mk
+		# And some do expect /usr/include/oracle/<ver>/client/include,
+		# querying 'sqlplus' for the version number, also see bug#652096.
+		dosym ../../../.."${oracle_home}"/sdk/include /usr/include/oracle/${MY_PVM}/client
+	fi
+	if use sqlplus; then
+		DOCS+=( SQLPLUS_README )
+		paxbins+=( sqlplus )
+		insinto "${oracle_home}"/sqlplus/admin
+		doins glogin.sql
+		dosym ../.."${oracle_home}"/bin/sqlplus /usr/bin/sqlplus
+	fi
+	if use tools; then
+		DOCS+=( TOOLS_README )
+		paxbins+=( exp expdp imp impdp sqlldr wrc )
+	fi
+
+	einfo "Installing binaries for ${MY_PLAT} ..."
+	into "${oracle_home}"
+	dobin ${paxbins[*]} ${scripts[*]}
+	pushd "${ED}${oracle_home}/bin" >/dev/null || die
+	pax-mark -c ${paxbins[*]#*/} || die
+	popd >/dev/null || die
+
+	einstalldocs
+
+	# create path for tnsnames.ora
+	insinto /etc/oracle
+	doins "${FILESDIR}"/tnsnames.ora.sample
+
+	# Add OCI libs to library path
+	{
+		echo "# ${EPREFIX}/etc/env.d/50${PN}"
+		echo "# Do not edit this file, but 99${PN} instead"
+		echo
+		echo "ORACLE_HOME=${EPREFIX}${oracle_home}"
+		echo "LDPATH=${ldpath}"
+		echo "TNS_ADMIN=${EPREFIX}/etc/oracle/"
+	} > "${T}"/50${PN}
+
+	doenvd "${T}"/50${PN}
+
+	# ensure ORACLE_HOME/lib exists
+# 	[[ -e ${ED}${oracle_home}/lib/. ]] ||
+# 	dosym $(get_libdir) "${oracle_home#/}"/lib
+}
+
+pkg_preinst() {
+	if [[ -r ${EROOT}/etc/env.d/99${PN} ]]; then
+		cp "${EROOT}/etc/env.d/99${PN}" "${ED}/etc/env.d/" || die
+	else
+		{
+			echo "# ${EPREFIX}/etc/env.d/99${PN}"
+			echo "# Configure system-wide defaults for your Oracle Instant Client here"
+			echo
+			echo "#$(grep '^ORACLE_HOME=' "${ED}/etc/env.d/50${PN}")"
+			echo "#$(grep '^TNS_ADMIN=' "${ED}/etc/env.d/50${PN}")"
+			echo "#NLS_LANG="
+		} > "${ED}/etc/env.d/99${PN}"
+	fi
+}
+
+pkg_postinst() {
+	elog "${P} does not provide an sqlnet.ora"
+	elog "configuration file, redirecting oracle diagnostics for database-"
+	elog "and network-issues into ~USER/oradiag_USER/ instead."
+	elog "It should be safe to ignore this message in sqlnet.log there:"
+	elog "   Directory does not exist for read/write [ORACLE_HOME/client/log] []"
+	elog "See https://bugs.gentoo.org/show_bug.cgi?id=465252 for reference."
+	elog "If you want to directly analyse low-level debug info or don't want"
+	elog "to see it at all, so you really need an sqlnet.ora file, please"
+	elog "consult http://search.oracle.com/search/search?q=sqlnet.ora"
+	elog ""
+	elog "TNS_ADMIN has been set to ${EPREFIX}/etc/oracle by default,"
+	elog "put your tnsnames.ora there or configure TNS_ADMIN"
+	elog "to point to your user specific configuration."
+	if use precomp; then
+		elog ""
+		elog "The proc precompiler uses the system library headers, which in"
+		elog "turn include the headers of the used compiler."
+		elog "To make proc work, please add the compiler header path of your"
+		elog "preferred compiler to sys_include in:"
+		elog "  ${EPREFIX}/etc/oracle/pcscfg.cfg"
+		elog "Remember to update this setting when you switch or update the"
+		elog "compiler."
+		elog "For gcc, the headers are usually found in a path matching the"
+		elog "following pattern:"
+		elog "  ${EPREFIX}/usr/lib/gcc/*/*/include"
+		elog "The exact details depend on the architecture and the version of"
+		elog "the compiler to be used."
+	fi
+	ewarn "Please re-source your shell settings for ORACLE_HOME"
+	ewarn "  changes, such as: source ${EPREFIX}/etc/profile"
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2024-03-29  7:40 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-22 12:24 [gentoo-commits] repo/gentoo:master commit in: dev-db/oracle-instantclient/, dev-db/oracle-instantclient/files/ Michael Haubenwallner
  -- strict thread matches above, loose matches on Subject: below --
2024-03-29  7:40 Joonas Niilola
2021-09-28  1:45 Sam James
2019-07-31 14:29 Michael Haubenwallner
2018-10-19 16:29 Michael Haubenwallner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox