Revert the RPATH changes and LD_LIBRARY_PATH hack as it resulted in system clang using build tree libraries, bug #478348. Instead, alter the RPATH after installing the libs. Fix installing libLTO and libprofile_rt.

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

6 files changed, 48 insertions, 96 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index cf6519cf199c..d2da4741a31e 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,13 @@
 # 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.120 2013/07/28 15:59:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.121 2013/07/30 14:04:12 mgorny Exp $
+
+  30 Jul 2013; Michał Górny <mgorny@gentoo.org>
+  files/llvm-3.3-gentoo-install.patch, files/llvm-3.4-gentoo-install.patch,
+  llvm-3.3-r1.ebuild, llvm-9999-r1.ebuild:
+  Revert the RPATH changes and LD_LIBRARY_PATH hack as it resulted in system
+  clang using build tree libraries, bug #478348. Instead, alter the RPATH after
+  installing the libs. Fix installing libLTO and libprofile_rt.
 
   28 Jul 2013; Alexis Ballier <aballier@gentoo.org> llvm-3.3.ebuild,
   llvm-3.3-r1.ebuild, llvm-9999.ebuild, llvm-9999-r1.ebuild:
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 4123f1d6f808..7706bc08410e 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -22,9 +22,9 @@ AUX llvm-3.1-fix_debug_line_info.patch 2620 SHA256 db1f1aadebbc4c4232bdad49fb9b7
 AUX llvm-3.1-ivybridge_support.patch 405 SHA256 cc91a69be3d0f7f216a4d0484284fd054d4b0273f1c4dda7afcc005564867725 SHA512 7ec84a127eda4cbec0aaeb1e34f0606ff76e070bf1f3eb71334219b6a2e21299f30f157d022952e6f23c5e4180903239f5a4323f214041decd4ccc21f1a285d7 WHIRLPOOL 443c57305f1c9676e7191042c0ab7491a2a789433e32b5cc12050cece38eebe9ae62fd1d54200fbc32d2c7d22aedc7f6776fd250ae53e7d2afad0a325c1ba919
 AUX llvm-3.2-nodoctargz.patch 1761 SHA256 e17494aef638d2fe3fb0b669516ffcc9e560161903e1e165de0eecba684c8c1b SHA512 d12a8996d8a1160f7bad4ce3b3a9ddfb2d29d91fc160876c145f9241927b0cf4413f3b29bc2bf291f0421f61a512de8057e8f3d0029a8a09ba3f1d93582723b5 WHIRLPOOL be273271db8293829a63120cfc917711c99d8893cae6f95af2583def735131f629ee67b5a1515df007477f34abeaf5f2729d689eefdc61eb3aae6b1959971507
 AUX llvm-3.3-R600_debug.patch 909 SHA256 84ebe63a557e3734dc8ed4545f098e2496d815e6bf4a99dfcb65d649a23d2c1b SHA512 cd1b92c713edf895ab7a15494c6092e44082b40b9bb5b0fdfdc438e919456c7fcafab9a840adb165c191454948c0b42bc78ce2b4d2cfbdf371917b16351c6928 WHIRLPOOL 0f08c58c78c1d04b8e701b0b817956a37271115c1fc83ea8f0f54bf965fbc659e418abf7f429c2a29581351050346cb783f0aa9147757d4cfdfa24fd8b28d09e
-AUX llvm-3.3-gentoo-install.patch 5453 SHA256 eef00ea4898997afd1ab873fe980a4730a45fd6f7592ae728f6d5f88fad412ac SHA512 cd8daf0ef94f859ef1ed45785c310b70923b57eb12b3af41c781036f23e975f720e7d5210d09b1f735d4288f8d62a97f70bdb289e07d3aa55cf2fe6033879d6a WHIRLPOOL 379c4795a564cf1d36803ff8a5921c3417ea0480d80490053c465792dd2564d45384c7df851f8cae15b157ab2d2c443c2fbae5070c4826321e7b3fd3bca750ee
+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 5311 SHA256 4578ed7120e5548eca872d3aaaa4f810da2389d8cd4ac7dc2ea50e9532f975ba SHA512 4ee86a547b2c4ebf2d64de7af15b586e5dd9bba4f6a04ca9cc9fd9f25ce35b3b32e6d991f1d6c856138fe0b59020bcf93f82ff7b99dbb0d839729ac73c2a349b WHIRLPOOL bd1c815b3d093535d784c4867a7f9cfff4074d2dc4329455ec0ba6c7c7a38c9328c4bdf14893d1db14c1fad37448fb524713bf30cc45c2373ac3dba1ad724aa1
+AUX llvm-3.4-gentoo-install.patch 5188 SHA256 6f8c80f3809151169249c883234bfcdbc3290c1765b04b870ae55989dd847a02 SHA512 0166a9e58677339ecc1ab71bcd37c975aada5eb7786e4ad8688cf4bbcdb3c57f4ced7b5881380e43a33ba1434d32430ddf9d3cfaa84b76ffd9ced8f736d23a49 WHIRLPOOL 3151c9c531add5f9659ac9c008a037921696eec257827fd63dc64d468e7f1cedc987499172d9031090dd7d4f37a472f2e4604b75f415da23f79ac8f92fd3dfce
 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
@@ -40,16 +40,28 @@ EBUILD llvm-2.9-r2.ebuild 6380 SHA256 e95d4d6c0fefb602a04197b10d31fff3c4ef997ff7
 EBUILD llvm-3.0-r2.ebuild 5767 SHA256 62fca1169c63516f29102a3a1bb4ea74408dfd151d97a9edbfb165a2def317c3 SHA512 f7ee2bbf8b31d86c11ab07f530278e3240ec21f3c58144a9e627aef3c1fb7690935786f33368a6f56062b5daf501adebfc164fd6712985a91076897b89cdd85f WHIRLPOOL be1a6edd697e2504df033705c2cb8e37f6c17a13d77558d231172c00f91ec247785469b6e1265e25c42eb3f6f394614cf516e0e422cb54094d9ba25669c8406c
 EBUILD llvm-3.1-r2.ebuild 6033 SHA256 9b9a587d30419fa646764a96e12fc6272f73f7246138c76ba577f0d6ab3afe59 SHA512 8b969084210af4203c029bb33d5b984e0b17f6770fd489dad818154ac9f6a87bfad069eff71776f678d9eb5d5136af472d3008d5bc73fab9dc1f36811af906c4 WHIRLPOOL 928459551d7cf6e8d18244026ba82cc3dbaf2b65bd6eac8adb617695c95535ba65bd013909730d5922de5764e9d6c6c4cf007aa6acd0b493826aa938d0389a5d
 EBUILD llvm-3.2.ebuild 6534 SHA256 5532d849a32e9f7a02f6bf6d16b01cc734132fdc9a192c46ec0e25cd8b3da7cf SHA512 bc8d3a7726a7cefc1de40e3e1be0bc06d89bdad9b3462e6ad1ef96f6d850fef3e708ebef3af20fc05a66b55f2837601ccff15b528bc088c8ceb715ed12212b25 WHIRLPOOL 5105558b2422e1d01d5aab4a52a8b434f357d481156d3885375987e9b34b001b427403407349ea82511a4230dcdfad60b08a30a20b6dc5ce4839ceb035e1163a
-EBUILD llvm-3.3-r1.ebuild 11889 SHA256 9507a207e7bd52797bc22f80f92af8f8fabeccef407e1f4fd7b5c3cef9e70251 SHA512 846c75be3c2a47a28590718179519e126fc5cb1e1057689166b7911f2c5670c117b2055882a5390c582047ca5bc5b4d4c7f83705a828ceeb795e86b73e48d831 WHIRLPOOL 2c930ac8059f5c16d515695e8ea6a91d20310ec98fdf10b930debc0074597b0c8dc01be16d9f3e8761e3aa3818bc6b33522f7f6d7724a564f34d489e6ec5502a
+EBUILD llvm-3.3-r1.ebuild 11060 SHA256 efa9c13257dfe189861733c8713005086c5b7cb73f5a836e6569a8bb390530c7 SHA512 24b6f3e4de91d22d75bb99a7cba5c30225ddc93bc8cd99a2a444ec6cdcd661916f0819b087a7498156715bd2f66572041f56e856efbc14aea4d5d67900a8ddaa WHIRLPOOL 1e8f04906d146e744264f86b866ad30e377b150c2201c363bde29dbf8da7421bb9f87465ff453d2ad06bdc0c71927b86474f84ccaa89ded27ca8c2cbd1b38077
 EBUILD llvm-3.3.ebuild 6798 SHA256 b8c2deecd402a9211a601cb4c9af00afe7144b9f42345b20a34a0b76a955bab1 SHA512 6b928895c8fd28e86a55e03ca82e30a127631205c5cabfeb1414eaa5079b413739a5ffa77916ab377c8693fa639b0ae254b980c5ab881beac26871124721144d WHIRLPOOL f60a7e6629d4b9a6b88e1345f61f7ffcd5a49d42185c74d12a4aadcf50369b05b62a7f700730211ca074a7d5676aa7a78cb70ae669ab05b79f112da15f7e194c
-EBUILD llvm-9999-r1.ebuild 10827 SHA256 df417e615e698396d160721cd6297f952a9df3a0e901e1444fa9d7be281d59a3 SHA512 8c9205bedd7ed33d820e26c13ec509ea77d3cbc9c6fd29ad8c0704b6dfc4f5a276767e734994431be28fd5d2357b0662ebd5c0ad65776cf2d3b48180c1d0a73a WHIRLPOOL c7931a0188da109b7439b81dbdcd80b7b8696d121c2cbbe490a1fbf052b24eff2c577ed5776e3c048b5211ed3dbc993070838736098c36b480e9fe1af274681f
+EBUILD llvm-9999-r1.ebuild 10106 SHA256 8fdce9cb7c00b461bf9bf0874ef36c60c84199b6fed4e95e16a0c6fc833424c5 SHA512 4d2063e09bb9a937a5de92464c180d2e02b0dd8300b43250239c35ed764ad68be1dbe543a28d985572b7288a36104b6e3136551a8317554ef699c9d8e5165423 WHIRLPOOL 52dd691c67f2b911046169b17c418c25fefe80e16f0cea815beafaee8e98c177b2237a5b25911fde8f71cc65d5ed1ce217fcb35a3f780340be2ae91e9c13ae6c
 EBUILD llvm-9999.ebuild 6460 SHA256 3e791fb81ae80f89f1ae07d16a4c4b7e8a609d7bdedfb210156c86ed3217ccea SHA512 95de19c7fcf99c14b6a57bc8b034ee5b7b0272fe7e1513fd42b8ac4ba234a1704967f2692ffbc26ad7d5390a4274889747ba9d4f5a441a346f7339b7a1ee57ba WHIRLPOOL 7d213935c4c4ec0a9e8a8a6dda1092c3feb802e2f4b62b76b37149e77efb27dca2a6011070a8fafbec3be6c354e0865d1850203384937cb1ecf35c5ce92068fd
-MISC ChangeLog 20223 SHA256 27e9a1d396d5a7743b78787dbe58ce398944bb786213fcf0a88fef1afb8e0187 SHA512 4d3a5ead34f698dd63162ad05aa22fd0af2ff61315ee35f87ef7c3fea8d53b104171c1823b87acb75fb316603378194db95ceab8185f32d94d8b26f0aca1d621 WHIRLPOOL f7c7a7e5f54a590d555114b55887d331ffb16694fc1e67066f2775bbe0519360eae8a01bfb59c1c834842c0cd4af7accfa3374f33723d3b379459c7b9ee40068
+MISC ChangeLog 20612 SHA256 42716c1533fb300988aa013a6bc88dd07241f939f653731783ea29fcef3b3669 SHA512 2477103fc1c1e6bf6922a9cbee5c7dc9c6b3d95c637881d93c3d3e27234f923209f7921807ce761466f2be5bd1cf7fd63fcb4d7da5c97307af7d285ee8b9ef5f WHIRLPOOL 9e082815847c0b0e85c9230289f682bf266320b7a1d1ffc812425f704c5553421f9b9d42d93816fe88423f29977015831f1767beb7d0e356786075b6df542150
 MISC metadata.xml 2632 SHA256 2600c9022e42659f3c9201ecc0387455d2b76d70225ba4c9be8420c55fa6ab07 SHA512 43702a59d30b6bbc57d7f33497b3889d3dddf228776e8a79946ca868269451e6fa5666f561ae99fe035851bb305c6e9d3eb5de5955f1cc84bd62d557ad4ec314 WHIRLPOOL 143e68e5f52836d6bc6de79e7c055d7f776e49b17d563bb71e84f37b16f207e0cede39ee6c4b29bc566fc1b102ecd16743e596509fdcf239ffb8bced13b15ac2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH1P94ACgkQvFcC4BYPU0q5NgCgo3lRoPD9kooJ+mgB8yNIRiYL
-R5EAoKOdOHw3sfvlOPZ/LYC14sucI92P
-=c1yW
+iQJ8BAEBCABmBQJR98f3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDoagP/0FooFecBNSu7SEFzeuYGLlK
+j05suwFWExEKj8r4TIpFz/h4yaHsBCzGsDDQBQCy7U8tshjTjfOMgRW0o9IllM93
+s4xLzLnneZEIrIUltef2SN+C1r3iN6sUj8W0hgbBOxua5Wddc3CN2kvh97ueVH4O
+tKtCrwkADPGgpB1V9yTJjwWqHgp797ot6CyoUwpT+zQiKgRynDZk7xHk3NwIlA7R
+YsAm4bGcOCUBagMxKl2/ed+swiidJTYYlsN9jPSmeyF+kjrE3iu7TueYlo4cfM3B
+iFFjFBwgTjbZA9ZwMf5U6f5TXqxBIzzmyX2LnaxSfkLkAMquv6OdSlVP2W4Z26Jk
+xodmcXLkQWkYuCipO+8U0/ULXjE/Ko53QsYWHBYmx772iDMjZ4mApmDV9l4iUDku
+r5bpvzPAwjLRxtr5bIVbKRjqqW2yJ/jPNmINBpBpMZhKT3KcB8h42VJgLUmo2hjO
+DtS+AMuVbXwcuYuQkHZ7iur4Yzi1NZJRSQwr5JUwxM4SelemIvvga7JdP5Oh1Q2H
+tNM8bedGKDZbKxmwOwULJ/xbhcAQtg0f7v/ZQ6G/JT8MsC4we87O5JUJm+TfkslK
+PeGyu8cQM6so/w3BciIPAHUzPUJIOWkNiSnNdqvsv+gagnQ49WV2xR4EEOfC5YVg
+kGvdhYx9Gy+ZensyhJnu
+=Xy9b
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch b/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch
index 8b19353d4b33..e477be505244 100644
--- a/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch
+++ b/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch
@@ -44,20 +44,12 @@ index f0c542b..db252f7 100644
    endif
    endif
  
-@@ -601,7 +601,6 @@ endif
- ifdef SHARED_LIBRARY
- ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
- ifneq ($(HOST_OS),Darwin)
--  LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
- endif
- endif
- endif
 @@ -639,7 +638,7 @@ endif
  ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
    ifneq ($(HOST_OS), Darwin)
      ifdef TOOLNAME
 -      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib'
-+      LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)'
++      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(RPATH) -Wl,'$(PROJ_libdir)'
        ifdef EXAMPLE_TOOL
          LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(DynamicFlag)
        else
@@ -66,7 +58,7 @@ index f0c542b..db252f7 100644
  else
    ifneq ($(DARWIN_MAJVERS),4)
 -    LD.Flags += $(RPATH) -Wl,@executable_path/../lib
-+    LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)'
++    LD.Flags += $(RPATH) -Wl,@executable_path/../lib -Wl,'$(PROJ_libdir)'
    endif
    ifeq ($(RC_XBS),YES)
      TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/llvm-lto.XXXXXX)
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 659486ae6c57..93260923678c 100644
--- a/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch
+++ b/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch
@@ -44,25 +44,17 @@ index 1bc78f1..60cd228 100644
    endif
    endif
    endif
-@@ -605,7 +605,6 @@ endif
- ifdef SHARED_LIBRARY
- ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
- ifneq ($(HOST_OS),Darwin)
--  LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
- endif
- endif
- endif
 @@ -643,11 +642,11 @@ endif
  ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
    ifneq ($(HOST_OS), Darwin)
      ifdef TOOLNAME
 -      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(DynamicFlag)
-+      LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)' $(DynamicFlag)
++      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(RPATH) -Wl,'$(PROJ_libdir)' $(DynamicFlag)
      endif
    else
      ifneq ($(DARWIN_MAJVERS),4)
 -      LD.Flags += $(RPATH) -Wl,@executable_path/../lib
-+      LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)'
++      LD.Flags += $(RPATH) -Wl,@executable_path/../lib $(RPATH) -Wl,'$(PROJ_libdir)'
      endif
      ifeq ($(RC_XBS),YES)
        TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/llvm-lto.XXXXXX)
diff --git a/sys-devel/llvm/llvm-3.3-r1.ebuild b/sys-devel/llvm/llvm-3.3-r1.ebuild
index 4677c77fef04..881699a36bcf 100644
--- a/sys-devel/llvm/llvm-3.3-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.3-r1.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-3.3-r1.ebuild,v 1.2 2013/07/28 15:59:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild,v 1.3 2013/07/30 14:04:12 mgorny Exp $
 
 EAPI=5
 
@@ -22,7 +22,8 @@ KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux
 IUSE="clang debug doc gold kernel_FreeBSD +libffi multitarget ocaml python
 	+static-analyzer test udis86 video_cards_radeon"
 
-DEPEND="dev-lang/perl
+DEPEND="app-admin/chrpath
+	dev-lang/perl
 	>=sys-devel/make-3.79
 	>=sys-devel/flex-2.5.4
 	>=sys-devel/bison-1.875d
@@ -122,9 +123,6 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.3-gentoo-install.patch
 	use clang && epatch "${FILESDIR}"/clang-3.3-gentoo-install.patch
 
-	# Fix insecure RPATHs that were removed upstream already.
-	epatch "${FILESDIR}"/${P}-insecure-rpath.patch
-
 	local sub_files=(
 		Makefile.config.in
 		Makefile.rules
@@ -150,19 +148,6 @@ src_prepare() {
 	epatch_user
 }
 
-llvm_add_ldpath() {
-	# Add LLVM built libraries to LD_LIBRARY_PATH.
-	# This way we don't have to hack RPATHs of executables.
-	local libpath
-	if use debug; then
-		libpath=${BUILD_DIR}/Debug+Asserts+Checks/lib
-	else
-		libpath=${BUILD_DIR}/Release/lib
-	fi
-
-	export LD_LIBRARY_PATH=${libpath}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-}
-
 multilib_src_configure() {
 	local CONF_FLAGS="--enable-keep-symbols
 		--enable-shared
@@ -226,9 +211,6 @@ multilib_src_compile() {
 		GENTOO_LIBDIR="$(get_libdir)"
 	)
 
-	local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
-	llvm_add_ldpath
-
 	# Tests need all the LLVM built.
 	if multilib_is_native_abi || use test; then
 		emake "${mymakeopts[@]}"
@@ -259,9 +241,6 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
-	local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
-	llvm_add_ldpath
-
 	default
 
 	use clang && emake -C tools/clang test
@@ -289,24 +268,18 @@ multilib_src_install() {
 		GENTOO_LIBDIR="$(get_libdir)"
 	)
 
-	local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
-	llvm_add_ldpath
+	emake "${mymakeopts[@]}" install
 
-	if multilib_is_native_abi; then
-		emake "${mymakeopts[@]}" install
+	# Fix rpaths.
+	chrpath -r "${EPREFIX}"/usr/$(get_libdir)/llvm \
+		"${ED}"/usr/bin/* || die
 
+	if multilib_is_native_abi; then
 		# Move files back.
 		if path_exists -o "${ED}"/tmp/llvm-config.*; then
 			mv "${ED}"/tmp/llvm-config.* "${ED}"/usr/bin || die
 		fi
 	else
-		# we need to install libs for llvm, then whole clang
-		# since libs-only omits clang dir
-		# and clang install-libs doesn't install headers and stuff
-		# (we build it anyway, so install is not a problem)
-		emake "${mymakeopts[@]}" install-libs
-		use clang && emake -C tools/clang "${mymakeopts[@]}" install
-
 		# Preserve ABI-variant of llvm-config,
 		# then drop all the executables since LLVM doesn't like to
 		# clobber when installing.
diff --git a/sys-devel/llvm/llvm-9999-r1.ebuild b/sys-devel/llvm/llvm-9999-r1.ebuild
index 1e47109c50f5..a9ffa5e05727 100644
--- a/sys-devel/llvm/llvm-9999-r1.ebuild
+++ b/sys-devel/llvm/llvm-9999-r1.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-r1.ebuild,v 1.3 2013/07/28 15:59:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999-r1.ebuild,v 1.4 2013/07/30 14:04:12 mgorny Exp $
 
 EAPI=5
 
@@ -20,7 +20,8 @@ KEYWORDS=""
 IUSE="clang debug doc gold +libffi multitarget ocaml python
 	+static-analyzer test udis86 video_cards_radeon"
 
-DEPEND="dev-lang/perl
+DEPEND="app-admin/chrpath
+	dev-lang/perl
 	dev-python/sphinx
 	>=sys-devel/make-3.79
 	>=sys-devel/flex-2.5.4
@@ -129,19 +130,6 @@ src_prepare() {
 	epatch_user
 }
 
-llvm_add_ldpath() {
-	# Add LLVM built libraries to LD_LIBRARY_PATH.
-	# This way we don't have to hack RPATHs of executables.
-	local libpath
-	if use debug; then
-		libpath=${BUILD_DIR}/Debug+Asserts+Checks/lib
-	else
-		libpath=${BUILD_DIR}/Release/lib
-	fi
-
-	export LD_LIBRARY_PATH=${libpath}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-}
-
 multilib_src_configure() {
 	local CONF_FLAGS="--enable-keep-symbols
 		--enable-shared
@@ -203,9 +191,6 @@ multilib_src_compile() {
 		GENTOO_LIBDIR="$(get_libdir)"
 	)
 
-	local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
-	llvm_add_ldpath
-
 	# Tests need all the LLVM built.
 	if multilib_is_native_abi || use test; then
 		emake "${mymakeopts[@]}"
@@ -237,9 +222,6 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
-	local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
-	llvm_add_ldpath
-
 	default
 
 	use clang && emake -C tools/clang test
@@ -264,24 +246,18 @@ multilib_src_install() {
 		GENTOO_LIBDIR="$(get_libdir)"
 	)
 
-	local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
-	llvm_add_ldpath
+	emake "${mymakeopts[@]}" install
 
-	if multilib_is_native_abi; then
-		emake "${mymakeopts[@]}" install
+	# Fix rpaths.
+	chrpath -r "${EPREFIX}"/usr/$(get_libdir)/llvm \
+		"${ED}"/usr/bin/* || die
 
+	if multilib_is_native_abi; then
 		# Move files back.
 		if path_exists -o "${ED}"/tmp/llvm-config.*; then
 			mv "${ED}"/tmp/llvm-config.* "${ED}"/usr/bin || die
 		fi
 	else
-		# we need to install libs for llvm, then whole clang
-		# since libs-only omits clang dir
-		# and clang install-libs doesn't install headers and stuff
-		# (we build it anyway, so install is not a problem)
-		emake "${mymakeopts[@]}" install-libs
-		use clang && emake -C tools/clang "${mymakeopts[@]}" install
-
 		# Preserve ABI-variant of llvm-config,
 		# then drop all the executables since LLVM doesn't like to
 		# clobber when installing.