gentoo resync : 28.04.2019

8 files changed, 44 insertions, 35 deletions

diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index ee0fb219061b..ae16d2d1c6d4 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -3,7 +3,7 @@ AUX 5.0.2/0001-Fix-return-type-in-ORC-readMem-client-interface.patch 1299 BLAKE2
 AUX 6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch 1575 BLAKE2B 3a650b244c2b97fa6e76327348a7bb00ace08b18441a59af238ccf0cdea4409e2d0b46c0a381737d7d0879dbc5eb0f71007fee0c9f0f5b92369453223d25397d SHA512 f09bf2b2bbac1f875f32f8761697717fbbfda2939fcccb8b03ecb8e4e65377c875355a3523d54f81c53d11bfaf3557f80000918bea003cfdba0662469283563a
 AUX 6.0.1/0002-llvm-mc-Produce-R_X86_64_PLT32-for-call-jmp-foo.patch 13865 BLAKE2B 03f677e386115c3c7333db39664f75b2b4c22e18c2e487e515dc2a55acaa1bf569d2945ae620420b4b4323fb2e4fb7d3c3313dcc7e648942afa25d055d36efc7 SHA512 2820793ef29f08b55b7d94ef700085dce02c6a029c5877a77c5296e9a05dfc9946d10ee66d2d3d8a150cd511e3346d2acf259b873aeed25c1b0aaefebe95790d
 AUX 6.0.1/0003-X86-Stop-X86DomainReassignment-from-creating-copies-.patch 4263 BLAKE2B f0b073f90968b008ce758a43f00a4268dad1037f949704f3d86741319b6972d1ad69bed0944152f21b837486404948c1f290babc90a4da5ac0c300f0d2a868ee SHA512 efcb4b4bf0320304df680e6b69d8db1e732539e6cde0d9f11566e00533ecf8383d1520edca0a69c96e1722b33dcc8bc33da23470faf59774724cedc9f522d9b1
-AUX 7.0.9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch 2626 BLAKE2B 6c3afe6941568119b6bbce1c66be913a29a2ac7853a881804c1c22e981075f1677ca7e4744738ad858f58a58c1a7295aeb5f1d87b3a2b2adfb971a54d76c04fb SHA512 34a84427c34fa8886f55e05cf0ffce258cdee8e98190e070eb40dc555a30784c49ebe4f946f7ea51b7d00fceb8071fc745007250dc5b5a61c4d2bb9910672ec5
+AUX 7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch 2626 BLAKE2B 6c3afe6941568119b6bbce1c66be913a29a2ac7853a881804c1c22e981075f1677ca7e4744738ad858f58a58c1a7295aeb5f1d87b3a2b2adfb971a54d76c04fb SHA512 34a84427c34fa8886f55e05cf0ffce258cdee8e98190e070eb40dc555a30784c49ebe4f946f7ea51b7d00fceb8071fc745007250dc5b5a61c4d2bb9910672ec5
 AUX 8.0.0/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch 1452 BLAKE2B d8b9b34b077bf33fd0fc6fb50937f5e9a8b90730fee3b6c08b5e0659fd37092ad073580ded506fbeba4fa3503f0ea6104d7adefa41f7eeef9a17a3189ba1212b SHA512 fa2aa9bde1b153f42037bb864b1a4dce0288f567c6a116a4005e45ca322808041562c2d2cecca5e3d84e44bf73bed600a05dfda85107c164415912ef60141dab
 AUX 9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch 1188 BLAKE2B 72311a8da991b9f3b98523baefe6f5b31aa7f9101c388f35484dd5f384a08e838ea42a17447ca17a0dfe6b7d3c20abbdf0e8afee72e8ad5d46ec38b8d55307c8 SHA512 0ada997db2a0eb875105fb212dc3fc3077b9c4f7804d78c33c4b1f512bf1267295f325153ae14c00404c86e576ae1c78a6aeb0a57d1d4525aabd1169c21806ef
 AUX 9999/musl-fixes.patch 1258 BLAKE2B fe275412bc908884239ea71de9a9ddf1d2f64debaa1a9ada18170195a7775c41571600ed3666343bf967aff5f9117900f73155f60de5077bc4584cfc2f782f53 SHA512 314dcbe846a66312c9f1634f4ff3f4670b3db1d3210bb550f1d3877a423333ba042da2e90c8736918a36be4d4faf58dab8d3236d4f26df5af7f7f019b0e0ec8f
@@ -15,15 +15,17 @@ DIST llvm-6.0.1-manpages.tar.bz2 102656 BLAKE2B 9088ca0bdda69f63354e61b7495df545
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.0.1-manpages.tar.bz2 121157 BLAKE2B d209e292dde0b528bca6e6438eac83d3a762e83fb333fa075f973806ec802a19e24ec6f0212fffe4757257f2840a5f00960d121024db2d8ab8b99d95bb42b1da SHA512 56dce233d17c4c3c1e4860f31d30e227364c99f04527e8e8372f308e30d09a297ca21a37b4eb2eddab69bee88ef5867446affd1ccd5d7cb1c12d9c9002a1101c
 DIST llvm-7.0.1.src.tar.xz 28311056 BLAKE2B 737aa6144a415e41a4ff2c8bd5a727d6f14d7b1810c62cbefa5a25fe642c98cddf8a28e35c7e9783373aa3b96f5c0943229e229ad1b43e56e9ed6db0f27ab128 SHA512 ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df
+DIST llvm-7.1.0-manpages.tar.bz2 120786 BLAKE2B b52a7afe7c5c170894e910ef2c651a5f38f0bd41147a2c63dc5b8a92f0ec37512e913e68efce51e1643e8f20cf0f3f088d31d19c541d2ff361ecb7d89b234b6c SHA512 78a526d889a8e62accf422655acbb4d17e3c22b0f0830003db0068b3c01c367ac32ce4f4be4cbb2966274440865557c25795205af2a59a054a6f6964294d289f
+DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.0-manpages.tar.bz2 140542 BLAKE2B e6c58865ace0b8848ffe825e931a639daa5b22099317b3263acf8df4b8d5e1e97ed54a85b9241e6874b112c67114bda5617c3014c3bc1430c179bdf389e77269 SHA512 198f5bde8c610aa7953b325fc29c2bebe5c3d81469af6273975ed32cd739a9936813fca7399acc49809c322cf73fbdaa77a834f889bd78fe4672024965ea47fb
 DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
 DIST llvm-manpages-4.0.1.tar.bz2 87981 BLAKE2B 79ffd254ee5c6e09159c954913ef820f74107d4fcea5e3ed82592dc36af8fdfbf1e850547ba8bfc20aa9a5ecdd26c50329e6a6d558ae3aa5475a930789ce3e01 SHA512 d5b3213567c25db58ef364d272314a79c311a80fc21d98c09a5540af45a8190a38f489228663fe9a9b63bf0f2b952c460c4196a8fc8d6f221619f6e7ed2fc415
-EBUILD llvm-4.0.1-r1.ebuild 6989 BLAKE2B cc642b77898de0b10ae66679acc9c76191abb11cba1d2f3f7a9682e46696e7cee876875e53cf9b20355c81a096e0bc65528b23946e49a913bb5fbdadfe2fcaad SHA512 81a34824986c8c77863a8eeff9bc6671870c2754c5f2d8770bd05853b10ba5617a2917354c9c35a49a934f318b37b6e176fd64ebc5ae95c289920eb56a3817ce
-EBUILD llvm-5.0.2.ebuild 7799 BLAKE2B 85d9788489be3d3efc7494329560a7886e56605b58d3f46b753ad31f61a3878df6b29bf2d27bae07b20ce70dcdc3fcb772523f05ba654daedc22488c317c336b SHA512 5d1a2f25328283a314dfeefac9fedba6008b0b1c1233bd72a9d8caf7e2c9db7ec73a5b95b9dfd0546ee108974b8b11b83f4267ac739f0a2554728f13bc6b6c32
-EBUILD llvm-6.0.1-r2.ebuild 8173 BLAKE2B 9b735e8161bf235b538e6ab375ea17b428cb5c3fe8e601579d934f303d9c63820c08d571e4cdf0bfe7170114e294addef772a08658ad2994ea1e93c5d5ef7647 SHA512 666cdef4c47272819e26a0cff741d5c0a173ce4dba56dd8c4d0409c522230ce80b07d80be577972e8001d82f11ea81c150dfc240e1f01001dc0bd90593c3a63e
-EBUILD llvm-6.0.1.ebuild 7824 BLAKE2B d816d77974b826836a9aced3387b6a3583859d15b7b8c83499b5f5eb04932ea89966af4b49ea5e2b320c997051891387dace2d2d84bde8f2c0d6f3b26fea55c8 SHA512 bc460c9e7bee704c2d814c9911398d5125196337f410489396a9254d79b2d421c2ca33ec350b3342bb073c761d2e180e73eb474281af3aca2194eb291ea223ed
-EBUILD llvm-7.0.1.ebuild 7720 BLAKE2B a1a0f4e79ac4728c84f13801997dd49472d385c0df5eda400988480aacb2ed4e282db9ded6d2444135f9a2cf37dca9f05fe7974a02595c922ca42e2cecd7707b SHA512 1d1e17afe9153f96a18da9533a58b6543d8874a0bfac66ac603bcb078ee7af4f83ba5a4558e6827656e5aaf3a7f81518bfe0b6e0485dea6ef19ec0e5ca9adc61
-EBUILD llvm-7.0.9999.ebuild 7474 BLAKE2B 5e4b8cdd350d479f4a4d61a5489f52933d0066b558bbaee7fb069d7722a2552fd9dc64b3124e8d928339be6ac6d89135a75c67a95c2225dd4fe520d10477d532 SHA512 aeec7bcbad7195bf56415e3f21fd695a345b85dd3f17eab664fa13ff4d2b8cac3d53ad10d1e031bd2aad30edd35a5cdd71920a3e7a05ba40bc73684532904e61
+EBUILD llvm-4.0.1-r1.ebuild 6986 BLAKE2B 5f0933d45e85df83435582df21da19379232464f23e578d09dde653940728a7a3a2cb0d46eb9b4efe3b28a1b84762d059248b9f3ba21b16769c279309d223d2f SHA512 eb1c002494512ca1582e40a02f6cdb9270b2c05921844184efa5e3cb61e8d7e5598a3c19b9d5a4044c243a476a34137614c67de811ef86f5d8e8c73418a0d9f3
+EBUILD llvm-5.0.2.ebuild 7796 BLAKE2B 705b7740627a5f7733ea3970bbf7c15e4bdee408e34593d8f385a8731f98ce39331a2c6e50f6dbc5ef55f2be75232645303e998e2caa0ddf8d0ee47e91b7fe3f SHA512 c8d5425cb4caf01d755cf069ab864a0df4eb176a745af8a6a708c3b59e3cf8b8852aef4eed8a914f756d356cfe7072b86f0bd4f36584e19b1b97406f4b37a55b
+EBUILD llvm-6.0.1-r2.ebuild 8170 BLAKE2B 10c0d73c8a198152caaccb0917c295bd18938a192bc115e8e3758f4a1a129516f67ca48021a0b7b3ccb534284cb7e88e52fc0db5af0c256ce272a77e78b0a369 SHA512 c8985460286ab141038b7d4effca7288652f0a7a1f8fb88b80bbcfac67bdb5d41328cbabc5c82df4e4fe7346e0dcf6915a3dfd47921a6c7f298f03e601401c17
+EBUILD llvm-6.0.1.ebuild 7821 BLAKE2B 461b8e38e5edb90b358bf8cb7e3f92e60b24bb72a664508bd7aa1e1356b2d8e91096d55f35b8ecda1bf13f2a4f6416254c4d2b3ed9a865b2d0fef93d6287463b SHA512 a4b0e775a9fc36c2487ce6a1d89c7f1ea9aa1e2c9b2cb5fce4401c2c136144ffbbe6b32a4daceb5fefd43f27e9e6ef0638abf621d98f7c6c3646e7a5e485137c
+EBUILD llvm-7.0.1.ebuild 7717 BLAKE2B 1cf24f6cbd54f4c058d379d5f4c6fd05b2b91bd9db2c24c4a8c96bffe182da723364ee9cc1192e8a4a8a57a409bd6552f42a608e0c065979b95239827d61f417 SHA512 86d04332837ba478f8a0283c3ec5c68c4e3aabbb6b308441a024b595d06af97acb0d0a8f6f34053b021a76d25b54484825a73155997fc9c3dad923236c5efa5e
+EBUILD llvm-7.1.0.ebuild 7841 BLAKE2B ce33e2cea8edee23a1dd2f000f5d80000d16138f6476dccb1c9f4451e492778d262e3e601672645f26e350b88cf901c90bb940bb72f5fb24bb0e5e24bc8a844f SHA512 f232a5c8fd7fbb0357407437382e5c69e83e02d738d8c7b016c953eb670a39c6a4f309bd7159372a71aaef33d477e597bb6a6866ade5fa62c5cb33f79f581a7c
 EBUILD llvm-8.0.0.ebuild 8800 BLAKE2B f8ca29bb91999d7949bc9ee18349208b60b81755182d96d711dda84b9875b99b4636b54b59364a18039766910feba03926dcea3a687e5c52a88f8fa7f44055c2 SHA512 10ae3e715787db1c66e67c62ae25f3fd806ead83c95449b6a5b176014fce3c1149c376863ebbb88fd780bf8a06329c0c32d3b27f24f91b7d99bfea49f74462bf
 EBUILD llvm-8.0.9999.ebuild 8299 BLAKE2B 5dd8ce5c960c85129d3d656d45912dea61aebb349d832b991e32e0caf6999e19ed9bf4ca0a0443f259442dc98bb884ce6ced610362255367501842196cd53588 SHA512 a07e5a92731311902cf6ff54a9e770beb518cbd8d5061e708bcce0ae398a7498a941a1ffd63251357a62eb73af7d45332f5686ea93e7183d69e2761149e82009
 EBUILD llvm-9999.ebuild 8594 BLAKE2B 2fe8e7fd9e17fa2eb40371257805d45ab84ae0dbd3b2f1d553600c98c38a1d0d5552fcc8f389e3f3d32252ad6e4cc67eaadd1a8265c5681cf2ff0104b263e2a0 SHA512 d18c74255aaa568d8d9cb43ae7091549c1b2d3ba237278068e887e0b29d8994faf3766b7dda92cc348b3f0a75011cfd88aac4de8e14aa1f895320fcfc2bbd027
diff --git a/sys-devel/llvm/files/7.0.9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch b/sys-devel/llvm/files/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
index 5def55d38fcc..5def55d38fcc 100644
--- a/sys-devel/llvm/files/7.0.9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+++ b/sys-devel/llvm/files/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
diff --git a/sys-devel/llvm/llvm-4.0.1-r1.ebuild b/sys-devel/llvm/llvm-4.0.1-r1.ebuild
index 405b1bf4ea6c..410573dc10b3 100644
--- a/sys-devel/llvm/llvm-4.0.1-r1.ebuild
+++ b/sys-devel/llvm/llvm-4.0.1-r1.ebuild
@@ -73,7 +73,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo
 src_prepare() {
 	# Fix llvm-config for shared linking and sane flags
 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/7.0.9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+	eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
 
 	# Backport the fix for dlclose() causing option parser mess
 	# e.g. https://bugs.gentoo.org/617154
diff --git a/sys-devel/llvm/llvm-5.0.2.ebuild b/sys-devel/llvm/llvm-5.0.2.ebuild
index 29bd7b644079..dbda3db29a26 100644
--- a/sys-devel/llvm/llvm-5.0.2.ebuild
+++ b/sys-devel/llvm/llvm-5.0.2.ebuild
@@ -76,7 +76,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo
 src_prepare() {
 	# Fix llvm-config for shared linking and sane flags
 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/7.0.9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+	eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
 
 	# Apply the backported patches
 	eapply "${WORKDIR}/llvm-5.0.1-patchset"
diff --git a/sys-devel/llvm/llvm-6.0.1-r2.ebuild b/sys-devel/llvm/llvm-6.0.1-r2.ebuild
index b0e6b8982dc3..7a983e01f194 100644
--- a/sys-devel/llvm/llvm-6.0.1-r2.ebuild
+++ b/sys-devel/llvm/llvm-6.0.1-r2.ebuild
@@ -78,7 +78,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo
 src_prepare() {
 	# Fix llvm-config for shared linking and sane flags
 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/7.0.9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+	eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
 
 	# Fix appending -Wl,-rpath-link on non-Linux (-> FreeBSD).
 	eapply "${FILESDIR}"/6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch
diff --git a/sys-devel/llvm/llvm-6.0.1.ebuild b/sys-devel/llvm/llvm-6.0.1.ebuild
index d4cb259ec03d..fde2a075f4df 100644
--- a/sys-devel/llvm/llvm-6.0.1.ebuild
+++ b/sys-devel/llvm/llvm-6.0.1.ebuild
@@ -78,7 +78,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo
 src_prepare() {
 	# Fix llvm-config for shared linking and sane flags
 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/7.0.9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+	eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
 
 	# Fix appending -Wl,-rpath-link on non-Linux (-> FreeBSD).
 	eapply "${FILESDIR}"/6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch
diff --git a/sys-devel/llvm/llvm-7.0.1.ebuild b/sys-devel/llvm/llvm-7.0.1.ebuild
index 9807a13f1bb3..72fae3757637 100644
--- a/sys-devel/llvm/llvm-7.0.1.ebuild
+++ b/sys-devel/llvm/llvm-7.0.1.ebuild
@@ -79,7 +79,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo
 src_prepare() {
 	# Fix llvm-config for shared linking and sane flags
 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/7.0.9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+	eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
 
 	# disable use of SDK on OSX, bug #568758
 	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
diff --git a/sys-devel/llvm/llvm-7.0.9999.ebuild b/sys-devel/llvm/llvm-7.1.0.ebuild
index c361a226832d..a708957fea03 100644
--- a/sys-devel/llvm/llvm-7.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-7.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,15 +8,13 @@ EAPI=6
 CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils eapi7-ver flag-o-matic git-r3 multilib-minimal \
+inherit cmake-utils eapi7-ver flag-o-matic multilib-minimal \
 	multiprocessing pax-utils python-any-r1 toolchain-funcs
 
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
-	https://github.com/llvm-mirror/llvm.git"
-EGIT_BRANCH="release_70"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz
+	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${P}-manpages.tar.bz2 )"
 
 # Keep in sync with CMakeLists.txt
 ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
@@ -33,8 +31,8 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 
 LICENSE="UoI-NCSA rc BSD public-domain
 	llvm_targets_ARM? ( LLVM-Grant )"
-SLOT="$(ver_cut 1)"
-KEYWORDS=""
+SLOT="$(ver_cut 1)/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml
 	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"
@@ -73,18 +71,20 @@ DEPEND="${RDEPEND}
 RDEPEND="${RDEPEND}
 	!sys-devel/llvm:0"
 PDEPEND="sys-devel/llvm-common
-	gold? ( >=sys-devel/llvmgold-${SLOT} )"
+	gold? ( >=sys-devel/llvmgold-${SLOT%/*} )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( ${ALL_LLVM_TARGETS[*]} )"
 
+S=${WORKDIR}/${P/_/}.src
+
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
 src_prepare() {
 	# Fix llvm-config for shared linking and sane flags
 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/7.0.9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+	eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
 
 	# disable use of SDK on OSX, bug #568758
 	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
@@ -105,7 +105,7 @@ multilib_src_configure() {
 		# disable appending VCS revision to the version to improve
 		# direct cache hit ratio
 		-DLLVM_APPEND_VC_REV=OFF
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT%/*}"
 		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
 
 		-DBUILD_SHARED_LIBS=ON
@@ -155,7 +155,7 @@ multilib_src_configure() {
 			-DLLVM_INSTALL_UTILS=ON
 		)
 		use doc && mycmakeargs+=(
-			-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+			-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT%/*}/share/man"
 			-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
 			-DSPHINX_WARNINGS_AS_ERRORS=OFF
 		)
@@ -165,7 +165,7 @@ multilib_src_configure() {
 	fi
 
 	if tc-is-cross-compiler; then
-		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
+		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT%.*}/bin/llvm-tblgen"
 		[[ -x "${tblgen}" ]] \
 			|| die "${tblgen} not found or usable"
 		mycmakeargs+=(
@@ -211,7 +211,7 @@ multilib_src_test() {
 
 src_install() {
 	local MULTILIB_CHOST_TOOLS=(
-		/usr/lib/llvm/${SLOT}/bin/llvm-config
+		/usr/lib/llvm/${SLOT%/*}/bin/llvm-config
 	)
 
 	local MULTILIB_WRAPPED_HEADERS=(
@@ -222,7 +222,7 @@ src_install() {
 	multilib-minimal_src_install
 
 	# move wrapped headers back
-	mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die
+	mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT%/*}/include || die
 }
 
 multilib_src_install() {
@@ -230,27 +230,34 @@ multilib_src_install() {
 
 	# move headers to /usr/include for wrapping
 	rm -rf "${ED%/}"/usr/include || die
-	mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die
+	mv "${ED%/}"/usr/lib/llvm/${SLOT%/*}/include "${ED%/}"/usr/include || die
 
-	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT%/*}/$(get_libdir)" )
 }
 
 multilib_src_install_all() {
-	local revord=$(( 9999 - ${SLOT} ))
+	local revord=$(( 9999 - ${SLOT%/*} ))
 	newenvd - "10llvm-${revord}" <<-_EOF_
-		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		PATH="${EPREFIX}/usr/lib/llvm/${SLOT%/*}/bin"
 		# we need to duplicate it in ROOTPATH for Portage to respect...
-		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
-		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT%/*}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT%/*}/share/man"
 		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
 	_EOF_
 
-	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	# install pre-generated manpages
+	if ! use doc; then
+		# (doman does not support custom paths)
+		insinto "/usr/lib/llvm/${SLOT%/*}/share/man/man1"
+		doins "${WORKDIR}/${P}-manpages/llvm"/*.1
+	fi
+
+	docompress "/usr/lib/llvm/${SLOT%/*}/share/man"
 }
 
 pkg_postinst() {
 	elog "You can find additional opt-viewer utility scripts in:"
-	elog "  ${EROOT%/}/usr/lib/llvm/${SLOT}/share/opt-viewer"
+	elog "  ${EROOT%/}/usr/lib/llvm/${SLOT%/*}/share/opt-viewer"
 	elog "To use these scripts, you will need Python 2.7 along with the following"
 	elog "packages:"
 	elog "  dev-python/pygments (for opt-viewer)"