sys-libs/db: migrate to gx86

Signed-off-by: Fabian Groffen <grobian@gentoo.org>

52 files changed, 0 insertions, 4481 deletions

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
deleted file mode 100644
index d6a3873642..0000000000
--- a/sys-libs/db/Manifest
+++ /dev/null
@@ -1,38 +0,0 @@
-DIST db-1.85-r3.1.patch.bz2 14641 BLAKE2B 5ca59487a433a5e5b5fed7a8737c20df041be56733fe9209047f9e53845fa034576c29ad74407509ab96473e4eef0138a3a47de6c348d27209f0e39df85b9f5f SHA512 32b1810515476758ece7415f241378460a4051bf5ee23fb464748f84a90a56ff2c5119ed93028114d64f1b1691b1c694c2301ff825edd89cdee90a870a68b6f4
-DIST db-3.2.9.tar.gz 2085238 BLAKE2B 10cb1c102bf5db52ec16181ccbb02a8c4560f42afd2382689ee4903fcd63bf3ab4802482a065a85b1d34c8fb9f620fceb985155b1390de7ca404c121b6b4b6bc SHA512 5f07b27ae0cbd2832e5db9473cd4f2d4aebeee25ed8245ebd2c297a576571635ca5cf75e63e0967b1e90978128a5b6f5d8112559c56927d5bc5eb0d9fd3a2e95
-DIST db-4.2.52.tar.gz 4073147 BLAKE2B 0bb9649a08df9b425f28471eb65c0efac0b7833b4c5c841b9ef53a142669b549e1f1b78cf42eeceea05ebb271aacd513d115070ea028f77fb1830bb9fcc7c8a9 SHA512 47a4e1353fe4f5c2160952a8f7a09b73fdf2dfcd222a8214e12630cec3139a624907bba83a06f10f8492b4dce328a979e9155ee049b9a88798edaca62cfe60d1
-DIST db-4.3.29.tar.gz 6103264 BLAKE2B eda13cd5c8b9421044f6c8b6b41ec318ff33e19da15f8d5e3075612186e60cfce30069078f712841058224ed58caf69d43960156ac645651670665390eae28e1 SHA512 93d36c040b25739b92c52504e117a9c7f4b671463d61d00029e70d0bc8171311f5d04211f7d966b8a9ef8c2a85a5ebe8cc55e4469c3c7c0e468caa4221f691fc
-DIST db-4.4.20-20060110-rpc_server-java.tar.gz 158976 BLAKE2B 91801a784468fe6dabb4e73e7f33217f6b0130ac1774f9785e541bf2843531e5fa1bbb3f1d0bab23233e2d25e1b3ff781dd08cd8b49c43f21b69383a8388fe42 SHA512 d1f04fe512baa0e5c8a11d765cb9040943ab70258f7d07fbaf579b3442c43ca0dfee56267db7543a71abbbd2f056b80fb5f9d2d8bb83b0f5e5ccebf273280e6f
-DIST db-4.4.20.tar.gz 7952742 BLAKE2B 683ecbd601541922bba1d1bf0aea16d5ba71f25ad287d292f674639503c32070fdb1c47409b0b7dc741c74b77b45738ff6505aca405bfa6c523a7a39f10b9a38 SHA512 dea85d0aa3cea0539de2f9819e1ebc8a8aba887614bbbd1710a69dbf2cef3fe262414b8b03deb7325c8bfeb3bbbdc3d5ba35377a73aac5e3c63aa1082d3a579e
-DIST db-4.5.20.tar.gz 9281894 BLAKE2B 68d6f5a68841adf6240ddff9563fd02c97cdcbc647aa5c7f9d108c7c0195829cda5c32795b137503b46a4c9eae47b9a95a28770f3cd2ca6a1dfa37aad3e3baa1 SHA512 c34907a53323158627971f464c32b9a5b00aff0fa779c67117826ebeea86a4731e272a5dc6dc5ae32f16284ff15c79d93050273795381acaaefd48e18dc2d612
-DIST db-4.6.21.tar.gz 11881885 BLAKE2B 682e0fb1cc471f01f0246761345bacc217e17a7a282d71bd27953fb839e54f58916f89192d50b43f51ec9fc403869304a3b1966dcf49458223ae38c1037693e3 SHA512 8118218e2eaf9d22e445e551ef184f4610406b81f9257794d14f637d9d12a51a007166b48bf820140c5be287ef61d22a62a16f7702f0d29f385108c40b11ce43
-DIST db-4.7.25.tar.gz 13124129 BLAKE2B ae75fbef28d233739e9e05d9058a104366c998219e7b35ddf7ddbcfaf5b54c58bf5ba3b23ec164eca13a86ac6765934877fd41dd4db5cd7016fae031da6c4ecc SHA512 3a0b2bcb210192c7a37b082fab47a8a32da5e7e91058e18be8fb844c8780088cbd4de6234257750505d5a05864517be03afdad95cb1c549f9743386d6129554b
-DIST db-4.8.30.tar.gz 22887305 BLAKE2B 10487580a371fa97ef5e468e1fcc4af68490934a82467da88b723f7d4ce403cd5f2b77bd95c218dda58161fe30bfef81f5093a8e5176f5ad5f482251c07c6423 SHA512 d1a3c52b0ab54ae3fd6792e6396c9f74d25f36b2eb9e853b67ef9c872508a58c784c7818108d06d184f59601b70cc877916e67dfea6f0ee1ca2b07468c1041f1
-DIST db-5.1.29.tar.gz 32188074 BLAKE2B 6af9e6afc0ebd06a43c0e96fd0b2b3c8e17476507996605aea0c1519b9120140ff410829118a59ea8eff1ab220762131cfab8cf574ffddfa6348128a57721b37 SHA512 b3487161cc09dd0aee6117d685d0bc0a58854cf5e96f9e778969a51d3a61b66f8e007b76e584e4ef73f84e07d4418b89c2f6697e34c1ad4072609b11b7b4c5b0
-DIST db-5.3.28.tar.gz 35090431 BLAKE2B 5b77a4ec0945fa96ce6c2b452fb4b029295e037fa64d5ff8dcb3b5e01ee3501fd75d9a73b8f5fa54d8907717d93546fbb5348ee70119e877fa2f17d301ecf50d SHA512 e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090
-DIST db-6.0.35.tar.gz 36532251 BLAKE2B 22fbe557ccc13e4b936db8ca7d6ba11ce42e477bbf39f7e472067e06fb5910b1147fa58a44ac944c24a51ea839f1c61edda6bd8f3c450acac0c13d7fdba11e89 SHA512 002db1553def44efa715095b04b2bac2de7450cdc7142586d1d8b5d8ce79ee5e98f824b3bd276cd586ca932dc51ed35a9ffbed95b2b9847264f262cfa092479d
-DIST db-6.1.29.tar.gz 37521943 BLAKE2B 3f036647337a36cb5f8cf5cc8774bd49d4cdff2d57750f21488183de67e426ab0863ee97d972751adc10b294f6c23e1e5e3f2c7b3fc02616463f971b10f3b15e SHA512 ced40e357acd1214f8b5800ddcf084c65c0ab77ca045a4504ac1a4c864035bd50aa8993cd1232174ff81071a36806314807330aa53dcb18de548c886c2a99e73
-DIST db-6.2.23.tar.gz 44305964 BLAKE2B 8d5705e8e4c66f93e52d1bee86a322ef6d2077d1e5c005208bedcb25f6cfd10e0a6d9c9a72a1d2e3568d6fec14ee82e2446a0fa0a0d505cc17f0ef245de826a1 SHA512 0aac380673ff4f97a2a6230f135f8151b8d2896a12710f708cd983b5fb95075b55fc2c67af577365e8ec7a32e43357a4f3118e37713d00b227f05eb11b1d12f5
-DIST db.1.85.tar.gz 270953 BLAKE2B 7862979b6fe21a67eac7eb5e0d05093f33fa71fa92f9717a65bd39b366727e6928109c821b86ede85d6d2a8013199f3927e760bed19001a5cfd2270819a3b904 SHA512 03bf3a2b0947efdca4e38719542e96378b5eeb57da64d5030dd23ab710773c1826f1c867032d0bea658b7fdd8272db253e97bbc490d198b9437025ffdf9e880e
-DIST patch.3.2.9.1 2139 BLAKE2B 7c442311499244d3432a1648294f3b610da827f7d940777de01f98816d6dc8bc50b68cb45900bcc1acf1672207a86009dbc33b6226f8a4fcbefc1bee51961138 SHA512 f410c43ea4af28a39d8ea47f774d38b53bf1183a34abfcf1f27e253eb61b42f4b5e9f0a3a500e174eb796ea342e6dd50a8bb95ff3eb8ee188461489cc994b8f9
-DIST patch.3.2.9.2 495 BLAKE2B a29338b8fd1cdd75833fd4dabcca17106a75e4cc49e7f5198ac723422e0b0ed553969109293d5e83517f2e5bf6478ddcc7e0cdf371e721fb3784dc7d8165e4b6 SHA512 cc75fef11a641d480beaa2b62201177c72d10c4eb20376b5f15769db6e9e1a0da41c0365d79772af19b4cacdaa9f91dad049c735de9f95b98dcfc4f0b611b557
-DIST patch.4.2.52.1 988 BLAKE2B d743a3d798fd80727ff51a0929a6532602d09d1d28840a3012746d9ff81e445b9266be02780e540a3a54ec2ce8ede4522ca6ac0b09b9c97a1dfb5fcbaded99e0 SHA512 67b894678503dc394e50b7c6a875ebbd996d6f78acd21858c04ba2cc4aba118f527aa3aae0793cff4e44bcb17b13fb1eb6a3d895e94cb97270d9759be1bb4bdb
-DIST patch.4.2.52.2 1433 BLAKE2B 9c9e40c264170fc9da6ae7ed6b4213d3f3cccee3c3c58cb9777f6a3a78540ef88f6b7427fb4691519dc2c0a5afed2d749ae4ca8f6144ccc7e281c83d14d00e59 SHA512 93c9463e2a795049473a2799186642185b7e2f94c51efa0412031d134088d129ebcf07e6a5f309d6cb37d9d282d8168276305d7420fb4cff6d7acc38a6ba4f00
-DIST patch.4.2.52.3 8672 BLAKE2B ae364cce5cb87287a78f3d19214ffdb33bef661392111d4d736291a6798cfc571f5251c0ea254fe2070f3e6503f97e79b4fb92c1105a83b4aefb710e5c78e9b3 SHA512 234bd96b93aec826c97314b41c8b9231c55598213ee8437a6df7efea44e6c1e8e4844db8214a9468d27bae9a588b028c765747493b5d169235e3d06d0cf107b4
-DIST patch.4.2.52.4 1311 BLAKE2B c1811a0ecdd580cad6f9d68276545f8cb7e42c26de06790df1346df3d65fc6ccd63f28bb206d3d7495db0d5153912284ac8705e9b3468897ecf528a35f97f505 SHA512 e2632944d82f5b6dcbbdfc237bdc37d5db736acd0284edfdb51fc0f3a9ca4fc6bcdb412bab325e62fc30d690f6963dfe53e6120cdda65dc403eff89d3a931287
-DIST patch.4.2.52.5 839 BLAKE2B 7a08473f822a2a0bdb595c817664c138078aca125481ffa7bdaad93e9b8236a9a5ffac7d9391a0fcedfea0abb52a33725402c899f0342ff09975f8e7c15c754d SHA512 5457bc4e433c8f12f34a764fcec1dfc9e832f960f518b21bd9116ec1b1130d9ad12373553e224d844e2b2de254470daf142120ff6d3125683a57f14a42a8e879
-DIST patch.4.3.29.1 835 BLAKE2B ac796fce9fcc4779629c3a77e55a026dd293a05135811ad434b10b9cbd5d05cb3ea7f04cdbf9778d863150978295e195e1b7dacd3f68c1f0815829930f437afe SHA512 c3dda4de68bff744dac5c96d1533032b2c8e8e0945f1a126b8aacdda322e05d1ec2e364eb7432ea1fb7366424ce155a9e58f84b9bee8e1ab4dd05a3313bcd8f7
-DIST patch.4.4.20.1 867 BLAKE2B 321fd297f9466632ddb4bf874221f98fd85856edf66d6f882b6ed9c742982ccc4d0fc00f9e9b6cccab1a573692fc51e700500db2d6a2b4b052dcd10edae73b05 SHA512 0fd501d219eb3de94c59e7b526c5031bba5dcc7dea4174545db5d688f33a5b4324aadd71e0e4eca3781592da0e90c1481c3b2d8f74612dfdff651c18d10eb2d7
-DIST patch.4.4.20.2 721 BLAKE2B 364c72016241ab36f1d086ca4dae62e9f8263aebb7cd758383b0adf8aeee5a0d45b0a7827ac5294c2d2ca8d9c8961959adce8ef23515c56b1253fe14d0fc44fc SHA512 4c497ce01c740c9c32b3a74946638c21b619cf057bbc8acaef24cb9f8d55d0d020d4cbc7775cb0cf07113c44981f076316cea14573fa08b49bc6352770bf5de6
-DIST patch.4.4.20.3 1366 BLAKE2B 4e6c9e4263af2da5debf85a6aa9a64c49c7da23b4fc8d568055c06bb2a6c04e204ccee95a987677ecc043678c7cd373a5d1d8f8f8f6aac79db3f58facc883616 SHA512 2b00acd823342083f0eaaf3b9659c811d05eebba67b39d9a9dbfa4a8fb56cded322e3f9028c57d83c75cb949a79f705cd8584df1630dd8cd3ad22a54c83baa91
-DIST patch.4.4.20.4 837 BLAKE2B f94feaab0190d76cf81b20b18826ca3e71329b4cb02a3666c6f073b3a2e36e4447cf583f554f35d085b3044bf66516e5479daa024cd637bc278269a05577bd10 SHA512 9aa464580cc1b402e594da56cdfc5e4d7c465f125b5f0cb312abbcdf72753bbf9ff14248657e0d354c93d7f1f89c7189e08060242c9a061033bb1016db640ceb
-DIST patch.4.5.20.1 984 BLAKE2B a2651bb0807c196a29834c2b7d1979a73fedb715bcbd4fd3fd0e0a108c1c0443715e656e4282c265cf200d61fe9cb4f4eeec4c9c924bb143eb53d0f07a445a5c SHA512 a8aff6f594e5413436a7ae5afe48286b0d397a247b2cd466f192eb6b4870fc68353c1ec1d0209cdd06640e09090b3d84ddb0fb709f8478ff3823e244c7f6cd3e
-DIST patch.4.5.20.2 1752 BLAKE2B 1d08a79a502552b842e248fbb214f27eb837bdcc99d61949702153bd245cc00b04ed8f34673543c79ec5da33334e57f8376ae53f8c68e510585c29d7ee08950a SHA512 b6af4b73e03b290595b6823e4d5c27da1b1bb5e66721ed5f0c6ecfec6595bcc56281340ec77fe6fb9432397adec0e292b31a5ee9d01870fb2955b8519017ffb7
-DIST patch.4.6.21.1 2475 BLAKE2B 6f4985d5388d81a4409ea7be4509b0ad695e0c8d3bff9d14cd8060d2dc332eac84f56af50a3b5c7efd09e987a8e1f06c7cae7aba7687cefa6caca95923b03a9c SHA512 9fe4991a59e409cb7df5b507efed7e443c05199b41646ea2d5d52de29513c8d27c2f3bf154a0170f04e12eaee6a622b945ae0f9789c3faaeb2ccea55f7a1ca2d
-DIST patch.4.6.21.2 892 BLAKE2B 95e6e6e431a4aeb3ec91df7f35d9c0b75696755249adae58730add46e62bf702916be605f4fc1016acb14ca3433b80ac8b9a7a0d444461bef57d042b7072d29b SHA512 e8570c0bee7522056f74cea73379fc13dae02258cffa78e540ee1c0433f368b3f856a21dc83017798120b3db7987c09e23af448153f0c024217df41a3e027347
-DIST patch.4.6.21.3 1517 BLAKE2B d717f6812ae71f1852ca9a6b558101196cb1f8eb0bb69ff2a385ffd255357f1d48df80ac99240655dd765e1be4d00bf2487a50501be47a22de238a5299be3914 SHA512 4da65c9414bd04d2efddd7d7855235f1276d827258971bf3ae175c73ab9c1b57a4f089b27e22928d1ed869e4e14cfde2f5e7c6a31ddf63c8dc582d0a2384cfcf
-DIST patch.4.6.21.4 41501 BLAKE2B 5cd304b53076ddd85a034c4d6313c8ea88b3aa8a202244825743fbd6bdc233f3549fe153b01affb021cf693a36c1b02ca47aa07596f7be80f3909aa40ef0c6aa SHA512 cb7819d7b1742f09af352e7563344abef27f1db1bbf04be049710abd26fb12eda142a08ff3cd3449b0a4a406141e39bbb0535f08bff051efbd261e7fbe5b53be
-DIST patch.4.7.25.1 2072 BLAKE2B 773fb96f9c5995cee22931fcd504b9962d0c3407f7b42392358ebcc79b15ad5b4c39526494aa5bac88219d1713b69e0a23f0c8eb5151c7817c1354e20a5e10aa SHA512 6f8618a3acc7ebc2839d2786d66c85904b8a9805319178175298239a9441550f1c61dda544d7994931e2aa412cdf5c209d8bb2f38207cebca341c556b97b9191
-DIST patch.4.7.25.2 2210 BLAKE2B 3e9727a4e006fa8e4502f1481a44144458401d0df0eeea26eb135b1979f330f354cd5016f56b86400118f13fe29a92798b0dcf19581738d3e9cf83b9be1ebb6d SHA512 d57746a527574966606955a8ad6b97742ff3979e85a0d087ae0c33b64b4fc2fd854f3ac145e2efc061b3479de5ee8172a02183cf54ada91fce3e331ab948ff18
-DIST patch.4.7.25.3 8442 BLAKE2B 666b643b3bf0d1e5ef5e445ae03228f436a5528bc197338c3c9bd468d7002bc81a16e295cf34fe6b38903e7f65c2c5c3cd9be0a3227f1122aeda22afc165e2a9 SHA512 815560c45c9c8491fd58d881a0bc1d23a82a13298d4757ed7d2ae4df4b88b278b8e4d6063eb46349a8f6f11ca9aa5b8555f3ce01df025715c2579dfa36241238
-DIST patch.4.7.25.4 5647 BLAKE2B 60ecb24fb137f7aeacb9689d8edc41791f78f96d1aa15c7fa47032371533d668c5dc12a5e1641945402f0e21f4e596cebb5010ac170ef462279b2efb887be020 SHA512 df9810034773a9d0556cbd174e4f131f0461402bf3f476ae5da1deb92f3e2e9ef789687c5cc5c2df6385f6b14251e893be225ffacd895d71dfb305b9de32567e
diff --git a/sys-libs/db/db-1.85-r3.ebuild b/sys-libs/db/db-1.85-r3.ebuild
deleted file mode 100644
index 5b0be69857..0000000000
--- a/sys-libs/db/db-1.85-r3.ebuild
+++ /dev/null
@@ -1,60 +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-1.85-r3.ebuild,v 1.18 2014/01/18 04:14:32 vapier Exp $
-
-inherit eutils toolchain-funcs multilib multilib
-
-DESCRIPTION="old berk db kept around for really old packages"
-HOMEPAGE="http://www.oracle.com/technology/software/products/berkeley-db/db/index.html"
-SRC_URI="http://download.oracle.com/berkeley-db/db.${PV}.tar.gz
-		 mirror://gentoo/${PF}.1.patch.bz2"
-# The patch used by Gentoo is from Fedora, and includes all 5 patches found on
-# the Oracle page, plus others.
-
-LICENSE="Sleepycat"
-SLOT="1"
-KEYWORDS="~x64-macos"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/db.${PV}
-
-get_port() {
-	local port
-	case ${CHOST} in
-		*-aix*)     port=aix.3.2 ;;
-		*)          port=linux ;;
-	esac
-	echo $port
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${PF}.1.patch
-	epatch "${FILESDIR}"/${P}-gentoo-paths.patch
-	sed -i \
-		-e "s:@GENTOO_LIBDIR@:$(get_libdir):" \
-		PORT/$(get_port)/Makefile || die
-}
-
-src_compile() {
-	tc-export CC AR RANLIB
-	emake -C PORT/$(get_port) OORG="${CFLAGS}" || die
-}
-
-src_install() {
-	make -C PORT/$(get_port) install DESTDIR="${D}" || die
-
-	# binary compat symlink
-	dosym libdb1$(get_libname 2) /usr/$(get_libdir)/libdb$(get_libname 2) || die
-
-	dosed "s:<db.h>:<db1/db.h>:" /usr/include/db1/ndbm.h
-	dosym db1/ndbm.h /usr/include/ndbm.h
-
-	dodoc changelog README
-	newdoc hash/README README.hash
-	docinto ps
-	dodoc docs/*.ps
-}
diff --git a/sys-libs/db/db-3.2.9_p2.ebuild b/sys-libs/db/db-3.2.9_p2.ebuild
deleted file mode 100644
index 71aec865ea..0000000000
--- a/sys-libs/db/db-3.2.9_p2.ebuild
+++ /dev/null
@@ -1,183 +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-3.2.9_p2.ebuild,v 1.14 2014/01/18 04:14:32 vapier Exp $
-
-inherit eutils db 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
-
-DESCRIPTION="Berkeley DB for transaction support in MySQL"
-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="3"
-# This ebuild is to be the compatibility ebuild for when db4 is put
-# in the tree.
-KEYWORDS="~x64-macos"
-IUSE="doc"
-
-DEPEND="${RDEPEND}
-	=sys-libs/db-1.85*"
-
-# This doesn't build without exceptions
-export CXXFLAGS="${CXXFLAGS/-fno-exceptions/-fexceptions}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack "${MY_P}".tar.gz
-
-	chmod -R ug+w *
-
-	cd "${WORKDIR}"/"${MY_P}"
-	for (( i=1 ; i<=${PATCHNO} ; i++ ))
-	do
-		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
-	done
-
-	# Get db to link libdb* to correct dependencies ... for example if we use
-	# NPTL or NGPT, db detects usable mutexes, and should link against
-	# libpthread, but does not do so ...
-	# <azarah@gentoo.org> (23 Feb 2003)
-	epatch "${FILESDIR}"/${MY_P}-fix-dep-link.patch
-
-	# We should get dump185 to link against system db1 ..
-	# <azarah@gentoo.org> (23 Feb 2003)
-	mv "${S}"/dist/Makefile.in "${S}"/dist/Makefile.in.orig
-	sed -e 's:DB185INC=:DB185INC= -I/usr/include/db1:' \
-		-e 's:DB185LIB=:DB185LIB= -ldb1:' \
-		"${S}"/dist/Makefile.in.orig > "${S}"/dist/Makefile.in || die "Failed to sed"
-
-	epatch "${FILESDIR}"/${MY_P}-gcc43.patch
-
-	# Fix invalid .la files
-	cd "${WORKDIR}"/${MY_P}/dist
-	rm -f ltversion.sh
-	# remove config.guess else we have problems with gcc-3.2
-	rm -f config.guess
-	sed -i "s,\(-D_GNU_SOURCE\),\1 ${CFLAGS}," configure
-
-}
-
-src_compile() {
-	local conf=
-	local conf_shared=
-	local conf_static=
-
-	conf="${conf}
-		--host=${CHOST} \
-		--build=${CHOST} \
-		--enable-cxx \
-		--enable-compat185 \
-		--enable-dump185 \
-		--prefix=${EPREFIX}/usr"
-
-	# --enable-rpc DOES NOT BUILD
-	# Robin H. Johnson <robbat2@gentoo.org> (18 Oct 2003)
-
-	conf_shared="${conf_shared}
-		--enable-dynamic"
-
-	# TCL support is also broken
-	# Robin H. Johnson <robbat2@gentoo.org> (18 Oct 2003)
-	# conf_shared="${conf_shared}
-	#	`use_enable tcl tcl`
-	#	`use_with tcl tcl /usr/$(get_libdir)`"
-
-	# NOTE: we should not build both shared and static versions
-	#       of the libraries in the same build root!
-
-	einfo "Configuring ${P} (static)..."
-	mkdir -p "${S}"/build-static
-	cd "${S}"/build-static
-	strip=/bin/true \
-	ECONF_SOURCE="${S}"/dist econf \
-		${conf} ${conf_static} \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--disable-shared \
-		--enable-static || die
-
-	einfo "Configuring ${P} (shared)..."
-	mkdir -p "${S}"/build-shared
-	cd "${S}"/build-shared
-	strip=/bin/true \
-	ECONF_SOURCE="${S}"/dist econf \
-		${conf} ${conf_shared} \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--disable-static \
-		--enable-shared || die
-
-	# Parallel make does not work
-	MAKEOPTS="${MAKEOPTS} -j1"
-	einfo "Building ${P} (static)..."
-	cd "${S}"/build-static
-	emake strip=/bin/true || die "Static build failed"
-	einfo "Building ${P} (shared)..."
-	cd "${S}"/build-shared
-	emake strip=/bin/true || die "Shared build failed"
-}
-
-src_install () {
-	cd "${S}"/build-shared
-	make libdb=libdb-3.2.a \
-		libcxx=libcxx_3.2.a \
-		prefix="${ED}"/usr \
-		libdir="${ED}"/usr/$(get_libdir) \
-		strip="${EPREFIX}"/bin/true \
-		install || die
-
-	cd "${S}"/build-static
-	newlib.a libdb.a libdb-3.2.a || die "failed to package static libraries!"
-	newlib.a libdb_cxx.a libdb_cxx-3.2.a || die "failed to package static libraries!"
-
-	db_src_install_headerslot || die "db_src_install_headerslot failed!"
-
-	# this is now done in the db eclass, function db_fix_so and db_src_install_usrlibcleanup
-	#cd "${ED}"/usr/lib
-	#ln -s libdb-3.2.so libdb.so.3
-
-	# For some reason, db.so's are *not* readable by group or others,
-	# resulting in no one but root being able to use them!!!
-	# This fixes it -- DR 15 Jun 2001
-	cd "${ED}"/usr/$(get_libdir)
-	chmod go+rx *.so
-	# The .la's aren't readable either
-	chmod go+r *.la
-
-	cd "${S}"
-	dodoc README
-
-	db_src_install_doc || die "db_src_install_doc failed!"
-
-	db_src_install_usrbinslot || die "db_src_install_usrbinslot failed!"
-
-	db_src_install_usrlibcleanup || die "db_src_install_usrlibcleanup failed!"
-}
-
-pkg_postinst () {
-	db_fix_so
-}
-
-pkg_postrm () {
-	db_fix_so
-}
-
-src_test() {
-	if use test; then
-		eerror "We'd love to be able to test, but the testsuite is broken in the 3.2.9 series"
-	fi
-}
diff --git a/sys-libs/db/db-4.2.52_p5-r1.ebuild b/sys-libs/db/db-4.2.52_p5-r1.ebuild
deleted file mode 100644
index b1d07ed2f6..0000000000
--- a/sys-libs/db/db-4.2.52_p5-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p5-r1.ebuild,v 1.17 2014/01/18 04:14:32 vapier Exp $
-
-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="${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.2"
-KEYWORDS="~amd64-linux ~x86-linux ~x64-macos"
-IUSE="tcl java doc cxx rpc"
-
-DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-	java? ( >=virtual/jdk-1.4 )"
-RDEPEND="tcl? ( dev-lang/tcl )
-	java? ( >=virtual/jre-1.4 )"
-
-src_unpack() {
-	unpack "${MY_P}".tar.gz
-	cd "${WORKDIR}"/"${MY_P}"
-	for (( i=1 ; i<=${PATCHNO} ; i++ ))
-	do
-		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
-	done
-	epatch "${FILESDIR}"/"${PN}"-4.2.52_p2-TXN.patch
-	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
-
-	# use the includes from the prefix
-	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch
-	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-listen-to-java-options.patch
-	epatch "${FILESDIR}"/"${PN}"-4.0.14-fix-dep-link.patch
-
-	sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i 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}"/../dist/Makefile.in
-
-	# START of 4.5+earlier specific
-	# Upstream sucks, they normally concat these
-	cd "${S}"/../dist/aclocal
-	for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
-	cd "${S}"/../dist/aclocal_java
-	for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
-	# END of 4.5+earlier specific
-	cd "${S}"/../dist
-	rm -f aclocal/libtool.{m4,ac} aclocal.m4
-	sed -i \
-		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-		configure.ac
-	sed -i \
-		-e '/^AC_PATH_TOOL/s/ sh, missing_sh/ bash, missing_sh/' \
-		aclocal/programs.m4
-	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
-}
-
-src_compile() {
-	local myconf=""
-
-	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
-
-	myconf="${myconf} $(use_enable cxx)"
-
-	use tcl \
-		&& myconf="${myconf} --enable-tcl --with-tcl=${EPREFIX}/usr/$(get_libdir)" \
-		|| myconf="${myconf} --disable-tcl"
-
-	myconf="${myconf} $(use_enable java)"
-	if use java; then
-		myconf="${myconf} --with-java-prefix=${JAVA_HOME}"
-		# Can't get this working any other way, since it returns spaces, and
-		# bash doesn't seem to want to pass correctly in any way i try
-		local javaconf="-with-javac-flags=$(java-pkg_javac-args)"
-	fi
-
-	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
-
-	# the entire testsuite needs the TCL functionality
-	if use tcl && use test; then
-		myconf="${myconf} --enable-test"
-	else
-		myconf="${myconf} --disable-test"
-	fi
-
-	cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \
-		--prefix="${EPREFIX}"/usr \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--infodir="${EPREFIX}"/usr/share/info \
-		--datadir="${EPREFIX}"/usr/share \
-		--sysconfdir="${EPREFIX}"/etc \
-		--localstatedir="${EPREFIX}"/var/lib \
-		--libdir="${EPREFIX}"/usr/"$(get_libdir)" \
-		--enable-compat185 \
-		--with-uniquename \
-		$(use_enable rpc) \
-		--host="${CHOST}" \
-		${myconf} "${javaconf}" || die "configure failed"
-
-	# This isn't safe for prefix (Darwin should be .jnilib), but I can't get the
-	# build system to behave itself, it generates libtool too late.
-	sed -i \
-		-e 's/-shrext  $(SOFLAGS)/-shrext .so $(SOFLAGS)/g' \
-		Makefile
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall libdir="${ED}/usr/$(get_libdir)" strip="${ED}/bin/strip" || 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 "${ED}"/usr/bin/berkeley_db_svc ]] && \
-	mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
-
-	if 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
-}
-
-pkg_postinst() {
-	db_fix_so
-}
-
-pkg_postrm() {
-	db_fix_so
-}
diff --git a/sys-libs/db/db-4.3.29_p1-r1.ebuild b/sys-libs/db/db-4.3.29_p1-r1.ebuild
deleted file mode 100644
index 1adc8d6d78..0000000000
--- a/sys-libs/db/db-4.3.29_p1-r1.ebuild
+++ /dev/null
@@ -1,169 +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-4.3.29_p1-r1.ebuild,v 1.19 2014/01/18 04:14:32 vapier Exp $
-
-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="${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.3"
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="tcl java doc cxx rpc"
-
-DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-	java? ( >=virtual/jdk-1.4 )
-	!elibc_Darwin? ( >=sys-devel/binutils-2.16.1 )"
-RDEPEND="tcl? ( dev-lang/tcl )
-	java? ( >=virtual/jre-1.4 )"
-
-src_unpack() {
-	unpack "${MY_P}".tar.gz
-	cd "${WORKDIR}"/"${MY_P}"
-	for (( i=1 ; i<=${PATCHNO} ; i++ ))
-	do
-		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
-	done
-	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
-
-	# use the includes from the prefix
-	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch
-	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-listen-to-java-options.patch
-
-	epatch "${FILESDIR}"/"${PN}"-4.3.27-fix-dep-link.patch
-
-	sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i 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}"/../dist/Makefile.in
-
-	# START of 4.5+earlier specific
-	# Upstream sucks, they normally concat these
-	cd "${S}"/../dist/aclocal
-	for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
-	cd "${S}"/../dist/aclocal_java
-	for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
-	# END of 4.5+earlier specific
-	cd "${S}"/../dist
-	rm -f aclocal/libtool.{m4,ac} aclocal.m4
-	sed -i \
-		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-		configure.ac
-	sed -i \
-		-e '/^AC_PATH_TOOL/s/ sh, missing_sh/ bash, missing_sh/' \
-		aclocal/programs.m4
-	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
-}
-
-src_compile() {
-	local myconf=""
-
-	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
-
-	myconf="${myconf} $(use_enable cxx)"
-
-	use tcl \
-		&& myconf="${myconf} --enable-tcl --with-tcl=${EPREFIX}/usr/$(get_libdir)" \
-		|| myconf="${myconf} --disable-tcl"
-
-	myconf="${myconf} $(use_enable java)"
-	if use java; then
-		myconf="${myconf} --with-java-prefix=${JAVA_HOME}"
-		# Can't get this working any other way, since it returns spaces, and
-		# bash doesn't seem to want to pass correctly in any way i try
-		local javaconf="-with-javac-flags=$(java-pkg_javac-args)"
-	fi
-
-	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
-
-	# the entire testsuite needs the TCL functionality
-	if use tcl && use test ; then
-		myconf="${myconf} --enable-test"
-	else
-		myconf="${myconf} --disable-test"
-	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
-
-	cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \
-		--prefix=${EPREFIX}/usr \
-		--mandir=${EPREFIX}/usr/share/man \
-		--infodir=${EPREFIX}/usr/share/info \
-		--datadir=${EPREFIX}/usr/share \
-		--sysconfdir=${EPREFIX}/etc \
-		--localstatedir=${EPREFIX}/var/lib \
-		--libdir=${EPREFIX}/usr/"$(get_libdir)" \
-		--enable-compat185 \
-		--enable-o_direct \
-		--without-uniquename \
-		$(use_enable rpc) \
-		--host="${CHOST}" \
-		${myconf}  "${javaconf}" || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall libdir="${ED}/usr/$(get_libdir)" strip="${ED}/bin/strip"  || 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 "${ED}"/usr/bin/berkeley_db_svc ]] && \
-	mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
-
-	if 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
-}
-
-pkg_postinst() {
-	db_fix_so
-}
-
-pkg_postrm() {
-	db_fix_so
-}
diff --git a/sys-libs/db/db-4.4.20_p4-r1.ebuild b/sys-libs/db/db-4.4.20_p4-r1.ebuild
deleted file mode 100644
index 7bda05c864..0000000000
--- a/sys-libs/db/db-4.4.20_p4-r1.ebuild
+++ /dev/null
@@ -1,164 +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-4.4.20_p4-r1.ebuild,v 1.12 2014/01/18 04:14:32 vapier Exp $
-
-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="${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
-		 mirror://gentoo/${MY_P}-20060110-rpc_server-java.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 BSD"
-SLOT="4.4"
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="tcl java doc cxx rpc"
-
-DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-	java? ( >=virtual/jdk-1.4 )
-	!elibc_Darwin? ( >=sys-devel/binutils-2.16.1 )"
-RDEPEND="tcl? ( dev-lang/tcl )
-	java? ( >=virtual/jre-1.4 )"
-
-src_unpack() {
-	unpack "${MY_P}".tar.gz
-	unpack "${MY_P}-20060110-rpc_server-java".tar.gz
-	cd "${WORKDIR}"/"${MY_P}"
-	for (( i=1 ; i<=${PATCHNO} ; i++ ))
-	do
-		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
-	done
-	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
-
-	# use the includes from the prefix
-	epatch "${FILESDIR}"/"${PN}"-4.3-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
-
-	# 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
-
-	# START of 4.5+earlier specific
-	# Upstream sucks, they normally concat these
-	cd "${S}"/../dist/aclocal
-	for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
-	cd "${S}"/../dist/aclocal_java
-	for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
-	# END of 4.5+earlier specific
-	cd "${S}"/../dist
-	rm -f aclocal/libtool.{m4,ac} aclocal.m4
-	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
-}
-
-src_compile() {
-	local myconf=""
-
-	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
-
-	myconf="${myconf} $(use_enable cxx)"
-
-	use tcl \
-		&& myconf="${myconf} --enable-tcl --with-tcl=${EPREFIX}/usr/$(get_libdir)" \
-		|| myconf="${myconf} --disable-tcl"
-
-	myconf="${myconf} $(use_enable java)"
-	if use java; then
-		myconf="${myconf} --with-java-prefix=${JAVA_HOME}"
-		# Can't get this working any other way, since it returns spaces, and
-		# bash doesn't seem to want to pass correctly in any way i try
-		local javaconf="-with-javac-flags=$(java-pkg_javac-args)"
-	fi
-
-	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
-
-	# the entire testsuite needs the TCL functionality
-	if use tcl && use test ; then
-		myconf="${myconf} --enable-test"
-	else
-		myconf="${myconf} --disable-test"
-	fi
-
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	if [[ ${CHOST} == *-linux-gnu || ${CHOST} == *-solaris* ]] ; then
-		append-ldflags -Wl,--default-symver
-	fi
-
-	cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \
-		--prefix=${EPREFIX}/usr \
-		--mandir=${EPREFIX}/usr/share/man \
-		--infodir=${EPREFIX}/usr/share/info \
-		--datadir=${EPREFIX}/usr/share \
-		--sysconfdir=${EPREFIX}/etc \
-		--localstatedir=${EPREFIX}/var/lib \
-		--libdir=${EPREFIX}/usr/"$(get_libdir)" \
-		--enable-compat185 \
-		--enable-o_direct \
-		--without-uniquename \
-		$(use_enable rpc) \
-		--host="${CHOST}" \
-		${myconf} "{javaconf}" || die "configure failed"
-
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-
-	einstall libdir="${ED}/usr/$(get_libdir)" strip="${ED}/bin/strip" || 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 "${ED}"/usr/bin/berkeley_db_svc ]] && \
-	mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
-
-	if 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
-}
-
-pkg_postinst() {
-	db_fix_so
-}
-
-pkg_postrm() {
-	db_fix_so
-}
diff --git a/sys-libs/db/db-4.5.20_p2-r1.ebuild b/sys-libs/db/db-4.5.20_p2-r1.ebuild
deleted file mode 100644
index 06522758d6..0000000000
--- a/sys-libs/db/db-4.5.20_p2-r1.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2-r1.ebuild,v 1.20 2014/01/18 04:14:32 vapier Exp $
-
-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="${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.5"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="tcl java doc cxx rpc"
-
-DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-	java? ( >=virtual/jdk-1.4 )
-	|| ( sys-devel/binutils-apple
-		 sys-devel/native-cctools
-		 >=sys-devel/binutils-2.16.1
-	)"
-RDEPEND="tcl? ( dev-lang/tcl )
-	java? ( >=virtual/jre-1.4 )
-	x86-winnt? ( sys-libs/onc-rpc-nt )"
-
-src_unpack() {
-	unpack "${MY_P}".tar.gz
-	cd "${WORKDIR}"/"${MY_P}"
-	for (( i=1 ; i<=${PATCHNO} ; i++ ))
-	do
-		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
-	done
-
-	cd dist || die "Cannot cd to 'dist'"
-
-	# need to upgrade local copy of libtool.m4 (named libtool.ac)
-	# for correct shared libs on aix (#213277).
-	local mylibtoolize=libtoolize
-	[[ ${CHOST} == *-darwin* ]] && mylibtoolize=glibtoolize
-	local mylt=$(type -P ${mylibtoolize})
-	cp -f "${mylt%/bin/${mylibtoolize}}"/share/aclocal/libtool.m4 aclocal/libtool.ac \
-	|| die "cannot update libtool.ac from libtool.m4"
-
-	# need to upgrade ltmain.sh for AIX,
-	# but aclocal.m4 is created in ./s_config,
-	# and elibtoolize does not work when there is no aclocal.m4, so:
-	if type -P glibtoolize > /dev/null ; then
-		glibtoolize --force --copy || die "glibtoolize failed."
-	else
-		libtoolize --force --copy || die "libtoolize failed."
-	fi
-	# now let shipped script do the autoconf stuff, it really knows best.
-	#see below
-	#sh ./s_config || die "Cannot execute ./s_config"
-
-	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
-
-	# use the includes from the prefix
-	epatch "${FILESDIR}"/"${PN}"-4.3-jni-check-prefix-first.patch
-	epatch "${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch
-	
-	# rpcgen check is broken on machines where there is a
-	# ${CHOST}-rpcgen...
-	epatch "${FILESDIR}"/${PN}-4.5-rpcgen.patch
-
-	# winnt patches (depends on rpcgen patch too!)
-	[[ ${CHOST} == *-winnt* ]] && epatch "${FILESDIR}"/${PN}-4.5-winnt.patch
-
-	sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i 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}"/../dist/Makefile.in
-
-	# START of 4.5+earlier specific
-	# Upstream sucks, they normally concat these
-	cd "${S}"/../dist/aclocal
-	for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
-	cd "${S}"/../dist/aclocal_java
-	for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
-	# END of 4.5+earlier specific
-	cd "${S}"/../dist
-	rm -f aclocal/libtool.{m4,ac} aclocal.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
-	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
-}
-
-src_compile() {
-	# 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
-
-	local myconf=""
-
-	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
-
-	myconf="${myconf} $(use_enable cxx)"
-
-	use tcl \
-		&& myconf="${myconf} --enable-tcl --with-tcl=${EPREFIX}/usr/$(get_libdir)" \
-		|| myconf="${myconf} --disable-tcl"
-
-	myconf="${myconf} $(use_enable java)"
-	if use java; then
-		myconf="${myconf} --with-java-prefix=${JAVA_HOME}"
-		# Can't get this working any other way, since it returns spaces, and
-		# bash doesn't seem to want to pass correctly in any way i try
-		local javaconf="-with-javac-flags=$(java-pkg_javac-args)"
-	fi
-
-	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
-
-	# the entire testsuite needs the TCL functionality
-	if use tcl && use test ; then
-		myconf="${myconf} --enable-test"
-	else
-		myconf="${myconf} --disable-test"
-	fi
-
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	if [[ ${CHOST} == *-linux-gnu || ${CHOST} == *-solaris* ]] ; then
-		# we hopefully use a GNU binutils linker in this case
-		append-ldflags -Wl,--default-symver
-	fi
-	
-	if [[ ${CHOST} == *-winnt* ]]; then
-		# this one should really sound --enable-windows, but
-		# seems the db devs only support mingw ... doesn't enable
-		# anything too specific to mingw.
-		myconf="${myconf} --enable-mingw"
-		myconf="${myconf} --with-mutex=win32"
-	fi
-
-	cd "${S}" && ECONF_SOURCE="${S}"/../dist CC=$(tc-getCC) econf \
-		--prefix="${EPREFIX}"/usr \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--infodir="${EPREFIX}"/usr/share/info \
-		--datadir="${EPREFIX}"/usr/share \
-		--sysconfdir="${EPREFIX}"/etc \
-		--localstatedir="${EPREFIX}"/var/lib \
-		--libdir="${EPREFIX}"/usr/"$(get_libdir)" \
-		--enable-compat185 \
-		--enable-o_direct \
-		--without-uniquename \
-		$(use_enable rpc) \
-		--host="${CHOST}" \
-		${myconf} "${javaconf}" || die "configure failed"
-
-	sed -e "s,\(^STRIP *=\).*,\1\"true\"," Makefile > Makefile.cpy \
-	    && mv Makefile.cpy Makefile
-
-	# FreeBSD contains a broken version of rpcgen, see 
-	# http://lists.freebsd.org/pipermail/freebsd-bugs/2005-August/014086.html
-	sed -i -e "s/^extern  \(void db_rpc_serverprog_\)/static \1/" db_server.h || die "failed to fix FreeBSD brokeness"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall libdir="${ED}/usr/$(get_libdir)" STRIP="true" || 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 "${ED}"/usr/bin/berkeley_db_svc ]] && \
-	mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
-
-	if 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
-}
-
-pkg_postinst() {
-	db_fix_so
-}
-
-pkg_postrm() {
-	db_fix_so
-}
diff --git a/sys-libs/db/db-4.6.21_p4.ebuild b/sys-libs/db/db-4.6.21_p4.ebuild
deleted file mode 100644
index 070f439096..0000000000
--- a/sys-libs/db/db-4.6.21_p4.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.6.21_p4.ebuild,v 1.16 2014/01/18 04:14:32 vapier Exp $
-
-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="${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.6"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="tcl java doc cxx rpc"
-
-DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-	java? ( >=virtual/jdk-1.4 )
-	|| ( sys-devel/binutils-apple
-		 sys-devel/native-cctools
-		 >=sys-devel/binutils-2.16.1
-	)"
-RDEPEND="tcl? ( dev-lang/tcl )
-	java? ( >=virtual/jre-1.4 )
-	x86-winnt? ( sys-libs/onc-rpc-nt )"
-
-src_unpack() {
-	unpack "${MY_P}".tar.gz
-	cd "${WORKDIR}"/"${MY_P}"
-	for (( i=1 ; i<=${PATCHNO} ; i++ ))
-	do
-		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
-	done
-
-	epatch "${FILESDIR}"/${PN}-4.6-interix.patch
-
-	cd dist || die "Cannot cd to 'dist'"
-
-	# need to upgrade local copy of libtool.m4
-	# for correct shared libs on aix (#213277).
-	local mylibtoolize=libtoolize
-	[[ ${CHOST} == *-darwin* ]] && mylibtoolize=glibtoolize
-	local mylt=$(type -P ${mylibtoolize})
-	cp -f "${mylt%/bin/${mylibtoolize}}"/share/aclocal/libtool.m4 aclocal/libtool.m4 \
-	|| die "cannot update libtool.ac from libtool.m4"
-
-	# need to upgrade ltmain.sh for AIX,
-	# but aclocal.m4 is created in ./s_config,
-	# and elibtoolize does not work when there is no aclocal.m4, so:
-	if type -P glibtoolize > /dev/null ; then
-		glibtoolize --force --copy || die "glibtoolize failed."
-	else
-		libtoolize --force --copy || die "libtoolize failed."
-	fi
-	# now let shipped script do the autoconf stuff, it really knows best.
-	#see below
-	#sh ./s_config || die "Cannot execute ./s_config"
-
-	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
-
-	# use the includes from the prefix
-	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch
-	epatch "${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch
-
-	cd "${WORKDIR}"/"${MY_P}"
-	[[ ${CHOST} == *-winnt* ]] && epatch "${FILESDIR}"/${PN}-4.6-winnt.patch
-
-	sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i 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}"/../dist/Makefile.in
-
-	cd "${S}"/../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
-	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
-}
-
-src_compile() {
-	# 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
-
-	local myconf=""
-
-	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
-
-	myconf="${myconf} $(use_enable cxx)"
-
-	use tcl \
-		&& myconf="${myconf} --enable-tcl --with-tcl=${EPREFIX}/usr/$(get_libdir)" \
-		|| myconf="${myconf} --disable-tcl"
-
-	myconf="${myconf} $(use_enable java)"
-	if use java; then
-		myconf="${myconf} --with-java-prefix=${JAVA_HOME}"
-		# Can't get this working any other way, since it returns spaces, and
-		# bash doesn't seem to want to pass correctly in any way i try
-		local javaconf="-with-javac-flags=$(java-pkg_javac-args)"
-	fi
-
-	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
-
-	# the entire testsuite needs the TCL functionality
-	if use tcl && use test ; then
-		myconf="${myconf} --enable-test"
-	else
-		myconf="${myconf} --disable-test"
-	fi
-
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	if [[ ${CHOST} == *-linux-gnu || ${CHOST} == *-solaris* ]] ; then
-		# we hopefully use a GNU binutils linker in this case
-		append-ldflags -Wl,--default-symver
-	fi
-	
-	if [[ ${CHOST} == *-winnt* ]]; then
-		# this one should really sound --enable-windows, but
-		# seems the db devs only support mingw ... doesn't enable
-		# anything too specific to mingw.
-		myconf="${myconf} --enable-mingw"
-		myconf="${myconf} --with-mutex=win32"
-	fi
-
-	cd "${S}" && ECONF_SOURCE="${S}"/../dist CC=$(tc-getCC) econf \
-		--prefix="${EPREFIX}"/usr \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--infodir="${EPREFIX}"/usr/share/info \
-		--datadir="${EPREFIX}"/usr/share \
-		--sysconfdir="${EPREFIX}"/etc \
-		--localstatedir="${EPREFIX}"/var/lib \
-		--libdir="${EPREFIX}"/usr/"$(get_libdir)" \
-		--enable-compat185 \
-		--enable-o_direct \
-		--without-uniquename \
-		$(use_enable rpc) \
-		--host="${CHOST}" \
-		${myconf} "${javaconf}" || die "configure failed"
-
-	sed -e "s,\(^STRIP *=\).*,\1\"true\"," Makefile > Makefile.cpy \
-	    && mv Makefile.cpy Makefile
-
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall libdir="${ED}/usr/$(get_libdir)" STRIP="true" || 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 "${ED}"/usr/bin/berkeley_db_svc ]] && \
-	mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
-
-	if 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
-}
-
-pkg_postinst() {
-	db_fix_so
-}
-
-pkg_postrm() {
-	db_fix_so
-}
diff --git a/sys-libs/db/db-4.7.25_p4.ebuild b/sys-libs/db/db-4.7.25_p4.ebuild
deleted file mode 100644
index e147ff296e..0000000000
--- a/sys-libs/db/db-4.7.25_p4.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.7.25_p4.ebuild,v 1.18 2014/01/18 04:14:32 vapier Exp $
-
-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="${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.7"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc java cxx tcl test rpc"
-
-# 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-apple
-		 sys-devel/native-cctools
-		 >=sys-devel/binutils-2.16.1
-	)"
-RDEPEND="tcl? ( dev-lang/tcl )
-	java? ( >=virtual/jre-1.5 )"
-
-src_unpack() {
-	unpack "${MY_P}".tar.gz
-	cd "${WORKDIR}"/"${MY_P}"
-	for (( i=1 ; i<=${PATCHNO} ; i++ ))
-	do
-		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
-	done
-	epatch "${FILESDIR}"/"${PN}"-4.6-libtool.patch
-
-	epatch "${FILESDIR}"/${PN}-4.6-interix.patch
-
-	cd dist || die "Cannot cd to 'dist'"
-
-	# need to upgrade local copy of libtool.m4
-	# for correct shared libs on aix (#213277).
-	cp -f "${EPREFIX}"/usr/share/aclocal/libtool.m4 aclocal/libtool.m4 \
-	|| die "cannot update libtool.ac from libtool.m4"
-
-	# need to upgrade ltmain.sh for AIX,
-	# but aclocal.m4 is created in ./s_config,
-	# and elibtoolize does not work when there is no aclocal.m4, so:
-	if type -P glibtoolize > /dev/null ; then
-		glibtoolize --force --copy || die "glibtoolize failed."
-	else
-		libtoolize --force --copy || die "libtoolize failed."
-	fi
-	# now let shipped script do the autoconf stuff, it really knows best.
-	#see code below
-	#sh ./s_config || die "Cannot execute ./s_config"
-
-	# 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
-
-	# 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
-
-	cd "${S}"/../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
-	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
-}
-
-src_compile() {
-	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 [[ ${CHOST} == *-linux-gnu || ${CHOST} == *-solaris* ]] ; then
-		# we hopefully use a GNU binutils linker in this case
-		append-ldflags -Wl,--default-symver
-	fi
-
-	tc-export CC CXX # would use CC=xlc_r on aix if not set
-
-	# Bug #270851: test needs TCL support
-	if use tcl || use test ; then
-		myconf="${myconf} --enable-tcl"
-		myconf="${myconf} --with-tcl=${EPREFIX}/usr/$(get_libdir)"
-	else
-		myconf="${myconf} --disable-tcl"
-	fi
-
-	cd "${S}"
-	ECONF_SOURCE="${S}"/../dist \
-	STRIP="true" \
-	econf \
-		--enable-compat185 \
-		--enable-o_direct \
-		--without-uniquename \
-		$(use_enable rpc) \
-		$(use arm && echo --with-mutex=ARM/gcc-assembly) \
-		$(use amd64 && echo --with-mutex=x86/gcc-assembly) \
-		$(use_enable cxx) \
-		$(use_enable java) \
-		${myconf} \
-		$(use_enable test) \
-		"$@"
-
-	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 "${ED}"/usr/bin/berkeley_db_svc ]] && \
-	mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
-
-	if 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
-}
-
-pkg_postinst() {
-	db_fix_so
-}
-
-pkg_postrm() {
-	db_fix_so
-}
diff --git a/sys-libs/db/db-4.8.30-r2.ebuild b/sys-libs/db/db-4.8.30-r2.ebuild
deleted file mode 100644
index 8bac512270..0000000000
--- a/sys-libs/db/db-4.8.30-r2.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2017 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.12 2015/03/20 14:41:50 jlec Exp $
-
-EAPI=5
-
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal toolchain-funcs
-
-#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="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-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:0=[${MULTILIB_USEDEP}] )
-	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.5 )
-	|| ( sys-devel/binutils-apple
-		 sys-devel/native-cctools
-		 >=sys-devel/binutils-2.16.1
-	)"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${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
-
-	epatch "${FILESDIR}"/${PN}-4.6-interix.patch
-
-	pushd dist > /dev/null || die "Cannot cd to 'dist'"
-
-	# need to upgrade local copy of libtool.m4
-	# for correct shared libs on aix (#213277).
-	local g="" ; type -P glibtoolize > /dev/null && g=g
-	local _ltpath="$(dirname "$(dirname "$(type -P ${g}libtoolize)")")"
-	cp -f "${_ltpath}"/share/aclocal/libtool.m4 aclocal/libtool.m4 \
-		|| die "cannot update libtool.ac from libtool.m4"
-
-	# need to upgrade ltmain.sh for AIX,
-	# but aclocal.m4 is created in ./s_config,
-	# and elibtoolize does not work when there is no aclocal.m4, so:
-	${g}libtoolize --force --copy || die "${g}libtoolize failed."
-	# now let shipped script do the autoconf stuff, it really knows best.
-	#see code below
-	#sh ./s_config || die "Cannot execute ./s_config"
-
-	# 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
-
-	popd > /dev/null
-
-	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 [[ ${CHOST} == *-linux-gnu || ${CHOST} == *-solaris* ]] ; then
-		# we hopefully use a GNU binutils linker in this case
-		append-ldflags -Wl,--default-symver
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	tc-ld-disable-gold #470634
-
-	# 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
-
-	tc-export CC CXX # would use CC=xlc_r on aix if not set
-
-	# Bug #270851: test needs TCL support
-	if use tcl || use test ; then
-		myconf+=(
-			--enable-tcl
-			--with-tcl=${EPREFIX}/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 "${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() {
-	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 "${ED}"/usr/bin/berkeley_db_svc ]] ; then
-		mv "${ED}"/usr/bin/berkeley_db_svc \
-			"${ED}"/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-4.8.30.ebuild b/sys-libs/db/db-4.8.30.ebuild
deleted file mode 100644
index 6f1ff4af0f..0000000000
--- a/sys-libs/db/db-4.8.30.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2017 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.20 2015/03/20 14:41:50 jlec 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="${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="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc java cxx tcl test"
-
-# the entire testsuite needs the TCL functionality
-DEPEND="tcl? ( >=dev-lang/tcl-8.4:0 )
-	test? ( >=dev-lang/tcl-8.4:0 )
-	java? ( >=virtual/jdk-1.5 )
-	|| ( sys-devel/binutils-apple
-		 sys-devel/native-cctools
-		 >=sys-devel/binutils-2.16.1
-	)"
-RDEPEND="tcl? ( dev-lang/tcl:0 )
-	java? ( >=virtual/jre-1.5 )"
-
-src_unpack() {
-	unpack "${MY_P}".tar.gz
-}
-
-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
-
-	epatch "${FILESDIR}"/${PN}-4.6-interix.patch
-
-	pushd dist > /dev/null || die "Cannot cd to 'dist'"
-
-	# need to upgrade local copy of libtool.m4
-	# for correct shared libs on aix (#213277).
-	local g="" ; type -P glibtoolize > /dev/null && g=g
-	local _ltpath="$(dirname "$(dirname "$(type -P ${g}libtoolize)")")"
-	cp -f "${_ltpath}"/share/aclocal/libtool.m4 aclocal/libtool.m4 \
-		|| die "cannot update libtool.ac from libtool.m4"
-
-	# need to upgrade ltmain.sh for AIX,
-	# but aclocal.m4 is created in ./s_config,
-	# and elibtoolize does not work when there is no aclocal.m4, so:
-	${g}libtoolize --force --copy || die "${g}libtoolize failed."
-	# now let shipped script do the autoconf stuff, it really knows best.
-	#see code below
-	#sh ./s_config || die "Cannot execute ./s_config"
-
-	# 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
-
-	popd > /dev/null
-
-	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() {
-	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 [[ ${CHOST} == *-linux-gnu || ${CHOST} == *-solaris* ]] ; then
-		# we hopefully use a GNU binutils linker in this case
-		append-ldflags -Wl,--default-symver
-	fi
-
-	tc-export CC CXX # would use CC=xlc_r on aix if not set
-
-	# Bug #270851: test needs TCL support
-	if use tcl || use test ; then
-		myconf="${myconf} --enable-tcl"
-		myconf="${myconf} --with-tcl=${EPREFIX}/usr/$(get_libdir)"
-	else
-		myconf="${myconf} --disable-tcl"
-	fi
-
-	ECONF_SOURCE="${S}"/../dist \
-	STRIP="true" \
-	econf \
-		--enable-compat185 \
-		--enable-o_direct \
-		--without-uniquename \
-		$(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 "${ED}"/usr/bin/berkeley_db_svc ]] ; then
-		mv "${ED}"/usr/bin/berkeley_db_svc \
-			"${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
-	fi
-
-	if use java; then
-		local ext=so
-		[[ ${CHOST} == *-darwin* ]] && ext=jnilib #313085
-		java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.${ext}
-		java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
-	fi
-}
-
-pkg_postinst() {
-	db_fix_so
-}
-
-pkg_postrm() {
-	db_fix_so
-}
diff --git a/sys-libs/db/db-5.1.29-r1.ebuild b/sys-libs/db/db-5.1.29-r1.ebuild
deleted file mode 100644
index 4eb5e24438..0000000000
--- a/sys-libs/db/db-5.1.29-r1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.1.29-r1.ebuild,v 1.3 2015/03/20 14:41:50 jlec Exp $
-
-EAPI=5
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib toolchain-funcs
-
-#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.1"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc java cxx tcl test"
-
-REQUIRED_USE="test? ( tcl )"
-
-# the entire testsuite needs the TCL functionality
-DEPEND="tcl? ( >=dev-lang/tcl-8.4:0 )
-	test? ( >=dev-lang/tcl-8.4:0 )
-	java? ( >=virtual/jdk-1.5 )
-	|| ( sys-devel/binutils-apple
-		 sys-devel/native-cctools
-		 >=sys-devel/binutils-2.16.1
-	)"
-RDEPEND="tcl? ( dev-lang/tcl:0 )
-	java? ( >=virtual/jre-1.5 )"
-
-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
-	epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-	epatch "${FILESDIR}"/${PN}-4.8.30-rename-atomic-compare-exchange.patch
-	# Set of patches to make this thing compile with C++11, Oracle
-	# promised to fix this for the next release
-	# https://community.oracle.com/thread/3952592
-	epatch "${FILESDIR}"/${PN}-6.2-c++11.patch
-
-	pushd dist > /dev/null || die "Cannot cd to 'dist'"
-
-	# need to upgrade local copy of libtool.m4
-	# for correct shared libs on aix (#213277).
-	local g="" ; type -P glibtoolize > /dev/null && g=g
-	local _ltpath="$(dirname "$(dirname "$(type -P ${g}libtoolize)")")"
-	cp -f "${_ltpath}"/share/aclocal/libtool.m4 aclocal/libtool.m4 \
-		|| die "cannot update libtool.ac from libtool.m4"
-
-	# need to upgrade ltmain.sh for AIX,
-	# but aclocal.m4 is created in ./s_config,
-	# and elibtoolize does not work when there is no aclocal.m4, so:
-	${g}libtoolize --force --copy || die "${g}libtoolize failed."
-	# now let shipped script do the autoconf stuff, it really knows best.
-	#see code below
-	#sh ./s_config || die "Cannot execute ./s_config"
-
-	# 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
-
-	popd > /dev/null
-
-	# 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
-
-	# 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=''
-
-	tc-ld-disable-gold #470634
-
-	# 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 [[ ${CHOST} == *-linux-gnu || ${CHOST} == *-solaris* ]] ; then
-		# we hopefully use a GNU binutils linker in this case
-		append-ldflags -Wl,--default-symver
-	fi
-
-	tc-export CC CXX # would use CC=xlc_r on aix if not set
-
-	# Bug #270851: test needs TCL support
-	if use tcl || use test ; then
-		myconf="${myconf} --enable-tcl"
-		myconf="${myconf} --with-tcl=${EPREFIX}/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 "${ED}"/usr/bin/berkeley_db_svc ]] && \
-	mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
-
-	if use java; then
-		local ext=so
-		[[ ${CHOST} == *-darwin* ]] && ext=jnilib #313085
-		java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.${ext}
-		java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED}"/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"
-
-	db_src_test
-}
diff --git a/sys-libs/db/db-5.3.28-r3.ebuild b/sys-libs/db/db-5.3.28-r3.ebuild
deleted file mode 100644
index 695ebf4f91..0000000000
--- a/sys-libs/db/db-5.3.28-r3.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal toolchain-funcs
-
-#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/technetwork/database/database-technologies/berkeleydb/overview/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="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-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:0=[${MULTILIB_USEDEP}] )
-	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.5 )
-	|| ( sys-devel/binutils-apple
-		 sys-devel/native-cctools
-		 >=sys-devel/binutils-2.16.1
-	)"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/db5.3/db.h
-)
-
-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
-	# Set of patches to make this thing compile with C++11, Oracle
-	# promised to fix this for the next release
-	# https://community.oracle.com/thread/3952592
-	epatch "${FILESDIR}"/${PN}-6.2-c++11.patch
-
-	pushd dist > /dev/null || die "Cannot cd to 'dist'"
-
-	# need to upgrade local copy of libtool.m4
-	# for correct shared libs on aix (#213277).
-	local g="" ; type -P glibtoolize > /dev/null && g=g
-	local _ltpath="$(dirname "$(dirname "$(type -P ${g}libtoolize)")")"
-	cp -f "${_ltpath}"/share/aclocal/libtool.m4 aclocal/libtool.m4 \
-		|| die "cannot update libtool.ac from libtool.m4"
-
-	# need to upgrade ltmain.sh for AIX,
-	# but aclocal.m4 is created in ./s_config,
-	# and elibtoolize does not work when there is no aclocal.m4, so:
-	${g}libtoolize --force --copy || die "${g}libtoolize failed."
-	# now let shipped script do the autoconf stuff, it really knows best.
-	#see code below
-	#sh ./s_config || die "Cannot execute ./s_config"
-
-	# 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
-
-	popd > /dev/null
-
-	# 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
-
-	# Needed when compiling with clang
-	epatch "${FILESDIR}"/${PN}-5.1.29-rename-atomic-compare-exchange.patch
-
-	epatch "${FILESDIR}"/${PN}-6.0.35-winnt.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
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	tc-ld-disable-gold #470634
-
-	# 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
-
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	if [[ ${CHOST} == *-linux-gnu || ${CHOST} == *-solaris* ]] ; then
-		# we hopefully use a GNU binutils linker in this case
-		append-ldflags -Wl,--default-symver
-	fi
-
-	tc-export CC CXX # would use CC=xlc_r on aix if not set
-
-	# 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="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		myconf+=(--disable-tcl )
-	fi
-
-	if [[ ${CHOST} == *-winnt* ]]; then
-		# this one should really sound --enable-windows, but
-		# seems the db devs only support mingw ... doesn't enable
-		# anything too specific to mingw.
-		myconf+=(--enable-mingw)
-		myconf+=(--with-mutex=win32)
-	fi
-
-	# sql_compat will cause a collision with sqlite3
-	# --enable-sql_compat
-	# Don't --enable-sql* because we don't want to use bundled sqlite.
-	# See Gentoo bug #605688
-	ECONF_SOURCE="${S_BASE}"/dist \
-	STRIP="true" \
-	econf \
-		--enable-compat185 \
-		--enable-dbm \
-		--enable-o_direct \
-		--without-uniquename \
-		--disable-sql \
-		--disable-sql_codegen \
-		--disable-sql_compat \
-		$([[ ${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_install() {
-	emake install DESTDIR="${D}"
-
-	db_src_install_headerslot
-
-	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		local ext=so
-		[[ ${CHOST} == *-darwin* ]] && ext=jnilib #313085
-		java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.${ext}
-		java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED}"/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 "${ED}"/usr/bin/berkeley_db_svc ]] ; then
-		mv "${ED}"/usr/bin/berkeley_db_svc \
-			"${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
-	fi
-}
-
-pkg_postinst() {
-	multilib_foreach_abi db_fix_so
-}
-
-pkg_postrm() {
-	multilib_foreach_abi 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
-
-	multilib-minimal_src_test
-}
-
-multilib_src_test() {
-	multilib_is_native_abi || return
-
-	S=${BUILD_DIR} db_src_test
-}
diff --git a/sys-libs/db/db-6.0.35-r1.ebuild b/sys-libs/db/db-6.0.35-r1.ebuild
deleted file mode 100644
index 7f2530ae61..0000000000
--- a/sys-libs/db/db-6.0.35-r1.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal versionator toolchain-funcs
-
-#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/technetwork/database/database-technologies/berkeleydb/overview/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="$(get_version_component_range 1-2)"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-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:0=[${MULTILIB_USEDEP}] )
-	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.5 )
-	|| ( sys-devel/binutils-apple
-		 sys-devel/native-cctools
-		 >=sys-devel/binutils-2.16.1
-	)"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/db$(get_version_component_range 1-2)/db.h
-)
-
-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
-	# Set of patches to make this thing compile with C++11, Oracle
-	# promised to fix this for the next release
-	# https://community.oracle.com/thread/3952592
-	epatch "${FILESDIR}"/${PN}-6.2-c++11.patch
-
-	pushd dist > /dev/null || die "Cannot cd to 'dist'"
-
-	# need to upgrade local copy of libtool.m4
-	# for correct shared libs on aix (#213277).
-	local g="" ; type -P glibtoolize > /dev/null && g=g
-	local _ltpath="$(dirname "$(dirname "$(type -P ${g}libtoolize)")")"
-	cp -f "${_ltpath}"/share/aclocal/libtool.m4 aclocal/libtool.m4 \
-		|| die "cannot update libtool.ac from libtool.m4"
-
-	# need to upgrade ltmain.sh for AIX,
-	# but aclocal.m4 is created in ./s_config,
-	# and elibtoolize does not work when there is no aclocal.m4, so:
-	${g}libtoolize --force --copy || die "${g}libtoolize failed."
-	# now let shipped script do the autoconf stuff, it really knows best.
-	#see code below
-	#sh ./s_config || die "Cannot execute ./s_config"
-
-	# 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
-
-	popd > /dev/null
-
-	# 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
-	epatch "${FILESDIR}"/${PN}-6.0.35-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
-
-	epatch "${FILESDIR}"/${PN}-6.0.35-winnt.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
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	tc-ld-disable-gold #470634
-
-	# 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
-
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	if [[ ${CHOST} == *-linux-gnu || ${CHOST} == *-solaris* ]] ; then
-		append-ldflags -Wl,--default-symver
-	fi
-
-	tc-export CC CXX # would use CC=xlc_r on aix if not set
-
-	# 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="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		myconf+=(--disable-tcl )
-	fi
-
-	if [[ ${CHOST} == *-winnt* ]]; then
-		# this one should really sound --enable-windows, but
-		# seems the db devs only support mingw ... doesn't enable
-		# anything too specific to mingw.
-		myconf+=(--enable-mingw)
-		myconf+=(--with-mutex=win32)
-	fi
-
-	# sql_compat will cause a collision with sqlite3
-	# --enable-sql_compat
-	# Don't --enable-sql* because we don't want to use bundled sqlite.
-	# See Gentoo bug #605688
-	ECONF_SOURCE="${S_BASE}"/dist \
-	STRIP="true" \
-	econf \
-		--enable-compat185 \
-		--enable-dbm \
-		--enable-o_direct \
-		--without-uniquename \
-		--disable-sql \
-		--disable-sql_codegen \
-		--disable-sql_compat \
-		$([[ ${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_install() {
-	emake install DESTDIR="${D}"
-
-	db_src_install_headerslot
-
-	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		local ext=so
-		[[ ${CHOST} == *-darwin* ]] && ext=jnilib #313085
-		java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.${ext}
-		java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED}"/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 "${ED}"/usr/bin/berkeley_db_svc ]] ; then
-		mv "${ED}"/usr/bin/berkeley_db_svc \
-			"${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
-	fi
-}
-
-pkg_postinst() {
-	multilib_foreach_abi db_fix_so
-}
-
-pkg_postrm() {
-	multilib_foreach_abi 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
-
-	multilib-minimal_src_test
-}
-
-multilib_src_test() {
-	multilib_is_native_abi || return
-
-	S=${BUILD_DIR} db_src_test
-}
diff --git a/sys-libs/db/db-6.1.29.ebuild b/sys-libs/db/db-6.1.29.ebuild
deleted file mode 100644
index e06058729a..0000000000
--- a/sys-libs/db/db-6.1.29.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal versionator toolchain-funcs
-
-#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/technetwork/database/database-technologies/berkeleydb/overview/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="$(get_version_component_range 1-2)"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-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:0=[${MULTILIB_USEDEP}] )
-	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.5 )
-	|| ( sys-devel/binutils-apple
-		 sys-devel/native-cctools
-		 >=sys-devel/binutils-2.16.1
-	)"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/db$(get_version_component_range 1-2)/db.h
-)
-
-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}-6.2-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/6.x
-	# still needs to be patched in 6.0.20
-	epatch "${FILESDIR}"/${PN}-6.1.19-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
-
-	# Set of patches to make this thing compile with C++11, Oracle
-	# promised to fix this for the next release
-	# https://community.oracle.com/thread/3952592
-	epatch "${FILESDIR}"/${PN}-6.2-c++11.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
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	tc-ld-disable-gold #470634
-
-	# 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
-
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	if [[ ${CHOST} == *-linux-gnu || ${CHOST} == *-solaris* ]] ; then
-		append-ldflags -Wl,--default-symver
-	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
-
-	tc-export CC CXX # would use CC=xlc_r on aix if not set
-
-	# Bug #270851: test needs TCL support
-	if use tcl || use test ; then
-		myconf+=(
-			--enable-tcl
-			--with-tcl="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		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 \
-		$([[ ${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_install() {
-	emake install DESTDIR="${D}"
-
-	db_src_install_headerslot
-
-	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		local ext=so
-		[[ ${CHOST} == *-darwin* ]] && ext=jnilib #313085
-		java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.${ext}
-		java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED}"/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 "${ED}"/usr/bin/berkeley_db_svc ]] ; then
-		mv "${ED}"/usr/bin/berkeley_db_svc \
-			"${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
-	fi
-}
-
-pkg_postinst() {
-	multilib_foreach_abi db_fix_so
-}
-
-pkg_postrm() {
-	multilib_foreach_abi 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
-
-	multilib-minimal_src_test
-}
-
-multilib_src_test() {
-	multilib_is_native_abi || return
-
-	S=${BUILD_DIR} db_src_test
-}
diff --git a/sys-libs/db/db-6.2.23.ebuild b/sys-libs/db/db-6.2.23.ebuild
deleted file mode 100644
index b0a217be20..0000000000
--- a/sys-libs/db/db-6.2.23.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal versionator toolchain-funcs
-
-#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/technetwork/database/database-technologies/berkeleydb/overview/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="$(get_version_component_range 1-2)"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-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:0=[${MULTILIB_USEDEP}] )
-	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.5 )
-	|| ( sys-devel/binutils-apple
-		 sys-devel/native-cctools
-		 >=sys-devel/binutils-2.16.1
-	)"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/db$(get_version_component_range 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.3-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
-	"${FILESDIR}"/${PN}-6.1.19-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.
-	"${FILESDIR}"/${PN}-6.0.20-test-link.patch
-
-	# Set of patches to make this thing compile with C++11, Oracle
-	# promised to fix this for the next release
-	# https://community.oracle.com/thread/3952592
-	"${FILESDIR}"/${PN}-6.2-c++11.patch
-)
-
-src_prepare() {
-	cd "${WORKDIR}"/"${MY_P}"
-	for (( i=1 ; i<=${PATCHNO} ; i++ ))
-	do
-		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
-	done
-
-	epatch "${PATCHES[@]}"
-	epatch_user
-
-	# 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
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	tc-ld-disable-gold #470634
-
-	# 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
-
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	if [[ ${CHOST} == *-linux-gnu || ${CHOST} == *-solaris* ]] ; then
-		append-ldflags -Wl,--default-symver
-	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
-
-	tc-export CC CXX # would use CC=xlc_r on aix if not set
-
-	# Bug #270851: test needs TCL support
-	if use tcl || use test ; then
-		myconf+=(
-			--enable-tcl
-			--with-tcl="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		myconf+=(--disable-tcl )
-	fi
-
-	# sql_compat will cause a collision with sqlite3
-	# --enable-sql_compat
-	# dbm or historic interface clashes with c++11 (llvm-3.8+)
-	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 \
-		$([[ ${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_install() {
-	emake install DESTDIR="${D}"
-
-	db_src_install_headerslot
-
-	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		local ext=so
-		[[ ${CHOST} == *-darwin* ]] && ext=jnilib #313085
-		java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.${ext}
-		java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED}"/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 "${ED}"/usr/bin/berkeley_db_svc ]] ; then
-		mv "${ED}"/usr/bin/berkeley_db_svc \
-			"${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
-	fi
-}
-
-pkg_postinst() {
-	multilib_foreach_abi db_fix_so
-}
-
-pkg_postrm() {
-	multilib_foreach_abi 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
-
-	multilib-minimal_src_test
-}
-
-multilib_src_test() {
-	multilib_is_native_abi || return
-
-	S=${BUILD_DIR} db_src_test
-}
diff --git a/sys-libs/db/files/db-1.85-gentoo-paths.patch b/sys-libs/db/files/db-1.85-gentoo-paths.patch
deleted file mode 100644
index 4a65106bdc..0000000000
--- a/sys-libs/db/files/db-1.85-gentoo-paths.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- PORT/linux/Makefile
-+++ PORT/linux/Makefile
-@@ -1,12 +1,12 @@
- #	@(#)Makefile	8.9 (Berkeley) 7/14/94
- 
--LIBDB=	libdb.a
--LIBDBSO=libdb.so
-+LIBDB=	libdb1.a
-+LIBDBSO=libdb1.so
- SOVER=2
- SONAME=$(LIBDBSO).$(SOVER)
- LIBNDBM=libndbm.a
- LIBNDBMSO=libndbm.so
--PROG=	db_dump185
-+PROG=	db1_dump185
- OBJ1=	hash.o hash_bigkey.o hash_buf.o hash_func.o hash_log2.o hash_page.o \
- 	ndbm.o
- OBJ2=	bt_close.o bt_conv.o bt_debug.o bt_delete.o bt_get.o bt_open.o \
-@@ -27,8 +27,8 @@
- DESTDIR =
- prefix = /usr
- bindir = $(prefix)/bin
--libdir = $(prefix)/lib
--includedir = $(prefix)/include
-+libdir = $(prefix)/@GENTOO_LIBDIR@
-+includedir = $(prefix)/include/db1
- 
- all: $(LIBDB) $(LIBDBSO) $(PROG)
- 
diff --git a/sys-libs/db/files/db-3.2.9-fix-dep-link.patch b/sys-libs/db/files/db-3.2.9-fix-dep-link.patch
deleted file mode 100644
index cdf6599b0d..0000000000
--- a/sys-libs/db/files/db-3.2.9-fix-dep-link.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- db-3.2.9/dist/Makefile.in.orig	2003-02-23 23:41:13.000000000 +0200
-+++ db-3.2.9/dist/Makefile.in	2003-02-23 23:42:07.000000000 +0200
-@@ -240,19 +240,19 @@
- 
- $(libso_target): $(OBJS)
- 	$(SOLINK) $(SOFLAGS) -o $(libso_target) \
--	    $(OBJS) $(LDFLAGS) $(LIBSO_LIBS)
-+	    $(OBJS) $(LDFLAGS) $(LIBS) $(LIBSO_LIBS)
- 
- $(libxso_target): $(COBJS) $(OBJS)
- 	$(SOLINK) $(SOFLAGS) -o $(libxso_target) \
--	    $(COBJS) $(OBJS) $(LDFLAGS) $(LIBXSO_LIBS)
-+	    $(COBJS) $(OBJS) $(LDFLAGS) $(LIBS) $(LIBXSO_LIBS)
- 
- $(libjso_target): $(JOBJS) $(OBJS)
- 	$(SOLINK) $(SOFLAGS) -o $(libjso_target) \
--	    $(JOBJS) $(OBJS) $(LDFLAGS) $(LIBJSO_LIBS)
-+	    $(JOBJS) $(OBJS) $(LDFLAGS) $(LIBS) $(LIBJSO_LIBS)
- 
- $(libtso_target): $(TOBJS) $(OBJS)
- 	$(SOLINK) $(SOFLAGS) -o $(libtso_target) \
--	    $(TOBJS) $(OBJS) $(LDFLAGS) $(LIBTSO_LIBS)
-+	    $(TOBJS) $(OBJS) $(LDFLAGS) $(LIBS) $(LIBTSO_LIBS)
- 
- ##################################################
- # Creating individual dependencies and actions for building class
diff --git a/sys-libs/db/files/db-3.2.9-gcc43.patch b/sys-libs/db/files/db-3.2.9-gcc43.patch
deleted file mode 100644
index f032da8529..0000000000
--- a/sys-libs/db/files/db-3.2.9-gcc43.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nuar db-3.2.9.orig/include/db_cxx.h db-3.2.9/include/db_cxx.h
---- db-3.2.9.orig/include/db_cxx.h	2001-01-11 10:28:55.000000000 -0800
-+++ db-3.2.9/include/db_cxx.h	2008-08-16 16:10:48.474699646 -0700
-@@ -49,7 +49,12 @@
- // Forward declarations
- //
- 
-+#if defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)
-+using namespace std;
-+#include <iostream>
-+#else
- #include <iostream.h>
-+#endif
- #include <stdarg.h>
- #include "db.h"
- 
diff --git a/sys-libs/db/files/db-4.0.14-fix-dep-link.patch b/sys-libs/db/files/db-4.0.14-fix-dep-link.patch
deleted file mode 100644
index f54f064640..0000000000
--- a/sys-libs/db/files/db-4.0.14-fix-dep-link.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- db-4.0.14/dist/Makefile.in.orig	2003-08-16 06:21:53.763400112 +0200
-+++ db-4.0.14/dist/Makefile.in	2003-08-16 06:23:16.036892640 +0200
-@@ -58,7 +58,7 @@
- 
- LDFLAGS=	@LDFLAGS@
- LIBS=		@LIBS@
--LIBSO_LIBS=	@LIBSO_LIBS@
-+LIBSO_LIBS=	@LIBSO_LIBS@ $(LIBS)
- 
- libdb=		libdb.a
- libso_base=	libdb
-@@ -77,7 +77,7 @@
- CXX=		@MAKEFILE_CXX@
- CXXLINK=	@MAKEFILE_CXXLINK@
- XSOLINK=	@MAKEFILE_XSOLINK@
--LIBXSO_LIBS=	@LIBXSO_LIBS@
-+LIBXSO_LIBS=	@LIBXSO_LIBS@ $(LIBS)
- 
- libcxx=		libdb_cxx.a
- libxso_base=	libdb_cxx
-@@ -93,7 +93,7 @@
- # Java support is optional and requires shared librarires.
- ##################################################
- CLASSPATH=	$(JAVA_CLASSTOP)
--LIBJSO_LIBS=	@LIBJSO_LIBS@
-+LIBJSO_LIBS=	@LIBJSO_LIBS@ $(LIBS)
- 
- JAR=		@JAR@
- JAVAC=		env CLASSPATH="$(CLASSPATH)" @JAVAC@
-@@ -121,7 +121,7 @@
- # Tcl support is optional and requires shared libraries.
- ##################################################
- TCFLAGS=	@TCFLAGS@
--LIBTSO_LIBS=	@LIBTSO_LIBS@
-+LIBTSO_LIBS=	@LIBTSO_LIBS@ $(LIBS)
- libtso_base=	libdb_tcl
- libtso=		$(libtso_base)-$(SOVERSION).@SOSUFFIX@
- libtso_static=	$(libtso_base)-$(SOVERSION).a
diff --git a/sys-libs/db/files/db-4.2-jni-check-prefix-first.patch b/sys-libs/db/files/db-4.2-jni-check-prefix-first.patch
deleted file mode 100644
index 17f80e1bcf..0000000000
--- a/sys-libs/db/files/db-4.2-jni-check-prefix-first.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- dist/aclocal_java/ac_jni_include_dirs.ac	2003-10-06 20:41:38.000000000 +0200
-+++ dist/aclocal_java/ac_jni_include_dirs.ac	2005-09-23 21:31:26.000000000 +0200
-@@ -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.2-libtool.patch b/sys-libs/db/files/db-4.2-libtool.patch
deleted file mode 100644
index a4a9db7f45..0000000000
--- a/sys-libs/db/files/db-4.2-libtool.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./dist/configure.orig	2004-09-22 22:58:48.421632944 -0700
-+++ ./dist/configure	2004-09-22 23:02:55.068136976 -0700
-@@ -5657,7 +5657,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
--case `"$LD" -v 2>&1 </dev/null` in
-+case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-   ;;
-@@ -11135,7 +11135,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
--case `"$LD" -v 2>&1 </dev/null` in
-+case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-   ;;
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 8ddb46b702..0000000000
--- a/sys-libs/db/files/db-4.2-listen-to-java-options.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- dist/configure.ac	2005-09-23 21:01:26.000000000 +0200
-+++ dist/configure.ac	2005-09-23 20:59:20.000000000 +0200
-@@ -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.2.52_p2-TXN.patch b/sys-libs/db/files/db-4.2.52_p2-TXN.patch
deleted file mode 100644
index 7ff8874c0c..0000000000
--- a/sys-libs/db/files/db-4.2.52_p2-TXN.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-This patch is intended to be applied to Berkeley DB 4.2.52 and,
-if applied, will automatically be used by slapd(8) back-bdb/hdb.
-Without this patch the BDB DB_LOG_AUTOREMOVE option will not work,
-nor will db_archive allow any transaction log files to be removed
-while slapd is running.
-
-The patch can be applied to the BDB source using patch(1) as follows
-	cd db-4.2.52
-	patch -p0 < openldap-src/build/BerkeleyDB42.patch
-
-(modify directory paths as necessary), then recompile and reinstall
-the BerkeleyDB 4.2 library, and then build and install OpenLDAP
-Software.
-
-The patch should not be applied to Berkeley DB 4.3.
-
-
-Index: dbinc/db.in
-===================================================================
-RCS file: /var/CVSROOT/bdb42/dbinc/db.in,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- dbinc/db.in	25 Nov 2003 21:58:02 -0000	1.1.1.1
-+++ dbinc/db.in	17 Jul 2004 16:07:23 -0000	1.2
-@@ -839,6 +839,7 @@
- #define	TXN_NOWAIT	0x040		/* Do not wait on locks. */
- #define	TXN_RESTORED	0x080		/* Transaction has been restored. */
- #define	TXN_SYNC	0x100		/* Sync on prepare and commit. */
-+#define	TXN_NOLOG	0x200		/* Do not log this transaction. */
- 	u_int32_t	flags;
- };
- 
-Index: txn/txn.c
-===================================================================
-RCS file: /var/CVSROOT/bdb42/txn/txn.c,v
-retrieving revision 1.1.1.2
-retrieving revision 1.2
-diff -u -r1.1.1.2 -r1.2
---- txn/txn.c	17 Dec 2003 21:43:53 -0000	1.1.1.2
-+++ txn/txn.c	17 Jul 2004 16:07:27 -0000	1.2
-@@ -127,7 +127,7 @@
- 	if ((ret = __db_fchk(dbenv,
- 	    "txn_begin", flags,
- 	    DB_DIRTY_READ | DB_TXN_NOWAIT |
--	    DB_TXN_NOSYNC | DB_TXN_SYNC)) != 0)
-+	    DB_TXN_NOSYNC | DB_TXN_SYNC | DB_TXN_NOT_DURABLE)) != 0)
- 		return (ret);
- 	if ((ret = __db_fcchk(dbenv,
- 	    "txn_begin", flags, DB_TXN_NOSYNC, DB_TXN_SYNC)) != 0)
-@@ -193,6 +193,8 @@
- 		F_SET(txn, TXN_SYNC);
- 	if (LF_ISSET(DB_TXN_NOWAIT))
- 		F_SET(txn, TXN_NOWAIT);
-+	if (LF_ISSET(DB_TXN_NOT_DURABLE))
-+		F_SET(txn, TXN_NOLOG);
- 
- 	if ((ret = __txn_begin_int(txn, 0)) != 0)
- 		goto err;
-@@ -328,7 +330,7 @@
- 	 * We should set this value when we write the first log record, not
- 	 * here.
- 	 */
--	if (DBENV_LOGGING(dbenv))
-+	if (DBENV_LOGGING(dbenv) && !F_ISSET(txn, TXN_NOLOG))
- 		__log_txn_lsn(dbenv, &begin_lsn, NULL, NULL);
- 	else
- 		ZERO_LSN(begin_lsn);
diff --git a/sys-libs/db/files/db-4.3-jarlocation.patch b/sys-libs/db/files/db-4.3-jarlocation.patch
deleted file mode 100644
index 17a342a7fc..0000000000
--- a/sys-libs/db/files/db-4.3-jarlocation.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur db-4.1.25.old/dist/Makefile.in db-4.1.25/dist/Makefile.in
---- db-4.1.25.old/dist/Makefile.in	2003-10-18 02:15:45.000000000 -0700
-+++ db-4.1.25/dist/Makefile.in	2003-10-18 02:13:47.000000000 -0700
-@@ -107,9 +107,9 @@
- JAVA_EXDIR=	$(JAVA_SRCDIR)/$(JAVA_EXREL)
- JAVA_RPCDIR=	$(srcdir)/rpc_server/java
- 
--libj_jarfile=	db.jar
--libj_exjarfile=	dbexamples.jar
--rpc_jarfile=	dbsvc.jar
-+libj_jarfile=	db-4.3.jar
-+libj_exjarfile=	dbexamples-4.3.jar
-+rpc_jarfile=	dbsvc-4.3.jar
- libjso_base=	libdb_java
- libjso=		$(libjso_base)-$(SOVERSION).@JMODSUFFIX@
- libjso_static=	$(libjso_base)-$(SOVERSION).a
diff --git a/sys-libs/db/files/db-4.3-jni-check-prefix-first.patch b/sys-libs/db/files/db-4.3-jni-check-prefix-first.patch
deleted file mode 100644
index 17f80e1bcf..0000000000
--- a/sys-libs/db/files/db-4.3-jni-check-prefix-first.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- dist/aclocal_java/ac_jni_include_dirs.ac	2003-10-06 20:41:38.000000000 +0200
-+++ dist/aclocal_java/ac_jni_include_dirs.ac	2005-09-23 21:31:26.000000000 +0200
-@@ -43,14 +43,19 @@
- *)	AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);;
- esac
- 
--_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC")
--_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'`
--case "$host_os" in
--	darwin*)	_JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
--			_JINC="$_JTOPDIR/Headers";;
--	*)		_JINC="$_JTOPDIR/include";;
--esac
--
-+# If JAVAPREFIX is defined, look there first
-+if test -r "$JAVAPREFIX/include/jni.h"; then
-+	_JTOPDIR="$JAVAPREFIX"
-+	_JINC="$JAVAPREFIX/include"
-+else
-+	_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC")
-+	_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'`
-+	case "$host_os" in
-+		darwin*)	_JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
-+				_JINC="$_JTOPDIR/Headers";;
-+		*)		_JINC="$_JTOPDIR/include";;
-+	esac
-+fi
- # If we find jni.h in /usr/include, then it's not a java-only tree, so
- # don't add /usr/include or subdirectories to the list of includes.
- # An extra -I/usr/include can foul things up with newer gcc's.
diff --git a/sys-libs/db/files/db-4.3-libtool.patch b/sys-libs/db/files/db-4.3-libtool.patch
deleted file mode 100644
index 426fd519f7..0000000000
--- a/sys-libs/db/files/db-4.3-libtool.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- dist/configure.orig	2005-02-02 11:22:49.596096072 +0100
-+++ dist/configure	2005-02-02 11:23:46.749407448 +0100
-@@ -5684,7 +5684,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
--case `$LD -v 2>&1 </dev/null` in
-+case `"$LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-   ;;
-@@ -8461,7 +8461,7 @@
-         tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 	archive_cmds="$tmp_archive_cmds"
-       supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
-+      case `"$LD" -v 2>/dev/null` in
-         *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-         *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-         *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -11383,7 +11383,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
--case `$LD -v 2>&1 </dev/null` in
-+case `"$LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-   ;;
-@@ -15353,7 +15353,7 @@
-         tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 	archive_cmds_F77="$tmp_archive_cmds"
-       supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
-+      case `"$LD" -v 2>/dev/null` in
-         *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-         *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-         *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -17695,7 +17695,7 @@
-         tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 	archive_cmds_GCJ="$tmp_archive_cmds"
-       supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
-+      case `"$LD" -v 2>/dev/null` in
-         *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-         *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-         *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
diff --git a/sys-libs/db/files/db-4.3-listen-to-java-options.patch b/sys-libs/db/files/db-4.3-listen-to-java-options.patch
deleted file mode 100644
index 8ddb46b702..0000000000
--- a/sys-libs/db/files/db-4.3-listen-to-java-options.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- dist/configure.ac	2005-09-23 21:01:26.000000000 +0200
-+++ dist/configure.ac	2005-09-23 20:59:20.000000000 +0200
-@@ -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.3.27-fix-dep-link.patch b/sys-libs/db/files/db-4.3.27-fix-dep-link.patch
deleted file mode 100644
index 1d14e83d07..0000000000
--- a/sys-libs/db/files/db-4.3.27-fix-dep-link.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- db-4.3.27/dist/Makefile.in.chris	2005-02-01 23:40:34.447945464 +0100
-+++ db-4.3.27/dist/Makefile.in	2005-02-01 23:42:21.635650456 +0100
-@@ -58,7 +58,7 @@
- LDFLAGS=	@LDFLAGS@
- LIBS=		@LIBS@
- TEST_LIBS=	@TEST_LIBS@
--LIBSO_LIBS=	@LIBSO_LIBS@
-+LIBSO_LIBS=	@LIBSO_LIBS@ $(LIBS)
- 
- libdb_base=	libdb
- libdb=		$(libdb_base).a
-@@ -77,7 +77,7 @@
- CXX=		@MAKEFILE_CXX@
- CXXLINK=	@MAKEFILE_CXXLINK@ @CXXFLAGS@
- XSOLINK=	@MAKEFILE_XSOLINK@ @CXXFLAGS@
--LIBXSO_LIBS=	@LIBXSO_LIBS@
-+LIBXSO_LIBS=	@LIBXSO_LIBS@ $(LIBS)
- 
- libcxx_base=	libdb_cxx
- libcxx=		$(libcxx_base).a
-@@ -93,7 +93,7 @@
- # Java support is optional and requires shared librarires.
- ##################################################
- CLASSPATH=	$(JAVA_CLASSTOP)
--LIBJSO_LIBS=	@LIBJSO_LIBS@
-+LIBJSO_LIBS=	@LIBJSO_LIBS@ $(LIBS)
- 
- JAR=		@JAR@
- JAVAC=		env CLASSPATH="$(CLASSPATH)" @JAVAC@
-@@ -126,7 +126,7 @@
- # Tcl support is optional and requires shared libraries.
- ##################################################
- TCFLAGS=	@TCFLAGS@
--LIBTSO_LIBS=	@LIBTSO_LIBS@
-+LIBTSO_LIBS=	@LIBTSO_LIBS@ $(LIBS)
- libtso_base=	libdb_tcl
- libtso=		$(libtso_base)-$(LIBVERSION)@MODSUFFIX@
- libtso_static=	$(libtso_base)-$(LIBVERSION).a
diff --git a/sys-libs/db/files/db-4.4-libtool.patch b/sys-libs/db/files/db-4.4-libtool.patch
deleted file mode 100644
index 3d86b88f86..0000000000
--- a/sys-libs/db/files/db-4.4-libtool.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- dist/configure.orig	2006-01-31 10:23:58.000000000 +0100
-+++ dist/configure	2006-01-31 10:26:43.000000000 +0100
-@@ -5765,7 +5765,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # I'd rather use --version here, but apparently some GNU lds only accept -v.
--case `$LD -v 2>&1 </dev/null` in
-+case `"$LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-   ;;
-@@ -8753,7 +8753,7 @@
-   	whole_archive_flag_spec=
-     fi
-     supports_anon_versioning=no
--    case `$LD -v 2>/dev/null` in
-+    case `"$LD" -v 2>/dev/null` in
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -11855,7 +11855,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # I'd rather use --version here, but apparently some GNU lds only accept -v.
--case `$LD -v 2>&1 </dev/null` in
-+case `"$LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-   ;;
-@@ -15842,7 +15842,7 @@
-   	whole_archive_flag_spec_F77=
-     fi
-     supports_anon_versioning=no
--    case `$LD -v 2>/dev/null` in
-+    case `"$LD" -v 2>/dev/null` in
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -18300,7 +18300,7 @@
-   	whole_archive_flag_spec_GCJ=
-     fi
-     supports_anon_versioning=no
--    case `$LD -v 2>/dev/null` in
-+    case `"$LD" -v 2>/dev/null` in
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
diff --git a/sys-libs/db/files/db-4.5-libtool.patch b/sys-libs/db/files/db-4.5-libtool.patch
deleted file mode 100644
index 3d86b88f86..0000000000
--- a/sys-libs/db/files/db-4.5-libtool.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- dist/configure.orig	2006-01-31 10:23:58.000000000 +0100
-+++ dist/configure	2006-01-31 10:26:43.000000000 +0100
-@@ -5765,7 +5765,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # I'd rather use --version here, but apparently some GNU lds only accept -v.
--case `$LD -v 2>&1 </dev/null` in
-+case `"$LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-   ;;
-@@ -8753,7 +8753,7 @@
-   	whole_archive_flag_spec=
-     fi
-     supports_anon_versioning=no
--    case `$LD -v 2>/dev/null` in
-+    case `"$LD" -v 2>/dev/null` in
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -11855,7 +11855,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # I'd rather use --version here, but apparently some GNU lds only accept -v.
--case `$LD -v 2>&1 </dev/null` in
-+case `"$LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-   ;;
-@@ -15842,7 +15842,7 @@
-   	whole_archive_flag_spec_F77=
-     fi
-     supports_anon_versioning=no
--    case `$LD -v 2>/dev/null` in
-+    case `"$LD" -v 2>/dev/null` in
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -18300,7 +18300,7 @@
-   	whole_archive_flag_spec_GCJ=
-     fi
-     supports_anon_versioning=no
--    case `$LD -v 2>/dev/null` in
-+    case `"$LD" -v 2>/dev/null` in
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
diff --git a/sys-libs/db/files/db-4.5-rpcgen.patch b/sys-libs/db/files/db-4.5-rpcgen.patch
deleted file mode 100644
index f204b17730..0000000000
--- a/sys-libs/db/files/db-4.5-rpcgen.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ru db-4.5.20.orig/dist/aclocal/rpc.ac db-4.5.20/dist/aclocal/rpc.ac
---- db-4.5.20.orig/dist/aclocal/rpc.ac	2008-08-29 10:56:58 +0200
-+++ db-4.5.20/dist/aclocal/rpc.ac	2008-08-29 11:03:19 +0200
-@@ -11,20 +11,20 @@
- 
- 	# Prefer the -C option to rpcgen which generates ANSI C-conformant
- 	# code.
--	RPCGEN="rpcgen -C"
--	AC_MSG_CHECKING(["$RPCGEN" build of db_server.h])
--	$RPCGEN -h $XDR_FILE > db_server.h 2>/dev/null
-+	TRPCGEN="${RPCGEN} -C"
-+	AC_MSG_CHECKING(["$TRPCGEN" build of db_server.h])
-+	$TRPCGEN -h $XDR_FILE > db_server.h 2>/dev/null
- 	if test $? -ne 0; then
- 		AC_MSG_RESULT([no])
- 
- 		# Try rpcgen without the -C option.
--		RPCGEN="rpcgen"
--		AC_MSG_CHECKING(["$RPCGEN" build of db_server.h])
--		$RPCGEN -h $XDR_FILE > db_server.h 2>/dev/null
-+		TRPCGEN="${RPCGEN}"
-+		AC_MSG_CHECKING(["$TRPCGEN" build of db_server.h])
-+		$TRPCGEN -h $XDR_FILE > db_server.h 2>/dev/null
- 		if test $? -ne 0; then
- 			AC_MSG_RESULT([no])
- 			AC_MSG_ERROR(
--			    [Unable to build RPC support: $RPCGEN failed.])
-+			    [Unable to build RPC support: $TRPCGEN failed.])
- 		fi
- 	fi
- 
-@@ -45,6 +45,7 @@
- 	fi
- 
- 	AC_MSG_RESULT([yes])
-+	RPCGEN=${TRPCGEN}
- 
- 	$RPCGEN -l $XDR_FILE |
- 	sed -e 's/^#include.*db_server.h.*/#include "db_server.h"/' \
diff --git a/sys-libs/db/files/db-4.5-winnt.patch b/sys-libs/db/files/db-4.5-winnt.patch
deleted file mode 100644
index 38ed2282f2..0000000000
--- a/sys-libs/db/files/db-4.5-winnt.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ru db-4.5.20.orig/dist/configure.ac db-4.5.20/dist/configure.ac
---- db-4.5.20.orig/dist/configure.ac	2008-08-29 17:04:51 +0200
-+++ db-4.5.20/dist/configure.ac	2008-08-29 16:53:27 +0200
-@@ -170,6 +170,8 @@
- 	AH_TEMPLATE(HAVE_QNX, [Define to 1 if building on QNX.]);;
- solaris*)
- 	CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS ";;
-+winnt*)
-+	LIBSO_LIBS="$LIBSO_LIBS -lrpc";;
- esac
- 
- # If the user wants a debugging environment, change any compiler optimization
-diff -ru db-4.5.20.orig/dist/win_db.in db-4.5.20/dist/win_db.in
---- db-4.5.20.orig/dist/win_db.in	2008-08-29 17:04:51 +0200
-+++ db-4.5.20/dist/win_db.in	2008-08-29 17:02:26 +0200
-@@ -56,6 +56,12 @@
- #include <wspiapi.h>
- #endif
- 
-+/* not quite sure if this is the correct define to test, but at least with
-+ * parity it is possible, and it is the default configuration on gentoo prefix! */
-+#ifdef __PARITY__
-+# include <rpc/rpc.h>
-+#endif
-+
- /*
-  * All of the necessary includes have been included, ignore the #includes
-  * in the Berkeley DB source files.
-@@ -67,10 +73,13 @@
-  * vsnprintf, but under different names.
-  */
- #define	fsync			_commit
--#define	getcwd(buf, size)	_getcwd(buf, size)
--#define	getpid			_getpid
--#define	snprintf		_snprintf
--#define	vsnprintf		_vsnprintf
-+
-+#ifndef __PARITY__
-+# define	getcwd(buf, size)	_getcwd(buf, size)
-+# define	getpid			_getpid
-+# define	snprintf		_snprintf
-+# define	vsnprintf		_vsnprintf
-+#endif
- 
- #define	h_errno			WSAGetLastError()
- 
diff --git a/sys-libs/db/files/db-4.6-interix.patch b/sys-libs/db/files/db-4.6-interix.patch
deleted file mode 100644
index de7eb10fb9..0000000000
--- a/sys-libs/db/files/db-4.6-interix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- dist/aclocal/rpc.m4
-+++ dist/aclocal/rpc.m4
-@@ -72,6 +72,8 @@
- 	ADDITIONAL_PROGS="berkeley_db_svc $ADDITIONAL_PROGS"
- 
- 	# Solaris and HPUX need the nsl library to build RPC.
-+	# Interix needs rpclib.
- 	AC_CHECK_FUNC(svc_run,,
--	    AC_HAVE_LIBRARY(nsl, LIBSO_LIBS="$LIBSO_LIBS -lnsl"))
-+	    AC_HAVE_LIBRARY(nsl, LIBSO_LIBS="$LIBSO_LIBS -lnsl")
-+	    AC_HAVE_LIBRARY(rpclib, LIBSO_LIBS="$LIBSO_LIBS -lrpclib"))
- ])
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 63735e6246..0000000000
--- a/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- dist/aclocal_java/ac_jni_include_dirs.m4	2003-10-06 20:41:38.000000000 +0200
-+++ dist/aclocal_java/ac_jni_include_dirs.m4	2005-09-23 21:31:26.000000000 +0200
-@@ -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.6-libtool.patch b/sys-libs/db/files/db-4.6-libtool.patch
deleted file mode 100644
index 3d86b88f86..0000000000
--- a/sys-libs/db/files/db-4.6-libtool.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- dist/configure.orig	2006-01-31 10:23:58.000000000 +0100
-+++ dist/configure	2006-01-31 10:26:43.000000000 +0100
-@@ -5765,7 +5765,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # I'd rather use --version here, but apparently some GNU lds only accept -v.
--case `$LD -v 2>&1 </dev/null` in
-+case `"$LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-   ;;
-@@ -8753,7 +8753,7 @@
-   	whole_archive_flag_spec=
-     fi
-     supports_anon_versioning=no
--    case `$LD -v 2>/dev/null` in
-+    case `"$LD" -v 2>/dev/null` in
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -11855,7 +11855,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # I'd rather use --version here, but apparently some GNU lds only accept -v.
--case `$LD -v 2>&1 </dev/null` in
-+case `"$LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-   ;;
-@@ -15842,7 +15842,7 @@
-   	whole_archive_flag_spec_F77=
-     fi
-     supports_anon_versioning=no
--    case `$LD -v 2>/dev/null` in
-+    case `"$LD" -v 2>/dev/null` in
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -18300,7 +18300,7 @@
-   	whole_archive_flag_spec_GCJ=
-     fi
-     supports_anon_versioning=no
--    case `$LD -v 2>/dev/null` in
-+    case `"$LD" -v 2>/dev/null` in
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
diff --git a/sys-libs/db/files/db-4.6-winnt.patch b/sys-libs/db/files/db-4.6-winnt.patch
deleted file mode 100644
index 6e908e18ad..0000000000
--- a/sys-libs/db/files/db-4.6-winnt.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -ru db-4.6.21.orig/dbinc/win_db.h db-4.6.21/dbinc/win_db.h
---- db-4.6.21.orig/dbinc/win_db.h	2008-09-01 10:16:01 +0200
-+++ db-4.6.21/dbinc/win_db.h	2008-09-01 10:17:23 +0200
-@@ -61,20 +61,28 @@
- #include <wspiapi.h>
- #endif
- 
-+/* need this for parity to be able to build RPC support (with ONC RPC for NT).
-+ */
-+#ifdef __PARITY__
-+# include <rpc/rpc.h>
-+#endif
-+
- /*
-  * Microsoft's C runtime library has fsync, getcwd, getpid, snprintf and
-  * vsnprintf, but under different names.
-  */
- #define	fsync			_commit
- 
--#ifndef DB_WINCE
--#define	getcwd(buf, size)	_getcwd(buf, size)
-+#ifndef __PARITY__
-+# ifndef DB_WINCE
-+#  define	getcwd(buf, size)	_getcwd(buf, size)
-+# endif
-+# define	getpid			GetCurrentProcessId
-+# define	snprintf		_snprintf
-+# define	strcasecmp		_stricmp
-+# define	strncasecmp		_strnicmp
-+# define	vsnprintf		_vsnprintf
- #endif
--#define	getpid			GetCurrentProcessId
--#define	snprintf		_snprintf
--#define	strcasecmp		_stricmp
--#define	strncasecmp		_strnicmp
--#define	vsnprintf		_vsnprintf
- 
- #define	h_errno			WSAGetLastError()
- 
-diff -ru db-4.6.21.orig/dist/aclocal/rpc.m4 db-4.6.21/dist/aclocal/rpc.m4
---- db-4.6.21.orig/dist/aclocal/rpc.m4	2008-09-01 10:16:01 +0200
-+++ db-4.6.21/dist/aclocal/rpc.m4	2008-09-01 09:59:28 +0200
-@@ -11,14 +11,15 @@
- 
- 	# Prefer the -C option to rpcgen which generates ANSI C-conformant
- 	# code.
--	RPCGEN="rpcgen -C"
-+	TRPCGEN="${RPCGEN}"
-+	RPCGEN="${TRPCGEN} -C"
- 	AC_MSG_CHECKING(["$RPCGEN" build of db_server.h])
- 	$RPCGEN -h $XDR_FILE > db_server.h 2>/dev/null
- 	if test $? -ne 0; then
- 		AC_MSG_RESULT([no])
- 
- 		# Try rpcgen without the -C option.
--		RPCGEN="rpcgen"
-+		RPCGEN="${TRPCGEN}"
- 		AC_MSG_CHECKING(["$RPCGEN" build of db_server.h])
- 		$RPCGEN -h $XDR_FILE > db_server.h 2>/dev/null
- 		if test $? -ne 0; then
-diff -ru db-4.6.21.orig/dist/configure.ac db-4.6.21/dist/configure.ac
---- db-4.6.21.orig/dist/configure.ac	2008-09-01 10:16:01 +0200
-+++ db-4.6.21/dist/configure.ac	2008-09-01 09:59:28 +0200
-@@ -182,6 +182,7 @@
- 	AH_TEMPLATE(HAVE_QNX, [Define to 1 if building on QNX.]);;
- solaris*)
- 	CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS ";;
-+winnt*) LIBSO_LIBS="$LIBSO_LIBS -lrpc" ;;
- esac
- 
- # If the user wants a debugging environment, change any compiler optimization
diff --git a/sys-libs/db/files/db-4.8-libtool.patch b/sys-libs/db/files/db-4.8-libtool.patch
deleted file mode 100644
index f5d985b2f2..0000000000
--- a/sys-libs/db/files/db-4.8-libtool.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- dist/configure
-+++ dist/configure
-@@ -6691,7 +6691,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   # I'd rather use --version here, but apparently some GNU lds only accept -v.
--case `$LD -v 2>&1 </dev/null` in
-+case `"$LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-   ;;
-@@ -7348,7 +7348,7 @@
-   ;;
- 
- irix5* | irix6* | nonstopux*)
--  case $LD in
-+  case "$LD" in
-   *-32|*"-32 ") libmagic=32-bit;;
-   *-n32|*"-n32 ") libmagic=N32;;
-   *-64|*"-64 ") libmagic=64-bit;;
-@@ -10664,7 +10664,7 @@
-       whole_archive_flag_spec=
-     fi
-     supports_anon_versioning=no
--    case `$LD -v 2>&1` in
-+    case `"$LD" -v 2>&1` in
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -10858,7 +10858,7 @@
-       ;;
- 
-     sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
--      case `$LD -v 2>&1` in
-+      case `"$LD" -v 2>&1` in
-         *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
- 	ld_shlibs=no
- 	cat <<_LT_EOF 1>&2
-@@ -12206,7 +12206,7 @@
-     libsuff= shlibsuff=
-     ;;
-   *)
--    case $LD in # libtool.m4 will add one of these switches to LD
-+    case "$LD" in # libtool.m4 will add one of these switches to LD
-     *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-       libsuff= shlibsuff= libmagic=32-bit;;
-     *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-@@ -13423,7 +13423,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   # I'd rather use --version here, but apparently some GNU lds only accept -v.
--case `$LD -v 2>&1 </dev/null` in
-+case `"$LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-   ;;
-@@ -15672,7 +15672,7 @@
-     libsuff= shlibsuff=
-     ;;
-   *)
--    case $LD in # libtool.m4 will add one of these switches to LD
-+    case "$LD" in # libtool.m4 will add one of these switches to LD
-     *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-       libsuff= shlibsuff= libmagic=32-bit;;
-     *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
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 9cebadc520..0000000000
--- 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
deleted file mode 100644
index 252a6213b3..0000000000
--- a/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/dbinc/atomic.h
-+++ b/src/dbinc/atomic.h
-@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
- #define	atomic_inc(env, p)	__atomic_inc(p)
- #define	atomic_dec(env, p)	__atomic_dec(p)
- #define	atomic_compare_exchange(env, p, o, n)	\
--	__atomic_compare_exchange((p), (o), (n))
-+	__db_atomic_compare_exchange((p), (o), (n))
- static inline int __atomic_inc(db_atomic_t *p)
- {
- 	int	temp;
-@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p)
-  * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
-  * which configure could be changed to use.
-  */
--static inline int __atomic_compare_exchange(
-+static inline int __db_atomic_compare_exchange(
- 	db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
- {
- 	atomic_value_t was;
diff --git a/sys-libs/db/files/db-5.0.21-enable-dbm-autoconf.patch b/sys-libs/db/files/db-5.0.21-enable-dbm-autoconf.patch
deleted file mode 100644
index 5405206fc5..0000000000
--- a/sys-libs/db/files/db-5.0.21-enable-dbm-autoconf.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-The autoconf from upstream never built DBM even if you wanted it, because
-enable_build_dbm was never true with --enable-dbm. The only time you actually
-got it before was when you had selected the testsuite.
-
-Fixed up that, and the entire reversed logic, and just throw away the useless
-db_cv_build_dbm variable entirely.
-
-Correct logic is:
-if(--enable-dbm || --enable-test) { 
-	Build DBM
-}
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar db-5.0.21.orig//dist/aclocal/options.m4 db-5.0.21//dist/aclocal/options.m4
---- db-5.0.21.orig//dist/aclocal/options.m4	2010-03-30 10:36:10.000000000 -0700
-+++ db-5.0.21//dist/aclocal/options.m4	2010-05-13 13:49:23.889947877 -0700
-@@ -274,15 +274,11 @@
- AC_MSG_RESULT($db_cv_test)
- 
- AC_MSG_CHECKING(if --enable-dbm option specified)
--AC_ARG_ENABLE(build_dbm,
-+AC_ARG_ENABLE(dbm,
- 	[AC_HELP_STRING([--enable-dbm],
- 			[Configure to enable the historic dbm interface.])],
--	[db_cv_build_dbm="$enable_dbm"], enableval="$db_cv_test")
--db_cv_build_dbm="$enableval"
--case "$enableval" in
-- no) AC_MSG_RESULT(yes);;
--yes) AC_MSG_RESULT(no);;
--esac
-+	[db_cv_dbm="$enable_dbm"], [db_cv_dbm="$db_cv_test"])
-+AC_MSG_RESULT($db_cv_dbm)
- 
- AC_MSG_CHECKING(if --enable-dtrace option specified)
- AC_ARG_ENABLE(dtrace,
-diff -Nuar db-5.0.21.orig//dist/configure.ac db-5.0.21//dist/configure.ac
---- db-5.0.21.orig//dist/configure.ac	2010-05-13 13:41:26.415822427 -0700
-+++ db-5.0.21//dist/configure.ac	2010-05-13 13:48:59.185822961 -0700
-@@ -973,7 +973,8 @@
- fi
- 
- # The DBM API can be disabled.
--if test "$db_cv_build_dbm" = "yes"; then
-+
-+if test "$db_cv_dbm" = "yes"; then
- 	AC_DEFINE(HAVE_DBM)
- 	AH_TEMPLATE(HAVE_DBM, [Define to 1 if building the DBM API.])
- 	ADDITIONAL_OBJS="$ADDITIONAL_OBJS dbm${o} hsearch${o}"
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
deleted file mode 100644
index ad3da2786c..0000000000
--- a/sys-libs/db/files/db-5.1.29-rename-atomic-compare-exchange.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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;
- #define	atomic_inc(env, p)	__atomic_inc(p)
- #define	atomic_dec(env, p)	__atomic_dec(p)
- #define	atomic_compare_exchange(env, p, o, n)	\
--	__atomic_compare_exchange((p), (o), (n))
-+	__db_atomic_compare_exchange((p), (o), (n))
- static inline int __atomic_inc(db_atomic_t *p)
- {
- 	int	temp;
-@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p)
-  * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
-  * which configure could be changed to use.
-  */
--static inline int __atomic_compare_exchange(
-+static inline int __db_atomic_compare_exchange(
- 	db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
- {
- 	atomic_value_t was;
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
deleted file mode 100644
index ff7abbe1fd..0000000000
--- a/sys-libs/db/files/db-5.2.28-sqlite-configure-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
-@@ -91,7 +91,7 @@
- # !!! END COPIED from autoconf distribution
- 
- sqlite_dir=$srcdir/../lang/sql/sqlite
--(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
- 
- # Configure JDBC if --enable-jdbc
- if test "$db_cv_jdbc" != "no"; then
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
deleted file mode 100644
index 8aceaa4d6f..0000000000
--- a/sys-libs/db/files/db-6.0.20-test-link.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
-@@ -289,16 +289,26 @@
- 			    [eval glob -nocomplain {$dir/$buildpath/db_{reptest,repsite,replicate}$EXE}] \
- 			    $destdir/$buildpath}
- 		}
-+		catch {
-+			set l [eval glob {$dir/.libs} {$dir/db_{checkpoint,deadlock}$EXE} \
-+					{$dir/db_{dump,load,printlog,recover,stat,upgrade}$EXE} \
-+					{$dir/db_{archive,verify,hotbackup,log_verify}$EXE}]
-+			foreach fn $l {
-+				set fbasename [file tail $fn]
-+				eval file link {$destdir/$fbasename} $fn
-+			}
-+		}
-+		# we will be modifying this file, so we must copy, not link
- 		catch {eval file copy \
--		    [eval glob {$dir/{.libs,include.tcl}}] $destdir}
-+		    [eval glob {$dir/include.tcl}] $destdir}
- 		# catch {eval file copy $dir/$queuedir $destdir}
--		catch {eval file copy \
--		    [eval glob {$dir/db_{checkpoint,deadlock}$EXE} \
--		    {$dir/db_{dump,load,printlog,recover,stat,upgrade}$EXE} \
--		    {$dir/db_{archive,verify,hotbackup,log_verify}$EXE}] \
--		    $destdir}
--		catch {eval file copy \
--		    [eval glob -nocomplain {$dir/db_{reptest,repsite,replicate}$EXE}] $destdir}
-+		catch {
-+			set l [eval glob -nocomplain {$dir/db_{reptest,repsite,replicate}$EXE}] 
-+			foreach fn $l {
-+				set fbasename [file tail $fn]
-+				eval file link {$destdir/$fbasename} $fn
-+			}
-+		}
- 
- 		# Create modified copies of include.tcl in parallel
- 		# directories so paths still work.
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
deleted file mode 100644
index c239bb118a..0000000000
--- a/sys-libs/db/files/db-6.0.35-sqlite-configure-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- db-6.0.35/dist/aclocal/sql.m4
-+++ db-6.0.35/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
- 
- # Configure JDBC if --enable-jdbc
- if test "$db_cv_jdbc" != "no"; then
diff --git a/sys-libs/db/files/db-6.0.35-winnt.patch b/sys-libs/db/files/db-6.0.35-winnt.patch
deleted file mode 100644
index 7b452960a7..0000000000
--- a/sys-libs/db/files/db-6.0.35-winnt.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- db-6.0.35/dist/aclocal/cxx.m4.orig	2017-09-21 14:38:27.091198600 +0200
-+++ db-6.0.35/dist/aclocal/cxx.m4	2017-09-21 14:38:38.481785600 +0200
-@@ -171,6 +171,7 @@
- 
- 	t44 = t4;
- 	t55 = t5;
-+	return 0;
- }
- 
- template <typename T4>
-@@ -178,6 +179,7 @@
- {
- 	T4 t44 = t4;
- 	std::vector<T4> abc = t55;
-+	return 0;
- }
- 
- // maximum of two int values 
---- db-6.0.35/dist/aclocal/tls.m4.orig	2017-09-21 15:41:28.325565600 +0200
-+++ db-6.0.35/dist/aclocal/tls.m4	2017-09-21 15:41:56.388089900 +0200
-@@ -21,10 +21,10 @@
-               class TLSClass2 {
-               public: static ] $ax_tls_decl_keyword [int tlsvar;
-               };
--              template<typename T> ] $ax_tls_defn_keyword [ T* TLSClass<T>::tlsvar = NULL;]
-+              template<typename T> ] $ax_tls_defn_keyword [ T* TLSClass<T>::tlsvar = 0;]
-               $ax_tls_defn_keyword [int TLSClass2::tlsvar = 1; 
-               static $ax_tls_decl_keyword int x = 0;],
--              [TLSClass<int>::tlsvar = NULL; TLSClass2::tlsvar = 1;],
-+              [TLSClass<int>::tlsvar = 0; TLSClass2::tlsvar = 1;],
-               [ac_cv_tls=modifier ; break])
-       done
-       test "$ac_cv_tls" = none || break
-@@ -39,7 +39,7 @@
-          static pthread_key_t key;
- 
-          static void init_once(void) {
--             pthread_key_create(&key, NULL);
-+             pthread_key_create(&key, 0);
-          }
-          static void *get_tls() {
-              return (void *)pthread_getspecific(&key);
---- db-6.0.35/dist/configure.ac.orig	2017-09-21 16:12:45.638028200 +0200
-+++ db-6.0.35/dist/configure.ac	2017-09-21 16:13:11.731822700 +0200
-@@ -371,11 +371,11 @@
- INSTALLER="\$(LIBTOOL) --mode=install cp -p"
- 
- MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
--MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
--MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
-+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -no-undefined -avoid-version"
-+MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -no-undefined"
- MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
--MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
--MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}"
-+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -no-undefined -avoid-version"
-+MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -no-undefined"
- 
- 
- case "$host_os" in
-@@ -411,9 +411,6 @@
- 	o=".lo"
- fi
- INSTALL_LIBS="$DEFAULT_LIB"
--if test "$enable_static" = "yes"; then
--	INSTALL_LIBS="$INSTALL_LIBS \$(libdb)"
--fi
- 
- # Optional C++ API.
- if test "$db_cv_cxx" = "yes"; then
-@@ -424,9 +421,6 @@
- 		DEFAULT_LIB_CXX="\$(libxso_target)"
- 	fi
- 	INSTALL_LIBS="$INSTALL_LIBS $DEFAULT_LIB_CXX"
--	if test "$enable_static" = "yes"; then
--		INSTALL_LIBS="$INSTALL_LIBS \$(libcxx)"
--	fi
- fi
- 
- # Optional Java API / JDBC.
-@@ -553,9 +547,6 @@
- 		DEFAULT_LIB_SQL="\$(libsqlso_target)"
- 	fi
- 	INSTALL_LIBS="$INSTALL_LIBS $DEFAULT_LIB_SQL"
--	if test "$enable_static" = "yes"; then
--		INSTALL_LIBS="$INSTALL_LIBS \$(libsql)"
--	fi
- 
- 	if test "$db_cv_test" = "yes"; then
- 		subdirs="$subdirs sql"
-@@ -593,9 +584,6 @@
- 	if test "$enable_shared" = "yes"; then
- 		INSTALL_LIBS_EXTRA="$INSTALL_LIBS_EXTRA \$(libsqliteso)"
- 	fi
--	if test "$enable_static" = "yes"; then
--		INSTALL_LIBS="$INSTALL_LIBS \$(libsqlite)"
--	fi
- fi
- 
- # Optional SQL code generation tool.
-@@ -619,9 +607,6 @@
- 		ADDITIONAL_INCS="$ADDITIONAL_INCS \$(topdir)/lang/cxx/stl/$f"
- 	done
- 	INSTALL_LIBS="$INSTALL_LIBS $DEFAULT_LIB_STL"
--	if test "$enable_static" = "yes"; then
--		INSTALL_LIBS="$INSTALL_LIBS \$(libstl)"
--	fi
- fi
- 
- # Checks for include files, structures, C types.
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
deleted file mode 100644
index 25854c53e1..0000000000
--- a/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- db-6.1.19/dist/aclocal/sql.m4
-+++ db-6.1.19/dist/aclocal/sql.m4
-@@ -96,6 +96,6 @@
- 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
- 
- # Configure JDBC if --enable-jdbc
diff --git a/sys-libs/db/files/db-6.2-c++11.patch b/sys-libs/db/files/db-6.2-c++11.patch
deleted file mode 100644
index 8f36856b10..0000000000
--- a/sys-libs/db/files/db-6.2-c++11.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-https://gist.githubusercontent.com/LnL7/5153b251fd525fe15de69b67e63a6075/raw/7778e9364679093a32dec2908656738e16b6bdcb/clang.patch
-
-(from https://community.oracle.com/thread/3952592?start=15&tstart=0)
-
-Removed the atomic_exchange bits since we already have those patched.
-Added an awkward bit to not define store in cplusplus mode in order not
-to trigger a conflict there -- crippling the interface
-
-diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h
-index 6a858f7..9f338dc 100644
---- a/src/dbinc/atomic.h
-+++ b/src/dbinc/atomic.h
-@@ -70,7 +70,7 @@ typedef struct {
-  * These have no memory barriers; the caller must include them when necessary.
-  */
- #define	atomic_read(p)		((p)->value)
--#define	atomic_init(p, val)	((p)->value = (val))
-+#define	atomic_init_db(p, val)	((p)->value = (val))
- 
- #ifdef HAVE_ATOMIC_SUPPORT
- 
-@@ -206,7 +206,7 @@ static inline int __atomic_compare_exchange(
- #define	atomic_dec(env, p)	(--(p)->value)
- #define	atomic_compare_exchange(env, p, oldval, newval)		\
- 	(DB_ASSERT(env, atomic_read(p) == (oldval)),		\
--	atomic_init(p, (newval)), 1)
-+	atomic_init_db(p, (newval)), 1)
- #else
- #define atomic_inc(env, p)	__atomic_inc(env, p)
- #define atomic_dec(env, p)	__atomic_dec(env, p)
-diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.c
-index 16de695..d0dcc29 100644
---- a/src/mp/mp_fget.c
-+++ b/src/mp/mp_fget.c
-@@ -649,7 +649,7 @@ alloc:		/* Allocate a new buffer header and data space. */
- 
- 		/* Initialize enough so we can call __memp_bhfree. */
- 		alloc_bhp->flags = 0;
--		atomic_init(&alloc_bhp->ref, 1);
-+		atomic_init_db(&alloc_bhp->ref, 1);
- #ifdef DIAGNOSTIC
- 		if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) {
- 			__db_errx(env, DB_STR("3025",
-@@ -955,7 +955,7 @@ alloc:		/* Allocate a new buffer header and data space. */
- 			MVCC_MPROTECT(bhp->buf, mfp->pagesize,
- 			    PROT_READ);
- 
--		atomic_init(&alloc_bhp->ref, 1);
-+		atomic_init_db(&alloc_bhp->ref, 1);
- 		MUTEX_LOCK(env, alloc_bhp->mtx_buf);
- 		alloc_bhp->priority = bhp->priority;
- 		alloc_bhp->pgno = bhp->pgno;
-diff --git a/src/mp/mp_mvcc.c b/src/mp/mp_mvcc.c
-index 770bad8..e28cce0 100644
---- a/src/mp/mp_mvcc.c
-+++ b/src/mp/mp_mvcc.c
-@@ -276,7 +276,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, need_frozenp)
- #else
- 	memcpy(frozen_bhp, bhp, SSZA(BH, buf));
- #endif
--	atomic_init(&frozen_bhp->ref, 0);
-+	atomic_init_db(&frozen_bhp->ref, 0);
- 	if (mutex != MUTEX_INVALID)
- 		frozen_bhp->mtx_buf = mutex;
- 	else if ((ret = __mutex_alloc(env, MTX_MPOOL_BH,
-@@ -428,7 +428,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_bhp, alloc_bhp)
- #endif
- 		alloc_bhp->mtx_buf = mutex;
- 		MUTEX_LOCK(env, alloc_bhp->mtx_buf);
--		atomic_init(&alloc_bhp->ref, 1);
-+		atomic_init_db(&alloc_bhp->ref, 1);
- 		F_CLR(alloc_bhp, BH_FROZEN);
- 	}
- 
-diff --git a/src/mp/mp_region.c b/src/mp/mp_region.c
-index 4952030..47645f8 100644
---- a/src/mp/mp_region.c
-+++ b/src/mp/mp_region.c
-@@ -245,7 +245,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg)
- 			     MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0)
- 				return (ret);
- 			SH_TAILQ_INIT(&htab[i].hash_bucket);
--			atomic_init(&htab[i].hash_page_dirty, 0);
-+			atomic_init_db(&htab[i].hash_page_dirty, 0);
- 		}
- 
- 		/*
-@@ -302,7 +302,7 @@ no_prealloc:
- 		} else
- 			hp->mtx_hash = mtx_base + (i % dbenv->mp_mtxcount);
- 		SH_TAILQ_INIT(&hp->hash_bucket);
--		atomic_init(&hp->hash_page_dirty, 0);
-+		atomic_init_db(&hp->hash_page_dirty, 0);
- #ifdef HAVE_STATISTICS
- 		hp->hash_io_wait = 0;
- 		hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0;
-diff --git a/src/mutex/mut_method.c b/src/mutex/mut_method.c
-index 09353b0..177353c 100644
---- a/src/mutex/mut_method.c
-+++ b/src/mutex/mut_method.c
-@@ -474,7 +474,7 @@ atomic_compare_exchange(env, v, oldval, newval)
- 	MUTEX_LOCK(env, mtx);
- 	ret = atomic_read(v) == oldval;
- 	if (ret)
--		atomic_init(v, newval);
-+		atomic_init_db(v, newval);
- 	MUTEX_UNLOCK(env, mtx);
- 
- 	return (ret);
-diff --git a/src/mutex/mut_tas.c b/src/mutex/mut_tas.c
-index 106b161..fc4de9d 100644
---- a/src/mutex/mut_tas.c
-+++ b/src/mutex/mut_tas.c
-@@ -47,7 +47,7 @@ __db_tas_mutex_init(env, mutex, flags)
- 
- #ifdef HAVE_SHARED_LATCHES
- 	if (F_ISSET(mutexp, DB_MUTEX_SHARED))
--		atomic_init(&mutexp->sharecount, 0);
-+		atomic_init_db(&mutexp->sharecount, 0);
- 	else
- #endif
- 	if (MUTEX_INIT(&mutexp->tas)) {
-@@ -536,7 +536,7 @@ __db_tas_mutex_unlock(env, mutex)
- 			F_CLR(mutexp, DB_MUTEX_LOCKED);
- 			/* Flush flag update before zeroing count */
- 			MEMBAR_EXIT();
--			atomic_init(&mutexp->sharecount, 0);
-+			atomic_init_db(&mutexp->sharecount, 0);
- 		} else {
- 			DB_ASSERT(env, sharecount > 0);
- 			MEMBAR_EXIT();
---- a/src/dbinc/db.in
-+++ b/src/dbinc/db.in
-@@ -2999,7 +2999,9 @@
- #define	fetch(a)	__db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a)
- #define	firstkey	__db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@
- #define	nextkey(a)	__db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a)
-+#if !defined(__cplusplus)
- #define	store(a, b)	__db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b)
-+#endif
- 
- /*******************************************************
-  * Hsearch historic interface.
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 963b01380c..0000000000
--- 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/patch.3.2.9.1 b/sys-libs/db/files/patch.3.2.9.1
deleted file mode 100644
index 8d70c6e519..0000000000
--- a/sys-libs/db/files/patch.3.2.9.1
+++ /dev/null
@@ -1,104 +0,0 @@
-*** include/log.h.orig	2001/01/25 18:22:51	11.20
---- include/log.h	2001/02/06 05:02:28	11.21
-***************
-*** 198,203 ****
---- 198,204 ----
-   */
-  typedef enum {
-  	DB_LV_INCOMPLETE,
-+ 	DB_LV_NONEXISTENT,
-  	DB_LV_NORMAL,
-  	DB_LV_OLD_READABLE,
-  	DB_LV_OLD_UNREADABLE
-*** log/log.c.orig	2001/01/25 18:22:55	11.43
---- log/log.c	2001/02/06 05:02:28	11.44
-***************
-*** 309,321 ****
-  	int find_first, *valp;
-  	logfile_validity *statusp;
-  {
-! 	logfile_validity clv_status, status;
-  	u_int32_t clv, logval;
-  	int cnt, fcnt, ret;
-  	const char *dir;
-  	char **names, *p, *q, savech;
-  
-! 	clv_status = status = DB_LV_NORMAL;
-  
-  	/* Return a value of 0 as the log file number on failure. */
-  	*valp = 0;
---- 309,321 ----
-  	int find_first, *valp;
-  	logfile_validity *statusp;
-  {
-! 	logfile_validity logval_status, status;
-  	u_int32_t clv, logval;
-  	int cnt, fcnt, ret;
-  	const char *dir;
-  	char **names, *p, *q, savech;
-  
-! 	logval_status = status = DB_LV_NONEXISTENT;
-  
-  	/* Return a value of 0 as the log file number on failure. */
-  	*valp = 0;
-***************
-*** 385,394 ****
-  			 * as a valid log file.
-  			 */
-  			break;
-  		case DB_LV_NORMAL:
-  		case DB_LV_OLD_READABLE:
-  			logval = clv;
-! 			clv_status = status;
-  			break;
-  		case DB_LV_OLD_UNREADABLE:
-  			/*
---- 385,398 ----
-  			 * as a valid log file.
-  			 */
-  			break;
-+ 		case DB_LV_NONEXISTENT:
-+ 			/* Should never happen. */
-+ 			DB_ASSERT(0);
-+ 			break;
-  		case DB_LV_NORMAL:
-  		case DB_LV_OLD_READABLE:
-  			logval = clv;
-! 			logval_status = status;
-  			break;
-  		case DB_LV_OLD_UNREADABLE:
-  			/*
-***************
-*** 410,416 ****
-  			 */
-  			if (!find_first) {
-  				logval = clv;
-! 				clv_status = status;
-  			}
-  			break;
-  		}
---- 414,420 ----
-  			 */
-  			if (!find_first) {
-  				logval = clv;
-! 				logval_status = status;
-  			}
-  			break;
-  		}
-***************
-*** 420,426 ****
-  
-  err:	__os_dirfree(names, fcnt);
-  	__os_freestr(p);
-! 	*statusp = clv_status;
-  
-  	return (ret);
-  }
---- 424,430 ----
-  
-  err:	__os_dirfree(names, fcnt);
-  	__os_freestr(p);
-! 	*statusp = logval_status;
-  
-  	return (ret);
-  }
diff --git a/sys-libs/db/files/patch.3.2.9.2 b/sys-libs/db/files/patch.3.2.9.2
deleted file mode 100644
index 4092cda52e..0000000000
--- a/sys-libs/db/files/patch.3.2.9.2
+++ /dev/null
@@ -1,21 +0,0 @@
-*** log/log_rec.c.orig	2001/01/25 18:22:56	11.49
---- log/log_rec.c	2001/02/07 22:17:46
-***************
-*** 404,410 ****
-  				TAILQ_INIT(&logp->dbentry[i].dblist);
-  			else
-  				TAILQ_REINSERT_HEAD(
-! 				    &logp->dbentry[i].dblist, dbp, links);
-  		}
-  
-  		/* Initialize the new entries. */
---- 404,410 ----
-  				TAILQ_INIT(&logp->dbentry[i].dblist);
-  			else
-  				TAILQ_REINSERT_HEAD(
-! 				    &logp->dbentry[i].dblist, dbtmp, links);
-  		}
-  
-  		/* Initialize the new entries. */
-
-
diff --git a/sys-libs/db/metadata.xml b/sys-libs/db/metadata.xml
deleted file mode 100644
index 19c6522292..0000000000
--- a/sys-libs/db/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<longdescription>
-The Berkeley Database (Berkeley DB) is a programmatic toolkit
-that provides embedded database support for both traditional and client/server
-applications. Berkeley DB includes b+tree, queue, extended linear hashing,
-fixed, and variable-length record access methods, transactions, locking,
-logging, shared memory caching and database recovery. DB supports C, C++, Java,
-and Perl APIs. DB is available for a wide variety of UNIX platforms as well as
-Windows NT and Windows '95 (MSVC 4, 5 and 6).
-</longdescription>
-<longdescription lang="nl">
-De Berkeley Database is een programmatische toolkit
-die embedded database support verzorg voor en traditionele en client/server
-applicaties. Berkeley DB bevat b+tree, rij, uitgebreide lineaire hashing, vaste
-en variabele lengte record toegangsmethoden, transacties, locking, logging,
-gedeeld geheugen caching en database herstel. DB ondersteund C, C++, Java en
-Perl API's. DB is beschikbaar voor veel UNIX platformen en
-Windows.
-</longdescription>
-<use>
-	<flag name="rpc">Enable rpc client/server</flag>
-</use>
-</pkgmetadata>