Update Gentoo patch for -9999, bug #534080.

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

4 files changed, 107 insertions, 18 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 6920c81f173c..a7b84474bca4 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.214 2014/12/31 02:04:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.215 2014/12/31 10:37:36 mgorny Exp $
+
+  31 Dec 2014; Michał Górny <mgorny@gentoo.org>
+  +files/llvm-3.6-gentoo-install.patch, llvm-9999.ebuild:
+  Update Gentoo patch for -9999, bug #534080.
 
   31 Dec 2014; Mike Frysinger <vapier@gentoo.org> llvm-3.5.0.ebuild,
   llvm-9999.ebuild:
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 01e85eb391bd..d0fed8b95fb1 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -38,6 +38,7 @@ AUX llvm-3.4-gentoo-install.patch 3528 SHA256 fa2de6dd186091b255832a9b5cb654eddd
 AUX llvm-3.5-gcc-4.9.patch 1722 SHA256 c73f64311ff67534b581729b3ef0fecf452b86961c3b668ac2e6b50f1eff0bd2 SHA512 5ad0a742fca3eb9e08a183af9f90370baf85528bba6f3083d19592fe2a704950ca8c6bf9e930f9834255de3fc5832c49a06c9ca29a66e45928d9047abd9ad8ac WHIRLPOOL dac24fcb47d8b094ffa6b4403dbd7604901dd0f5ef6665a882380109584e4de815b2f277e05d44c05e1a3d22a7003075b2b2649f3f614f299b38bc6d594400ae
 AUX llvm-3.5-gentoo-install.patch 3204 SHA256 0c97173613505ea92f0aa79d4e04e797f1917fdc33b34daee05752bb52336d53 SHA512 f60b04f1fc7798f7869f3d80e4c163086c398e01b81220d60ccff42be5899fa036d5ab95257933e89e4c5efd04267a09015917c6a617b86b82d7ab4f5d0de221 WHIRLPOOL 81ce5835b9eb1fe1b162f35d6e37762cc8d613e67c5791f078ecd0e354a87eb92e52452bd6e9a7f70953dabea99d197786e87ed64dc802223149b8e97d6de265
 AUX llvm-3.5.0-fix_LLVMExports_cmake.patch 1563 SHA256 924303a7fa7ee46276eb2984e3e2d9304873df1d63c0d878371cf98b4094aef0 SHA512 8e8c3ae2c8e2bac0d78a7f572ccfae9cfc30e52ffbfa953596c075cf6adc4e5881d2b80cad4d87bbf1de837d88352334bb51a331adc8d8db74354945c036637e WHIRLPOOL b525bbf3a7ade5906e9e35315af1ccb50c4392e1d104c516927a3ab9b627bc3d0fcf41bd0b77093f6743131f801d37d53d1065371e5c86eb4e7d538eb969b3a8
+AUX llvm-3.6-gentoo-install.patch 3169 SHA256 318288e667623e22c441f7a1da8c3e27b3fff7426839a58a05e43dd0ac37d443 SHA512 9e13fd8606c6aa636d5e1cd3e32781fa4cae3266acf306f5c38f052a7520fc4b603022244b4502045d968c9ca28292539a17caa33b9b470353adfdbb8e159321 WHIRLPOOL 8f3b9b5150d2a29ba4f94a86235d12cf96c1a28ceb7f55fe7b90b3e5e074fe4883d449ac34cbe823ccc22f1ab8b3e2d05dadb39abaaac0a17e3870bbba1ea14e
 DIST cfe-3.3.src.tar.gz 9425539 SHA256 b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996 SHA512 06773f43f7d3529f06edb029f7de398f06a700a0f2476e00c4727e70c291028221bfac23625dfd2c220d6ac91a21670848187a934b99a21801c695127371afcc WHIRLPOOL 8b97b527f19015dd3283b9e174615170e639793f64c635ccc4ee4d8216f8de759fd0121a8ef3513fa1c6ad19b31aa3529091ffb44a01ee858edfef400881596a
 DIST cfe-3.4.2.src.tar.gz 10612313 SHA256 5ba6f5772f8d00f445209356a7daf83c5bca2da5acd10de517ad2359ae95bc10 SHA512 e01fa8e312e9b3b7b3cb572ac21349161aaa50078ecfe7bded273b75db4a0c44acde524f8fdfcbeec54c61eeeb8339e9917d1f205a8fda18e34fe7ccbe89c36d WHIRLPOOL 153208b1a60bb5fbe92a7162cb26bbe70d591e7db9dcf06fcd54efc539bbff0403ec88e64236969c9f256e5586bc333840bd6178fd158577d6fe228d9edd4dcd
 DIST cfe-3.5.0.src.tar.xz 8233432 SHA256 fc80992e004b06f6c7afb612de1cdaa9ac9d25811c55f94fcf7331d9b81cdb8b SHA512 b26a5e2cd81c150607c23b22fafc0d9c7f12b83b45e476b8e75bf5e99d42be7c98ffeac7349df664f01b00900864a01429860b298e48961861377a4b2daf3e49 WHIRLPOOL 5dd8b6fe97933b74f1668b1d753c16cd3bcd05ccf72aac1283aa449caf93f5ba88ae79e7668f7e79b554e1421549a87af21c86cf92657c1b4d77744165718ce7
@@ -66,23 +67,25 @@ EBUILD llvm-3.2.ebuild 6534 SHA256 eb16cc91887fdb035722d268caaa3e4843825403786fc
 EBUILD llvm-3.3-r3.ebuild 14190 SHA256 d16d933d6791ef7dbe08aa43340bb9924e063af11fa9e13ca8230509240d2c15 SHA512 c986e970f489f7ff79188043db397383e3c567735c8f4a1e8a13b89ef6a3a9f4b8550218444eadd04ef3a14143ab05dc839b3dbe935128f5437157d3aaec02cf WHIRLPOOL 910f7d65902548270835371a5076c746534c0b57487fb8fb149a893454e86e942beed284d6b7491cfb2f043a6e19554f97aec829067938192e75f64bd0fd7a7c
 EBUILD llvm-3.4.2.ebuild 15628 SHA256 f20ecd20046059e2b3b3fa18cec3cf7ed22269d814b640a56756d70c7de39df1 SHA512 9a9185d9d24e3304e7664dd7e719a2fd9cd6e160b7b97be2e473c0867f40de7733e8ccc574d15c1d0b7ee7b314c62afa88cf45ec5bd344ba78ed391509f38bc9 WHIRLPOOL 3c60b96db4a79197c47746c43e43427320612792f61f5358256eddd4988a36b50cf3f26be6b0e88f866c8bba0f31a792ad9711b5ba07ec6ba98264a832057e89
 EBUILD llvm-3.5.0.ebuild 15105 SHA256 792c73b5721dd9e657988b80045d06d1d915fd2cc9b338c8f514b7af8d31d11d SHA512 de64fbcfcdac75a8f5300a9e6d53f266e45a1a76ae4e51e37e199903c91c87d983d101383c902c3d5a1a59b2bd2dd810b4c2aa2e83a018b7b8f8fa7011d05a18 WHIRLPOOL fb6a7505097af65ce26064b70374c85c7e74806818b76dc541c3e120a74271dbb5ea6bb075ce5f3021e97009548a4b946984f323e7edec33c48e47f490a9a214
-EBUILD llvm-9999.ebuild 13914 SHA256 a2160cb5bfcfacd8b94a3527a1c0b1113cb817b261598d5e5df40b32740a8d9d SHA512 c7bd441e58b32f202222378f02075eb095e5ff5c5ff4b773fd6d17c5e7311dbbc925cccc1a676672fac8ac4b38bf747017c0e0304a67cfb26ecb2468b5a59a97 WHIRLPOOL cd302273a1a023fcc00156c3f1ecc94feec2c89a17201d6c17e3866490ed166e7be4d38851321c7fdb715ccfbf8086cf35d8dcb1408fa0ef4a57a741395018d9
-MISC ChangeLog 36098 SHA256 c8bbcbb443706f1e7313f35ab25552f6e5d7ad71a0f2a2eef61f7ccf05043d5a SHA512 c0dba024f7c8c72b73e880d64c3cafe8199ba613be5e0c6e6521e2893aea6b4f2c3861cfb297955b8a7170b7dcebcd3ee9d40a91de0d2bedf2f676312216bf20 WHIRLPOOL ce0f565cc90b115fe50eb56849a5ea5b74d0401f560da8784a5edc28b92326e1be238125af26567ae5718d3daffb7ce738f3d6bc63b2fbfdf8acccf35a464625
+EBUILD llvm-9999.ebuild 13914 SHA256 96c731cfe077bec0da28a5dc82179e6e70bda7fc77c8c25ed4d64eca845738f8 SHA512 ed6a18ae0a1c59c3327d118d478a03e4a73953d9a5a3b2c0953ce80076f2d07db9e83e078a7af00e094191d2dc1c3372640340a63ccb7bac77a9756f679c5f98 WHIRLPOOL e70e3977d37f1dcbda3541f028c1d45065453f23ec280bba2aaab69386f390a2a2fea5cbfc7050ae16ef5beb0ff3336839e988b6cf8d95235097713d627fba8b
+MISC ChangeLog 36253 SHA256 32f7e1523920905c5ad5d897af87688e39d9b3399132cea42a0eb86f0c3c865c SHA512 3b20164f224bbf6a92103f5636a6e991b932910625218a5140d7823e823046b0edfc6320ed96e51c69aabd0feb5c71c33935b8825018df8e7124211803c6b215 WHIRLPOOL 5eb1323c7ca6ea79075837cb827fd76566afa45256c9266af75ee7678e5829821d2769ddace5bf012d898b5206c07967fb068ac171fc74312c1253d0aa25ef1b
 MISC metadata.xml 2787 SHA256 22dc7b91c98fb4258271cc9cd4bd99f214b30f258bbdfea83dc37ac74df8d498 SHA512 4fca0d2551a889e7800c688077adf405697d05730bf66621ac53fdefeeeaddb7a8d868973edc9a6fe48e9a07734f1d43fd88229bae693fe181a7dbb95eeb9481 WHIRLPOOL 6284033d40bef02510f924ec1e6a9d3e1072bf26945fdedde0ddaf1d6d35c3d30971cdefa583a8e4d9db3da67bee04145ace15ded4cee63f534588b66633c76b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUo1m/AAoJEPGu1DbS6WIA5v8P/23FKmrNvhfWIHDNMHzih2P1
-au4zZY/tMHFz5DrEW5bqk9yU0Vdd1MtZQKyRaBbmAw8aZclIYQyeSXnV62Iys5lF
-VEyVwvaeTDp1CGN72f3jtE6gbc17nnEDWfne7E1k3ptqNaRvPYabT0Vh4hMnx6r1
-GT7wFFTDMbAKfjBKoVw5p1F8zVcJHEV2CDPSGoCoz+rEkr1BDKiSBp8hFaFcniqh
-RabHl4mTDirB5f3qT8d9lGliF0xgaRRiGkx4YebZ4/LCip/B6Hm0BZaLtqyfnz0K
-qpSwtgROCH+d831gJwDvPmMFo2UdwhvlHw+GlXRoGn0Kwqf7Kp70U/tmUPP/H15i
-V4qqvuB7/XhHTHTXQeLBKfArMWelEWEpLTM7B56dC9nthFX6X1yW1o9LvMuHAEAq
-PYGVlcIgOpkNLNsPCmAebxkREaLweu+SUV/i8924caX9uvV7w3RphDqTj+TlbOZh
-HVHFei/Du3v3uE5GM0yO6JLLPKli58X6oVs9qygfD7avfoBDT43O6YiFzSOaTzSc
-ucFkH7c3RDDR5iRxFcgLRLxURVZuDesCTq81OnR6G0T5RlMKOrdA7e3OTwda5bq5
-FsJEjnYnA9FWJf30t8FFmJRUvyDA9SgkpxyG0x24bXYzBnZmsqnebKJy9U+WnJ4R
-7+LvEj5bB7zT6EYna0zq
-=lR83
+iQJ8BAEBCABmBQJUo9H5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOUqUP/3PG5ymTYc4xQ+rQcMxkVx6h
+JBe0tt4xW0JKG8jZVTeVib31vSgE5YQDO8AVUYgDrH4CSKB3gW3XTt50tKJcH5XD
+zrg+Xi6eT+/hNhLv0W8HPtiuk7IA80Zd83OdKuPf/Zzx2+h1eGilFfzIAhDlYoIY
+P3Mj2+wRKbjRTusFZR7/6/foAT0kUGfAUK03SxWZCw7FrlytPSicZxQllLojeVJA
+ln0p/7ZPE8qEJdVUp9fxWscxKykFjgHekoZeZegjYyoNidQ6gwf+IW+vrw4dwUZp
+yn4p8e+4D7fLty4MbnwMZiVxqILDj5/CMsjZUhr/WNn0oDgTdI3vBEi3MdjgLCHv
+d9wAFlZ3JuVLJnrvQdw8K74VFoLGLCznfim1pz6U69pebV0mmlq2frz7/7zjaIjs
+eeqUCZgnP+BhkZrmWchhvgSBMJ+IpkuB1D6RWhfh7RzRNhTfj+lYHZwlx4FQFoHU
+kbVtMcqGkrwCKtcqhjV+EgRx5/exYoHflpVI4v9bbm6OLfQmu0oVuFwppK4ZImxL
+gnFrXb2eyv5QPdWW1jVzlXF5+DEN3PaoHJuWhSOMDRteydc3YrjHjyCue63oDBd3
+VpAux4YGk2rMnq555ajB9Z3cW6RsBjRmURj+zf6VcMOEteqOS+zzjU1TEM9HiqUc
+6QgZxyuKEojxhNeG8mIM
+=AjRh
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/files/llvm-3.6-gentoo-install.patch b/sys-devel/llvm/files/llvm-3.6-gentoo-install.patch
new file mode 100644
index 000000000000..c4d0db2c0743
--- /dev/null
+++ b/sys-devel/llvm/files/llvm-3.6-gentoo-install.patch
@@ -0,0 +1,82 @@
+From bb016afeba4d9e886e776565a508634a261111a2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 31 Dec 2014 11:26:12 +0100
+Subject: [PATCH] gentoo build fixes
+
+---
+ Makefile.config.in                      | 6 +++---
+ Makefile.rules                          | 2 +-
+ tools/llvm-config/BuildVariables.inc.in | 1 +
+ tools/llvm-config/Makefile              | 2 ++
+ tools/llvm-config/llvm-config.cpp       | 2 +-
+ 5 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.config.in b/Makefile.config.in
+index d34a2d5..a26cd08 100644
+--- a/Makefile.config.in
++++ b/Makefile.config.in
+@@ -99,10 +99,10 @@ PROJ_internal_prefix := $(prefix)
+ endif
+ 
+ PROJ_bindir     := $(PROJ_prefix)/bin
+-PROJ_libdir     := $(PROJ_prefix)/lib
++PROJ_libdir     := $(PROJ_prefix)/$(GENTOO_LIBDIR)
+ PROJ_datadir    := $(PROJ_prefix)/share
+-PROJ_docsdir    := $(PROJ_prefix)/docs/llvm
+-PROJ_etcdir     := $(PROJ_prefix)/etc/llvm
++PROJ_docsdir    := $(PROJ_prefix)/share/doc/@PF@
++PROJ_etcdir     := @EPREFIX@/etc/llvm
+ PROJ_includedir := $(PROJ_prefix)/include
+ PROJ_infodir    := $(PROJ_prefix)/info
+ PROJ_mandir     := $(PROJ_prefix)/share/man
+diff --git a/Makefile.rules b/Makefile.rules
+index c8c971f..d1258b1 100644
+--- a/Makefile.rules
++++ b/Makefile.rules
+@@ -283,7 +283,7 @@ ifeq ($(ENABLE_OPTIMIZED),1)
+   BuildMode := Release
+   # Don't use -fomit-frame-pointer on Darwin or FreeBSD.
+   ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin Darwin DragonFly FreeBSD GNU/kFreeBSD))
+-    OmitFramePointer := -fomit-frame-pointer
++    OmitFramePointer :=
+   endif
+ 
+   CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer)
+diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in
+index 3f51f49..513ea89 100644
+--- a/tools/llvm-config/BuildVariables.inc.in
++++ b/tools/llvm-config/BuildVariables.inc.in
+@@ -26,3 +26,4 @@
+ #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@"
+ #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"
+ #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@"
++#define LLVM_LIBDIR "@LLVM_LIBDIR@"
+diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile
+index 1ff8b6f..5d73c6e 100644
+--- a/tools/llvm-config/Makefile
++++ b/tools/llvm-config/Makefile
+@@ -65,6 +65,8 @@ $(ObjDir)/BuildVariables.inc: $(BUILDVARIABLES_SRCPATH) Makefile $(ObjDir)/.dir
+ 	  >> temp.sed
+ 	$(Verb) $(ECHO) 's/@LLVM_TARGETS_BUILT@/$(subst /,\/,$(TARGETS_TO_BUILD))/' \
+ 	  >> temp.sed
++	$(Verb) $(ECHO) 's/@LLVM_LIBDIR@/$(subst /,\/,$(GENTOO_LIBDIR))/' \
++	  >> temp.sed
+ 	$(Verb) $(SED) -f temp.sed < $< > $@
+ 	$(Verb) $(RM) temp.sed
+ 
+diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
+index 224035a..57180ac 100644
+--- a/tools/llvm-config/llvm-config.cpp
++++ b/tools/llvm-config/llvm-config.cpp
+@@ -265,7 +265,7 @@ int main(int argc, char **argv) {
+     ActivePrefix = CurrentExecPrefix;
+     ActiveIncludeDir = ActivePrefix + "/include";
+     ActiveBinDir = ActivePrefix + "/bin";
+-    ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX;
++    ActiveLibDir = ActivePrefix + "/" LLVM_LIBDIR;
+     ActiveIncludeOption = "-I" + ActiveIncludeDir;
+   }
+ 
+-- 
+2.2.1
+
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 5ffc99828802..3c745c0010ed 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.95 2014/12/31 02:04:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.96 2014/12/31 10:37:36 mgorny Exp $
 
 EAPI=5
 
@@ -145,7 +145,7 @@ src_unpack() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch
 	epatch "${FILESDIR}"/${PN}-3.5-gcc-4.9.patch
-	epatch "${FILESDIR}"/${PN}-3.5-gentoo-install.patch
+	epatch "${FILESDIR}"/${PN}-3.6-gentoo-install.patch
 
 	if use clang; then
 		# Automatically select active system GCC's libraries, bugs #406163 and #417913