Documentation build can be made optional again, add back pax markings

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x00F7AB331B0F097F

3 files changed, 31 insertions, 26 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 0b84df678869..aa90795585b8 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.246 2015/06/09 21:17:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.247 2015/06/11 17:05:20 voyageur Exp $
+
+  11 Jun 2015; Bernard Cafarelli <voyageur@gentoo.org> llvm-9999.ebuild:
+  Documentation build can be made optional again, add back pax markings
 
   09 Jun 2015; Michał Górny <mgorny@gentoo.org> llvm-9999.ebuild:
   Enable EH & RTTI for better compatibility
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 5ca0c952a5f5..fe3bf27138d0 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -99,25 +99,25 @@ EBUILD llvm-3.5.1.ebuild 15323 SHA256 3b673170e10b2cbad34d877eeaa870f7d26d777b85
 EBUILD llvm-3.5.2.ebuild 15351 SHA256 d06513e37ce4a492610840c9788aaeaf86fc184ca7ba6d7f9d897a5a1fc3aa03 SHA512 874c560af1c62c54401bcae868973b47576115951e353c1f324b88465ec8b19e1f549c8e8927bae6f3fd65a458f76d5903afd385de059724998a881e18b06d84 WHIRLPOOL a2fe4a0bef21d1be6e9a0e77e364c60af28ec5cff6f5429b40d1b821e462ca36a8a099cc7230e195253b77bc1871bd523f4f3e70cffa17ea3c318766fbf7879a
 EBUILD llvm-3.6.0.ebuild 15310 SHA256 213f00e1aeb57bed52823f43025c63a820a0aa92421de7ec2d539d61bb212577 SHA512 13be6ca07c5c90dd28656261b4585aa3810ab86024949d5865892bbd58508d9f77eab390aa5a5288c84aa3e2ce8d0ed5aeb9b2b84f28a77fb22b1dc5abf24d44 WHIRLPOOL 0b3f9778f8d3ca8417e7943ad49c236446de927ddcb80bd5b5fb62fc6accd63663666db716104dd6eb27552f288999a7191842b6fc0c4ccb9d810152b78f4659
 EBUILD llvm-3.6.1.ebuild 15458 SHA256 2171ecd5da2735212e4539a43211db11d5f0126cf47b4bfb38dc9d4cb4370391 SHA512 631e497f91049fab1cd9f5d835e73ef744d76f84be4485ae8950d63a0c6d5a04df9f9e518b1c566e9d3bfd9a45e1d791ac64a1d35f6d72e0c4dc2b34b496fd56 WHIRLPOOL 81b5d30b99e3b59ad0ee386e700311f72a06490227890f1816c4af733566bd7c0bbbdb671b6cd73d614ca36e5c3b3c5fc314b89d695654be6f05fe3113172660
-EBUILD llvm-9999.ebuild 12556 SHA256 d6a7a6e98cf1e342999e1f9d168b8001e73cc2aab19adcfffa10444ff4f84dd8 SHA512 9d532fa55b55d340def2e8f274861f5f46915d3649cfb635737fcb915631db36c224476a2364261ae56733a4e64d899cf7b5607a9e710a6cedeaf320ee6e1505 WHIRLPOOL acb35c39d188d6af6143541f1cb01cd452398f3b5e394b2f3d4b204f3846cfeb48c5c709542a2c2d140632e8853c207ccf128151b01d0717c7ffeb2d0cb4d048
-MISC ChangeLog 41861 SHA256 9ca16cef3d5f05f1310e37e75fca123611ebb1b42215aa38ceaa15db6207b19e SHA512 c81e6a32a0f285ecb0c651b455f355da699995731cd0bd1b0be7dd944ba6cc4245f1eeef627b6d93d7b72260c3376a126206c78c85f82662c2b188e72ab3def5 WHIRLPOOL 7671baa00732c2b54f0a9fdcfe389d7387cc6537efad51388b5b00350799a18db16885fefbb088380906492d0c471adcc72a4e3f2d8e46267f6ad0302ba7cd0c
+EBUILD llvm-9999.ebuild 12737 SHA256 c7a1bcbfef1d1c47a1712cc7930159b1d8736b4797c5e7015d0a0693e23d7419 SHA512 ad73e0b6ffddd5ebb1186ab780ce2a1bbd06c4a7fcd26fc6c1f105c4cd6484ed9e5502163cfde240b895dddb0e96e77c644514c62a7ada87f3bda0441ff0ab38 WHIRLPOOL 6411ebd5c8b8e9e02329e164ca4d182eea058f59ef7b251df51855409d447824e3785f01f4fec1934e8829437cd71122058dab8eb465285e0cdb8c2fa15d5c0f
+MISC ChangeLog 42009 SHA256 28aa60edff7589eb347612dc2f0d933bbc64f6b37ac81381fca81f80c94a681e SHA512 6124b8b35af1ecd48d8ae0d140a7099b1fc5dd28c8a084025c21b6f539a89c3b772d6781d2be11562917ef13f46fb4b8dbe724a2e5246211b257571c7b09830c WHIRLPOOL a36a69533abb22a7ce19daef4f27b6d58d7559cd37d05a07d5c69dab7fe306158e92eccbe2f113b19cb5959cefc9d305dafa59615c2177bae480eaddb2e2eebb
 MISC metadata.xml 2787 SHA256 22dc7b91c98fb4258271cc9cd4bd99f214b30f258bbdfea83dc37ac74df8d498 SHA512 4fca0d2551a889e7800c688077adf405697d05730bf66621ac53fdefeeeaddb7a8d868973edc9a6fe48e9a07734f1d43fd88229bae693fe181a7dbb95eeb9481 WHIRLPOOL 6284033d40bef02510f924ec1e6a9d3e1072bf26945fdedde0ddaf1d6d35c3d30971cdefa583a8e4d9db3da67bee04145ace15ded4cee63f534588b66633c76b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVd1fxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO394P/1QSnpjgQ/3YaQykbe89jbpP
-jNZRXc8u0ctQFbK9YRH9mB0jFSjX6td46XzQdctNHc7ZhNtZcRFAmnkvlAVbaXti
-Qj7G1QWVV/bbtjzGWZollwODsL7m56SV8hkLrsYWyg5WHDMwNCjFJwOpNCgtO4gj
-147riEjyk6SjPyjrzsgdi2dvx2KaJf0YW1HTkWtEKDUrEm0vpe97QsEf0DNT80LV
-bHtDZ23oVQk++rygQ2rywXQskeWaxUgTUUID9l/AMe6nXrXz2SAPE51SMpizcHB8
-AnRyBuJcLDUO740C8GsFwbZcrSn/2JlQhF71IGoz4ybsDKWfpGTXV+NbxW6/6c/D
-sGgOHwyHituBQyjVpBy/apsOivA4GJ9fV20Hhhkb4/722ZB3UjTaglELFMQRY4IC
-qN3sw7AuHbCbPbZXpbXd/tOucCFZATexVy3BB7/aTzzLjGSnN6/sNOTgfeiVvCAO
-zlaqRmdsZIUJcJbn/6DD9xb4bVVNcyTp4k5zEDFWIMZl8Bmf618X/gVOw80gcyss
-2hmQ4WAYR2dXtWtIu1FyQAponbc0IE11+avcmDFuVCSKzbIv7Oe+QmsCZVZX5b9T
-AFckvUp8XacZfaVm7XM94IKsBX5iMyS8Z2LSK/zTZLAIdfwO9GbVl3zuj0rsSW/J
-q9gL+B+x3H+CtQXEGL7d
-=uKKT
+iQJ8BAEBCABmBQJVeb/RXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREMzFDRDFGNEQwRTAyNjc2QzRDNjRFQzAw
+MEY3QUIzMzFCMEYwOTdGAAoJEAD3qzMbDwl/+QIP/09hcYO8AoaROfJsXoEJi7px
+tXEGN24gLd1yZnqiA1HdU4+CW23b793DNtCyJ13I7UvJ3B92cerwK/zUrLLrp7wA
+EIji5XeZP9RT+QMgD9KvoITQ3fgkM+zIFX6JYsU7LMjwMTearVgZ/IDVlVvGW7ZM
+Yki3uFmrKuiGr14cNcbSNBBvMXPYPvH3kxC3o2M2BIDfCCbCq6D2o02tVnGcFFsU
+vOWk1L+y0+rkWQ9ElG2IW5yCUdq7U8dNEWVleUtXLzFUQOgjYtgmFLb9nKrMR9l9
+1Tklo3t7+L3DYRwfL2rjTIOGOk0kyzrsiryqYofT3/NlEO+Blj9VV0TdJB4pKOTK
+9o9tb4XE1uw4sBAGVYE2DKh4Lsby0CayijTyKUQ54J/oTXq7WL5YboJQoNQAtTpX
+rrJTZ7zV1tNSkXdoGi2IOT0YmuP3NpzcZWJ6EHkT+M4CIN1BxhVYGrREn2NDGd5b
+TJcrtdAlk3WkGGvgbwe+0ApZcFKIOmM19DFSBmKNAHg+p1sMdVDyBPmkykictUGl
+To8SE0+Odqo7Nk8tnERSM+d1sGofIW+9iwuvmO9b/19l1V7d8wUEZdF9kaN83Gvc
+yNspyE6WnnLoVHiNlxa5EGRe7YO4j0SnrFLXHWze286iOi7Ls5ZdWeLh8ma9FWiC
+P7UNV8kWrh581y8dLRtv
+=KyWM
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 70ab432b600c..91a95c110d54 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.112 2015/06/09 21:17:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.113 2015/06/11 17:05:20 voyageur Exp $
 
 EAPI=5
 
@@ -43,7 +43,6 @@ COMMON_DEPEND="
 # configparser-3.2 breaks the build (3.3 or none at all are fine)
 DEPEND="${COMMON_DEPEND}
 	dev-lang/perl
-	dev-python/sphinx
 	>=sys-devel/make-3.81
 	>=sys-devel/flex-2.5.4
 	>=sys-devel/bison-1.875d
@@ -53,6 +52,7 @@ DEPEND="${COMMON_DEPEND}
 	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
 	kernel_Darwin? ( sys-libs/libcxx )
 	clang? ( xml? ( virtual/pkgconfig ) )
+	doc? ( dev-python/sphinx )
 	libffi? ( virtual/pkgconfig )
 	!!<dev-python/configparser-3.3.0.2
 	${PYTHON_DEPS}"
@@ -243,11 +243,10 @@ multilib_src_configure() {
 
 	if multilib_is_native_abi; then
 		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=ON
+			$(cmake-utils_use doc LLVM_BUILD_DOCS)
+			$(cmake-utils_use doc LLVM_ENABLE_SPHINX)
+			$(cmake-utils_use doc SPHINX_OUTPUT_HTML)
 			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_ENABLE_SPHINX=ON
-			-DSPHINX_OUTPUT_HTML=$(usex doc)
-
 			-DLLVM_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/html"
 		)
 
@@ -296,6 +295,10 @@ multilib_src_configure() {
 multilib_src_compile() {
 	cmake-utils_src_compile
 
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
 	if use test; then
 		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
 		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
@@ -340,7 +343,6 @@ src_install() {
 		)
 	fi
 
-
 	multilib-minimal_src_install
 }