remove apr-util-0 wrt #203578

Package-Manager: portage-2.1.4

10 files changed, 16 insertions, 406 deletions

diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog
index 0dfe4afaf9fd..1951ed1ef1d0 100644
--- a/dev-libs/apr-util/ChangeLog
+++ b/dev-libs/apr-util/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/apr-util
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.105 2007/12/15 14:26:31 hollow Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.106 2008/01/28 23:51:51 hollow Exp $
+
+  28 Jan 2008; Benedikt Böhm <hollow@gentoo.org>
+  -files/apr-util-0.9.12-db-4.5.patch, -files/apr-util-0.9.12-linking.patch,
+  -apr-util-0.9.12.ebuild, -apr-util-0.9.12-r1.ebuild,
+  -apr-util-0.9.13.ebuild:
+  remove apr-util-0 wrt #203578
 
 *apr-util-1.2.12 (15 Dec 2007)
 
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 2c32cc3ec641..50eddde8acb5 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,33 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX apr-util-0.9.12-db-4.5.patch 3700 RMD160 bf230d5e84cb1ed09645f37ce73e803c5ac0c7ff SHA1 e03eef45265ecd0510d6e15118403bd2ef956b32 SHA256 e77d59dfe8289d3ad6e96d12651534e6634c629b91723c43583b7171308f99d3
-MD5 e04ae5a7ef56703daed38416e3e75a64 files/apr-util-0.9.12-db-4.5.patch 3700
-RMD160 bf230d5e84cb1ed09645f37ce73e803c5ac0c7ff files/apr-util-0.9.12-db-4.5.patch 3700
-SHA256 e77d59dfe8289d3ad6e96d12651534e6634c629b91723c43583b7171308f99d3 files/apr-util-0.9.12-db-4.5.patch 3700
-AUX apr-util-0.9.12-linking.patch 552 RMD160 b989add276da33dc37d94b443b34f006033321e8 SHA1 e24be832134302352472f49515450db1082d2e81 SHA256 57c40f62214094ab36b5e940e07bfbee5555ad6a08ab63947fd7f8e5c5875472
-MD5 5dc0176e66c29e58c1c49e52a3292e87 files/apr-util-0.9.12-linking.patch 552
-RMD160 b989add276da33dc37d94b443b34f006033321e8 files/apr-util-0.9.12-linking.patch 552
-SHA256 57c40f62214094ab36b5e940e07bfbee5555ad6a08ab63947fd7f8e5c5875472 files/apr-util-0.9.12-linking.patch 552
 DIST apr-1.2.11.tar.gz 1114033 RMD160 8b1c1831cd8281de17f41f84ffc5cfd9b6c35553 SHA1 bde2c8b6e477752bcac4f387ac0de9671cd15d1a SHA256 fc7a14e8ded002c252cf5f3ccce6cd5636f01a85986188e373f9343a174c42ff
 DIST apr-1.2.12.tar.gz 1127522 RMD160 912c34e412b42e678288727b811ba35f03d07b6b SHA1 12ebc5ee6bba6b66b75e25ff8326fd2d2ad8f4ff SHA256 23759142c483be869a0aec0529c5b8c94745b4dfd1c2c23f38417f4e02adcead
-DIST apr-util-0.9.12.tar.gz 592364 RMD160 a4554def22f29f56aab34cacddc7fa65c412f446 SHA1 402969874b301d11252acd6eaf0bb01aad3e2908 SHA256 5768fcc4d38fa6f811b0a89e2ef450d0f52688ff9263e548819adb096fbfc9c3
-DIST apr-util-0.9.13.tar.gz 593575 RMD160 34d6e517de6cb64e0b1aef45a99ee64f9ceba130 SHA1 079384f68d4efce2e74a3033adaae6bfc2bc3bad SHA256 8c5a2c9e0434a391360bbf3573a403a3f4f326d1b562f64276cbd4f92066da7f
 DIST apr-util-1.2.10.tar.gz 654083 RMD160 6d577b04a4d75efcb40e132fddf15faede7b29c1 SHA1 9e136a5492313a0eb3c50154a25da2c99dcabb1b SHA256 8761fec487ff98e7b9d965864125d0468a3d4adf2c91a44834faff3c693e6f47
 DIST apr-util-1.2.12.tar.gz 668292 RMD160 438528fe4d207dc2290de80ccbd2973266853f8a SHA1 7c0d929a3c0b328c257c916408bc2c9d47690fed SHA256 7d70ff17bec733bdb04a6653a8e9c15ab7d88429dac91a4ae58c1db5caaee07f
 DIST apr_dbd_mysql-r84.c 49110 RMD160 9d665f2e964b09f58b182829563a203f59e16640 SHA1 04c82a4dda00bbeaddc713b29dae826562fc0db6 SHA256 79893740a58c96fba6e04f800e950ec42d8128e034056ff8a5770e0d3acc4919
-EBUILD apr-util-0.9.12-r1.ebuild 2204 RMD160 5ba2b0b75c8202a2f6cebb5aed708a28333357d4 SHA1 064da1af28edfb7f442012ddb88ecef8776aa984 SHA256 db3afe463d8d2b93ad65a1f6a87d266870d070391b7991a4e7e6bddc8d93e314
-MD5 e87c5af6b465b5ea03d7c37df87258ee apr-util-0.9.12-r1.ebuild 2204
-RMD160 5ba2b0b75c8202a2f6cebb5aed708a28333357d4 apr-util-0.9.12-r1.ebuild 2204
-SHA256 db3afe463d8d2b93ad65a1f6a87d266870d070391b7991a4e7e6bddc8d93e314 apr-util-0.9.12-r1.ebuild 2204
-EBUILD apr-util-0.9.12.ebuild 1982 RMD160 edceacb2948b7c506aa23889b871bea800532505 SHA1 9bf26800994a809f03af6da72d93ae859d780725 SHA256 d4e925b87c1bc3ea84fe3a61f5a1c32f5f5df06b6b14149c25eb56d3c6a881bf
-MD5 90175a09555fb6a91867856dcf769c03 apr-util-0.9.12.ebuild 1982
-RMD160 edceacb2948b7c506aa23889b871bea800532505 apr-util-0.9.12.ebuild 1982
-SHA256 d4e925b87c1bc3ea84fe3a61f5a1c32f5f5df06b6b14149c25eb56d3c6a881bf apr-util-0.9.12.ebuild 1982
-EBUILD apr-util-0.9.13.ebuild 2044 RMD160 c48d4f631c75dfccd73250615379d8d056b8523d SHA1 9980a04c79f198c6d664823eea1554e09adbdece SHA256 361685efa8dac8b66f776b6fe905fb0d2515d2ea4b12931159205544a41722a6
-MD5 d100cc02c9f6af3ab98038817c64bd22 apr-util-0.9.13.ebuild 2044
-RMD160 c48d4f631c75dfccd73250615379d8d056b8523d apr-util-0.9.13.ebuild 2044
-SHA256 361685efa8dac8b66f776b6fe905fb0d2515d2ea4b12931159205544a41722a6 apr-util-0.9.13.ebuild 2044
 EBUILD apr-util-1.2.10.ebuild 2341 RMD160 3dccd7cbe8632547852741097c6a05b63dd6fe95 SHA1 d36cfd8bcc31dbc5509a714d342bfbe08ac9644f SHA256 fd5fdef80738666d84d06032068f2ccf557729d8254a93f7eb0234dfb17651d8
 MD5 be71673379e333b192d5272f6f22195d apr-util-1.2.10.ebuild 2341
 RMD160 3dccd7cbe8632547852741097c6a05b63dd6fe95 apr-util-1.2.10.ebuild 2341
@@ -36,23 +14,14 @@ EBUILD apr-util-1.2.12.ebuild 2118 RMD160 593e5e8274b0493549543ff2f80b8a282492fa
 MD5 ffa63ca7bdb6d0e43de432977b750f45 apr-util-1.2.12.ebuild 2118
 RMD160 593e5e8274b0493549543ff2f80b8a282492faf9 apr-util-1.2.12.ebuild 2118
 SHA256 9b5e1bf2d32ab74e73bbafbe5d1895e45be42d6001071208f1a07c46b04ae45e apr-util-1.2.12.ebuild 2118
-MISC ChangeLog 13513 RMD160 fff2d96a7c884d6f1009ca9058b1f7b68f032ffa SHA1 16513411f299b3d84273511f7216edf1baac94d3 SHA256 eace73ca4dcabc7cd4a8cd047a63a5e4fa4ccf928015a5f3f7e7e47c7ba1174d
-MD5 6769df50509252b56f7464478f9b2a0d ChangeLog 13513
-RMD160 fff2d96a7c884d6f1009ca9058b1f7b68f032ffa ChangeLog 13513
-SHA256 eace73ca4dcabc7cd4a8cd047a63a5e4fa4ccf928015a5f3f7e7e47c7ba1174d ChangeLog 13513
+MISC ChangeLog 13755 RMD160 dc02b1d3451256aa54763c410af5349f122a40b3 SHA1 f68cf0ef7030e0a26db340e8c49a151b7c7dc7e1 SHA256 1a621543e312a7054f88afb2c4149af64b7ad4972f4bb624066f1cc168e0828f
+MD5 29e7d65cbcef9742829eba0f0c7df556 ChangeLog 13755
+RMD160 dc02b1d3451256aa54763c410af5349f122a40b3 ChangeLog 13755
+SHA256 1a621543e312a7054f88afb2c4149af64b7ad4972f4bb624066f1cc168e0828f ChangeLog 13755
 MISC metadata.xml 229 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 SHA1 92fdbcb6a85ece96506733ad67a5e4e74a58a529 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d
 MD5 17bfbf436c6d4afc4dea019597d048d1 metadata.xml 229
 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 metadata.xml 229
 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d metadata.xml 229
-MD5 537f6952f094fa8eeaa7a554c6eedb6d files/digest-apr-util-0.9.12 247
-RMD160 b240c0c4d2dcb011148569f97f233d826c76876b files/digest-apr-util-0.9.12 247
-SHA256 c4de35e77ddfa5d48a08e9f231f723f01e67c5c560b2198595ccae73fddd1f9a files/digest-apr-util-0.9.12 247
-MD5 537f6952f094fa8eeaa7a554c6eedb6d files/digest-apr-util-0.9.12-r1 247
-RMD160 b240c0c4d2dcb011148569f97f233d826c76876b files/digest-apr-util-0.9.12-r1 247
-SHA256 c4de35e77ddfa5d48a08e9f231f723f01e67c5c560b2198595ccae73fddd1f9a files/digest-apr-util-0.9.12-r1 247
-MD5 b002adcdf387f1aa2c49afa574bb2653 files/digest-apr-util-0.9.13 247
-RMD160 aad7d0578eb8fe17ce81a374078f7e0ba2b42fad files/digest-apr-util-0.9.13 247
-SHA256 a33f63c70f5b71847671b5a22784c8429fb622e41bcb40d5e5d966f370a7fcad files/digest-apr-util-0.9.13 247
 MD5 f67aba6d96594bf1faa4b5ff8f45aa29 files/digest-apr-util-1.2.10 717
 RMD160 9d96fa70dd8c8cb92149a713d0f790ca2b03b156 files/digest-apr-util-1.2.10 717
 SHA256 b10027b2194f7bdbd55d5acf3199840ed09da8dad35100d36fbe1664b8d9cede files/digest-apr-util-1.2.10 717
@@ -60,9 +29,9 @@ MD5 b11a32c67b0f943f0b3b73b9db4a32ed files/digest-apr-util-1.2.12 482
 RMD160 206c773f17d3993889ea603f93c3e224f2d2416f files/digest-apr-util-1.2.12 482
 SHA256 0c8781f111aed19f682e7a804f954776fc0728a06bc141cd5c4d506601551ea7 files/digest-apr-util-1.2.12 482
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHY+QdmPFBzbX68WERAuheAJ432QFUO8p/+E5enwif7ZjfUnnpqQCglryu
-VZdapjUhHDW1dQA1YqSrCt8=
-=oET2
+iEYEARECAAYFAkeeaqAACgkQmPFBzbX68WE9FgCdHc3eliA4T49SdjKV0OpY8pqk
+IT8AoJl9zp1VFQsnFxkkPvKaOXESBED1
+=BEvV
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/apr-util/apr-util-0.9.12-r1.ebuild b/dev-libs/apr-util/apr-util-0.9.12-r1.ebuild
deleted file mode 100644
index 1bdfa14b3f27..000000000000
--- a/dev-libs/apr-util/apr-util-0.9.12-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-0.9.12-r1.ebuild,v 1.14 2007/08/25 22:37:35 vapier Exp $
-
-WANT_AUTOMAKE="1.7"
-WANT_AUTOCONF="2.1"
-
-inherit autotools eutils flag-o-matic libtool db-use
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="berkdb gdbm ldap"
-RESTRICT="test"
-
-DEPEND="dev-libs/expat
-	~dev-libs/apr-${PV}
-	berkdb? ( =sys-libs/db-4* )
-	gdbm? ( sys-libs/gdbm )
-	ldap? ( =net-nds/openldap-2* )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-linking.patch
-	epatch "${FILESDIR}"/${P}-db-4.5.patch
-
-	# Fix the config.layout
-	ebegin "Applying ${P}-config.layout.patch"
-	sed -i "s,prefix:        /usr/local/apr,prefix:        /usr," \
-		"${S}"/config.layout
-	eend $?
-
-	eautoreconf
-}
-
-src_compile() {
-	local myconf=""
-
-	use ldap && myconf="${myconf} --with-ldap"
-	myconf="${myconf} $(use_with gdbm)"
-
-	if use berkdb; then
-		dbver="$(db_findver sys-libs/db)" || die "Unable to find db version"
-		dbver="$(db_ver_to_slot "$dbver")"
-		dbver="${dbver/\./}"
-		myconf="${myconf} --with-dbm=db${dbver}
-		--with-berkeley-db=$(db_includedir):/usr/$(get_libdir)"
-	else
-		myconf="${myconf} --without-berkeley-db"
-	fi
-
-	econf \
-		--datadir=/usr/share/apr-util-0 \
-		--with-apr=/usr \
-		--with-expat=/usr \
-		$myconf || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" installbuilddir=/usr/share/apr-util-0/build install || die
-
-	#bogus values pointing at /var/tmp/portage
-	sed -i -e 's:APU_SOURCE_DIR=.*:APU_SOURCE_DIR=:g' "${D}"/usr/bin/apu-config
-	sed -i -e 's:APU_BUILD_DIR=.*:APU_BUILD_DIR=/usr/share/apr-util-0/build:g' \
-		"${D}"/usr/bin/apu-config
-
-	dodoc CHANGES NOTICE
-
-	# Will install as portage user when using userpriv. Fixing
-	chown -R root:0 "${D}"/usr/include/apr-0/
-
-	# This file is only used on AIX systems, which gentoo is not,
-	# and causes collisions between the SLOTs, so kill it
-	rm "${D}"/usr/$(get_libdir)/aprutil.exp
-
-}
diff --git a/dev-libs/apr-util/apr-util-0.9.12.ebuild b/dev-libs/apr-util/apr-util-0.9.12.ebuild
deleted file mode 100644
index d4f3bb78a0e0..000000000000
--- a/dev-libs/apr-util/apr-util-0.9.12.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-0.9.12.ebuild,v 1.19 2007/07/12 02:25:34 mr_bones_ Exp $
-
-inherit eutils flag-o-matic libtool db-use
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="berkdb gdbm ldap"
-RESTRICT="test"
-
-DEPEND="dev-libs/expat
-	~dev-libs/apr-${PV}
-	berkdb? ( =sys-libs/db-4* )
-	gdbm? ( sys-libs/gdbm )
-	ldap? ( =net-nds/openldap-2* )"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	epatch ${FILESDIR}/apr-util-0.9.12-linking.patch
-	elibtoolize || die "elibtoolize failed"
-}
-
-src_compile() {
-
-	local myconf=""
-
-	use ldap && myconf="${myconf} --with-ldap"
-	myconf="${myconf} $(use_with gdbm)"
-
-	if use berkdb; then
-		dbver="$(db_findver sys-libs/db)" || die "Unable to find db version"
-		dbver="$(db_ver_to_slot "$dbver")"
-		dbver="${dbver/\./}"
-		myconf="${myconf} --with-dbm=db${dbver}
-		--with-berkeley-db=$(db_includedir):/usr/$(get_libdir)"
-	else
-		myconf="${myconf} --without-berkeley-db"
-	fi
-
-	econf \
-		--datadir=/usr/share/apr-util-0 \
-		--with-apr=/usr \
-		--with-expat=/usr \
-		$myconf || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" installbuilddir=/usr/share/apr-util-0/build install || die
-
-	#bogus values pointing at /var/tmp/portage
-	sed -i -e 's:APU_SOURCE_DIR=.*:APU_SOURCE_DIR=:g' ${D}/usr/bin/apu-config
-	sed -i -e 's:APU_BUILD_DIR=.*:APU_BUILD_DIR=/usr/share/apr-util-0/build:g' ${D}/usr/bin/apu-config
-
-	dodoc CHANGES NOTICE
-
-	# Will install as portage user when using userpriv. Fixing
-	chown -R root:0 ${D}/usr/include/apr-0/
-
-	# This file is only used on AIX systems, which gentoo is not,
-	# and causes collisions between the SLOTs, so kill it
-	rm ${D}/usr/$(get_libdir)/aprutil.exp
-
-}
diff --git a/dev-libs/apr-util/apr-util-0.9.13.ebuild b/dev-libs/apr-util/apr-util-0.9.13.ebuild
deleted file mode 100644
index 50b5e58685e2..000000000000
--- a/dev-libs/apr-util/apr-util-0.9.13.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-0.9.13.ebuild,v 1.4 2007/07/12 02:25:34 mr_bones_ Exp $
-
-inherit eutils flag-o-matic libtool db-use
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="berkdb gdbm ldap"
-RESTRICT="test"
-
-DEPEND="dev-libs/expat
-	~dev-libs/apr-${PV}
-	berkdb? ( =sys-libs/db-4* )
-	gdbm? ( sys-libs/gdbm )
-	ldap? ( =net-nds/openldap-2* )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/apr-util-0.9.12-linking.patch
-	elibtoolize || die "elibtoolize failed"
-}
-
-src_compile() {
-	local myconf=""
-
-	use ldap && myconf="${myconf} --with-ldap"
-	myconf="${myconf} $(use_with gdbm)"
-
-	if use berkdb; then
-		dbver="$(db_findver sys-libs/db)" || die "Unable to find db version"
-		dbver="$(db_ver_to_slot "$dbver")"
-		dbver="${dbver/\./}"
-		myconf="${myconf} --with-dbm=db${dbver}
-		--with-berkeley-db=$(db_includedir):/usr/$(get_libdir)"
-	else
-		myconf="${myconf} --without-berkeley-db"
-	fi
-
-	econf \
-		--datadir=/usr/share/apr-util-0 \
-		--with-apr=/usr \
-		--with-expat=/usr \
-		$myconf || die "econf failed!"
-
-	emake || die "emake failed!"
-}
-
-src_install() {
-	make DESTDIR="${D}" installbuilddir=/usr/share/apr-util-0/build install || die "make install failed!"
-
-	#bogus values pointing at /var/tmp/portage
-	sed -i -e 's:APU_SOURCE_DIR=.*:APU_SOURCE_DIR=:g' "${D}"/usr/bin/apu-config
-	sed -i -e 's:APU_BUILD_DIR=.*:APU_BUILD_DIR=/usr/share/apr-util-0/build:g' "${D}"/usr/bin/apu-config
-
-	dodoc CHANGES NOTICE
-
-	# Will install as portage user when using userpriv. Fixing
-	chown -R root:0 "${D}"/usr/include/apr-0/
-
-	# This file is only used on AIX systems, which gentoo is not,
-	# and causes collisions between the SLOTs, so kill it
-	rm "${D}"/usr/$(get_libdir)/aprutil.exp
-}
diff --git a/dev-libs/apr-util/files/apr-util-0.9.12-db-4.5.patch b/dev-libs/apr-util/files/apr-util-0.9.12-db-4.5.patch
deleted file mode 100644
index 09e60b22640a..000000000000
--- a/dev-libs/apr-util/files/apr-util-0.9.12-db-4.5.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- apr/apr-util/trunk/build/dbm.m4	2006/02/09 04:13:19	376178
-+++ apr/apr-util/trunk/build/dbm.m4	2006/11/08 20:45:12	472635
-@@ -464,7 +464,25 @@
-     apu_db_version=4
-   fi
- ])
--
-+dnl
-+dnl APU_CHECK_DB45: is DB4.5 present?
-+dnl
-+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
-+dnl
-+AC_DEFUN([APU_CHECK_DB45], [
-+  places=$1
-+  if test -z "$places"; then
-+    places="std /usr/local/BerkeleyDB.4.5 /boot/home/config"
-+  fi
-+  APU_CHECK_BERKELEY_DB("4", "5", "-1",
-+    "$places",
-+    "db45/db.h db4/db.h db.h",
-+    "db-4.5 db4-4.5 db45 db4 db"
-+  )
-+  if test "$apu_have_db" = "1"; then
-+    apu_db_version=4
-+  fi
-+])
- 
- AC_DEFUN([APU_CHECK_DB], [
-   requested=$1
-@@ -531,6 +549,12 @@
-       AC_MSG_ERROR(Berkeley db4 not found)
-     fi
-     ;;
-+  db45)
-+    APU_CHECK_DB44("$check_places")
-+    if test "$apu_db_version" != "4"; then
-+      AC_MSG_ERROR(Berkeley db4 not found)
-+    fi
-+    ;;
-   default)
-     APU_CHECK_DB_ALL("$check_places")
-     ;;
-@@ -543,23 +567,26 @@
- AC_DEFUN([APU_CHECK_DB_ALL], [
-   all_places=$1
-  
--  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
-@@ -596,11 +623,11 @@
- 
-   AC_ARG_WITH(dbm, [
-     --with-dbm=DBM          choose the DBM type to use.
--      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44}
-+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45}
-   ], [
-     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])
-+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45])
-     fi
-     requested="$withval"
-   ], [
-@@ -786,6 +813,10 @@
-       apu_use_db=1
-       apu_default_dbm=db4
-       ;;
-+    db45)
-+      apu_use_db=1
-+      apu_default_dbm=db4
-+      ;;
-     default)
-       dnl ### use more sophisticated DBMs for the default?
-       apu_default_dbm="sdbm (default)"
-@@ -793,7 +824,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])
-+        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44 db45])
-       ;;
-   esac
- 
diff --git a/dev-libs/apr-util/files/apr-util-0.9.12-linking.patch b/dev-libs/apr-util/files/apr-util-0.9.12-linking.patch
deleted file mode 100644
index 87524c32c3dd..000000000000
--- a/dev-libs/apr-util/files/apr-util-0.9.12-linking.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: apr-util-0.9.12/Makefile.in
-===================================================================
---- apr-util-0.9.12.orig/Makefile.in
-+++ apr-util-0.9.12/Makefile.in
-@@ -81,7 +81,7 @@ install: $(TARGET_LIB)
- 
- $(TARGET_LIB):
- 	@objects="`find $(SUBDIRS) -name expat -prune -o -name 'gen_uri_delims.@so_ext@' -prune -o -name '*.@so_ext@' -print`"; \
--	    tmpcmd="$(LINK) @lib_target@ @EXTRA_OS_LINK@"; \
-+	    tmpcmd="$(LINK) $(APRUTIL_LDFLAGS) @lib_target@ @EXTRA_OS_LINK@ $(APRUTIL_LIBS)"; \
- 	    echo $$tmpcmd; \
- 	    $$tmpcmd && touch $@
- 
diff --git a/dev-libs/apr-util/files/digest-apr-util-0.9.12 b/dev-libs/apr-util/files/digest-apr-util-0.9.12
deleted file mode 100644
index c3958886c8de..000000000000
--- a/dev-libs/apr-util/files/digest-apr-util-0.9.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8e9cc71a1303b67b3278fbeab9799f2e apr-util-0.9.12.tar.gz 592364
-RMD160 a4554def22f29f56aab34cacddc7fa65c412f446 apr-util-0.9.12.tar.gz 592364
-SHA256 5768fcc4d38fa6f811b0a89e2ef450d0f52688ff9263e548819adb096fbfc9c3 apr-util-0.9.12.tar.gz 592364
diff --git a/dev-libs/apr-util/files/digest-apr-util-0.9.12-r1 b/dev-libs/apr-util/files/digest-apr-util-0.9.12-r1
deleted file mode 100644
index c3958886c8de..000000000000
--- a/dev-libs/apr-util/files/digest-apr-util-0.9.12-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8e9cc71a1303b67b3278fbeab9799f2e apr-util-0.9.12.tar.gz 592364
-RMD160 a4554def22f29f56aab34cacddc7fa65c412f446 apr-util-0.9.12.tar.gz 592364
-SHA256 5768fcc4d38fa6f811b0a89e2ef450d0f52688ff9263e548819adb096fbfc9c3 apr-util-0.9.12.tar.gz 592364
diff --git a/dev-libs/apr-util/files/digest-apr-util-0.9.13 b/dev-libs/apr-util/files/digest-apr-util-0.9.13
deleted file mode 100644
index fe458f30ff67..000000000000
--- a/dev-libs/apr-util/files/digest-apr-util-0.9.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 31e3881af0d9546286b0057717cdb89b apr-util-0.9.13.tar.gz 593575
-RMD160 34d6e517de6cb64e0b1aef45a99ee64f9ceba130 apr-util-0.9.13.tar.gz 593575
-SHA256 8c5a2c9e0434a391360bbf3573a403a3f4f326d1b562f64276cbd4f92066da7f apr-util-0.9.13.tar.gz 593575