Rename alltargets USE flag to multitarget, bug #382307

Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64

10 files changed, 42 insertions, 414 deletions

diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index dbf5a2820d55..c45cde442d64 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -11,18 +11,15 @@ DIST clang-2.8.tgz 5666777 RMD160 f00956b6de29cc09f3992aeabd140f2189c6cf39 SHA1
 DIST clang-2.9.tgz 6243772 RMD160 4ab79cbd0e2ad25a2272e6ee2fbbf546818dbd73 SHA1 5fd3b5cec050ec12858c1602b23cf096282ad4a4 SHA256 70c41f3f782a71cbaa7bc8d6ea29fce4263ad3e8558dfecc6dc11cdef17909df
 DIST llvm-2.8-r1.tgz 9112527 RMD160 3f5a71d07e105a7cf46eafc7a9006a927035012c SHA1 6d49fe039d28e8664de25491c775cb2c599e30c1 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b
 DIST llvm-2.9.tgz 9574781 RMD160 caeaa067fda1eb34196b356a087645f83731cfb7 SHA1 500f587f840199ac53c4fc7572839d08fa9d9123 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779
-EBUILD clang-2.8-r3.ebuild 6703 RMD160 5d15d6b792f8c5207c2446c099be385686dca28d SHA1 8ffc1dabd746714c500aa0f429c9ed209a6b77ab SHA256 68a2bfedecadd38498631a5e4be8f5e098e7e518aec09f06af7f40cf26198d76
-EBUILD clang-2.9-r1.ebuild 6605 RMD160 79195fad712c066d8b3b803e8baa1f2b239df67c SHA1 46f9e2d9198995e18470b5f0da6eb7a1b355393c SHA256 af09147097e159b0238fdfc9521eed9e7641dcdc5c1f04c99b05e4f6cfec6b27
-EBUILD clang-2.9.ebuild 6509 RMD160 48b2ac1acbbd15be1eef910cfdc4becc62b0e031 SHA1 21d95c0451bb77fc01cd08f3a6c836b00dc59ac0 SHA256 2159a11c7a8deeb0bd75a7b768fed18fc2735627a00a7b191d2ba7b3454b5079
-EBUILD clang-9999.ebuild 6171 RMD160 9df8e1f13cf1c2d1e59ce41cfa6ac57bc33e7c11 SHA1 807cdb2fe181c46d22464acb0bf20ca32d9f54fd SHA256 ed8dbbbaa8af1fb0f09917a744ec7ed6b75d3c0b72fa7da1cbf374a9eb11d60d
-MISC ChangeLog 7526 RMD160 1479fd8ffbfb5cf1fa6e935bb468f490b04af2dd SHA1 deb1b73434f6ed8d6feaf95fd40dc343d07abc83 SHA256 d54d0da98f0592da1a5b5f27aafd1fdf725c8d15a940750f906ea64b7fc24fbc
-MISC metadata.xml 1338 RMD160 a38cbf003127688600ac88edaa6e335da6b3a334 SHA1 7ad645c76eb95fbe855c6b6205beccc47aaa4156 SHA256 128694053a0f138cd2d1e2fdfc3f13449ead64add45e08d9d3091a635d6f1c01
+EBUILD clang-2.8-r3.ebuild 6705 RMD160 c352eef7ad232366103c5f95aa8824cde5b463df SHA1 e9008981b715af9a3ecb6352dbff5728f591b91d SHA256 386a60cc32060cdc99e96033bddc78395a5e8e8c925089fbeebfca421521e788
+EBUILD clang-2.9-r1.ebuild 6607 RMD160 c4c6f5c98be7411a0998f4720e85116a4c03f3c1 SHA1 5a8072f9372be7ec51429d3b7be05209774611ed SHA256 0d8e72cd348d67c64ad1f3eb5801753619342df1a1ca026382efb5e60942a38e
+EBUILD clang-9999.ebuild 6173 RMD160 ebb051b2593a68c44bf91d5aa0aa173cfbab07f1 SHA1 538c89e0ffd93c766543dcd5a365e0b278b0ab2c SHA256 35b806177a22d18d6570fcbadab6fb5543b5d8d66bc418ee1c62ea14caeb52e5
+MISC ChangeLog 7754 RMD160 48ce4e1722787407960ef64e6ddd19da2ff8314b SHA1 2be9d044de6c622525491807dc023adcbee200f9 SHA256 4fcfa684478c2b7b99977a579c4b6eb10c95cbbfe0606a6ab6f75267cbc04d5a
+MISC metadata.xml 1339 RMD160 5f8b76cda96fc95f67fd8ff7f977c116a4f0f28a SHA1 034f922ae098216b179e9d5c78246f9caa95b9d6 SHA256 0ef2f9bcc4f3293dcb69b2c882b93737b9be496e6f8789efa69df6adb2c1edf8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59s+MACgkQfXuS5UK5QB0KhgP/RUClxpWmq4H7p5imUSCpOAV7
-Ph7GBnnGRpkgPiJnwJVkj8NwZC65vPqKtcPgjw0uMwnoZLJSoGpQajqcgtlqwGLW
-8whKcM6TPN6XXwR+i68rQ5UlUBsiDWQNr32xz39+jaWVbu5MUKeSWL8GGVx08sRT
-NBKzkFOfFmkBtvwRg04=
-=Mh+h
+iF4EAREIAAYFAk6JumsACgkQFYEBGcdFJfIxIAD7BRLm6j2JvtFBIMPziqEndtPc
+AYdrzQ8klDp2fGv88RwA/iR+ypnq7FbIekFDk7vKtBSZwbh93LBEzqUkK8HI5yxG
+=+rzZ
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index ddef3a42285a..ed2686fde2ca 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.45 2011/09/28 10:56:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.46 2011/10/03 13:36:01 voyageur Exp $
+
+  03 Oct 2011; Bernard Cafarelli <voyageur@gentoo.org> -llvm-2.8-r1.ebuild,
+  llvm-2.8-r2.ebuild, llvm-2.8-r4.ebuild, -llvm-2.9-r1.ebuild,
+  llvm-2.9-r2.ebuild, llvm-9999.ebuild, metadata.xml:
+  Rename alltargets USE flag to multitarget, bug #382307. Clean bison
+  dependency, depending only on new enough one. Drop some versions
 
   28 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
   USE="libffi" is now global USE flag.
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 2aa7148fdd16..62693799218a 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX llvm-2.6-commandguide-nops.patch 975 RMD160 1178c27a8845c2c86d6d381ba3d95b4b9b627f1e SHA1 41b9d8c3ae0ed1023ec72bf629c53fa8981e0264 SHA256 0e36fb43e020fa380230a8c6f2a79b9a19e12e857e833ef856e2b41aaa283649
 AUX llvm-2.7-nodoctargz.patch 1878 RMD160 a6134fd292a1a2c6a594e787ce73b15012be04bb SHA1 9d32a0e15791789d8bf58dfecf9580a00d150319 SHA256 983657329ebede731b397ba0256d729b3958f39faea64c9f7d065ab8d2a3e7fd
@@ -9,22 +9,16 @@ AUX llvm-2.9-Operator.h-c++0x.patch 2062 RMD160 3f137dc80cac2d77b978a332a731e443
 AUX llvm-2.9-nodoctargz.patch 1569 RMD160 6589aa0a41f47e915ce93fe6dcf68dd601c3bcdc SHA1 19795ec9c34e6ec5539ec6a77944ceb51abdef72 SHA256 62f1b080364d94e528bb34f0063562d16a59395aa7f97277bba88fbd93e00b84
 DIST llvm-2.8-r1.tgz 9112527 RMD160 3f5a71d07e105a7cf46eafc7a9006a927035012c SHA1 6d49fe039d28e8664de25491c775cb2c599e30c1 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b
 DIST llvm-2.9.tgz 9574781 RMD160 caeaa067fda1eb34196b356a087645f83731cfb7 SHA1 500f587f840199ac53c4fc7572839d08fa9d9123 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779
-EBUILD llvm-2.8-r1.ebuild 6029 RMD160 4adbf75b2c9639fa55703cc72d7c47758f5e23b5 SHA1 c6a312609a19bcc8c8eb4e728540df5140a07650 SHA256 65d899bf69315ac21d0a741b190e80430b27815b5457075bc9eee36e79da6b57
-EBUILD llvm-2.8-r2.ebuild 6111 RMD160 27b53327fcfcee19851fffb617de02ae8ee4e41e SHA1 753eb5d2fe2a5711f092e0d136a9bd2578eb03e8 SHA256 de994f696fad03cabc7d9c3feea6a08fd7554abe9e11b169afbdba297013d40f
-EBUILD llvm-2.8-r4.ebuild 6177 RMD160 a007533f6e237c58b66e8ee6010ba84911ab1285 SHA1 2a7677609003eb00c7230b38a6fd2631404a8325 SHA256 017ead4a7f2fd6a2aa48019bbec5dc31860d814841e698e6c5a3033c690e5431
-EBUILD llvm-2.9-r1.ebuild 5991 RMD160 f7ee74837d5719faf889e3060f79d695e0288ccc SHA1 d2a53043d727ea21544382eab88eef5ba044dd04 SHA256 2139297514ea4d16de45680fd5dc7fbefd96e78c3771b099cf5a671be16c2b7d
-EBUILD llvm-2.9-r2.ebuild 6070 RMD160 d9a3c08b5f5300af7ccd6b7d46a143a666c39768 SHA1 9ad905ab1bfd2db11c83054b239e1c0eff371e71 SHA256 8832e76424ef790aae1da50d5dd0f83dd875eb4f271663e15f482bc265c26682
-EBUILD llvm-9999.ebuild 5972 RMD160 9f0ded385ffb15de7d50bb32c23fc146d905a1bd SHA1 e5c68bba893ee6e406c1dffa09fdfe3c6b0d8e8d SHA256 1a39544e390dfe9bd682c807c5d3d1dfc2745838b3ae1fd78b8b3fd5820950a5
-MISC ChangeLog 7288 RMD160 cf941314d16601837f8a3a7c8ef0ed837906262a SHA1 bf6458ad6023a5b7d1735e4df2fe7c535949bf95 SHA256 06f655b8ca54f7f728f399cf85f8549b9cfcbf1a54b29ded561e6fa60fd42f3d
-MISC metadata.xml 2233 RMD160 9b6356c44b97587198e665667e69e0f02ed8c766 SHA1 fd0ccca0ceefc1645a79d903d168a3352441eb2b SHA256 ef685ab5ebc1fea8cabe835909eee61ec272ae10cf02772853283e39bc01a634
+EBUILD llvm-2.8-r2.ebuild 6064 RMD160 a65cbe7aaf46d226f844430f5a459aad373ee7a2 SHA1 4a0787940fd3328fa620e36f27349b494fa4d327 SHA256 591e06c515b561220d4334aa5d02c51021c9b424082c785888e9459d7f95d5aa
+EBUILD llvm-2.8-r4.ebuild 6132 RMD160 1303d8d19fbf64009e68742cdbdf11b00ccde922 SHA1 92c3e6ca5d976684ba37766cd68b58bbfe0c8265 SHA256 883f5997b8e3e9670cb4a2c70e0066c6b6f679ed6e5cd156c6d7b677e3f31c2b
+EBUILD llvm-2.9-r2.ebuild 6025 RMD160 f6d6e780e92f0882088333197439a88d549a89b6 SHA1 54ab1b2cf0ff3652e0d9922dbb25a1131d43e764 SHA256 c07dcbf874d8605d3588288aeccdd5d435bb7c0f2c5117cee8daad3eecc21c65
+EBUILD llvm-9999.ebuild 5927 RMD160 bb1591ef18b0dd8ee152b6d4633bb925d406dca1 SHA1 fc0800481270503d05995786a7c00a98ebc93c50 SHA256 4e0d098bf2ea23b53f01f7aadb25129bfff70355a4c131ad397c200fd933a68b
+MISC ChangeLog 7618 RMD160 4c803b1d655af81c27148aea28fa05fd94f03dc2 SHA1 cfff3870d71ef1c5e6f2cffffcf83f5d5a50f822 SHA256 ec66d70f8cdc7383498940e5c526e6bb5579477dc8549b65f9ec527a4582e50e
+MISC metadata.xml 2234 RMD160 b14138857d612a9f5568760b1e70b80f344d978c SHA1 53d1e496b0e80e9acc24fd1cb8858e9efc93d7c0 SHA256 83a322d633e38210fe9946ea92902a17142863fe26578bb1b1bad773952b0419
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOgv1oAAoJEEdUh39IaPFNgVgH/i4eggMH/ggc8rEG8uoqUy31
-6qPXk7ni7YR2cXNJ3pSW312K7KSAfwAm0sEBUi9KzcofQck+weeliCOOpWeg8CZB
-RxiH+m23q9QXd8wZVrrtQTRVFEpyXyECGQQxr1hFMdSB2QFXPypTi5ZxeSXuQJgl
-5IPXp1w4b59zS8QvjWGU9xuytkatgOfM7L0SmGS10ge7MPC70vErRTxYmcGNhZ8N
-p5COALgwSKPY4/0jBMUQzfBY+TY4x1rznhkXqyRE8Q5JCsLweS6Ypzhh4yUCRKF3
-tK1hVc7sjJdWHikS5YQQBvxUTpJ6B3RJkMZtPcN14CFoSM4oW1YJKM8YegqVtok=
-=rP58
+iF4EAREIAAYFAk6JulMACgkQFYEBGcdFJfKlXQD/a3nRc/X8fMmkVWPw/BFVzBGc
+VLQY/A+/tq9oC+iJXCAA/A9uUnp1ioa0M9jn0Sm88ikkEWmmX1nU3dSOAuwI6Ru6
+=eecU
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-2.8-r1.ebuild b/sys-devel/llvm/llvm-2.8-r1.ebuild
deleted file mode 100644
index 0848fa049c41..000000000000
--- a/sys-devel/llvm/llvm-2.8-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.8-r1.ebuild,v 1.6 2011/02/14 11:19:33 xarthisius Exp $
-
-EAPI="3"
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="http://llvm.org/"
-# Upstream silently re-released the tarball...
-# drop the -> in 2.9
-SRC_URI="http://llvm.org/releases/${PV}/${P}.tgz -> ${P}-r1.tgz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~ppc-macos"
-IUSE="alltargets debug +libffi llvm-gcc ocaml test udis86"
-
-DEPEND="dev-lang/perl
-	>=sys-devel/make-3.79
-	>=sys-devel/flex-2.5.4
-	>=sys-devel/bison-1.28
-	!~sys-devel/bison-1.85
-	!~sys-devel/bison-1.875
-	|| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 )
-	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )
-	libffi? ( virtual/libffi )
-	ocaml? ( dev-lang/ocaml )
-	udis86? ( amd64? ( dev-libs/udis86[pic] )
-		!amd64? ( dev-libs/udis86 ) )"
-RDEPEND="dev-lang/perl"
-
-S=${WORKDIR}/${PN}-${PV/_pre*}
-
-pkg_setup() {
-	# need to check if the active compiler is ok
-
-	broken_gcc=" 3.2.2 3.2.3 3.3.2 4.1.1 "
-	broken_gcc_x86=" 3.4.0 3.4.2 "
-	broken_gcc_amd64=" 3.4.6 "
-
-	gcc_vers=$(gcc-fullversion)
-
-	if [[ ${broken_gcc} == *" ${version} "* ]] ; then
-		elog "Your version of gcc is known to miscompile llvm."
-		elog "Check http://www.llvm.org/docs/GettingStarted.html for"
-		elog "possible solutions."
-		die "Your currently active version of gcc is known to miscompile llvm"
-	fi
-
-	if [[ ${CHOST} == i*86-* && ${broken_gcc_x86} == *" ${version} "* ]] ; then
-		elog "Your version of gcc is known to miscompile llvm on x86"
-		elog "architectures.  Check"
-		elog "http://www.llvm.org/docs/GettingStarted.html for possible"
-		elog "solutions."
-		die "Your currently active version of gcc is known to miscompile llvm"
-	fi
-
-	if [[ ${CHOST} == x86_64-* && ${broken_gcc_amd64} == *" ${version} "* ]];
-	then
-		 elog "Your version of gcc is known to miscompile llvm in amd64"
-		 elog "architectures.  Check"
-		 elog "http://www.llvm.org/docs/GettingStarted.html for possible"
-		 elog "solutions."
-		die "Your currently active version of gcc is known to miscompile llvm"
-	 fi
-}
-
-src_prepare() {
-	# unfortunately ./configure won't listen to --mandir and the-like, so take
-	# care of this.
-	einfo "Fixing install dirs"
-	sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \
-		-e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \
-		-e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/${PN}, \
-		-i Makefile.config.in || die "Makefile.config sed failed"
-	sed -e 's,$ABS_RUN_DIR/lib,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
-		-i tools/llvm-config/llvm-config.in.in || die "llvm-config sed failed"
-
-	einfo "Fixing rpath"
-	sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
-		-i Makefile.rules || die "rpath sed failed"
-
-	epatch "${FILESDIR}"/${PN}-2.7-nodoctargz.patch
-	epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch
-	epatch "${FILESDIR}"/${PN}-2.8-darwin8.patch
-}
-
-src_configure() {
-	local CONF_FLAGS="--enable-shared"
-
-	if use debug; then
-		CONF_FLAGS="${CONF_FLAGS} --disable-optimized"
-		einfo "Note: Compiling LLVM in debug mode will create huge and slow binaries"
-		# ...and you probably shouldn't use tmpfs, unless it can hold 900MB
-	else
-		CONF_FLAGS="${CONF_FLAGS} \
-			--enable-optimized \
-			--disable-assertions \
-			--disable-expensive-checks"
-	fi
-
-	if use alltargets; then
-		CONF_FLAGS="${CONF_FLAGS} --enable-targets=all"
-	else
-		CONF_FLAGS="${CONF_FLAGS} --enable-targets=host-only"
-	fi
-
-	if use amd64; then
-		CONF_FLAGS="${CONF_FLAGS} --enable-pic"
-	fi
-
-	# things would be built differently depending on whether llvm-gcc is
-	# used or not.
-	local LLVM_GCC_DIR=/dev/null
-	local LLVM_GCC_DRIVER=nope ; local LLVM_GPP_DRIVER=nope
-	if use llvm-gcc ; then
-		if has_version sys-devel/llvm-gcc; then
-			LLVM_GCC_DIR=$(ls -d ${EROOT}/usr/$(get_libdir)/llvm-gcc* 2> /dev/null)
-			LLVM_GCC_DRIVER=$(find ${LLVM_GCC_DIR} -name 'llvm*-gcc' 2> /dev/null)
-			if [[ -z ${LLVM_GCC_DRIVER} ]] ; then
-				die "failed to find installed llvm-gcc, LLVM_GCC_DIR=${LLVM_GCC_DIR}"
-			fi
-			einfo "Using $LLVM_GCC_DRIVER"
-			LLVM_GPP_DRIVER=${LLVM_GCC_DRIVER/%-gcc/-g++}
-		else
-			eerror "llvm-gcc USE flag enabled, but sys-devel/llvm-gcc was not found"
-			eerror "Building with standard gcc, re-merge this package after installing"
-			eerror "llvm-gcc to build with it"
-			eerror "This is normal behavior on first LLVM merge"
-		fi
-	fi
-
-	CONF_FLAGS="${CONF_FLAGS} \
-		--with-llvmgccdir=${LLVM_GCC_DIR} \
-		--with-llvmgcc=${LLVM_GCC_DRIVER} \
-		--with-llvmgxx=${LLVM_GPP_DRIVER}"
-
-	if use ocaml; then
-		CONF_FLAGS="${CONF_FLAGS} --enable-bindings=ocaml"
-	else
-		CONF_FLAGS="${CONF_FLAGS} --enable-bindings=none"
-	fi
-
-	if use udis86; then
-		CONF_FLAGS="${CONF_FLAGS} --with-udis86"
-	fi
-	CONF_FLAGS="${CONF_FLAGS} $(use_enable libffi)"
-	econf ${CONF_FLAGS} || die "econf failed"
-}
-
-src_compile() {
-	emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 || die "emake failed"
-}
-
-src_install() {
-	emake KEEP_SYMBOLS=1 DESTDIR="${D}" install || die "install failed"
-
-	# Fix install_names on Darwin.  The build system is too complicated
-	# to just fix this, so we correct it post-install
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		for lib in lib{EnhancedDisassembly,LLVM-${PV},BugpointPasses,LLVMHello,LTO,profile_rt}.dylib ; do
-			# libEnhancedDisassembly is Darwin10 only, so non-fatal
-			[[ -f ${ED}/usr/lib/${PN}/${lib} ]] || continue
-			ebegin "fixing install_name of $lib"
-			install_name_tool \
-				-id "${EPREFIX}"/usr/lib/${PN}/${lib} \
-				"${ED}"/usr/lib/${PN}/${lib}
-			eend $?
-		done
-		for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/${PN}/libLTO.dylib ; do
-			ebegin "fixing install_name reference to libLLVM-${PV}.dylib of ${f##*/}"
-			install_name_tool \
-				-change "${S}"/Release/lib/libLLVM-${PV}.dylib \
-					"${EPREFIX}"/usr/lib/${PN}/libLLVM-${PV}.dylib \
-				"${f}"
-			eend $?
-		done
-	fi
-}
diff --git a/sys-devel/llvm/llvm-2.8-r2.ebuild b/sys-devel/llvm/llvm-2.8-r2.ebuild
index 8286189cf8b3..d8c60e42ba86 100644
--- a/sys-devel/llvm/llvm-2.8-r2.ebuild
+++ b/sys-devel/llvm/llvm-2.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.8-r2.ebuild,v 1.5 2011/07/15 09:54:56 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.8-r2.ebuild,v 1.6 2011/10/03 13:36:01 voyageur Exp $
 
 EAPI="3"
 inherit eutils multilib toolchain-funcs
@@ -14,14 +14,12 @@ SRC_URI="http://llvm.org/releases/${PV}/${P}.tgz -> ${P}-r1.tgz"
 LICENSE="UoI-NCSA"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="alltargets debug +libffi llvm-gcc ocaml test udis86"
+IUSE="debug +libffi llvm-gcc multitarget ocaml test udis86"
 
 DEPEND="dev-lang/perl
 	>=sys-devel/make-3.79
 	>=sys-devel/flex-2.5.4
-	>=sys-devel/bison-1.28
-	!~sys-devel/bison-1.85
-	!~sys-devel/bison-1.875
+	>=sys-devel/bison-1.875d
 	|| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 )
 	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )
 	libffi? ( virtual/libffi )
@@ -102,7 +100,7 @@ src_configure() {
 			--disable-expensive-checks"
 	fi
 
-	if use alltargets; then
+	if use multitarget; then
 		CONF_FLAGS="${CONF_FLAGS} --enable-targets=all"
 	else
 		CONF_FLAGS="${CONF_FLAGS} --enable-targets=host-only"
diff --git a/sys-devel/llvm/llvm-2.8-r4.ebuild b/sys-devel/llvm/llvm-2.8-r4.ebuild
index 22e9e5e23a62..21e02dff7c48 100644
--- a/sys-devel/llvm/llvm-2.8-r4.ebuild
+++ b/sys-devel/llvm/llvm-2.8-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.8-r4.ebuild,v 1.1 2011/04/15 17:28:55 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.8-r4.ebuild,v 1.2 2011/10/03 13:36:01 voyageur Exp $
 
 EAPI="3"
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -14,14 +14,12 @@ SRC_URI="http://llvm.org/releases/${PV}/${P}.tgz -> ${P}-r1.tgz"
 LICENSE="UoI-NCSA"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="alltargets debug +libffi llvm-gcc ocaml test udis86 vim-syntax"
+IUSE="debug +libffi llvm-gcc multitarget ocaml test udis86 vim-syntax"
 
 DEPEND="dev-lang/perl
 	>=sys-devel/make-3.79
 	>=sys-devel/flex-2.5.4
-	>=sys-devel/bison-1.28
-	!~sys-devel/bison-1.85
-	!~sys-devel/bison-1.875
+	>=sys-devel/bison-1.875d
 	|| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 )
 	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )
 	libffi? ( dev-util/pkgconfig
@@ -97,7 +95,7 @@ src_configure() {
 		$(use_enable debug assertions)
 		$(use_enable debug expensive-checks)"
 
-	if use alltargets; then
+	if use multitarget; then
 		CONF_FLAGS="${CONF_FLAGS} --enable-targets=all"
 	else
 		CONF_FLAGS="${CONF_FLAGS} --enable-targets=host-only"
diff --git a/sys-devel/llvm/llvm-2.9-r1.ebuild b/sys-devel/llvm/llvm-2.9-r1.ebuild
deleted file mode 100644
index 018eb7dddd2a..000000000000
--- a/sys-devel/llvm/llvm-2.9-r1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.9-r1.ebuild,v 1.3 2011/04/21 09:24:25 grobian Exp $
-
-EAPI="3"
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="http://llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${P}.tgz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="alltargets debug +libffi llvm-gcc ocaml test udis86 vim-syntax"
-
-DEPEND="dev-lang/perl
-	>=sys-devel/make-3.79
-	>=sys-devel/flex-2.5.4
-	>=sys-devel/bison-1.28
-	!~sys-devel/bison-1.85
-	!~sys-devel/bison-1.875
-	|| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 )
-	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )
-	libffi? ( dev-util/pkgconfig
-		virtual/libffi )
-	ocaml? ( dev-lang/ocaml )
-	udis86? ( amd64? ( dev-libs/udis86[pic] )
-		!amd64? ( dev-libs/udis86 ) )"
-RDEPEND="dev-lang/perl
-	libffi? ( virtual/libffi )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-S=${WORKDIR}/${PN}-${PV/_pre*}
-
-pkg_setup() {
-	# need to check if the active compiler is ok
-
-	broken_gcc=" 3.2.2 3.2.3 3.3.2 4.1.1 "
-	broken_gcc_x86=" 3.4.0 3.4.2 "
-	broken_gcc_amd64=" 3.4.6 "
-
-	gcc_vers=$(gcc-fullversion)
-
-	if [[ ${broken_gcc} == *" ${version} "* ]] ; then
-		elog "Your version of gcc is known to miscompile llvm."
-		elog "Check http://www.llvm.org/docs/GettingStarted.html for"
-		elog "possible solutions."
-		die "Your currently active version of gcc is known to miscompile llvm"
-	fi
-
-	if [[ ${CHOST} == i*86-* && ${broken_gcc_x86} == *" ${version} "* ]] ; then
-		elog "Your version of gcc is known to miscompile llvm on x86"
-		elog "architectures.  Check"
-		elog "http://www.llvm.org/docs/GettingStarted.html for possible"
-		elog "solutions."
-		die "Your currently active version of gcc is known to miscompile llvm"
-	fi
-
-	if [[ ${CHOST} == x86_64-* && ${broken_gcc_amd64} == *" ${version} "* ]];
-	then
-		 elog "Your version of gcc is known to miscompile llvm in amd64"
-		 elog "architectures.  Check"
-		 elog "http://www.llvm.org/docs/GettingStarted.html for possible"
-		 elog "solutions."
-		die "Your currently active version of gcc is known to miscompile llvm"
-	 fi
-}
-
-src_prepare() {
-	# unfortunately ./configure won't listen to --mandir and the-like, so take
-	# care of this.
-	einfo "Fixing install dirs"
-	sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \
-		-e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \
-		-e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/${PN}, \
-		-i Makefile.config.in || die "Makefile.config sed failed"
-	sed -e 's,$ABS_RUN_DIR/lib,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
-		-i tools/llvm-config/llvm-config.in.in || die "llvm-config sed failed"
-
-	einfo "Fixing rpath"
-	sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
-		-i Makefile.rules || die "rpath sed failed"
-
-	epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch
-	epatch "${FILESDIR}"/${PN}-2.9-nodoctargz.patch
-}
-
-src_configure() {
-	local CONF_FLAGS="--enable-shared
-		$(use_enable !debug optimized)
-		$(use_enable debug assertions)
-		$(use_enable debug expensive-checks)"
-
-	if use alltargets; then
-		CONF_FLAGS="${CONF_FLAGS} --enable-targets=all"
-	else
-		CONF_FLAGS="${CONF_FLAGS} --enable-targets=host-only"
-	fi
-
-	if use amd64; then
-		CONF_FLAGS="${CONF_FLAGS} --enable-pic"
-	fi
-
-	# things would be built differently depending on whether llvm-gcc is
-	# used or not.
-	local LLVM_GCC_DIR=/dev/null
-	local LLVM_GCC_DRIVER=nope ; local LLVM_GPP_DRIVER=nope
-	if use llvm-gcc ; then
-		if has_version sys-devel/llvm-gcc; then
-			LLVM_GCC_DIR=$(ls -d ${EROOT}/usr/$(get_libdir)/llvm-gcc* 2> /dev/null)
-			LLVM_GCC_DRIVER=$(find ${LLVM_GCC_DIR} -name 'llvm*-gcc' 2> /dev/null)
-			if [[ -z ${LLVM_GCC_DRIVER} ]] ; then
-				die "failed to find installed llvm-gcc, LLVM_GCC_DIR=${LLVM_GCC_DIR}"
-			fi
-			einfo "Using $LLVM_GCC_DRIVER"
-			LLVM_GPP_DRIVER=${LLVM_GCC_DRIVER/%-gcc/-g++}
-		else
-			eerror "llvm-gcc USE flag enabled, but sys-devel/llvm-gcc was not found"
-			eerror "Building with standard gcc, re-merge this package after installing"
-			eerror "llvm-gcc to build with it"
-			eerror "This is normal behavior on first LLVM merge"
-		fi
-	fi
-
-	CONF_FLAGS="${CONF_FLAGS} \
-		--with-llvmgccdir=${LLVM_GCC_DIR} \
-		--with-llvmgcc=${LLVM_GCC_DRIVER} \
-		--with-llvmgxx=${LLVM_GPP_DRIVER}"
-
-	if use ocaml; then
-		CONF_FLAGS="${CONF_FLAGS} --enable-bindings=ocaml"
-	else
-		CONF_FLAGS="${CONF_FLAGS} --enable-bindings=none"
-	fi
-
-	if use udis86; then
-		CONF_FLAGS="${CONF_FLAGS} --with-udis86"
-	fi
-
-	if use libffi; then
-		append-cppflags "$(pkg-config --cflags libffi)"
-	fi
-	CONF_FLAGS="${CONF_FLAGS} $(use_enable libffi)"
-	econf ${CONF_FLAGS} || die "econf failed"
-}
-
-src_compile() {
-	emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 || die "emake failed"
-}
-
-src_install() {
-	emake KEEP_SYMBOLS=1 DESTDIR="${D}" install || die "install failed"
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins utils/vim/*.vim
-	fi
-
-	# Fix install_names on Darwin.  The build system is too complicated
-	# to just fix this, so we correct it post-install
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		for lib in lib{EnhancedDisassembly,LLVM-${PV},LTO}.dylib {BugpointPasses,LLVMHello,profile_rt}.dylib ; do
-			# libEnhancedDisassembly is Darwin10 only, so non-fatal
-			[[ -f ${ED}/usr/lib/${PN}/${lib} ]] || continue
-			ebegin "fixing install_name of $lib"
-			install_name_tool \
-				-id "${EPREFIX}"/usr/lib/${PN}/${lib} \
-				"${ED}"/usr/lib/${PN}/${lib}
-			eend $?
-		done
-		for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/${PN}/libLTO.dylib ; do
-			ebegin "fixing install_name reference to libLLVM-${PV}.dylib of ${f##*/}"
-			install_name_tool \
-				-change "@executable_path/../lib/libLLVM-${PV}.dylib" \
-					"${EPREFIX}"/usr/lib/${PN}/libLLVM-${PV}.dylib \
-				"${f}"
-			eend $?
-		done
-	fi
-}
diff --git a/sys-devel/llvm/llvm-2.9-r2.ebuild b/sys-devel/llvm/llvm-2.9-r2.ebuild
index b2837b3d4b5b..27543d5cd22b 100644
--- a/sys-devel/llvm/llvm-2.9-r2.ebuild
+++ b/sys-devel/llvm/llvm-2.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.9-r2.ebuild,v 1.1 2011/05/23 11:43:47 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.9-r2.ebuild,v 1.2 2011/10/03 13:36:01 voyageur Exp $
 
 EAPI="3"
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -12,14 +12,12 @@ SRC_URI="http://llvm.org/releases/${PV}/${P}.tgz"
 LICENSE="UoI-NCSA"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="alltargets debug +libffi llvm-gcc ocaml test udis86 vim-syntax"
+IUSE="debug +libffi llvm-gcc multitarget ocaml test udis86 vim-syntax"
 
 DEPEND="dev-lang/perl
 	>=sys-devel/make-3.79
 	>=sys-devel/flex-2.5.4
-	>=sys-devel/bison-1.28
-	!~sys-devel/bison-1.85
-	!~sys-devel/bison-1.875
+	>=sys-devel/bison-1.875d
 	|| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 )
 	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )
 	libffi? ( dev-util/pkgconfig
@@ -95,7 +93,7 @@ src_configure() {
 		$(use_enable debug assertions)
 		$(use_enable debug expensive-checks)"
 
-	if use alltargets; then
+	if use multitarget; then
 		CONF_FLAGS="${CONF_FLAGS} --enable-targets=all"
 	else
 		CONF_FLAGS="${CONF_FLAGS} --enable-targets=host-only"
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index fa2e230c5eb3..34232e6de259 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.13 2011/06/06 19:34:32 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.14 2011/10/03 13:36:01 voyageur Exp $
 
 EAPI="3"
 inherit subversion eutils flag-o-matic multilib toolchain-funcs
@@ -13,14 +13,12 @@ ESVN_REPO_URI="http://llvm.org/svn/llvm-project/llvm/trunk"
 LICENSE="UoI-NCSA"
 SLOT="0"
 KEYWORDS=""
-IUSE="alltargets debug +libffi llvm-gcc ocaml test udis86 vim-syntax"
+IUSE="debug +libffi llvm-gcc multitarget ocaml test udis86 vim-syntax"
 
 DEPEND="dev-lang/perl
 	>=sys-devel/make-3.79
 	>=sys-devel/flex-2.5.4
-	>=sys-devel/bison-1.28
-	!~sys-devel/bison-1.85
-	!~sys-devel/bison-1.875
+	>=sys-devel/bison-1.875d
 	|| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 )
 	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )
 	libffi? ( dev-util/pkgconfig
@@ -93,7 +91,7 @@ src_configure() {
 		$(use_enable debug assertions)
 		$(use_enable debug expensive-checks)"
 
-	if use alltargets; then
+	if use multitarget; then
 		CONF_FLAGS="${CONF_FLAGS} --enable-targets=all"
 	else
 		CONF_FLAGS="${CONF_FLAGS} --enable-targets=host-only"
diff --git a/sys-devel/llvm/metadata.xml b/sys-devel/llvm/metadata.xml
index 994d006656f3..d1e724f140cc 100644
--- a/sys-devel/llvm/metadata.xml
+++ b/sys-devel/llvm/metadata.xml
@@ -11,8 +11,8 @@
    3. A compiler infrastructure - LLVM is also a collection of source code that implements the language and compilation strategy. The primary components of the LLVM infrastructure are a GCC-based C and C++ front-end, a link-time optimization framework with a growing set of global and interprocedural analyses and transformations, static back-ends for many popular (and some obscure) architectures, a back-end which emits portable C code, and a Just-In-Time compilers for several architectures.
    4. LLVM does not imply things that you would expect from a high-level virtual machine. It does not require garbage collection or run-time code generation (In fact, LLVM makes a great static compiler!). Note that optional LLVM components can be used to build high-level virtual machines and other systems that need these services.</longdescription>
 	<use>
-		<flag name='alltargets'>Build all host targets (default: host only)</flag>
 		<flag name='llvm-gcc'>Build LLVM with <pkg>sys-devel/llvm-gcc</pkg></flag>
+		<flag name='multitarget'>Build all host targets (default: host only)</flag>
 		<flag name='udis86'>Enable support for <pkg>dev-libs/udis86</pkg> disassembler library</flag>
 	</use>
 </pkgmetadata>