dev-db/oracle-instantclient-12.2.0.1: bump odbc-2.zip

For Version 12.2.0.1.0, in 9/22/2017 the ODBC file was updated to
instantclient-odbc-linux-12.2.0.1.0-2.zip, while the
instantclient-odbc-linux-12.2.0.1.0.zip was removed.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

3 files changed, 37 insertions, 329 deletions

diff --git a/dev-db/oracle-instantclient/Manifest b/dev-db/oracle-instantclient/Manifest
index 71fb080c5c41..fd91881793a3 100644
--- a/dev-db/oracle-instantclient/Manifest
+++ b/dev-db/oracle-instantclient/Manifest
@@ -1,24 +1,24 @@
-DIST instantclient-basic-linux-12.1.0.2.0.zip 59727331 SHA256 96d210d1ff9575022644a8817696ed9e90374d98cabd2631b7b458689ca7511d SHA512 5d93c72c43ba2ca765209f4c1d518b9e93c80ff33625bf0bc33b974413e2b91ab22681e0922d2148fbfa6b6043fe84eee5334aa398e1ee7b1c2663ff2b3bb235 WHIRLPOOL 78b4902939ccc47540c4524e0a8326ab4a9c302a94c6a85790151ff9d83c400a0298436afab72c2b7b779f9f8606b5b4787fd4dbd496a0add171ae87461881d9
-DIST instantclient-basic-linux-12.2.0.1.0.zip 64594237 SHA256 32f5a53bdaf65e87b176a68fa0097e2a5249952be6f4afc3e0ef80345591a9cf SHA512 35cdd84765f1e020cd1e7fe3a765449bcad1c3b09189ab64f6a969da27d7ff2932bad319037ec066615e672d2b3105d4c36b42ec30ab60d6c577a2796908d22b WHIRLPOOL 1de40d5cfbe2e6846256c98f15a3a3ae8e68862bdbf6ebd73b16dd5e141179d6835656da3585695079defde05eb0c5e73a68f7ba0de2c7edb7e16940d32a2af3
-DIST instantclient-basic-linux.x64-12.1.0.2.0.zip 63352239 SHA256 c4e1b7201f23bc855782157ebeaaa3635eb6f5f01189bc1d3335bbdadfcb1fbb SHA512 e4cbdf40f00521651002f0753ead292b7a33352a7dae5d77635fbdb784451a1b9331ad614326dccdea34ecff3d44ddd0932b83c4bd405e69d95c7decae945f2c WHIRLPOOL 2463abbaa366a20b77b6800262b0b8692ad1e53b8f7e05c542d38e5e893d4e9fb466ef34fb839366991388eda7251654ee5b7fe3020b39692f798bea8e51e83b
-DIST instantclient-basic-linux.x64-12.2.0.1.0.zip 68965195 SHA256 5015e3c9fba84e009f7519893f798a1622c37d1ae2c55104ff502c52a0fe5194 SHA512 13f9b80d1021309fa48ca6c9dd6406ba6f97dcd611f786e940db42eeaba40cdf603b108954b9b3195f830e49377593e31b04f8d9310f619418bcd129b39f2ff1 WHIRLPOOL 244ab81ef2abf813ceb0f92fed25ad7bf05f25737a747ea194a5c61d4a81e9fb88f81136e0c8e7939e06c0d8b2c5a15014ee097e391d96e98c26edd834951a0a
-DIST instantclient-jdbc-linux-12.1.0.2.0.zip 1571004 SHA256 b40be90a26f27444ee6999ea05d7e62791ff0f01b943d48ceda51167e24f7e1d SHA512 ed3e5f831f1ac7351bd6eb7b3c10a09bba0f1989384ff1f041fdf94a5ca6acbf06e8285283f48731be6ece3dce55d307ac31e8bab57548dca0e3b3056060b5b2 WHIRLPOOL b17c5e25028b3c75719a42b77c43c10c346671632d582c8bd1ce31fa944690b3c883b357674407cb930cc4d7f0ba9054e53cd440842ac8be3951ea1dc32354bb
-DIST instantclient-jdbc-linux-12.2.0.1.0.zip 1572140 SHA256 c630ce7a4005bb354bf5c49744ec658046670d03b1064363aabf6a8a9f43eae7 SHA512 3b57ab454645f8719a75c8778ab33589548018ec09d187ca88252006f44b014d62659a622ae423f79f9bf0f11149cafaa33880e90278c94a847e69e409bd3dca WHIRLPOOL 269b2ad208ebbe2dde6db33593dad1abedf2f89eeb813ce8df895c81ea239383b9b2dc1c20dfba141c67ff084a99b68ca018d450c9193a7e07728c27487bb73f
-DIST instantclient-jdbc-linux.x64-12.1.0.2.0.zip 1571639 SHA256 444236c8881b4a6dc98342d8f2d95be5db6c2fa3ae925bdabc1d0cb684b0f20b SHA512 1e6aa33c159d5769d10b16da3c5ff16629dae049c7e7d3ab1504a0ad625968f4d3f655a83ff128bff726c3ed03eab9ef7603c897aad288d1dc4e557c03ac7e2a WHIRLPOOL 3f4adf8b631301f969e23651717be307c94ba2f6f8a7f0e53a086994c3e02a0643bfb69a3b9ec14914f3994cdbc0689e00a3c96f3f65db001e1c3382e380d130
-DIST instantclient-jdbc-linux.x64-12.2.0.1.0.zip 1572942 SHA256 1a18fcaa41984bc0499a3d3138843292550a5606556217adb47ddc59caa7a0fa SHA512 79c939442431e14b9f30e94821fc4d8eeb34cd35b887fd8fa90a045357a241a58a53d591d22a5f42b188540c50350b842391a3871c86eb4fe8169ea23001a21a WHIRLPOOL 204cc898bab739296dcf0404a19b8e13b11d302024a2ca6f860452947a2d2ce442708b254ed9777ac1cc101b7ed66cab24d870d805282b530be58582f8e2d275
-DIST instantclient-odbc-linux-12.1.0.2.0.zip 1100875 SHA256 bc686e56f544d465797a710af8ac39f49cfee1da13e4124dd080b13e49c6e573 SHA512 ff3b13a338f0acbae07f23d0e54f0ffa803afcda1a798b9cf38ced103201c0698a7240a062fb67af3547c17e906089e236cc3454685ca4645161a8b14414235e WHIRLPOOL 7dce918dcc16fc66f067a84540304948bd27ad38337518c5fa4c708112db3096da7037ac06e165b605f60c2f412f615dd9a511a6d7abaa1e9743e9f5823c3a89
-DIST instantclient-odbc-linux-12.2.0.1.0.zip 590235 SHA256 d6794428265756c72074c46d1fcb66f45d79600cb80954d7203c84b9fc0b7055 SHA512 bece0959fa126bf9e6e0104b3464cef466913c6af0ea77257415486a756b93428ddef41d1a5d97d08fffe092825ff69dbc2b5bf39e359a07f980bef1a2c82a9d WHIRLPOOL 6fb8701c9dae33ec127540a358b134855eb49dd8b9b42e83cc1ffbbca4560da5b6d3e0c20d5449cd21bf42cb990c5de8c31068146be6f73326986cde31a69e53
-DIST instantclient-odbc-linux.x64-12.1.0.2.0.zip 1289004 SHA256 ba2b50f8386b971b948b338ba2552b93511a1f515053a990dfb365d9bef35cba SHA512 b6dd02a2566aba66bbdd61e37e00f0c0ec2d466ad969658d4943657642e6e385cb08d0bee3a127b38a7077ec71c8f341aa4696f381e4d9978f807caa1f3ccb91 WHIRLPOOL 4fdda8d10aa3f744cb849f82e21f8d5d6ffc21e907bb0c659962a1d98d7456362108ccdf4b084d741d15177edf6a0233afe917f23adbe7d9af04b6f64a5ddab9
-DIST instantclient-odbc-linux.x64-12.2.0.1.0.zip 634997 SHA256 ead4f196080125114c6eb0c773f516c832bd55435b5eaba2fc9362dd0742f78b SHA512 03fc26db3cb07186b79bd7473d4b1f9c60f439c8b3c3653dbfa8f57fe3767ac4a233c91d31dea16b39db8170ee027913d7c4d86c0476a57ac9695a68b920f07c WHIRLPOOL 693605d1d9ccdd4585ae7f3d9e9f2f464f009996f7db373b129035d3573cdcab475b69e78bbb23b0f714cd903db212e8987d11950d061892a397be4195781492
-DIST instantclient-sdk-linux-12.1.0.2.0.zip 667183 SHA256 8a3d609230f02186c85cd39bef1e8b974a239254c5b12ba7e482c5a7c35ffb4a SHA512 fdc0111dba77aa88dc7a39c8d9afbd08c4ffde63890595501915be48a70f6fc623762657a1f3e3b54dd08b0d1e5ce00f99ec5ce40990bb17fab63ae38b986dc9 WHIRLPOOL ab4b2406d503381e5f0f878ebec7d03ff3fa748a0f7aa975dda567223327092452543c5a5568b0eea060d998f209092d7bc2d7d227ddd134cd6d259db5377a90
-DIST instantclient-sdk-linux-12.2.0.1.0.zip 674751 SHA256 38aa0c3961d44bec4819e04de1ab0642f2e9ec92dbbad327a7935224c7239d8b SHA512 b2e53e95aaee283f9077f422c7ea8e961a42decb0f58d438eeb32edb32e8c88321261ffd009ca453b531c4aa22a74b8cf71b9a91754c2bd082c83f644523c72e WHIRLPOOL ce3703933b2af85d8e05a9de7b11998adaa2860e0a7d796b13cb0d3e27d7cda7b7b8b3f2abe216d2e2739f0ef34f2739e5b75fd2f683ae3ff2ebf98841c9b91f
-DIST instantclient-sdk-linux.x64-12.1.0.2.0.zip 667174 SHA256 ba4b1b96b9f00bc36682542df575f1d52717f6ad48436f50c85b2e87b3a6961c SHA512 451918e34c4e41dcaea6d678cf10a20a3fb80be5c060aa1a2890f2eb528e6e4982bfd758598eaa115cd367cde0468f7f0f811bac2ef28671075868857eaf9f2e WHIRLPOOL e0cc5019eebf25c3db8debd207c85907937698a80e4ccea7c4eae0bde3c58bdfecb2d03f915dda870cc1d579146594d2720a7338a4466529bae20dd1a4e15aca
-DIST instantclient-sdk-linux.x64-12.2.0.1.0.zip 674743 SHA256 7f404c3573c062ce487a51ac4cfe650c878d7edf8e73b364ec852645ed1098cb SHA512 4a62ae1be31514664a0f442f65df633b93bea25f1ebe84e405865b9e363017726075bf2d5b2181600018ee122f74649aaa8ec5b507ee8938e33ae056a7f828b6 WHIRLPOOL ced978a6b668b6e435eac9c63c83587d197f64c40528fe54325f23e82a2c6d77b2e2596de524bbfedf02db909351674ca6c4483c7220b688d44d79955b2ffb7f
-DIST instantclient-sqlplus-linux-12.1.0.2.0.zip 828190 SHA256 03062efdb88423342657a679760581af14d936a897647bddcf248453bb01105f SHA512 e521f141f0bb4fe62bda6da389a9c1038be879f1456500a9e70ac0a41d4f35cf2051181a03223521aa24ee06a33b67614d3afd91f01099afa0081f2771876d43 WHIRLPOOL cd03b648dcc9340b09501b9af9da0d7c493983e304413fcc4a882524919a693a86d2d640009b9da125424c0dd9302546c2a5deeb569401c642b35a941d76e017
-DIST instantclient-sqlplus-linux-12.2.0.1.0.zip 869831 SHA256 c289ceaa6196e44a6e85d7342c9440b25c237018f6a1bdadb72d7cc2075f504c SHA512 83894a72192ea9ca86d361ba70a6c011f297afa5d186a49fbab7050d9615de300d54b12af8d948fe18a75dcf51bd04f9feaa8460a1c69df9c55f9854e3cee61e WHIRLPOOL b8275cf7e7fcde546fdbdd038afc8b55545106ae5512429ee5b352318d8647b34a816924dfb86a1e51954bf7acec770ac296d6bfabb6dcb560d45d48fce1355e
-DIST instantclient-sqlplus-linux.x64-12.1.0.2.0.zip 861284 SHA256 b52a7fca7279d4e9584674ea6f24464411f62f6ba95a2a16ec92979e99cac4bd SHA512 ad0af692bcae1231b58c7ea55fa79d85c7a5c9875a805565b1b5956ed30e608d753ac9210f6169ab3ff4e42ac2f1d871ccff47bd2656f7684925136fef1f30c2 WHIRLPOOL bad31c1135377f191adfb95861b171f286f2564023387c7d5fbb897624e0e15784157a052784985fcf42cb9e5d500067e71d1a8a6858ed65a179f6b4cc6c78ca
-DIST instantclient-sqlplus-linux.x64-12.2.0.1.0.zip 904309 SHA256 d49b2bd97376591ca07e7a836278933c3f251875c215044feac73ba9f451dfc2 SHA512 7d31a5262138f8ae0429cf08f0743b9c8c7863fc8e6abfa8ef089cee2059da75bf23503f9f1f09c28b82c5209aca27f81da6c890799236307395b59fea3bf012 WHIRLPOOL ad7ebdb2b643a98d500e0d2cf999cae8dc248b65aad40338ccf28b66f18ee2dd4e0ab89629dcc6b9024e0e5e4548218585ad160cae06e5df1d27e691701e14c2
-DIST instantclient-tools-linux-12.1.0.2.0.zip 187088 SHA256 2c73b8668ec5c99ec777110a5e33744540b8d394dcb934430d39dc507373126a SHA512 37a9eb3e2fdbbbf32f0fb5d017209db1b62d54efe48a875625e9d6162ea894d93d144358b2360989fa71704b346f86b36f1640a5c98f8aac7c1e6853b2d078fd WHIRLPOOL 156b434fc181cbd7832fc7646bb5c6ae73c69a748b8d76dd36481aea72db211d4524d290662cf0506f0fdc811035bb39eaf2a1a087b9de50cb943e5289d5ffe9
-DIST instantclient-tools-linux-12.2.0.1.0.zip 1032131 SHA256 8fae4cc5b74924be262513c3988655dabbe90c7092ec5c40a98dc2869212a514 SHA512 e547d571bf881e787dc19bf23f82c4396f14dbca35a51a21e4133ff463f3c3c2c308cc2263f55b49ce70604569158266cd88d7ebf8b5cf51c9cd58b2871133e2 WHIRLPOOL 06fbebacc13ece06c8f83bbd25a9ebf824f6bd8d69f8e50f46b672bfa08e6369df47634dbab52be760219d86eb870e27553cd3fff52fe6aba30902e2fcba384b
-DIST instantclient-tools-linux.x64-12.1.0.2.0.zip 203511 SHA256 cdddadf2fb7bba406a397e0dd47b53bffb9326265b874d1b17507c98a38afa16 SHA512 f18ca11300fc20925c72122d03fc00402b9a52b39f7f70cfd3fa97264a1a2a173e7f77059affba98e897546e05c6ac1e3a546ce1c7e63ef049130496d346342b WHIRLPOOL d98d728b917cdc368e859ec358ef35c1284b4a8e49b2e4d909a0d363bdaea10e80622dca19977afa3030d7930d2d1b37ce1983eb27da09f909c9c0a636b82206
-DIST instantclient-tools-linux.x64-12.2.0.1.0.zip 1132671 SHA256 9c5674a89bb4aad619fe0691a06d8984e5c0d450f2b895db975302dddc15e215 SHA512 1697289fc4b6a37277036dbef1892bd113892fcd3b0f347f0960ef8a1b90f3e91411bb237060e88bfdd418e50600372b710df08d97a4e847fd90d077ed0647d2 WHIRLPOOL 5536c43c3ef44ba14f82b79a59e6527e63a366e6701512bcec6c7723dbd37b0e4d60a98312c9111e9c36c1f106b516ab1fb335da7b14f8ae39cdabf83389fa13
+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.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-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.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-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.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-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.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-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.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-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.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
diff --git a/dev-db/oracle-instantclient/oracle-instantclient-12.2.0.1.ebuild b/dev-db/oracle-instantclient/oracle-instantclient-12.2.0.1.ebuild
deleted file mode 100644
index 4eee326f922e..000000000000
--- a/dev-db/oracle-instantclient/oracle-instantclient-12.2.0.1.ebuild
+++ /dev/null
@@ -1,303 +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)
-
-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-r1.ebuild b/dev-db/oracle-instantclient/oracle-instantclient-12.2.0.1_p2.ebuild
index 67a48f68db6c..9bac87e49757 100644
--- a/dev-db/oracle-instantclient/oracle-instantclient-12.2.0.1-r1.ebuild
+++ b/dev-db/oracle-instantclient/oracle-instantclient-12.2.0.1_p2.ebuild
@@ -8,9 +8,12 @@ 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-${PV}.0.zip"
+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}"
@@ -19,13 +22,21 @@ 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="${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="