Version bump.

Package-Manager: portage-13932-svn/cvs/Linux x86_64

7 files changed, 41 insertions, 355 deletions

diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog
index 44f83ec4116e..1c6c9f1ac19d 100644
--- a/dev-libs/apr-util/ChangeLog
+++ b/dev-libs/apr-util/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/apr-util
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.132 2009/07/07 18:29:26 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.133 2009/08/06 12:59:16 arfrever Exp $
+
+*apr-util-1.3.9 (06 Aug 2009)
+
+  06 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -apr-util-1.2.10.ebuild, -apr-util-1.2.12.ebuild, -apr-util-1.3.0.ebuild,
+  -apr-util-1.3.2.ebuild, -apr-util-1.3.4.ebuild, +apr-util-1.3.9.ebuild:
+  Version bump.
 
 *apr-util-1.3.8 (07 Jul 2009)
 
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 238ff36f6d8f..0d3c394d26d0 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,20 +1,8 @@
-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-1.3.0.tar.gz 1145703 RMD160 1b392ce9335f6608102edbba162cc2e9924da6cf SHA1 5cccd027d43e94acf813ca627a3b0984520fe50a SHA256 1bf89994de9758061fdd304d5fe37971d5f2f9e95f587ba847ceb33e67f1d1f0
-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-util-1.3.0.tar.gz 746522 RMD160 f8ca262db8bc1d4d7b2a5ad992850d662f6a8241 SHA1 56114a5750cc76e1536bf3e000f9b710de2c70d0 SHA256 ccbbce2c06410a44b93259d7071dc25697c71410666c076feb7d6669960bcd8d
-DIST apr-util-1.3.2.tar.gz 778182 RMD160 868a503cfb038c9dd5f82b0cdd1eee4691ef1096 SHA1 29d3974d928d29fe996f3cf1e6b4794b82272683 SHA256 0c95069e5b4962d56ec4112f2aa85701b93a7374b76adcca348ca19c0db560f1
-DIST apr-util-1.3.4.tar.gz 778902 RMD160 741b9b8e9449ce3cae565aeac57deaeb688071d3 SHA1 c538c566447cf38b849288a40cf81e5267d9117f SHA256 3f07ffdb18fb853290c9b83e82cd5cae66b8fbc357bd391e846c0afdd24fed7e
 DIST apr-util-1.3.7.tar.gz 788206 RMD160 9e41d6c79fe601129c10c95e782c7e34f6058e11 SHA1 1ddb686c1ae573a67784c24d51c6f3ba44cbe32b SHA256 fadd6a0c55596b2c21375942e3acefc33715e647ed4770dc398d08d8783a39e0
 DIST apr-util-1.3.8.tar.gz 789031 RMD160 b15f3d4077d139bd092b013696cfecff4fd0db62 SHA1 17e201fa6ac2c3037fadca8d7c8baa2a30e210e5 SHA256 15ef62c09e76d0ee485c4980b69f5c556740bc4efa736d8563c6961902745700
-DIST apr_dbd_mysql-r84.c 49110 RMD160 9d665f2e964b09f58b182829563a203f59e16640 SHA1 04c82a4dda00bbeaddc713b29dae826562fc0db6 SHA256 79893740a58c96fba6e04f800e950ec42d8128e034056ff8a5770e0d3acc4919
-EBUILD apr-util-1.2.10.ebuild 2373 RMD160 cfd05aa3a37e36bbe2f3d4053b2c4a56cbfdfbe9 SHA1 49f5fb6cff82d2fa00fe46699123e03e9e5ee37c SHA256 9181619073e95f52a2979dd9fe8d7903de54ca12786209d78453d7287c5133a3
-EBUILD apr-util-1.2.12.ebuild 1993 RMD160 da1acc8d734647f2a1355b7781bd0c77cdf5ae8e SHA1 b9befea6cdd9a8b9406f1acac0788fc2a22764dc SHA256 3ddf98c93574ca7d7c71d8fd6acecd04760b38471e9e7b1d220ac7a8d0f9fa3e
-EBUILD apr-util-1.3.0.ebuild 1992 RMD160 cc16563f3826f9082c84a7748c11bae959601f82 SHA1 8a79c7e7f2500a3bc63ac954e799a22ad60d92ab SHA256 b14adc4c47ded8dd6d97f45a18dc777304aa70b1f4fee004eb1db50e1ba07013
-EBUILD apr-util-1.3.2.ebuild 2057 RMD160 c366c3cb52b9972424ac5fd24761d60314e5c0b0 SHA1 2d99955241f314cd19294b2d9655369e83eef2e2 SHA256 144961eb47e53001cf472c3afab70b2b452e8a633dc6e910404245d046f8cd13
-EBUILD apr-util-1.3.4.ebuild 2185 RMD160 0e581559bf82fadc9099988370f6f0dc95db8901 SHA1 62aa8f87b44345bce5fa8d9e92cdfd77b0556f1a SHA256 688c392a423b2e4ce4b1b6094c9018fb549de5e7ec7518ec7e8ea7669a89be04
+DIST apr-util-1.3.9.tar.gz 790952 RMD160 f6180ba186e8ed73831b1da78de7ec57fc1cb162 SHA1 fd2a76352353e6bc2f7cc7da80e2ab3842795199 SHA256 20897069274a026057df26b90a6424da9d70318d930c99885c451d8753b8e4d9
 EBUILD apr-util-1.3.7.ebuild 2264 RMD160 93957a7afc40c5fc6c8517561976acf86f8c2ec0 SHA1 f5d82c1eeeb9743aaf0656a6d26a12109ce906eb SHA256 150d1b93aeb1d6f2074b621c8de35226668042a6f11a479fdcc77623fc0e871e
 EBUILD apr-util-1.3.8.ebuild 2277 RMD160 7fba860df1d2496a3300f97d8c7118b9316346dc SHA1 345ff6c0a799aa27e4abcb4169b22258be884385 SHA256 dafc2a718897b7d45c7bbfa9f5f8ac6199cd613925df1ef0456fdb687b81a0b6
-MISC ChangeLog 16771 RMD160 40af0aabe6368d7d07724f8cfb72cd8454741021 SHA1 0fa635a8f7adb655fb19f338256a1e23cb755df7 SHA256 0473d2a1df7b32db00bef92b46b0f73399b5d213b2fdd1ba7f0d39f86e876123
+EBUILD apr-util-1.3.9.ebuild 2277 RMD160 07f71333e81f087f7885362d5405d4caee6fc60e SHA1 a46c8f68421875785bfac6310481e1bcda5ce90d SHA256 6c7df901095ffdf4585b9b86664707165098b5468a98765df0365822184b7afb
+MISC ChangeLog 17042 RMD160 f1d58e8b4f75e8a24db20fc77c019bb55485f7a8 SHA1 796a0ceeae0c8605921da84da9b1dcb35f0e3b09 SHA256 2a0e5025f16bdbfd39e76be59a89d08f94c0b7a1b2f6841284b6d37fa86db736
 MISC metadata.xml 229 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 SHA1 92fdbcb6a85ece96506733ad67a5e4e74a58a529 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d
diff --git a/dev-libs/apr-util/apr-util-1.2.10.ebuild b/dev-libs/apr-util/apr-util-1.2.10.ebuild
deleted file mode 100644
index 6f4e7fecc6fb..000000000000
--- a/dev-libs/apr-util/apr-util-1.2.10.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2008 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.2.10.ebuild,v 1.12 2008/06/01 11:42:35 hollow Exp $
-
-inherit autotools eutils flag-o-matic libtool db-use
-
-DBD_MYSQL=84
-APR_PV=1.2.11
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.gz
-	mirror://apache/apr/apr-${APR_PV}.tar.gz
-	mysql? ( mirror://gentoo/apr_dbd_mysql-r${DBD_MYSQL}.c )"
-
-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 gdbm ldap mysql postgres sqlite sqlite3"
-RESTRICT="test"
-
-RDEPEND="dev-libs/expat
-	>=dev-libs/apr-${PV}
-	berkdb? ( =sys-libs/db-4* )
-	gdbm? ( sys-libs/gdbm )
-	ldap? ( =net-nds/openldap-2* )
-	mysql? ( =virtual/mysql-5* )
-	postgres? ( virtual/postgresql-base )
-	sqlite? ( =dev-db/sqlite-2* )
-	sqlite3? ( =dev-db/sqlite-3* )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use mysql ; then
-		cp "${DISTDIR}"/apr_dbd_mysql-r${DBD_MYSQL}.c \
-			"${S}"/dbd/apr_dbd_mysql.c || die "could not copy mysql driver"
-	fi
-
-	./buildconf --with-apr=../apr-${APR_PV} || die "buildconf failed"
-	elibtoolize || die "elibtoolize failed"
-}
-
-src_compile() {
-	local myconf=""
-
-	use ldap && myconf="${myconf} --with-ldap"
-
-	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-1 \
-		--with-apr=/usr \
-		--with-expat=/usr \
-		$(use_with gdbm) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite sqlite2) \
-		$(use_with sqlite3) \
-		${myconf} || die "econf failed!"
-
-	emake || die "emake failed!"
-
-	if use doc; then
-		emake dox || die "make dox failed"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc CHANGES NOTICE
-
-	if use doc; then
-		dohtml docs/dox/html/* || die
-	fi
-
-	# 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-1.2.12.ebuild b/dev-libs/apr-util/apr-util-1.2.12.ebuild
deleted file mode 100644
index 8b1f8f45e9b1..000000000000
--- a/dev-libs/apr-util/apr-util-1.2.12.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2008 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.2.12.ebuild,v 1.4 2008/06/15 16:21:55 hollow Exp $
-
-inherit eutils flag-o-matic libtool db-use
-
-DESCRIPTION="Apache Portable Runtime Utility Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.gz
-	mirror://apache/apr/apr-${PV}.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 gdbm ldap mysql postgres sqlite sqlite3"
-RESTRICT="test"
-
-RDEPEND="dev-libs/expat
-	>=dev-libs/apr-${PV}
-	berkdb? ( =sys-libs/db-4* )
-	gdbm? ( sys-libs/gdbm )
-	ldap? ( =net-nds/openldap-2* )
-	mysql? ( =virtual/mysql-5* )
-	postgres? ( virtual/postgresql-base )
-	sqlite? ( =dev-db/sqlite-2* )
-	sqlite3? ( =dev-db/sqlite-3* )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_compile() {
-	local myconf=""
-
-	use ldap && myconf="${myconf} --with-ldap"
-
-	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-1 \
-		--with-apr=/usr \
-		--with-expat=/usr \
-		$(use_with gdbm) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite sqlite2) \
-		$(use_with sqlite3) \
-		${myconf}
-
-	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
-
-	if use doc; then
-		dohtml 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 kill it
-	rm "${D}"/usr/$(get_libdir)/aprutil.exp
-}
diff --git a/dev-libs/apr-util/apr-util-1.3.0.ebuild b/dev-libs/apr-util/apr-util-1.3.0.ebuild
deleted file mode 100644
index 2deb693af64c..000000000000
--- a/dev-libs/apr-util/apr-util-1.3.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2008 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.0.ebuild,v 1.2 2008/06/15 16:21:55 hollow Exp $
-
-inherit eutils flag-o-matic libtool db-use
-
-DESCRIPTION="Apache Portable Runtime Utility Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.gz
-	mirror://apache/apr/apr-${PV}.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 gdbm ldap mysql postgres sqlite sqlite3"
-RESTRICT="test"
-
-RDEPEND="dev-libs/expat
-	>=dev-libs/apr-${PV}
-	berkdb? ( =sys-libs/db-4* )
-	gdbm? ( sys-libs/gdbm )
-	ldap? ( =net-nds/openldap-2* )
-	mysql? ( =virtual/mysql-5* )
-	postgres? ( virtual/postgresql-base )
-	sqlite? ( =dev-db/sqlite-2* )
-	sqlite3? ( =dev-db/sqlite-3* )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_compile() {
-	local myconf=""
-
-	use ldap && myconf="${myconf} --with-ldap"
-
-	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-1 \
-		--with-apr=/usr \
-		--with-expat=/usr \
-		$(use_with gdbm) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite sqlite2) \
-		$(use_with sqlite3) \
-		${myconf}
-
-	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
-
-	if use doc; then
-		dohtml 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 kill it
-	rm "${D}"/usr/$(get_libdir)/aprutil.exp
-}
diff --git a/dev-libs/apr-util/apr-util-1.3.2.ebuild b/dev-libs/apr-util/apr-util-1.3.2.ebuild
deleted file mode 100644
index 404829ca1441..000000000000
--- a/dev-libs/apr-util/apr-util-1.3.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2008 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.2.ebuild,v 1.7 2008/11/05 00:43:00 vapier Exp $
-
-inherit eutils flag-o-matic libtool db-use
-
-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-${PV}
-	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? ( virtual/postgresql-base )
-	sqlite? ( =dev-db/sqlite-2* )
-	sqlite3? ( =dev-db/sqlite-3* )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_compile() {
-	local myconf=""
-
-	use ldap && myconf="${myconf} --with-ldap"
-
-	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-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}
-
-	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
-
-	if use doc; then
-		dohtml 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 kill it
-	rm "${D}"/usr/$(get_libdir)/aprutil.exp
-}
diff --git a/dev-libs/apr-util/apr-util-1.3.4.ebuild b/dev-libs/apr-util/apr-util-1.3.9.ebuild
index f3e9fdb8fe6e..df3293af4e9e 100644
--- a/dev-libs/apr-util/apr-util-1.3.4.ebuild
+++ b/dev-libs/apr-util/apr-util-1.3.9.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2009 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.4.ebuild,v 1.8 2009/01/23 11:43:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.3.9.ebuild,v 1.1 2009/08/06 12:59:16 arfrever Exp $
 
-# usually apr-util has the same PV as apr, but in case of security fixes, this
-# may change.
+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.3"
+APR_PV="1.3.8"
 
-inherit eutils flag-o-matic libtool db-use
+inherit db-use libtool multilib
 
 DESCRIPTION="Apache Portable Runtime Utility Library"
 HOMEPAGE="http://apr.apache.org/"
@@ -15,12 +16,12 @@ 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"
+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}
+	>=dev-libs/apr-${APR_PV}:1
 	berkdb? ( =sys-libs/db-4* )
 	freetds? ( dev-db/freetds )
 	gdbm? ( sys-libs/gdbm )
@@ -28,24 +29,28 @@ RDEPEND="dev-libs/expat
 	mysql? ( =virtual/mysql-5* )
 	odbc? ( dev-db/unixODBC )
 	postgres? ( virtual/postgresql-base )
-	sqlite? ( =dev-db/sqlite-2* )
-	sqlite3? ( =dev-db/sqlite-3* )"
+	sqlite? ( dev-db/sqlite:0 )
+	sqlite3? ( dev-db/sqlite:3 )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
-src_compile() {
-	local myconf=""
+src_prepare() {
+	elibtoolize
+}
 
-	use ldap && myconf="${myconf} --with-ldap"
+src_configure() {
+	local myconf
+
+	use ldap && myconf+=" --with-ldap"
 
 	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)"
+		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="${myconf} --without-berkeley-db"
+		myconf+=" --without-berkeley-db"
 	fi
 
 	econf --datadir=/usr/share/apr-util-1 \
@@ -59,8 +64,10 @@ src_compile() {
 		$(use_with sqlite sqlite2) \
 		$(use_with sqlite3) \
 		${myconf}
+}
 
-	emake || die "emake failed!"
+src_compile() {
+	emake || die "emake failed"
 
 	if use doc; then
 		emake dox || die "emake dox failed"
@@ -70,13 +77,13 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	dodoc CHANGES NOTICE
+	dodoc CHANGES NOTICE README
 
 	if use doc; then
 		dohtml 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 kill it
-	rm "${D}"/usr/$(get_libdir)/aprutil.exp
+	# 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"
 }