Delete older ebuilds.

7 files changed, 15 insertions, 720 deletions

diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 5f12339b0616..1660e8fb52ed 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX apr-util-1.3.10-support_berkeley_db-5.1.patch 5015 RMD160 654fb2288a497918a50565f6507061b064f7e6c4 SHA1 7a80bd0fb27343717b34e0912f4f9922f722e20c SHA256 021a7cb221654d3b20162ece372e12a173b6fb479bd3f3ac0fe1a75058450652
-AUX apr-util-1.3.9-support_berkeley_db-4.8.patch 4443 RMD160 f378ba707441854a0b19f07a396f7a7be041e715 SHA1 ce3cf0caa6c9a9b6cddb9b0b49366dc132eab398 SHA256 11a8163c75a279d1aa93f9bd0142a836add228a5f1232a8f85e1a128363ae8aa
-AUX apr-util-1.3.9-support_berkeley_db-5.0.patch 5782 RMD160 93095ea8dbf9ceb35271a752fc6e21f7944d2c24 SHA1 d2d26a293b4b2e52808512ad0a180cb669e6d9ff SHA256 b61b4f1d0063aa41d6f739ea059e5c5ffcdcb8a17a4aefa1901d5cdd08dd8a17
-DIST apr-util-1.3.10.tar.bz2 607912 RMD160 b18520330602d342e15966c48fb31127ce7b31e0 SHA1 9a720cf77f1d0fdc5b0f6ce6d656cc864d7d4833 SHA256 1ac0c049078e17f6bf609bf763634d6851961b5cb81fbca2f9c9810510d017ee
 DIST apr-util-1.3.11.tar.bz2 607486 RMD160 5b745baf523b99c8fa0501deab4f00d86ca050e5 SHA1 dc71af7684f76d56f06b4fc8763a8606bd861e84 SHA256 13b8446c5ff96ed32293db77689992db18addb1a76d0f6dae29f132dc96dab59
-DIST apr-util-1.3.9.tar.gz 790952 RMD160 f6180ba186e8ed73831b1da78de7ec57fc1cb162 SHA1 fd2a76352353e6bc2f7cc7da80e2ab3842795199 SHA256 20897069274a026057df26b90a6424da9d70318d930c99885c451d8753b8e4d9
-EBUILD apr-util-1.3.10.ebuild 2426 RMD160 4b8d74a1890d0fc361da3133ff3e1e1d32e4f140 SHA1 10e16fdc483a61afe1fa9d86f0a2820e4910ce7d SHA256 fca93735e49e684d100fdcf3a6567d25609c0bf73a0d785545b89f924cb38709
-EBUILD apr-util-1.3.11.ebuild 2519 RMD160 69564e24179eadb7ba441cd54f6cf4545161b0ca SHA1 91b7ab6ef8ba80e5356dc35c5ebea6916fb1b539 SHA256 4fa76e68bd8aa2571c301a039dd66d4162124b2186c12db7b1b17a4d9a202ced
-EBUILD apr-util-1.3.9-r1.ebuild 2443 RMD160 9a6ad060420c08bae4665f4df2025cb86439804c SHA1 ae45c6223d4866297bf0a5452861af2616e78fa6 SHA256 dfc5929305af09c7181ae4656d8e362c8b3b47321af3196a398d1f6fb9d655f7
-EBUILD apr-util-1.3.9.ebuild 2364 RMD160 d2c2104cae2cde452b7997e38734bb2ab9b29b5e SHA1 e320872cd820ec29a740aaa689b8b558ba2c113f SHA256 194443f4ae7fd705ee442460f567a73843aff6d932a6c01730efc7caabb4c612
-MISC ChangeLog 20633 RMD160 91d779bc7d7dcafca5a18b2d4870fe87f0c58c86 SHA1 aa13a249480ca3cfc68dad21265a4f5ddfe1287d SHA256 28d75a4c380cae7d6c246f510ca3660d04b63105c5f63ff492e186d81ba8d893
+EBUILD apr-util-1.3.11.ebuild 2510 RMD160 599ee97079645aef1ef2eeec3707c43ff020aa22 SHA1 e6ccaee867d6183e41a16b7d82518dbb88035e1c SHA256 0cb438b545963fbc89b0305265296ef9d2e512e6e9a270bd97689aa36840f210
+MISC ChangeLog 20754 RMD160 72d75430ec44e18af4450bff6dcbd808b501c453 SHA1 879fd02764ca731cd4749f107ee28fd4557241cd SHA256 2cd3455916630c4b2a9411ad64e959193ac2e30ccae2b626856e5c2d456d027f
 MISC metadata.xml 229 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 SHA1 92fdbcb6a85ece96506733ad67a5e4e74a58a529 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk3OrboACgkQIiMqcbOVdxTbqwP+I2PjU9HbBfym0g9Hnj5su8i/
-uODu/ltSrEjYSMHOODtcLkpJMDRGmXJ+8cUBdqoUj3DMhC0Au6Di/yw2CttvSOF7
-8TskU5+8AdoPzdR4SQ4yaMyVTTrNBsM79JrOKDOxwIrEvDM/chf0XsZAevVoFIna
-dd3JvBHvqtzs//5vlzE=
-=itP1
+iQIcBAEBAgAGBQJNzuwQAAoJEE70JXb4HvNV6FUP/1GfdmPHbGO0xdJGIfSIMTqc
+N0MkI2B4zF/7/BqjOxleVfReP0RGSzsL3qSd+BZC6OBMfeJ0DvhEacu4Uc1rtNFm
+pCxf4pwrcW7YPCcpFU54FhOl6YXDPgitDAFthB6nONC6HN/A0jQcsDIraTAzJjY2
+PVnAnRLyP/70x/VCsHbsIXtKl/s0mBUjmG04oCMmJckXM8IaMZApx1ck7S0VcQe3
+GgDhz2DnFjs//QN24EMFQ2lnbGd6OER/Vey5fpEn1uxM/V1uM0pHTXtfGDuONYWJ
+QJU1kP4LA4QfifKy2BAU5NSEqpcFnzV2UGVssWFgoOtjRhxXVetPvciYqe0ge7ZQ
+xgbKCDaxbQGcch5TzUMYOWLaLBXXVIgVI3H4KbEvhoxaC8bzUAZOCppKqWb3wJZK
++bESW6XjIvdLQtGWxslMwVMS2jolqcS1/E3hQVJmEDugelMwUzLzYPbjJ9mbExDg
+9U7uyfRBZTU7XPd60wew5GnbAgjeMLIxtMLYkq0W8BTfh9lM6Qube0aEewHODW6s
+3EgSUldgX4T3GdWK9KrcmozPJJYt62/pgWgPAk7p+HjeymHFo+BaT7IIYuD6C7PF
+nZayggKhD/uQ1TCKA7Bbeelx+nUpjr4P+UCgcs8l9J0gE6FWP0tGre/96go3GRFB
+95SAYOL7yvGcl7FTzThP
+=EdGg
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/apr-util/apr-util-1.3.10.ebuild b/dev-libs/apr-util/apr-util-1.3.10.ebuild
deleted file mode 100644
index 434f0b431b07..000000000000
--- a/dev-libs/apr-util/apr-util-1.3.10.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.3.10.ebuild,v 1.8 2010/10/09 16:38:42 armin76 Exp $
-
-EAPI="3"
-
-# Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
-#APR_PV=${PV}
-APR_PV="1.3.8"
-
-inherit autotools db-use eutils libtool multilib
-
-DESCRIPTION="Apache Portable Runtime Utility Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="berkdb doc freetds gdbm ldap mysql odbc postgres sqlite sqlite3"
-RESTRICT="test"
-
-RDEPEND="dev-libs/expat
-	>=dev-libs/apr-${APR_PV}:1
-	berkdb? ( >=sys-libs/db-4 )
-	freetds? ( dev-db/freetds )
-	gdbm? ( sys-libs/gdbm )
-	ldap? ( =net-nds/openldap-2* )
-	mysql? ( =virtual/mysql-5* )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:0 )
-	sqlite3? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-support_berkeley_db-5.1.patch"
-	eautoreconf
-
-	elibtoolize
-}
-
-src_configure() {
-	local myconf
-
-	if use berkdb; then
-		local db_version
-		db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version"
-		db_version="$(db_ver_to_slot "${db_version}")"
-		db_version="${db_version/\./}"
-		myconf+=" --with-dbm=db${db_version} --with-berkeley-db=$(db_includedir 2> /dev/null):/usr/$(get_libdir)"
-	else
-		myconf+=" --without-berkeley-db"
-	fi
-
-	econf --datadir=/usr/share/apr-util-1 \
-		--with-apr=/usr \
-		--with-expat=/usr \
-		$(use_with freetds) \
-		$(use_with gdbm) \
-		$(use_with ldap) \
-		$(use_with mysql) \
-		$(use_with odbc) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite sqlite2) \
-		$(use_with sqlite3) \
-		${myconf}
-}
-
-src_compile() {
-	emake CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
-
-	if use doc; then
-		emake dox || die "emake dox failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc CHANGES NOTICE README
-
-	if use doc; then
-		dohtml -r docs/dox/html/* || die "dohtml failed"
-	fi
-
-	# This file is only used on AIX systems, which Gentoo is not,
-	# and causes collisions between the SLOTs, so remove it.
-	rm -f "${D}usr/$(get_libdir)/aprutil.exp"
-}
diff --git a/dev-libs/apr-util/apr-util-1.3.9-r1.ebuild b/dev-libs/apr-util/apr-util-1.3.9-r1.ebuild
deleted file mode 100644
index 57cd15cc74e5..000000000000
--- a/dev-libs/apr-util/apr-util-1.3.9-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.3.9-r1.ebuild,v 1.1 2010/08/06 13:28:36 hwoarang Exp $
-
-EAPI="2"
-
-# Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
-#APR_PV=${PV}
-APR_PV="1.3.8"
-
-inherit autotools db-use eutils libtool multilib
-
-DESCRIPTION="Apache Portable Runtime Utility Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="berkdb doc freetds gdbm ldap mysql odbc postgres sqlite sqlite3"
-RESTRICT="test"
-
-RDEPEND="dev-libs/expat
-	>=dev-libs/apr-${APR_PV}:1
-	berkdb? ( >=sys-libs/db-4 )
-	freetds? ( dev-db/freetds )
-	gdbm? ( sys-libs/gdbm )
-	ldap? ( =net-nds/openldap-2* )
-	mysql? ( =virtual/mysql-5* )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:0 )
-	sqlite3? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-support_berkeley_db-{4.8,5.0}.patch
-	eautoreconf
-
-	elibtoolize
-}
-
-src_configure() {
-	local myconf
-
-	use ldap && myconf+=" --with-ldap"
-
-	if use berkdb; then
-		local db_version
-		db_version="$(db_findver sys-libs/db)" || die "Unable to find db version"
-		db_version="$(db_ver_to_slot "${db_version}")"
-		db_version="${db_version/\./}"
-		myconf+=" --with-dbm=db${db_version} --with-berkeley-db=$(db_includedir):/usr/$(get_libdir)"
-	else
-		myconf+=" --without-berkeley-db"
-	fi
-
-	econf --datadir=/usr/share/apr-util-1 \
-		--with-apr=/usr \
-		--with-expat=/usr \
-		$(use_with freetds) \
-		$(use_with gdbm) \
-		$(use_with mysql) \
-		$(use_with odbc) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite sqlite2) \
-		$(use_with sqlite3) \
-		${myconf}
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" \
-		|| die "emake failed"
-
-	if use doc; then
-		emake dox || die "emake dox failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc CHANGES NOTICE README
-
-	if use doc; then
-		dohtml -r docs/dox/html/* || die "dohtml failed"
-	fi
-
-	# This file is only used on AIX systems, which Gentoo is not,
-	# and causes collisions between the SLOTs, so remove it.
-	rm -f "${D}usr/$(get_libdir)/aprutil.exp"
-}
diff --git a/dev-libs/apr-util/apr-util-1.3.9.ebuild b/dev-libs/apr-util/apr-util-1.3.9.ebuild
deleted file mode 100644
index 5be51c77fd36..000000000000
--- a/dev-libs/apr-util/apr-util-1.3.9.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.3.9.ebuild,v 1.14 2010/07/14 10:06:40 ssuominen Exp $
-
-EAPI="2"
-
-# Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
-#APR_PV=${PV}
-APR_PV="1.3.8"
-
-inherit autotools db-use eutils libtool multilib
-
-DESCRIPTION="Apache Portable Runtime Utility Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="berkdb doc freetds gdbm ldap mysql odbc postgres sqlite sqlite3"
-RESTRICT="test"
-
-RDEPEND="dev-libs/expat
-	>=dev-libs/apr-${APR_PV}:1
-	berkdb? ( >=sys-libs/db-4 )
-	freetds? ( dev-db/freetds )
-	gdbm? ( sys-libs/gdbm )
-	ldap? ( =net-nds/openldap-2* )
-	mysql? ( =virtual/mysql-5* )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:0 )
-	sqlite3? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-support_berkeley_db-{4.8,5.0}.patch
-	eautoreconf
-
-	elibtoolize
-}
-
-src_configure() {
-	local myconf
-
-	use ldap && myconf+=" --with-ldap"
-
-	if use berkdb; then
-		local db_version
-		db_version="$(db_findver sys-libs/db)" || die "Unable to find db version"
-		db_version="$(db_ver_to_slot "${db_version}")"
-		db_version="${db_version/\./}"
-		myconf+=" --with-dbm=db${db_version} --with-berkeley-db=$(db_includedir):/usr/$(get_libdir)"
-	else
-		myconf+=" --without-berkeley-db"
-	fi
-
-	econf --datadir=/usr/share/apr-util-1 \
-		--with-apr=/usr \
-		--with-expat=/usr \
-		$(use_with freetds) \
-		$(use_with gdbm) \
-		$(use_with mysql) \
-		$(use_with odbc) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite sqlite2) \
-		$(use_with sqlite3) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use doc; then
-		emake dox || die "emake dox failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc CHANGES NOTICE README
-
-	if use doc; then
-		dohtml -r docs/dox/html/* || die "dohtml failed"
-	fi
-
-	# This file is only used on AIX systems, which Gentoo is not,
-	# and causes collisions between the SLOTs, so remove it.
-	rm -f "${D}usr/$(get_libdir)/aprutil.exp"
-}
diff --git a/dev-libs/apr-util/files/apr-util-1.3.10-support_berkeley_db-5.1.patch b/dev-libs/apr-util/files/apr-util-1.3.10-support_berkeley_db-5.1.patch
deleted file mode 100644
index 40a366289dc9..000000000000
--- a/dev-libs/apr-util/files/apr-util-1.3.10-support_berkeley_db-5.1.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-https://svn.apache.org/viewvc?view=revision&revision=1003788
-
---- build/dbm.m4
-+++ build/dbm.m4
-@@ -560,6 +560,25 @@
-     apu_db_version=5
-   fi
- ])
-+dnl
-+dnl APU_CHECK_DB51: is DB5.1 present?
-+dnl
-+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
-+dnl
-+AC_DEFUN([APU_CHECK_DB51], [
-+  places=$1
-+  if test -z "$places"; then
-+    places="std /usr/local/BerkeleyDB.5.1 /boot/home/config"
-+  fi
-+  APU_CHECK_BERKELEY_DB("5", "1", "-1",
-+    "$places",
-+    "db51/db.h db5/db.h db.h",
-+    "db-5.1 db5-5.1 db51 db5 db"
-+  )
-+  if test "$apu_have_db" = "1"; then
-+    apu_db_version=5
-+  fi
-+])
- 
- AC_DEFUN([APU_CHECK_DB], [
-   requested=$1
-@@ -656,6 +675,12 @@
-       AC_MSG_ERROR(Berkeley db5 not found)
-     fi
-     ;;
-+  db51)
-+    APU_CHECK_DB51("$check_places")
-+    if test "$apu_db_version" != "5"; then
-+      AC_MSG_ERROR(Berkeley db5 not found)
-+    fi
-+    ;;
-   default)
-     APU_CHECK_DB_ALL("$check_places")
-     ;;
-@@ -663,38 +688,41 @@
- ])
- 
- dnl
--dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.0 to 1.
-+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.1 to 1.
- dnl
- AC_DEFUN([APU_CHECK_DB_ALL], [
-   all_places=$1
-  
--  APU_CHECK_DB50("$all_places")
-+  APU_CHECK_DB51("$all_places")
-   if test "$apu_db_version" != "5"; then
--    APU_CHECK_DB48("$all_places")
--    if test "$apu_db_version" != "4"; then
--      APU_CHECK_DB47("$all_places")
-+    APU_CHECK_DB50("$all_places")
-+    if test "$apu_db_version" != "5"; then
-+      APU_CHECK_DB48("$all_places")
-       if test "$apu_db_version" != "4"; then
--        APU_CHECK_DB46("$all_places")
-+        APU_CHECK_DB47("$all_places")
-         if test "$apu_db_version" != "4"; then
--          APU_CHECK_DB45("$all_places")
-+          APU_CHECK_DB46("$all_places")
-           if test "$apu_db_version" != "4"; then
--            APU_CHECK_DB44("$all_places")
-+            APU_CHECK_DB45("$all_places")
-             if test "$apu_db_version" != "4"; then
--              APU_CHECK_DB43("$all_places")
-+              APU_CHECK_DB44("$all_places")
-               if test "$apu_db_version" != "4"; then
--                APU_CHECK_DB42("$all_places")
-+                APU_CHECK_DB43("$all_places")
-                 if test "$apu_db_version" != "4"; then
--                  APU_CHECK_DB41("$all_places")
-+                  APU_CHECK_DB42("$all_places")
-                   if test "$apu_db_version" != "4"; then
--                    APU_CHECK_DB4("$all_places")
-+                    APU_CHECK_DB41("$all_places")
-                     if test "$apu_db_version" != "4"; then
--                      APU_CHECK_DB3("$all_places")
--                      if test "$apu_db_version" != "3"; then
--                        APU_CHECK_DB2("$all_places")
--                        if test "$apu_db_version" != "2"; then
--                          APU_CHECK_DB1("$all_places")
--                          if test "$apu_db_version" != "1"; then
--                            APU_CHECK_DB185("$all_places")
-+                      APU_CHECK_DB4("$all_places")
-+                      if test "$apu_db_version" != "4"; then
-+                        APU_CHECK_DB3("$all_places")
-+                        if test "$apu_db_version" != "3"; then
-+                          APU_CHECK_DB2("$all_places")
-+                          if test "$apu_db_version" != "2"; then
-+                            APU_CHECK_DB1("$all_places")
-+                            if test "$apu_db_version" != "1"; then
-+                              APU_CHECK_DB185("$all_places")
-+                            fi
-                           fi
-                         fi
-                       fi
-@@ -735,11 +763,11 @@
-   apu_db_version=0
- 
-   AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
--      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50}])],
-+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50,db51}])],
-   [
-     if test "$withval" = "yes"; then
-       AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
--        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50])
-+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51])
-     fi
-     requested="$withval"
-   ], [
-@@ -946,6 +974,10 @@
-       apu_use_db=1
-       apu_default_dbm=db5
-       ;;
-+    db51)
-+      apu_use_db=1
-+      apu_default_dbm=db5
-+      ;;
-     default)
-       dnl ### use more sophisticated DBMs for the default?
-       apu_default_dbm="sdbm (default)"
-@@ -953,7 +985,7 @@
-       ;;
-     *)
-       AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
--        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50])
-+        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51])
-       ;;
-   esac
- 
diff --git a/dev-libs/apr-util/files/apr-util-1.3.9-support_berkeley_db-4.8.patch b/dev-libs/apr-util/files/apr-util-1.3.9-support_berkeley_db-4.8.patch
deleted file mode 100644
index 31c4c032f32f..000000000000
--- a/dev-libs/apr-util/files/apr-util-1.3.9-support_berkeley_db-4.8.patch
+++ /dev/null
@@ -1,129 +0,0 @@
---- build/dbm.m4
-+++ build/dbm.m4
-@@ -522,6 +522,25 @@
-     apu_db_version=4
-   fi
- ])
-+dnl
-+dnl APU_CHECK_DB48: is DB4.8 present?
-+dnl
-+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
-+dnl
-+AC_DEFUN([APU_CHECK_DB48], [
-+  places=$1
-+  if test -z "$places"; then
-+    places="std /usr/local/BerkeleyDB.4.8 /boot/home/config"
-+  fi
-+  APU_CHECK_BERKELEY_DB("4", "8", "-1",
-+    "$places",
-+    "db48/db.h db4/db.h db.h",
-+    "db-4.8 db4-4.8 db48 db4 db"
-+  )
-+  if test "$apu_have_db" = "1"; then
-+    apu_db_version=4
-+  fi
-+])
- 
- AC_DEFUN([APU_CHECK_DB], [
-   requested=$1
-@@ -606,6 +625,12 @@
-       AC_MSG_ERROR(Berkeley db4 not found)
-     fi
-     ;;
-+  db48)
-+    APU_CHECK_DB48("$check_places")
-+    if test "$apu_db_version" != "4"; then
-+      AC_MSG_ERROR(Berkeley db4 not found)
-+    fi
-+    ;;
-   default)
-     APU_CHECK_DB_ALL("$check_places")
-     ;;
-@@ -613,34 +638,37 @@
- ])
- 
- dnl
--dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.7 to 1.
-+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.8 to 1.
- dnl
- AC_DEFUN([APU_CHECK_DB_ALL], [
-   all_places=$1
-  
--  APU_CHECK_DB47("$all_places")
-+  APU_CHECK_DB48("$all_places")
-   if test "$apu_db_version" != "4"; then
--    APU_CHECK_DB46("$all_places")
-+    APU_CHECK_DB47("$all_places")
-     if test "$apu_db_version" != "4"; then
--      APU_CHECK_DB45("$all_places")
-+      APU_CHECK_DB46("$all_places")
-       if test "$apu_db_version" != "4"; then
--        APU_CHECK_DB44("$all_places")
-+        APU_CHECK_DB45("$all_places")
-         if test "$apu_db_version" != "4"; then
--          APU_CHECK_DB43("$all_places")
-+          APU_CHECK_DB44("$all_places")
-           if test "$apu_db_version" != "4"; then
--            APU_CHECK_DB42("$all_places")
-+            APU_CHECK_DB43("$all_places")
-             if test "$apu_db_version" != "4"; then
--              APU_CHECK_DB41("$all_places")
-+              APU_CHECK_DB42("$all_places")
-               if test "$apu_db_version" != "4"; then
--                APU_CHECK_DB4("$all_places")
-+                APU_CHECK_DB41("$all_places")
-                 if test "$apu_db_version" != "4"; then
--                  APU_CHECK_DB3("$all_places")
--                  if test "$apu_db_version" != "3"; then
--                    APU_CHECK_DB2("$all_places")
--                    if test "$apu_db_version" != "2"; then
--                      APU_CHECK_DB1("$all_places")
--                      if test "$apu_db_version" != "1"; then
--                        APU_CHECK_DB185("$all_places")
-+                  APU_CHECK_DB4("$all_places")
-+                  if test "$apu_db_version" != "4"; then
-+                    APU_CHECK_DB3("$all_places")
-+                    if test "$apu_db_version" != "3"; then
-+                      APU_CHECK_DB2("$all_places")
-+                      if test "$apu_db_version" != "2"; then
-+                        APU_CHECK_DB1("$all_places")
-+                        if test "$apu_db_version" != "1"; then
-+                          APU_CHECK_DB185("$all_places")
-+                        fi
-                       fi
-                     fi
-                   fi
-@@ -679,11 +707,11 @@
-   apu_db_version=0
- 
-   AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
--      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47}])],
-+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48}])],
-   [
-     if test "$withval" = "yes"; then
-       AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
--        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47])
-+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48])
-     fi
-     requested="$withval"
-   ], [
-@@ -882,6 +910,10 @@
-       apu_use_db=1
-       apu_default_dbm=db4
-       ;;
-+    db48)
-+      apu_use_db=1
-+      apu_default_dbm=db4
-+      ;;
-     default)
-       dnl ### use more sophisticated DBMs for the default?
-       apu_default_dbm="sdbm (default)"
-@@ -889,7 +921,7 @@
-       ;;
-     *)
-       AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
--        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47])
-+        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48])
-       ;;
-   esac
- 
diff --git a/dev-libs/apr-util/files/apr-util-1.3.9-support_berkeley_db-5.0.patch b/dev-libs/apr-util/files/apr-util-1.3.9-support_berkeley_db-5.0.patch
deleted file mode 100644
index e819c339fc02..000000000000
--- a/dev-libs/apr-util/files/apr-util-1.3.9-support_berkeley_db-5.0.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-http://bugs.gentoo.org/319421
-http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/dbm/apr_dbm_berkeleydb.c?r1=719535&r2=938146&view=patch
-http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/~checkout~/packages/apr-util/apr-util-db.patch?rev=1.1;content-type=text%2Fplain
-
---- build/dbm.m4
-+++ build/dbm.m4
-@@ -112,7 +112,7 @@
-         changequote([,])
-         unset $cache_id
-         AC_CHECK_HEADER([$bdb_header], [
--          if test "$1" = "3" -o "$1" = "4"; then
-+          if test "$1" = "3" -o "$1" = "4" -o "$1" = "5"; then
-             # We generate a separate cache variable for each prefix and libname
-             # we search under.  That way, we avoid caching information that
-             # changes if the user runs `configure' with a different set of
-@@ -541,6 +541,26 @@
-     apu_db_version=4
-   fi
- ])
-+dnl
-+dnl APU_CHECK_DB50: is DB5.0 present?
-+dnl
-+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
-+dnl
-+dnl
-+AC_DEFUN([APU_CHECK_DB50], [
-+  places=$1
-+  if test -z "$places"; then
-+    places="std /usr/local/BerkeleyDB.5.0 /boot/home/config"
-+  fi
-+  APU_CHECK_BERKELEY_DB("5", "0", "-1",
-+    "$places",
-+    "db50/db.h db5/db.h db.h",
-+    "db-5.0 db5-5.0 db50 db5 db"
-+  )
-+  if test "$apu_have_db" = "1"; then
-+    apu_db_version=5
-+  fi
-+])
- 
- AC_DEFUN([APU_CHECK_DB], [
-   requested=$1
-@@ -631,6 +651,12 @@
-       AC_MSG_ERROR(Berkeley db4 not found)
-     fi
-     ;;
-+  db50)
-+    APU_CHECK_DB50("$check_places")
-+    if test "$apu_db_version" != "5"; then
-+      AC_MSG_ERROR(Berkeley db5 not found)
-+    fi
-+    ;;
-   default)
-     APU_CHECK_DB_ALL("$check_places")
-     ;;
-@@ -638,36 +664,39 @@
- ])
- 
- dnl
--dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.8 to 1.
-+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.0 to 1.
- dnl
- AC_DEFUN([APU_CHECK_DB_ALL], [
-   all_places=$1
-- 
--  APU_CHECK_DB48("$all_places")
--  if test "$apu_db_version" != "4"; then
--    APU_CHECK_DB47("$all_places")
-+  
-+  APU_CHECK_DB50("$all_places")
-+  if test "$apu_db_version" != "5"; then
-+    APU_CHECK_DB48("$all_places")
-     if test "$apu_db_version" != "4"; then
--      APU_CHECK_DB46("$all_places")
-+      APU_CHECK_DB47("$all_places")
-       if test "$apu_db_version" != "4"; then
--        APU_CHECK_DB45("$all_places")
-+        APU_CHECK_DB46("$all_places")
-         if test "$apu_db_version" != "4"; then
--          APU_CHECK_DB44("$all_places")
-+          APU_CHECK_DB45("$all_places")
-           if test "$apu_db_version" != "4"; then
--            APU_CHECK_DB43("$all_places")
-+            APU_CHECK_DB44("$all_places")
-             if test "$apu_db_version" != "4"; then
--              APU_CHECK_DB42("$all_places")
-+              APU_CHECK_DB43("$all_places")
-               if test "$apu_db_version" != "4"; then
--                APU_CHECK_DB41("$all_places")
-+                APU_CHECK_DB42("$all_places")
-                 if test "$apu_db_version" != "4"; then
--                  APU_CHECK_DB4("$all_places")
-+                  APU_CHECK_DB41("$all_places")
-                   if test "$apu_db_version" != "4"; then
--                    APU_CHECK_DB3("$all_places")
--                    if test "$apu_db_version" != "3"; then
--                      APU_CHECK_DB2("$all_places")
--                      if test "$apu_db_version" != "2"; then
--                        APU_CHECK_DB1("$all_places")
--                        if test "$apu_db_version" != "1"; then
--                          APU_CHECK_DB185("$all_places")
-+                    APU_CHECK_DB4("$all_places")
-+                    if test "$apu_db_version" != "4"; then
-+                      APU_CHECK_DB3("$all_places")
-+                      if test "$apu_db_version" != "3"; then
-+                        APU_CHECK_DB2("$all_places")
-+                        if test "$apu_db_version" != "2"; then
-+                          APU_CHECK_DB1("$all_places")
-+                          if test "$apu_db_version" != "1"; then
-+                            APU_CHECK_DB185("$all_places")
-+                          fi
-                         fi
-                       fi
-                     fi
-@@ -707,7 +736,7 @@
-   apu_db_version=0
- 
-   AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
--      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48}])],
-+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50}])],
-   [
-     if test "$withval" = "yes"; then
-       AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
-@@ -914,6 +943,10 @@
-       apu_use_db=1
-       apu_default_dbm=db4
-       ;;
-+    db50)
-+      apu_use_db=1
-+      apu_default_dbm=db5
-+      ;;
-     default)
-       dnl ### use more sophisticated DBMs for the default?
-       apu_default_dbm="sdbm (default)"
-@@ -921,7 +954,7 @@
-       ;;
-     *)
-       AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
--        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48])
-+        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50])
-       ;;
-   esac
- 
---- dbm/apr_dbm_berkeleydb.c
-+++ dbm/apr_dbm_berkeleydb.c
-@@ -37,13 +37,13 @@
-  * DB_185, DB2, DB3, and DB4.
-  */
- 
--#if   defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 4)
-+#if   defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR >= 4)
- /* We will treat anything greater than 4.1 as DB4.
-  * We can treat 4.0 as DB3.
-  */
--#if   defined(DB_VERSION_MINOR) && (DB_VERSION_MINOR >= 1)
-+#if   DB_VERSION_MAJOR > 4 || (defined(DB_VERSION_MINOR) && (DB_VERSION_MINOR >= 1))
- #define DB_VER 4
--#else
-+#elif DB_VERSION_MAJOR == 4
- #define DB_VER 3
- #endif
- #elif defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 3)