Version bump.

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

7 files changed, 81 insertions, 488 deletions

diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index 53ad4e2fb523..8d7acaae1c87 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/apr
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.131 2009/07/24 22:10:18 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.132 2009/08/06 12:51:53 arfrever Exp $
+
+*apr-1.3.8 (06 Aug 2009)
+
+  06 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -apr-1.2.11.ebuild, -apr-1.2.12.ebuild, -apr-1.3.0.ebuild,
+  -apr-1.3.2.ebuild, -apr-1.3.3.ebuild, +apr-1.3.8.ebuild:
+  Version bump.
 
 *apr-1.3.7 (24 Jul 2009)
 
diff --git a/dev-libs/apr/apr-1.2.11.ebuild b/dev-libs/apr/apr-1.2.11.ebuild
deleted file mode 100644
index c1ca78953913..000000000000
--- a/dev-libs/apr/apr-1.2.11.ebuild
+++ /dev/null
@@ -1,97 +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/apr-1.2.11.ebuild,v 1.11 2008/06/01 11:35:11 hollow Exp $
-
-inherit autotools
-
-DESCRIPTION="Apache Portable Runtime 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="doc ipv6 urandom debug"
-RESTRICT="test"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# for some reason not all the .m4 files that are referenced in
-	# configure.in exist, so we remove all references and include every
-	# .m4 file in build using aclocal via eautoreconf
-	# See bug 135463
-	sed -i -e '/sinclude/d' configure.in
-	AT_M4DIR="build" eautoreconf
-
-	epatch "${FILESDIR}"/config.layout.patch
-}
-
-src_compile() {
-	# For now we always enable ipv6. Testing has shown that is still works
-	# correctly in ipv4 systems, and currently, the ipv4-only support
-	# is broken in apr. (ipv6 is enabled by default)
-	#myconf="${myconf} $(use_enable ipv6)"
-
-	if use urandom; then
-		myconf="${myconf} --with-devrandom=/dev/urandom"
-	else
-		myconf="${myconf} --with-devrandom=/dev/random"
-	fi
-
-	if use debug; then
-		myconf="${myconf} --enable-maintainer-mode"
-		myconf="${myconf} --enable-pool-debug=all"
-	fi
-
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	# See bugs 24215 and 133573
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> "${S}"/config.cache
-
-	econf --enable-layout=gentoo \
-		 --enable-threads \
-		 --enable-nonportable-atomics \
-		 ${myconf} || die "econf failed!"
-
-	# Make sure we use the system libtool
-	sed -i 's,$(apr_builddir)/libtool,/usr/bin/libtool,' "${S}"/build/apr_rules.mk
-	sed -i 's,${installbuilddir}/libtool,/usr/bin/libtool,' "${S}"/apr-1-config
-	rm -f "${S}"/libtool
-
-	emake || die "Make failed"
-
-	if use doc; then
-		emake dox || die "make dox failed"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# 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)/apr.exp
-
-	dodoc CHANGES NOTICE
-
-	if use doc; then
-		dohtml docs/dox/html/* || die
-	fi
-}
-
-pkg_postinst() {
-	ewarn "We are now using the system's libtool rather then bundling"
-	ewarn "our own. You will need to rebuild Apache and possibly other"
-	ewarn "software if you get a message similiar to the following:"
-	ewarn
-	ewarn "   /usr/share/apr-1/build-1/libtool: No such file or directory"
-	ewarn
-}
diff --git a/dev-libs/apr/apr-1.2.12.ebuild b/dev-libs/apr/apr-1.2.12.ebuild
deleted file mode 100644
index 57f4fcc41b58..000000000000
--- a/dev-libs/apr/apr-1.2.12.ebuild
+++ /dev/null
@@ -1,97 +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/apr-1.2.12.ebuild,v 1.2 2008/06/01 11:35:11 hollow Exp $
-
-inherit autotools
-
-DESCRIPTION="Apache Portable Runtime 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="doc ipv6 urandom debug"
-RESTRICT="test"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# for some reason not all the .m4 files that are referenced in
-	# configure.in exist, so we remove all references and include every
-	# .m4 file in build using aclocal via eautoreconf
-	# See bug 135463
-	sed -i -e '/sinclude/d' configure.in
-	AT_M4DIR="build" eautoreconf
-
-	epatch "${FILESDIR}"/config.layout.patch
-}
-
-src_compile() {
-	# For now we always enable ipv6. Testing has shown that is still works
-	# correctly in ipv4 systems, and currently, the ipv4-only support
-	# is broken in apr. (ipv6 is enabled by default)
-	#myconf="${myconf} $(use_enable ipv6)"
-
-	if use urandom; then
-		myconf="${myconf} --with-devrandom=/dev/urandom"
-	else
-		myconf="${myconf} --with-devrandom=/dev/random"
-	fi
-
-	if use debug; then
-		myconf="${myconf} --enable-maintainer-mode"
-		myconf="${myconf} --enable-pool-debug=all"
-	fi
-
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	# See bugs 24215 and 133573
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> "${S}"/config.cache
-
-	econf --enable-layout=gentoo \
-		--enable-threads \
-		--enable-nonportable-atomics \
-		${myconf}
-
-	# Make sure we use the system libtool
-	sed -i 's,$(apr_builddir)/libtool,/usr/bin/libtool,' "${S}"/build/apr_rules.mk
-	sed -i 's,${installbuilddir}/libtool,/usr/bin/libtool,' "${S}"/apr-1-config
-	rm -f "${S}"/libtool
-
-	emake || die "Make failed"
-
-	if use doc; then
-		emake dox || die "make dox failed"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# 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)/apr.exp
-
-	dodoc CHANGES NOTICE
-
-	if use doc; then
-		dohtml docs/dox/html/* || die
-	fi
-}
-
-pkg_postinst() {
-	ewarn "We are now using the system's libtool rather then bundling"
-	ewarn "our own. You will need to rebuild Apache and possibly other"
-	ewarn "software if you get a message similiar to the following:"
-	ewarn
-	ewarn "   /usr/share/apr-1/build-1/libtool: No such file or directory"
-	ewarn
-}
diff --git a/dev-libs/apr/apr-1.3.0.ebuild b/dev-libs/apr/apr-1.3.0.ebuild
deleted file mode 100644
index b1236ca2a2ae..000000000000
--- a/dev-libs/apr/apr-1.3.0.ebuild
+++ /dev/null
@@ -1,97 +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/apr-1.3.0.ebuild,v 1.1 2008/06/11 19:12:54 hollow Exp $
-
-inherit autotools
-
-DESCRIPTION="Apache Portable Runtime 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="doc ipv6 urandom debug"
-RESTRICT="test"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# for some reason not all the .m4 files that are referenced in
-	# configure.in exist, so we remove all references and include every
-	# .m4 file in build using aclocal via eautoreconf
-	# See bug 135463
-	sed -i -e '/sinclude/d' configure.in
-	AT_M4DIR="build" eautoreconf
-
-	epatch "${FILESDIR}"/config.layout.patch
-}
-
-src_compile() {
-	# For now we always enable ipv6. Testing has shown that is still works
-	# correctly in ipv4 systems, and currently, the ipv4-only support
-	# is broken in apr. (ipv6 is enabled by default)
-	#myconf="${myconf} $(use_enable ipv6)"
-
-	if use urandom; then
-		myconf="${myconf} --with-devrandom=/dev/urandom"
-	else
-		myconf="${myconf} --with-devrandom=/dev/random"
-	fi
-
-	if use debug; then
-		myconf="${myconf} --enable-maintainer-mode"
-		myconf="${myconf} --enable-pool-debug=all"
-	fi
-
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	# See bugs 24215 and 133573
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> "${S}"/config.cache
-
-	econf --enable-layout=gentoo \
-		--enable-threads \
-		--enable-nonportable-atomics \
-		${myconf}
-
-	# Make sure we use the system libtool
-	sed -i 's,$(apr_builddir)/libtool,/usr/bin/libtool,' "${S}"/build/apr_rules.mk
-	sed -i 's,${installbuilddir}/libtool,/usr/bin/libtool,' "${S}"/apr-1-config
-	rm -f "${S}"/libtool
-
-	emake || die "Make failed"
-
-	if use doc; then
-		emake dox || die "make dox failed"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# 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)/apr.exp
-
-	dodoc CHANGES NOTICE
-
-	if use doc; then
-		dohtml docs/dox/html/* || die
-	fi
-}
-
-pkg_postinst() {
-	ewarn "We are now using the system's libtool rather then bundling"
-	ewarn "our own. You will need to rebuild Apache and possibly other"
-	ewarn "software if you get a message similiar to the following:"
-	ewarn
-	ewarn "   /usr/share/apr-1/build-1/libtool: No such file or directory"
-	ewarn
-}
diff --git a/dev-libs/apr/apr-1.3.2.ebuild b/dev-libs/apr/apr-1.3.2.ebuild
deleted file mode 100644
index b947a9c75b54..000000000000
--- a/dev-libs/apr/apr-1.3.2.ebuild
+++ /dev/null
@@ -1,97 +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/apr-1.3.2.ebuild,v 1.8 2008/11/05 00:42:45 vapier Exp $
-
-inherit autotools
-
-DESCRIPTION="Apache Portable Runtime 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="doc urandom debug"
-RESTRICT="test"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# for some reason not all the .m4 files that are referenced in
-	# configure.in exist, so we remove all references and include every
-	# .m4 file in build using aclocal via eautoreconf
-	# See bug 135463
-	sed -i -e '/sinclude/d' configure.in
-	AT_M4DIR="build" eautoreconf
-
-	epatch "${FILESDIR}"/config.layout.patch
-}
-
-src_compile() {
-	# For now we always enable ipv6. Testing has shown that is still works
-	# correctly in ipv4 systems, and currently, the ipv4-only support
-	# is broken in apr. (ipv6 is enabled by default) Bug #123320
-	#myconf="${myconf} $(use_enable ipv6)"
-
-	if use urandom; then
-		myconf="${myconf} --with-devrandom=/dev/urandom"
-	else
-		myconf="${myconf} --with-devrandom=/dev/random"
-	fi
-
-	if use debug; then
-		myconf="${myconf} --enable-maintainer-mode"
-		myconf="${myconf} --enable-pool-debug=all"
-	fi
-
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	# See bugs 24215 and 133573
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> "${S}"/config.cache
-
-	econf --enable-layout=gentoo \
-		--enable-threads \
-		--enable-nonportable-atomics \
-		${myconf}
-
-	# Make sure we use the system libtool
-	sed -i 's,$(apr_builddir)/libtool,/usr/bin/libtool,' "${S}"/build/apr_rules.mk
-	sed -i 's,${installbuilddir}/libtool,/usr/bin/libtool,' "${S}"/apr-1-config
-	rm -f "${S}"/libtool
-
-	emake || die "Make failed"
-
-	if use doc; then
-		emake dox || die "make dox failed"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# 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)/apr.exp
-
-	dodoc CHANGES NOTICE
-
-	if use doc; then
-		dohtml docs/dox/html/* || die
-	fi
-}
-
-pkg_postinst() {
-	ewarn "We are now using the system's libtool rather then bundling"
-	ewarn "our own. You will need to rebuild Apache and possibly other"
-	ewarn "software if you get a message similiar to the following:"
-	ewarn
-	ewarn "   /usr/share/apr-1/build-1/libtool: No such file or directory"
-	ewarn
-}
diff --git a/dev-libs/apr/apr-1.3.3.ebuild b/dev-libs/apr/apr-1.3.3.ebuild
deleted file mode 100644
index f7b1d1c7c7fe..000000000000
--- a/dev-libs/apr/apr-1.3.3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.3.3.ebuild,v 1.10 2009/01/23 11:41:20 armin76 Exp $
-
-EAPI="1"
-
-inherit autotools
-
-DESCRIPTION="Apache Portable Runtime 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="doc +urandom debug"
-RESTRICT="test"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# for some reason not all the .m4 files that are referenced in
-	# configure.in exist, so we remove all references and include every
-	# .m4 file in build using aclocal via eautoreconf
-	# See bug 135463
-	sed -i -e '/sinclude/d' configure.in
-	AT_M4DIR="build" eautoreconf
-
-	epatch "${FILESDIR}"/config.layout.patch
-}
-
-src_compile() {
-	# For now we always enable ipv6. Testing has shown that is still works
-	# correctly in ipv4 systems, and currently, the ipv4-only support
-	# is broken in apr. (ipv6 is enabled by default) Bug #123320
-	#myconf="${myconf} $(use_enable ipv6)"
-
-	if use urandom; then
-		myconf="${myconf} --with-devrandom=/dev/urandom"
-	else
-		myconf="${myconf} --with-devrandom=/dev/random"
-	fi
-
-	if use debug; then
-		myconf="${myconf} --enable-maintainer-mode"
-		myconf="${myconf} --enable-pool-debug=all"
-	fi
-
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	# See bugs 24215 and 133573
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> "${S}"/config.cache
-
-	econf --enable-layout=gentoo \
-		--enable-threads \
-		--enable-nonportable-atomics \
-		${myconf}
-
-	# Make sure we use the system libtool
-	sed -i 's,$(apr_builddir)/libtool,/usr/bin/libtool,' "${S}"/build/apr_rules.mk
-	sed -i 's,${installbuilddir}/libtool,/usr/bin/libtool,' "${S}"/apr-1-config
-	rm -f "${S}"/libtool
-
-	emake || die "Make failed"
-
-	if use doc; then
-		emake dox || die "make dox failed"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# 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)/apr.exp
-
-	dodoc CHANGES NOTICE
-
-	if use doc; then
-		dohtml docs/dox/html/* || die
-	fi
-}
-
-pkg_postinst() {
-	ewarn "We are now using the system's libtool rather than bundling"
-	ewarn "our own. You will need to rebuild Apache and possibly other"
-	ewarn "software if you get a message similiar to the following:"
-	ewarn
-	ewarn "   /usr/share/apr-1/build-1/libtool: No such file or directory"
-	ewarn
-}
diff --git a/dev-libs/apr/apr-1.3.8.ebuild b/dev-libs/apr/apr-1.3.8.ebuild
new file mode 100644
index 000000000000..15de4a3e4895
--- /dev/null
+++ b/dev-libs/apr/apr-1.3.8.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.3.8.ebuild,v 1.1 2009/08/06 12:51:53 arfrever Exp $
+
+EAPI="2"
+
+inherit autotools eutils libtool multilib
+
+DESCRIPTION="Apache Portable Runtime 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="debug doc +urandom"
+RESTRICT="test"
+
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+src_prepare() {
+	AT_M4DIR="build" eautoreconf
+	elibtoolize
+
+	epatch "${FILESDIR}/config.layout.patch"
+}
+
+src_configure() {
+	local myconf
+
+	if use debug; then
+		myconf+=" --enable-maintainer-mode --enable-pool-debug=all"
+	fi
+
+	if use urandom; then
+		myconf+=" --with-devrandom=/dev/urandom"
+	else
+		myconf+=" --with-devrandom=/dev/random"
+	fi
+
+	econf --enable-layout=gentoo \
+		--enable-nonportable-atomics \
+		--enable-threads \
+		${myconf}
+
+	# Make sure we use the system libtool.
+	sed -i 's,$(apr_builddir)/libtool,/usr/bin/libtool,' build/apr_rules.mk
+	sed -i 's,${installbuilddir}/libtool,/usr/bin/libtool,' apr-1-config
+	rm -f libtool
+}
+
+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
+
+	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 remove it.
+	rm -f "${D}usr/$(get_libdir)/apr.exp"
+}