Delay building unnecessary tools & unittests until src_test(). Do not install BugpointPasses.so (seems unused). Match man phase generation & install phases.

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

3 files changed, 53 insertions, 34 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 37964dc4deae..0cc808aa7c8b 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.149 2013/12/19 11:08:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.150 2013/12/19 17:22:46 mgorny Exp $
+
+  19 Dec 2013; Michał Górny <mgorny@gentoo.org> llvm-9999.ebuild:
+  Delay building unnecessary tools & unittests until src_test(). Do not install
+  BugpointPasses.so (seems unused). Match man phase generation & install phases.
 
   19 Dec 2013; Michał Górny <mgorny@gentoo.org> llvm-9999.ebuild:
   Clean up the build procedure a bit. Pass the same MAKEOPTS to all calls, and
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index d2516f306c70..1c833e37caa3 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -45,25 +45,25 @@ EBUILD llvm-3.1-r2.ebuild 6033 SHA256 9b9a587d30419fa646764a96e12fc6272f73f72461
 EBUILD llvm-3.2.ebuild 6534 SHA256 eb16cc91887fdb035722d268caaa3e4843825403786fcf74643be2c6f8099f11 SHA512 e781a4e4416a4acee667029744dab7f8e52022df4fcbb89d4d9acf855549f1c0a1661b79ee0067fd052a36bad278f08a2ff7f6e6e44d8c3ea7f82910ac573d9b WHIRLPOOL 115d13959a22867266dd7c0133109ccba063e97972cc2c807fb7a6dd7d3fbef1726caf314e262f6683a97a2c3a6ff776f808de7d80923472fc692554eccbca27
 EBUILD llvm-3.3-r1.ebuild 12007 SHA256 343a88ba35b67f4d86c20e29e1f4919640a9c4fbf9942fb1733945480ba1e8f5 SHA512 3db9e2ad26e803ac663b696ff615eed83a4342e4b771f161b74304bb83c61f171e02f2b176cf62663724206a57e20be52ec22cf49de234f72b32673bb2588512 WHIRLPOOL 1c423485f6161b40daa5a7ebdc38838b4bd2d6a9c540881eb3cfbf5f592b454da32758ad23c2607fe7a875c65891f7b64f3079a53ac77af5b2decb6490a6b8b4
 EBUILD llvm-3.3.ebuild 6798 SHA256 4e53042e76ce97e6a460cda74c5dbadc1cee9009345e8f0232e28d53c8f77579 SHA512 5513887c3b5a25a678713b68c216a40801ddecbf5a4dc58d7ad01c1ec8411589e20d8662c34f117e6d64924302504c8ce74b48f3edca1f292b56881eb6176271 WHIRLPOOL 79d6adefc281699477a271f76cb8eb7992d0946b6fcda9149a0976c30138ac882f735eff08c25c0edf37ccc8e31700f6d2d51d38c354c82c06695962e8f9243b
-EBUILD llvm-9999.ebuild 11152 SHA256 8cfe94b5da8507769087b5bb07fbb5c4282ecffb3d02485b1d82452a99277d04 SHA512 3be515add98e35afd2ca7b14de7913b9d2dd7f9a07408e96d8ccbfbf015df0fcdf564860755faedaf4941acaa1771f2001239aab1aaf7ff62fae498d3ca2eb15 WHIRLPOOL 8e47e1e32ec8de8ef15734c7f059836102275cb50811013ad4513fc779ce0f5a72f62f4c601ce6633612158c2a63f0c4031a17acae3d404d202c3190d2a3398d
-MISC ChangeLog 25093 SHA256 549d2d8903531ff07f11ce106a015cb9c2abcb4a098836ec2be6462d4ff3755e SHA512 2f972899f942887365d7fe0925ea088e9ff420117b3a625309bb89ff3ef694ae8027b43325279d06ef4b3e46fbe2d62fd52d25659b234a017c86e81c2aadffea WHIRLPOOL f298b6b5a092ba78516255df21a54adfe7c235b5d8af3aef460eb1dbce4c12eec96c286e82c4f668df7a3924022c5bf6e1d50dde77fb42dd07fd8fea753ba9c8
+EBUILD llvm-9999.ebuild 11696 SHA256 6da7c3a85e27d4a9de40768e4e3a3a8177bb0d8aa6c799b67a35405ccd3fe065 SHA512 fda0b3644c4a05f64b48e73af866603da811810e76a1b58539d59ab3be13b0958684743d3080454834a9787dae50f7dd7f8b89b728a4afb0d1a90f5f1da610d1 WHIRLPOOL 044537fc02a1e60b2b1641aba756c33ed1410c88ca895c9f473f4baaff27709a6b40b990d7869b128cbf8e4052bd487a35a10ee59845a14d775e4d9a31f06a0f
+MISC ChangeLog 25323 SHA256 fe9f0686921009cb188f0870ceabe7f69d2d1c082a1204d2af102b02c4b396e0 SHA512 a964cdd76e2fef1afae11bb8c3d1b8904272be8fc9afd370c48e299746bdf540716915967994c708507363b2df791f18a04d519a0efe29581df0463c49a7da78 WHIRLPOOL c274b5bb35f2e57b216116bb59a578012eb6a83f198413d7e45ae40e756fa6b3b8fa17222587258208f1c40293e261185d165c0bb3e438c1fc0dec08a906dfee
 MISC metadata.xml 2723 SHA256 d1bbe72da2553592ad60522f744b8339bce17487343abf372d966c1fe9cd163d SHA512 800f72039a5f0fdb175a8ddab7ae8f184907865802ffd5f139006f3a8c77053f114e2f7b01cef3f41f6fffb3f8f8b2b474fdf95461f27b2dc8ae31cbd732a14e WHIRLPOOL 462d3d2f22e29d3678621a9f89ed98a58ee60fde57da7be21fbca7fd61e106abbcb19c0e491424869302c19ca93b15c480cd7ca2a3181f2148174d44e891e190
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSstOhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSsytoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOOncP/RY/1uiD/I3UqO/zfqi1zh5B
-z1WU1RBXfafVRaX8gRJM5V4I5ogv9pM7G1De/ZzW8sANrPLQmFIWtd8h+3LmwXE/
-TyMdqKHAvZJrWChtX0QRG3eSxlBUBKpM1T8U1ERW5+TmGY5yhBiv59t/NjUhebbr
-u6qKxqfn36cODf2cr4h2C8mPhbkFG+AzYHqat7fokemzl/rhos+Lf3dTzg9HuAfL
-BLXHLDT99CMQiuUacwYXdILJxoP3/uEJ69epVYFaQS8XZmSOrauOxEcut+d1/6M0
-F1V7Mz0qh3PuBEsAiE78OWC91jSiRM4iQP8aQEJskB7GvSqlVpujjPZLthmAwtj3
-lnqwM+NwCPZ/X8Pyf+hG+Jwm1d/SHxzWYGuZJq3PtygwrmQ+YrJpq1EbBWtGdeS7
-TyOLwX8dPoJgQD+MfXPnZFNQMnu91/vGkYMVC7V+wzKWqKGt/OPoIUdCmil0dAMQ
-NhDwLdifedCB62DSieKBaeZLGKJpL3sh8y8eSBYWHBzZ+PjfOEN3WIEo0C6EziBY
-rxBYNJEYvqOJeAz5EZWrG1tyyuX9XfiwchTy9hlip2aH5eYUn55wmiRd3hEaYNKb
-psFwV3LSPP4mQo7pkmisUsxPhZdEMA3/Oj5QoD0lutDqqN6yTI/JTknGxYPw+laL
-qjz/okKuTa3mOFuzJFdL
-=BbW1
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOV8YP/31AAfr9cBSEAX88lsn8q5AO
+kr8HHb2K+wyeYeTloPzZiLlcjdlBku8Yr/2M9rjVEs6prMtYykRgaZUz0kfb2L7b
+jq6ypQVW6Cs4ffbCNkoIIjoGnH6F3QCpfZJJP8ZZLcQGYZ3m3LVX+k3Xt2kPD98x
+cl/+cYV4ptfBtJrIIH3dlaulAr+kTCY/1P5uXpOGaCTr/bsgOTv9jGlHqQB14CNe
+tzypyq1+1htaawkpj3FH6nMkWom8oRPioov/OAjtZPr0gTq/WLBjmwba4kUHNNCH
+gsyWs1SiPQrw9JkWuy7SFu81mHmAxb/joLZLImN23zOROP2OQKVxGBZOsTIB30m1
+o1h3EIvxOOcYxsdreJf1f8QEjpycOI6FCEajhXfqocSL0jNvb6sUN6J0UmF6NW80
+k+HE/vRtE7fL2zoCgUXD2fZ0B+HS3AENfWzXolQJ2uApBtFz1KJhA3msVaj7hcVP
+kAqGgm1zxgwrwfaxcyqdPzxA8ux3cBAb1FXpIMHpO4RZ5rvd2umehbi5gmLfUmYn
+h4+FtPdTRewAmsd8B7RLMGSW2tcQk6UpTbw8WWJMfL4VYoiqWxTvyur+QqcwS/h3
+O6UHFOy3y12Wz7lYguYuv+N/j6rZj6C5dzGpVhzHBoQCDFgrUHiyFJDeKRJDd4xt
+C44juVOAFv9bA76+uwo2
+=ZmFH
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 2e0f941ed81f..ae3e2ad18dd6 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.63 2013/12/19 11:08:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.64 2013/12/19 17:22:46 mgorny Exp $
 
 EAPI=5
 
@@ -240,18 +240,29 @@ set_makeargs() {
 		GENTOO_LIBDIR=$(get_libdir)
 	)
 
-	if ! multilib_build_binaries; then
+	# for tests, we want it all! otherwise, we may use a little filtering...
+	# adding ONLY_TOOLS also disables unittest building...
+	if [[ ${EBUILD_PHASE_FUNC} != src_test ]]; then
 		local tools=( llvm-config )
 		use clang && tools+=( clang )
-		use test && tools+=(
-			llc llvm-objdump llvm-readobj llvm-dwarfdump llvm-rtdyld llvm-cov
-			yaml2obj obj2yaml opt llvm-mcmarkup bugpoint llvm-c-test bugpoint-passes
-			llvm-as llvm-dis llvm-nm llvm-bcanalyzer llvm-mc macho-dump llvm-ar
-			llvm-extract lli llvm-link llvm-lto
-		)
+
+		if multilib_build_binaries; then
+			use gold && tools+=( gold )
+			tools+=(
+				opt llvm-as llvm-dis llc llvm-ar llvm-nm llvm-link lli
+				llvm-extract llvm-mc llvm-bcanalyzer llvm-diff macho-dump
+				llvm-objdump llvm-readobj llvm-rtdyld llvm-dwarfdump llvm-cov
+				llvm-size llvm-stress llvm-mcmarkup llvm-symbolizer obj2yaml
+				yaml2obj lto llvm-lto
+			)
+		fi
 
 		MAKEARGS+=(
+			# filter tools + disable unittests implicitly
 			ONLY_TOOLS="${tools[*]}"
+
+			# this disables unittests & docs from clang
+			BUILD_CLANG_ONLY=YES
 		)
 	fi
 }
@@ -264,6 +275,8 @@ multilib_src_compile() {
 
 	if multilib_build_binaries; then
 		emake -C "${S}"/docs -f Makefile.sphinx man
+		use clang && emake -C "${S}"/tools/clang/docs/tools \
+			BUILD_FOR_WEBSITE=1 DST_MAN_DIR="${T}"/ man
 		use doc && emake -C "${S}"/docs -f Makefile.sphinx html
 	fi
 
@@ -274,19 +287,20 @@ multilib_src_compile() {
 		pax-mark m Release/bin/llvm-rtdyld
 		pax-mark m Release/bin/lli
 	fi
-	if use test; then
-		pax-mark m unittests/ExecutionEngine/JIT/Release/JITTests
-		pax-mark m unittests/ExecutionEngine/MCJIT/Release/MCJITTests
-		pax-mark m unittests/Support/Release/SupportTests
-	fi
 }
 
 multilib_src_test() {
 	local MAKEARGS
 	set_makeargs
 
-	emake "${MAKEARGS[@]}" check
+	# build the remaining tools & unittests
+	emake "${MAKEARGS[@]}"
+
+	pax-mark m unittests/ExecutionEngine/JIT/Release/JITTests
+	pax-mark m unittests/ExecutionEngine/MCJIT/Release/MCJITTests
+	pax-mark m unittests/Support/Release/SupportTests
 
+	emake "${MAKEARGS[@]}" check
 	use clang && emake "${MAKEARGS[@]}" -C tools/clang test
 }
 
@@ -314,6 +328,10 @@ multilib_src_install() {
 		if path_exists -o "${ED}"/tmp/llvm-config.*; then
 			mv "${ED}"/tmp/llvm-config.* "${ED}"/usr/bin || die
 		fi
+
+		doman "${S}"/docs/_build/man/*.1
+		use clang && doman "${T}"/clang.1
+		use doc && dohtml -r "${S}"/docs/_build/html/
 	else
 		# Preserve ABI-variant of llvm-config,
 		# then drop all the executables since LLVM doesn't like to
@@ -360,9 +378,6 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	doman docs/_build/man/*.1
-	use doc && dohtml -r docs/_build/html/
-
 	insinto /usr/share/vim/vimfiles/syntax
 	doins utils/vim/*.vim