--- dev-libs/apr-util/apr-util-1.2.10.ebuild
+++ dev-libs/apr-util/apr-util-1.2.12.ebuild
@@ -4,14 +4,12 @@
 
 inherit autotools eutils flag-o-matic libtool db-use
 
-DBD_MYSQL=84
-APR_PV=1.2.11
+APR_PV=1.2.12
 
-DESCRIPTION="Apache Portable Runtime Library"
+DESCRIPTION="Apache Portable Runtime Utility 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 )"
+	mirror://apache/apr/apr-${APR_PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1"
@@ -34,11 +32,6 @@
 	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"
 }
@@ -66,22 +59,22 @@
 		$(use_with postgres pgsql) \
 		$(use_with sqlite sqlite2) \
 		$(use_with sqlite3) \
-		${myconf} || die "econf failed!"
+		${myconf}
 
 	emake || die "emake failed!"
 
 	if use doc; then
-		emake dox || die "make dox failed"
+		emake dox || die "emake dox failed"
 	fi
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 
 	dodoc CHANGES NOTICE
 
 	if use doc; then
-		dohtml docs/dox/html/* || die
+		dohtml docs/dox/html/* || die "dohtml failed"
 	fi
 
 	# This file is only used on AIX systems, which gentoo is not,