gentoo resync : 21.12.2017

2 files changed, 11 insertions, 10 deletions

diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 39ada9fc3176..335942b3f01c 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -33,7 +33,8 @@ DIST llvm-3.9.1-patchset.tar.xz 16404 BLAKE2B 9c9d630e6c6a70ba6a026a6ecb7a7d29a5
 DIST llvm-3.9.1.src.tar.xz 18130436 BLAKE2B 90afd2c06e612132bbc84c29fed59abdfdaed41f8a7590e3f60ba5072179317365f15f301f577ba050b78797f682bef8fa85ebad7391fd3e67b46eb02a5df068 SHA512 50cbe8ee911080f586e77861c442348701bd02e2de0c090c54c34f82ac275ecfcd712af0f41e387c33b4a6057778a4258a27554292fe68ab4af3fd9dd6d90683
 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.0.src.tar.xz 23411980 BLAKE2B bc3d8b75b766c83912252b51d6b57c8151c9d83415eff7bc771923d35138ed253a788d6c8e0a384c5e78ce1a1065f10d66ef5004df163b4c3b0c6274bb3aa6b7 SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a
-DIST llvm-5.0.1rc2.src.tar.xz 23508164 BLAKE2B 3594d1658310a99787b4ff6f85aa8dd12a0405464bcb095ba4f205ce5b4ed3240a8ae1bef726ff98aba61ae5c8f8c10eeb8e415320d210af60f9e74bff7a8d5c SHA512 0a156e3949d22304b5e173dc9a3628161dff2798ad67924341c11494544350ef3a35a3ebb6ec8e7223b2407ce47cf12dafa6de8c006c5799a620e35a86c30b1b
+DIST llvm-5.0.1-manpages.tar.bz2 94004 BLAKE2B 34eb29361ad7aa881e64d1dd2992fd89ce44adafd2521284c27b6ffe7082bc7e70458204e6f34d582b704bf7c5dad93c6a6dc41fc7abc41862aab8f5ec53ed07 SHA512 3444cc8e06009f5dd2669b92af662a1049d9294c8ca0dcf45486e1dc1aaf10160860b7856d30ad70bbe5864b21d1539316e89f5237549f5653954e23baf64334
+DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb
 DIST llvm-manpages-4.0.1.tar.bz2 87981 BLAKE2B 79ffd254ee5c6e09159c954913ef820f74107d4fcea5e3ed82592dc36af8fdfbf1e850547ba8bfc20aa9a5ecdd26c50329e6a6d558ae3aa5475a930789ce3e01 SHA512 d5b3213567c25db58ef364d272314a79c311a80fc21d98c09a5540af45a8190a38f489228663fe9a9b63bf0f2b952c460c4196a8fc8d6f221619f6e7ed2fc415
 DIST llvm-manpages-5.0.0.tar.bz2 94240 BLAKE2B 1657edefa2e839f401b7c30ba1c0cfde45bcb0fa9bcfc3ea6070bc0addc237be898c5a79e54b2120f98b2a9550ab286cfd0bc835751a4e8cc30005d4081fb9f9 SHA512 0bccfb00caa0796bed8ea4e591616e025e43d304f05589180820c17f8567fa3a1f1f76c323098ed0d0e4590765415b1c1c272a94c6e2e7544788f4088ef0ffea
 EBUILD llvm-3.4.2-r100.ebuild 7025 BLAKE2B b494ca2548a0d759e0eb3eac8c609406010da506e707ba98fed7e53858612d51ffbc87344c240b77eb82b2bb67bd5b8f4a4dd99d2925065a6b3293839297188a SHA512 9829abe6dbd09d786236ed4b05edbdbdd96c82af22dee5e4d4eb33fa28c80102024eeed057bc15140cf4bb646e84e8ed86e152a10df99b59f9ce84790af53593
@@ -43,7 +44,7 @@ EBUILD llvm-3.7.1-r3.ebuild 16958 BLAKE2B fd7a7890b0041c216fe4b21937a578b2a00da2
 EBUILD llvm-3.9.1-r1.ebuild 16507 BLAKE2B 83692ac24d5df082c1eab87ef85353a44a485332fa5720414a5965d379939e82aa6bfccb2fb513bc8c18872184d4ef99a02dc4766dad5bd555f887b2a9122589 SHA512 1234349f89c1d2b07e1918075b52f2866e56cc742d3f3da233dd8465c559c765c7cb256f1d6eb77ee61fede9be2c84bd6236c42e5672d5130f0e7730ee24de96
 EBUILD llvm-4.0.1-r1.ebuild 6761 BLAKE2B 62f83ec333027a67e3635dbde1cb324b08819fd22491591b39dd3cd57930790df2ef117b6cbce56ce2db04789773d0f3cd71d93e64bfc12d35bc7bd60f15d8d8 SHA512 d32f436e48854839f6ec146c4a1d0f44f15f3e73563c33eef370b62049142401bf6aabbf2cd96f6f550ef2e05c220cc5abbbb486b062d85b268c2885666d9fbe
 EBUILD llvm-5.0.0.ebuild 6802 BLAKE2B cdaba58a9e17e67d239c931fc7f2e93464b341772fa806fc776b2010f17f1d40251616f11222c753a2c6b7689b18dba2c1189ef242b581e1989eee4b876e8146 SHA512 35d8e14da0f5a1baa60643e3c04663eb044201665ef2ff0faf53ab98f6c5634ff5f099e11d9d3d02a0f16a051540829ee275e1099b6652f7a25469480f617dee
-EBUILD llvm-5.0.1_rc2.ebuild 6886 BLAKE2B 70bb2a3839896c8009e27a97a514b36936e5b6b6bd5f17184dc2d0ed100b3be13b0ee8c97ec153cbad63028b6e316673f01fc6e5108ae42cf227d8bde6067b78 SHA512 ac6c5a04157c7abb84d9b154bb00717dd02ea95701e793f8afa2052b8febbb4c26821f83fd805f2d2c18b6ccd046cb07809419845c8a1d7a3b7ffd4435ffa0f9
+EBUILD llvm-5.0.1.ebuild 6888 BLAKE2B c566e61b4c16c7cc4e2ea3c8f7f485480bea994657d910e6c937f8d95ea819078585a65cf048d3e412e4fa7352e2f640f7681efb012880312191513114bf39ed SHA512 f27f579a6030a06d6dd810447a135c1a3337372496a00dfb93eeb6238d1a6f6fa0120d0eea467092817b67925962ea34f539e27427f3f1bc71ab98587f1414ff
 EBUILD llvm-5.0.9999.ebuild 6667 BLAKE2B 05cc207eddb9088d1f85c85c4dcc6657f62eb33b05f3a2ec9116260e0431fee2019045ba554d1f14c9214cf84bfa24030fb8119e64181bbff1471dc67ae7e3c0 SHA512 166611b3896cbeb91db37851fe61939cea7a86b31e8c1f86eaf0446cfdb213b870f08e812c675edd090bc47fb3e35db8fe0e813e3fee2c266881f9f32535d7e2
 EBUILD llvm-9999.ebuild 6662 BLAKE2B 1fc2fd66640cb3fd433bc355f880f8718535b5c500726cf121f70aae87708dc4068ed0c3fbecb61ab86c813d3808411d657c492e22e492518a7b3cf04a2bc953 SHA512 3abb4a1a689994902cdf8eef9bdb60214f6a5482c7cefe8ee0eacdb8e0c5d0db3c3d1b63ac04862194ca7a7de3b22f9d8db30c6f40a55c72c3b61f5b8ee76a04
 MISC metadata.xml 2747 BLAKE2B 0684b3ae235b762c8c365ac0da29d285781cb7aae25250664704385c3326c07097a6061907b1bc2417b90db39745745bfbbab887d53a7fa1024e62bcded2d0be SHA512 cbb82ddab3a19f9103ed1f72bdae2b50dd3bd906b377ff6004dc7b85e9ec8852fd9d03f7f9e7015363454b86680ec5fdb756b08bc6a7c2743669ee4ff3b4aa08
diff --git a/sys-devel/llvm/llvm-5.0.1_rc2.ebuild b/sys-devel/llvm/llvm-5.0.1.ebuild
index a52f8631f7bb..ca00fa16d34d 100644
--- a/sys-devel/llvm/llvm-5.0.1_rc2.ebuild
+++ b/sys-devel/llvm/llvm-5.0.1.ebuild
@@ -13,8 +13,8 @@ inherit cmake-utils eapi7-ver flag-o-matic multilib-minimal \
 
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="http://prereleases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
-#	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-manpages-${PV}.tar.bz2 )"
+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
@@ -32,7 +32,7 @@ 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=""
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="debug doc gold libedit +libffi ncurses test
 	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 
@@ -226,11 +226,11 @@ _EOF_
 	doenvd "${T}/10llvm-${revord}"
 
 	# install pre-generated manpages
-#	if ! use doc; then
-#		# (doman does not support custom paths)
-#		insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
-#		doins "${WORKDIR}/llvm-manpages-${PV}/llvm"/*.1
-#	fi
+	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"
 }