version bump wrt #228953

(Portage version: 2.2_pre8/cvs/Linux 2.6.22-vs2.2.0.6-gentoo x86_64)

2 files changed, 103 insertions, 1 deletions

diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index 72b75c8bb745..149a32a4fbe0 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/apr
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.103 2008/06/11 19:12:54 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.104 2008/06/23 18:05:00 hollow Exp $
+
+*apr-1.3.2 (23 Jun 2008)
+
+  23 Jun 2008; Benedikt Böhm <hollow@gentoo.org> +apr-1.3.2.ebuild:
+  version bump wrt #228953
 
 *apr-1.3.0 (11 Jun 2008)
 
diff --git a/dev-libs/apr/apr-1.3.2.ebuild b/dev-libs/apr/apr-1.3.2.ebuild
new file mode 100644
index 000000000000..e12c1897ac21
--- /dev/null
+++ b/dev-libs/apr/apr-1.3.2.ebuild
@@ -0,0 +1,97 @@
+# 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.1 2008/06/23 18:05:00 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
+}