Version bump.

(Portage version: 13932-svn/cvs/Linux x86_64)

6 files changed, 38 insertions, 340 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/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"
 }