Version bump. Removed EAPI-5 ebuild. Converted some ebuilds to EAPI-4.

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

5 files changed, 95 insertions, 71 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 5153746f3dae..decb59d7a574 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,13 @@
 # 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.342 2014/01/05 22:02:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.343 2014/01/15 07:44:39 polynomial-c Exp $
+
+*db-5.3.28 (15 Jan 2014)
+
+  15 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> db-4.8.30.ebuild,
+  +db-5.3.28.ebuild, -db-6.0.20.ebuild, db-6.0.20-r1.ebuild:
+  Version bump. Removed EAPI-5 ebuild (not allowed for base-system packages).
+  Converted some ebuilds to EAPI-4.
 
   05 Jan 2014; Robin H. Johnson <robbat2@gentoo.org> -db-4.2.52_p5.ebuild,
   -db-4.3.29_p1.ebuild, -db-4.4.20_p4.ebuild, -db-4.5.20_p2.ebuild,
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index ed56e1a7142f..41ddbd066408 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -43,6 +46,7 @@ DIST db-5.0.32.tar.gz 29325258 SHA256 6d7bc4a927fbb40750f4e047252b3861d640fa7477
 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.1.85.tar.gz 270953 SHA256 4220d4ddeb77fb57ba2f37c1aa105d561d3ef85a6fb89c79c3edd735d0e193c6 SHA512 03bf3a2b0947efdca4e38719542e96378b5eeb57da64d5030dd23ab710773c1826f1c867032d0bea658b7fdd8272db253e97bbc490d198b9437025ffdf9e880e WHIRLPOOL 802346b9fc133f6c9316e987352e8bd8e12792b30b0eae9b4e2b3629c9bc8385ab12244dead428bb824945aab383cd4801de3fc705667797bdf6159066ed1352
 DIST patch.3.2.9.1 2139 SHA256 6d89a42ee0be9e47b3e8a42981c65266a556de84bc6281edcf0f977f52547798 SHA512 f410c43ea4af28a39d8ea47f774d38b53bf1183a34abfcf1f27e253eb61b42f4b5e9f0a3a500e174eb796ea342e6dd50a8bb95ff3eb8ee188461489cc994b8f9 WHIRLPOOL 3a879d5306403739465550ade1fbf53ac62b832fbdf507a204fef13949bc7be9c35ddd972834d3ca74bf17c421791011200556dffd95265eb64849f1d7b647ec
@@ -75,12 +79,29 @@ EBUILD db-4.4.20_p4-r1.ebuild 4809 SHA256 062d041abb41888c193911b6b3b8f505aa0fb2
 EBUILD db-4.5.20_p2-r1.ebuild 5090 SHA256 f303b27249f550acc5c83ec6a6798382cb5b8c078b58ae4dd65b32926316c122 SHA512 1793527c61a2e34dcf5a1e3a78ce3515bc5e06f12f947443b493a2ef18917532acfae637a795fda7d498e809079d2652c5f1afbd903bcbb142e9418d6a84108b WHIRLPOOL 53fb03736f3b7c7a1ab73b1f0cbeb94abc6073b3a3fa09aac7b720407fb85c25194065b2e3234084776793db71923024763e9be2338b20b4987f0af5212a0b42
 EBUILD db-4.6.21_p4.ebuild 4816 SHA256 d28213b75ca78534e5fcfbfa6b9cfdd4fed45f7974b2412e826ed17b04a56f13 SHA512 3c282b863edbb0eee1f5005f377ab42db33c1e7ab44ff19bae4297981fbd92eb533dab0de765ef107499311e93b5c23574af3cde552620de750bb356bd6b8683 WHIRLPOOL 94d59af76bda32d82c5b6a1fe8e6fc0588c35e915a297828bdf080fa44ba8d686f3d0e314c728b6afac6641a226d7ef3506ce99de27d7df3d372ba2e94bbf2a9
 EBUILD db-4.7.25_p4.ebuild 4351 SHA256 4b1759102e94ca8eec7a699cd0d496ac3a8085211198a055e8aaeb443bf8c494 SHA512 6bdf3f3707638febaefa6a0f5ea8fe128bece7b5dd17d7732b3176fe8df3524489e52427bc742672264bf240b2e0396195fb1cdb77d53f4c2e06ae8bdbaf0f73 WHIRLPOOL 04a1c46c90d15f9801ed89e2bcb3c991c0dd9a6b5cad66de9bc22a128bf0602dbfcfea856923fb25e31c2f8b335da83d1ea0063b2c38676176082cb8d3dcdd26
-EBUILD db-4.8.30.ebuild 4499 SHA256 691002bafa28748f2c0f9fa2ffc303ed594f834d0b34b152422aefc568dd501f SHA512 5c036c285258b66ec90dd8c14a06c670f6bdbf4d5af515beb3c443e77261510997d28a1d6286ff9db10de3def7cd63c49ffa156d53471eeed4d2959f97c0aa34 WHIRLPOOL 3aa07d137dd6ed5b335b233597a1483a0c647b3d56bbafd9027cec01c4589fe6f3015440525e0bc0831407c09fa429cc8a629df4750435ddb533e91e010756a8
+EBUILD db-4.8.30.ebuild 4565 SHA256 b8405310d758ea4597005fd22189bf3d848898f1394673a64ce3881af107ae55 SHA512 3944349f7780b259e4733361f4f872f62a06029255309b96486b75879b343aa3ae7a36494537bc7cb67d15c84c477d10be9859a206e3ddcb0e18a699de5931e7 WHIRLPOOL 85b3c7f7f1234d44f238764e2f153ea5fc75ded9408dfe3295eeca7893ad1b0a6bb6e6d1da19efa2c93b2108875311fcd6a671ba0f4f69ff729fe31c4725450f
 EBUILD db-5.0.32.ebuild 5451 SHA256 e30a866166c69fa16c298986221251fc2c549a92f14cac2815527b4cee831768 SHA512 18dfa7adfbd0d8a6abf41384598c43fd5940a9d1846a841c66c4884040d508ba7ed496973f022b781987375bbee22be15506618d178d9bcc5f04b591031900e0 WHIRLPOOL f65551cec5a02c873f2ee760e266ba5136c63edafd556e193532341f52aa4fddda934ce24e7c5f72fb60538332c1d987f46bf4d6f3c954a451b67a3d44638f1a
 EBUILD db-5.1.29.ebuild 5383 SHA256 e1fa631147bd4ebe2155141426933694d96c0a9a22c5b65953b0c2fd66bbbdb1 SHA512 7c8b5c9c16c3edca0c80f76e8750e7f9c47eab13b646c76d7c5e448e9c042e7d1489230039d95dec4f399779d7ee18dd7917545077e3bdf0cd278e047d7ecac1 WHIRLPOOL ec8862433595738202edefda88b5b95dd590542369e841465e1db47edd9b95600dd1b31a2fa59efd5197b8d7acb59aa17a65736f596e553bdd1973bcde006910
 EBUILD db-5.2.42.ebuild 6261 SHA256 0ee010bdf9d7c30b13b7dd01451ea783cdf483e3ca208f8f1f9a0d21cd9c164e SHA512 d63656ddc25aa3cdc0a5bba7966e6bf57618f9e0a17fe65a2abd40df6794352620a7c431227660d8d1b00b46043fee30146958300d4dfe6bdd75020d9999db7b WHIRLPOOL be9a36191369b3a6168c15e3dfbce6db57ab46a0c54b2fbc2b76db6df0df9d494b648c3b4600e1d9f03a2159128e5310748406fb7cf7d0c32c4d7ff586a4bb4f
 EBUILD db-5.3.21.ebuild 6278 SHA256 727deb393baeeebae4845c57b39adcb724dbc2a706a5e308c3908bc9056471c3 SHA512 fe9d3244fe5e6b2703349df50b89098178fddda792780d32e581bbc27d402b9f47c2c65df98fe51da67a517e52b40a40c4b4331380a0804dae4262e58b7514f7 WHIRLPOOL a150ed7ea79437c2d3bd761aeefe2db8f3d792381f8840575589d76f43ab70001e2255f774f0e5bf5242e2348e920aedabefad635f3a9f31c02ce84de6d14a2e
-EBUILD db-6.0.20-r1.ebuild 6321 SHA256 ad52ab95f4a12397a6020bc9cd9c6c3bca979cd7a9367213a35aab972b6b85e8 SHA512 5677439c6da70d92cafc3c0f804408f29cb451ea511fe27dcd9d283d3a6a28e79adc254dd6cfb6e8be075b5574ca2f45f883b8e08ab9ed495982091813ffebd7 WHIRLPOOL 208ac48f17a88655cbce90122cb4fe513db690fe87c48a856e3cce0f7a56f1d7cbb1e2498953509ea9ee6b6bfd85c3898cb08ee0358b4229ab0d1926d72fbe6a
-EBUILD db-6.0.20.ebuild 5826 SHA256 ce8917bad530be9eb19549b5c3eb815041e156768a7e0c57c78d90e0e51f5504 SHA512 5aaf9a8b5a679fe40b154e6938feaf84c27c5baf1a1c1d27755d773049ce022fb6a4309ca65ee26dff1bc0de926ac7565210eda550d459a28d6d4d13cf25c710 WHIRLPOOL c29721c62a0472497c44305949c6965f55066ca554c6494eb0b1de86e166bd1d778da7cfcd6133929e5d39c8f4b283a5df82ea68b444ee5b3264a944987ebf3b
-MISC ChangeLog 55312 SHA256 50ea4ba870d87447779c2fadccba6a5fc52c6d295bdab4b94d05d663e29f8ce8 SHA512 24278407f717606e691ed25d4c7da8aaf3340a137e5802e31bb05570dfb6849fdbe679e1ca59cc34d31e8f8f6c00c75cf3baaecebd72f571bb191d92f7be663d WHIRLPOOL 78a42fa3b5cff40e11cf6e375a4b2c805bad06ab5dac495edae1dc04ca352e9cb19ff30ffa7e303eb172ab7af1f63955ed2c09bc451890ae0c56e9ca79b21d4d
+EBUILD db-5.3.28.ebuild 6009 SHA256 860089124977715fe9e14c8ece36af017499db7f4c00fae8298a7e348cdb2d0f SHA512 f49269e523a98897c0c32fb726387694ac15df0649440a1cb76b7ed62323acfbfe9693d3c4669feb84b2d776461ee1caf0df7961684b59674d07228bfbf221fb WHIRLPOOL 51ccfe7a7a58d62d8883f96424a731598698a0f894df6a9b9e07332131173d5287d05d1f296990b31caa61c844dfbd35d14478fe9b7d928861890915765417d4
+EBUILD db-6.0.20-r1.ebuild 6052 SHA256 3958a31dedcccb933127f1733f95100a3298b99135eecfd52dfb15f84bb8ad90 SHA512 ab23f0b064336db0cf5618711843ea318b3c5a60f3333aa017e18f7f88865dd0e6b7e1e6cd41468f1f62a3f666ebe5e636cbe9f90bddd5b9525f2927f16bfee4 WHIRLPOOL 52513ae7cd0e2b7cbbe6805c9b719aad5f5a36a92e89d0c2e9db0a9bb06e80ffa38fb67e457934920b39a961b5129110d8710fd076c7ff98cc2e02f1b4890a62
+MISC ChangeLog 55591 SHA256 a17c3752852fd108f3d1dcf734b8f57d25b0a995093387b5f1e25675902599f1 SHA512 3988583dc50bd3f98f6088d4ec85d1ed22f2d66334160855acc97a7c4c96608f20e38298e407a1b2ecb70e8c2a371869212652d5d8fc489c5a092717caf08c52 WHIRLPOOL c100de8d5bc5fa6e7c3cb9129c17ace281eb51882c9c5b257cfd91af601bebdc88adf30af1f54e4a7d42fcc181186b2844b0aeda13bd7f08dfe073b24b91ec95
 MISC metadata.xml 1231 SHA256 0aac93eb29b4674d00b215122f39eb1ec03248e105cab670bc1921cbcca1e927 SHA512 6d25e610cc6cdcba13f8ffaab19406ca9dd7b5eda0585a6666058408ef1eb23a062428483532f4d1461888039e49a97aad4afc6dceb96baa70b880f7c4cf59b9 WHIRLPOOL 1d6531dd2346d7bc02dd016688a58c1c454a9262c3bad846147a6bce51f3ab0aba11165782162a5fda678a1fae3bafcab0d57eb882d5450814ce4fa7b813de54
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAEBCAAGBQJS1jxoAAoJEPiazRVxLXTFV0QQAJA1G9iFKysyKR9yZRnG7LUY
+Kitaz0G3b8d9XtLOx6Aqm6w3zMt/Q2GAsfGdAtwxVBkEJdc7+zTlcGihIs7rERFZ
+RiaQ64meARyW95MvThtSzjWxdLoUgcSjae6/Jb/+HH5hcVbl86zKSjZFzUMpNJlD
+XIqX4Iu4H4w2yqpzfQib9GxZh7ouBvYleweA9RBqLFcqxUmeu7+OYpMb6rtc6WbV
+IPZ8QNw8Q7PZtFspsWElyMRMbHqdIOj8seKpmXmkTAjSzhyBV7vJhi/ggXyQNc+g
+HznU3RI4CCD8nUlbjTCllmOW8MCAuWvxUx0oc4QhhaPfG4vmbugptl/FLWaCMMPp
+V9BKOji00w9VzK45oRbrKru16yBB40QrsANHyeID/0jyfUJqZwxyBBlglm9qpBF+
+89/138kyVpmAQiQQ66J4NNRanqe8cemPAh3aDhPH4M88ifg/K6eZ9ISw3Z0ZvQtV
+CCHBdf9z5/qX0FZtPTKMUKpfdqJyWGHdtcKl1MVWo5Jd/a5CcYqN+g3VANSK9aBn
+okInv71VppLIlXIZcMSA/M38zzmcghXtipO/5/cd2/Z6RdWUO9QdQOqoSPpaoQSp
+AzfoEGvtol5yfYCltAKCHyPUizQ4wBZnD91ebiI37QjhBVP0ml49afA8gDEPz6Bd
+K1Pyj7DY9Fe1EN37/5iL
+=8czU
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/db/db-4.8.30.ebuild b/sys-libs/db/db-4.8.30.ebuild
index 372ffad91ee1..c614a274366e 100644
--- a/sys-libs/db/db-4.8.30.ebuild
+++ b/sys-libs/db/db-4.8.30.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.ebuild,v 1.16 2013/09/23 19:21:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.8.30.ebuild,v 1.17 2014/01/15 07:44:39 polynomial-c Exp $
+
+EAPI=4
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
 
@@ -39,7 +41,10 @@ RDEPEND="tcl? ( dev-lang/tcl )
 
 src_unpack() {
 	unpack "${MY_P}".tar.gz
-	cd "${WORKDIR}"/"${MY_P}"
+}
+
+src_prepare() {
+	cd "${WORKDIR}"/"${MY_P}" || die
 	for (( i=1 ; i<=${PATCHNO} ; i++ ))
 	do
 		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
@@ -52,22 +57,23 @@ src_unpack() {
 	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
+	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
+		"${S}"/../dist/Makefile.in || die
 
-	cd "${S}"/../dist
+	cd "${S}"/../dist || die
 	rm -f aclocal/libtool.m4
 	sed -i \
 		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-		configure.ac
+		configure.ac || die
 	sed -i \
 		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
-		aclocal/programs.m4
+		aclocal/programs.m4 || die
 	AT_M4DIR="aclocal aclocal_java" eautoreconf
 	# Upstream sucks - they do autoconf and THEN replace the version variables.
 	. ./RELEASE
@@ -77,10 +83,10 @@ src_unpack() {
 		-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
+		-e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure || die
 }
 
-src_compile() {
+src_configure() {
 	local myconf=''
 
 	# compilation with -O0 fails on amd64, see bug #171231
@@ -111,7 +117,6 @@ src_compile() {
 		myconf="${myconf} --disable-tcl"
 	fi
 
-	cd "${S}"
 	ECONF_SOURCE="${S}"/../dist \
 	STRIP="true" \
 	econf \
@@ -126,12 +131,10 @@ src_compile() {
 		${myconf} \
 		$(use_enable test) \
 		"$@"
-
-	emake || die "make failed"
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	emake install DESTDIR="${D}"
 
 	db_src_install_usrbinslot
 
@@ -143,8 +146,10 @@ src_install() {
 
 	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 [[ -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
diff --git a/sys-libs/db/db-6.0.20.ebuild b/sys-libs/db/db-5.3.28.ebuild
index ed74cf3e0182..ffddbfa79873 100644
--- a/sys-libs/db/db-6.0.20.ebuild
+++ b/sys-libs/db/db-5.3.28.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.ebuild,v 1.1 2013/07/10 08:57:04 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.3.28.ebuild,v 1.1 2014/01/15 07:44:39 polynomial-c Exp $
 
-EAPI=5
+EAPI=4
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
 
 #Number of official patches
@@ -26,8 +26,8 @@ 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="AGPL-3"
-SLOT="6.0"
+LICENSE="Sleepycat"
+SLOT="5.3"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
@@ -49,14 +49,18 @@ src_prepare() {
 	do
 		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
 	done
+
 	# 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
-	# still needs to be patched in 6.0.19
-	epatch "${FILESDIR}"/${PN}-6.0.19-sqlite-configure-path.patch
+	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.
@@ -65,22 +69,22 @@ src_prepare() {
 		"${S_BASE}"/dist/configure)"
 	sed -r -i \
 		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
-		"${S_BASE}"/dist/RELEASE
+		"${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
+		"${S_BASE}"/dist/Makefile.in || die
 
-	cd "${S_BASE}"/dist
+	cd "${S_BASE}"/dist || die
 	rm -f aclocal/libtool.m4
 	sed -i \
 		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-		configure.ac
+		configure.ac || die
 	sed -i \
 		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
-		aclocal/programs.m4
+		aclocal/programs.m4 || die
 	AT_M4DIR="aclocal aclocal_java" eautoreconf
 	# Upstream sucks - they do autoconf and THEN replace the version variables.
 	. ./RELEASE
@@ -90,7 +94,7 @@ src_prepare() {
 		DB_VERSION \
 		DB_RELEASE_DATE ; do
 		local ev="__EDIT_${v}__"
-		sed -i -e "s/${ev}/${!v}/g" configure
+		sed -i -e "s/${ev}/${!v}/g" configure || die
 	done
 }
 
@@ -127,7 +131,6 @@ src_configure() {
 
 	# sql_compat will cause a collision with sqlite3
 	# --enable-sql_compat
-	cd "${S}"
 	ECONF_SOURCE="${S_BASE}"/dist \
 	STRIP="true" \
 	econf \
@@ -148,12 +151,8 @@ src_configure() {
 		"$@"
 }
 
-src_compile() {
-	emake || die "make failed"
-}
-
 src_install() {
-	emake install DESTDIR="${D}" || die
+	emake install DESTDIR="${D}"
 
 	db_src_install_usrbinslot
 
@@ -165,8 +164,10 @@ src_install() {
 
 	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 [[ -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
@@ -193,7 +194,7 @@ src_test() {
 	#	"${S_BASE}/test/testparams.tcl"
 	sed -ri \
 		-e '/multi_repmgr/d' \
-		"${S_BASE}/test/tcl/test.tcl"
+		"${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.
@@ -206,7 +207,7 @@ src_test() {
 	sed -ri \
 		-e '/set parms.*repmgr018/d' \
 		-e 's/repmgr018//g' \
-		"${S_BASE}/test/tcl/test.tcl"
+		"${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.20-r1.ebuild
index 122b389a3ab4..0d3b5d7d3dc8 100644
--- a/sys-libs/db/db-6.0.20-r1.ebuild
+++ b/sys-libs/db/db-6.0.20-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.1 2013/07/10 17:10:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-6.0.20-r1.ebuild,v 1.2 2014/01/15 07:44:39 polynomial-c Exp $
 
-EAPI=2
+EAPI=4
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
 
 #Number of official patches
@@ -49,21 +49,14 @@ src_prepare() {
 	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
 
 	# 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/6.x
-	# still needs to be patched in 6.0.19
+	# still needs to be patched in 6.0.20
 	epatch "${FILESDIR}"/${PN}-6.0.19-sqlite-configure-path.patch
 
 	# The upstream testsuite copies .lib and the binaries for each parallel test
@@ -77,22 +70,22 @@ src_prepare() {
 		"${S_BASE}"/dist/configure)"
 	sed -r -i \
 		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
-		"${S_BASE}"/dist/RELEASE
+		"${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
+		"${S_BASE}"/dist/Makefile.in || die
 
-	cd "${S_BASE}"/dist
+	cd "${S_BASE}"/dist || die
 	rm -f aclocal/libtool.m4
 	sed -i \
 		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-		configure.ac
+		configure.ac || die
 	sed -i \
 		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
-		aclocal/programs.m4
+		aclocal/programs.m4 || die
 	AT_M4DIR="aclocal aclocal_java" eautoreconf
 	# Upstream sucks - they do autoconf and THEN replace the version variables.
 	. ./RELEASE
@@ -102,7 +95,7 @@ src_prepare() {
 		DB_VERSION \
 		DB_RELEASE_DATE ; do
 		local ev="__EDIT_${v}__"
-		sed -i -e "s/${ev}/${!v}/g" configure
+		sed -i -e "s/${ev}/${!v}/g" configure || die
 	done
 }
 
@@ -139,7 +132,6 @@ src_configure() {
 
 	# sql_compat will cause a collision with sqlite3
 	# --enable-sql_compat
-	cd "${S}"
 	ECONF_SOURCE="${S_BASE}"/dist \
 	STRIP="true" \
 	econf \
@@ -160,12 +152,8 @@ src_configure() {
 		"$@"
 }
 
-src_compile() {
-	emake || die "make failed"
-}
-
 src_install() {
-	emake install DESTDIR="${D}" || die
+	emake install DESTDIR="${D}"
 
 	db_src_install_usrbinslot
 
@@ -177,8 +165,10 @@ src_install() {
 
 	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 [[ -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
@@ -205,7 +195,7 @@ src_test() {
 	#	"${S_BASE}/test/testparams.tcl"
 	sed -ri \
 		-e '/multi_repmgr/d' \
-		"${S_BASE}/test/tcl/test.tcl"
+		"${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.
@@ -218,7 +208,7 @@ src_test() {
 	sed -ri \
 		-e '/set parms.*repmgr018/d' \
 		-e 's/repmgr018//g' \
-		"${S_BASE}/test/tcl/test.tcl"
+		"${S_BASE}/test/tcl/test.tcl" || die
 
 	db_src_test
 }