gentoo resync : 25.03.2022

22 files changed, 95 insertions, 414 deletions

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index c4be38f2320d..a19eac69f2aa 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,17 +1,14 @@
-AUX db-18.1.25-test-link.patch 1443 BLAKE2B 819038f07f0329575eecdb5891b16114507d9a530b434eabf748367baf86be979198dd7aeb904af14d9b3643e013e2ec34257bc254724351dc62dab30029b5b8 SHA512 e3cba1c842dffbbf1bbf353111ce41cf46078d03d9b42052ad72081e9b9434eeb3eedad42d532dba9f2c90b36a620f2a2f9a65fb98477e5b1fa6dfc04ba1ec0e
+AUX db-18.1.25-sqlite-configure-path.patch 782 BLAKE2B ecca297f94f161010c05aa018369430f2e1173ac7c2f76f4f15b3965f88547fb4403282890394dfe897b9c97da9b89dc0ee7865264463f29f2647f032c47cb88 SHA512 442a7a43c47664ce806d3026c17997a5cb8b087ac6538c170b17bd42fc81ed0ea0f38b32c8cb6728e18ef7fffa5331b2e53f5e2e0b425d3fff8c260a6aa57063
+AUX db-18.1.25-test-link.patch 1425 BLAKE2B a6a586008fde747c36734dfeff77178e1fd97c76ed87d8bbfeb7fab20327b4f224382269bd75255f80dbda3021e3d15fc93f144667ab6c0ec5bb491577f1ac51 SHA512 ccfe99fdae653d8380288ddbc47aacae52957ce8eb4970dd5cb877cb6bf97013f60244ef64ff086781e2abd3b2106f8a832bbfc190539f88fff2f05f678aa3b6
 AUX db-18.1.40-fix-docs.patch 613 BLAKE2B 5b3c5f8b35624eac5c14caedac9ffadecae26122a0024b2c42c75d9c10e8ac414b2195a29cece5a680ef30355d20c5bf5405dd7bb03647fbf2d603c5abc66417 SHA512 ddd0daa3de0efa363764abf1dade45914f6bdf44d883c2b0b3ea1c96c2cff0889b5078beea274113169c9b056135a09905e5083d6be3e3139e74f86ef61deb1f
-AUX db-4.2-listen-to-java-options.patch 244 BLAKE2B 221f39b4cc6e4d4ce91efb90a5b207e634f8d362fbb34d1fe9c57960323cce71507e49a4aca0a6187374a37fa77208547e56edea2695d7b1111d96345469cd1d SHA512 20103923b1da278ca5a682ba0a74183d9c8f68a4774af51d12884d7d405fe7ec27f82b0b49a01a6453b96798db995b1f0fef34f2aa40a3b66db48efddb94af49
-AUX db-4.6-jni-check-prefix-first.patch 1104 BLAKE2B 830f19c74df5730234496f8035c943ee13388154a60fca4701f7a72b4c2685550cd95892d9edc406ee29889af94df2ab5094abf35362da15b0669fbfe73b0165 SHA512 78791ada74d91e572e35d33f60d0174705916655c0e4db4844b73bc3e9dd71a65b916e153c087c0ede1d4a400588af7674b7e69804d8a2883e45992904b0b3f3
 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
-AUX db-5.1.29-rename-atomic-compare-exchange.patch 852 BLAKE2B 2c521fc843bb6764f076dde6ed640a9641b35698b9ad9fac06d2b820046a060264560f2219e516844ac3ad5fd045786f920aac8a2e8f62a01807e3f8caecda04 SHA512 8ba96cfc3e484a839b8651214f0769b35273c6235de7e53d5118eb0347f5a477f75e3336a12f1399b7748c6b6ab95aec39c8b813d7b227dd61f37ed4ab52f7d5
-AUX db-5.2.28-sqlite-configure-path.patch 906 BLAKE2B b3c41488954e113fcc7dc8788ee2b2b2e53629302e5a0f4bd32f092213bf9ef23120f56551d0d2f4be17ca9605969c555b604401f19054c3b4848e9c3bb94ba4 SHA512 ed0e683313f780975b3aec60018b08569ebdd38e4cdf60de170ef0bc4fc63d602e7a5572792f2634f3680e763b74ffdb0a5b484562a10a4b82b28b19c3acc565
-AUX db-6.0.20-test-link.patch 1568 BLAKE2B e61cac8c00aa5db4ef224b94f1214eff09beda3f088a8a56c6ca917e37a6f4bf0538b3cde7dba166419397975ce0c13d352298009c75a4d729bfb855dff926b5 SHA512 0e091949a071e76439cae4bb37cfdd6c4e4f586c15adbaa6d5d1c9cca5a4982f8e5960d968b41c4368d99556a95b172a6ef1331daf90fb87a77567fc7343f980
-AUX db-6.0.35-sqlite-configure-path.patch 764 BLAKE2B 9c0f9f4cce511d407b760572a31c83d7d49f0c98b104c519c30eb3cfa054e9b300c7f869b27392fe1063533aa0eba22d42016a0d5b5908cebca4cde70f426a8c SHA512 acb6aa901d62a5c5f4ae22e9d2e0bb89101038a3e91c2d65845cd514cdb0e38c3aa15645701024dc5ed39372850362a24b47faa96a0a81f8149958d8ebabdf17
-AUX db-6.1.19-sqlite-configure-path.patch 727 BLAKE2B 46b5f562042be34e134dbc8bf66f9a1a282992253ae1473960255765aab16df348c472772a20f7a29c49cb0478edff78eadc40e91dc5b96d622b5f69fa164b5c SHA512 6d15c1ec5726998001a6dfa6679bd6f55fe70dc16b1cc531709ba49ee962531e3b4e4bd91ac3a5ea0d1b0736632e66269638651e42a3bbf7697785cecb87aff7
-AUX db-6.2-jni-check-prefix-first.patch 1302 BLAKE2B 4703beff3c14e0218d4b8b3b911ee912cc80c2ed42730e7b11eb728c9ae16ee535baf628dff6c62bb3cf25d262b87896ab3ed5df5b2bd88968f1fce62b0b7095 SHA512 662fb5e1b292dd87b11db7cd071b280863d2cb7c5e1e8ec7149e6ecc5d0db0c40a0b3995503c27ff0dd0d3d5fb274a7f72736058edd2e5b52521048e11253a30
-AUX db-6.2.32-jni-check-prefix-first.patch 1575 BLAKE2B 5230393b8f40e6ef329590b0037a975dbc60f23f3ce8a603e3c21cec5b0bb311a225c1d8558cc3c6bfdb658e88c83f441c45aaf556051aee8ba83f9262616ba0 SHA512 eb0739c46f88ad9538e4a467e8547f97404747633942ec6b05eabcfb7ba427ff66c00aa5dc95cb9518056b861c240898db4745dd3626ed95e7cb01c54b47dccd
+AUX db-4.8.30-rename-atomic-compare-exchange.patch 761 BLAKE2B 01d01cb784049f7d598945d205b560c84c1dfcb0bfad733a31182122c9be30177051284f364b2846805b4d639de1e259554b9bc89c092d285a577276eb83eaed SHA512 8733ccf1b6c3072b7035f4cc976b151bb5331a4be6a23736baccf05268f869f594fc39b843b37cdd5b84e48f8af035f05d676be0b17c6031299f682f4793b4f6
+AUX db-5.1.29-rename-atomic-compare-exchange.patch 769 BLAKE2B a6110550327dbe154ad21a053f8ebcb2a37506228c34858337b1bf375b290a351cd75405f50f567b3b56da6a2871e1f166e6e3b972a92808f841fe6f64cfb159 SHA512 25121cb7aaa08d46fb206a1437bfb2e180c4c3f5866bb02550c49bc5084842b330f9e1c47df6fd2eda72003b9ab510199588ff05a0f2e115e91f3990805dcd8f
+AUX db-5.2.28-sqlite-configure-path.patch 733 BLAKE2B 7324ab06fdf2b7c05ad03d4a91d9c62af8e0fe07db9474f3874cb3e8d50fd90e08d85a743d84062ef2ce1895d999572b3d862e3f525e719274614e2c3cf802cf SHA512 18f5fa82c236e6961711b0a41d43d2cd7b4a4b72759df69ba265a49a55023f17b1356b8a5d1c1c539d69eaaaaf4f525adbd7173acb3a8ab7eae838dd10f54021
+AUX db-6.0.20-test-link.patch 1395 BLAKE2B 639f40b16fd225a57825387d75ac8bd961b11ffe653a8f2b9fa9526251713e48d8c877624e257f63c6d88a6c601e787ae44120477aa517c37c1e279298dfcaa8 SHA512 206bfe3fce4b4f8476c5d885fe8f004ce4437e42e33a6b8944de780c58bdbd8c0e7380e43113be5efeae86fcd50a12f8fca96ceb38539bb9624898a24395d408
+AUX db-6.0.35-sqlite-configure-path.patch 748 BLAKE2B 570c499549fddd62fa4d14a6eb7830dea3da6b60a05c9be6e5e5169dd9ee7b2e032b4ba9669d8de3985a2717101f7b709e1c26efb5a3200d1aa0d6511bed5d16 SHA512 fd8a4eed5d54f3364c5d3509a238db1f1d62b3f13b75ba1e58a20659c83d038904562d32cc4cdde41b324623459e50071b507979b3fedbc85f2231e6784f1227
+AUX db-6.1.19-sqlite-configure-path.patch 711 BLAKE2B d00fe596fe422f152889fe0285a5b00d2fd0724a9406f27ef904cc533c0197c6ad340946256cf0ccc388b7126c61bcdbc37921c84028e742201d952c1f2e1df6 SHA512 d79c2520c75d0f96049e0b7ffa168de5aaee9050927d8b1ffaa5a4a7fc64b75654906f182e7aa5e0a33d55402655b2d10981849f15cf6b4bec5c6feb080de1c5
+AUX db-6.2.38-bashism-configure.patch 425 BLAKE2B 68e67fd52ffc11cdc23b8e19954b34a320faad8f001bb4282464caf48a5911f58db1824cd8f2803968f3b4b31084999b8b04967cd917111b099ec2d43138dd44 SHA512 b6c5e44055d2d763ddef12f48a030693deb0addd9b72f63896a9c9bf61a4ad243b0c663b3f8d60a84b5dddaea6b7fbb76f0bc9de53065b030a3431a59facc8c3
 DIST db-18.1.32.tar.gz 44244747 BLAKE2B b539d8966a269f6a9440ef442248849f12c6b1eda79b9a41074e1eb0eb4930fd4674dd0e20a114e4020fe2ce19832572c4c86d458835da39a99f639dc3c4e23e SHA512 890b3047c28114ac30794c0234126b0b2a3e699f3ed259831091f02d51885e3583dd10c0ef0cecc215b9b8d80b48a2d3a82a5793cd3816afb45f6cc19ae23f25
 DIST db-18.1.40.tar.gz 30763705 BLAKE2B c7235cbdf82d8e38450c98baa1ff67132f6132d59a43dd2d6ed8bc2672b7924b4cbd93320278a0a3a78e454caff622b4480abe8dcc20c94ae56a78b3569a76fd SHA512 53787164fb8a198a0178c7f58d891c2b0943d1c52b11fe9de525938469327e85664f0bc63e33d740c171bc370954710a6b3e8b9be2a08237fb9757a795c5b19e
 DIST db-4.8.30.tar.gz 22887305 BLAKE2B 10487580a371fa97ef5e468e1fcc4af68490934a82467da88b723f7d4ce403cd5f2b77bd95c218dda58161fe30bfef81f5093a8e5176f5ad5f482251c07c6423 SHA512 d1a3c52b0ab54ae3fd6792e6396c9f74d25f36b2eb9e853b67ef9c872508a58c784c7818108d06d184f59601b70cc877916e67dfea6f0ee1ca2b07468c1041f1
@@ -19,11 +16,11 @@ DIST db-5.3.28.tar.gz 35090431 BLAKE2B 5b77a4ec0945fa96ce6c2b452fb4b029295e037fa
 DIST db-6.0.35.tar.gz 36532251 BLAKE2B 22fbe557ccc13e4b936db8ca7d6ba11ce42e477bbf39f7e472067e06fb5910b1147fa58a44ac944c24a51ea839f1c61edda6bd8f3c450acac0c13d7fdba11e89 SHA512 002db1553def44efa715095b04b2bac2de7450cdc7142586d1d8b5d8ce79ee5e98f824b3bd276cd586ca932dc51ed35a9ffbed95b2b9847264f262cfa092479d
 DIST db-6.1.38.tar.gz 37644337 BLAKE2B 32b3f65bef04bb18e45c3c0c9110d5d0bf58f4761bee5bf07949e192f4b9f5fa28117b1696c17863da0affe408bd6c81eeee32c472c46d31c17693519959ff03 SHA512 5760d1e441bea11c371825ac47203b1eb9f188f9cb2ea0e3d547b3d3b15620d27cb0b3333d617eb7b89c53407fb7ed79cad27477d714b5b797869f8bf4b1808b
 DIST db-6.2.38.tar.gz 41298311 BLAKE2B a04a3344058b1d9982f39628c1114aded8f8c860753853c8b487e9ea14bd69a0391301620396d22204b3c8f25945c3f5485ea4792567e2d903a657541204d297 SHA512 b357932e4a5856b9cf8cf42050a307977eee8483d24a32ad938611545178fb1e6be597c1542a11466b1fb31ef4ef47b519deea1c5310a6460495281539083a19
-EBUILD db-18.1.32-r1.ebuild 6912 BLAKE2B ac4bec54fedf37e5f093bc3d8ae60e020ac9252e2547a2ef080c19454edafc1a499046bbd8d805580a37f5ec23f8726b55fd8da7f3caab73286a186833f5e6c5 SHA512 24e3b227716ed725b434d3da0c7a6b174c4964d9b26be389087376c1d98614bde66c83b59dbaad9440b93d2749f4dcf8f05c10f12c0c6672edb34179284d0059
-EBUILD db-18.1.40-r1.ebuild 6844 BLAKE2B 91d803f6c72eeae01410ddbcadad18d5bffc321123f374d3599bbadb7d4c69ab2071f7134814c69f158815317640a779257b93706fd07d6ef1dd8939ff7ff296 SHA512 e006904a600c7907a621fd6af91b5d6c1b9c70cc55fb19df80d16629a2815fbbb5c3932d903f01e5a269addbdb5cc03915e20b21571cf8360ba1c58c5ad30bec
-EBUILD db-4.8.30-r6.ebuild 5234 BLAKE2B c8f8b141eb5d9c2d1ff25b9faf7df72878874395aa73e401c7ed8c229479fd52757c0111e7865a63a38fcf62950e5ce9212ea64e5be93417fdd0ab5e5ae812d8 SHA512 f56d829b4166ffe5d2fa44396ee2c05543b2cc8885e62e75f04b2503973feb7d7361e610ede6a1f0425d64233e777a12aadd5d61c769bcff1ecce96d5d477839
-EBUILD db-5.3.28-r8.ebuild 7158 BLAKE2B e13767e068447cf4ceb49d1497e4006469a5cb98cacaa08463ba29a84b19a6c594895068ff94e7b61e2c72b3765a7dbe844a9de5514b732e1726c5531dec7af2 SHA512 898cef2b4da5e145416d716e8c363ec7f32faa878662f64c9a50513713b916c8fe27ac96049814ceccae5efaeaffd440c95894092377e7621eb3a60869cda404
-EBUILD db-6.0.35-r4.ebuild 7171 BLAKE2B ff986f36576a53a417d2099fe384766bff9ac9325ffa919d3edf69e81460f4f3e9ed7d296f039d4e76fea1c62a72dd6f6623a1901620e3aaf4b808da74d6f0aa SHA512 ea324b57f6cf094ecd4d8e56ced05c78e6d97efb9cc6f645b35a15d9bb4bad980fea54bb2fd37e3248948d0e139c8f861ebec1a31e7695dd2a8c104e7d8cbc55
-EBUILD db-6.1.38-r1.ebuild 6961 BLAKE2B 7507744c38b054e4bfd929e576ae6f5a34dc1c5377407b76c5d7525f6ecfb4799cb2cd618c6eae9343f587110d27d954bd5d1385d8c71aea908e10081ccd1aef SHA512 d6aae878dc7707672c4b8e4af1827a001ae5fa0070959ead6552711d09d45c9d7f0e48eb87459a94e5944341fa8d97dd8541df5c475e039e479dc249512179b4
-EBUILD db-6.2.38-r1.ebuild 7174 BLAKE2B d66ce4b678328c88a8c97f899780177e3ba3a369f42ab50bde09d1097434cd9210639356797559cd88069f70d69d40e98a82c964c84b8ad6966ae5b18fb9ba2f SHA512 59bd01603384927a3a45846b9064a3a63522113ff3d9f9384d4b6eb7c1edbe272495104b4c45582e2e35aef295ea80f81a25e3346bac4a8264eef7d0a3f034ad
+EBUILD db-18.1.32-r1.ebuild 5960 BLAKE2B 0c5376bf33a91c69c3f0bfe3baf9b4f99770082ebbbf202ac436a9a1b9d8f9ce8e59f8e2670c0a524848717e98991cbb0e628098d060af99cead9fa5ef82a632 SHA512 3f5dca955df5d78f95baaeb2f64ae30e67f7ee30656e962ccd119f8a88d45905fecbdf5d29a2e72b5e63c41ef849db6961b22b86cc03aa132a0114fc00310d61
+EBUILD db-18.1.40-r1.ebuild 5877 BLAKE2B 225c7e6250140cc1c8c81f0b99a326e5b3ea0007b5b8804155b45e4b3c82fe09bb704590379098789ea43a657d0e72e79b1bd2e0c0dfd69c4615685010939d51 SHA512 6d9052607d2bf864d3ded422054b55a387c7cbc17f2575c879b7333be22b57507f186598f4107167a914dee7594c0a98d5e1628aba40a2c3269dc95ef0b73905
+EBUILD db-4.8.30-r6.ebuild 4304 BLAKE2B c9021ae73d814d5f78e0fa9066a27813729d7353fb62b5735dadf7394dbc586b67e4f4703132396f9b80906c70353cde6ae1113cab8ed5778894d6242024e648 SHA512 6509604b1624b47f5e3a51e2b37e5de002836d23a4ea4633b994a4f168c44804dd2283904783473391e160cae5462ed6c087da893d2e4e06440f7db6456246e9
+EBUILD db-5.3.28-r8.ebuild 6274 BLAKE2B 47e32b5796b11c9d794a0ac69d5983d89b17c88ea98b2e50b9678fd9ae1d0072a8c28dc126d3c787324d84f04fd7db9f3d6e1eebea32a29cf35b1f295f4e14e0 SHA512 8b200232eeeee74f7e3cd23f53b202a8da8f3e215ee3a21ee62f57729fcea533379b8515a48de3449442a3b75abd40c4a1bcbab197366e9e82af9de201671dd4
+EBUILD db-6.0.35-r4.ebuild 6221 BLAKE2B c5c9602d02034638fd45c9cf4723cd86ee0bec8d2291add78ebbfb13fe43278fb477dea4337514b41002e4ade5dd2f715cf391b8f5353e9145455766bea2d2f6 SHA512 9642cb3f3b64510ec3d8d8bf04f95299f4301a48641b67c4a219d5c770947df9d2be20adc82c919c1b8be546fb19e0de85a8336fb28f7b7c51825c81f88db4b5
+EBUILD db-6.1.38-r1.ebuild 6004 BLAKE2B fb9176d0eef059b4b9606d9287bebe69dafa3752c98fd03e536593b34159b500498758b77456771e28edf9409bbf917f10ca13365899c5245685ce2fe10e5a20 SHA512 7ccfff6e27f1e138a53abba02123f56e10a3da56ddc41c12a2715aa9fd6e8a47d8c8b2e05a6489e18ef69b063a1c9150378a93b398288f3c5fb89ed3c2c2449c
+EBUILD db-6.2.38-r1.ebuild 6267 BLAKE2B 883d7c81d6e2fc11a2c3d7dc6746935f1ea3a26aae9ab0bc833138234c238057a58caebc23b70e2dc2da05d0ea130bb670a4b33bf68aeb2bfd90bf86d9339b0f SHA512 b1411c814134c6ef9751425aaa79362cc03c0aa8d19a21fd4c5cc8085ec5a98bddc773442bdb69ee9f06544d013505f36b3c2d1301b37b20646f4126573c7aeb
 MISC metadata.xml 1261 BLAKE2B 81cfdd965f4e2e0342d812c6c1fd602c43ca8bbbb23bd12f230444d26bee578f9ba2af781a8390bb754b66b4699c6aada379dea90397798f8a489a7fd11b85fb SHA512 08d43450d54a8718639ae2637f13da7626415e99a8fa5948c5107b7a973161f31b3b0cf58dc538dd48a18db996f020d57d20edefbcdd8e37c6e58c206c3aab6e
diff --git a/sys-libs/db/db-18.1.32-r1.ebuild b/sys-libs/db/db-18.1.32-r1.ebuild
index 76b018c57445..463c37170918 100644
--- a/sys-libs/db/db-18.1.32-r1.ebuild
+++ b/sys-libs/db/db-18.1.32-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal eapi7-ver toolchain-funcs
+inherit db flag-o-matic autotools multilib multilib-minimal eapi7-ver toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -31,30 +31,21 @@ done
 LICENSE="AGPL-3"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="doc java cxx tcl test"
+IUSE="doc cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
 
 # the entire testsuite needs the TCL functionality
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.8 )
 	>=sys-devel/binutils-2.16.1"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.8 )"
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/db$(ver_cut 1-2)/db.h
 )
 
 PATCHES=(
-	# bug #510506
-	"${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
-	# use the includes from the prefix
-	"${FILESDIR}"/${PN}-6.2.32-jni-check-prefix-first.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
 	# still needs to be patched in 6.0.20
@@ -83,12 +74,6 @@ src_prepare() {
 		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
 		"${S_BASE}"/dist/RELEASE || die
 
-	# Include the SLOT for Java JAR files
-	# This supersedes the unused jarlocation patches.
-	sed -r -i \
-		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-		"${S_BASE}"/dist/Makefile.in || die
-
 	cd "${S_BASE}"/dist || die
 	rm -f aclocal/libtool.m4
 	sed -i \
@@ -97,7 +82,7 @@ src_prepare() {
 	sed -i \
 		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
 		aclocal/programs.m4 || die
-	AT_M4DIR="aclocal aclocal_java" eautoreconf
+	AT_M4DIR="aclocal" eautoreconf
 	# Upstream sucks - they do autoconf and THEN replace the version variables.
 	. ./RELEASE
 	for v in \
@@ -131,11 +116,11 @@ multilib_src_configure() {
 		--disable-sql
 		--disable-sql_codegen
 		--disable-sql_compat
+		--disable-java
 		$([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly)
 		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly)
 		$(use_enable cxx)
 		$(use_enable cxx stl)
-		$(multilib_native_use_enable java)
 		$(use_enable test)
 	)
 
@@ -152,14 +137,6 @@ multilib_src_configure() {
 	# mumbo jumbo.
 	append-ldflags -Wl,--default-symver
 
-	# use `set` here since the java opts will contain whitespace
-	if multilib_is_native_abi && use java ; then
-		myconf+=(
-			--with-java-prefix="${JAVA_HOME}"
-			--with-javac-flags="$(java-pkg_javac-args)"
-		)
-	fi
-
 	# Bug #270851: test needs TCL support
 	if use tcl || use test ; then
 		myeconfargs+=(
@@ -181,12 +158,6 @@ multilib_src_install() {
 	db_src_install_headerslot
 
 	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_regso "${ED%/}"/usr/"$(get_libdir)"/libdb_java*.so
-		java-pkg_dojar "${ED%/}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED%/}"/usr/"$(get_libdir)"/*.jar
-	fi
 }
 
 multilib_src_install_all() {
diff --git a/sys-libs/db/db-18.1.40-r1.ebuild b/sys-libs/db/db-18.1.40-r1.ebuild
index 407d361673f7..7809ee145998 100644
--- a/sys-libs/db/db-18.1.40-r1.ebuild
+++ b/sys-libs/db/db-18.1.40-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal eapi7-ver toolchain-funcs
+inherit db flag-o-matic autotools multilib multilib-minimal eapi7-ver toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -32,30 +32,21 @@ LICENSE="AGPL-3"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-IUSE="doc java cxx tcl test"
+IUSE="doc cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
 
 # the entire testsuite needs the TCL functionality
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.8 )
 	>=sys-devel/binutils-2.16.1"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.8 )"
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/db$(ver_cut 1-2)/db.h
 )
 
 PATCHES=(
-	# bug #510506
-	"${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
-	# use the includes from the prefix
-	"${FILESDIR}"/${PN}-6.2.32-jni-check-prefix-first.patch
-	"${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
-
 	# The upstream testsuite copies .lib and the binaries for each parallel test
 	# core, ~300MB each. This patch uses links instead, saves a lot of space.
 	"${FILESDIR}"/${PN}-18.1.25-test-link.patch
@@ -81,12 +72,6 @@ src_prepare() {
 		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
 		"${S_BASE}"/dist/RELEASE || die
 
-	# Include the SLOT for Java JAR files
-	# This supersedes the unused jarlocation patches.
-	sed -r -i \
-		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-		"${S_BASE}"/dist/Makefile.in || die
-
 	cd "${S_BASE}"/dist || die
 	rm -f aclocal/libtool.m4
 	sed -i \
@@ -95,8 +80,8 @@ src_prepare() {
 	sed -i \
 		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
 		aclocal/programs.m4 || die
-	AT_M4DIR="aclocal aclocal_java" eautoreconf
-	# Upstream sucks - they do autoconf and THEN replace the version variables.
+	AT_M4DIR="aclocal" eautoreconf
+	# They do autoconf and THEN replace the version variables :(
 	. ./RELEASE
 	for v in \
 		DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
@@ -129,11 +114,11 @@ multilib_src_configure() {
 		--disable-sql
 		--disable-sql_codegen
 		--disable-sql_compat
+		--disable-java
 		$([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly)
 		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly)
 		$(use_enable cxx)
 		$(use_enable cxx stl)
-		$(multilib_native_use_enable java)
 		$(use_enable test)
 	)
 
@@ -150,14 +135,6 @@ multilib_src_configure() {
 	# mumbo jumbo.
 	append-ldflags -Wl,--default-symver
 
-	# use `set` here since the java opts will contain whitespace
-	if multilib_is_native_abi && use java ; then
-		myconf+=(
-			--with-java-prefix="${JAVA_HOME}"
-			--with-javac-flags="$(java-pkg_javac-args)"
-		)
-	fi
-
 	# Bug #270851: test needs TCL support
 	if use tcl || use test ; then
 		myeconfargs+=(
@@ -179,12 +156,6 @@ multilib_src_install() {
 	db_src_install_headerslot
 
 	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_regso "${ED%/}"/usr/"$(get_libdir)"/libdb_java*.so
-		java-pkg_dojar "${ED%/}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED%/}"/usr/"$(get_libdir)"/*.jar
-	fi
 }
 
 multilib_src_install_all() {
diff --git a/sys-libs/db/db-4.8.30-r6.ebuild b/sys-libs/db/db-4.8.30-r6.ebuild
index 3bc178287279..ca3d63339448 100644
--- a/sys-libs/db/db-4.8.30-r6.ebuild
+++ b/sys-libs/db/db-4.8.30-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools db flag-o-matic java-pkg-opt-2 multilib multilib-minimal toolchain-funcs
+inherit autotools db flag-o-matic multilib multilib-minimal toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -30,25 +30,18 @@ done
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="doc java cxx tcl test"
+IUSE="doc cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
 
 # the entire testsuite needs the TCL functionality
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.8 )"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.8 )"
+	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.8-libtool.patch
-	"${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
 	"${FILESDIR}"/${PN}-4.8.30-rename-atomic-compare-exchange.patch
-
-	# use the includes from the prefix
-	"${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
-	"${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
 )
 
 src_prepare() {
@@ -63,12 +56,6 @@ src_prepare() {
 	sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i dist/RELEASE \
 		|| die
 
-	# Include the SLOT for Java JAR files
-	# This supersedes the unused jarlocation patches.
-	sed -r \
-		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-		-i dist/Makefile.in || die
-
 	cd dist || die
 	rm aclocal/libtool.m4 || die
 	sed \
@@ -78,9 +65,9 @@ src_prepare() {
 		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
 		-i aclocal/programs.m4 || die
 
-	AT_M4DIR="aclocal aclocal_java" eautoreconf
+	AT_M4DIR="aclocal" eautoreconf
 
-	# Upstream sucks - they do autoconf and THEN replace the version variables.
+	# They do autoconf and THEN replace the version variables :(
 	. ./RELEASE
 	sed \
 		-e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
@@ -98,10 +85,10 @@ multilib_src_configure() {
 		--enable-o_direct
 		--without-uniquename
 		--disable-static
+		--disable-java
 		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly)
 		$(use_enable cxx)
 		$(use_enable cxx stl)
-		$(multilib_native_use_enable java)
 		$(use_enable test)
 	)
 
@@ -118,14 +105,6 @@ multilib_src_configure() {
 	# mumbo jumbo.
 	append-ldflags -Wl,--default-symver
 
-	# use `set` here since the java opts will contain whitespace
-	if multilib_is_native_abi && use java ; then
-		myconf+=(
-			--with-java-prefix="${JAVA_HOME}"
-			--with-javac-flags="$(java-pkg_javac-args)"
-		)
-	fi
-
 	# Bug #270851: test needs TCL support
 	if use tcl || use test ; then
 		myconf+=(
@@ -161,12 +140,6 @@ multilib_src_install() {
 	db_src_install_headerslot
 
 	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
-		java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
-	fi
 }
 
 multilib_src_install_all() {
diff --git a/sys-libs/db/db-5.3.28-r8.ebuild b/sys-libs/db/db-5.3.28-r8.ebuild
index 91d4a786cf4c..c7f5d0f6d288 100644
--- a/sys-libs/db/db-5.3.28-r8.ebuild
+++ b/sys-libs/db/db-5.3.28-r8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools db flag-o-matic java-pkg-opt-2 multilib multilib-minimal toolchain-funcs
+inherit autotools db flag-o-matic multilib multilib-minimal toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -30,29 +30,20 @@ done
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="doc java cxx tcl test"
+IUSE="doc cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
 
 # the entire testsuite needs the TCL functionality
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.7 )"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.7 )"
+	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/db${SLOT}/db.h
 )
 
 PATCHES=(
-	# bug #510506
-	"${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
-	# use the includes from the prefix
-	"${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.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
 	"${FILESDIR}"/${PN}-5.2.28-sqlite-configure-path.patch
@@ -83,12 +74,6 @@ src_prepare() {
 		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
 		-i dist/RELEASE || die
 
-	# Include the SLOT for Java JAR files
-	# This supersedes the unused jarlocation patches.
-	sed -r \
-		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-		-i dist/Makefile.in || die
-
 	cd dist || die
 	rm aclocal/libtool.m4 || die
 	sed \
@@ -98,9 +83,9 @@ src_prepare() {
 		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
 		-i aclocal/programs.m4 || die
 
-	AT_M4DIR="aclocal aclocal_java" eautoreconf
+	AT_M4DIR="aclocal" eautoreconf
 
-	# Upstream sucks - they do autoconf and THEN replace the version variables.
+	# They do autoconf and THEN replace the version variables :(
 	. ./RELEASE
 	local v ev
 	for v in \
@@ -133,10 +118,10 @@ multilib_src_configure() {
 		--disable-sql_codegen
 		--disable-sql_compat
 		--disable-static
+		--disable-java
 		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly)
 		$(use_enable cxx)
 		$(use_enable cxx stl)
-		$(multilib_native_use_enable java)
 		$(use_enable test)
 	)
 
@@ -153,13 +138,6 @@ multilib_src_configure() {
 	# mumbo jumbo.
 	append-ldflags -Wl,--default-symver
 
-	if multilib_is_native_abi && use java ; then
-		myconf+=(
-			--with-java-prefix="${JAVA_HOME}"
-			--with-javac-flags="$(java-pkg_javac-args)"
-		)
-	fi
-
 	# Bug #270851: test needs TCL support
 	if use tcl || use test ; then
 		myconf+=(
@@ -189,12 +167,6 @@ multilib_src_install() {
 	db_src_install_headerslot
 
 	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
-		java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
-	fi
 }
 
 multilib_src_install_all() {
diff --git a/sys-libs/db/db-6.0.35-r4.ebuild b/sys-libs/db/db-6.0.35-r4.ebuild
index 261cbcd2b8c0..cf95493690ea 100644
--- a/sys-libs/db/db-6.0.35-r4.ebuild
+++ b/sys-libs/db/db-6.0.35-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools db flag-o-matic java-pkg-opt-2 multilib multilib-minimal toolchain-funcs
+inherit autotools db flag-o-matic multilib multilib-minimal toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -30,29 +30,20 @@ done
 LICENSE="AGPL-3"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc java cxx tcl test"
+IUSE="doc cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
 
 # the entire testsuite needs the TCL functionality
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.7:* )"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.7:* )"
+	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/db${SLOT}/db.h
 )
 
 PATCHES=(
-	# bug #510506
-	"${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
-	# use the includes from the prefix
-	"${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.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
 	# still needs to be patched in 6.0.20
@@ -81,12 +72,6 @@ src_prepare() {
 		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
 		-i dist/RELEASE || die
 
-	# Include the SLOT for Java JAR files
-	# This supersedes the unused jarlocation patches.
-	sed -r \
-		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-		-i dist/Makefile.in || die
-
 	cd dist || die
 	rm aclocal/libtool.m4 || die
 	sed \
@@ -96,9 +81,9 @@ src_prepare() {
 		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
 		-i aclocal/programs.m4 || die
 
-	AT_M4DIR="aclocal aclocal_java" eautoreconf
+	AT_M4DIR="aclocal" eautoreconf
 
-	# Upstream sucks - they do autoconf and THEN replace the version variables.
+	# They do autoconf and THEN replace the version variables :(
 	. ./RELEASE
 	local v ev
 	for v in \
@@ -127,10 +112,10 @@ multilib_src_configure() {
 		--disable-sql_codegen
 		--disable-sql_compat
 		--disable-static
+		--disable-java
 		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly)
 		$(use_enable cxx)
 		$(use_enable cxx stl)
-		$(multilib_native_use_enable java)
 		$(use_enable test)
 	)
 
@@ -147,14 +132,6 @@ multilib_src_configure() {
 	# mumbo jumbo.
 	append-ldflags -Wl,--default-symver
 
-	# use `set` here since the java opts will contain whitespace
-	if multilib_is_native_abi && use java ; then
-		myconf+=(
-			--with-java-prefix="${JAVA_HOME}"
-			--with-javac-flags="$(java-pkg_javac-args)"
-		)
-	fi
-
 	# Bug #270851: test needs TCL support
 	if use tcl || use test ; then
 		myconf+=(
@@ -188,12 +165,6 @@ multilib_src_install() {
 	db_src_install_headerslot
 
 	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
-		java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
-	fi
 }
 
 multilib_src_install_all() {
diff --git a/sys-libs/db/db-6.1.38-r1.ebuild b/sys-libs/db/db-6.1.38-r1.ebuild
index 74fb45257401..278f210fd913 100644
--- a/sys-libs/db/db-6.1.38-r1.ebuild
+++ b/sys-libs/db/db-6.1.38-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal eapi7-ver toolchain-funcs
+inherit db flag-o-matic autotools multilib multilib-minimal eapi7-ver versionator toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -30,30 +30,21 @@ done
 LICENSE="AGPL-3"
 SLOT="$(get_version_component_range 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc java cxx tcl test"
+IUSE="doc cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
 
 # the entire testsuite needs the TCL functionality
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.8 )
 	>=sys-devel/binutils-2.16.1"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.8 )"
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/db$(ver_cut 1-2)/db.h
 )
 
 PATCHES=(
-	# bug #510506
-	"${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
-	# use the includes from the prefix
-	"${FILESDIR}"/${PN}-6.2-jni-check-prefix-first.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
 	# still needs to be patched in 6.0.20
@@ -82,12 +73,6 @@ src_prepare() {
 		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
 		"${S_BASE}"/dist/RELEASE || die
 
-	# Include the SLOT for Java JAR files
-	# This supersedes the unused jarlocation patches.
-	sed -r -i \
-		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-		"${S_BASE}"/dist/Makefile.in || die
-
 	cd "${S_BASE}"/dist || die
 	rm -f aclocal/libtool.m4
 	sed -i \
@@ -96,8 +81,8 @@ src_prepare() {
 	sed -i \
 		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
 		aclocal/programs.m4 || die
-	AT_M4DIR="aclocal aclocal_java" eautoreconf
-	# Upstream sucks - they do autoconf and THEN replace the version variables.
+	AT_M4DIR="aclocal" eautoreconf
+	# They do autoconf and THEN replace the version variables :(
 	. ./RELEASE
 	for v in \
 		DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
@@ -129,11 +114,11 @@ multilib_src_configure() {
 		--disable-sql_codegen
 		--disable-sql_compat
 		--disable-static
+		--disable-java
 		$([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly)
 		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly)
 		$(use_enable cxx)
 		$(use_enable cxx stl)
-		$(multilib_native_use_enable java)
 		$(use_enable test)
 	)
 
@@ -150,14 +135,6 @@ multilib_src_configure() {
 	# mumbo jumbo.
 	append-ldflags -Wl,--default-symver
 
-	# use `set` here since the java opts will contain whitespace
-	if multilib_is_native_abi && use java ; then
-		myeconfargs+=(
-			--with-java-prefix="${JAVA_HOME}"
-			--with-javac-flags="$(java-pkg_javac-args)"
-		)
-	fi
-
 	# Bug #270851: test needs TCL support
 	if use tcl || use test ; then
 		myeconfargs+=(
@@ -179,12 +156,6 @@ multilib_src_install() {
 	db_src_install_headerslot
 
 	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_regso "${ED%/}"/usr/"$(get_libdir)"/libdb_java*.so
-		java-pkg_dojar "${ED%/}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED%/}"/usr/"$(get_libdir)"/*.jar
-	fi
 }
 
 multilib_src_install_all() {
diff --git a/sys-libs/db/db-6.2.38-r1.ebuild b/sys-libs/db/db-6.2.38-r1.ebuild
index 786041b37bd1..de6a736bdf14 100644
--- a/sys-libs/db/db-6.2.38-r1.ebuild
+++ b/sys-libs/db/db-6.2.38-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal eapi7-ver toolchain-funcs
+inherit db flag-o-matic autotools multilib multilib-minimal versionator eapi7-ver toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -30,31 +30,22 @@ done
 LICENSE="AGPL-3"
 SLOT="$(get_version_component_range 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc java cxx tcl test"
+IUSE="doc cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
 
 # the entire testsuite needs the TCL functionality
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.8 )
 	kernel_linux? ( >=sys-devel/binutils-2.16.1 )
 	kernel_SunOS? ( >=sys-devel/binutils-2.16.1 )"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.8 )"
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/db$(ver_cut 1-2)/db.h
 )
 
 PATCHES=(
-	# bug #510506
-	"${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
-	# use the includes from the prefix
-	"${FILESDIR}"/${PN}-6.2.32-jni-check-prefix-first.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
 	# still needs to be patched in 6.0.20
@@ -63,6 +54,8 @@ PATCHES=(
 	# The upstream testsuite copies .lib and the binaries for each parallel test
 	# core, ~300MB each. This patch uses links instead, saves a lot of space.
 	"${FILESDIR}"/${PN}-6.0.20-test-link.patch
+
+	"${FILESDIR}"/${PN}-6.2.38-bashism-configure.patch
 )
 
 src_prepare() {
@@ -83,12 +76,6 @@ src_prepare() {
 		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
 		"${S_BASE}"/dist/RELEASE || die
 
-	# Include the SLOT for Java JAR files
-	# This supersedes the unused jarlocation patches.
-	sed -r -i \
-		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-		"${S_BASE}"/dist/Makefile.in || die
-
 	cd "${S_BASE}"/dist || die
 	rm -f aclocal/libtool.m4
 	sed -i \
@@ -97,8 +84,8 @@ src_prepare() {
 	sed -i \
 		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
 		aclocal/programs.m4 || die
-	AT_M4DIR="aclocal aclocal_java" eautoreconf
-	# Upstream sucks - they do autoconf and THEN replace the version variables.
+	AT_M4DIR="aclocal" eautoreconf
+	# They do autoconf and THEN replace the version variables :(
 	. ./RELEASE
 	for v in \
 		DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
@@ -130,11 +117,11 @@ multilib_src_configure() {
 		--disable-sql_codegen
 		--disable-sql_compat
 		--disable-static
+		--disable-java
 		$([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly)
 		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly)
 		$(use_enable cxx)
 		$(use_enable cxx stl)
-		$(multilib_native_use_enable java)
 		$(use_enable test)
 	)
 
@@ -153,14 +140,6 @@ multilib_src_configure() {
 		append-ldflags -Wl,--default-symver
 	fi
 
-	# use `set` here since the java opts will contain whitespace
-	if multilib_is_native_abi && use java ; then
-		myeconfargs+=(
-			--with-java-prefix="${JAVA_HOME}"
-			--with-javac-flags="$(java-pkg_javac-args)"
-		)
-	fi
-
 	# Bug #270851: test needs TCL support
 	if use tcl || use test ; then
 		myeconfargs+=(
@@ -182,12 +161,6 @@ multilib_src_install() {
 	db_src_install_headerslot
 
 	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_regso "${ED%/}"/usr/"$(get_libdir)"/libdb_java*.so
-		java-pkg_dojar "${ED%/}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED%/}"/usr/"$(get_libdir)"/*.jar
-	fi
 }
 
 multilib_src_install_all() {
diff --git a/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch b/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch
new file mode 100644
index 000000000000..83fe2d66765e
--- /dev/null
+++ b/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch
@@ -0,0 +1,11 @@
+--- a/dist/aclocal/sql.m4
++++ b/dist/aclocal/sql.m4
+@@ -99,7 +99,7 @@
+ if test "$db_cv_debug" = "yes"; then
+   CPPFLAGS="$CPPFLAGS -g"
+ fi
+-(cd sql && eval "\$SHELL ../$sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline --enable-editline=$with_editline" && cat build_config.h >> config.h) || exit 1
++(cd sql && eval "\$SHELL $sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline --enable-editline=$with_editline" && cat build_config.h >> config.h) || exit 1
+ 
+ # Configure JDBC if --enable-jdbc
+ if test "$db_cv_jdbc" != "no"; then
diff --git a/sys-libs/db/files/db-18.1.25-test-link.patch b/sys-libs/db/files/db-18.1.25-test-link.patch
index dc3d8ae93c5a..5fb6d5fae7e9 100644
--- a/sys-libs/db/files/db-18.1.25-test-link.patch
+++ b/sys-libs/db/files/db-18.1.25-test-link.patch
@@ -1,5 +1,5 @@
---- db-18.1.25/test/tcl/parallel.tcl
-+++ db-18.1.25/test/tcl/parallel.tcl
+--- a/test/tcl/parallel.tcl
++++ b/test/tcl/parallel.tcl
 @@ -296,17 +296,26 @@
  			    [eval glob -nocomplain {$dir/$buildpath/db_{reptest,repsite,replicate}$EXE}] \
  			    $destdir/$buildpath}
diff --git a/sys-libs/db/files/db-4.2-listen-to-java-options.patch b/sys-libs/db/files/db-4.2-listen-to-java-options.patch
deleted file mode 100644
index f1f701de1261..000000000000
--- a/sys-libs/db/files/db-4.2-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.6-jni-check-prefix-first.patch b/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch
deleted file mode 100644
index a0b2800d1286..000000000000
--- a/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/dist/aclocal_java/ac_jni_include_dirs.m4
-+++ b/dist/aclocal_java/ac_jni_include_dirs.m4
-@@ -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.8.24-java-manifest-location.patch b/sys-libs/db/files/db-4.8.24-java-manifest-location.patch
deleted file mode 100644
index 9cebadc52064..000000000000
--- a/sys-libs/db/files/db-4.8.24-java-manifest-location.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar db-4.8.24.orig/dist/Makefile.in db-4.8.24/dist/Makefile.in
---- db-4.8.24.orig/dist/Makefile.in	2009-09-19 23:39:45.286001896 +0000
-+++ db-4.8.24/dist/Makefile.in	2009-09-19 23:41:13.079326882 +0000
-@@ -830,7 +830,7 @@
- 	$(JAVA) -classpath $(JAVA_CLASSTOP) \
- 	    com.sleepycat.persist.model.ClassEnhancer $(JAVA_CLASSTOP)
- 	cd $(JAVA_CLASSTOP) && \
--	     $(JAR) cfm ../$(libj_jarfile) ../$(JAVA_MANIFEST) ./com/sleepycat
-+	     $(JAR) cfm ../$(libj_jarfile) $(JAVA_MANIFEST) ./com/sleepycat
- 
- $(libj_exjarfile): $(libj_jarfile) $(JAVA_EXSRCS)
- 	@test -d $(JAVA_EXCLASSTOP) || \
diff --git a/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch b/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch
index c53160a82970..99a26e15fbfb 100644
--- a/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch
+++ b/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch
@@ -1,5 +1,3 @@
-diff --git a/dbinc/atomic.h b/dbinc/atomic.h
-index 0034dcc..fa7ba93 100644
 --- a/dbinc/atomic.h
 +++ b/dbinc/atomic.h
 @@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
diff --git a/sys-libs/db/files/db-5.1.29-rename-atomic-compare-exchange.patch b/sys-libs/db/files/db-5.1.29-rename-atomic-compare-exchange.patch
index ad3da2786c88..252a6213b30f 100644
--- a/sys-libs/db/files/db-5.1.29-rename-atomic-compare-exchange.patch
+++ b/sys-libs/db/files/db-5.1.29-rename-atomic-compare-exchange.patch
@@ -1,5 +1,3 @@
-diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h
-index 0034dcc..fa7ba93 100644
 --- a/src/dbinc/atomic.h
 +++ b/src/dbinc/atomic.h
 @@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
diff --git a/sys-libs/db/files/db-5.2.28-sqlite-configure-path.patch b/sys-libs/db/files/db-5.2.28-sqlite-configure-path.patch
index ff7abbe1fd79..cfbe2a7ffd01 100644
--- a/sys-libs/db/files/db-5.2.28-sqlite-configure-path.patch
+++ b/sys-libs/db/files/db-5.2.28-sqlite-configure-path.patch
@@ -1,6 +1,5 @@
-diff -Nuar db-5.2.28.orig//dist/aclocal/sql.m4 db-5.2.28//dist/aclocal/sql.m4
---- db-5.2.28.orig//dist/aclocal/sql.m4	2011-06-10 09:50:45.000000000 -0700
-+++ db-5.2.28//dist/aclocal/sql.m4	2011-07-15 17:02:54.646521189 -0700
+--- a/dist/aclocal/sql.m4
++++ b/dist/aclocal/sql.m4
 @@ -91,7 +91,7 @@
  # !!! END COPIED from autoconf distribution
  
diff --git a/sys-libs/db/files/db-6.0.20-test-link.patch b/sys-libs/db/files/db-6.0.20-test-link.patch
index 8aceaa4d6f8c..5fc6669465c6 100644
--- a/sys-libs/db/files/db-6.0.20-test-link.patch
+++ b/sys-libs/db/files/db-6.0.20-test-link.patch
@@ -1,6 +1,5 @@
-diff -Nuar db-6.0.20.orig/test/tcl/parallel.tcl db-6.0.20/test/tcl/parallel.tcl
---- db-6.0.20.orig/test/tcl/parallel.tcl	2013-07-04 15:49:43.408348040 +0000
-+++ db-6.0.20/test/tcl/parallel.tcl	2013-07-04 17:40:07.147943377 +0000
+--- a/test/tcl/parallel.tcl
++++ b/test/tcl/parallel.tcl
 @@ -289,16 +289,26 @@
  			    [eval glob -nocomplain {$dir/$buildpath/db_{reptest,repsite,replicate}$EXE}] \
  			    $destdir/$buildpath}
diff --git a/sys-libs/db/files/db-6.0.35-sqlite-configure-path.patch b/sys-libs/db/files/db-6.0.35-sqlite-configure-path.patch
index c239bb118a82..66bdcf9fe130 100644
--- a/sys-libs/db/files/db-6.0.35-sqlite-configure-path.patch
+++ b/sys-libs/db/files/db-6.0.35-sqlite-configure-path.patch
@@ -1,5 +1,5 @@
---- db-6.0.35/dist/aclocal/sql.m4
-+++ db-6.0.35/dist/aclocal/sql.m4
+--- a/dist/aclocal/sql.m4
++++ b/dist/aclocal/sql.m4
 @@ -96,7 +96,7 @@
  if test "$db_cv_build_cryptography" = "yes"; then
  	CPPFLAGS="$CPPFLAGS -DSQLITE_HAS_CODEC=1"
diff --git a/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch b/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch
index 25854c53e160..103e3302bdc9 100644
--- a/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch
+++ b/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch
@@ -1,5 +1,5 @@
---- db-6.1.19/dist/aclocal/sql.m4
-+++ db-6.1.19/dist/aclocal/sql.m4
+--- a/dist/aclocal/sql.m4
++++ b/dist/aclocal/sql.m4
 @@ -96,6 +96,6 @@
  if test "$db_cv_build_cryptography" = "yes"; then
  	CPPFLAGS="$CPPFLAGS -DSQLITE_HAS_CODEC=1"
diff --git a/sys-libs/db/files/db-6.2-jni-check-prefix-first.patch b/sys-libs/db/files/db-6.2-jni-check-prefix-first.patch
deleted file mode 100644
index 963b01380c23..000000000000
--- a/sys-libs/db/files/db-6.2-jni-check-prefix-first.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- db-6.2.23/dist/aclocal_java/ac_jni_include_dirs.m4
-+++ db-6.2.23/dist/aclocal_java/ac_jni_include_dirs.m4
-@@ -43,18 +43,23 @@
- *)	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:/[[^/]]*$::'`
--			if test -d "$_JTOPDIR/include"; then
--				_JINC="$_JTOPDIR/include"
--			else
--				_JINC="$_JTOPDIR/Headers"
--			fi;;
--	*)		_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:/[[^/]]*$::'`
-+				if test -d "$_JTOPDIR/include"; then
-+					_JINC="$_JTOPDIR/include"
-+				else
-+					_JINC="$_JTOPDIR/Headers"
-+				fi;;
-+		*)		_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-6.2.32-jni-check-prefix-first.patch b/sys-libs/db/files/db-6.2.32-jni-check-prefix-first.patch
deleted file mode 100644
index 0a320d7f9336..000000000000
--- a/sys-libs/db/files/db-6.2.32-jni-check-prefix-first.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- db-6.2.32/dist/aclocal_java/ac_jni_include_dirs.m4
-+++ db-6.2.32/dist/aclocal_java/ac_jni_include_dirs.m4
-@@ -43,21 +43,26 @@
- *)	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:/[[^/]]*$::'`
--			if test -d "$_JTOPDIR/include"; then
--				_JINC="$_JTOPDIR/include"
--			else
--				_JINC="`$_JTOPDIR/Commands/java_home`/include"
--			fi;;
--	*)		if test ! -r "$_JTOPDIR/include/jni.h"; then
--				_JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
--			fi
--			_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:/[[^/]]*$::'`
-+				if test -d "$_JTOPDIR/include"; then
-+					_JINC="$_JTOPDIR/include"
-+				else
-+					_JINC="`$_JTOPDIR/Commands/java_home`/include"
-+				fi;;
-+		*)		if test ! -r "$_JTOPDIR/include/jni.h"; then
-+					_JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
-+				fi
-+				_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-6.2.38-bashism-configure.patch b/sys-libs/db/files/db-6.2.38-bashism-configure.patch
new file mode 100644
index 000000000000..bea1f3d3bde0
--- /dev/null
+++ b/sys-libs/db/files/db-6.2.38-bashism-configure.patch
@@ -0,0 +1,11 @@
+--- a/dist/aclocal/types.m4
++++ b/dist/aclocal/types.m4
+@@ -188,7 +188,7 @@ AC_SUBST(db_off_t_decl)
+ AC_CHECK_TYPE(db_off_t,,
+     [AM_SEARCH_SSIZES(db_off_t_decl, db_off_t, $ac_cv_sizeof_off_t)])
+ AC_SUBST(db_off_t_max_decl)
+-if test "$ac_cv_sizeof_off_t" == "4"; then
++if test "$ac_cv_sizeof_off_t" = "4"; then
+ 	db_off_t_max_decl="#define DB_OFF_T_MAX INT32_MAX"
+ else
+ 	db_off_t_max_decl="#define DB_OFF_T_MAX INT64_MAX"