Deprecating icc at last

Package-Manager: portage-2.0.52-r1

3 files changed, 13 insertions, 65 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index 81d0d2a7c718..4723879aa516 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/boost
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.65 2005/10/25 20:10:35 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.66 2005/10/26 03:33:48 morfic Exp $
+
+  26 Oct 2005; Daniel Goller <morfic@gentoo.org> boost-1.33.0-r1.ebuild:
+  Deprecating icc at last
 
   25 Oct 2005; Daniel Goller <morfic@gentoo.org> boost-1.33.0-r1.ebuild:
   Adding bcp, bjam, changing to /usr/share/boost-build
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index bb45ee99a458..e55c758e6601 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 26334aff7fedef42798e3a5bb8e45063 ChangeLog 9060
+MD5 81bedf9b2d1f532125cf0cb21d508b8b ChangeLog 9160
 MD5 d259ae434e176df207cba3deab973f61 boost-1.29.0.ebuild 1426
 MD5 34d13e0eeb58e13e1992908d04d51b45 boost-1.30.0.ebuild 2973
 MD5 4759f9391ad73c487d4f6b3dbf8632a8 boost-1.30.2.ebuild 2960
@@ -11,7 +11,7 @@ MD5 37f8eb8b22a26f2bc30b6101d14cb9d0 boost-1.32.0-r2.ebuild 5690
 MD5 76f87ddbbddd80f054d8d005d4d66d92 boost-1.32.0-r3.ebuild 6183
 MD5 8d4eca3eb59bc23e2d53b3d0cfd06c97 boost-1.32.0.ebuild 2294
 MD5 16a0704d7282649d4c5920e3c8b39bee metadata.xml 343
-MD5 e755f7466c30323264e35d4c8db4704b boost-1.33.0-r1.ebuild 7159
+MD5 80f79bf6db7e485997aee8f16a90f82d boost-1.33.0-r1.ebuild 5625
 MD5 421fe3be35fd6d405bf2b3381d51867f boost-1.33.0.ebuild 6259
 MD5 9f4b3bf1104d681375b01af831179ee8 boost-1.32.0-r4.ebuild 6263
 MD5 ed187a2b2048776a7e5b27060d96938c files/digest-boost-1.29.0 65
@@ -29,7 +29,7 @@ MD5 612f486fa190f86f9be3a17465036dd0 files/digest-boost-1.33.0-r1 67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDXs5Z/aM9DdBw91cRAnCqAKDCxm7bhI98agtp7BEccN16VPtJ6gCeO8ow
-rwNcpg6kfaFUBjHPtvUe0zc=
-=G9F3
+iD8DBQFDXvkp/aM9DdBw91cRAk0pAJ9RL7K32imT0I3/wHW4ftNoov6fUgCfbv3l
+x813OEYP27y5/RvC9az+igQ=
+=GhYA
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/boost/boost-1.33.0-r1.ebuild b/dev-libs/boost/boost-1.33.0-r1.ebuild
index 77510c63df34..b48be19ce9e6 100644
--- a/dev-libs/boost/boost-1.33.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.33.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.33.0-r1.ebuild,v 1.3 2005/10/26 00:31:06 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.33.0-r1.ebuild,v 1.4 2005/10/26 03:33:48 morfic Exp $
 
 # This ebuild was generated by Ebuilder v0.4.
 inherit python distutils multilib eutils
@@ -13,10 +13,9 @@ SRC_URI="mirror://sourceforge/boost/${PN}_${BOOST_PV}.tar.bz2"
 LICENSE="freedist Boost-1.0"
 SLOT="1"
 KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bcp bjam debug doc icc pyste static threads threadsonly"
+IUSE="bcp bjam debug doc pyste static threads threadsonly"
 
-DEPEND="!icc? ( sys-devel/gcc )
-	icc? (  >=dev-lang/icc-8.0.055 )
+DEPEND=" sys-devel/gcc
 	dev-lang/python"
 
 RDEPEND="pyste? ( dev-cpp/gccxml dev-python/elementtree ) ${DEPEND}"
@@ -31,11 +30,7 @@ pkg_setup() {
 		arch=${ARCH}
 	fi
 
-	if use icc ; then
-		BOOST_TOOLSET="intel-linux"
-		TOOLSET_NAME="icc"
-		SOSUFFIX="so"
-	elif use ppc-macos ; then
+	if use ppc-macos ; then
 		BOOST_TOOLSET="darwin"
 		TOOLSET_NAME="darwin"
 		SOSUFFIX="dylib"
@@ -44,20 +39,6 @@ pkg_setup() {
 		TOOLSET_NAME="gcc"
 		SOSUFFIX="so"
 	fi
-	#Check ICC path and use this instead of hardcoding it, thanks to Peter Koeleman
-	if use icc; then
-		if [ "X${IA32ROOT}" == "X" ]; then
-			# try IA64ROOT
-			if [ "X${IA64ROOT}" == "X" ]; then
-				# this shouldn't happen when icc is properly installed
-				eerror "Could not find path to Intel compiler"
-			else
-				INTEL_PATH="${IA64ROOT}"
-			fi
-		else
-			INTEL_PATH="${IA32ROOT}"
-		fi
-	fi
 
 	if use static ; then
 		BUILD="release <runtime-link>static"
@@ -107,27 +88,6 @@ src_compile() {
 			epatch ${FILESDIR}/boost-alpha-threads.patch
 		fi
 
-		if use icc ; then
-				export CPLUS_INCLUDE_PATH="${INTEL_PATH}/include/c++"
-				export GXX_INCLUDE="/usr/include"
-				${BOOSTJAM} ${NUMJOBS} -sBOOST_ROOT="${S}" \
-				-sPYTHON_ROOT=/usr \
-				-sPYTHON_VERSION=${PYVER} \
-				-sTOOLS=${BOOST_TOOLSET} \
-				-sINTEL_PATH="${INTEL_PATH}/" \
-				-sBUILD="${BUILD}" \
-				--prefix=${D}/usr \
-				--layout=system
-
-				${BOOSTJAM} ${NUMJOBS} -sBOOST_ROOT="${S}" \
-				-sPYTHON_ROOT=/usr \
-				-sPYTHON_VERSION=${PYVER} \
-				-sTOOLS=${BOOST_TOOLSET} \
-				-sINTEL_PATH="${INTEL_PATH}/" \
-				-sBUILD="${BUILD}" \
-				--prefix=${D}/usr \
-				--layout=system
-		else
 				${BOOSTJAM} ${NUMJOBS} -sBOOST_ROOT="${S}" \
 				-sPYTHON_ROOT=/usr \
 				-sPYTHON_VERSION=${PYVER} \
@@ -143,7 +103,6 @@ src_compile() {
 				-sBUILD="${BUILD}" \
 				--prefix=${D}/usr \
 				--layout=system
-		fi
 
 		if use pyste; then
 			cd ${S}/libs/python/pyste/install
@@ -165,19 +124,6 @@ src_install () {
 		cp -a index.html v1/ v2/ ${D}/usr/share/boost-build || die "failed to install docs"
 		cd "${S}"
 
-		if use icc ; then
-			export CPLUS_INCLUDE_PATH="${INTEL_PATH}/include/c++"
-			export GXX_INCLUDE="/usr/include"
-			${BOOSTJAM} ${NUMJOBS} -sBOOST_ROOT="${S}" \
-			-sPYTHON_ROOT=/usr \
-			-sPYTHON_VERSION=${PYVER} \
-			-sTOOLS=${BOOST_TOOLSET} \
-			-sBUILD="${BUILD}" \
-			-sINTEL_PATH="${INTEL_PATH}/" \
-			--prefix=${D}/usr \
-			--layout=system \
-			install || die "Install failed"
-		else
 			${BOOSTJAM}	${NUMJOBS} -sBOOST_ROOT="${S}" \
 			-sPYTHON_ROOT=/usr \
 			-sPYTHON_VERSION=${PYVER} \
@@ -186,7 +132,6 @@ src_install () {
 			--prefix=${D}/usr \
 			--layout=system \
 			install || die "Install failed"
-		fi
 
 	# Install documentation; seems to be mostly under ${S}/lib