Add patch to build properly with parallel make; also build tests in parallel.

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

3 files changed, 47 insertions, 2 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 48c2fd488316..707cd91d0f46 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.370 2012/06/11 03:47:27 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.371 2012/06/15 19:17:10 flameeyes Exp $
+
+  15 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/gnutls-3.0.20-parallelmake.patch, gnutls-3.0.20.ebuild:
+  Add patch to build properly with parallel make; also build tests in parallel.
 
 *gnutls-2.12.20 (11 Jun 2012)
 
diff --git a/net-libs/gnutls/files/gnutls-3.0.20-parallelmake.patch b/net-libs/gnutls/files/gnutls-3.0.20-parallelmake.patch
new file mode 100644
index 000000000000..8d43e8a938d1
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.0.20-parallelmake.patch
@@ -0,0 +1,34 @@
+From b05bf9461093b0a60c3dde4b7ad6e959d12c3ff8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
+Date: Fri, 15 Jun 2012 11:46:12 -0700
+Subject: [PATCH] build: make sure to declare the generated source files as
+ BUILT_SOURCES
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This allows proper building when using parallel make on a multi-core
+system.
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+---
+ src/Makefile.am |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 5550f3b..8b3b578 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -150,6 +150,9 @@ libcmd_p11tool_la_LIBADD += ../gl/libgnu.la $(INET_PTON_LIB)
+ 
+ endif # ENABLE_PKCS11
+ 
++BUILT_SOURCES = ocsptool-args.c p11tool-args.c psk-args.c cli-debug-args.c \
++		cli-args.c serv-args.c srptool-args.c certtool-args.c
++
+ ocsptool-args.c: $(srcdir)/args-std.def $(srcdir)/ocsptool-args.def
+ 	-autogen ocsptool-args.def
+ p11tool-args.c: $(srcdir)/args-std.def $(srcdir)/p11tool-args.def
+-- 
+1.7.8.6
+
diff --git a/net-libs/gnutls/gnutls-3.0.20.ebuild b/net-libs/gnutls/gnutls-3.0.20.ebuild
index a30cb835ec8e..0c0174d69286 100644
--- a/net-libs/gnutls/gnutls-3.0.20.ebuild
+++ b/net-libs/gnutls/gnutls-3.0.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.0.20.ebuild,v 1.2 2012/06/09 07:57:17 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.0.20.ebuild,v 1.3 2012/06/15 19:17:10 flameeyes Exp $
 
 EAPI=4
 
@@ -76,6 +76,8 @@ src_prepare() {
 	# support user patches
 	epatch_user
 
+	epatch "${FILESDIR}"/${P}-parallelmake.patch
+
 	eautoreconf
 
 	# Use sane .so versioning on FreeBSD.
@@ -97,6 +99,11 @@ src_configure() {
 		${myconf}
 }
 
+src_test() {
+	# let it build in parallel
+	emake check
+}
+
 src_install() {
 	default