Fixed parallel build failure, bug #225079, thank Iain for report.

Package-Manager: portage-2.1.4.4

4 files changed, 33 insertions, 4 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index fac000069400..77a3bb292832 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/fontconfig
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.117 2008/06/04 14:06:05 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.118 2008/06/22 16:51:45 pva Exp $
+
+  22 Jun 2008; Peter Volkov <pva@gentoo.org>
+  +files/fontconfig-2.6.0-parallel.patch, fontconfig-2.6.0-r1.ebuild:
+  Fixed parallel build failure, bug #225079, thank Iain for report.
 
 *fontconfig-2.6.0-r1 (04 Jun 2008)
 
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index f4e8ba301771..bcf534b29cfd 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,10 +1,11 @@
 AUX fontconfig-2.3.2-docbook.patch 506 RMD160 c205d99ecc19866da8d0ac4ef7172dcef98a6299 SHA1 1054f38cef09c93baf34f08253345ca2ae638e4a SHA256 c6480dcf19fec22126a9205fa3d9b317e5a97613f86218cf1926a2a07848afd5
 AUX fontconfig-2.5.0-libtool-2.2.patch 2589 RMD160 36a07e0161c6b2a970de19a090db4f750a519bea SHA1 e0267a4f29c670425861211cf960745021c22b6d SHA256 fce47ca38e8cff70ef7be40493b02b99ff2387a6e141a0e322ec8bfedee5b1a9
+AUX fontconfig-2.6.0-parallel.patch 437 RMD160 5a8ab14d0d86f19d0658768a37927bf1761b3d3c SHA1 f12963e627d0735aed4e3c5b9b16331fd293ce4a SHA256 0f0a2fd2ad9241aa680f2c4fa607cc7898e9d8e8aa585b68d47961f82cf424e8
 DIST fontconfig-2.4.2.tar.gz 1278340 RMD160 c953020a5193500080c9eceef47b76e61c41b188 SHA1 cd5e30625680a0435563b586275156eaf8d0d34a SHA256 63a3d6413182817b91eea327b58c243f1865acfc40bef61fc52d2b0431341363
 DIST fontconfig-2.5.0.tar.gz 1385058 RMD160 2c61ba3adc49aa5dd4eb081e13a849cc1d62d9da SHA1 9ffad5f5eb2c5dd277bfed1cafc6e62aa0172842 SHA256 34c6badb4cb7eb496779d30616903de400fa244838ea39c2a7f63eaa5fdf0efe
 DIST fontconfig-2.6.0.tar.gz 1403857 RMD160 2fea7fa3fe1757b58ce53c4225b9f8e6ec7507bf SHA1 93752566b8327485b153bd156049614f779b4c57 SHA256 a9a639eaa0e5666606a4657cc1494eb6df820fac7e5a2aa0c3f7e703b7c8d8a5
 EBUILD fontconfig-2.4.2.ebuild 2414 RMD160 4c7488d70c9e4380ae73525e7f15a122de85f2b5 SHA1 479f03bcf14b76e10e67950a5925991f00494388 SHA256 e0274d8c6fb723b4f0bc39e2e6596c4b61b8c6d15f0a79ab160d4945c0ac3ee0
 EBUILD fontconfig-2.5.0-r1.ebuild 2505 RMD160 e65b8588e50e6f56ddaebbe9e75f0600e18e98a9 SHA1 55f256b214f5d2bef1d78ef61a747d61b6f77266 SHA256 2b6ecdb834a51f4ef21dd265127e82eb60474edc1dc83dceec4f1c987b64c5b5
-EBUILD fontconfig-2.6.0-r1.ebuild 2382 RMD160 5e3e8e1cfe6a157c9ce97d39268258a9045fb83a SHA1 f21349a9681f1219d89268a883171111d009aef8 SHA256 01ea557f862fb27500dad283556197cc2b9c294175ed03631b6917fe2f95e9a3
-MISC ChangeLog 17687 RMD160 3d78427e16946926ead63b4570568899c0dce3f1 SHA1 f984ef4080509b276e9797b1627821b5033b8bb2 SHA256 c92c8f4d93321ac692f07e5e5a4808557824befa4b918d7f53157f792a28970c
+EBUILD fontconfig-2.6.0-r1.ebuild 2430 RMD160 33148acb23bd42a4f9d0af139a4f20826b8abd2f SHA1 d31ef0a02403468ebe49663f5c10725613a2e97c SHA256 175beed00f6a749a16aa1d6fa4beed500476ad931ae3700ed092d8b7b60dfb98
+MISC ChangeLog 17866 RMD160 35b3e824908c3ea9f445fa99beb8c37f8759111b SHA1 00fce57bbd21acbad0a05753b673b2c51aa9216d SHA256 c141fcc816a358900d034841db25e761cf0c351b7d62a7ad2a3df3e58db42779
 MISC metadata.xml 419 RMD160 898b8233ab233060d8137dadf28c291b83a65500 SHA1 ee62c352812f8765122e5a65b7df5f8794c6c485 SHA256 859faa6fc0c008e92a6432f0fd50a760170d724b15997e557d5d73088277c4db
diff --git a/media-libs/fontconfig/files/fontconfig-2.6.0-parallel.patch b/media-libs/fontconfig/files/fontconfig-2.6.0-parallel.patch
new file mode 100644
index 000000000000..d44af5194fe8
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.6.0-parallel.patch
@@ -0,0 +1,22 @@
+=== modified file 'fc-case/Makefile.am'
+--- fc-case/Makefile.am	2008-06-22 15:28:39 +0000
++++ fc-case/Makefile.am	2008-06-22 15:50:28 +0000
+@@ -36,6 +36,8 @@
+ 
+ noinst_MANS=fc-case.man
+ 
++noinst_HEADERS=$(TARG)
++
+ fc_case_SRCS= \
+ 	fc-case.c \
+ 	fccaseint.h \
+@@ -52,7 +54,7 @@
+ 
+ ALIAS_FILES = fcalias.h fcaliastail.h
+ 
+-BUILT_SOURCES = $(ALIAS_FILES) $(TARG)
++BUILT_SOURCES = $(ALIAS_FILES)
+ 
+ $(ALIAS_FILES): 
+ 	touch $(ALIAS_FILES)
+
diff --git a/media-libs/fontconfig/fontconfig-2.6.0-r1.ebuild b/media-libs/fontconfig/fontconfig-2.6.0-r1.ebuild
index 0ac950a63c13..aec91ffb4b42 100644
--- a/media-libs/fontconfig/fontconfig-2.6.0-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.6.0-r1.ebuild,v 1.1 2008/06/04 14:06:05 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.6.0-r1.ebuild,v 1.2 2008/06/22 16:51:45 pva Exp $
 
 inherit eutils libtool
 
@@ -26,9 +26,11 @@ src_unpack() {
 	cd "${S}"
 
 	epunt_cxx #74077
+	epatch "${FILESDIR}"/${P}-parallel.patch
 	# Neeeded to get a sane .so versionning on fbsd, please dont drop
 	# If you have to run eautoreconf, you can also leave the elibtoolize call as
 	# it will be a no-op.
+	eautomake
 	elibtoolize
 }