Revbump to fix a parallel install bug. Enable posix-shm support. EAPI bumped to 5

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

3 files changed, 35 insertions, 4 deletions

diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index 7c4eac658a0a..5fa62e5dea32 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/apr
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.221 2014/04/28 07:10:01 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.222 2014/04/28 13:26:43 polynomial-c Exp $
+
+*apr-1.5.1-r1 (28 Apr 2014)
+
+  28 Apr 2014; Lars Wendler <polynomial-c@gentoo.org> -apr-1.5.1.ebuild,
+  +apr-1.5.1-r1.ebuild, +files/apr-1.5.1-parallel_make_install.patch:
+  Revbump to fix a parallel install bug. Enable posix-shm support. EAPI bumped
+  to 5.
 
 *apr-1.5.1 (28 Apr 2014)
 
diff --git a/dev-libs/apr/apr-1.5.1.ebuild b/dev-libs/apr/apr-1.5.1-r1.ebuild
index bb4e0bd66c56..548a0f96d975 100644
--- a/dev-libs/apr/apr-1.5.1.ebuild
+++ b/dev-libs/apr/apr-1.5.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.5.1.ebuild,v 1.1 2014/04/28 07:10:01 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.5.1-r1.ebuild,v 1.1 2014/04/28 13:26:43 polynomial-c Exp $
 
-EAPI="4"
+EAPI=5
 
 inherit autotools eutils libtool multilib toolchain-funcs
 
@@ -28,6 +28,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.5.0-libtool.patch
 	epatch "${FILESDIR}"/${PN}-1.5.0-cross-types.patch
 	epatch "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
+	epatch "${FILESDIR}"/${PN}-1.5.1-parallel_make_install.patch
 
 	epatch_user #449048
 
@@ -101,6 +102,7 @@ src_configure() {
 	econf \
 		--enable-layout=gentoo \
 		--enable-nonportable-atomics \
+		--enable-posix-shm \
 		--enable-threads \
 		$(use_enable static-libs static) \
 		"${myconf[@]}"
@@ -125,7 +127,10 @@ src_compile() {
 src_install() {
 	default
 
-	find "${ED}" -name "*.la" -delete
+	# Prallel install breaks since apr-1.5.1
+	#make -j1 DESTDIR="${D}" install || die
+
+	prune_libtool_files --all
 
 	if use doc; then
 		dohtml -r docs/dox/html/*
diff --git a/dev-libs/apr/files/apr-1.5.1-parallel_make_install.patch b/dev-libs/apr/files/apr-1.5.1-parallel_make_install.patch
new file mode 100644
index 000000000000..a58a229c378e
--- /dev/null
+++ b/dev-libs/apr/files/apr-1.5.1-parallel_make_install.patch
@@ -0,0 +1,19 @@
+http://www.mail-archive.com/dev@apr.apache.org/msg25738.html
+
+--- apr-1.5.1/Makefile.in
++++ apr-1.5.1/Makefile.in
+@@ -129,11 +129,11 @@
+ etags:
+ 	etags `find . -name '*.[ch]'`
+ 
+-make_tools_dir:
++OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
++tools/gen_test_char.lo: tools/gen_test_char.c
+ 	$(APR_MKDIR) tools
++	$(LT_COMPILE)
+ 
+-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
+-tools/gen_test_char.lo: make_tools_dir
+ tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
+ 	$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
+