Cleanup ebuilds, some EAPI5 porting.

Package-Manager: portage-2.2.10/cvs/Linux x86_64

6 files changed, 256 insertions, 514 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index f28d494e9fe8..a2684aebb786 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.353 2014/07/28 13:49:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.354 2014/08/03 22:03:03 robbat2 Exp $
+
+*db-6.0.30-r1 (03 Aug 2014)
+*db-4.8.30-r2 (03 Aug 2014)
+
+  03 Aug 2014; Robin H. Johnson <robbat2@gentoo.org> +db-4.8.30-r2.ebuild,
+  +db-6.0.30-r1.ebuild, -db-5.3.21.ebuild, -db-5.3.28.ebuild,
+  -db-6.0.20-r1.ebuild:
+  Cleanup ebuilds, some EAPI5 porting.
 
   28 Jul 2014; Agostino Sarubbo <ago@gentoo.org> db-4.8.30-r1.ebuild:
   Stable for ppc, wrt bug #512012
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 4f1290c96bd5..b0041bca2076 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX db-1.85-gentoo-paths.patch 684 SHA256 049052c74c544ac1c1f3b1b91c3e43df76b135c610148212679dfd324470cf2f SHA512 d7e2075a1683c7a04337830730e429c4bf2b5f0bdb49cdc3b625bda83be7cf579f4039204a355f5854c2981b6bd3234767e02bc6a7914e2bcde2a73d698fb914 WHIRLPOOL 272d1acc842c83f9b189deaaf9c38cabc67a0428a21f6b0ff6647899ffb6db7fb4944d18e76884f816baa02ec842d393f5b8c341ef41b820c74adf02d6e86d3a
 AUX db-3.2.9-fix-dep-link.patch 1005 SHA256 57e6f13170db99ba7f2f43aa0c7606085d25094127c63a48b76333c1289f6382 SHA512 42f8a6e495266209d7c9bf35bfba801abddffb10488b7b156a790bacdf8fe2d3d3113d8d0a1afddeca238736f64cf8a881141d181fd4a211e4b04da9ed010587 WHIRLPOOL d01855996c76b18793a6cb68ddfab8f3e9a439a13267c41299be13a294469f56d3842a418600475861181b97e90472e800696745068ffb3f47ccbccd74578513
 AUX db-3.2.9-gcc43.patch 441 SHA256 102ac694f32719deabbefdcfbecd96a255b8a6cdc312095fb537cf99ca6b9d77 SHA512 17d44ae357337d938bbe296b519efc03b914792ce4440936c1178b09dbb21783034e16f4fb2ff03443b00e8af530afc0fce778a937b06f0ba8c598b02cbc989c WHIRLPOOL 89f49f22f7c89d8989b002dc1f9469216666d2e79aaf724f4849b30a05eb108e1c1e4a286b60e2331e6fad7139b74c28eb6eaa93fe16358bf7d29928907c990e
@@ -45,9 +42,7 @@ DIST db-4.8.30.tar.gz 22887305 SHA256 e0491a07cdb21fb9aa82773bbbedaeb7639cbd0e7f
 DIST db-5.0.32.tar.gz 29325258 SHA256 6d7bc4a927fbb40750f4e047252b3861d640fa74778b3bf1841c2913f053648e SHA512 70a75a278b1dfcaaa53a15788441107382fe34719a741149f8a71dbd69de3ba04bec362fe78a6f6fd434383c5e8a50d81f80266bb244e6e3b0f4e70c2b8f0ea8 WHIRLPOOL 916cef3b0f203226e0c5a9a1b82eed980dbf52359bbc7e957bcb0c7799f0a89a21525154c24df9958535c23574d8809a8fbccb7cb0804dc404d5b2efb1b6a966
 DIST db-5.1.29.tar.gz 32188074 SHA256 a943cb4920e62df71de1069ddca486d408f6d7a09ddbbb5637afe7a229389182 SHA512 b3487161cc09dd0aee6117d685d0bc0a58854cf5e96f9e778969a51d3a61b66f8e007b76e584e4ef73f84e07d4418b89c2f6697e34c1ad4072609b11b7b4c5b0 WHIRLPOOL c2c5e335a8ed85f9dd947eb8225148c9633d21f5e17d321a6938b50d4bf061e735563cdbefb8c8aa457923ef80e778f95ad80aba4a92a381432ecf52c2a25353
 DIST db-5.2.42.tar.gz 34659298 SHA256 5626f51b3f904c0e00b5ce5ea7904d941b46cfc904557545edd4190e7316a1a5 SHA512 8f9e6e38d9aa0a5fb3f9733cd60b37f012ba43a6f0e632af09f1bd3afa552c3d68b1e2a44393eace2bf8692eba855611affc45401e1bee36bab541fd0869c811 WHIRLPOOL df14903e4dfe7a50cb264d54c12aa6ba7116e9f8d565387a816467fd35763640ac6d3b7ad4ee809430b46c834fc9877293f7e64462f2226d8182f7d37949cc91
-DIST db-5.3.21.tar.gz 35062469 SHA256 ddd92a930317df92021054c03992392db9ea5cddba43bef8920d392a82114fb8 SHA512 e09a08002b723a056b7a53dea275794a9df104296e7733ec1d7023888f23466095b38614f3ab1acbbb095d10cca70cc14c35c3519a41800eadd6863beb85e3a9 WHIRLPOOL 325aa202825d596fe1e0491c13f3b8da62ab2a4074969b7d09396b96d24dd8f4164a790b7ef2030768479e83cdfd57f15cc163a5ce4791fb4039900385381f60
 DIST db-5.3.28.tar.gz 35090431 SHA256 e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628 SHA512 e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090 WHIRLPOOL ad9042c4509ece1cae42ade4734f69d59a9ec946a85bd486063a7e8f9fa1ae3f925b71f0475fef05a27d33f695ef82ffd06fbaadbd7dc5bfaa77a8caacf9d1dc
-DIST db-6.0.20.tar.gz 36571533 SHA256 806a8a443854e339f07a62d5e010baf48203bce0bbb49e32f245184c9f522203 SHA512 b512d24f0b39b20096897ed81e8bca87c104ce81754d7360dacc11fe68cb16a5d6c18a9b9cda2aa0b56d9e4cfbeda9e62ca1285ea523edffe3d6442b2cad4e58 WHIRLPOOL e62ff517d04e4080457d5e01a565a865b53e1a5ab9b974087c1c1b8c0a11a979bbcda864ba9e2b2a281e8922d6ea93df12bd01d654bbd0b5b9f2bfd8d66fd899
 DIST db-6.0.30.tar.gz 36584356 SHA256 608e4b1cf390e9bf54c0ef00c5bd9ca76d36e2261b9f4d33d54516f3f6a20fd2 SHA512 ea249c59dba18cad391f523840028ba8ef962c32f2c7470942d52f9c07f18ba9fdf964dcd545cb7f2d6c66b91924a0ba1478af1d8f81f0dcbbf94c97ac515cf9 WHIRLPOOL 6784730d250dd480bacf78e966c6acb2fb3ca2c3989668e9440a0a60376b009850b2b48fc35f47e3964b175e78501d18b1c3e3b265831165083fe2dd04a46eb3
 DIST db.1.85.tar.gz 270953 SHA256 4220d4ddeb77fb57ba2f37c1aa105d561d3ef85a6fb89c79c3edd735d0e193c6 SHA512 03bf3a2b0947efdca4e38719542e96378b5eeb57da64d5030dd23ab710773c1826f1c867032d0bea658b7fdd8272db253e97bbc490d198b9437025ffdf9e880e WHIRLPOOL 802346b9fc133f6c9316e987352e8bd8e12792b30b0eae9b4e2b3629c9bc8385ab12244dead428bb824945aab383cd4801de3fc705667797bdf6159066ed1352
 DIST patch.3.2.9.1 2139 SHA256 6d89a42ee0be9e47b3e8a42981c65266a556de84bc6281edcf0f977f52547798 SHA512 f410c43ea4af28a39d8ea47f774d38b53bf1183a34abfcf1f27e253eb61b42f4b5e9f0a3a500e174eb796ea342e6dd50a8bb95ff3eb8ee188461489cc994b8f9 WHIRLPOOL 3a879d5306403739465550ade1fbf53ac62b832fbdf507a204fef13949bc7be9c35ddd972834d3ca74bf17c421791011200556dffd95265eb64849f1d7b647ec
@@ -81,32 +76,14 @@ EBUILD db-4.5.20_p2-r1.ebuild 5099 SHA256 be4380149b54e98e5656c93ac5c41e895fbb8a
 EBUILD db-4.6.21_p4.ebuild 4825 SHA256 1f1a8ff9fb54421252df74603f5d3b3739ecb33fab4f254fe9a3d1ef62bfaec0 SHA512 baa46c38441fc982f287a582713a72179e2481158571e6a6790c3a4636874bd3e22566a58e4ad0f64c96b4a07d7ebaacdd6ae26fa8199976e3165359c194ed33 WHIRLPOOL c4dbed87d59372aaeb636241cd2cee445f5df7347dbb47129efa9027e254567320d64f47bff1fc10eb4818040d06500c59d0718856e059b8a9549083ae3f87da
 EBUILD db-4.7.25_p4.ebuild 4360 SHA256 c1326c862fcaacc626e239b155b78d3f2c3fda3403b372301c7efe1021b21a49 SHA512 92944741cc786bf27c22d4dba1cb7273978181d448794afcb7b98123b949fbf8cbc08be972df83c49083af10f7d651f156ed30fc6fb1eb4a72d33c0635bd6d4a WHIRLPOOL 68cf35de0017c9797521b7c24d5636ace309b839511918280ff72d3cb0f5cfd2176848eb40dba8c737451b5c9895ab6ff14de07bd007413d8f4aff4bc5e25658
 EBUILD db-4.8.30-r1.ebuild 5142 SHA256 0386ca8103fff47c35951f81cef4f739288f288e356238fcbe96f38ac5437588 SHA512 a8a57b5d8f33775764447e4c5138a2eb55638f60d6ae92baf8eda8050ee588b0c6666ef6c99648b0ed3580158e06e49df87dd17cd50913926a7a4fa556de8218 WHIRLPOOL a29d022ce37e973e7d9542f2b5fc7d57b8d6016b129cbfc1246511ea59ee6aff62be4fd93c926d719628eb62210572904b49b513825904244e49f551b72f7d5f
+EBUILD db-4.8.30-r2.ebuild 5136 SHA256 45d9378d7136112ff48027175bf90dda64872712309838c18b743872157680ee SHA512 67c1cee0a5586a4f7ada1b97c4efb5b7e296fdde0469ad4ef45b0d0e3dd92297df00dda753175eff4916625e2c11daded1bae9624d7ea095ff140689bab41d33 WHIRLPOOL 29dd48c0cec77b0e175aef90d25208d5f2f64bf2ed4d3d665280b0a7dbe948440ce3bf6c4dd98b433e4e8d99511f625609b384ed91ed00dc56491408df1abc6b
 EBUILD db-4.8.30.ebuild 4562 SHA256 fe7409e1b17ccc13af1fe941f5f685d05ac310d66ad8a24b116d9957ac145f5f SHA512 2613a9cc3e04411d7a6faacdf62657d832ca505821af9d061eb6767a1169cc733f609928b335696d385837e676bee75f92e405fb7461ba4ac244b81d5c03d5dd WHIRLPOOL 02bcb8f47dce6a1a567465b93fd7ab8e197796832b1f87ae2dab18fd4f8ecb78006495bd475d96b9dfe0cb1f56e8ee3d5198112e96c756d9932791f5f53456aa
 EBUILD db-5.0.32.ebuild 5461 SHA256 573d8e3e998b7a58109f67418696e1ccf07fa52960450fbc48088105c56cdaed SHA512 69504d48fdc0912ea841ec38e7e67a53a24e1ccd61a48dd375ec4a74e636ec31b343f23ddaa34a59808f873ba4a41bb13a7083b42fbcf22fd3d6f498a35545be WHIRLPOOL ca3c08685eeb4946556a0d2b9dd32e992694dbe02fbbc718f445bbef23de719db20f3c8539939c01182e671e6c6b543cffe49621bb5634c3171a9c91cec3ce08
 EBUILD db-5.1.29.ebuild 5393 SHA256 c6ac68ea12fccd4fe97892af30f25909418d605b1e98e92ff062714bc69a4b12 SHA512 f02dcf3434ca388a97bf59fb5e925503b1d4f332f63941c8d098eaaf8c8c3efda3dbe73852074de0f54329b949e73548fdbefa831f60a16167e2a5c4ac3a22ce WHIRLPOOL 89609f988335d512116ce103baf5ae24adcbb5b707ffd28e1a4c4975eaa7497202e20fd40a455c564f9fc6d0ee2914314dea7be3ca60ed74cead5d94f65fe773
 EBUILD db-5.2.42.ebuild 6267 SHA256 8ac23b6377328fe41e39bce0dd4f41d7bb66ebf20f1fd8dd2fec173f53da268a SHA512 0461767e88f6a4edeba2ca4cbf3fb89beefd56d3c0406db0e01defa7dba0de4ac6bdb92f999a62638eacac7f2eeab06c7c3a7b154a2563b79aec806debbf416e WHIRLPOOL 564c1466b0e490632675b70d06e9e89c7cf2ff3142d929a5d706058fe0baeadb69fb6d60e93c7eee244e5743f4b44514c7a8954c3f081fe21706ac2637b06905
-EBUILD db-5.3.21.ebuild 6370 SHA256 950203d6e79f202d235cab8c7891744661b07896d1f332efbba9e3d1537baa0f SHA512 962d158be517b67965bd325e1df369ec909f02ba45f84027288328edf0c01e7a0da456e6d5fd496b9afd1db892d8dc54cd242715868c6efbaf055e3f241f0995 WHIRLPOOL 645ead7ee99d2fb2e3447d197bcbaa66cea37d510d22a18e99bbf717276e3b8c89d74da53fd6a55deea1bca825ba308b03d9ca13dfc4bb2f6df2016c587ccc8e
 EBUILD db-5.3.28-r1.ebuild 6086 SHA256 0fcc323de3ca62f743580b114d88e8dcd3c59d5d72088f05da954a1c749a5300 SHA512 73925fbe9f43754f12c205030d23570338458146c3c74be33f1374e3f1545193f19e77f2bc49cd5064d0b531b75fbe0c9023b99b7242491c008e1f8ce215dadf WHIRLPOOL 18364228c4babe42239ac904cac48a103589416e429c3c85cbde1dbdbaef9a150fa540245d1a379336339c5a6a29270012e3a2cab829fe9784ae11616f6244af
 EBUILD db-5.3.28-r2.ebuild 6590 SHA256 4ab811618daaa0112aafea7cfc4473fc7b47d73a9262b5e2bd7a0eeb314b99f8 SHA512 c8751d1bba9cd54ae57acf415b9e546887d5967a3a53fad044b4bd90f3dd6d9e071aee3109a2e20ec3cfc451e1dd18c9e32ef48c976cb8a6bdcf31feb72125c6 WHIRLPOOL 893f0e8dca47e06f4a39de2c403cc14271fb9cbc092469c887f34fee2797217b6638e9cb3ffcd90d62315557275804ed0d51adf657df499ab3e85e9f9cf5e892
-EBUILD db-5.3.28.ebuild 6096 SHA256 92f492a8e5ad5fbe826085272430ee1bb9db9bbaccb54a773d2ee1fb8bc5dd0a SHA512 a099e478cbc1a4b330f095f96cfd7c6f7a21d20ae0221ff8f5d9c89e61cc59360fd91e477b337b5a8376d29e926a9e1f03e5f68a9cdaaa9de01f75238b69c8b1 WHIRLPOOL b7e1d3f9023f1340791e13f442543a70230515fe05d88bf8576f78150d42fe74c0c5da56663f77a4f0c00c0f23e9a424ebedd665540a2a440dddeed3d97ce65e
-EBUILD db-6.0.20-r1.ebuild 6139 SHA256 a16b8902a2acff82aa113fb0569d321da964b8f8685154ad08b9fcfa31107065 SHA512 19a1bc98c1d1e71e2baf90f6e8b8581851dd625acffd16aa5280cedbcfb368d79e5983e2ad341d6ac1f6b04922960feea84f5d52855d4baf7cfb26c056340ed4 WHIRLPOOL 598096a934cd7acf62295533a10d53a91c906b5729d86cd7aab62841a38bc1a582135a7dd0e6a6e86f7e1f4bb7c83a430745f451ed5e365d183b8c7b349565a9
+EBUILD db-6.0.30-r1.ebuild 6705 SHA256 d355f9e7910b3f1cde7f5fde08bb4f4fd76a486f5ff09677648a066ac634c60f SHA512 8213f23a60f4c32d9809441acfd7450f828d44f69ddbbc467fe1b714ff01a32a116368d59a0187c01fc7f6fa761afa333067c46e3f7b981171a4b6e2e6d91cce WHIRLPOOL c330e3bb2ab0be8be3e2f5a661ba8e1511a4eed5cfc35b4bce9692cdeb6cf1e1052b405c7f5c53ee44d371eb2e69750e20f70a6ccd850c308df0e8ab01592fdd
 EBUILD db-6.0.30.ebuild 6714 SHA256 29bf09b815b4ebff90a9c8cff2b2f5342a567f147f02f24f759535620e18ca00 SHA512 eb3dae0caf8affbbbb33f72c605e464ce40780602b9ac8409f1cefe3e785f210a7d5ea910a6905709e6a564675cf8c7dc1a8e9f544c4d6283e2e55bb0f7a0df9 WHIRLPOOL 056531e5e6dd67880778ab5e009a4aaaac6f417274441192fea4e2a71c8357ef8581fd7abbaa826ae322ae42eaade7f4b7c0cd3b1d8295886fd5567e71e2ead3
-MISC ChangeLog 57262 SHA256 0b0ef541caa138d4c22e9a35281027bb6b4d0f4d225f623e0e63b8f20f5499c2 SHA512 d2bdc65dacc5458b3bcdeee8e467516c6ed73ad41aad665a25268a57984c072316b3524b39fd94e0fa7cb7b74c65b9aa2ee6e45c38443125c0263df26f9e1c15 WHIRLPOOL 4494b7ca437aef9092d9567337eed5e491c0904682e402d8a1afa389d728f495877468ffd146774f70f3c90791a9932490e18ab49a2bfe16c8938599dcec23e8
+MISC ChangeLog 57524 SHA256 0e949d6f362aacc65615b717f153a433c3a9eabed1b675d07417a57b8e46154d SHA512 37e294169c007436570403f78aeb3ea54d0451fd2116502652400ecba9b0ec89f4bb60e90902b06ae3eefc1a45b8b6e36cf80d39ab6edf10181bdc11bdde74fb WHIRLPOOL c84c891eb1092fd82c64e5ac0f0ab8fc8ce46d902507857080248c79d93fc73c3b2f26c1292697fa4ed7c73a8aa0c84ae229e6c1cc54c6a56fcb0ac623198dad
 MISC metadata.xml 1231 SHA256 0aac93eb29b4674d00b215122f39eb1ec03248e105cab670bc1921cbcca1e927 SHA512 6d25e610cc6cdcba13f8ffaab19406ca9dd7b5eda0585a6666058408ef1eb23a062428483532f4d1461888039e49a97aad4afc6dceb96baa70b880f7c4cf59b9 WHIRLPOOL 1d6531dd2346d7bc02dd016688a58c1c454a9262c3bad846147a6bce51f3ab0aba11165782162a5fda678a1fae3bafcab0d57eb882d5450814ce4fa7b813de54
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJT1lTpAAoJELp701BxlEWfvTQP/jU4KHL7I/yldt0eX7ACU0uZ
-Kb2ebTHGGE4qWjWKnzCQN0AVhr9YgjPFFT6B0z/ArC+R41yIyUkTUh86718Q1OSH
-/Bw23PoG8cso4XQMJmovo5vn3CWTTl3eD4aXl/3VGk/iZEDtwN/0oti5izSlWIds
-IFkDRrM347xkU6QwYrD1HOJZTGW7Ux19oAGWyEmEwR02xwAiy7quJDwq01Q7hElL
-J2OznO2XbPadwsQ1pwo2j5sAg4u0yMyDqOOf0u0ZndSBioJPyN+9tamiBZF/6S7b
-o/4MlUCuv9bnSo8evuHPaH4h+4k0RmCIk+DhikN6PlLdJ2IWZzD183PuzgxyGlBR
-pDhD2L1Laba6Dt8TafN2fqisa8lS4ui8eiaoB0kqXtAPXLcbRyAdqk49TZS6wcLx
-bGXF7Q+4GRrAOHG8w1Zunbni+vF0t+LGqz/UjgcoomNLiHePUXlcIGnuHZZZmHSj
-IcocpJtSliIxjEh3lt+K/s71kPGlwi2vAYvge2tepwUnq0kmaHr7CR7gH+3IVX7B
-beieiySi5OuTnO61pFHYmow0IvHncUBR2VT9djTUVVPIG4BukR+uNohYKhAnIO1b
-UG1B152qN7weFZC7y9wMxEZ0zFpYW4lTXXXxN3s/X1Iyg/2gi5tfWMePqCLsByE2
-uhCHc5b6tpXkm3mgpGDs
-=klyb
------END PGP SIGNATURE-----
diff --git a/sys-libs/db/db-4.8.30-r2.ebuild b/sys-libs/db/db-4.8.30-r2.ebuild
new file mode 100644
index 000000000000..7bd0abec8fe9
--- /dev/null
+++ b/sys-libs/db/db-4.8.30-r2.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.8.30-r2.ebuild,v 1.1 2014/08/03 22:03:03 robbat2 Exp $
+
+EAPI=5
+
+inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal
+
+#Number of official patches
+#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+PATCHNO=${PV/*.*.*_p}
+if [[ ${PATCHNO} == "${PV}" ]] ; then
+	MY_PV=${PV}
+	MY_P=${P}
+	PATCHNO=0
+else
+	MY_PV=${PV/_p${PATCHNO}}
+	MY_P=${PN}-${MY_PV}
+fi
+
+S="${WORKDIR}/${MY_P}/build_unix"
+DESCRIPTION="Oracle Berkeley DB"
+HOMEPAGE="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
+SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
+for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
+	export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
+done
+
+LICENSE="Sleepycat"
+SLOT="4.8"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="doc java cxx tcl test"
+
+REQUIRED_USE="test? ( tcl )"
+
+# the entire testsuite needs the TCL functionality
+DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1[${MULTILIB_USEDEP}] )
+	test? ( >=dev-lang/tcl-8.5.15-r1[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jdk-1.5 )
+	>=sys-devel/binutils-2.16.1"
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jre-1.5 )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r2
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+src_prepare() {
+	cd "${WORKDIR}"/"${MY_P}" || die
+	for (( i=1 ; i<=${PATCHNO} ; i++ ))
+	do
+		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
+	done
+	epatch "${FILESDIR}"/${PN}-4.8-libtool.patch
+	epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
+	epatch "${FILESDIR}"/${PN}-4.8.30-rename-atomic-compare-exchange.patch
+
+	# 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
+
+	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 -i \
+		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
+		"${S}"/../dist/Makefile.in || die
+
+	cd "${S}"/../dist || die
+	rm -f aclocal/libtool.m4
+	sed -i \
+		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
+		configure.ac || die
+	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.
+	. ./RELEASE
+	sed -i \
+		-e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
+		-e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \
+		-e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \
+		-e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \
+		-e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \
+		-e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure || die
+}
+
+src_configure() {
+	# Add linker versions to the symbols. Easier to do, and safer than header file
+	# mumbo jumbo.
+	if use userland_GNU ; then
+		append-ldflags -Wl,--default-symver
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	# compilation with -O0 fails on amd64, see bug #171231
+	if [[ ${ABI} == amd64 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		replace-flags -O0 -O2
+		is-flagq -O[s123] || append-flags -O2
+	fi
+
+	# 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+=(
+			--enable-tcl
+			--with-tcl=/usr/$(get_libdir)
+		)
+	else
+		myconf+=(--disable-tcl )
+	fi
+
+	ECONF_SOURCE="${S}"/../dist \
+	STRIP="true" \
+	econf \
+		--enable-compat185 \
+		--enable-o_direct \
+		--without-uniquename \
+		$([[ ${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) \
+		"${myconf[@]}" \
+		$(use_enable test)
+}
+
+multilib_src_test() {
+	multilib_is_native_abi || return
+
+	S=${BUILD_DIR} db_src_test
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	db_src_install_headerslot
+
+	db_src_install_usrlibcleanup
+
+	if multilib_is_native_abi && use java; then
+		java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
+		java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
+		rm -f "${D}"/usr/"$(get_libdir)"/*.jar
+	fi
+}
+
+multilib_src_install_all() {
+	db_src_install_usrbinslot
+
+	db_src_install_doc
+
+	dodir /usr/sbin
+	# This file is not always built, and no longer exists as of db-4.8
+	if [[ -f "${D}"/usr/bin/berkeley_db_svc ]] ; then
+		mv "${D}"/usr/bin/berkeley_db_svc \
+			"${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
+	fi
+}
+
+pkg_postinst() {
+	multilib_foreach_abi db_fix_so
+}
+
+pkg_postrm() {
+	multilib_foreach_abi db_fix_so
+}
diff --git a/sys-libs/db/db-5.3.21.ebuild b/sys-libs/db/db-5.3.21.ebuild
deleted file mode 100644
index 3479705e28fd..000000000000
--- a/sys-libs/db/db-5.3.21.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.3.21.ebuild,v 1.5 2014/05/20 13:19:07 polynomial-c Exp $
-
-EAPI=2
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
-
-#Number of official patches
-#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
-PATCHNO=${PV/*.*.*_p}
-if [[ ${PATCHNO} == "${PV}" ]] ; then
-	MY_PV=${PV}
-	MY_P=${P}
-	PATCHNO=0
-else
-	MY_PV=${PV/_p${PATCHNO}}
-	MY_P=${PN}-${MY_PV}
-fi
-
-S_BASE="${WORKDIR}/${MY_P}"
-S="${S_BASE}/build_unix"
-DESCRIPTION="Oracle Berkeley DB"
-HOMEPAGE="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
-SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
-for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
-	export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
-done
-
-LICENSE="Sleepycat"
-SLOT="5.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="doc java cxx tcl test"
-
-# the entire testsuite needs the TCL functionality
-DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-	test? ( >=dev-lang/tcl-8.4 )
-	java? ( >=virtual/jdk-1.5 )
-	>=sys-devel/binutils-2.16.1"
-RDEPEND="tcl? ( dev-lang/tcl )
-	java? ( >=virtual/jre-1.5 )"
-
-src_unpack() {
-	unpack "${MY_P}".tar.gz
-}
-
-src_prepare() {
-	cd "${WORKDIR}"/"${MY_P}"
-	for (( i=1 ; i<=${PATCHNO} ; i++ ))
-	do
-		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
-	done
-	#epatch "${FILESDIR}"/${PN}-4.8-libtool.patch
-	# upstreamed:5.2.36
-	#epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
-	# bug #510506
-	epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
-	# 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
-
-	# upstream autoconf fails to build DBM when it's supposed to
-	# merged upstream in 5.0.26
-	#epatch "${FILESDIR}"/${PN}-5.0.21-enable-dbm-autoconf.patch
-
-	# sqlite configure call has an extra leading ..
-	# upstreamed:5.2.36, missing in 5.3.x
-	epatch "${FILESDIR}"/${PN}-5.2.28-sqlite-configure-path.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.
-	epatch "${FILESDIR}"/${PN}-6.0.20-test-link.patch
-
-	# Upstream release script grabs the dates when the script was run, so lets
-	# end-run them to keep the date the same.
-	export REAL_DB_RELEASE_DATE="$(awk \
-		'/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \
-		"${S_BASE}"/dist/configure)"
-	sed -r -i \
-		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
-		"${S_BASE}"/dist/RELEASE
-
-	# 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
-
-	cd "${S_BASE}"/dist
-	rm -f aclocal/libtool.m4
-	sed -i \
-		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-		configure.ac
-	sed -i \
-		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
-		aclocal/programs.m4
-	AT_M4DIR="aclocal aclocal_java" eautoreconf
-	# Upstream sucks - they do autoconf and THEN replace the version variables.
-	. ./RELEASE
-	for v in \
-		DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
-		DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \
-		DB_VERSION \
-		DB_RELEASE_DATE ; do
-		local ev="__EDIT_${v}__"
-		sed -i -e "s/${ev}/${!v}/g" configure
-	done
-}
-
-src_configure() {
-	local myconf=''
-
-	# compilation with -O0 fails on amd64, see bug #171231
-	if use amd64; then
-		replace-flags -O0 -O2
-		is-flagq -O[s123] || append-flags -O2
-	fi
-
-	# use `set` here since the java opts will contain whitespace
-	set --
-	if use java ; then
-		set -- "$@" \
-			--with-java-prefix="${JAVA_HOME}" \
-			--with-javac-flags="$(java-pkg_javac-args)"
-	fi
-
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	if use userland_GNU ; then
-		append-ldflags -Wl,--default-symver
-	fi
-
-	# Bug #270851: test needs TCL support
-	if use tcl || use test ; then
-		myconf="${myconf} --enable-tcl"
-		myconf="${myconf} --with-tcl=/usr/$(get_libdir)"
-	else
-		myconf="${myconf} --disable-tcl"
-	fi
-
-	# sql_compat will cause a collision with sqlite3
-	# --enable-sql_compat
-	cd "${S}"
-	ECONF_SOURCE="${S_BASE}"/dist \
-	STRIP="true" \
-	econf \
-		--enable-compat185 \
-		--enable-dbm \
-		--enable-o_direct \
-		--without-uniquename \
-		--enable-sql \
-		--enable-sql_codegen \
-		--disable-sql_compat \
-		$(use arm && echo --with-mutex=ARM/gcc-assembly) \
-		$(use amd64 && echo --with-mutex=x86/gcc-assembly) \
-		$(use_enable cxx) \
-		$(use_enable cxx stl) \
-		$(use_enable java) \
-		${myconf} \
-		$(use_enable test) \
-		"$@"
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-
-	db_src_install_usrbinslot
-
-	db_src_install_headerslot
-
-	db_src_install_doc
-
-	db_src_install_usrlibcleanup
-
-	dodir /usr/sbin
-	# This file is not always built, and no longer exists as of db-4.8
-	[[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \
-	mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
-
-	if use java; then
-		java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
-		java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${D}"/usr/"$(get_libdir)"/*.jar
-	fi
-}
-
-pkg_postinst() {
-	db_fix_so
-}
-
-pkg_postrm() {
-	db_fix_so
-}
-
-src_test() {
-	# db_repsite is impossible to build, as upstream strips those sources.
-	# db_repsite is used directly in the setup_site_prog,
-	# setup_site_prog is called from open_site_prog
-	# which is called only from tests in the multi_repmgr group.
-	#sed -ri \
-	#	-e '/set subs/s,multi_repmgr,,g' \
-	#	"${S_BASE}/test/testparams.tcl"
-	sed -ri \
-		-e '/multi_repmgr/d' \
-		"${S_BASE}/test/tcl/test.tcl"
-
-	# This is the only failure in 5.2.28 so far, and looks like a false positive.
-	# Repmgr018 (btree): Test of repmgr stats.
-	#     Repmgr018.a: Start a master.
-	#     Repmgr018.b: Start a client.
-	#     Repmgr018.c: Run some transactions at master.
-	#         Rep_test: btree 20 key/data pairs starting at 0
-	#         Rep_test.a: put/get loop
-	# FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1
-	sed -ri \
-		-e '/set parms.*repmgr018/d' \
-		-e 's/repmgr018//g' \
-		"${S_BASE}/test/tcl/test.tcl"
-
-	db_src_test
-}
diff --git a/sys-libs/db/db-5.3.28.ebuild b/sys-libs/db/db-5.3.28.ebuild
deleted file mode 100644
index 1f8ee8d574b8..000000000000
--- a/sys-libs/db/db-5.3.28.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.3.28.ebuild,v 1.3 2014/05/20 13:19:07 polynomial-c Exp $
-
-EAPI=4
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
-
-#Number of official patches
-#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
-PATCHNO=${PV/*.*.*_p}
-if [[ ${PATCHNO} == "${PV}" ]] ; then
-	MY_PV=${PV}
-	MY_P=${P}
-	PATCHNO=0
-else
-	MY_PV=${PV/_p${PATCHNO}}
-	MY_P=${PN}-${MY_PV}
-fi
-
-S_BASE="${WORKDIR}/${MY_P}"
-S="${S_BASE}/build_unix"
-DESCRIPTION="Oracle Berkeley DB"
-HOMEPAGE="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
-SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
-for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
-	export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
-done
-
-LICENSE="Sleepycat"
-SLOT="5.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="doc java cxx tcl test"
-
-# the entire testsuite needs the TCL functionality
-DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-	test? ( >=dev-lang/tcl-8.4 )
-	java? ( >=virtual/jdk-1.5 )
-	>=sys-devel/binutils-2.16.1"
-RDEPEND="tcl? ( dev-lang/tcl )
-	java? ( >=virtual/jre-1.5 )"
-
-src_unpack() {
-	unpack "${MY_P}".tar.gz
-}
-
-src_prepare() {
-	cd "${WORKDIR}"/"${MY_P}"
-	for (( i=1 ; i<=${PATCHNO} ; i++ ))
-	do
-		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
-	done
-
-	# bug #510506
-	epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
-	# 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
-
-	# sqlite configure call has an extra leading ..
-	# upstreamed:5.2.36, missing in 5.3.x
-	epatch "${FILESDIR}"/${PN}-5.2.28-sqlite-configure-path.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.
-	epatch "${FILESDIR}"/${PN}-6.0.20-test-link.patch
-
-	# Upstream release script grabs the dates when the script was run, so lets
-	# end-run them to keep the date the same.
-	export REAL_DB_RELEASE_DATE="$(awk \
-		'/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \
-		"${S_BASE}"/dist/configure)"
-	sed -r -i \
-		-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 \
-		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-		configure.ac || die
-	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.
-	. ./RELEASE
-	for v in \
-		DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
-		DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \
-		DB_VERSION \
-		DB_RELEASE_DATE ; do
-		local ev="__EDIT_${v}__"
-		sed -i -e "s/${ev}/${!v}/g" configure || die
-	done
-}
-
-src_configure() {
-	local myconf=''
-
-	# compilation with -O0 fails on amd64, see bug #171231
-	if use amd64; then
-		replace-flags -O0 -O2
-		is-flagq -O[s123] || append-flags -O2
-	fi
-
-	# use `set` here since the java opts will contain whitespace
-	set --
-	if use java ; then
-		set -- "$@" \
-			--with-java-prefix="${JAVA_HOME}" \
-			--with-javac-flags="$(java-pkg_javac-args)"
-	fi
-
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	if use userland_GNU ; then
-		append-ldflags -Wl,--default-symver
-	fi
-
-	# Bug #270851: test needs TCL support
-	if use tcl || use test ; then
-		myconf="${myconf} --enable-tcl"
-		myconf="${myconf} --with-tcl=/usr/$(get_libdir)"
-	else
-		myconf="${myconf} --disable-tcl"
-	fi
-
-	# sql_compat will cause a collision with sqlite3
-	# --enable-sql_compat
-	ECONF_SOURCE="${S_BASE}"/dist \
-	STRIP="true" \
-	econf \
-		--enable-compat185 \
-		--enable-dbm \
-		--enable-o_direct \
-		--without-uniquename \
-		--enable-sql \
-		--enable-sql_codegen \
-		--disable-sql_compat \
-		$(use arm && echo --with-mutex=ARM/gcc-assembly) \
-		$(use amd64 && echo --with-mutex=x86/gcc-assembly) \
-		$(use_enable cxx) \
-		$(use_enable cxx stl) \
-		$(use_enable java) \
-		${myconf} \
-		$(use_enable test) \
-		"$@"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	db_src_install_usrbinslot
-
-	db_src_install_headerslot
-
-	db_src_install_doc
-
-	db_src_install_usrlibcleanup
-
-	dodir /usr/sbin
-	# This file is not always built, and no longer exists as of db-4.8
-	if [[ -f "${D}"/usr/bin/berkeley_db_svc ]] ; then
-		mv "${D}"/usr/bin/berkeley_db_svc \
-			"${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
-	fi
-
-	if use java; then
-		java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
-		java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${D}"/usr/"$(get_libdir)"/*.jar
-	fi
-}
-
-pkg_postinst() {
-	db_fix_so
-}
-
-pkg_postrm() {
-	db_fix_so
-}
-
-src_test() {
-	# db_repsite is impossible to build, as upstream strips those sources.
-	# db_repsite is used directly in the setup_site_prog,
-	# setup_site_prog is called from open_site_prog
-	# which is called only from tests in the multi_repmgr group.
-	#sed -ri \
-	#	-e '/set subs/s,multi_repmgr,,g' \
-	#	"${S_BASE}/test/testparams.tcl"
-	sed -ri \
-		-e '/multi_repmgr/d' \
-		"${S_BASE}/test/tcl/test.tcl" || die
-
-	# This is the only failure in 5.2.28 so far, and looks like a false positive.
-	# Repmgr018 (btree): Test of repmgr stats.
-	#     Repmgr018.a: Start a master.
-	#     Repmgr018.b: Start a client.
-	#     Repmgr018.c: Run some transactions at master.
-	#         Rep_test: btree 20 key/data pairs starting at 0
-	#         Rep_test.a: put/get loop
-	# FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1
-	sed -ri \
-		-e '/set parms.*repmgr018/d' \
-		-e 's/repmgr018//g' \
-		"${S_BASE}/test/tcl/test.tcl" || die
-
-	db_src_test
-}
diff --git a/sys-libs/db/db-6.0.20-r1.ebuild b/sys-libs/db/db-6.0.30-r1.ebuild
index 230c743f8b8e..6525bbf7d3dc 100644
--- a/sys-libs/db/db-6.0.20-r1.ebuild
+++ b/sys-libs/db/db-6.0.30-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-6.0.20-r1.ebuild,v 1.4 2014/05/20 13:19:07 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-6.0.30-r1.ebuild,v 1.1 2014/08/03 22:03:03 robbat2 Exp $
 
-EAPI=4
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
+EAPI=5
+inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal versionator
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -27,21 +27,23 @@ for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
 done
 
 LICENSE="AGPL-3"
-SLOT="6.0"
+SLOT="$(get_version_component_range 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
+REQUIRED_USE="test? ( tcl )"
+
 # the entire testsuite needs the TCL functionality
-DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-	test? ( >=dev-lang/tcl-8.4 )
+DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1[${MULTILIB_USEDEP}] )
+	test? ( >=dev-lang/tcl-8.5.15-r1[${MULTILIB_USEDEP}] )
 	java? ( >=virtual/jdk-1.5 )
 	>=sys-devel/binutils-2.16.1"
-RDEPEND="tcl? ( dev-lang/tcl )
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1[${MULTILIB_USEDEP}] )
 	java? ( >=virtual/jre-1.5 )"
 
-src_unpack() {
-	unpack "${MY_P}".tar.gz
-}
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/db$(get_version_component_range 1-2)/db.h
+)
 
 src_prepare() {
 	cd "${WORKDIR}"/"${MY_P}"
@@ -103,34 +105,41 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=''
+	# Add linker versions to the symbols. Easier to do, and safer than header file
+	# mumbo jumbo.
+	if use userland_GNU ; then
+		append-ldflags -Wl,--default-symver
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=()
 
 	# compilation with -O0 fails on amd64, see bug #171231
-	if use amd64; then
+	if [[ ${ABI} == amd64 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
 		replace-flags -O0 -O2
 		is-flagq -O[s123] || append-flags -O2
 	fi
 
 	# use `set` here since the java opts will contain whitespace
-	set --
-	if use java ; then
-		set -- "$@" \
-			--with-java-prefix="${JAVA_HOME}" \
+	if multilib_is_native_abi && use java ; then
+		myconf+=(
+			--with-java-prefix="${JAVA_HOME}"
 			--with-javac-flags="$(java-pkg_javac-args)"
-	fi
-
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	if use userland_GNU ; then
-		append-ldflags -Wl,--default-symver
+		)
 	fi
 
 	# Bug #270851: test needs TCL support
 	if use tcl || use test ; then
-		myconf="${myconf} --enable-tcl"
-		myconf="${myconf} --with-tcl=/usr/$(get_libdir)"
+		myconf+=(
+			--enable-tcl
+			--with-tcl=/usr/$(get_libdir)
+		)
 	else
-		myconf="${myconf} --disable-tcl"
+		myconf+=(--disable-tcl )
 	fi
 
 	# sql_compat will cause a collision with sqlite3
@@ -145,47 +154,48 @@ src_configure() {
 		--enable-sql \
 		--enable-sql_codegen \
 		--disable-sql_compat \
-		$(use arm && echo --with-mutex=ARM/gcc-assembly) \
-		$(use amd64 && echo --with-mutex=x86/gcc-assembly) \
+		$([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) \
+		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) \
 		$(use_enable cxx) \
 		$(use_enable cxx stl) \
-		$(use_enable java) \
-		${myconf} \
-		$(use_enable test) \
-		"$@"
+		$(multilib_native_use_enable java) \
+		"${myconf[@]}" \
+		$(use_enable test)
 }
 
-src_install() {
+multilib_src_install() {
 	emake install DESTDIR="${D}"
 
-	db_src_install_usrbinslot
-
 	db_src_install_headerslot
 
-	db_src_install_doc
-
 	db_src_install_usrlibcleanup
 
+	if multilib_is_native_abi && use java; then
+		java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
+		java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
+		rm -f "${D}"/usr/"$(get_libdir)"/*.jar
+	fi
+}
+
+multilib_src_install_all() {
+	db_src_install_usrbinslot
+
+	db_src_install_doc
+
 	dodir /usr/sbin
 	# This file is not always built, and no longer exists as of db-4.8
 	if [[ -f "${D}"/usr/bin/berkeley_db_svc ]] ; then
 		mv "${D}"/usr/bin/berkeley_db_svc \
 			"${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
 	fi
-
-	if use java; then
-		java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
-		java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${D}"/usr/"$(get_libdir)"/*.jar
-	fi
 }
 
 pkg_postinst() {
-	db_fix_so
+	multilib_foreach_abi db_fix_so
 }
 
 pkg_postrm() {
-	db_fix_so
+	multilib_foreach_abi db_fix_so
 }
 
 src_test() {
@@ -213,5 +223,11 @@ src_test() {
 		-e 's/repmgr018//g' \
 		"${S_BASE}/test/tcl/test.tcl" || die
 
-	db_src_test
+	multilib-minimal_src_test
+}
+
+multilib_src_test() {
+	multilib_is_native_abi || return
+
+	S=${BUILD_DIR} db_src_test
 }