Version bump (bug #309625).

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

3 files changed, 87 insertions, 4 deletions

diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index a4fc72063c39..ad95898074e7 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/apr
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.154 2010/03/07 11:56:25 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.155 2010/04/01 15:05:44 arfrever Exp $
+
+*apr-1.4.2 (01 Apr 2010)
+
+  01 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +apr-1.4.2.ebuild:
+  Version bump (bug #309625).
 
   07 Mar 2010; Benedikt Böhm <hollow@gentoo.org> apr-1.3.8.ebuild,
   apr-1.3.9.ebuild:
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 4dd04614e8a3..6efd5c3e1e19 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,7 +1,7 @@
 AUX config.layout.patch 818 RMD160 dada232c8b85e6c3c62fbc6caa1d05f36164dc27 SHA1 3822a0ec508165dd189e1b750bdf4e7778b6c21e SHA256 eeacaf654f23084e842bff02b97c083a8da5b5c056fd086166ba2d250edf3181
-DIST apr-1.3.8.tar.gz 1164963 RMD160 f45e1eaac6984e1207305f97c969d7adf806914b SHA1 6ed6a18230c48b4324eb0f6cbb02159a0762fc21 SHA256 587ec1eddd41201a0d30e63ada1b2d0f358be57138b6ce02ebdef1a12ffa29f2
 DIST apr-1.3.9.tar.bz2 927657 RMD160 e90943275289113771b623c827ab3fb3c18064d8 SHA1 fb19ec11a15db03dcb9211f31012b079a522d1f0 SHA256 5705a393f48ce8652e2b9143668ed208d34e7ce702b28dd497353561a6ed2ce2
-EBUILD apr-1.3.8.ebuild 1876 RMD160 c58ce6b759592dd8414ecc6747fda43d2749fe25 SHA1 16515be0e98aa52b7be9444e2fc7093974af0013 SHA256 5c1527d7e8384e7c9200575995d621d06171a19cbc068b06173a1293e6697bd4
+DIST apr-1.4.2.tar.bz2 766793 RMD160 20d4ae082d490432710aad1c4f689e6032a6c921 SHA1 b3ed66c2e7f67c50ae33b5cd85e9f46a93c6e4f8 SHA256 2017ca700694d09d2b0b21dd7c4d195e43a48735aac88526160c6195ee8f5391
 EBUILD apr-1.3.9.ebuild 1879 RMD160 c2cf42299838497fc55aa3d31a26fb0d382543a9 SHA1 44fd7b97f2b94cc312e19314ea7c263fa35e8814 SHA256 3682a05d20cce1c1d9dc8d83d118df13d0c7cf7ce24d5b62542418ebb0a90eaf
-MISC ChangeLog 18558 RMD160 8a5f14f23a8da2e443dd4f361c084525d5339e49 SHA1 62489dfc0b65a2d32bab4bcd94648d83e63b6458 SHA256 f1a2a980de659e269a44a2d7f5aa343b034715865c776c601736a788d785a351
+EBUILD apr-1.4.2.ebuild 1895 RMD160 29d9e3373a129d813907a3e7d44801faa58dca64 SHA1 82fb50bc9ce531e4e631095311f77294994b0144 SHA256 3eb933a47d63848f8c67de8d09a04647bc4f615458b972e3ff0208c5483fce74
+MISC ChangeLog 18711 RMD160 a98bc077a1b30d498a7260a0562b9b092d819ec1 SHA1 fe66bb19d1be03085b631f986a6eb9b1afff2ec4 SHA256 5798dda62c671ba0cdfd304af8cde0dd0fd766c5b0d2b85c8fe4410a655d3b3e
 MISC metadata.xml 406 RMD160 9af45dec0119ed9afc091ef98d47a4dd7fcec2ae SHA1 d16a3b4f5efbf383b034e83f298a6d86ac9fd878 SHA256 bef219a00636140b1d99834ae19afc00b89f4df68068d1937a53c2c8ce51f2b9
diff --git a/dev-libs/apr/apr-1.4.2.ebuild b/dev-libs/apr/apr-1.4.2.ebuild
new file mode 100644
index 000000000000..331eef088ec1
--- /dev/null
+++ b/dev-libs/apr/apr-1.4.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.4.2.ebuild,v 1.1 2010/04/01 15:05:44 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.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="doc older-kernels-compatibility +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 older-kernels-compatibility; then
+		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
+		export apr_cv_accept4="no"
+		export apr_cv_dup3="no"
+		export apr_cv_epoll_create1="no"
+		export apr_cv_sock_cloexec="no"
+	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 -j1 || 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 README
+
+	if use doc; then
+		dohtml -r 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"
+}