20 files changed, 43 insertions, 175 deletions
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index c0caa6375321..27ace9ca6001 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -8,14 +8,10 @@ AUX db-4.2-jni-check-prefix-first.patch 1104 BLAKE2B 79d8c93831f4a08df8411540d5a
 AUX db-4.2-libtool.patch 665 BLAKE2B 5d6610c5205796647ca2c6eb5a973d54cb9d22f1467ee17c48a1cef2165d05192fb215dc817babb088b2477994ebcbe4e47f06ef9880c27c2e160e98145814a4 SHA512 6a0c6fb1a8cb76f84763c2925ad05dc06c521356f02ada61bf627fe855556da61c1c721063181720e300fe7e012b11bb7a85dd55a4c02083d26f21115aacfbfd
 AUX db-4.2-listen-to-java-options.patch 244 BLAKE2B 221f39b4cc6e4d4ce91efb90a5b207e634f8d362fbb34d1fe9c57960323cce71507e49a4aca0a6187374a37fa77208547e56edea2695d7b1111d96345469cd1d SHA512 20103923b1da278ca5a682ba0a74183d9c8f68a4774af51d12884d7d405fe7ec27f82b0b49a01a6453b96798db995b1f0fef34f2aa40a3b66db48efddb94af49
 AUX db-4.2.52_p2-TXN.patch 2336 BLAKE2B 6fbd0f0346d79f979b0272e0ad9642cbbc310743b396706f4ddb999d22d95e038110e38922c0bb528b99a0a3e5e8054341503dcf6986dcd8f6def7a732e0f94f SHA512 905611212b554a0cc4658abfbb1275e7e38b64bfec1309b133e500c868badd38d317bf481949a64d3ff16845d11285bdbc26d3af968f809e8c999c2d4d465138
-AUX db-4.3-jni-check-prefix-first.patch 1104 BLAKE2B 79d8c93831f4a08df8411540d5a98b181f063f5daef649b8af42cf5c04bc5597599b64f291fd89dd5c5c21c77816130d2c4b41f57b88b065fd9a99c2d22e4bea SHA512 18076650e6373be5dedb25ce7d37f81ffef4df69917e3207040d99081eed2e8081d4cbfcfc647bf0c3946f9c957b031cd5030f62e4689de9c76b219136228696
 AUX db-4.3-libtool.patch 2088 BLAKE2B 4ede74e622bacb7a4e9728d6d1735fd4f35aac23b220234a4457fe82334a463f6c5616a8ca7881fc6b507c2ab3a0b57778f9fd0dcc53b1bf766c00ef81d2474c SHA512 8779d67118503810a3a0a4b94f4a47929406cd9e690c2370827de06269b99162812b9118d156fe7b022c017e2f2ac5c766404c1f3cdc20155c4b7bc2a24584a3
-AUX db-4.3-listen-to-java-options.patch 244 BLAKE2B 221f39b4cc6e4d4ce91efb90a5b207e634f8d362fbb34d1fe9c57960323cce71507e49a4aca0a6187374a37fa77208547e56edea2695d7b1111d96345469cd1d SHA512 20103923b1da278ca5a682ba0a74183d9c8f68a4774af51d12884d7d405fe7ec27f82b0b49a01a6453b96798db995b1f0fef34f2aa40a3b66db48efddb94af49
 AUX db-4.3.27-fix-dep-link.patch 1179 BLAKE2B 60a9ac78e125e0c33b6c95b6c76b477c9ef248246ac7acf4df6080cb0e38c2d0ff7109e72508c2ed877c8b7bfe849a60c631bf6ebf9f537edc45b8ab7cd1fb53 SHA512 05f9eb53f01db8e4d36ff3527a5757611def974d2c2a4cc97cdd48ce7bd5e8bd22030cd8d4493374a5ee226a98f4873bf8f75e196897f6c0c9c4e9bdc368d05f
 AUX db-4.4-libtool.patch 1744 BLAKE2B 56aaedb9875993ecedfa62eaa9b4e49d187042e6ce81bcfc466baac80d021f12249a957ae2a3ede40e1a0aa2ff0ed596a046d1b4134295a36f245467774a1428 SHA512 c7c4c74096925ed9f7e384684153b37d5fcf2f8d40553d1d477b34c54d3b2110cb199d2e23543db321223be3a8a5c095f8bba7730f6c4d6ea51b9d04a9a68448
-AUX db-4.5-libtool.patch 1744 BLAKE2B 56aaedb9875993ecedfa62eaa9b4e49d187042e6ce81bcfc466baac80d021f12249a957ae2a3ede40e1a0aa2ff0ed596a046d1b4134295a36f245467774a1428 SHA512 c7c4c74096925ed9f7e384684153b37d5fcf2f8d40553d1d477b34c54d3b2110cb199d2e23543db321223be3a8a5c095f8bba7730f6c4d6ea51b9d04a9a68448
 AUX db-4.6-jni-check-prefix-first.patch 1104 BLAKE2B 830f19c74df5730234496f8035c943ee13388154a60fca4701f7a72b4c2685550cd95892d9edc406ee29889af94df2ab5094abf35362da15b0669fbfe73b0165 SHA512 78791ada74d91e572e35d33f60d0174705916655c0e4db4844b73bc3e9dd71a65b916e153c087c0ede1d4a400588af7674b7e69804d8a2883e45992904b0b3f3
-AUX db-4.6-libtool.patch 1744 BLAKE2B 56aaedb9875993ecedfa62eaa9b4e49d187042e6ce81bcfc466baac80d021f12249a957ae2a3ede40e1a0aa2ff0ed596a046d1b4134295a36f245467774a1428 SHA512 c7c4c74096925ed9f7e384684153b37d5fcf2f8d40553d1d477b34c54d3b2110cb199d2e23543db321223be3a8a5c095f8bba7730f6c4d6ea51b9d04a9a68448
 AUX db-4.8-libtool.patch 2080 BLAKE2B 9a3dae0587dcf97f41b2991a577a92a558cf8c171c14e703dc5e83ab8292a00e37fb939922197c0b0dbc96c6462faf27cead0fa3535c0e798378d8c2b22b546a SHA512 b1298a1f98c7a99a05cae1f205550d7019a488c9f049bc5e6ee32d4fd7a5ec852ae4d41b7cfe928917b57b9e9949460d907cd5926fa7cdafe1c8749191996218
 AUX db-4.8.24-java-manifest-location.patch 592 BLAKE2B c8e295dbf888b3ef832ea3536f91a6be49a0ce9ed90fec92ff90cd0288b4eaacc4f4eed43599dce61e79454372844f150e24a8f054104cdca22f5ae9861c3444 SHA512 306503befbc76b1b0775adb94185407fbff23f467d474e0ad3b28190edfdb485942d14c3a53a7cde71213f49bc548a7d271fedd95286920ae5c21778e139fec2
 AUX db-4.8.30-rename-atomic-compare-exchange.patch 836 BLAKE2B 4d837c6850d35327c79d9adfc138759e09454d222a63c16f7ca3f5bd36b7f12107a16962cb3f37ba9464d8acec19dca020223e33e45dea5b0007f10fe1ec248d SHA512 1a4be944b1d41483fb4429a9454a3e9446b41720ff829c0b90b09bc3f9838c798dc3f9e0c918332d0933d6bc62b9b13b3f8251463f1fbddfddbdb341adbaf5ed
@@ -66,19 +62,19 @@ DIST patch.4.7.25.2 2210 BLAKE2B 3e9727a4e006fa8e4502f1481a44144458401d0df0eeea2
 DIST patch.4.7.25.3 8442 BLAKE2B 666b643b3bf0d1e5ef5e445ae03228f436a5528bc197338c3c9bd468d7002bc81a16e295cf34fe6b38903e7f65c2c5c3cd9be0a3227f1122aeda22afc165e2a9 SHA512 815560c45c9c8491fd58d881a0bc1d23a82a13298d4757ed7d2ae4df4b88b278b8e4d6063eb46349a8f6f11ca9aa5b8555f3ce01df025715c2579dfa36241238
 DIST patch.4.7.25.4 5647 BLAKE2B 60ecb24fb137f7aeacb9689d8edc41791f78f96d1aa15c7fa47032371533d668c5dc12a5e1641945402f0e21f4e596cebb5010ac170ef462279b2efb887be020 SHA512 df9810034773a9d0556cbd174e4f131f0461402bf3f476ae5da1deb92f3e2e9ef789687c5cc5c2df6385f6b14251e893be225ffacd895d71dfb305b9de32567e
 EBUILD db-1.85-r4.ebuild 1306 BLAKE2B 1486c5fda2f806ae456ce0291ae9b356be90e27282dbc0ca801567d7bce1e7d468acd6bfb40cb944fd319c4d55ce3367a7100fa25ae3f26d185482602ddc1a40 SHA512 120786a3a06cb8c59e24fce7bb4c4f1660f19bfd972b84d59e4afa4ff0e261ea8432b3414ef2a7176d04df6c726d0b0f191bf3921c0d3e48e4150c5fdae9d2aa
-EBUILD db-18.1.32.ebuild 6944 BLAKE2B 23d03a70a916a4fd236455fc8e2a50b682fe2c4a4828b9499823c9779b129170b4d59fd6cf4e622b7d96c5b997c45e443abe1aacdd504ecb5b993e92cf355201 SHA512 809cb9fc4e1fb30d705f7227b8881bfa978ca1dc8503b73fb7bcc74c2293a145b2bb4a7024775a14e9b7a7c84c10979c5d862d0f356cadd327755e6aecee3b91
-EBUILD db-3.2.9_p2-r1.ebuild 4872 BLAKE2B 928b5f9695258dcaf330419ba9304dbb4e005c43817ee955881aa9f19e61712c2a4fa2900de3fb9d318fdd64b18b0c5b8250984068baa6dbea2d6c9683df276a SHA512 f1b3690456a43f125d1377512d2379a2c8d4f9abfd78805ff2401258b8786eb2fafb565daa1c49f1445f0349e76b2f96f26fcc4ce4a3b8df45f39409d24f6d82
-EBUILD db-4.2.52_p5-r2.ebuild 4609 BLAKE2B 8ef11a05001685d8185eda1eea2ddbcad810f33fe5c365a05464b5ff997ff1c858f36536a34466c0ce68160472f0eb45374cb5556640b739c7d03751c9aa971d SHA512 cbacc75cb72f75323b31ffda94e235b98d55dd9fb3bf931d117fe28571e37f8747304c5339ada4996d78f95d5ded00f15cfc44b8af295b62610a6b709d31145d
-EBUILD db-4.3.29_p1-r2.ebuild 4528 BLAKE2B a4128b4fff25c016b2751d437cc35fa7e0f4638d68a4929508f3b145163635656c005d54e42056679d8f67cd0ca8f94d0c63f9c9446b8cb8550faee74f998807 SHA512 700dfcdd0549731a24cd1f40fa3f2a42ccf87f8c4fae5845443a945667ea58100548a386944a4fa16f7ed8e3f83e51a95b79868d46ffcd493caee92cba842369
-EBUILD db-4.4.20_p4-r2.ebuild 4412 BLAKE2B d4ab4f8b6227b7e41a326a49ce34618380a8f4a06ff18f1ad671cc6b283794d41c5da2ed525a907602c26873f6a7be433f78588d20abbd27acacf4e97b8660e0 SHA512 faecf68558f49c07400bfef194984109d155ca006549d6f62f1b0a736d07bfc605ed821c89e90a32481611747bbbd12d8cb8e069a0e05e63fca6339d0463bc3e
-EBUILD db-4.5.20_p2-r2.ebuild 4653 BLAKE2B 5cf5481dbbd734197c8d05d7317d83231d87606088f826d19fc1078f27f07bbe02653d7d2c75e5093e74ca76ff1b0eced9ff7c59dbcbad8619ad263a01ca9799 SHA512 4f4fd5d83bfbc859b804c23ff2542549a22120ed69737504648ba2665698b7778d2e09276cf4c56ecbd5669b5e1bad521d3fae68cdc5c9aad8474863c9e91951
-EBUILD db-4.6.21_p4-r1.ebuild 4375 BLAKE2B 37c4b2b20ded8c9fe1f1eb401bf7f02ffd6592e002a673ae33e2c675efafe71da99a4d7caffd2f9852082a0f025f23030a75de0ac7372200e9f3b37729bd9799 SHA512 74c3e473b4c87023eb5500b94907643044e7acc0916ff2d7caf8bd56370e70bdc7ea560dc1cbf98bfd4a46eb55401e6cd5af6b1c73489602954e4a327c2cad61
-EBUILD db-4.7.25_p4-r1.ebuild 4722 BLAKE2B ee8e0d611aa42a198df4df4ac802c813e79591785bf5e5601d873cd4b56214bf22dde8835835b8939c881d1035b1d5dd8efa2d65722aa5bec38cfcced69de5f5 SHA512 d0f4a8935fa00596f6215bcc3b2f6ad9e630559cb43ce22ed58a6d6b93fbdf5f9a0e5ed030deed594c639fef2ae3621084cc0482d62d973877dcec2f6546d195
-EBUILD db-4.8.30-r3.ebuild 5205 BLAKE2B 70a74868abb8637d2fea3189cf6fd9e36812f0a0b77998250fa0d3da180c7c2fff2d2098775b57f685fba5c68956f9dd0839e7a1a603a54ee227878982c94367 SHA512 b9db7d18e99238492327cffecd48d897f7c1d5a8a93a03bedf3f8e1871b7e043fc5dd6aa094f60e3fec691c39e8a03c57c55efe805079d2993437366c1f3f092
-EBUILD db-5.1.29-r2.ebuild 5856 BLAKE2B e4b16a65b13c47de96c4bf0886503a7e63199bfd76e1778cc7c5609e3a9dba0b6a3e76199c3d8adff651b87289e8cec6af41c995bfb09223545378591175f311 SHA512 91f8ffd4008d1c25d7604ecec1b03f04c8b33812faa52a99eb709b58b4026492fdcdb5fc1d60392e66673647e76996f5b3702026e50f8fa0d48f0ece0c2f2a29
-EBUILD db-5.3.28-r2.ebuild 7136 BLAKE2B 41a76ef290004a1e137c709078a64ea20e0b4864a4d0a57330ddd5ecaeec4d52e989493274e0d167844c9bb75b040937c83af153a781dcaff17ca2907899c2d5 SHA512 728a9a5266381b22124573e3d81dead6d44c834452250c5bf4c0130814d90a62b9be8de87545b6f6fbca2c782eaec31c3f2a958c196ef93034cdc34024e8aca2
-EBUILD db-5.3.28-r4.ebuild 7139 BLAKE2B 308fef1d85d67ec7e72e0bbe1937e612da7a15bad3c227bbd84b42547765f85960451027821fc4e1cc296fdf5790a7375eeef98289f8157d46f502b2323af225 SHA512 7cad0667f82eb8144521b03bfb027b5497d84eeacc389dd6e7364071958171288a90d59ed6a8407aa12784738766d4d9e3e6ca651169572c4e58351fb89a7c47
-EBUILD db-6.0.35-r2.ebuild 7137 BLAKE2B 2e199b4b2d9f137a2fdba9bd0c33332c20fbf7d1dc39b168286d6043020c2b44376770e8b5c4a4eb128e3ac50719dc21363d193fc03d26db128cf94db72f642c SHA512 5ff1125296504b3630587105ce2d8c7e7de26e3cf9f87d01d4431bf390225640aac901eb359975b6d35896ec7535f30ce65b2118e4e4898cf5f152c64722c3ec
-EBUILD db-6.1.38.ebuild 6908 BLAKE2B b6259d7f32cc945b1a4331f7d615d6eed80643f447dbe7b75eeaf1d1a80749a1d3b500dce74e35b7c2831d18203aafebfada2f26769ba08b38942fb3e69a64ee SHA512 3fde549eb7effd3f8c20ab6668f3ca043965c95fe544fe70ed39221f5ff390479b4518f4c33ad7c37859b4750651d0a36ba9fe5defdee17a163a6cdc4ada7302
-EBUILD db-6.2.38.ebuild 6911 BLAKE2B 6cdca513fba86b7ba56bdbb4f81f7b0770d2a3371f1d66fb543b455707fcdb6d8e7f53fcf04951111abe7558ddfc1f098b12f8e2d0bbe9e22406cc8134728156 SHA512 ec3f5b4c78cee86991d2c9e802895d176790c4d437f332231a0c64b7fe7ffc8c6d16d12723c2ad689bc4cb2ea54d478fe194da11f39a801f53aca9eed6b2da83
+EBUILD db-18.1.32.ebuild 6944 BLAKE2B d0966b541e93b454809eca92f092b84e9dfeea3cb2414bac6b20c767f5339f65c5c756680989c14d3b435394125024d8f99f7ba6bc2d0c696d8f9bb76bc2a6e7 SHA512 b123767db77cc67fd02a99c146249cfb311fa0d1f883563abef464eab75d307dd2867dcb18b8707e9a2dddd39a87404f27465fcfe63c046fe4a9aeb479134fc6
+EBUILD db-3.2.9_p2-r1.ebuild 4898 BLAKE2B 9bc27e772d9e01dc86e45510dd564f77ecc3221517ca1ed9363aa1cd6ef719191f5dd8ef13b9b34956e5b0de9b1c42dc68c755b6fb3128fefd7be72c1e580b10 SHA512 9be7f38b93fc4fa6e8b172b2ad7fb37f018e7e06fcdf1f9c6614c4bc9f986e198cd2cc6db0de865665fb55f63d600f42f800aa1a551b459819e4ec5be7135f7b
+EBUILD db-4.2.52_p5-r2.ebuild 4636 BLAKE2B 630d229bbcec68d85f0c874c150b632c441dd5cb9bc16fe1b0a5d08fb3ea4b018010520070f1278d1ee71876a8ed7e3a843aa9d1588d37f586f533787d6baa6e SHA512 a2daa7406c6b974c9d10c71386b3c6eba81e2283964915f589c060bd073ce7408354965b417947d95f8d5564c24d421c5637bae59ab596d3106f0cd942a1915a
+EBUILD db-4.3.29_p1-r2.ebuild 4546 BLAKE2B fbfa335acab145679b4d8cc496de0b20900407052e8a11863cfc30327c5d10e4065f4271662ba755f075c34528dc3f53757c06bb2850702daa71817ea1abe25b SHA512 65912e51a8ac13aa88d27d3ac3e797912432ba2614c7427af02fbc65f3a38589c517500dc096b68473f705a0053aa7031818ac66cf51683b968f868dbd87c290
+EBUILD db-4.4.20_p4-r2.ebuild 4439 BLAKE2B ea7c61757bd534a41c0b1702dcbb198ba81b8c89b5066c23d5a4a89a946a05d3d2bc6389a00d7bd8902334f5d4acc48ae07487ed49d357fb7848c0fc7a2eead8 SHA512 42d912533b4f611c70f7941e24760fbb603dad6634fe037cd9c2767d98549cfe6843e613e0e445f5c413ec4d6a4cc8ac7db0d490b1a059867414503f38557cef
+EBUILD db-4.5.20_p2-r2.ebuild 4674 BLAKE2B 08da47a505ef950a50084d48752af4882b73b91b542b8786be4c8a77c571fd22ac217e8d9baa145785c77cf0b1d6de5676b327dd5e4f863b35e75254a5345a56 SHA512 177ae0adc22a3b99ef45b8fba770bf7ca64ff328ccc4c532b376674a7b30dcd34ce54625507a5f429b47caf7bacbab78a44008761cd913f059b44e90823d439f
+EBUILD db-4.6.21_p4-r1.ebuild 4396 BLAKE2B 9f4ea4e63bc4f00361ecabe2294c30bc2a1f0d944139ef109e624134a48fd6dc988d2a50f76ae3908ae50c87a2fafda962329968a75048342f0ca6ccd1f6a9c5 SHA512 3503bf925fd7c4a746a9ebb3c2c5c2ae0173aa468e1fecb45cea77d67d5149b83471a6057f889311071643d4c27499be5fd68abd1b8624c195773b0dbd43657d
+EBUILD db-4.7.25_p4-r1.ebuild 4722 BLAKE2B 481048e5bff155bd38ed9f332979ea85242af57a97b65b6eadb8d8d69dfd6ce9579727a11a8fc5f89f7f69200acdbaf947e3e98717a00f0dbe3471ba6b29ec39 SHA512 0998d13f3594daa5258ba2b5e5d07d0034574625f9dcd2abc74919d07e09bdbcbdbcb4b58db22b1fb7afaeaf1fd6d1f8392b9e601716773e8526548106b11093
+EBUILD db-4.8.30-r3.ebuild 5205 BLAKE2B ce19afaec900cc61fb9bb8f97ed115f22c9e3380f2ecc7843fce392329ed78b8327ea816a7496d47ed3f4c1f4017efa3b353d94f78ad64ef5a2a2e1e0f8bfdd4 SHA512 2e1854df2993d9228d423ab6569b51dfd689f447125902e1020445acb3be728d4af3368969718186dbdd34abd7791c5d2c5d09d339a77e844b5b538db06ab55a
+EBUILD db-5.1.29-r2.ebuild 5856 BLAKE2B 21b51a72428a7523df6c0688f0082d825016ed270684c0a066733304a9857a21bb933078b45b2263ce728b68e6c9c2ace1697d58111be77162ba62cade3ed2c9 SHA512 de70e02208eac3c925e0cdf1ca72d8eb338787643a3583e6ce63dccbca8d83710494cfa8e20f2b104f0c6bbd519ac15ec3280fa3f432627e0eaae8b3d7c272bf
+EBUILD db-5.3.28-r2.ebuild 7136 BLAKE2B 03d87bc6fdfac302fd281e05354d739fd5d1d5bf5a010274a7840ecb50305782668713fc60e7353190131be004adfd8364946d0f16ab0b9159435f678f04d6bf SHA512 7821923642541e718acce6a5b74826faceeedf5849e1bec47314252b132e851f4a46dc567f340be3a5631e4bca11f175f551bfbf6bdfdf129c4560d6a2829292
+EBUILD db-5.3.28-r4.ebuild 7142 BLAKE2B c8d9a8441051754c85174cca506c752f14c8d2b331d25231ae969181fcbefb63bbbbaf215ca348a8e0531e641351bf9b26eb0a61edd54641ab7fdf345c485d43 SHA512 ce16c3a580082df7a9aa1497b47a6fa3124df7fd100626f359824afa0d67b92adca05a0a6dadabbca54498c3408215af2e2832a0f76b25f1817bcc5d2915f513
+EBUILD db-6.0.35-r2.ebuild 7137 BLAKE2B 1dd77dd052e145d829449135c3c53498e112643737949ad7f2d575c135901df0c84c64e537f6a5f04237c32ea4f3e28bce70b71effad2eb1b231db859a5ddb0b SHA512 86088bfe60d3ab9b05e930a486352eb41ef57b51f8a76784c75c3b9cf38732484a576f1cc9fdab8f3240e445327b5a4185c58e58765ccd125710f85b81fcea8b
+EBUILD db-6.1.38.ebuild 6908 BLAKE2B 836b5c1b5cdc670e99fadcc7d1ce491f468d8ad82d93046323754ef41fd21ca9014a7e36fa46fcf4ea62625c26b2bbe781a8000ce68995ece393459a6c0a4e5d SHA512 c7e1d9c525bedc9062c29de090f06fca1c5d60b1eaa141ca3bcd6704060b27bc913da0b2acb76e74a995765422de9394a2abd1ce38ef8ef9f2fe1a991c91372d
+EBUILD db-6.2.38.ebuild 6911 BLAKE2B b55b1c0e66cbcf52d5ea236dde20d6b1f53dfa568027910e1efe8925a2c07b20f923f5307d67ddab0fd92f2961c7b5a4dbcee89b1bd3875fbb1b84955895e2ac SHA512 e7e1d4132b3af68ed43fa77ec5610c260290ed3620277484c8fd0f4c6b42900b2ac55673a90a840621251e08c1c83b3bd808e6a55469653b7ec73eb728b3ede0
 MISC metadata.xml 1323 BLAKE2B f954567067cc1490d6804dd9d7b612dd90733c7ab84546cbedc0075f8f3ef1faf6f1bb70bae31e83b0aa17666bd6711999b67ce4fe6c15bcffc3ba5bd8d004b7 SHA512 36f8b6db241ef960b2ac0f7bd19738066e3daadd90efbf7edc54a4774e491506d69a2207738f53643a3e52f1f35a900e4717747744bd30ca682265f50cb8884c
diff --git a/sys-libs/db/db-18.1.32.ebuild b/sys-libs/db/db-18.1.32.ebuild
index f1e091a2851e..b44531fc25ed 100644
--- a/sys-libs/db/db-18.1.32.ebuild
+++ b/sys-libs/db/db-18.1.32.ebuild
@@ -53,7 +53,7 @@ PATCHES=(
 
 	# use the includes from the prefix
 	"${FILESDIR}"/${PN}-6.2.32-jni-check-prefix-first.patch
-	"${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
+	"${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
 
 	# sqlite configure call has an extra leading ..
 	# upstreamed:5.2.36, missing in 5.3.x/6.x
diff --git a/sys-libs/db/db-3.2.9_p2-r1.ebuild b/sys-libs/db/db-3.2.9_p2-r1.ebuild
index 5385f48b6062..7a7212b3fb4d 100644
--- a/sys-libs/db/db-3.2.9_p2-r1.ebuild
+++ b/sys-libs/db/db-3.2.9_p2-r1.ebuild
@@ -30,6 +30,7 @@ SLOT="3"
 # in the tree.
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="doc"
+RESTRICT="!test? ( test )"
 
 DEPEND="${RDEPEND}
 	=sys-libs/db-1.85*"
@@ -140,7 +141,7 @@ src_compile() {
 
 src_install() {
 	pushd build-shared &>/dev/null || die
-	# build system does not support DESTDIR 
+	# build system does not support DESTDIR
 	emake \
 		libdb=libdb-3.2.a \
 		libcxx=libcxx_3.2.a \
diff --git a/sys-libs/db/db-4.2.52_p5-r2.ebuild b/sys-libs/db/db-4.2.52_p5-r2.ebuild
index 2db608127ccd..a612717f5682 100644
--- a/sys-libs/db/db-4.2.52_p5-r2.ebuild
+++ b/sys-libs/db/db-4.2.52_p5-r2.ebuild
@@ -29,6 +29,7 @@ LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="tcl java doc cxx rpc"
+RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
 	java? ( >=virtual/jdk-1.4 )"
diff --git a/sys-libs/db/db-4.3.29_p1-r2.ebuild b/sys-libs/db/db-4.3.29_p1-r2.ebuild
index a152f3a66fa3..0f5a92f4d33e 100644
--- a/sys-libs/db/db-4.3.29_p1-r2.ebuild
+++ b/sys-libs/db/db-4.3.29_p1-r2.ebuild
@@ -29,6 +29,7 @@ LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
 IUSE="tcl java doc cxx rpc"
+RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
 	java? ( >=virtual/jdk-1.4 )
@@ -40,8 +41,8 @@ PATCHES=(
 	"${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
 
 	# use the includes from the prefix
-	"${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch
-	"${FILESDIR}"/"${PN}"-"${SLOT}"-listen-to-java-options.patch
+	"${FILESDIR}"/"${PN}"-4.2-jni-check-prefix-first.patch
+	"${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch
 
 	"${FILESDIR}"/"${PN}"-4.3.27-fix-dep-link.patch
 )
@@ -67,7 +68,7 @@ src_prepare() {
 	# This supersedes the unused jarlocation patches.
 	sed -r \
 		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-		dist/Makefile.in || die
+		-i dist/Makefile.in || die
 
 	# START of 4.5+earlier specific
 	# Upstream sucks, they normally concat these
diff --git a/sys-libs/db/db-4.4.20_p4-r2.ebuild b/sys-libs/db/db-4.4.20_p4-r2.ebuild
index 64d3c53846b4..ba34f3c14a14 100644
--- a/sys-libs/db/db-4.4.20_p4-r2.ebuild
+++ b/sys-libs/db/db-4.4.20_p4-r2.ebuild
@@ -30,6 +30,7 @@ LICENSE="Sleepycat BSD"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="tcl java doc cxx rpc"
+RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
 	java? ( >=virtual/jdk-1.4 )
@@ -41,8 +42,8 @@ PATCHES=(
 	"${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
 
 	# use the includes from the prefix
-	"${FILESDIR}"/"${PN}"-4.3-jni-check-prefix-first.patch
-	"${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch
+	"${FILESDIR}"/"${PN}"-4.2-jni-check-prefix-first.patch
+	"${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch
 )
 
 # Required to avoid unpack attempt of patches
diff --git a/sys-libs/db/db-4.5.20_p2-r2.ebuild b/sys-libs/db/db-4.5.20_p2-r2.ebuild
index c44739cf0a90..b0224a1b6b35 100644
--- a/sys-libs/db/db-4.5.20_p2-r2.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r2.ebuild
@@ -29,6 +29,7 @@ LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="tcl java doc cxx rpc"
+RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
 	java? ( >=virtual/jdk-1.4 )
@@ -37,11 +38,11 @@ RDEPEND="tcl? ( dev-lang/tcl )
 	java? ( >=virtual/jre-1.4 )"
 
 PATCHES=(
-	"${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
+	"${FILESDIR}"/"${PN}"-4.4-libtool.patch
 
 	# use the includes from the prefix
-	"${FILESDIR}"/"${PN}"-4.3-jni-check-prefix-first.patch
-	"${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch
+	"${FILESDIR}"/"${PN}"-4.2-jni-check-prefix-first.patch
+	"${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch
 )
 
 # Required to avoid unpack attempt of patches
diff --git a/sys-libs/db/db-4.6.21_p4-r1.ebuild b/sys-libs/db/db-4.6.21_p4-r1.ebuild
index 00ab2118d149..ac6d71e9f2f7 100644
--- a/sys-libs/db/db-4.6.21_p4-r1.ebuild
+++ b/sys-libs/db/db-4.6.21_p4-r1.ebuild
@@ -29,6 +29,7 @@ LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="tcl java doc cxx rpc"
+RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
 	java? ( >=virtual/jdk-1.4 )
@@ -37,11 +38,11 @@ RDEPEND="tcl? ( dev-lang/tcl )
 	java? ( >=virtual/jre-1.4 )"
 
 PATCHES=(
-	"${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
+	"${FILESDIR}"/"${PN}"-4.4-libtool.patch
 
 	# use the includes from the prefix
 	"${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch
-	"${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch
+	"${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch
 )
 
 # Required to avoid unpack attempt of patches
diff --git a/sys-libs/db/db-4.7.25_p4-r1.ebuild b/sys-libs/db/db-4.7.25_p4-r1.ebuild
index 7309f2c92018..58f152d09e46 100644
--- a/sys-libs/db/db-4.7.25_p4-r1.ebuild
+++ b/sys-libs/db/db-4.7.25_p4-r1.ebuild
@@ -41,11 +41,11 @@ RDEPEND="tcl? ( dev-lang/tcl )
 	java? ( >=virtual/jre-1.5 )"
 
 PATCHES=(
-	"${FILESDIR}"/"${PN}"-4.6-libtool.patch
+	"${FILESDIR}"/"${PN}"-4.4-libtool.patch
 
 	# use the includes from the prefix
 	"${FILESDIR}"/"${PN}"-4.6-jni-check-prefix-first.patch
-	"${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch
+	"${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch
 )
 
 # Required to avoid unpack attempt of patches
diff --git a/sys-libs/db/db-4.8.30-r3.ebuild b/sys-libs/db/db-4.8.30-r3.ebuild
index 72e1ebf21a93..2ab7720ed8e0 100644
--- a/sys-libs/db/db-4.8.30-r3.ebuild
+++ b/sys-libs/db/db-4.8.30-r3.ebuild
@@ -49,7 +49,7 @@ PATCHES=(
 
 	# use the includes from the prefix
 	"${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
-	"${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
+	"${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
 )
 
 src_prepare() {
diff --git a/sys-libs/db/db-5.1.29-r2.ebuild b/sys-libs/db/db-5.1.29-r2.ebuild
index e756c205a3cf..fa1ad448f712 100644
--- a/sys-libs/db/db-5.1.29-r2.ebuild
+++ b/sys-libs/db/db-5.1.29-r2.ebuild
@@ -48,7 +48,7 @@ PATCHES=(
 
 	# use the includes from the prefix
 	"${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
-	"${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
+	"${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
 
 	# upstream autoconf fails to build DBM when it's supposed to
 	# merged upstream in 5.0.26
diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild
index ab3e1ac51059..65935b031707 100644
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r2.ebuild
@@ -58,7 +58,7 @@ src_prepare() {
 
 	# use the includes from the prefix
 	epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
-	epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
+	epatch "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
 
 	# sqlite configure call has an extra leading ..
 	# upstreamed:5.2.36, missing in 5.3.x
diff --git a/sys-libs/db/db-5.3.28-r4.ebuild b/sys-libs/db/db-5.3.28-r4.ebuild
index feb6b08177b5..d7e61dc35ab2 100644
--- a/sys-libs/db/db-5.3.28-r4.ebuild
+++ b/sys-libs/db/db-5.3.28-r4.ebuild
@@ -52,7 +52,7 @@ PATCHES=(
 
 	# use the includes from the prefix
 	"${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
-	"${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
+	"${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
 
 	# sqlite configure call has an extra leading ..
 	# upstreamed:5.2.36, missing in 5.3.x
@@ -88,7 +88,7 @@ src_prepare() {
 	# This supersedes the unused jarlocation patches.
 	sed -r \
 		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-		dist/Makefile.in || die
+		-i dist/Makefile.in || die
 
 	cd dist || die
 	rm aclocal/libtool.m4 || die
diff --git a/sys-libs/db/db-6.0.35-r2.ebuild b/sys-libs/db/db-6.0.35-r2.ebuild
index d64d2ecb9bf6..b10a1424460f 100644
--- a/sys-libs/db/db-6.0.35-r2.ebuild
+++ b/sys-libs/db/db-6.0.35-r2.ebuild
@@ -52,7 +52,7 @@ PATCHES=(
 
 	# use the includes from the prefix
 	"${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
-	"${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
+	"${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
 
 	# sqlite configure call has an extra leading ..
 	# upstreamed:5.2.36, missing in 5.3.x/6.x
diff --git a/sys-libs/db/db-6.1.38.ebuild b/sys-libs/db/db-6.1.38.ebuild
index e1ebf51e41f4..fa361fed9012 100644
--- a/sys-libs/db/db-6.1.38.ebuild
+++ b/sys-libs/db/db-6.1.38.ebuild
@@ -52,7 +52,7 @@ PATCHES=(
 
 	# use the includes from the prefix
 	"${FILESDIR}"/${PN}-6.2-jni-check-prefix-first.patch
-	"${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
+	"${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
 
 	# sqlite configure call has an extra leading ..
 	# upstreamed:5.2.36, missing in 5.3.x/6.x
diff --git a/sys-libs/db/db-6.2.38.ebuild b/sys-libs/db/db-6.2.38.ebuild
index 37e88ebf6652..574e8c6fda31 100644
--- a/sys-libs/db/db-6.2.38.ebuild
+++ b/sys-libs/db/db-6.2.38.ebuild
@@ -52,7 +52,7 @@ PATCHES=(
 
 	# use the includes from the prefix
 	"${FILESDIR}"/${PN}-6.2.32-jni-check-prefix-first.patch
-	"${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
+	"${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
 
 	# sqlite configure call has an extra leading ..
 	# upstreamed:5.2.36, missing in 5.3.x/6.x
diff --git a/sys-libs/db/files/db-4.3-jni-check-prefix-first.patch b/sys-libs/db/files/db-4.3-jni-check-prefix-first.patch
deleted file mode 100644
index 0777c706d0bf..000000000000
--- a/sys-libs/db/files/db-4.3-jni-check-prefix-first.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/dist/aclocal_java/ac_jni_include_dirs.ac
-+++ b/dist/aclocal_java/ac_jni_include_dirs.ac
-@@ -43,14 +43,19 @@
- *)	AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);;
- esac
- 
--_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC")
--_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'`
--case "$host_os" in
--	darwin*)	_JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
--			_JINC="$_JTOPDIR/Headers";;
--	*)		_JINC="$_JTOPDIR/include";;
--esac
--
-+# If JAVAPREFIX is defined, look there first
-+if test -r "$JAVAPREFIX/include/jni.h"; then
-+	_JTOPDIR="$JAVAPREFIX"
-+	_JINC="$JAVAPREFIX/include"
-+else
-+	_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC")
-+	_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'`
-+	case "$host_os" in
-+		darwin*)	_JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
-+				_JINC="$_JTOPDIR/Headers";;
-+		*)		_JINC="$_JTOPDIR/include";;
-+	esac
-+fi
- # If we find jni.h in /usr/include, then it's not a java-only tree, so
- # don't add /usr/include or subdirectories to the list of includes.
- # An extra -I/usr/include can foul things up with newer gcc's.
diff --git a/sys-libs/db/files/db-4.3-listen-to-java-options.patch b/sys-libs/db/files/db-4.3-listen-to-java-options.patch
deleted file mode 100644
index f1f701de1261..000000000000
--- a/sys-libs/db/files/db-4.3-listen-to-java-options.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/dist/configure.ac
-+++ b/dist/configure.ac
-@@ -385,6 +385,7 @@
-         # A classpath that includes . is needed to check for Java
- 	CLASSPATH=".:$CLASSPATH"
- 	export CLASSPATH
-+	AC_JAVA_OPTIONS
- 	AC_PROG_JAVAC
- 	AC_PROG_JAR
- 	AC_PROG_JAVA
diff --git a/sys-libs/db/files/db-4.5-libtool.patch b/sys-libs/db/files/db-4.5-libtool.patch
deleted file mode 100644
index b4d2fc8d73cf..000000000000
--- a/sys-libs/db/files/db-4.5-libtool.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/dist/configure
-+++ b/dist/configure
-@@ -5765,7 +5765,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # I'd rather use --version here, but apparently some GNU lds only accept -v.
--case `$LD -v 2>&1 </dev/null` in
-+case `"$LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-   ;;
-@@ -8753,7 +8753,7 @@
-   	whole_archive_flag_spec=
-     fi
-     supports_anon_versioning=no
--    case `$LD -v 2>/dev/null` in
-+    case `"$LD" -v 2>/dev/null` in
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -11855,7 +11855,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # I'd rather use --version here, but apparently some GNU lds only accept -v.
--case `$LD -v 2>&1 </dev/null` in
-+case `"$LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-   ;;
-@@ -15842,7 +15842,7 @@
-   	whole_archive_flag_spec_F77=
-     fi
-     supports_anon_versioning=no
--    case `$LD -v 2>/dev/null` in
-+    case `"$LD" -v 2>/dev/null` in
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -18300,7 +18300,7 @@
-   	whole_archive_flag_spec_GCJ=
-     fi
-     supports_anon_versioning=no
--    case `$LD -v 2>/dev/null` in
-+    case `"$LD" -v 2>/dev/null` in
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
diff --git a/sys-libs/db/files/db-4.6-libtool.patch b/sys-libs/db/files/db-4.6-libtool.patch
deleted file mode 100644
index b4d2fc8d73cf..000000000000
--- a/sys-libs/db/files/db-4.6-libtool.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/dist/configure
-+++ b/dist/configure
-@@ -5765,7 +5765,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # I'd rather use --version here, but apparently some GNU lds only accept -v.
--case `$LD -v 2>&1 </dev/null` in
-+case `"$LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-   ;;
-@@ -8753,7 +8753,7 @@
-   	whole_archive_flag_spec=
-     fi
-     supports_anon_versioning=no
--    case `$LD -v 2>/dev/null` in
-+    case `"$LD" -v 2>/dev/null` in
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -11855,7 +11855,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # I'd rather use --version here, but apparently some GNU lds only accept -v.
--case `$LD -v 2>&1 </dev/null` in
-+case `"$LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-   ;;
-@@ -15842,7 +15842,7 @@
-   	whole_archive_flag_spec_F77=
-     fi
-     supports_anon_versioning=no
--    case `$LD -v 2>/dev/null` in
-+    case `"$LD" -v 2>/dev/null` in
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -18300,7 +18300,7 @@
-   	whole_archive_flag_spec_GCJ=
-     fi
-     supports_anon_versioning=no
--    case `$LD -v 2>/dev/null` in
-+    case `"$LD" -v 2>/dev/null` in
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...