Update udis86 dep now that pic USE-flag is going away, bump EAPI in old packages when needed for the dep, bug #449812. Also clean ~arch 3.1 packages and update live ebuild EAPI

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

10 files changed, 41 insertions, 412 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 2b184647f7c9..6ad199dd39f4 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/llvm
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.102 2012/12/21 09:18:12 voyageur Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.103 2013/01/03 23:29:51 voyageur Exp $
+
+  03 Jan 2013; Bernard Cafarelli <voyageur@gentoo.org> llvm-2.8-r2.ebuild,
+  llvm-2.9-r2.ebuild, llvm-3.0-r2.ebuild, -llvm-3.1.ebuild,
+  -llvm-3.1-r1.ebuild, llvm-3.1-r2.ebuild, llvm-3.2.ebuild, llvm-9999.ebuild:
+  Update udis86 dep now that pic USE-flag is going away, bump EAPI in old
+  packages when needed for the dep, bug #449812. Also clean ~arch 3.1 packages
+  and update live ebuild EAPI
 
 *llvm-3.2 (21 Dec 2012)
 
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index f16107af7f16..6c070e1d9462 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -24,20 +24,18 @@ DIST llvm-2.9.tgz 9574781 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd9
 DIST llvm-3.0.tar.gz 10350539 SHA256 519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477 SHA512 602bb5590b70cb9138bc19d8c630c62bbabdcb2132215c921fe4bce4e3f74dfc66440b9dcd458ff55a86047cc9cc0417c6563715c133e0db222e4b88f07c13bb WHIRLPOOL 6f4ece3ec747352cd78b08d25c5b1cda91140eb6957d509161e45395e47c074f8d2102bfcaeabcdef8c1f6672f2cf06d88e290667666122da029391b3528d440
 DIST llvm-3.1.src.tar.gz 11077429 SHA256 1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab SHA512 fb941094601043e405ccc57473414ef92437b09c200e71614f93d8e93b2a58cca8d78c385be037e064b0711cd6268802c774ce4a40fc0ea17bf576305304d2aa WHIRLPOOL c5c72e139296e1c186131f991010f52f958063a4fcfcb1f8527b53a2aaa7edcaca70ab6cf86c25d08640dcf6d720a865fda7dc7eb06cf1ce9c23fd37b5d597ef
 DIST llvm-3.2.src.tar.gz 12275252 SHA256 125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343 SHA512 cc66171322dbbe40bcac0e0ea5b09df8ff52df63ded304f841f32f702270d6ab1512216413ee52498c3ebee8cd39c4cd23e3855d591944bc2ac0ae76f5be62cc WHIRLPOOL c3a39b2426293d0251b7769607ade873bb6bf8d54e7c8055773a9b75742bc8e39049fb71409a258c6f3d98775b78c280d4bfe4223ba91e5ed6ecae0eddf910e5
-EBUILD llvm-2.8-r2.ebuild 6222 SHA256 4e9fc704a4aa3b1a8e07bf9807f1f3fbdc429d1ab075edf025dd6b96e003d852 SHA512 37236bce567ded3e55854520b341140e9da62b48dc52dda57b78727eacbea387c1f74bb3d890f34f21d381d2b94f185903128cc10199b7dc432d76994322bb14 WHIRLPOOL b8dc0c1f4952a56ab5bc774fc5c996df88c2dd92d96d60a997c4c17f54bf4798e3abd60fc0d9e9c9e4400d8f44941a792e424592f2d32cada2635a86d4a56bf3
-EBUILD llvm-2.9-r2.ebuild 6388 SHA256 2b74124e4ab37531667667d4ea29671377efd3b3725d4a29d427a90cf905ab2c SHA512 a2929e999475c91aca40871be7d9755a77c6a278ee0d3d9fac96fbef11733b9de57a6d5167a12fc8d088eb6665912f69cc21c0d70a0b64be6e3e5682f2971701 WHIRLPOOL 3c14ae92b72d72c88b20ea4279c6d746737519775617d28d4c0c8a2deed9fb8d927bbee3b67f6268fdd0332f75494c187f2ba851f77f6560314c692f21d2e2b8
-EBUILD llvm-3.0-r2.ebuild 5806 SHA256 18e03c4f4c814b73d059de78d219c587d94326f20d59b4ea98ac6ab7093c7c0d SHA512 5d57e0378c1a3807ca0b46c4a781116abb22878e1adb45a073971315b817ac42da9337b368078ca92dc07265aba141867cedb347feb3ca179180ebd8012bcf28 WHIRLPOOL 2e6b2f4544def559986c40ac1e2760414feb5a51dec0d76f12578463b99b095892c81f449624fa7b6a4bca428ee84f44b8c0cb8cd3c6646c6e4015c9e6cbeeb7
-EBUILD llvm-3.1-r1.ebuild 5903 SHA256 052898bb07188074d3423acb1ce9991fda2de6f036cb1dd46ede1864c1d58d88 SHA512 304c60f65749f9982315bc69e3626dfcf701967609ee6776d26b90c4ea535ed25d1fe7d3f0b5e08e3741817c3685db832426448a8340ddb3bf17eab587869969 WHIRLPOOL 4763950f83b83ff1879af50673a2b0301ce388f96b77312990317561f29ba14f50b7f9a304394c25e5f10795eef4560a5bbab9b770e23b4e55bcc736a8600ef1
-EBUILD llvm-3.1-r2.ebuild 6069 SHA256 6fcb7e06de1b9112a4448bbaffa74010916e55d2df2af15d4900785cbb6f6817 SHA512 4425cc9fa2bdaaaebad889d2bf30d9d16328d805f9b84b22154deb0635e1086472acfd8a7a211b61eba39591e3436dac6587e24c8d0583cdbc2a57ddbcea984f WHIRLPOOL afe0826c87367fca7d974ed885c95982d55362b2f26ab4ae562721f2cb4ace95de2548e10d371bc5026ef4c918836621780f3426c98a26c6850a4e908c9c9826
-EBUILD llvm-3.1.ebuild 5770 SHA256 ba4c4ce590bbfd2a2f05c35d862bec64bac78d1a9fedb53e821883d0d7642967 SHA512 f51271aab684bc66bdf35b0d42fff0f0314c452dcee0d8996fa389c0658df2f1a68d35b080923731a10af88839c6b2d0737f0020767f4cdaea545c3cbdd86e24 WHIRLPOOL 49a25c3554ab5d60d98166856eeed60f06051783607caa27ed352f0f2a0eb5a93f7038f7a877efce981fd4157f821318bb3255a752b6ef9525709dcfaf8f8349
-EBUILD llvm-3.2.ebuild 6211 SHA256 8f272da9c1c31c0788ab76fb92063e6d4c82fef6978abb1c37caadc6f795a0ed SHA512 0e0bc5238fdd5f72c1a3d16c459b37f5a9c4514eaef219aac34f79bf4886810e3afa5b6ddb1ee91d60aec28187dcd47f88bd7b7ad7e719a9fc1e05512d39e331 WHIRLPOOL 6e0c0b0e140d856d2aff0e78884fe26a32fca56af932d27290833fae9d7219990a36abb6f459f6af552f243b86b8465165cf26d2fc8782c67774fd3edbfd3a1f
-EBUILD llvm-9999.ebuild 5990 SHA256 2183e98dad05d1085968ef956ea21c57938dd05d074725b3d9724715172a7f93 SHA512 a09a691036812ecde865de59f2d16186d792c92ba7309adf1e7d16620f19d8df34973bbfaaf62c33263e8a04406410e17f70f1b7221b6a89dfc0a3c89f340dd1 WHIRLPOOL 029c6645df0e83ddc087091daa1fafddf878611df5b49cf5d01b54d847e0c216fac585054175c308d4ab72381a1143ad50ec3c2d29e72af3f0291d7da0b26292
-MISC ChangeLog 16499 SHA256 6150f5a12cdfaadaec9e3f1f6e7d9d3f512ce5e1a3a6bb7a49793ec4f0ef9090 SHA512 ae051af00daec650065a936b68670b7c7e13199e5a1df643ba02c413d4bf8010a575b39630ffcef11ab06c8d8f6d9be037a234c082497e6a3a7e3b7a0ddbb417 WHIRLPOOL 82c217654017300be6d5d7fd69383c6512c2d7ee57a9f74ad0ee4841ce415b3d5ed31c29ac5f470039d5b1af45db46c67d3e43abf22bf2134dd4f06d94667007
+EBUILD llvm-2.8-r2.ebuild 6185 SHA256 36149148c4abaeda3a1dce91e74149e2843eb2b2a761792e9da55badb33d2251 SHA512 a87364380901fb752d74fa9c9420912eccf0c85e020f2d8eb88eb647d58eb2766efdc6970ab7c7a4cf8fbd7a3e2ea86f3ea42d93841a3413ad718b4b6ad4d490 WHIRLPOOL 9a0dd101b466fa8339b3dd9eef01b2551bf8a4f33f4098c42bff3f09084757b856bebf2f062d07eeae99bcdb402cd842b5292b5a44fa1b3f40badae1a15bc51a
+EBUILD llvm-2.9-r2.ebuild 6350 SHA256 3698f309f1251961a3a285fe18a140f636f20b3afbb19a8ce8d1a18baee34298 SHA512 a0cc3c13e5ea41abcca7afc4d1b10dd66f3df7c79105bcf2a56a1d219ed044073478974788cb57a7ec72d2763eadf3740e57586c3f65de8e2d4f4234b0e9aab4 WHIRLPOOL 3fd49852d0af405c42cd82a97f3a15db357aecef051b9259a3919aa02ccd39ec372fd9607179b096b774fe7d46ee766df120784f9fcf05a8742d94f2372c658b
+EBUILD llvm-3.0-r2.ebuild 5767 SHA256 62fca1169c63516f29102a3a1bb4ea74408dfd151d97a9edbfb165a2def317c3 SHA512 f7ee2bbf8b31d86c11ab07f530278e3240ec21f3c58144a9e627aef3c1fb7690935786f33368a6f56062b5daf501adebfc164fd6712985a91076897b89cdd85f WHIRLPOOL be1a6edd697e2504df033705c2cb8e37f6c17a13d77558d231172c00f91ec247785469b6e1265e25c42eb3f6f394614cf516e0e422cb54094d9ba25669c8406c
+EBUILD llvm-3.1-r2.ebuild 6033 SHA256 9b9a587d30419fa646764a96e12fc6272f73f7246138c76ba577f0d6ab3afe59 SHA512 8b969084210af4203c029bb33d5b984e0b17f6770fd489dad818154ac9f6a87bfad069eff71776f678d9eb5d5136af472d3008d5bc73fab9dc1f36811af906c4 WHIRLPOOL 928459551d7cf6e8d18244026ba82cc3dbaf2b65bd6eac8adb617695c95535ba65bd013909730d5922de5764e9d6c6c4cf007aa6acd0b493826aa938d0389a5d
+EBUILD llvm-3.2.ebuild 6173 SHA256 e5e77b93a2103c00fcccd4a13ee49b4964dc63e35e6eea9d933c3ee299eea766 SHA512 6975cbfc45b690cc5f13499a4a761b0e592687f2b669d284c15afd53714bdaded978782ba0b30e6698aea4a603b74213f26ae1ee47d1cd90ce372e2e7050078e WHIRLPOOL 571e5bcd2c929b8b99019b2baf1e5a74d73a8557c964362aae66e442d7c53973871b30981d093505de58c102a9cea86b45109d42a61c1d4e8b846d4e2f222b8b
+EBUILD llvm-9999.ebuild 5950 SHA256 9013ead52ddb95955f9e7911c4dc4f1b6b0c0f02fea77acd5303da41b7dd5d9a SHA512 95a41b70398bb05f340f563cda7a82234d30cba5d7ca962ded1ba8e8be21ee129ca5ca7a387e797f4beab1d26f33c7307e47b435050e8693ee23436604c7c5e8 WHIRLPOOL 6cd83f1cd97b47ffb1b6ef863d2b02a7275937c9e481967ac456abe1b948a26215eb8738835bcd22c7e6824120558644ca6daadb45e18d8aeaf5e7f55db37a68
+MISC ChangeLog 16896 SHA256 f77567fb79ca84dfbdb75e3fac546533fbfb3d866afd9dd0143dd645ac9d3c1b SHA512 2e6585fa4ae156bce02aa10fea47e6c24cc7094057ed0e82f2cf05b0a8f28336861b4eb9919b271184d879f2c23ddf53c023215e85f633cec48c97764944bfc0 WHIRLPOOL 84467d57da633dc3f60d295b2121b59d544c6e588ac6d7de50ba27cccdffc947314ee1ba067741e2e34d2d0c6e6e40231f37fc6aaeb997722c08804ed4efc32b
 MISC metadata.xml 2384 SHA256 c0f936ccdd15b17a06d712f1d7a58ff0fec818ee618279778fbc37abd50f76d6 SHA512 c51f223cac8c190251ae90403c7e86df616b1a9258d1fee349d044dc175eb0a0ea78fd42bf7ab036e0189434311a286399487aa28a4cb867a3f94fd1c4f27f3b WHIRLPOOL b33d5a0b2e856f24ac584ab141f075ce132ea1df3292548833c3fd23c2ca7c5f1ce82434edd8e8c97295d5d1963a2bf9cf212ed0f00a47f295b2fbe74d7f4294
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDUKVsACgkQFYEBGcdFJfKPVwD/XetuQvgbffk4nKQp6+6OvyYe
-MlGIhJPMrdnIrFVmRW0BAIRng9G2TyXDyBZtrQmYJ+nCJQgqmhU3G20ueyS28JJH
-=8DFB
+iF4EAREIAAYFAlDmFI8ACgkQFYEBGcdFJfJJ6QD/YwDB88sTaIc8ezKIhNPfAWq0
+2ZGGcNzKfxyn2wQW+2oBAIEsDcZtkIi4o9RslmOTrARNTuWtIp92vq40MFu/JP2M
+=Bq3p
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-2.8-r2.ebuild b/sys-devel/llvm/llvm-2.8-r2.ebuild
index 100bb598ff8b..5d56e499ae4b 100644
--- a/sys-devel/llvm/llvm-2.8-r2.ebuild
+++ b/sys-devel/llvm/llvm-2.8-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 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.8 2011/11/24 08:56:51 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.8-r2.ebuild,v 1.9 2013/01/03 23:29:51 voyageur Exp $
 
-EAPI="3"
+EAPI="4"
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="Low Level Virtual Machine"
@@ -24,8 +24,7 @@ DEPEND="dev-lang/perl
 	|| ( >=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 ) )"
+	udis86? ( dev-libs/udis86[pic(+)] )"
 RDEPEND="dev-lang/perl"
 
 S=${WORKDIR}/${PN}-${PV/_pre*}
diff --git a/sys-devel/llvm/llvm-2.9-r2.ebuild b/sys-devel/llvm/llvm-2.9-r2.ebuild
index 0d36e633cd9a..015d92235161 100644
--- a/sys-devel/llvm/llvm-2.9-r2.ebuild
+++ b/sys-devel/llvm/llvm-2.9-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.10 2012/11/30 16:07:29 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.9-r2.ebuild,v 1.11 2013/01/03 23:29:51 voyageur Exp $
 
-EAPI="3"
+EAPI="4"
 inherit eutils flag-o-matic multilib toolchain-funcs pax-utils
 
 DESCRIPTION="Low Level Virtual Machine"
@@ -23,8 +23,7 @@ DEPEND="dev-lang/perl
 	libffi? ( virtual/pkgconfig
 		virtual/libffi )
 	ocaml? ( dev-lang/ocaml )
-	udis86? ( amd64? ( dev-libs/udis86[pic] )
-		!amd64? ( dev-libs/udis86 ) )"
+	udis86? ( dev-libs/udis86[pic(+)] )"
 RDEPEND="dev-lang/perl
 	libffi? ( virtual/libffi )
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
diff --git a/sys-devel/llvm/llvm-3.0-r2.ebuild b/sys-devel/llvm/llvm-3.0-r2.ebuild
index 279333412d28..c11cae8361ce 100644
--- a/sys-devel/llvm/llvm-3.0-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.0-r2.ebuild,v 1.8 2012/09/24 11:43:29 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.0-r2.ebuild,v 1.9 2013/01/03 23:29:51 voyageur Exp $
 
-EAPI="3"
+EAPI="4"
 PYTHON_DEPEND="2"
 inherit eutils flag-o-matic multilib toolchain-funcs python pax-utils
 
@@ -25,8 +25,7 @@ DEPEND="dev-lang/perl
 	libffi? ( virtual/pkgconfig
 		virtual/libffi )
 	ocaml? ( dev-lang/ocaml )
-	udis86? ( amd64? ( dev-libs/udis86[pic] )
-		!amd64? ( dev-libs/udis86 ) )"
+	udis86? ( dev-libs/udis86[pic(+)] )"
 RDEPEND="dev-lang/perl
 	libffi? ( virtual/libffi )
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
diff --git a/sys-devel/llvm/llvm-3.1-r1.ebuild b/sys-devel/llvm/llvm-3.1-r1.ebuild
deleted file mode 100644
index ca0755b702cb..000000000000
--- a/sys-devel/llvm/llvm-3.1-r1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.1-r1.ebuild,v 1.3 2012/07/27 18:20:47 mgorny Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-inherit eutils flag-o-matic multilib toolchain-funcs python pax-utils
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="http://llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug gold +libffi 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.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 )
-	gold? ( >=sys-devel/binutils-2.22[cxx] )
-	libffi? ( virtual/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}/${P}.src
-
-pkg_setup() {
-	# Required for test and build
-	python_set_active_version 2
-	python_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 "/ActiveLibDir = ActivePrefix/s/lib/$(get_libdir)\/${PN}/" \
-		-i tools/llvm-config/llvm-config.cpp || die "llvm-config sed failed"
-
-	einfo "Fixing rpath and CFLAGS"
-	sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
-		-e '/OmitFramePointer/s/-fomit-frame-pointer//' \
-		-i Makefile.rules || die "rpath sed failed"
-	if use gold; then
-		sed -e 's,\$(SharedLibDir),'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
-			-i tools/gold/Makefile || die "gold rpath sed failed"
-	fi
-
-	# Specify python version
-	python_convert_shebangs -r 2 test/Scripts
-
-	epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch
-	epatch "${FILESDIR}"/${PN}-2.9-nodoctargz.patch
-	epatch "${FILESDIR}"/${PN}-3.0-PPC_macro.patch
-	epatch "${FILESDIR}"/${P}-ivybridge_support.patch
-	epatch "${FILESDIR}"/${P}-fix_debug_line_info.patch
-
-	# User patches
-	epatch_user
-}
-
-src_configure() {
-	local CONF_FLAGS="--enable-shared
-		--with-optimize-option=
-		$(use_enable !debug optimized)
-		$(use_enable debug assertions)
-		$(use_enable debug expensive-checks)"
-
-	if use multitarget; then
-		CONF_FLAGS="${CONF_FLAGS} --enable-targets=all"
-	else
-		CONF_FLAGS="${CONF_FLAGS} --enable-targets=host,cpp"
-	fi
-
-	if use amd64; then
-		CONF_FLAGS="${CONF_FLAGS} --enable-pic"
-	fi
-
-	if use gold; then
-		CONF_FLAGS="${CONF_FLAGS} --with-binutils-include=${EPREFIX}/usr/include/"
-	fi
-	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)"
-
-	# llvm prefers clang over gcc, so we may need to force that
-	tc-export CC CXX
-	econf ${CONF_FLAGS}
-}
-
-src_compile() {
-	emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1
-
-	pax-mark m Release/bin/lli
-	if use test; then
-		pax-mark m unittests/ExecutionEngine/JIT/Release/JITTests
-	fi
-}
-
-src_install() {
-	emake KEEP_SYMBOLS=1 DESTDIR="${D}" install
-
-	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
-	local lib= f= odylib=
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		for lib in lib{EnhancedDisassembly,LLVM-${PV},LTO,profile_rt}.dylib {BugpointPasses,LLVMHello}.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
-			odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${PV}.dylib)
-			ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
-			install_name_tool \
-				-change "${odylib}" \
-					"${EPREFIX}"/usr/lib/${PN}/libLLVM-${PV}.dylib \
-				"${f}"
-			eend $?
-		done
-	fi
-}
diff --git a/sys-devel/llvm/llvm-3.1-r2.ebuild b/sys-devel/llvm/llvm-3.1-r2.ebuild
index 86f547e011fb..f70b29e7d842 100644
--- a/sys-devel/llvm/llvm-3.1-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.1-r2.ebuild,v 1.8 2012/12/17 19:53:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.1-r2.ebuild,v 1.9 2013/01/03 23:29:51 voyageur Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -25,8 +25,7 @@ DEPEND="dev-lang/perl
 	libffi? ( virtual/pkgconfig
 		virtual/libffi )
 	ocaml? ( dev-lang/ocaml )
-	udis86? ( amd64? ( dev-libs/udis86[pic] )
-		!amd64? ( dev-libs/udis86 ) )"
+	udis86? ( dev-libs/udis86[pic(+)] )"
 RDEPEND="dev-lang/perl
 	libffi? ( virtual/libffi )
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
diff --git a/sys-devel/llvm/llvm-3.1.ebuild b/sys-devel/llvm/llvm-3.1.ebuild
deleted file mode 100644
index dc82e57095ba..000000000000
--- a/sys-devel/llvm/llvm-3.1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.1.ebuild,v 1.7 2012/07/03 14:32:17 voyageur Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-inherit eutils flag-o-matic multilib toolchain-funcs python pax-utils
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="http://llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug gold +libffi 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.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 )
-	gold? ( >=sys-devel/binutils-2.22[cxx] )
-	libffi? ( virtual/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}/${P}.src
-
-pkg_setup() {
-	# Required for test and build
-	python_set_active_version 2
-	python_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 "/ActiveLibDir = ActivePrefix/s/lib/$(get_libdir)\/${PN}/" \
-		-i tools/llvm-config/llvm-config.cpp || die "llvm-config sed failed"
-
-	einfo "Fixing rpath and CFLAGS"
-	sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
-		-e '/OmitFramePointer/s/-fomit-frame-pointer//' \
-		-i Makefile.rules || die "rpath sed failed"
-	if use gold; then
-		sed -e 's,\$(SharedLibDir),'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
-			-i tools/gold/Makefile || die "gold rpath sed failed"
-	fi
-
-	# Specify python version
-	python_convert_shebangs -r 2 test/Scripts
-
-	epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch
-	epatch "${FILESDIR}"/${PN}-2.9-nodoctargz.patch
-	epatch "${FILESDIR}"/${PN}-3.0-PPC_macro.patch
-	epatch "${FILESDIR}"/${P}-ivybridge_support.patch
-
-	# User patches
-	epatch_user
-}
-
-src_configure() {
-	local CONF_FLAGS="--enable-shared
-		--with-optimize-option=
-		$(use_enable !debug optimized)
-		$(use_enable debug assertions)
-		$(use_enable debug expensive-checks)"
-
-	if use multitarget; 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
-
-	if use gold; then
-		CONF_FLAGS="${CONF_FLAGS} --with-binutils-include=${EPREFIX}/usr/include/"
-	fi
-	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}
-}
-
-src_compile() {
-	emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1
-
-	pax-mark m Release/bin/lli
-	if use test; then
-		pax-mark m unittests/ExecutionEngine/JIT/Release/JITTests
-	fi
-}
-
-src_install() {
-	emake KEEP_SYMBOLS=1 DESTDIR="${D}" install
-
-	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
-	local lib= f= odylib=
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		for lib in lib{EnhancedDisassembly,LLVM-${PV},LTO,profile_rt}.dylib {BugpointPasses,LLVMHello}.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
-			odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${PV}.dylib)
-			ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
-			install_name_tool \
-				-change "${odylib}" \
-					"${EPREFIX}"/usr/lib/${PN}/libLLVM-${PV}.dylib \
-				"${f}"
-			eend $?
-		done
-	fi
-}
diff --git a/sys-devel/llvm/llvm-3.2.ebuild b/sys-devel/llvm/llvm-3.2.ebuild
index 52e50ce31228..9515bf11419e 100644
--- a/sys-devel/llvm/llvm-3.2.ebuild
+++ b/sys-devel/llvm/llvm-3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.2.ebuild,v 1.1 2012/12/21 09:18:12 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.2.ebuild,v 1.2 2013/01/03 23:29:51 voyageur Exp $
 
 EAPI=5
 PYTHON_DEPEND="2"
@@ -26,8 +26,7 @@ DEPEND="dev-lang/perl
 	libffi? ( virtual/pkgconfig
 		virtual/libffi )
 	ocaml? ( dev-lang/ocaml )
-	udis86? ( amd64? ( dev-libs/udis86[pic] )
-		!amd64? ( dev-libs/udis86 ) )"
+	udis86? ( dev-libs/udis86[pic(+)] )"
 RDEPEND="dev-lang/perl
 	libffi? ( virtual/libffi )
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index e0ed2f63da8a..a93f2486e6b5 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.36 2012/12/14 10:33:32 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.37 2013/01/03 23:29:51 voyageur Exp $
 
-EAPI="4"
+EAPI=5
 PYTHON_DEPEND="2"
 inherit subversion eutils flag-o-matic multilib toolchain-funcs python pax-utils
 
@@ -27,8 +27,7 @@ DEPEND="dev-lang/perl
 	libffi? ( virtual/pkgconfig
 		virtual/libffi )
 	ocaml? ( dev-lang/ocaml )
-	udis86? ( amd64? ( dev-libs/udis86[pic] )
-		!amd64? ( dev-libs/udis86 ) )"
+	udis86? ( dev-libs/udis86[pic(+)] )"
 RDEPEND="dev-lang/perl
 	libffi? ( virtual/libffi )
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"