Re-apply the install phase fixes for multilib-portage (bug #506398) and /tmp ownership (bug #506472). For now, just the live ebuild.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 32 insertions, 34 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 145972df3b24..d54a5897a2d1 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.186 2014/04/07 20:59:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.187 2014/04/10 17:03:23 mgorny Exp $
+
+  10 Apr 2014; Michał Górny <mgorny@gentoo.org> llvm-9999.ebuild:
+  Re-apply the install phase fixes for multilib-portage (bug #506398) and /tmp
+  ownership (bug #506472). For now, just the live ebuild.
 
   07 Apr 2014; Michał Górny <mgorny@gentoo.org> llvm-9999.ebuild:
   Update PYTHON_COMPAT in the live ebuild.
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index d89d8919c1f6..81f861669b73 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -57,25 +57,25 @@ EBUILD llvm-3.3-r3.ebuild 14223 SHA256 41dd967a26ec4b6a8b0b230ee62b25d8b8e1447d4
 EBUILD llvm-3.3.ebuild 6798 SHA256 4e53042e76ce97e6a460cda74c5dbadc1cee9009345e8f0232e28d53c8f77579 SHA512 5513887c3b5a25a678713b68c216a40801ddecbf5a4dc58d7ad01c1ec8411589e20d8662c34f117e6d64924302504c8ce74b48f3edca1f292b56881eb6176271 WHIRLPOOL 79d6adefc281699477a271f76cb8eb7992d0946b6fcda9149a0976c30138ac882f735eff08c25c0edf37ccc8e31700f6d2d51d38c354c82c06695962e8f9243b
 EBUILD llvm-3.4-r1.ebuild 14806 SHA256 eb56a521612ee0a9ef4375d7908a7fee73950acba71006e50223a83b3927483f SHA512 391fcd8eedd6c4777db48dfd23799079e4b333b78fb8a21c3b42fd1d291edfacf56ffecf072c1b01e7b248fd913b778b547b8c885317d1efd906433b867420dc WHIRLPOOL 3650a3c0f5ea67a81cdcd1ae4f4c0e7b700c96ee37d9122b9aa357182d5ade1b10ada64ced8dd8ea2157043047a10aa538192324139bd3742026ea4f8aa071e1
 EBUILD llvm-3.4.ebuild 14517 SHA256 89ff017e78d65e03c3334b732358a374c357c25579239ef87146436a32a58bda SHA512 0d6dc970cb65cd4ca8d6706f4993d068c753582bdfec9f23c3ad1d6343425f4b07ad1664d0a5e6dd1be9923fb11f93a629c8e690c0b7311949fa2de921a2b21f WHIRLPOOL a60dd2ffa9abc18875f4bcb263a0e494459d7a86d7a9bdf75a5d869f82e566dd0d8c1b0da203936ffd85580d77e04a641e2924239dff7e051f11954a56afa03e
-EBUILD llvm-9999.ebuild 13844 SHA256 f8ee9aacec482dfcd04c9c3c043b77872e26c05fcb45eefdad929e97e23c5ba0 SHA512 2656254ca43999d0b8882845afd22051167cdb78441828ffae7a848a2c9fc585cff6d3be9f113d28bc9fb198cdc078c83e06e8a0802333397d09fb4b25cd3e2c WHIRLPOOL 776ee684bb45d7bfddae25d86dd53498c95adfde6322c3ff4133db2b3139ea34d7aa019bdb9b58d8d1f26632c71e0eda17ea0c8bc30ac67cb126ec61962ec80e
-MISC ChangeLog 30845 SHA256 206bccf6533e1b6c4aba0d6707f72459a17c013ff710179cd02270cc4d6634c3 SHA512 d1d302b0f1447c2c904fb56de5f3e845002771187ca46af3c45dab77dda357cce8de6bd608a62b17b15109bc99a9598599efde0758b6c1bbd646358b198b2896 WHIRLPOOL 3359c53837d2c8b9112faeffec26b67ceabca626e8c5fc1ce48b19b4e96f799d7e3eee6ad290e9e8e4f73e61b2894e1debc835d894561d9dc5453d6e8f5ef4c8
+EBUILD llvm-9999.ebuild 13559 SHA256 aa47abdb514c9c3e3fdcd99466218d61050a696c489669bfdb8b20c6f1c741d0 SHA512 cb38f0143078988b3f5091c716a6b3594ab03a4e09fbd24b70b4788a82101159331da917d9e574395d3193abe62503cfc0d408bb97afff81a08cc85dea450e35 WHIRLPOOL e9ad011097f1b26b34ac3b691e31909bc5188cf247bb89dbfbbf696c01ffbac16a36f2c264ce0867b2c753a08d4ad16b885ba9cf0c14a80925d38e37a7ee1db5
+MISC ChangeLog 31051 SHA256 195f06bbdccead92876eac9cf21730ee220d8570b393935a164d18073e5b4ea5 SHA512 8f4f7de2ace7aa38958160d1d947fd1ddbe31eca5409fc27de8a10f4fbddddd80baae66727e0f5cb7d1bb6eb3a0354f09b4d1ef177f2eabf23178a370be2738e WHIRLPOOL 1d7c98ef5174a779e1a73eaa270f100771a2d6e10e78290e05958dee17741f1b9ec5008a2f936bf5e6fd6d185071706dc7c284923ea2e3df77df051d2b549451
 MISC metadata.xml 2723 SHA256 d1bbe72da2553592ad60522f744b8339bce17487343abf372d966c1fe9cd163d SHA512 800f72039a5f0fdb175a8ddab7ae8f184907865802ffd5f139006f3a8c77053f114e2f7b01cef3f41f6fffb3f8f8b2b474fdf95461f27b2dc8ae31cbd732a14e WHIRLPOOL 462d3d2f22e29d3678621a9f89ed98a58ee60fde57da7be21fbca7fd61e106abbcb19c0e491424869302c19ca93b15c480cd7ca2a3181f2148174d44e891e190
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTQxHLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTRs7kXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOr9IQAIO5ekW26/kDg1e2vzNT6x5n
-9CvNmCsNK37zUwHznySmX1SLJ7bP3o/2lYdy9/pSgvWCaFcSMXtmPkxu0iCE6AYN
-WaqpUJZ1se2wn2V7IWxXqAimZFG6/hxacmSIggvRRvRa/1xMp3pn/8KI1iVCWlqL
-Oz7ZnsxHQGWqNyE0bNAABvOJbogg7EHoq37ivlCuHlYigKo7vKWUj8xysDZfqIZw
-e5lruXuVQpq47TaazdZQurB3qrpznYWGI8AjU7aKUtSgKlmPOhZfkHJLgT+vlTds
-mUdksv+RpL8ffgVrOz9w+h4QJVSBahmBf4rmJVpwT0Jcvydlqy6zW0W/ToVr2nj5
-5c10Om1tocaInIR4w7tfHVhpFzuvFqP4XknS8qzFuEkYxc5UHRctMXQdCxVfrVX4
-mV8/twvz8XkkC9aGxroU3YJW4lTbiWN3f5oVSy0rKLAuJL2mmxfRkXdeZlfSpvrU
-L90zuSO8qJmXiw72ne6pMLXzVuvLxmq3p+fhAbrg1toxHx+bBU2cJ08XOWH2pBoW
-MMhCLkVJ4Z3zhiI7faS+qdNVlrJ0gdrCaWUmslsInakY1mJDFbaivkKY2wbvFJym
-xoEYK6SM1kMloi4ga64i1w2XenKJRMODtTVO6Cq+fA8r+Z9mGPf28L+VjAN8G3Or
-RdeSk30VpHDnKI1EMHOO
-=NvhR
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOamEP/i70hHfCgXk/l9WTWOBUij0O
+icjtlHNnBQQj83gkDC6TpgwkpPHSuwc+w1romaXAXOLalAzm9oeyWqPP16ONpzaC
+aRmJi93N77Qv142Cj7Egt3FR9QR5pRwEpnnxq3E8Dx5raPVsVMkiHfExX2I/tInC
+WqKLfFs30Use5+HKuwkejA1pDLBuB1iVaJOarvoYKP7yEVWliSfGTYy6W5rf35z1
+QRmIb+iuGqAL60IiyoFphs3H74RSd6VKJqWMGHF7pH+oZGr07uj7XCTQut4Z4RAC
+SdqFoCmybfHV5UPEzNANSoLN0HFLVnFFWDABqjJKxdU0qiUjvK2Rub1uacC4VhsA
+4O+mS19Z9nEt5PD0gm+qRHKkYQX7kAWr7VukGZJ/G/H2wgEz7sO0pZITEbG4zTp5
+wsrA7iWUo3HSE1uTntl0H6sbO15jPjJNdHzyJvp7/zW7G6lyKiU7MmLPeaZVmKCI
+wWTOPyegq1VNPfqhQlL+D/Zzq9Z1Twof0nIac4ODI3CzWLADIIP4inCiH31ESJqp
+yXP82PWjx169pL+Txz4v5Of1mlgAu84/DrH3N64+omzaiHz0hhFx1DvnDGEJJfP7
+OnllX2NucfgbYwP5gRpB2N+4b0uoH3VIUIp0MgX0LLjEvurJOWaGfflPlqTpFDQZ
+n+Zh3iV8rS+UONUtGdBV
+=Tuqk
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 4fbd5e7beb9a..20b716512cc2 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 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.82 2014/04/07 20:59:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.83 2014/04/10 17:03:23 mgorny Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
 
-inherit cmake-utils eutils flag-o-matic git-r3 multilib multilib-minimal \
-	python-r1 toolchain-funcs pax-utils check-reqs
+inherit cmake-utils eutils flag-o-matic git-r3 multibuild multilib \
+	multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs
 
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="http://llvm.org/"
@@ -65,6 +65,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 # so why did it call itself ninja in the first place?
 CMAKE_MAKEFILE_GENERATOR=emake
 
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/llvm-config
+)
+
 pkg_pretend() {
 	# in megs
 	# !clang !debug !multitarget -O2       400
@@ -371,25 +375,15 @@ multilib_src_install() {
 	local MAKEARGS
 	set_makeargs
 
-	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+	local root=${D}/_${ABI}
 
-	# Preserve ABI-variant of llvm-config.
-	dodir /tmp
-	mv "${ED}"/usr/bin/llvm-config "${ED}"/tmp/"${CHOST}"-llvm-config || die
+	emake "${MAKEARGS[@]}" DESTDIR="${root}" install
+	multibuild_merge_root "${root}" "${D}"
 
 	if ! multilib_build_binaries; then
-		# Drop all the executables since LLVM doesn't like to
-		# clobber when installing.
-		rm -r "${ED}"/usr/bin || die
-
 		# Backwards compat, will be happily removed someday.
-		dosym "${CHOST}"-llvm-config /tmp/llvm-config.${ABI}
+		dosym "${CHOST}"-llvm-config /usr/bin/llvm-config.${ABI}
 	else
-		# Move files back.
-		mv "${ED}"/tmp/*llvm-config* "${ED}"/usr/bin || die
-		# Create a symlink for host's llvm-config.
-		dosym "${CHOST}"-llvm-config /usr/bin/llvm-config
-
 		# Install docs.
 		doman "${S}"/docs/_build/man/*.1
 		use clang && doman "${T}"/clang.1