Update the gentoo-install.patch to match current git.

Package-Manager: portage-2.2.0_alpha194/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

3 files changed, 29 insertions, 25 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 9314771ddf81..7124379f24c3 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.129 2013/08/02 12:25:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.130 2013/08/06 22:02:44 mgorny Exp $
+
+  06 Aug 2013; Michał Górny <mgorny@gentoo.org>
+  files/llvm-3.4-gentoo-install.patch:
+  Update the gentoo-install.patch to match current git.
 
   02 Aug 2013; Michał Górny <mgorny@gentoo.org> llvm-3.3-r1.ebuild,
   llvm-9999.ebuild:
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index aaa920dd100b..f61d6bb20ebc 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -24,7 +24,7 @@ AUX llvm-3.2-nodoctargz.patch 1761 SHA256 e17494aef638d2fe3fb0b669516ffcc9e56016
 AUX llvm-3.3-R600_debug.patch 909 SHA256 84ebe63a557e3734dc8ed4545f098e2496d815e6bf4a99dfcb65d649a23d2c1b SHA512 cd1b92c713edf895ab7a15494c6092e44082b40b9bb5b0fdfdc438e919456c7fcafab9a840adb165c191454948c0b42bc78ce2b4d2cfbdf371917b16351c6928 WHIRLPOOL 0f08c58c78c1d04b8e701b0b817956a37271115c1fc83ea8f0f54bf965fbc659e418abf7f429c2a29581351050346cb783f0aa9147757d4cfdfa24fd8b28d09e
 AUX llvm-3.3-gentoo-install.patch 5321 SHA256 4f2e80f5567227e3539052a743ef0432f108d76e6fb9ba373dc51dbf159e0410 SHA512 90075d4bb5bdefb76bfb191dcb1b618de464434d9d084b2f99cc5034d33b112378f9aae1d289d30a2f8926132c17ea32ba1bf4049c3a61a418d37f903634b259 WHIRLPOOL 39b3ce4e937985483be7b4d19a37c0837b3c27f308f09fe8aee185b9fb43782b540f6b6be042b8f6dc4b5037be64284e2e233e65b3558e4b4eb1095a7d586a4f
 AUX llvm-3.3-insecure-rpath.patch 881 SHA256 27d893e5f551d245f15c01a94df81dd9ad069c2a980cf6a8860fb429eb37a5d8 SHA512 f03d1f522d0153fcbef677bf85202a6ddff408362d9ebc3e4f9f21814b43d28b033b0efb3ee86f5c11a4ac3a91b8afc80d022bddcd839ba503b29cf946e40218 WHIRLPOOL cfca8d189f88c0e26b4c3091db6c4267a90307c5728e64ee3ca55272a884389e56ed186904d9d66b44b870792eaae049cf6e66ee38efaf757655a4be4a0cec6e
-AUX llvm-3.4-gentoo-install.patch 5188 SHA256 6f8c80f3809151169249c883234bfcdbc3290c1765b04b870ae55989dd847a02 SHA512 0166a9e58677339ecc1ab71bcd37c975aada5eb7786e4ad8688cf4bbcdb3c57f4ced7b5881380e43a33ba1434d32430ddf9d3cfaa84b76ffd9ced8f736d23a49 WHIRLPOOL 3151c9c531add5f9659ac9c008a037921696eec257827fd63dc64d468e7f1cedc987499172d9031090dd7d4f37a472f2e4604b75f415da23f79ac8f92fd3dfce
+AUX llvm-3.4-gentoo-install.patch 5159 SHA256 7d6fdc4d24c45b6b81c5e0f86db29c291fdb338b3fd86dbe46f09cc5d9bdb64f SHA512 8cb7bc2b8a3ec911252cf26c9966d3d0db0441edfa1da5838c06421076a8e847762a284ff712c2bcc43a6e0d936d1cb7851cced2ce557b7731dcf7c7deb16b02 WHIRLPOOL bcf690f1dbe0343b6c3d256fdcd9bbd67180055ee92e89ded229b2936a2b80ec54d1a3560f8c6428e3f2e4bf8cb7a9b0ec7391000c1d15faa0caaca0a65f1211
 DIST cfe-3.3.src.tar.gz 9425539 SHA256 b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996 SHA512 06773f43f7d3529f06edb029f7de398f06a700a0f2476e00c4727e70c291028221bfac23625dfd2c220d6ac91a21670848187a934b99a21801c695127371afcc WHIRLPOOL 8b97b527f19015dd3283b9e174615170e639793f64c635ccc4ee4d8216f8de759fd0121a8ef3513fa1c6ad19b31aa3529091ffb44a01ee858edfef400881596a
 DIST compiler-rt-3.3.src.tar.gz 1568034 SHA256 0e2f3180d6316e6c43f064fdd406c5c6515e682c5f31c57c28335b68c7525423 SHA512 3e86aa8ab9810b4fbac54a40fc93a717a55c642520858c0db215a5324c1e495b4d8fcec9620251cca8e4e5f9afa34bc14364d7f785880a0700469d0201827929 WHIRLPOOL fcfd06bc860dfd901a7576cd4309f863e9d4363e36ab4c67e9e08fe3c8a37d627ee95eb96b9ed53eb6047dec06e73181b3c3e1555b1b49f1e893e6382f21ddc1
 DIST llvm-2.8-r1.tgz 9112527 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b SHA512 8688d5cf415e8aef74cca6a14587af36234a6347e2238ac2c0d66805c42926b9399f36390e1a58a4081e902b0904adb818c1a360d5df572dfa893d6f79f5e35a WHIRLPOOL 0da9250e31242b55586c9138089e742aab5d414d5f3412ebf917ae8b9506f984c6134a932be93ec7e4c01c79f6c21d508cb0b2e0ec283419bd4ae4db745430ae
@@ -43,24 +43,24 @@ EBUILD llvm-3.2.ebuild 6534 SHA256 5532d849a32e9f7a02f6bf6d16b01cc734132fdc9a192
 EBUILD llvm-3.3-r1.ebuild 11786 SHA256 25c964fae177e041b68e1db18e1f6ce4901b553493dc6ed8e30f4f725ee51363 SHA512 d0becdd5328712162125c595412c053190641df8fa33653fb90547fc3cfbb7b40eb72b8ee06c0e6a475d04bd7619a9740bbef4c84776faa329551d4f25389666 WHIRLPOOL ecf3725e8633e93c02d10b1d189e07f799609b48373a914e6d035f85bf2d80fcf4cdf7e2c3f0431881d0dd922a14d06b7420cea9cca694b4b5f32c2d9c8eda01
 EBUILD llvm-3.3.ebuild 6798 SHA256 b8c2deecd402a9211a601cb4c9af00afe7144b9f42345b20a34a0b76a955bab1 SHA512 6b928895c8fd28e86a55e03ca82e30a127631205c5cabfeb1414eaa5079b413739a5ffa77916ab377c8693fa639b0ae254b980c5ab881beac26871124721144d WHIRLPOOL f60a7e6629d4b9a6b88e1345f61f7ffcd5a49d42185c74d12a4aadcf50369b05b62a7f700730211ca074a7d5676aa7a78cb70ae669ab05b79f112da15f7e194c
 EBUILD llvm-9999.ebuild 10788 SHA256 54d605b3ce76424b3261851d5a6727c650b1c61eaaa84113f92f8244ed83dd4a SHA512 54781f0d9e2ef7718ea4e5d747e60c1f3d68f10fb19d1fa38c3bd4925052a1a98f20f6deb08627aba8b93e5372a13e1c5319205f9229dd60a6d1094dcf576ad7 WHIRLPOOL 95c7ab3959cc5565ebc524f7c8f76f0ce1e2050fd1f68b1c70914d5e426cad6506efa96245fe7acbfd16cf0bc78dcade90483799e76bfab47fdc9c049c586b09
-MISC ChangeLog 21828 SHA256 a60161d8c0dee2f25d3f341a528ce1eeef84262628000aeb06b166fe05f373e0 SHA512 152c0ebd0ffe69ea1ba28c23b0b4fc768a165ba6914f9aabbd2ebfd82e0cb7994cb2960e93c86a0dec7801e0fbc44a073d0836a9c467d173f094f69596a28c37 WHIRLPOOL defb0dcab625b1f965ff7d3e6d924c94df707253818381800a6cab6411ff4f0bbb950cebdbf6d889aa438f5d0313971ca7e5b502de87b8018c6bda02493c53a7
+MISC ChangeLog 21974 SHA256 fb1b3b481bf64799bddd03fc7b50082c021993f406efe31011be6067e0ec43e2 SHA512 52518667212c781df37b2130121aca43405b6fa0b69ddbb5bedda99c2f7016e4e728f7b5b69fd77c442a69d4b01b5fa77a88de18229e4c994826df9e3e956cf1 WHIRLPOOL 3828d5fdae742c5ae99637613f3329820217c943745695ac9ea3f476a797ea728f6ef04697bd60859e4c0528e6eb43925ee714f7ac4ef8a807827df844015526
 MISC metadata.xml 2632 SHA256 2600c9022e42659f3c9201ecc0387455d2b76d70225ba4c9be8420c55fa6ab07 SHA512 43702a59d30b6bbc57d7f33497b3889d3dddf228776e8a79946ca868269451e6fa5666f561ae99fe035851bb305c6e9d3eb5de5955f1cc84bd62d557ad4ec314 WHIRLPOOL 143e68e5f52836d6bc6de79e7c055d7f776e49b17d563bb71e84f37b16f207e0cede39ee6c4b29bc566fc1b102ecd16743e596509fdcf239ffb8bced13b15ac2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJR+6VlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSAXKqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZD0JwQAIozPVvn31YBEHP5uKM67kMR
-q1NZFy9Fqe0yzkC7cFsckqIxkLLajg+otQIqJxIESGD50HlAq6xgZGeapDv3N7/Q
-A1BbTLRrFvTce7XJXrBJHfZj+7uKAfHH1rpMMqpbnz8lDrlqQnkoFjMs47HQFViq
-CgwUHEGTBjvRCNB17obX884eJiUS2vKfV+OgpohOOe2qwEJKnK+P+e6j+/gI2Mpw
-zN7ZLcwB9wK3gaQQ+i2h7z7zVePDOtRtUhjxz6W8mLCDVNEsC2oQkFjhE+r3eLIn
-KZg8dW8P9plHx5zixIn+S4N8eEOkWZ2YXErKTI3B6jbj4FC7M+y+Ed8FsdeWQTTI
-WuV3t7jd3Bj4zcrfhVehOn3BW68g6Qymp/U2frqtfO4BpQALbS/+C2KrRXgl1seu
-tEiWbayz+d70UWfWpwHHAEBCM2qGe2OFcs2WV//xx+1x6eby5vam4DxvehOo/szg
-9UNd34AUjCVr4pIdCs9qHpDzL/U5fJwGLWzQV5vnJsj+K1f4gUOukVexWPMvpZQc
-am40ZkyCrU4OMkqIVXWF27D3i7EpcT7Ws47r8ff7Rir9I/wg4TsfcRgknNNWy6U7
-Q34/sjLVrBafda2+Cm1JRPadF8c7xGaisFjTJhJx4xyWysxxACKQoPVZ0c3P80uk
-jbC+p9apeKx7JH5i/F1T
-=4wBz
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDMVEQAK1h9x+bnOokOtZRnWvmktqd
+Ni0ZG3A6Ho+q4fEK4i0NCfvJU5XLEEHDVycpOQQ6A6aBtFNqpy5XfBuxeUc56JAw
+y4X+zfJvWm+MnPlpUuPhUHb5yMWvXT3NB7HAH/KWJ2dtGVonRs6V3+VYzCy4Gezm
+MbdMPajB6Ba4TFyRHEZBydDg1rwIRVe51PyQCyKDO0wqDLa5YxOQg2pHAlqsvqlv
+MXkEZOw12RTwBqZ7NqtSJn/bn4W+jFf7SPYGRZCu6/jnMkld02y0gNoNrwZpmK6/
+bAARh4pb+goEWlIo9J+I+SZaG4ykIlaiQDn9zc0pS10/2ZK3WOlfjK9bVnc8K1YU
+f/OU0wpVaE12HOMzIg4dNzxDLP3BlAVygNlyZ4vm6HfZY4GH1nzYhkwCyODoDkNi
+aj08Qu1ZoKzuihLcAe/cNoTvvp8LdnIkq7eiz6eIz3qsZAi7aP4iGbdEDCeI//VH
+fzWAWEGTyMH6LRQeLQET5t/GHhQxGMiec1eok3/4rRo7+AIA2C54KRcVdIIpV37v
+Feu/GoFYlYBWK1DvznlCNs9rof/5WLF/7AcEhMxml7kYTG0uBkwv1/HS2uW6ogbg
+T1KPfJNAu4fmjgGkRE0+Fsrvv79/CSk9Kevdx3qnbQSR2cHNh2iayFPoNPqojOWZ
+FZcJPfpPXW3ojcA8z8M6
+=WvTr
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch b/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch
index 93260923678c..6188a0fc7eab 100644
--- a/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch
+++ b/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch
@@ -1,17 +1,17 @@
-From be2ee7ba7ab4c1aec86d3d9e49e1be241afd8abd Mon Sep 17 00:00:00 2001
+From 912a22be663bc1c0cc20b9cde9c9a35e9f48275c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl>
 Date: Fri, 19 Jul 2013 10:10:52 +0200
 Subject: [PATCH 1/2] gentoo install fixes
 
 ---
  Makefile.config.in                      | 6 +++---
- Makefile.rules                          | 7 +++----
+ Makefile.rules                          | 6 +++---
  tools/gold/Makefile                     | 2 +-
  tools/llvm-config/BuildVariables.inc.in | 2 ++
  tools/llvm-config/Makefile              | 4 ++++
  tools/llvm-config/llvm-config.cpp       | 5 +++--
  utils/FileCheck/Makefile                | 2 +-
- 7 files changed, 17 insertions(+), 11 deletions(-)
+ 7 files changed, 17 insertions(+), 10 deletions(-)
 
 diff --git a/Makefile.config.in b/Makefile.config.in
 index dcca45f..e75ae2e 100644
@@ -32,7 +32,7 @@ index dcca45f..e75ae2e 100644
  PROJ_infodir    := $(PROJ_prefix)/info
  PROJ_mandir     := $(PROJ_prefix)/share/man
 diff --git a/Makefile.rules b/Makefile.rules
-index 1bc78f1..60cd228 100644
+index 32b1ebc..5bb0342 100644
 --- a/Makefile.rules
 +++ b/Makefile.rules
 @@ -277,7 +277,7 @@ ifeq ($(ENABLE_OPTIMIZED),1)
@@ -44,12 +44,12 @@ index 1bc78f1..60cd228 100644
    endif
    endif
    endif
-@@ -643,11 +642,11 @@ endif
- ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
+@@ -619,11 +619,11 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
+   endif
    ifneq ($(HOST_OS), Darwin)
      ifdef TOOLNAME
--      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(DynamicFlag)
-+      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(RPATH) -Wl,'$(PROJ_libdir)' $(DynamicFlag)
+-      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib'
++      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(RPATH) -Wl,'$(PROJ_libdir)'
      endif
    else
      ifneq ($(DARWIN_MAJVERS),4)