commit:     082e005716964690a27f007ba87ac3f663791d67
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 28 14:52:32 2016 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Thu Jan 28 14:53:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=082e0057

sys-devel/llvm: work on 3.8.0_rc1 install, bug #573202

Also add man-pages tarball

clang tests still fail

Package-Manager: portage-2.2.27

 sys-devel/llvm/Manifest              |  1 +
 sys-devel/llvm/llvm-3.8.0_rc1.ebuild | 37 ++++++------------------------------
 2 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 177b034..28dd9b2 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -36,4 +36,5 @@ DIST llvm-3.6.2.src.tar.xz 12802380 SHA256 
f60dc158bfda6822de167e87275848969f055
 DIST llvm-3.7.0-manpages.tar.bz2 38095 SHA256 
8597fa532464c6336aefbbef0b1ce452aaa98d474fa58108c6a6f57a9ccd6785 SHA512 
ea70ac15dbaef3740b31f66aa798338f7f9b82484586582aa62e0364f9d74bf175be2f4f29721df253b8157c1cbc146ab9045c0656c42a6375434e994786b643
 WHIRLPOOL 
743b339b0df7c52d270a5197e9e765dfd92d4b5acee94cf9d9d7713e1a75aa9d987b3f5adab0952e7267febf88b318d0f31cb45847e2b0b42c7c7373b2358358
 DIST llvm-3.7.0.src.tar.xz 14636252 SHA256 
ab45895f9dcdad1e140a3a79fd709f64b05ad7364e308c0e582c5b02e9cc3153 SHA512 
fe3bfefd3d49423831ad12b89f944ac9f469aaaaafdea1dd94fc7fb6d5cc9fbe66b6463796aeaabfc145ae474ec3ad68da41c4a011e8aa4bc650f1835af75388
 WHIRLPOOL 
4787fc417042cbb4470887358225c367c6617ccd6cb90f1e4f226ec1565b302e4d70458fc13ceedca5b3ac270523637398bb7503c8c423c81fd9682a41c0289f
 DIST llvm-3.7.1.src.tar.xz 14592544 SHA256 
be7794ed0cec42d6c682ca8e3517535b54555a3defabec83554dbc74db545ad5 SHA512 
ac521debc02f6deba96ef975d6a546b0c5c77299c1dbf5e1b87a7974ff5e7fd715bd7e384b92d9adf572ce47130bdbf6d3c648eb0d7f72f16f976292e4909e90
 WHIRLPOOL 
788ce0907b906ebee595c766713bec5067563c8aba7460211f5830e116df7c830de84704834c0df2f2f2c90354d75521e4a4aff57e769a2d8ab590778c1e4a70
+DIST llvm-3.8.0-manpages.tar.bz2 37889 SHA256 
4dda7f69f9412e0fb50d32631df34d6ea7f93c945c9a59cb050a99f1d2d0508b SHA512 
a93ed7a25b75c237a0967ba7a501c71af3e7e9292ebabf69733bc637e9a4534dcaee539c6b1f6b2df7a87103c2371b1cf130fac05b88047100988c814e89ab0f
 WHIRLPOOL 
9790a576fd4db798c2339bb4ea1dc973f1057177364770a104be7916998a1ad824e6b4eee296066ddd32eb5e6c57ffd5716457cecbd8ca9fe1b317d0d5ed2676
 DIST llvm-3.8.0rc1.src.tar.xz 16559376 SHA256 
41809e45cb3a97908c5741b4c15c90d801793e09d75858a6cfaa9582f233249b SHA512 
0fbb2a5c16aad989a00b0068ab094882eb6f945237f1b82e102835321dc74cdbdaaa2d16dbc73df93ad466b3221ad440c18bd79e70e1f3de92e0a11de717d20e
 WHIRLPOOL 
ae25d7b12c359aaab53dafeb0dd737b564d6fceac95443049118ec8cb7a308836572243c77cfb0a6018fa2600b2844f252d95870fed79e11e3cc5ae5b5dbfe0d

diff --git a/sys-devel/llvm/llvm-3.8.0_rc1.ebuild 
b/sys-devel/llvm/llvm-3.8.0_rc1.ebuild
index c39a17f..613a5fa 100644
--- a/sys-devel/llvm/llvm-3.8.0_rc1.ebuild
+++ b/sys-devel/llvm/llvm-3.8.0_rc1.ebuild
@@ -16,8 +16,8 @@ 
SRC_URI="http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.8.0_}/${P/_}.src.tar.xz
        clang? ( 
http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.8.0_}/compiler-rt-${PV/_}.src.tar.xz
                
http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.8.0_}/cfe-${PV/_}.src.tar.xz
                
http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.8.0_}/clang-tools-extra-${PV/_}.src.tar.xz
 )
-       lldb? ( 
http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.8.0_}/lldb-${PV/_}.src.tar.xz )"
-#      !doc? ( 
http://dev.gentoo.org/~voyageur/distfiles/${P/_rc*}-manpages.tar.bz2 )"
+       lldb? ( 
http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.8.0_}/lldb-${PV/_}.src.tar.xz )
+       !doc? ( 
http://dev.gentoo.org/~voyageur/distfiles/${P/_rc*}-manpages.tar.bz2 )"
 
 LICENSE="UoI-NCSA"
 SLOT="0/${PV}"
@@ -423,7 +423,7 @@ multilib_src_install() {
 
        if multilib_is_native_abi; then
                # Install man pages.
-               use doc || doman "${WORKDIR}"/${PN}-3.8.0-manpages/*.1
+               use doc || doman "${WORKDIR}"/${P/_rc*}-manpages/*.1
 
                # Symlink the gold plugin.
                if use gold; then
@@ -478,31 +478,6 @@ multilib_src_install_all() {
        if use clang; then
                pushd tools/clang >/dev/null || die
 
-               if use static-analyzer ; then
-                       pushd tools/scan-build >/dev/null || die
-
-                       dobin ccc-analyzer scan-build
-                       dosym ccc-analyzer /usr/bin/c++-analyzer
-                       doman scan-build.1
-
-                       insinto /usr/share/llvm
-                       doins scanview.css sorttable.js
-
-                       popd >/dev/null || die
-               fi
-
-               if use static-analyzer ; then
-                       pushd tools/scan-view >/dev/null || die
-
-                       python_doscript scan-view
-
-                       touch __init__.py || die
-                       python_moduleinto clang
-                       python_domodule *.py Resources
-
-                       popd >/dev/null || die
-               fi
-
                if use python ; then
                        pushd bindings/python/clang >/dev/null || die
 
@@ -518,14 +493,14 @@ multilib_src_install_all() {
                popd >/dev/null || die
 
                python_fix_shebang "${ED}"
-               if use lldb && use python; then
-                       python_optimize
+               if use static-analyzer; then
+                       python_optimize "${ED}"usr/share/scan-view
                fi
        fi
 }
 
 pkg_postinst() {
-       if use clang && ! has_version sys-libs/libomp; then
+       if use clang && ! has_version 'sys-libs/libomp'; then
                elog "To enable OpenMP support in clang, install 
sys-libs/libomp."
        fi
 }

Reply via email to