Fix bug 287043 -- parallel build failure

Package-Manager: portage-2.2_rc41/cvs/Linux i686

4 files changed, 40 insertions, 5 deletions

diff --git a/net-wireless/gnome-bluetooth/ChangeLog b/net-wireless/gnome-bluetooth/ChangeLog
index bffe3b9ff7e5..567995568a19 100644
--- a/net-wireless/gnome-bluetooth/ChangeLog
+++ b/net-wireless/gnome-bluetooth/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/gnome-bluetooth
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.58 2009/09/30 05:17:43 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.59 2009/09/30 10:13:19 nirbheek Exp $
+
+  30 Sep 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  gnome-bluetooth-2.28.1.ebuild,
+  +files/gnome-bluetooth-2.28.1-fix-smp-build.patch:
+  Fix bug 287043 -- parallel build failure
 
 *gnome-bluetooth-2.28.1 (30 Sep 2009)
 
diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest
index 0cd57299cd53..280a16af590b 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -1,3 +1,4 @@
+AUX gnome-bluetooth-2.28.1-fix-smp-build.patch 870 RMD160 63f78c0fdd7174a4a5c1e2bd6d69a22e0aed556b SHA1 d563591625f49db712cb606414261b07b6bef7f3 SHA256 afe7bff781d488d32abbb2facf998543549bb72585084c3990213287dcc68eb2
 DIST gnome-bluetooth-0.11.0.tar.bz2 558059 RMD160 123e64e28ddfbed3e8bda4fab7b9cdab5e5d8549 SHA1 b781207c3953cebf1edc2255c697bb4ad43c8405 SHA256 ae3c75465269609d363105ab7237b11ec41ea39737da862e47fcbff6f1b036fa
 DIST gnome-bluetooth-0.12.0.tar.bz2 549901 RMD160 7d2ac5e371093ad2664c831b9cd230d66cce797d SHA1 8e46f51a7fc92469e24183c1e042a642cfe32de3 SHA256 f9b514189367bdaa91592eb4825259d90dcdaee0aa0a7c9d43252fad3506473a
 DIST gnome-bluetooth-0.9.1.tar.bz2 559765 RMD160 173352716dc84740e41cbafae9fd4db8edef5fab SHA1 c67ae127760cc24e0d2be75e0b518da5565e91c6 SHA256 de8cbc2baf8d145f6e389fe4a101d0b8fc0f66840905204283aec070859a043c
@@ -7,6 +8,6 @@ EBUILD gnome-bluetooth-0.11.0.ebuild 1524 RMD160 1bccff392c432f6f5f8a451f3a9cfd6
 EBUILD gnome-bluetooth-0.12.0.ebuild 1005 RMD160 a718aca1abd870a222912547bcb357b15e0ac98b SHA1 8d72973e37bc3d131359560cd124bf126be9a37e SHA256 e6fd15df595ca5f4bbbfdaa2572f1e8a02c1e3d92ee1a44135fbbb2c104e4097
 EBUILD gnome-bluetooth-0.9.1.ebuild 1582 RMD160 cf286eb1f18651b76fc8a87a5f1a901b5a2ddff1 SHA1 b41b700ba8612c85f013a7b5f46152f2f77e6c6d SHA256 9d0d8cbca9a9929dda470d0a5f1c191b5b1e0f15a6b91cd185929c2b98b469df
 EBUILD gnome-bluetooth-2.27.8.ebuild 1003 RMD160 5ee2ef02a85015c18f980af329091244733fb3ab SHA1 ea8fd6adf011fbfde47376e80322e743683092cc SHA256 b058f65c38a56751611eb13a7a90f8bf638266524e4b760c896e7f9e6d78fb48
-EBUILD gnome-bluetooth-2.28.1.ebuild 1256 RMD160 96b24ed293bde082a37a085c42575b8cbf08b153 SHA1 8d482ec55c18aefe451898c65943c0c0638db061 SHA256 6f84a6942f068393224092a55de759357513e68fcd94e8655b9e31161f7c65f4
-MISC ChangeLog 10387 RMD160 ef70bd9157bd98535d6ad1573917637bfde6343c SHA1 e560a70fa0ab29e2e9d34c14cc274c592415dd1e SHA256 c6c488574307f3b6f7e7e0e45259abcb68c5202619086ff50ddb3780dfe21593
+EBUILD gnome-bluetooth-2.28.1.ebuild 1379 RMD160 f531cbbc1e6753a1264cf99bb908b15a8fc5c91b SHA1 4b12f367cabf3f5dad0ca3155a3124448db54f6c SHA256 cae9fcce7f3b00ea0985e4db558452f9c45cc4a2018a511c0db9d1ae7184a4d7
+MISC ChangeLog 10571 RMD160 49efddd53e29e060b1d9d8cb6596d633efe46e2a SHA1 aa494e0600c923deea065bc44b138dc9eb65dbbf SHA256 ba987c4f1f36f8e06c2f9fdffad689988198e97dd187951e40d7d0b79cac7c1c
 MISC metadata.xml 195 RMD160 e6211b251685833c4a0eed62d735e0f4ea7d870a SHA1 d635b8b23bd26fcb7ec9fe2cb015c7618fd034ad SHA256 81b6400e7c415f0000de8250b5ddefa56d81f5e374d834a45505795b55f4e205
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.28.1-fix-smp-build.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.28.1-fix-smp-build.patch
new file mode 100644
index 000000000000..02990bebe380
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.28.1-fix-smp-build.patch
@@ -0,0 +1,24 @@
+Parallel build issue http://bugs.gentoo.org/show_bug.cgi?id=287043
+
+---
+From 0622ea93f4e42d1599f2467e6bef5dca49cd99fd Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Tue, 29 Sep 2009 10:36:58 +0000
+Subject: Fix SMP build
+
+---
+diff --git a/wizard/Makefile.am b/wizard/Makefile.am
+index fc92c5e..074f55f 100644
+--- a/wizard/Makefile.am
++++ b/wizard/Makefile.am
+@@ -9,7 +9,7 @@ bin_PROGRAMS = bluetooth-wizard
+ 
+ bluetooth_wizard_SOURCES = main.c
+ 
+-bluetooth_wizard_LDADD = $(top_builddir)/lib/libgnome-bluetooth.la $(top_builddir)/lib/libcommon.la $(top_builddir)/wizard/libwizard.la $(WIZARD_LIBS)
++bluetooth_wizard_LDADD = $(top_builddir)/lib/libgnome-bluetooth.la $(top_builddir)/lib/libcommon.la libwizard.la $(WIZARD_LIBS)
+ 
+ AM_CFLAGS = $(WIZARD_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPKGDATADIR="\"$(pkgdatadir)\""
+ 
+--
+cgit v0.8.2
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.1.ebuild
index a29b28e3a191..febc79491270 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.1.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.1.ebuild,v 1.1 2009/09/30 05:17:43 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.1.ebuild,v 1.2 2009/09/30 10:13:19 nirbheek Exp $
 
 EAPI="2"
 
-inherit eutils gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="Fork of bluez-gnome focused on integration with GNOME"
 HOMEPAGE="http://live.gnome.org/GnomeBluetooth"
@@ -43,4 +43,9 @@ src_prepare() {
 	# Fix intltoolize broken file, see upstream #577133 and #579464
 	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
 		|| die "sed failed"
+	
+	# Patch is from upstream 2.28 branch, bug 287043
+	epatch "${FILESDIR}/${P}-fix-smp-build.patch"
+
+	eautoreconf
 }