Removed explicit icc support since no patching is needed.

4 files changed, 14 insertions, 24 deletions

diff --git a/app-sci/emboss/ChangeLog b/app-sci/emboss/ChangeLog
index 4ba64c221077..a99ed4bfd741 100644
--- a/app-sci/emboss/ChangeLog
+++ b/app-sci/emboss/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-sci/emboss
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/emboss/ChangeLog,v 1.11 2004/07/20 00:34:01 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/emboss/ChangeLog,v 1.12 2004/07/20 20:36:30 ribosome Exp $
+
+  20 Jul 2004; Olivier Fisette <ribosome@gentoo.org>
+  emboss-2.8.0-r3.ebuild, emboss-2.9.0.ebuild:
+  Removed icc support since no patching is needed.
 
   19 Jul 2004; Olivier Fisette <ribosome@gentoo.org> emboss-2.9.0.ebuild:
   Version bump. Changed the configuration and install steps a bit to
diff --git a/app-sci/emboss/Manifest b/app-sci/emboss/Manifest
index d62faff0fa6c..4f4f460d393e 100644
--- a/app-sci/emboss/Manifest
+++ b/app-sci/emboss/Manifest
@@ -1,8 +1,8 @@
 MD5 df9f374d37049fcb81ae4b7986f1d0a4 emboss-2.8.0-r2.ebuild 1424
-MD5 acb7132aecfe43f537808ec65eb57086 emboss-2.9.0.ebuild 1885
-MD5 a4d4643bb5e7973c0162b710121a0772 ChangeLog 2259
+MD5 8914dcbba2a4256ad0c1a9ec97be9c98 emboss-2.9.0.ebuild 1743
+MD5 a3134b47cce56a9f7027825e13b390b9 ChangeLog 2411
 MD5 6051afb1f26bf343082490327784b958 metadata.xml 1013
-MD5 f4ef6ae05458bbe72b97eecb80e42151 emboss-2.8.0-r3.ebuild 2025
+MD5 af546b3d478bbee660efdf142344ada4 emboss-2.8.0-r3.ebuild 1883
 MD5 048d6642b77660671ad5c64cdc351df6 files/digest-emboss-2.8.0-r2 66
 MD5 048d6642b77660671ad5c64cdc351df6 files/digest-emboss-2.8.0-r3 66
 MD5 68e42b6377bb0887a0aeac76cf530854 files/digest-emboss-2.9.0 66
diff --git a/app-sci/emboss/emboss-2.8.0-r3.ebuild b/app-sci/emboss/emboss-2.8.0-r3.ebuild
index 8dc704d73c43..a21d0fee5bf9 100644
--- a/app-sci/emboss/emboss-2.8.0-r3.ebuild
+++ b/app-sci/emboss/emboss-2.8.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/emboss/emboss-2.8.0-r3.ebuild,v 1.1 2004/07/15 02:06:20 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/emboss/emboss-2.8.0-r3.ebuild,v 1.2 2004/07/20 20:36:30 ribosome Exp $
 
 DESCRIPTION="The European Molecular Biology Open Software Suite: a sequence analysis package."
 HOMEPAGE="http://www.emboss.org/"
@@ -9,9 +9,9 @@ LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="X png icc no-biodata"
+IUSE="X png no-biodata"
 
-RDEPEND="X? ( virtual/x11 )
+DEPEND="X? ( virtual/x11 )
 	png? (
 		sys-libs/zlib
 		media-libs/libpng
@@ -29,16 +29,9 @@ PDEPEND="!no-biodata? (
 		app-sci/transfac
 	)"
 
-DEPEND="icc? ( dev-lang/icc )
-	${RDEPEND}"
-
 S=${WORKDIR}/EMBOSS-${PV}
 
 src_compile() {
-	if use icc; then
-		CC=/opt/intel/compiler80/bin/icc
-		CXX=/opt/intel/compiler80/bin/icc
-	fi
 	local EXTRA_CONF
 	! use X && EXTRA_CONF="${EXTRA_CONF} --without-x"
 	! use png && EXTRA_CONF="${EXTRA_CONF} --without-pngdriver"
diff --git a/app-sci/emboss/emboss-2.9.0.ebuild b/app-sci/emboss/emboss-2.9.0.ebuild
index a3664963a708..36198eac2389 100644
--- a/app-sci/emboss/emboss-2.9.0.ebuild
+++ b/app-sci/emboss/emboss-2.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/emboss/emboss-2.9.0.ebuild,v 1.1 2004/07/20 00:34:01 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/emboss/emboss-2.9.0.ebuild,v 1.2 2004/07/20 20:36:30 ribosome Exp $
 
 DESCRIPTION="The European Molecular Biology Open Software Suite: a sequence analysis package."
 HOMEPAGE="http://emboss.sourceforge.net/"
@@ -9,9 +9,9 @@ LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="X png icc no-biodata"
+IUSE="X png no-biodata"
 
-RDEPEND="X? ( virtual/x11 )
+DEPEND="X? ( virtual/x11 )
 	png? (
 		sys-libs/zlib
 		media-libs/libpng
@@ -29,16 +29,9 @@ PDEPEND="!no-biodata? (
 		app-sci/transfac
 	)"
 
-DEPEND="icc? ( dev-lang/icc )
-	${RDEPEND}"
-
 S=${WORKDIR}/EMBOSS-${PV}
 
 src_compile() {
-	if use icc; then
-		CC=/opt/intel/compiler80/bin/icc
-		CXX=/opt/intel/compiler80/bin/icc
-	fi
 	EXTRA_CONF="--includedir=${D}/usr/include/emboss"
 	! use X && EXTRA_CONF="${EXTRA_CONF} --without-x"
 	! use png && EXTRA_CONF="${EXTRA_CONF} --without-pngdriver"