Update clang patch, bug #538768. It looks like upstream finally fixed libdir for LLVMgold.

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

4 files changed, 74 insertions, 8 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index a459326c2848..caf57c14b859 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,11 @@
 # 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.225 2015/01/31 19:48:12 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.226 2015/02/04 10:55:25 mgorny Exp $
+
+  04 Feb 2015; Michał Górny <mgorny@gentoo.org>
+  +files/clang-3.6-gentoo-install.patch, llvm-9999.ebuild:
+  Update clang patch, bug #538768. It looks like upstream finally fixed libdir
+  for LLVMgold.
 
   31 Jan 2015; Fabian Groffen <grobian@gentoo.org> llvm-3.4.2.ebuild,
   llvm-3.5.0.ebuild, llvm-3.5.1.ebuild, llvm-9999.ebuild:
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 9cec53fa565f..e165e2008353 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -11,6 +11,7 @@ AUX clang-3.4-darwin_prefix-include-paths.patch 710 SHA256 f76311dfc5fa734a3a72f
 AUX clang-3.4-gentoo-install.patch 3228 SHA256 051799f114102aa46717dc4a7224c878f7511b69a06090c501abe157c6025c5d SHA512 35127c66182ee1f698bf96731c11679c3fe162d9dcb524c06467598b374fcce94dd0484723acc0072ab1565c581e2fc74d6b7246484bfd9bf1511eb419a85c9b WHIRLPOOL 3d1644da31e9278bf0983bcaf1947b99570e71366b6cc868020c5978037795c27ae211c4d32562dfc1933ff2a4e9f8c0aab0248ac9c6c69fc954a830502d3f68
 AUX clang-3.5-gentoo-install.patch 2166 SHA256 e359a219f2d0d2b88094bbb5ab91fd50d9662686f77e85b7ccfb8d1c4a6fd39d SHA512 07e5b3d4131a7d58577bcb99a82c585258c98a38e71b7e8dda058b467a558471e1ddeec5c9f5492f5d17e280cd4b09e49338e0926dd2534583bc8a2772bce26d WHIRLPOOL 5582b2015b4d3e845a45bfda08c156683df11685170f253f79ccf016f2e771b016d213417d83068f01a41bd8e0148474711cd6f9b7187e758322e9ebb9c390dd
 AUX clang-3.5-gentoo-runtime-gcc-detection-v3.patch 1694 SHA256 24691db819d08f87f0144a67900ae6797c0df4d180b55acc5c377d890ac2e72e SHA512 a34f694560ef0c7366ad0dc243a479afc74b6122d624b8681538da69c70d0d1869245a89c61d49add890c5f76134281470f5e75a59e6fc9ac963230fc56fe8e6 WHIRLPOOL 4f4af09e08c7d5af89558e77d0a2a4542f77ae505e9020ca6e48e20ef71c4db6016ed0211b2a303b756994f62949c91c216cc2f81b16ff65c71414d354977c8f
+AUX clang-3.6-gentoo-install.patch 1660 SHA256 74cce23945897ce2cfd3931b08695d534973e32a0d104ff942b2f5c500ec4ad7 SHA512 77e2a2dd82fd13292edced8c9bba911579f2b4984a64223e8c80f41b5605220f1433beb6f40e0746163d894d4405296e1f40584eb069f960866df97e6057b569 WHIRLPOOL 4784e8da4e04406a1261c9a539280c90936141b6061e567c70f9e4b566d45e0275b2513d66c03a5473fee6f434e0cf0242e7ac21eafe59a8c26c7c6bf7040876
 AUX llvm-2.6-commandguide-nops.patch 975 SHA256 0e36fb43e020fa380230a8c6f2a79b9a19e12e857e833ef856e2b41aaa283649 SHA512 6842285e499b86581ca12fd94f5335e0dcd7afcaf0cdc5042ee8d84d0da6aba6659652eb639027bcad7caf77b0c994ac7e181a15bc609c4b3882e0f391c8cd33 WHIRLPOOL bf1212a8fd06214dba0916a73266842558bed740220d68e3447701ffeba1b3020ca4b4ab5c6d57772a60a6e09f153232f680b1e0b11cbd5d430bd9ef693d2926
 AUX llvm-2.7-nodoctargz.patch 1878 SHA256 983657329ebede731b397ba0256d729b3958f39faea64c9f7d065ab8d2a3e7fd SHA512 3f9dd34437c6dba8246cdf5c8563889f805f3c8e579190c4f0fb06f72bf5aa112ecbfa18467a35eceaadcd470544f434f319f048cb58d6631170788b10fcc75b WHIRLPOOL 63182867bf8f0bd6ca1b7d97229fd13952526d59587192727348026e8a759f1c6b79db044760465e2424851fdbdf79e4122c5bb0285b505d20f151334063e8d1
 AUX llvm-2.8-alignof.patch 2522 SHA256 a9f7add4f4002bf9af438c0c4d1ca86875d6214a5044334325a60cdcbc8a3cdc SHA512 188bdf29b60ce0f83010ef33cd28c4cb710d238fe678be731ce1d099c7df5577f51162c95e06d996e9c90535ace41fecd3eff6570214a313fe165c0945c42832 WHIRLPOOL 65dd1cf8eb106af0516a5f302a08c51bfa884e35dd5efffbbcf97e1212a6b9356c6caea4472dce8e54a5a30dc5c6ba73be29e64b1b060e63a9ce7d816066ccea
@@ -72,13 +73,25 @@ EBUILD llvm-3.3-r3.ebuild 14190 SHA256 d16d933d6791ef7dbe08aa43340bb9924e063af11
 EBUILD llvm-3.4.2.ebuild 15757 SHA256 da50eccf544bcd0bd03d960f6bcb3acebec7d65560e8c7f87834153586b663b0 SHA512 4350371e6a34ac0dd23d119ee98686440a1568a97a76ce7f51f9bf8bba78fd3949e6dd6284d938f7078ee0698cdae6a22417c620fe3fd09d41f47029de4cbc4e WHIRLPOOL 74d5cbc807c33a84a1fb49527b6ab7c1af2600f78549300afd50d915981f22fdd0c8a8e32040bfb135670d3c8b49e0f0fd15e13595db5288dbb9470b05ffe5b6
 EBUILD llvm-3.5.0.ebuild 15235 SHA256 4250403418b87a6719c00cf9403e167d89b48a14d266343f11edc8070e4b0293 SHA512 73d1caa13413470eb1d2b767a756843fc91b0d1c4dfc96bc68a91797cc3731af13b8e82ee4da426a558d68b36ed1188a1d7851cef58d47e9d8429bc18a867702 WHIRLPOOL 353cb07b77b8d52c95f2b10cd2c944be437e29461225e17de051048b1d73216201dba8082002e7249b40b349021d6641037f704af96bd226593803864aef0794
 EBUILD llvm-3.5.1.ebuild 15317 SHA256 5c5500fa371ef2c8d36be4c9e418d1a99d2c15d5af91cec7952809fc7e700ebe SHA512 9d847999a1e96427d4395d5b287cdc9725a854f6c42c7fd0e88ba658185c7f90fd7f723e1e821a35bb4d361e0ba04f35c4c4b4b1ea06cca97509217699546a24 WHIRLPOOL 0127ac9825ee6d96f6b0939980fd4a9fd14f3eece2839dbcfdbf021f9d7f2499430b08028fcc0d7f380e4cba7db13c043668c6975560efc13177171afe1acda1
-EBUILD llvm-9999.ebuild 14403 SHA256 537b497d057f41d132d77d9e8b78ed88e09c6cfcda782af21caa28e4ca0ff126 SHA512 48e7e9877564e1783c2136bcc88f4bde81c60a914adee89f9d19b8e154372d89bebc0ce18b557907c9898a16db7274789b34db005f060a40b61905003c88c838 WHIRLPOOL fa40ff19f2090c6c630f3be13b03a4c79d281731c697374beff1a8004fa48db40e09da1f4fcd048695f487772d725d84dc8aef630e840f006d8bbbc36e988374
-MISC ChangeLog 37753 SHA256 8196f97fddee78f44bc457f4510fd42e417afac3ec06a458d2e76ef53c0102ac SHA512 c52a502eb0295ba62ae9f8dfb9a8c6d3a5cb473e6535b18ea03ddd0cdfddadbc0da4a046510e38a56d19983d5ce47f329aec7234d05f45abd77cc32ad7cf5c90 WHIRLPOOL 4a6d2ae6c642c3d7c2ab0bd0141bc370e5c4e13a332fd5f6951651b7b2948b5517e539e48d05f283bccea107e6ff2b6391da84b9d4f1484de0d4b4f7d6eee33a
+EBUILD llvm-9999.ebuild 14402 SHA256 b45c2b3c15b861c26d55eb91dc895e380f9cbd54b0a1a57a05134ff54d5e4b1a SHA512 b2b06bee630eff7cf3f4ec81d8739e9f138f63d44aeab80b8f87ca1b24558bc670684328776e257399c62ac23ef8da6f3788734317f699e762350b9e4bf8eb2e WHIRLPOOL 3bbb955951037e89b02b72e05cfc20b107ac4805afda5d12b67e3d9b9fbb1c56ce15b6aa5a93cc78ba3501a06de9003c88f50e1a6dde919b069c0d6434b85e6a
+MISC ChangeLog 37957 SHA256 c3149ce1324d44a8b3c091c52ee47b4e3e36360e03414bd205ae6a39ed17fb20 SHA512 6a3da8fa3c8822d17b77576dd1c1d296265388bc0cee1732828406c7133f1eaf4391259bd96f303275b564c7e159a987ab33213955dbe680ace2157f48c5df30 WHIRLPOOL 530ae277dc75d5533f6dd753dbe13b66a070b64b62368236317dca5a69b69c4ceb9e5f4a96fcfcf7cd807d5ff009c2e2a47a04ac44f070a229769dde55411143
 MISC metadata.xml 2787 SHA256 22dc7b91c98fb4258271cc9cd4bd99f214b30f258bbdfea83dc37ac74df8d498 SHA512 4fca0d2551a889e7800c688077adf405697d05730bf66621ac53fdefeeeaddb7a8d868973edc9a6fe48e9a07734f1d43fd88229bae693fe181a7dbb95eeb9481 WHIRLPOOL 6284033d40bef02510f924ec1e6a9d3e1072bf26945fdedde0ddaf1d6d35c3d30971cdefa583a8e4d9db3da67bee04145ace15ded4cee63f534588b66633c76b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTNMX8ACgkQX3X2B8XHTokVAgCfSTAjofp7ll8i58e5gD+IUySw
-eg8AoIgqn+Lr4CF+4XFKsn2bylt0pxu3
-=L4VE
+iQJ8BAEBCABmBQJU0fqfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOlbAP/3udhgSl+RB7nm0J6mI12xe4
+RoXWcz4KGllU2KTQet8x27vlSIPTm1I6O9ZCpZ659BPAnDPMVjj96y/nhy3FvNSg
+LRsRvhR7Nabmc23FADvWDqvwxeYakM/oesJyIM4QI4eypIhcgHbmG66ldB6/43il
+Ym5mfeXOwlqGLbgb2zM4W5tuJEgdZZhRJ4K7Owher3nZNChymPrNZcA6ocuI/5ll
+wsdPPcgkNjpwLm9ttiEYlgPZUR11YMDQpVEpekBQpG2ADUZIbMgkYAXUW0TPBU59
+z1Fp4XAVRwxs7KscVfZhnZXS48ElnNe+lfHAa6/ALqI1Xp9tw1rZcl+SkVK6VPXE
+oqIE6YUYSIGRYLEK+Eo+K2sPN+DdpVKmITMYZwbOwEplHvtYOeEcQVF+PmqqO6+u
+rsuSt3LQNhU//gKv7HTwPmM49SK4bIyral8nRlHijiP0cB7faB2QWP9zI6J20sAa
+YUxbhzd3KtH8DQLlum1rVYjiQF+1BT2gassLahswpVaU19wzJV2qXSU9WOknjo7B
+Fn+S7kKdF3uklBYGkpUYo+D4OSk2UcgXc1EnVd3HgTR2Qw6tGupsGCDQTUvyZwTi
+fjRYKIecXJzxHvvZbte1iV9TVkii7HF2eYX/ApfFNhMTjiz6trGxEIv7VF0dFCOO
++wlu1WSI87DdpPu8FQP6
+=Sw9g
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/files/clang-3.6-gentoo-install.patch b/sys-devel/llvm/files/clang-3.6-gentoo-install.patch
new file mode 100644
index 000000000000..6d76ba9660ce
--- /dev/null
+++ b/sys-devel/llvm/files/clang-3.6-gentoo-install.patch
@@ -0,0 +1,48 @@
+---
+ tools/clang/lib/Driver/Tools.cpp        | 2 +-
+ tools/clang/tools/scan-build/scan-build | 4 ++--
+ tools/clang/tools/scan-view/scan-view   | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp
+index 187ed38..55bcd99 100644
+--- a/tools/clang/lib/Driver/Tools.cpp
++++ b/tools/clang/lib/Driver/Tools.cpp
+diff --git a/tools/clang/tools/scan-build/scan-build b/tools/clang/tools/scan-build/scan-build
+index 0f119f6..58f78d9 100755
+--- a/tools/clang/tools/scan-build/scan-build
++++ b/tools/clang/tools/scan-build/scan-build
+@@ -419,7 +419,7 @@
+
+   my $Dir = shift;
+
+-  my $JS = Cwd::realpath("$RealBin/sorttable.js");
++  my $JS = Cwd::realpath("@EPREFIX@/usr/share/llvm/sorttable.js");
+
+   DieDiag("Cannot find 'sorttable.js'.\n")
+     if (! -r $JS);
+@@ -429,7 +429,7 @@
+   DieDiag("Could not copy 'sorttable.js' to '$Dir'.\n")
+     if (! -r "$Dir/sorttable.js");
+
+-  my $CSS = Cwd::realpath("$RealBin/scanview.css");
++  my $CSS = Cwd::realpath("@EPREFIX@/usr/share/llvm/scanview.css");
+
+   DieDiag("Cannot find 'scanview.css'.\n")
+     if (! -r $CSS);
+diff --git a/tools/clang/tools/scan-view/scan-view b/tools/clang/tools/scan-view/scan-view
+index fb27da6..1f8ddb8 100755
+--- a/tools/clang/tools/scan-view/scan-view
++++ b/tools/clang/tools/scan-view/scan-view
+@@ -54,7 +54,7 @@ def start_browser(port, options):
+     webbrowser.open(url)
+ 
+ def run(port, options, root):
+-    import ScanView
++    from clang import ScanView
+     try:
+         print 'Starting scan-view at: http://%s:%d'%(options.host,
+                                                      port)
+-- 
+1.8.4.4
+
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 99c967ce4a83..7dba0c94bb39 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.101 2015/01/31 19:48:12 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.102 2015/02/04 10:55:25 mgorny Exp $
 
 EAPI=5
 
@@ -153,7 +153,7 @@ src_prepare() {
 		# Automatically select active system GCC's libraries, bugs #406163 and #417913
 		epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
 
-		epatch "${FILESDIR}"/clang-3.5-gentoo-install.patch
+		epatch "${FILESDIR}"/clang-3.6-gentoo-install.patch
 	fi
 
 	if use prefix && use clang; then