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

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 58 insertions, 12 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/Manifest b/net-libs/gnutls/Manifest
index 16c5b8dbe433..c256c35d68e9 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+AUX gnutls-3.0.20-parallelmake.patch 1126 RMD160 b572681466e9a244b5410937551ee657af5077c6 SHA1 1977eba23faf0a83549b21c5a04a760a3cbefbe1 SHA256 00acad9ae1420d2d9179ecdf8af22ffc19175a147420305e60e9c8b21e996608
 DIST gnutls-2.12.18.tar.bz2 7207965 RMD160 c5c5bb91f374edd7bfa63c2b2b19ea7606353d17 SHA1 cd5cf0932575b758ad3ee89952763a8395ea4af0 SHA256 780b12e3f05191316390611a3d9d982d29ca3f3abc234517b2fc542064b6f07a
 DIST gnutls-2.12.19.tar.bz2 7208159 RMD160 077d62ab00780a6798cee92e80d542f1e74891f2 SHA1 643620216ba54b195e41e29abfdcc31125f92d25 SHA256 8f167b39de4e2fddd83f7e29c98ce2e7fc76f4d79ccf4d3d66d1379b971160ec
 DIST gnutls-2.12.20.tar.bz2 7231438 RMD160 8b9fca72136113f250296e7399644b8aaa3503ed SHA1 a8a7bb1f51b4da45d32242bd2e843ab3a66f63f6 SHA256 4884eafcc8383ed23209199bbc72ad04f4eb94955a50a594125ff34c6889c564
@@ -8,17 +9,17 @@ DIST gnutls-3.0.20.tar.xz 4426520 RMD160 a775877a7dec4e10a5612dc0ebb71d59f78ead3
 EBUILD gnutls-2.12.18.ebuild 3267 RMD160 2c3ae21f47d7d4fc590fc580d2cd67e1bbc26266 SHA1 154468c7f58ae4ba0c7d1048f9131ee013d1adf2 SHA256 3cca5cf44ad3420d8450403849d6336ea1d43909474412d9402a9f74d13ce99a
 EBUILD gnutls-2.12.19.ebuild 3394 RMD160 6bc593c18d208a76e739db5455f705b83c6bb3ca SHA1 911367bdb9195f29fe3cee8a95765b570e75531e SHA256 ece8494fee1cb0b224605603f2c336fa4d6b000b52fc5cce57b4395e74925bcf
 EBUILD gnutls-2.12.20.ebuild 3394 RMD160 1785fd58a74e2b02808f5f83b06c3df9dd9d11a6 SHA1 c3f9397db3eb6284ba3185cf73e0b2451f2fde8b SHA256 68e5c2504fa5915b8b2260575c0d56aca77808f718d4a41186f4628a8f973732
-EBUILD gnutls-3.0.20.ebuild 2919 RMD160 97911742d0bd31a1fbc8bdb97cc050bb561023d9 SHA1 3b79d208547cdbcbd28da48e2a7be9ec9719d5a0 SHA256 f401f21881da92186e9505386d8f8a8f07cf2f83567480c0dee0e9e8fd8f6931
-MISC ChangeLog 54449 RMD160 3ab73db04cce8c8cea4453c2e197796f8a7351d8 SHA1 8ef0da6738c38d707278715e51f7f6e6f9646efe SHA256 60a6cba20e266a0a51ffd4ac19555539795958b0c236f1c347130bb83878e0a2
+EBUILD gnutls-3.0.20.ebuild 3023 RMD160 499cf5ecdd59b4e1782b31ae349133fa5ca23180 SHA1 ae6848593952c1b50f278706dd6995500294b497 SHA256 201c0be0eb6e403dfc4640e3f353ffb151c6b565a123358ae0e0ebcfd928eabc
+MISC ChangeLog 54651 RMD160 fba8e7cb12f3fcfb2e01fea18b2fb64af3f1f7f2 SHA1 c3b2ac8f7c83232f33dd4e95765e0485c135f71d SHA256 0c407ac2e5bb70e585bd8f3d68cbdc6c7e21e1dd8a02635e47d329e706713b7e
 MISC metadata.xml 340 RMD160 e973767590edb923f2828ef545293617b4b19554 SHA1 e42964b82af04a3d6de8307186a33d18a12af326 SHA256 a2bf9aefe44513df9e611a974c08d7f26b987c0c48c134a0d6f5177ca6a8676d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP1WpUAAoJEEqz6FtPBkyjY2gH/ilunqDwlg6y5Xttb/yu5btj
-k5UNh+2rqT1gG7RK/EDfoVy6rqRK+h9pA6h6LezfePAd9ODxPhzT38mt88ECCHGt
-vqkYsmx4fLjwpyLWRSlSb6LiRnBmyiuIrT0nNMqzXh6WexLCls8wQC+LTA/nx+oh
-FQI9zy70jlMiZ5ZUgD/n9iyhxmDRWjGvpB/PMvwiprI6PpH1VkIbQcN01fhR5/BS
-m673/0/H/gGGqSG7jkB9vcIygYH1itn2iXBFazmlvtC7rrq4Dt5hv0PxhCV0MMNP
-Zt5Oh5xYNqHLJ5fX/vos+mjWFA/ud48/PQRDd0glKCpoO4EuvNotQOuGjsvpN7E=
-=2krJ
+iQEcBAEBAgAGBQJP24pAAAoJEBzRPIrUMBNC5uAH/2vvkuim/qUdjBXFtRNFSGth
+qV2F45sYvZ9CHPETa9K6Xj5wzTVVef8wDTV9lVyjQFjzbD03Yh5WcxefFPf+wW42
+BsVd12+yBsfqmedWycdPyLRgu4V9R+rH+ZwgTNfH+fJZO1adkOlHlMwcwdlw77T7
+Xc6pFflFrDF8eWc2eKjq0pwjpYauH2CWc5CW5aA8LYCguaWK5zi8y0WqcMPSL47h
+G7NmiIDr2JzwrC2bY5MuHdFd4Kc/7il/WUVTtav3zSqOE5pisd8DiDaKbt+m/cMs
+n3sZsQoehcjES0Pi51z25Ulzw8Bv7VP/FH2kgt5OujxD4uPn9HXt87TWWjGVTZI=
+=P3x7
 -----END PGP SIGNATURE-----
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