Index: boost-1.41.0-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.41.0-r3.ebuild,v
retrieving revision 1.1
diff -u -B -r1.1 boost-1.41.0-r3.ebuild
--- boost-1.41.0-r3.ebuild	21 Dec 2009 10:13:40 -0000	1.1
+++ boost-1.41.0-r3.ebuild	26 Feb 2010 04:33:25 -0000
@@ -13,7 +13,7 @@
 SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
 LICENSE="Boost-1.0"
 SLOT="$(get_version_component_range 1-2)"
-IUSE="debug doc +eselect expat icu mpi python test tools"
+IUSE="debug doc +eselect expat icu mpi python static-libs test tools"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 
@@ -188,24 +188,27 @@
 
 	export BOOST_ROOT="${S}"
 
+	LINK_TARGETS=shared
+	use static-libs && LINK_TARGETS+=,static
+
 	einfo "Using the following command to build: "
-	einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease ${OPTIONS} threading=single,multi link=shared,static runtime-link=shared"
+	einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease ${OPTIONS} threading=single,multi link=${LINK_TARGETS} runtime-link=shared"
 
 	${BJAM} ${NUMJOBS} -q -d+2 \
 		gentoorelease \
 		${OPTIONS} \
-		threading=single,multi link=shared,static runtime-link=shared \
+		threading=single,multi link=${LINK_TARGETS} runtime-link=shared \
 		|| die "building boost failed"
 
 	# ... and do the whole thing one more time to get the debug libs
 	if use debug ; then
 		einfo "Using the following command to build: "
-		einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoodebug ${OPTIONS} threading=single,multi link=shared,static runtime-link=shared --buildid=debug"
+		einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoodebug ${OPTIONS} threading=single,multi link=${LINK_TARGETS} runtime-link=shared --buildid=debug"
 
 		${BJAM} ${NUMJOBS} -q -d+2 \
 			gentoodebug \
 			${OPTIONS} \
-			threading=single,multi link=shared,static runtime-link=shared \
+			threading=single,multi link=${LINK_TARGETS} runtime-link=shared \
 			--buildid=debug \
 			|| die "building boost failed"
 	fi
@@ -227,24 +230,24 @@
 	export BOOST_ROOT="${S}"
 
 	einfo "Using the following command to install: "
-	einfo "${BJAM} -q -d+2 gentoorelease ${OPTIONS} threading=single,multi link=shared,static runtime-link=shared --includedir=\"${D}/usr/include\" --libdir=\"${D}/usr/$(get_libdir)\" install"
+	einfo "${BJAM} -q -d+2 gentoorelease ${OPTIONS} threading=single,multi link=${LINK_TARGETS} runtime-link=shared --includedir=\"${D}/usr/include\" --libdir=\"${D}/usr/$(get_libdir)\" install"
 
 	${BJAM} -q -d+2 \
 		gentoorelease \
 		${OPTIONS} \
-		threading=single,multi link=shared,static runtime-link=shared \
+		threading=single,multi link=${LINK_TARGETS} runtime-link=shared \
 		--includedir="${D}/usr/include" \
 		--libdir="${D}/usr/$(get_libdir)" \
 		install || die "install failed for options '${OPTIONS}'"
 
 	if use debug ; then
 		einfo "Using the following command to install: "
-		einfo "${BJAM} -q -d+2 gentoodebug ${OPTIONS} threading=single,multi link=shared,static runtime-link=shared --includedir=\"${D}/usr/include\" --libdir=\"${D}/usr/$(get_libdir)\" --buildid=debug"
+		einfo "${BJAM} -q -d+2 gentoodebug ${OPTIONS} threading=single,multi link=${LINK_TARGETS} runtime-link=shared --includedir=\"${D}/usr/include\" --libdir=\"${D}/usr/$(get_libdir)\" --buildid=debug"
 
 		${BJAM} -q -d+2 \
 			gentoodebug \
 			${OPTIONS} \
-			threading=single,multi link=shared,static runtime-link=shared \
+			threading=single,multi link=${LINK_TARGETS} runtime-link=shared \
 			--includedir="${D}/usr/include" \
 			--libdir="${D}/usr/$(get_libdir)" \
 			--buildid=debug \