Fix parallel make issue, bug #435524 by Attila Tóth.

(Portage version: 2.1.11.19/cvs/Linux x86_64)

3 files changed, 43 insertions, 3 deletions

diff --git a/net-irc/telepathy-idle/ChangeLog b/net-irc/telepathy-idle/ChangeLog
index 5e00e29a39e0..2d209b33a762 100644
--- a/net-irc/telepathy-idle/ChangeLog
+++ b/net-irc/telepathy-idle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/telepathy-idle
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/telepathy-idle/ChangeLog,v 1.42 2012/09/15 08:46:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/telepathy-idle/ChangeLog,v 1.43 2012/09/22 13:32:57 pacho Exp $
+
+  22 Sep 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/telepathy-idle-0.1.12-parallel-make.patch,
+  telepathy-idle-0.1.12.ebuild:
+  Fix parallel make issue, bug #435524 by Attila Tóth.
 
 *telepathy-idle-0.1.12 (15 Sep 2012)
 
diff --git a/net-irc/telepathy-idle/files/telepathy-idle-0.1.12-parallel-make.patch b/net-irc/telepathy-idle/files/telepathy-idle-0.1.12-parallel-make.patch
new file mode 100644
index 000000000000..f3442eaba0f8
--- /dev/null
+++ b/net-irc/telepathy-idle/files/telepathy-idle-0.1.12-parallel-make.patch
@@ -0,0 +1,31 @@
+From b092172e56393fad70e472afa26df4f886dfdbc0 Mon Sep 17 00:00:00 2001
+From: Dan Winship <danw@gnome.org>
+Date: Fri, 24 Aug 2012 16:19:45 +0000
+Subject: build: fix for "make -j" safety
+
+A make rule with multiple (non-pattern) targets just says that each of
+those files can be built by the rule, not that the rule builds all of
+them at once. So under "make -j", extensions/Makefile would run three
+copies of glib-ginterface-gen.py at once, which could end up deleting
+each others' files and causing a make failure. Fix.
+
+Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
+---
+diff --git a/extensions/Makefile.am b/extensions/Makefile.am
+index 24efb6e..bb837da 100644
+--- a/extensions/Makefile.am
++++ b/extensions/Makefile.am
+@@ -42,7 +42,10 @@ extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
+ 		$(tools_dir)/doc-generator.xsl \
+ 		$< > $@
+ 
+-_gen/svc.c _gen/svc.h _gen/svc-gtk-doc.h: _gen/all.xml \
++_gen/svc.h: _gen/svc.c
++_gen/svc-gtk-doc.h: _gen/svc.c
++
++_gen/svc.c: _gen/all.xml \
+ 	$(tools_dir)/glib-ginterface-gen.py
+ 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
+ 		--filename=_gen/svc --signal-marshal-prefix=_idle_ext \
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/net-irc/telepathy-idle/telepathy-idle-0.1.12.ebuild b/net-irc/telepathy-idle/telepathy-idle-0.1.12.ebuild
index 0c6b6ed33385..5124bcc55f53 100644
--- a/net-irc/telepathy-idle/telepathy-idle-0.1.12.ebuild
+++ b/net-irc/telepathy-idle/telepathy-idle-0.1.12.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/telepathy-idle/telepathy-idle-0.1.12.ebuild,v 1.1 2012/09/15 08:46:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/telepathy-idle/telepathy-idle-0.1.12.ebuild,v 1.2 2012/09/22 13:32:57 pacho Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
 
-inherit python
+inherit autotools eutils python
 
 DESCRIPTION="Full-featured IRC connection manager for Telepathy."
 HOMEPAGE="http://telepathy.freedesktop.org/wiki/Components"
@@ -32,4 +32,8 @@ pkg_setup() {
 
 src_prepare() {
 	python_convert_shebangs -r 2 .
+
+	# Fix parallel make, fixed in next release, bug #435524
+	epatch "${FILESDIR}/${P}-parallel-make.patch"
+	eautoreconf
 }