making it work for icc as well as gcc

Package-Manager: portage-2.0.51-r15

3 files changed, 21 insertions, 15 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index a37fc7dbb97b..7ba7112df27a 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,10 @@
 # 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.38 2005/03/05 05:33:08 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.39 2005/03/05 16:02:36 morfic Exp $
+
+  05 Mar 2005; Daniel Goller <morfic@gentoo.org> boost-1.32.0-r1.ebuild:
+  making the symlinks work for gcc and icc by inserting a variable not a
+  harcoded -gcc into the libname
 
 *boost-1.32.0-r1 (04 Mar 2005)
 
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index d90a5ac1ffaf..a519e526badd 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -5,9 +5,9 @@ MD5 12f996aa5f489e4e51055e537ea059a8 boost-1.31.0.ebuild 3967
 MD5 8d4eca3eb59bc23e2d53b3d0cfd06c97 boost-1.32.0.ebuild 2294
 MD5 d259ae434e176df207cba3deab973f61 boost-1.29.0.ebuild 1426
 MD5 34d13e0eeb58e13e1992908d04d51b45 boost-1.30.0.ebuild 2973
-MD5 c07bfc543945d8f78951e36716f867f0 ChangeLog 5903
+MD5 c02c5f370fd7ce1e64ca695f991467e1 ChangeLog 6083
 MD5 ac17509c51769ef73346e3d3d7733f67 metadata.xml 347
-MD5 84b6d44583110473af4eadf51a236e04 boost-1.32.0-r1.ebuild 2656
+MD5 7c074931a8bc332002d62ae3d1b4dbb8 boost-1.32.0-r1.ebuild 2800
 MD5 4759f9391ad73c487d4f6b3dbf8632a8 boost-1.30.2.ebuild 2960
 MD5 ed187a2b2048776a7e5b27060d96938c files/digest-boost-1.29.0 65
 MD5 2b36d47323b021671d391600501685cc files/digest-boost-1.30.0 66
@@ -18,7 +18,7 @@ MD5 1d06245b53e5677556ae22e5f60f0df3 files/digest-boost-1.32.0-r1 67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCKULjUpKYMelfdYERAhHmAJ46NCQVhBW/gu7TSfbzt/75Wckn1ACfelVx
-yQe540JBp7OCbRZIs+4PSso=
-=Dfk2
+iD8DBQFCKdX4UpKYMelfdYERAg6BAJ0e0UfuX1fkuCWKSYul2WGFgvhVngCfcrJn
+CRLjHZblcnPO8wIDTTZxxjw=
+=1dfp
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/boost/boost-1.32.0-r1.ebuild b/dev-libs/boost/boost-1.32.0-r1.ebuild
index 6b47af470183..049427f4cd72 100644
--- a/dev-libs/boost/boost-1.32.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.32.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.32.0-r1.ebuild,v 1.1 2005/03/05 05:33:08 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.32.0-r1.ebuild,v 1.2 2005/03/05 16:02:36 morfic Exp $
 
 # This ebuild was generated by Ebuilder v0.4.
 inherit python
@@ -29,8 +29,10 @@ pkg_setup() {
 
 	if use icc ; then
 		BOOST_TOOLSET="intel-linux"
+		TOOLSET_NAME="icc"
 	else
 		BOOST_TOOLSET="gcc"
+		TOOLSET_NAME="gcc"
 	fi
 
 	BOOSTJAM=./tools/build/jam_src/bin.linux${arch}/bjam
@@ -89,17 +91,17 @@ src_install () {
 		cd ${D}/usr/lib
 
 		for fn in `ls -1 *.so|cut -d- -f1|sort|uniq`; do
-				dosym $fn.so $fn-gcc.so
-				dosym $fn-mt.so $fn-gcc-mt.so
-				dosym $fn-d.so $fn-gcc-d.so
-				dosym $fn-mt-d.so $fn-gcc-d.so
+				dosym $fn.so $fn-${TOOLSET_NAME}.so
+				dosym $fn-mt.so $fn-${TOOLSET_NAME}-mt.so
+				dosym $fn-d.so $fn-${TOOLSET_NAME}-d.so
+				dosym $fn-mt-d.so $fn-${TOOLSET_NAME}-mt-d.so
 		done
 
 		for fn in `ls -1 *.a|cut -d- -f1|sort|uniq`; do
-				dosym $fn.a $fn-gcc.a
-				dosym $fn-mt.a $fn-gcc-mt.a
-				dosym $fn-d.a $fn-gcc-d.a
-				dosym $fn-mt-d.a $fn-gcc-d.a
+				dosym $fn.a $fn-${TOOLSET_NAME}.a
+				dosym $fn-mt.a $fn-${TOOLSET_NAME}-mt.a
+				dosym $fn-d.a $fn-${TOOLSET_NAME}-d.a
+				dosym $fn-mt-d.a $fn-${TOOLSET_NAME}-mt-d.a
 		done
 
 }