From: Caleb Tennis <caleb@gentoo.org>
Date: Wed, 14 Mar 2007 15:13:28 +0000 (+0000)
Subject: More fixes frmo bug 170625
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ab8880469592e6491075c012806e9828f232b8fd;p=gentoo.git

More fixes frmo bug 170625
Package-Manager: portage-2.1.2.2
---

diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 4448a610581b..42b551478fc8 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -13,10 +13,10 @@ EBUILD qwt-5.0.0_rc1.ebuild 1524 RMD160 a4af1ad1cd4366a5b658afcfb9f61b85f91bc057
 MD5 220e8820a4c925bdee4347834e696365 qwt-5.0.0_rc1.ebuild 1524
 RMD160 a4af1ad1cd4366a5b658afcfb9f61b85f91bc057 qwt-5.0.0_rc1.ebuild 1524
 SHA256 79e20bec2e8c6a0bb2f234f7858bdc8a283d04cbea4d448c23560e2dc0732227 qwt-5.0.0_rc1.ebuild 1524
-EBUILD qwt-5.0.1.ebuild 1365 RMD160 429a63626a222ca3cbfb00b6d643522744395307 SHA1 e78d180fb6f0882d80239de311cb5ae6f7b2cda3 SHA256 68f687023a166e9062303f158f97ed67f3d512a6b54775fd3850d8d9a1898732
-MD5 f187c2dafac37468242876e56acb55ed qwt-5.0.1.ebuild 1365
-RMD160 429a63626a222ca3cbfb00b6d643522744395307 qwt-5.0.1.ebuild 1365
-SHA256 68f687023a166e9062303f158f97ed67f3d512a6b54775fd3850d8d9a1898732 qwt-5.0.1.ebuild 1365
+EBUILD qwt-5.0.1.ebuild 1552 RMD160 c52af11e96af5f7a7aad86860089f1cb9f8221d5 SHA1 8b70f19d4f789838acfc9e86e27c9d2c775961b5 SHA256 88eda5a536d95f03e760a1052b1a6751783f9792a940a95eaa8f8f738d9e1503
+MD5 f2dcee2ef1d815f79dc9ac9804d209a7 qwt-5.0.1.ebuild 1552
+RMD160 c52af11e96af5f7a7aad86860089f1cb9f8221d5 qwt-5.0.1.ebuild 1552
+SHA256 88eda5a536d95f03e760a1052b1a6751783f9792a940a95eaa8f8f738d9e1503 qwt-5.0.1.ebuild 1552
 MISC ChangeLog 5905 RMD160 af4d4d18c7aa4f2a937dab31cfd02a9cfac2f33d SHA1 aefc8bfa7d2ee05a994cd2e8b0ea181d4120dd3b SHA256 dce1605491f0f1b107b83ffecdc7df7aa32dd7af195883f0392462313b85b27d
 MD5 2fd06cb38ee4961013668bade4ae2b6e ChangeLog 5905
 RMD160 af4d4d18c7aa4f2a937dab31cfd02a9cfac2f33d ChangeLog 5905
diff --git a/x11-libs/qwt/qwt-5.0.1.ebuild b/x11-libs/qwt/qwt-5.0.1.ebuild
index 13fffcd03a9c..4b9b3cb0fb4f 100644
--- a/x11-libs/qwt/qwt-5.0.1.ebuild
+++ b/x11-libs/qwt/qwt-5.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.0.1.ebuild,v 1.2 2007/03/14 12:03:06 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.0.1.ebuild,v 1.3 2007/03/14 15:13:28 caleb Exp $
 
 inherit multilib eutils
 
@@ -27,7 +27,7 @@ src_unpack () {
 	echo >> ${qwtconfig} "target.path = /usr/$(get_libdir)"
 	echo >> ${qwtconfig} "headers.path = /usr/include/qwt5"
 	echo >> ${qwtconfig} "doc.path = /usr/share/doc/${PF}"
-	echo >> ${qwtconfig}	
+	echo >> ${qwtconfig}
 	echo >> ${qwtconfig} "CONFIG += qt warn_on thread"
 	echo >> ${qwtconfig} "CONFIG += release"
 	echo >> ${qwtconfig} "CONFIG += QwtDll QwtPlot QwtWidgets QwtDesigner"
@@ -40,15 +40,20 @@ src_unpack () {
 	# They got the version wrong
 	sed -e "s/5.0.0/5.0.1/g" -i "${S}/src/src.pro"
 
+	if ! useq doc; then
+		echo >> "${S}/src/src.pro" "INSTALLS = target headers"
+	fi
+
 }
 
 src_compile () {
+	# -j1 due to parallel build failures ( bug # 170625 )
 	/usr/bin/qmake qwt.pro
-	emake || die
+	emake MAKEOPTS="$MAKEOPTS -j1" || die
 
 	cd designer
 	/usr/bin/qmake qwtplugin.pro
-	emake || die
+	emake MAKEOPTS="$MAKEOPTS -j1" || die
 }
 
 src_install () {