From 10c433de5cfd6720b745c7a06a46cc8f2108af4b Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@gentoo.org>
Date: Thu, 7 Dec 2006 17:18:12 +0000
Subject: [PATCH] fix compile on icc (bug #154010) Package-Manager:
 portage-2.1.2_rc2-r5

---
 dev-util/devhelp/ChangeLog           |  5 ++++-
 dev-util/devhelp/Manifest            | 16 ++++++++--------
 dev-util/devhelp/devhelp-0.12.ebuild |  9 +++++++--
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/dev-util/devhelp/ChangeLog b/dev-util/devhelp/ChangeLog
index 59d57f1cbf6d..24738cb15697 100644
--- a/dev-util/devhelp/ChangeLog
+++ b/dev-util/devhelp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/devhelp
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.43 2006/08/01 09:09:34 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.44 2006/12/07 17:18:12 compnerd Exp $
+
+  07 Dec 2006; Saleem Abdulrasool <compnerd@gentoo.org> devhelp-0.12.ebuild:
+  Fix warnings on icc, bug #154010
 
 *devhelp-0.12 (01 Aug 2006)
 
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 146f3ac9ad2e..31f10e26893f 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -8,14 +8,14 @@ EBUILD devhelp-0.11-r1.ebuild 1224 RMD160 48dd784a35cfcab0f76f78cbcb667c40aadbec
 MD5 11456bd3dfff180982a127e99e9ec4db devhelp-0.11-r1.ebuild 1224
 RMD160 48dd784a35cfcab0f76f78cbcb667c40aadbec2d devhelp-0.11-r1.ebuild 1224
 SHA256 785f9b70b6459d6be07a921293c5a53cac32e11daaa258fe4263f3beb3cdca7e devhelp-0.11-r1.ebuild 1224
-EBUILD devhelp-0.12.ebuild 1041 RMD160 fea98937f20e39620a36516053cc4c9fcd247f01 SHA1 364ce9be89c6b0063830526bcd781ffea1bfb9a6 SHA256 46347f630a03514d83baf8acfc35ac508a37f4e4fe24c98fb4217cc8f7c8a04e
-MD5 bb052c52d0a7e6ece91d7519c9a8c807 devhelp-0.12.ebuild 1041
-RMD160 fea98937f20e39620a36516053cc4c9fcd247f01 devhelp-0.12.ebuild 1041
-SHA256 46347f630a03514d83baf8acfc35ac508a37f4e4fe24c98fb4217cc8f7c8a04e devhelp-0.12.ebuild 1041
-MISC ChangeLog 5644 RMD160 e8c9e3da6f63f65cccce901df890d9a1ab39d579 SHA1 ea39caf18076d0597fe9f032dae3e86ffa0f64a3 SHA256 6376ae6b47ba6f78edd23cbc28a92ff258225d1e05d684057e653da09f42d820
-MD5 25577dcd27c645c79264179b35e3e362 ChangeLog 5644
-RMD160 e8c9e3da6f63f65cccce901df890d9a1ab39d579 ChangeLog 5644
-SHA256 6376ae6b47ba6f78edd23cbc28a92ff258225d1e05d684057e653da09f42d820 ChangeLog 5644
+EBUILD devhelp-0.12.ebuild 1195 RMD160 a53c52b5fb716de8cf8aa9120b85acc9a09b1f5d SHA1 1f7908910c9605bf011c4a305ec0192f90b104ec SHA256 2be4c0f1233a587d348349660e48ce056cacfa13a4a95e1fdc4a522b42294aec
+MD5 a68223e670ef09d8c29f15ca19475890 devhelp-0.12.ebuild 1195
+RMD160 a53c52b5fb716de8cf8aa9120b85acc9a09b1f5d devhelp-0.12.ebuild 1195
+SHA256 2be4c0f1233a587d348349660e48ce056cacfa13a4a95e1fdc4a522b42294aec devhelp-0.12.ebuild 1195
+MISC ChangeLog 5756 RMD160 fc6eae9783466bbd46b856e6a825ba9f2da0ba84 SHA1 8067cf70bf634f0f9b4ddbfcb32d66146216f801 SHA256 63207a4f07c56ed6706fc35903c25f5ecd1997e14c6965d921df9b8ce8ebafc9
+MD5 003b1b8b252be6b4d5f92a1bb68586de ChangeLog 5756
+RMD160 fc6eae9783466bbd46b856e6a825ba9f2da0ba84 ChangeLog 5756
+SHA256 63207a4f07c56ed6706fc35903c25f5ecd1997e14c6965d921df9b8ce8ebafc9 ChangeLog 5756
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
diff --git a/dev-util/devhelp/devhelp-0.12.ebuild b/dev-util/devhelp/devhelp-0.12.ebuild
index f2816124f0ce..dee89a0fb57c 100644
--- a/dev-util/devhelp/devhelp-0.12.ebuild
+++ b/dev-util/devhelp/devhelp-0.12.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.12.ebuild,v 1.1 2006/08/01 09:09:34 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.12.ebuild,v 1.2 2006/12/07 17:18:12 compnerd Exp $
 
-inherit gnome2
+inherit toolchain-funcs gnome2
 
 DESCRIPTION="An API documentation browser for GNOME 2"
 HOMEPAGE="http://developer.imendio.com/wiki/Devhelp"
@@ -38,4 +38,9 @@ pkg_setup() {
 	else
 		G2CONF="${G2CONF} --with-gecko=seamonkey"
 	fi
+
+	# ICC is crazy, silence warnings (bug #154010)
+	if [[ $(tc-getCC) == "icc" ]] ; then
+		G2CONF="${G2CONF} --with-compile-warnings=no"
+	fi
 }
-- 
2.26.2