Version bump (bug #474602)

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

4 files changed, 249 insertions, 17 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index f33d43c893a9..ac1d398d795a 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/db
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.334 2012/11/25 19:23:39 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.335 2013/07/10 08:57:04 polynomial-c Exp $
+
+*db-6.0.20 (10 Jul 2013)
+
+  10 Jul 2013; Lars Wendler <polynomial-c@gentoo.org> +db-6.0.20.ebuild,
+  +files/db-6.0.19-sqlite-configure-path.patch:
+  Non-maintainer commit: Version bump (bug #474602).
 
   25 Nov 2012; Ulrich Müller <ulm@gentoo.org> db-1.85-r3.ebuild,
   db-3.2.9_p2.ebuild, db-4.2.52_p5.ebuild, db-4.2.52_p5-r1.ebuild,
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 65890fd8ca41..e66ddae91764 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -30,6 +30,7 @@ AUX db-4.8.24-java-manifest-location.patch 592 SHA256 1589885b89ff465fe752c3062e
 AUX db-4.8.30-rename-atomic-compare-exchange.patch 836 SHA256 8efa8b37d4dbcbeb73592472be493f23c999616469dda88c6832b9d25f00b813 SHA512 1a4be944b1d41483fb4429a9454a3e9446b41720ff829c0b90b09bc3f9838c798dc3f9e0c918332d0933d6bc62b9b13b3f8251463f1fbddfddbdb341adbaf5ed WHIRLPOOL 58777a9588937dc669e82d541309e571da2ed81515e69b1678aca87cee06fa40a398bcb16a02b29ef182f5b97121e2181b7897b71e33fc93d4b24b9c341be8f9
 AUX db-5.0.21-enable-dbm-autoconf.patch 1757 SHA256 e4868b2cbdfc881d9822d354e873727bbd824c3aa09c60dd6d6d8102c2bc1323 SHA512 9610b6f7b5ce931737972402b3f1ed453142ab633010e8aa7b61af70685f4707532cce0264576d4bfd0b672f6b8b0ac641198fc593ea000cecf4e836fdd1146d WHIRLPOOL 460eed1a22537245d9efcb883d910fb1b8bb3b2e170067dd24226a2ad3cf695fac0aa915d04530011490a8a61e001b95ffef1c95cc28f48e71ca4588f96d6947
 AUX db-5.2.28-sqlite-configure-path.patch 906 SHA256 94e36064e3414d644cc1a157c011a80fdf28df66b0da4b7df69d078735d152fe SHA512 ed0e683313f780975b3aec60018b08569ebdd38e4cdf60de170ef0bc4fc63d602e7a5572792f2634f3680e763b74ffdb0a5b484562a10a4b82b28b19c3acc565 WHIRLPOOL d557e9040e05b1543cc1cf8b9a2ab4d033498004924115be37ad781a1765acc740abd230cf44a196aa1072ab63c57044f7fb84e651436d03cbe0cd8055819e6c
+AUX db-6.0.19-sqlite-configure-path.patch 754 SHA256 8af56358e09da952eba2f1784c1bb2d1bd671a8c2b6777065aff473bcdca7145 SHA512 c4bf556e65f64ba7667dc3eecfbde37b7ec76a5ff6a4bab3d3ca496107466d82027884a02dc012a0c3873fc505aae7519b9ea721eb84a1855b15f54b2a4ac148 WHIRLPOOL f95cbbc97e27453c354f858be288462e807bbd811a997057bb97d61ff6556ee0438e6313295c60e9f1f4f5b580fd80de3516ff6a5cbf522258ccbf9b95420951
 DIST db-1.85-r3.1.patch.bz2 14641 SHA256 88e3095b191fe425d0192d052595ab838ad4ef6324aac0a9e338fd6df7ae40d4 SHA512 32b1810515476758ece7415f241378460a4051bf5ee23fb464748f84a90a56ff2c5119ed93028114d64f1b1691b1c694c2301ff825edd89cdee90a870a68b6f4 WHIRLPOOL 3c3437cd4a6294c2ca6db3b6522c4999d5efd9c1807b499b72bba7534c658349bd7f889912b0dbc4bc017fcc5f6d2062ec112ebf044673802bc0d9476ee26dfb
 DIST db-3.2.9.tar.gz 2085238 SHA256 3eccaec87bca4ca0f5728cf4579650da9d12e331187f1e98321e5c9e9e04b108 SHA512 5f07b27ae0cbd2832e5db9473cd4f2d4aebeee25ed8245ebd2c297a576571635ca5cf75e63e0967b1e90978128a5b6f5d8112559c56927d5bc5eb0d9fd3a2e95 WHIRLPOOL 248641e75420fc353d3ace86b3c65ee8354b073e2dddc7d71c1d2ea4681d81306255077dd7ed322a2b5ad8b87d356fa5aba864e5f24dc956133d563e2bba96bd
 DIST db-4.2.52.tar.gz 4073147 SHA256 72f581d8b91da900434629886d1d1c6ea8b9d2a9329368c3b875e7cd556b6a0e SHA512 47a4e1353fe4f5c2160952a8f7a09b73fdf2dfcd222a8214e12630cec3139a624907bba83a06f10f8492b4dce328a979e9155ee049b9a88798edaca62cfe60d1 WHIRLPOOL 409df946378054ccca9e5f27980f28da410f9dad9ffa7acaf092725779897fe89a2ac7a4add4a7974271e1d82bc9255681fb1b6cde94782feae86b7f73f8e8f7
@@ -52,6 +53,7 @@ DIST db-5.2.28.tar.gz 33033536 SHA256 92133e3a5b4bb480db4cc349f1f6e636342910057b
 DIST db-5.2.36.tar.gz 34664337 SHA256 8828f884cb5d1ecb0c52a18366c8845dce99d804d8b72b6e66f6e553f3d8d984 SHA512 fe51c681ff044750ecfc7da7857b93806976aae8900857421816a7b2904bb69829264197aeaad2e16de00e89a9b6c325141a3834a8e44e06d242785dd24df78d WHIRLPOOL 44b0919bf5264d9f27c10291f4019874b5a782a4f640833459a2edd86ff90d429fe382b5642b81b17ed368d92d4c554f82c693c98eda45e4c2d5e15ada3f235c
 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-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
 DIST patch.3.2.9.2 495 SHA256 61db874796fe8789b0045f456285b27c5b8b7b8902a5e342a115456015716d0e SHA512 cc75fef11a641d480beaa2b62201177c72d10c4eb20376b5f15769db6e9e1a0da41c0365d79772af19b4cacdaa9f91dad049c735de9f95b98dcfc4f0b611b557 WHIRLPOOL 1362c32dc16875a97b451ff52415fe4b9e9d37b256a92c7e86c14a52431937352ae55ecee4361459e9036b9bea238c205a8f0d4406ac7e47387a8cda22906879
@@ -101,22 +103,23 @@ EBUILD db-5.2.28.ebuild 6008 SHA256 88c2f6d15de7e8893347030a21104a6386f4199f9a47
 EBUILD db-5.2.36.ebuild 6052 SHA256 54fc7481cf31b7e3ebfa87ea72b13b96fccfded017330516384e360836aaa538 SHA512 5b8af4877d3c1749b31388c5b6bd70d4bfc14a75a0ad33c434b9040e2b4c605637c203170542948e6581632559d053ed062339b995ebea311c0222a315fea8fd WHIRLPOOL 080e453349aeaddee0b9c2f4280297798b2fadd4ba2c0faa8bb46f8cc7020e0f9c65c8671bac9bab4f05fe3b23e63bbaf701f977f3ddf8bbcb779446ebbd793c
 EBUILD db-5.2.42.ebuild 6052 SHA256 7741ac79f9c3d0cdce69479b63ede48c1738d82aab2a4c33671b2228c64f16cc SHA512 64c0c356b041fef848324c05f6fd66135df16c92f89951569be90f60a6acf42181e5d07f455e94f450995b6b5950a7f115c9a2ce1b7a0e218d204f5e5e3367a2 WHIRLPOOL 6b6523baf42f0eb315f73c403e68260cb4393cb5969507578ce34c11770ccab365b91abfe4ccb83ab7135ab96f01d6b494c686c28b579f176c3b2ccb483239de
 EBUILD db-5.3.21.ebuild 6069 SHA256 81f666da5f3bbc4b32d0c09671c341a20d3d9be6b1aff236fee783eaa0145a26 SHA512 7fd2c8901670430996822685e6749578ced5d7e919ff8d4c141bdbb68c134269a4153f9f57d014af3dc0cec3b38da76ecceb739c627056e6f8c1a193e7df52db WHIRLPOOL 01cc8a8b1f8177265765032f1cbb55bf689fe5c520a4c52c11434291933074466ea97a0bc135bd57da69de1d3d6ed9d8f321d2620f587b9ea2fc70bfe906f933
-MISC ChangeLog 53807 SHA256 69c7d104c7c85a79e5f3c5ee708e98ee65a3b8d75059f011e5dbba218753ba25 SHA512 3cdcf43aed9750774d881be0787cd80ce134be1000954cd71a10c4ab8f1db6755498dc6ec0eff9d0359535cfcf21cf80690ff733b19381bf9526b9f1ab23d75a WHIRLPOOL 839dbd057a287d370da0e91ca2e85d97be48ed63fff83d1d5a5506caa43054fe089ead8ba26d61b92d4c5601df83bffb0557184ed513d2e18b63ae7f7f014d0b
+EBUILD db-6.0.20.ebuild 5826 SHA256 ce8917bad530be9eb19549b5c3eb815041e156768a7e0c57c78d90e0e51f5504 SHA512 5aaf9a8b5a679fe40b154e6938feaf84c27c5baf1a1c1d27755d773049ce022fb6a4309ca65ee26dff1bc0de926ac7565210eda550d459a28d6d4d13cf25c710 WHIRLPOOL c29721c62a0472497c44305949c6965f55066ca554c6494eb0b1de86e166bd1d778da7cfcd6133929e5d39c8f4b283a5df82ea68b444ee5b3264a944987ebf3b
+MISC ChangeLog 54017 SHA256 5c4ab1871263ee8aced65b7e3dbdd49897279c39074512b547632c1ecac5f8b5 SHA512 83bb71ed2ea4d9363de8d1eddf52fa24bda18d86058bfa63feb7e42e04cd93b38f8d13cf7d42ec9ebfaaa043bb7c5e3b25736183a4dc8b56c38db8e002af667e WHIRLPOOL 2407ede0aa49f72dff03cdc1f0cda2499449c85c2ab0a475672d8e7dc6314a41d904a1426d90b508b51de5e663c70fe07fa6fcd4bfd3bbb334d1a16848144177
 MISC metadata.xml 1231 SHA256 0aac93eb29b4674d00b215122f39eb1ec03248e105cab670bc1921cbcca1e927 SHA512 6d25e610cc6cdcba13f8ffaab19406ca9dd7b5eda0585a6666058408ef1eb23a062428483532f4d1461888039e49a97aad4afc6dceb96baa70b880f7c4cf59b9 WHIRLPOOL 1d6531dd2346d7bc02dd016688a58c1c454a9262c3bad846147a6bce51f3ab0aba11165782162a5fda678a1fae3bafcab0d57eb882d5450814ce4fa7b813de54
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQsnCLAAoJEDxpGckxwJCBvlAQAI6BhvGqCFsQIWng5paM41e8
-21mc+BJtCSTZFofgdR9T6zduSv8uiN4rwDAOF5MByD8Nd52qp8rTHlo5cSfKfZEm
-abpQ1rpImiM9qA3CJ4K9+AQRHdB4Nre98gRE88GGclenpbgRQuXZJ0FyyYc0wxT3
-7JMrtatAljP2ugikX9fPpVE/TuuTmmmnHlCho7j7BYD5tivyiRPgMWebn7heXNir
-30ywLSnG5eK7YuXoM7xYKbcuLg5rqCyNWb6LM7rtexguAZCMNabV4N9vEek6/Ma1
-lgyWtr1L4FVqS+K+9Wm5SB4/P/RSKQWyENXLYbhEjorCQ40jvOAkSigrlSdNYB8f
-zPWvpB1XBOWVdsUe1blR0iT9I7GId/d+QedVFjrP9hgT919p2hj+iS0ew7GJEDr5
-a4mLMMXI3gtHjZO6av506ozWo+xFyUj0Lm9kiQgJiPULHoE6HT293lclP7MGUblN
-on0vubjBk/TYMiWhQGojNArGT42ZODvousuVnu1W34qcsFb/um0oUThE3fmcytku
-rJRchp2ooWHHdj0Hz3ShuA1aY5sBVef5TQe9SrphrXFV+6IWSkPDjtjYz0GE23VW
-cQD/nahGzAlO8m31/AuKFLYoqdQlZLE8N2cx7LF+UtQIqDY4kIYyQh/KETPHF+Z9
-Rvd8MXtv7Jwvw+ecFPoh
-=uZuR
+iQIcBAEBCAAGBQJR3SHhAAoJEPiazRVxLXTF3VoQAKDsTIqMPQYMkZTloLiikFUb
+iGhacVbP1vvb+EgRqS8VWpJGnSB68d1yOfTvQbmGs/u7MpnLSzuo7EdxTgnj4cAy
+vJ975aRqGK9YB/4EilFTah6IOROI7jNIO4nQfWNmZjy6i8cGf4tX/aGLO5C+oNve
+qT9roBzJ+ywUWqGfKr3HdWSNN5pY9G0m+s56kb91Xmc0XEvwy8m0jFzfcO2DyfWD
+LAr6I4lUyvClr/35zfKHoYlm1uMzOWgFuOmj4/Yj94LJlicMuX8K9RAffd6kNGLJ
+5rXGMAKps+loTGAfxo7P0ZcjSi0p/uc8Dmv1tIFJc1Lz84VcKAOw2sEin8CkQxl8
+AdPkSBX+gvRpyMw3uqAkqSBK6opY5YB5iWsDRKHPI4VT77NEdrBtch0bmXsPPxY9
+8WEg7ddoYJyAGscy64cuQijKOqnyuMUJILwFysfVF+fjKDbwJE4hdN4cQcD2UHJF
+YoabH9ct7Bp7S059u5kodqvex4l0gOhKaC2U4zqFUjQ5TxCywZunpH5S5/m+g40y
+7smGwxVny6nk6haKCHumJmXYN0m0nmjmYVMOtmGYj5vJOnUWcGVvGgGivkf5iy2E
+gyiG15K6OpweR/o3fCDh16KLfy1kwsRAT+wjqVdxflLhAAyO8ml+Bk7hgL7ch7pR
+vBkE1WYXAviUksxU7ijF
+=mu56
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/db/db-6.0.20.ebuild b/sys-libs/db/db-6.0.20.ebuild
new file mode 100644
index 000000000000..ed74cf3e0182
--- /dev/null
+++ b/sys-libs/db/db-6.0.20.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2013 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 $
+
+EAPI=5
+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="AGPL-3"
+SLOT="6.0"
+KEYWORDS="~alpha ~amd64 ~arm ~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
+	# 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
+
+	# 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/files/db-6.0.19-sqlite-configure-path.patch b/sys-libs/db/files/db-6.0.19-sqlite-configure-path.patch
new file mode 100644
index 000000000000..78a2ba3ea8aa
--- /dev/null
+++ b/sys-libs/db/files/db-6.0.19-sqlite-configure-path.patch
@@ -0,0 +1,11 @@
+--- db-6.0.19/dist/aclocal/sql.m4
++++ db-6.0.19/dist/aclocal/sql.m4
+@@ -96,7 +96,7 @@
+ if test "$db_cv_build_cryptography" = "yes"; then
+ 	CPPFLAGS="$CPPFLAGS -DSQLITE_HAS_CODEC=1"
+ 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 " && 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 " && cat build_config.h >> config.h) || exit 1
+ CPPFLAGS="$orig_CPPFLAGS"
+ 
+ # Configure JDBC if --enable-jdbc