Removed icc USE flag use for bug #216511.

Package-Manager: portage-2.1.4.4

5 files changed, 18 insertions, 117 deletions

diff --git a/games-board/crafty/ChangeLog b/games-board/crafty/ChangeLog
index b918d75413f2..95648257bf45 100644
--- a/games-board/crafty/ChangeLog
+++ b/games-board/crafty/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/crafty
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/crafty/ChangeLog,v 1.25 2008/02/29 23:41:34 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/crafty/ChangeLog,v 1.26 2008/04/11 15:41:11 wolf31o2 Exp $
+
+  11 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org> crafty-20.13.ebuild,
+  -crafty-21.6-r1.ebuild, crafty-22.0.ebuild:
+  Removed icc USE flag use for bug #216511.
 
 *crafty-22.0 (29 Feb 2008)
 
diff --git a/games-board/crafty/Manifest b/games-board/crafty/Manifest
index dfdcd1e0c37a..8a21bef9496b 100644
--- a/games-board/crafty/Manifest
+++ b/games-board/crafty/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST crafty-20.13.zip 422053 RMD160 65ae1a196376c697cd028ab818d5f2975682193c SHA1 4b9bd7d1f6098cfdbc2a7b5d854b5b1d37184bc9 SHA256 b80bbb7c72f8adb7dacf284eefd7e4dafdc2683eaf8d5255fc04c09a5b54de28
-DIST crafty-21.6.zip 423100 RMD160 d8fd129967638cbe614e7d3a90e9a4f53db93024 SHA1 330aa20db9b390d6b2802266daf557180059ada6 SHA256 be5ec37938f7b741e5f3bded193fb6e30e0cb69f910202b7cc01f01846b42b56
 DIST crafty-22.0.zip 402797 RMD160 3d8d69b532cb6c72db3ffe2c9f94571a4845f77b SHA1 219e9fd344a2e1704cc6da6b6588f94cd143dfe9 SHA256 05772b0a63a07dd5dafc307bcf41df41df0212209a22907244652422bb302fa6
 DIST crafty.doc.ascii 79678 RMD160 f0c8304efcaa93a14a37da96d22bb25cda8d1bf5 SHA1 99bb27b39ddd4bd3db8078e128eadfcde1c3b64b SHA256 be291c0f4c7e7d64404ec58b9e92c2455c4342d3c96c721ba21a80fce8332e83
-EBUILD crafty-20.13.ebuild 2290 RMD160 ac1d8ea55da60fea9eea0804b5ae4adf317bb5c0 SHA1 949e7b3b95721f62bf1cee1674b6299c8c035196 SHA256 eae9fe1e48423af70cb60c4fe00563e5031f4e93ecc40715509eede1d7c9a87d
-EBUILD crafty-21.6-r1.ebuild 2712 RMD160 8818242c9e35377d1b7f29804e71af5ae48bd008 SHA1 4fa0b9194fcc5c0d0a439f828bf405ad049ec92b SHA256 48271e185bb734d758585118b8e6a4c91ee94b51827fd6fe0ca9503a2facbc68
-EBUILD crafty-22.0.ebuild 2709 RMD160 870cc5f9296d49333a58d0ee29a691e31d8b7fb1 SHA1 92e48e9cc5bab39eb74dd9b2bc846507b79f0baa SHA256 fa916d7d6e653a4d7144a6880f357fb96c682983020d582fdc91cb2ea6b4a59c
-MISC ChangeLog 3744 RMD160 3cf867814f7ef00c070fb61bd84eb6fd775744fd SHA1 3ca9252cf122c4e8b631cf82a01f6d581daae01c SHA256 bb3c3a305ed6610733d1b95759398939f9d67b0a38ffc5b0254c16036155422b
+EBUILD crafty-20.13.ebuild 2291 RMD160 e3282db5f30c5d906a8d5a007bbc839784aba778 SHA1 7819ae301eebe4ed29ad3b7ad1c9dc563fdfa00d SHA256 ed74fb87b37b764600fac3c78e8e95efea19145b86c37dd92cb9302d0b8ec062
+EBUILD crafty-22.0.ebuild 2694 RMD160 0d265d22d4ee51d2d6e7dda66a13777b78f31160 SHA1 1dff0cf436e8533836901048a3f991383fe11e0a SHA256 b409652a35d4f0e78d7b43f2d6436f90e7e0e11cf7469513404e0b84b39660d7
+MISC ChangeLog 3912 RMD160 13566cf4072db7d70117ae0b0c1f29a9c0b0bd52 SHA1 4859776a210051c4139b7988ad49e42529ef0149 SHA256 00d9831abf11b9e491e4c18360e1592390a4fd5b839d69ab4e5d8e4af40af638
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHyJg48qKy9+b2Hl0RAnN4AKCSQlTvCiUpzmyKcaWVF4PoCvFx3ACgjSc+
-2WolEY4EUMV78p4JYTKT7xs=
-=dqZP
------END PGP SIGNATURE-----
diff --git a/games-board/crafty/crafty-20.13.ebuild b/games-board/crafty/crafty-20.13.ebuild
index d21da7f0cdef..f32cd8299447 100644
--- a/games-board/crafty/crafty-20.13.ebuild
+++ b/games-board/crafty/crafty-20.13.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/crafty/crafty-20.13.ebuild,v 1.3 2007/03/12 13:44:57 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/crafty/crafty-20.13.ebuild,v 1.4 2008/04/11 15:41:11 wolf31o2 Exp $
 
-inherit flag-o-matic games
+inherit flag-o-matic toolchain-funcs games
 
 DESCRIPTION="Bob Hyatt's strong chess engine"
 HOMEPAGE="ftp://ftp.cis.uab.edu/pub/hyatt/"
@@ -11,12 +11,11 @@ SRC_URI="ftp://ftp.cis.uab.edu/pub/hyatt/source/${P}.zip"
 LICENSE="crafty"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
-IUSE="icc no-opts"
+IUSE="no-opts"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	app-arch/unzip
-	icc? ( >=dev-lang/icc-5.0 )"
+	app-arch/unzip"
 
 src_unpack() {
 	unpack ${A}
@@ -33,7 +32,7 @@ src_compile() {
 	local makeopts="target=LINUX"
 
 	if ! use no-opts ; then
-		if use icc ; then
+		if [[ $(tc-getCC) = icc ]] ; then
 			makeopts="${makeopts} CC=icc CXX=gcc asm=X86.o"
 			append-flags -D_REENTRANT -tpp6 \
 				-DCOMPACT_ATTACKS -DUSE_ATTACK_FUNCTIONS \
diff --git a/games-board/crafty/crafty-21.6-r1.ebuild b/games-board/crafty/crafty-21.6-r1.ebuild
deleted file mode 100644
index 887b8fd3131b..000000000000
--- a/games-board/crafty/crafty-21.6-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/crafty/crafty-21.6-r1.ebuild,v 1.1 2007/12/26 11:12:04 tupone Exp $
-
-inherit flag-o-matic games
-
-DESCRIPTION="Bob Hyatt's strong chess engine"
-HOMEPAGE="ftp://ftp.cis.uab.edu/pub/hyatt/"
-SRC_URI="ftp://ftp.cis.uab.edu/pub/hyatt/source/${P}.zip
-	ftp://ftp.cis.uab.edu/pub/hyatt/documentation/${PN}.doc.ascii"
-
-LICENSE="crafty"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="icc no-opts"
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	icc? ( >=dev-lang/icc-5.0 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e '/-o crafty/s/CC/CXX/' \
-		-e 's:CXFLAGS:CXXFLAGS:g' \
-		Makefile \
-		|| die "sed failed"
-	sed -i \
-		-e "s:\"crafty.hlp\":\"${GAMES_DATADIR}/${PN}/crafty.hlp\":" option.c \
-		|| die "sed failed"
-}
-
-src_compile() {
-	local makeopts="target=LINUX"
-
-	if ! use no-opts ; then
-		if use icc ; then
-			makeopts="${makeopts} CC=icc CXX=gcc asm=X86.o"
-			append-flags -D_REENTRANT -tpp6 \
-				-DCOMPACT_ATTACKS -DUSE_ATTACK_FUNCTIONS \
-				-DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B -DFAST \
-				-DSMP -DCPUS=4 -DCLONE -DDGT
-			append-flags -O2 -fno-alias -fforce-mem \
-				-fomit-frame-pointer -fno-gcse -mpreferred-stack-boundary=2
-		else
-			if [[ "${CHOST}" == "i686-pc-linux-gnu" ]] \
-			|| [[ "${CHOST}" == "i586-pc-linux-gnu" ]] ; then
-				append-flags -DCOMPACT_ATTACKS -DUSE_ATTACK_FUNCTIONS \
-					-DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B \
-					-DFAST -DSMP -DCPUS=4 -DCLONE -DDGT
-				append-flags -fno-gcse \
-					-fomit-frame-pointer -mpreferred-stack-boundary=2
-				makeopts="${makeopts} CC=gcc CXX=g++"
-			elif [[ "${CHOST}" == "x86_64-pc-linux-gnu" ]] ; then
-				append-flags -DCOMPACT_ATTACKS -DUSE_ATTACK_FUNCTIONS \
-					-DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B \
-					-DFAST -DSMP -DCPUS=4 -DCLONE -DDGT
-				append-flags -fomit-frame-pointer
-				makeopts="${makeopts} CC=gcc CXX=g++"
-			else
-				: # everything else :)
-			fi
-		fi
-	fi
-	append-flags -DPOSIX
-	emake ${makeopts} crafty-make LDFLAGS="${LDFLAGS} -lpthread" || die "build failed"
-}
-
-src_install() {
-	dogamesbin crafty || die "dogamesbin failed"
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins crafty.hlp || die "doins failed"
-	dodoc "${DISTDIR}"/crafty.doc.ascii
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog
-	elog "Note: No books or tablebases have been installed. If you want them, just"
-	elog "      download them from ${HOMEPAGE}."
-	elog "      You will find documentation there too. In most cases you take now "
-	elog "      your xboard compatible application, (xboard, eboard, knights) and "
-	elog "      just play chess against computer opponent. Have fun."
-	elog
-}
diff --git a/games-board/crafty/crafty-22.0.ebuild b/games-board/crafty/crafty-22.0.ebuild
index f76d3ba5dd8c..14eaef03be02 100644
--- a/games-board/crafty/crafty-22.0.ebuild
+++ b/games-board/crafty/crafty-22.0.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/games-board/crafty/crafty-22.0.ebuild,v 1.1 2008/02/29 23:41:34 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/crafty/crafty-22.0.ebuild,v 1.2 2008/04/11 15:41:11 wolf31o2 Exp $
 
 inherit flag-o-matic games
 
@@ -12,13 +12,12 @@ SRC_URI="ftp://ftp.cis.uab.edu/pub/hyatt/source/${P}.zip
 LICENSE="crafty"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="icc no-opts"
+IUSE="no-opts"
 RESTRICT="test"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	app-arch/unzip
-	icc? ( >=dev-lang/icc-5.0 )"
+	app-arch/unzip"
 
 src_unpack() {
 	unpack ${A}
@@ -37,7 +36,7 @@ src_compile() {
 	local makeopts="target=LINUX"
 
 	if ! use no-opts ; then
-		if use icc ; then
+		if [[ $(tc-getCC) = icc ]] ; then
 			makeopts="${makeopts} CC=icc CXX=gcc asm=X86.o"
 			append-flags -D_REENTRANT -tpp6 \
 				-DCOMPACT_ATTACKS -DUSE_ATTACK_FUNCTIONS \