gentoo resync : 11.02.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-02-11 16:09:52 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-02-11 16:09:52 +0000
commit: f78108598211053d41752a83e0345441bb9014ae (patch)
tree: dd2fc7ae0a1aea7bda4942ab0c453d1e55284b37 /sys-devel
parent: dc45b83b28fb83e9659492066e347b8dc60bc9e3 (diff)
51 files changed, 1121 insertions, 1182 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 05d02b20f09d..a107cc43625a 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/boost-m4/Manifest b/sys-devel/boost-m4/Manifest
index 471e5ab99e88..ecede8d59d67 100644
--- a/sys-devel/boost-m4/Manifest
+++ b/sys-devel/boost-m4/Manifest
@@ -3,5 +3,5 @@ DIST boost-m4-0.4.tar.gz 38871 BLAKE2B 95475d8109f13b420ee5ac95588e5756b17e923ef
 DIST boost-m4-0.4_p20160328.tar.gz 41253 BLAKE2B 47ad17f652560dce4e276b295e55e7daa8752f1c932a6c0d1bad9e4bc2ff72eb0adfaf8abc4e7c57f179f08857de255935fc530f0a4d8a26d3f6a2a0711417ac SHA512 4aecd311b21ced4a3d62fc706a9fa731c375ea490482f78756892243b5af6909cd8841c249632b37820be7f1bde41c290e842edd933d0c727e1dca76d30eb506
 EBUILD boost-m4-0.4-r1.ebuild 917 BLAKE2B c32b670293a9b5b5bd949c71c35d6bae28581db8aef36afd4532e8c7f92fe9beb58a84496e2bcc17c884ad46e3c1b8e5468579947e1008c0393e211ce4849d61 SHA512 d6fa04dca6ce327db4189f03e8e7a7239e69c1f16b9c5a91a7b8020b1dc970ea8393daa2c8dbab1f11d433e63d11858f96bc5790334f65e4260696198b0912d8
 EBUILD boost-m4-0.4.ebuild 844 BLAKE2B 5d1ab04c297ef3f76665ccf1e18a66a5018945287a7acc0874b2a32b764db1770f39cae4f814cddc2e008e13821884134d4414d0ef8838f761b5b88d6af73a11 SHA512 896b5628af4a1934c25543d564a2266bdf7afc0653ec93de84155d16b905aeaede4e4877b0dd3afde6a6bacbce266c8247a2cde9cc8f1662af53878b478161d0
-EBUILD boost-m4-0.4_p20160328.ebuild 905 BLAKE2B ea9d83d0512bc6bb1ff0f71be7f35caa1f9bb07fb40a787ea57254e8fdf2a8e61af3a31809a94003c462d3dcc7a638e3f4c4406ba85c9a6a4b2b8db65ae9c946 SHA512 02a1b9157d587d24383f5fed217dab143ff31bfecd17fb3f33f4efc9ef10a66e577d8207832895baa74b075f0d8ab12546e7dd3feb577a80bae5cad0d6443ab8
+EBUILD boost-m4-0.4_p20160328.ebuild 911 BLAKE2B fbd661f55027c625eb5e7a91cfbe5b790f81ef1aaf8b9bf9f71524bc697487fba314fba02fba7c39521adc51736552f6f2a10788ebfacc51dbe5c84d187eac1b SHA512 ca1993e6f73ecae2ef5fff42faed5b4abeb6aeeb3cf1016a88a24b9e3c613ce08429a0852cfac32676d437676364e8db4e144798d314029f7e54c288e56732d0
 MISC metadata.xml 222 BLAKE2B 448a1ea951952548a4400942106647671f29fd652f7cfb1c37fe9560e77f169f9ba9b68967736b542d134c111924cd0e2d84dc4db6269690234b6f0b50cac630 SHA512 5144b4eb888e33db8ccf9038a19bebaca24c0ad51a04e706f1701214adab830a39907686b4c4d655f147b827c34dc2fda9737680ee983da5f62b417ec0775557
diff --git a/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild b/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
index 5fea1fbee600..946b07adb127 100644
--- a/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
+++ b/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 S="${WORKDIR}/boost.m4-1489691f65aecb593e33abc3e56ac482dd67da7b"
 
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 623f3aa18159..dca43c132922 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -2,6 +2,7 @@ EBUILD clang-runtime-3.9.0.ebuild 540 BLAKE2B 194ab885cecfa8d265b5f7fa3ed937910f
 EBUILD clang-runtime-3.9.1.ebuild 569 BLAKE2B 58fa2d4ee5d80c7540e8030015fe085ad6969f57103face3c2f38088495e017813946ff451d39b0fcbb2dea13a95afd742efc96ce97cf09bb0d5240280c84db4 SHA512 b78a53021a94b191c3c48a0db9b8e0a395714dfb204569180eedc4cb390d948ad78d9f87d6974cc6ff036fc05ed10aa30cadfc521d18205cdf6d556814d92a29
 EBUILD clang-runtime-4.0.1.ebuild 639 BLAKE2B 62665ccfdb77a3635995b6ec9a59589e3d5e5b39c3940b378acc314fc9fcb4af23f7d44fba89f61eceb4055622b9d7c35ae26724b3cc207c06ac60bd2eda5a75 SHA512 b42d5fbf0082e194f4fc4ddf987a2d1dd0f06fc673b590ec278b45cacb8854c207b26cd159fe4cccdd1a123884037fff7c9e5908d0f329b93ff4ef0238e550da
 EBUILD clang-runtime-5.0.1.ebuild 685 BLAKE2B 28192550762e053ba121c73c3001d7abd8f3e40cf85c609a51f878a8c5d40e66b10cc3f844a72d7dd552a5cd0d1742cdbf0fbdb8a58b163d34f2f7e6dc11a085 SHA512 5033510813fdeca2497a16556b7e27189f18aa3d04287dd62854883011c4c41257bb897a9130222ff07b8b5ba4b31f206960d35391735c5dad97243471a41027
+EBUILD clang-runtime-6.0.0_rc2.ebuild 623 BLAKE2B fb3bffb0037eabc57b6975e22c6e1b5bc609ddb7dfa441a6885e743b4c9aab92ba110318051a3740f8db441ac850c37e0dc2337c1b8e97a084eb04655442c219 SHA512 1c3199400fe383ab5b5da8cff69772b9d1c8aa17a78ca43c8769c702ede5d16703a4ce96cd6d28e69134380ad674a5085cf0b579374aa42b9bf51e06483abd0e
 EBUILD clang-runtime-6.0.9999.ebuild 664 BLAKE2B 59e6e790aac53ba65a92bc546fcca2440da744a59a10ec1b164c7b60c09449fccd0707cde8675196fb047c0a055c15bf345d30f4d3b9baffea151f0e2902d81f SHA512 95bf095071e580ce118136ff9304d73b3db3928d73c50769690ec0a28db4e039f354dfe010d75b44a5554f72fcc76a2ea5503143ba2628c6d278b51ff941a82d
 EBUILD clang-runtime-9999.ebuild 664 BLAKE2B 6dc480fc8db84af479892ec2f92442609642f415ee177091c626d55a77aa9b627cd0e94c78f583fc831bbda987ed6b6ed652240b5b1292c36a7ba2d16899970c SHA512 91da5250ab6ec5cda641371ccc4ae9b6ea2cb474965dcd3930fb38b6397cfc13a43d6c030790e97e73d59d8c0c63f4dbe0318d7a3a8f9e34f70a600657dd3d8a
 MISC metadata.xml 578 BLAKE2B d58a4d1a7bf88a0d5640a02f3acb7e491f275b3bb66a8583aa057b8daae93bb1dbb80f6150bc326228c6ab8c8f8498b46bf72a3fb5e97d0eeea2fb39f87660e3 SHA512 822f56b33d991088ad5e51c3dd96e2e36f544b68c57e45ed8365835d1ef6d0eb797f9de1f8f33b59fbbaf085e245079ca767d5e8b773261cf9ad2c5629b7b16a
diff --git a/sys-devel/clang-runtime/clang-runtime-6.0.0_rc2.ebuild b/sys-devel/clang-runtime/clang-runtime-6.0.0_rc2.ebuild
new file mode 100644
index 000000000000..1d63685566e9
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-6.0.0_rc2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-build
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="${PV%_*}"
+KEYWORDS=""
+IUSE="+compiler-rt libcxx openmp +sanitize"
+
+RDEPEND="
+	compiler-rt? (
+		~sys-libs/compiler-rt-${PV}:${SLOT}
+		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
+	)
+	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
+
+REQUIRED_USE="sanitize? ( compiler-rt )"
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index bf5691f420e6..b5d17861f1c3 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -6,11 +6,14 @@ AUX 5.0.1/darwin_prefix-include-paths.patch 690 BLAKE2B cfb96eb259fb7d557d215be0
 AUX 5.0.1/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch 3411 BLAKE2B a47f686dffa3e710435291670b8be7b99ea89d86092230f9acce328d24efa7ee43a5023b8deb482a497c1b54eec02c89291e4f10ad2c60382cc4ebe7c913981e SHA512 1ebfe7a6d06dd2991923cd1142c5c5b09ba2d06a3c7e0cbcb5b0f1d34aee57bf585941c0dd44ab331e9427828e5c63ea7475d673ccd3ec8617b99c59c56229a0
 DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d6ad24ff439a983f629711b4513b9c4bee4070f8df13b6b2a52d673b0706733a4c151ce5021a0233147debff14ac SHA512 936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964
 DIST cfe-5.0.1.src.tar.xz 11483036 BLAKE2B c4eb54cd8271b62cf7a2219db0b599b68c00b6e574d1946220efbd1633e841796e6717d6eeb35e84a6db32a731a3285b59cedeb3b1a8f3c3c502b799fdd0a720 SHA512 6619177a2ff9934fe8b15d6aa229abb8e34d0b1a75228d9efba9393daf71d6419a7256de57b31e2f9f829f71f842118556f996e86ee076f1e0a7cd394dfd31a2
+DIST cfe-6.0.0rc2.src.tar.xz 11957996 BLAKE2B 65cd91d8b5591e6312f9b46c1deecca5e14db72f58830b5249ca0fbc3b0911ae5bf60c9e1e326cad6eb670d5f2a144229b4e04e5b7645e516b2a530e428cc171 SHA512 991c45ee8500bee1e7004172e2ab8fa78e3d412b1474cfb48ee6f49232afe8d2f512e2ebf148afc4f8b38cff0110e3af26bdbec2138d80592c876452a18c63fe
 DIST clang-tools-extra-4.0.1.src.tar.xz 581788 BLAKE2B 52ca89eda6fe1e0fbbdc46e17f4067f03a9a9440dcdcc98811651087d0c9ab24dfe3eefb0b80a32ec41abe0766cb3e47031de61c4cff02b7d0e08c8fd03e3faa SHA512 ea26d926f428e62e76cf8a073e63ffe05645f6592e05d7717d5c257908870ae9217727d3e1578227b14eda5937085872463f1a8e99970256179c68b8a92e69e0
 DIST clang-tools-extra-5.0.1.src.tar.xz 646328 BLAKE2B 472eb1e73a17564790919ec392dddcd91f131c1cbf2a5f3cab09a9f7126d4d18ec6785ffcb3c3230eec6edc90acbe2bf859367c37f62ba77d7542f4c18b925f3 SHA512 2e6a811cccd22281f7567f5626ff0484ed1fefee4a9244a717e3ccb9516dce9e7ff315044fb10e505e91c3f1c6d2774558debb9559915d053886599bcb153d7b
+DIST clang-tools-extra-6.0.0rc2.src.tar.xz 758068 BLAKE2B dd39e975015601a7df327acd76f5dbd46a20858d65f72e8af4b1e2a176f5c98a07c9d2db12dccef1e9127019e78d7201cf82c27c2b372bfae70f55859fca0e94 SHA512 0a09582e602603c975ec0eb95c67333fdf7985038a36053b7a63db68709a7a5a5ef4b9b2579f7c53e1c3fc39e28ee3c69e3d484f9ab2841f25abe26a84971917
 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 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-6.0.0rc2.src.tar.xz 25288140 BLAKE2B 095f054ce2ccb1eee3def2b8c6cecc610c4392283062338aa20d2de33c951484a2dc6774db2727e19e879307cfc95dda2730185cde8e52f4f45851d8dd809b3e SHA512 3cb3521ba8d90bf2a90c49d753ab5e92f1e0ccfc86946f3767c06d0f276e2c4cf8ff2f984680835efbaa4dae1cd2d3a074468e547785e05a67ea55311b94a0e9
 DIST llvm-manpages-4.0.1.tar.bz2 87981 BLAKE2B 79ffd254ee5c6e09159c954913ef820f74107d4fcea5e3ed82592dc36af8fdfbf1e850547ba8bfc20aa9a5ecdd26c50329e6a6d558ae3aa5475a930789ce3e01 SHA512 d5b3213567c25db58ef364d272314a79c311a80fc21d98c09a5540af45a8190a38f489228663fe9a9b63bf0f2b952c460c4196a8fc8d6f221619f6e7ed2fc415
 EBUILD clang-3.4.2-r100.ebuild 972 BLAKE2B b11888e71750e7de7363d0e74a43999b31baf54dd43438c98d037b5b49d4043a74fdda70dd2b0eb405451c2579ee0285404b28792cc525c1c26e81a07bfd2dc9 SHA512 b42ec4379b4a70eb638ae6a6d45a287cd83f5ac339ac25ade2c6c77bd8d05c208d389d6f09e4cfe567e67d3e616adfbaffa1b1a9a7f35f5ecb7a0e7ccdc720fc
 EBUILD clang-3.5.2-r100.ebuild 972 BLAKE2B 0f17918969ee1034e1febc34afe95a29dddcf6056caa53920ade66a887b57939933f31b022fb68fb29bf8a5e387f659f6e3b618594cda4cd50f913ec14d0f0de SHA512 1e9a9f67ecd1cea111599376e676c665c6c1e731514a06065751502d221f8c6d7033dc23376f21850a63d036a33fbf241845a9127beca6ee8549348866cdce3e
@@ -18,7 +21,8 @@ EBUILD clang-3.6.2-r100.ebuild 972 BLAKE2B 865d1b2ca82dc3e4965f676adee77bcebb285
 EBUILD clang-3.7.1-r100.ebuild 1121 BLAKE2B 9cf6e15e5a2fa9d400731747105f65c8ef14d20e5a982f02b53a13ad1f269b86c298603e6625340670fffd74e434c92df7fb22cfb4cd7af4d75501a0520b5106 SHA512 5280504ce38eba8da79cf1c31b21bcbd07ad9ecb3db59a7054f829ed43d48744d16760cbaab9ef32f01345a9e7f54f8a63091dda3687115654a110f5a0e227bf
 EBUILD clang-3.9.1-r100.ebuild 1534 BLAKE2B b269b09553ec5559ad90ffdfcaa20604c10fbe394651b7a9e037a9aaac878a6ef6cc2702a1cc6123cffa0ece705b851e908ac275f7fa854d099ec2ab8bafc9ed SHA512 84a3c016f9db31c6cbcee7620330b76af97702be3e92bd0db6e58883ccc054a792003a374cb5bf9d69b8f7c89165a2853ba495d58cd02d98524cf8025e99bcf0
 EBUILD clang-4.0.1.ebuild 9440 BLAKE2B c92c9b070fbbab2de8374f34297a5a9c16a81719bca21b0fd22549e405b6c199461a39ad59120204e28b5acb5a1cddc03edd1c65d3c0a7cbc3410cf59c2a16a2 SHA512 d3cfa79b3faa5a5a8539a534c3454a01ff9d8fa7ee70bd22a0f647db59ea5e203c0f22bb25f9c31791ce1f959e9d6c6936b219e83ec042523092e1b990bcdcf2
-EBUILD clang-5.0.1.ebuild 9666 BLAKE2B 8fb4d0650a81e738123918c9a7448e343fe26398cfe667dc642e1ab30195fd30404209607942438cae6a77d127d22f3e65f31e3621b9f8a19704986801cee2d8 SHA512 8667346d9f5283df0665f1f92ee746994119d15e7658407e2f728b9aeda6f80f0f87196bf7b92981050917bb7d84ab754c10d68775ef2a197fd56eb891924371
+EBUILD clang-5.0.1.ebuild 9682 BLAKE2B ed564ac0def1db9d09c4bed7f4c16ae802a159670c3b7fee32a38b793b59a5a202d26e785f880ebabda39c3b8a3b00d2473b80fdc29e6cf1f2c4e7ae9149ba63 SHA512 ccf3a85365ebf81cb1effb649ce4a0cc12c24badb5351d2173547f0bc0ca2e9e0fe4bbcba875af34ad9b0827502fdcc9ad4aef85d7368359d378f411445efeb5
+EBUILD clang-6.0.0_rc2.ebuild 9412 BLAKE2B f10acc2dc061f413c1d74e707cfa2af71e0870099bf0f3b5a679f634f46164518b39af8a0dd55e81d3ac4d050b51b0bdef59aea261b27a111220fc3df22c2339 SHA512 392822cc034d3ae54a6deac376d3cd9c1daea7db81dedfa2f7c3cb86720744541520fe3dc38f1b25dd9e445d3ef4e4b5dd91fe0d51fe173fccd2106a4b099f83
 EBUILD clang-6.0.9999.ebuild 8789 BLAKE2B d5b5a969ef186359ef630a2633f217aff2455a6dddbcf931f4f7e45fe9d3603c138b71f2b27499af20bb180c17bb9c6cb82dff0c96adec48221271e7289abde0 SHA512 7bc571f18566262d1e6fda17a28cf8dd7568360f386161ea695745a5454251e413bd971d5032986f3275d87a66f49fcc54b4aa35a2429db17aaf642ca1c2dec5
 EBUILD clang-9999.ebuild 8854 BLAKE2B db11809f43cbe407952ac0251102e1964ec212cbff15993144473f82d1662db4edd83a67f9e411f4dfd9a1cb4ea4091844c50c479102d3e4b71d138eb7c33089 SHA512 a3877379b48d385e1a16bf5f5889f747eb99db0792981a651aca8469b14160d6b866358e1e191c4d2f7ad53e21fa877012f015b49271b9ab15905aaaab6d440d
 MISC metadata.xml 1455 BLAKE2B 9dd88bba7158dfdc83bfc48fa4134e1f5a3357ab778cad400a51e348bbb4b44d2740ec417fdc888df0b4fd820441649e92b7adffdd4db558a2f4c3f4830a83a1 SHA512 369a87bd551e483e81ff56f5167177b1bcfedf9bc97f501ef2b07bfdfea3a25532f5e86af062568b3b22a53fe07318fd93dc55bd83b453dd10a0f4d3e88cb932
diff --git a/sys-devel/clang/clang-5.0.1.ebuild b/sys-devel/clang/clang-5.0.1.ebuild
index 375aedcf55a8..e07848fcd49f 100644
--- a/sys-devel/clang/clang-5.0.1.ebuild
+++ b/sys-devel/clang/clang-5.0.1.ebuild
@@ -113,7 +113,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 	eprefixify lib/Frontend/InitHeaderSearch.cpp
 }
 
diff --git a/sys-devel/clang/clang-6.0.0_rc2.ebuild b/sys-devel/clang/clang-6.0.0_rc2.ebuild
new file mode 100644
index 000000000000..514b588975bb
--- /dev/null
+++ b/sys-devel/clang/clang-6.0.0_rc2.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eapi7-ver flag-o-matic llvm \
+	multilib-minimal pax-utils prefix python-single-r1 toolchain-funcs
+
+MY_P=cfe-${PV/_/}.src
+EXTRA_P=clang-tools-extra-${PV/_/}.src
+LLVM_P=llvm-${PV/_/}.src
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="http://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
+	http://prereleases.llvm.org/${PV/_//}/${EXTRA_P}.tar.xz
+	test? ( http:/pre/releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
+#	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-${PV}-manpages.tar.bz2 )"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC Sparc SystemZ X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
+	test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
+	static-analyzer? (
+		dev-lang/perl:*
+		z3? ( sci-mathematics/z3:0= )
+	)
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	${PYTHON_DEPS}"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	xml? ( virtual/pkgconfig )
+	!!<dev-python/configparser-3.3.0.2
+	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	!<sys-devel/llvm-4.0.0_rc:0
+	!sys-devel/clang:0"
+PDEPEND="
+	~sys-devel/clang-runtime-${PV}
+	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
+	default-libcxx? ( sys-libs/libcxx )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+
+# We need extra level of indirection for CLANG_RESOURCE_DIR
+S=${WORKDIR}/x/y/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+PATCHES=(
+	# add Prefix include paths for Darwin
+	"${FILESDIR}"/5.0.1/darwin_prefix-include-paths.patch
+)
+
+# Multilib notes:
+# 1. ABI_* flags control ABIs libclang* is built for only.
+# 2. clang is always capable of compiling code for all ABIs for enabled
+#    target. However, you will need appropriate crt* files (installed
+#    e.g. by sys-devel/gcc and sys-libs/glibc).
+# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
+#    in the current profile (i.e. alike supported by sys-devel/gcc).
+#
+# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
+# multilib clang* libraries (not runtime, not wrappers).
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	# create extra parent dir for CLANG_RESOURCE_DIR
+	mkdir -p x/y || die
+	cd x/y || die
+
+	einfo "Unpacking ${MY_P}.tar.xz ..."
+	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
+	einfo "Unpacking ${EXTRA_P}.tar.xz ..."
+	tar -xf "${DISTDIR}/${EXTRA_P}.tar.xz" || die
+
+	mv "${EXTRA_P}" "${S}"/tools/extra || die
+	if use test; then
+		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
+		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
+			"${LLVM_P}"/utils/{lit,llvm-lit,unittest} || die
+		mv "${LLVM_P}" "${WORKDIR}"/llvm || die
+	fi
+
+#	if ! use doc; then
+#		einfo "Unpacking llvm-${PV}-manpages.tar.bz2 ..."
+#		tar -xf "${DISTDIR}/llvm-${PV}-manpages.tar.bz2" || die
+#	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	eprefixify lib/Frontend/InitHeaderSearch.cpp
+}
+
+multilib_src_configure() {
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1-3 "${llvm_version}")
+
+	local mycmakeargs=(
+		# ensure that the correct llvm-config is used
+		-DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		# relative to bindir
+		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
+
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# these are not propagated reliably, so redefine them
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+		# libgomp support fails to find headers without explicit -I
+		# furthermore, it provides only syntax checking
+		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+		# override default stdlib and rtlib
+		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
+		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
+
+		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+		# z3 is not multilib-friendly
+		-DCLANG_ANALYZER_BUILD_Z3=$(multilib_native_usex z3)
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_LIT_ARGS="-vv"
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			# normally copied from LLVM_INCLUDE_DOCS but the latter
+			# is lacking value in stand-alone builds
+			-DCLANG_INCLUDE_DOCS=$(usex doc)
+			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=$(usex doc)
+		)
+		use doc && mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=ON
+			-DLLVM_ENABLE_SPHINX=ON
+			-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+			-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF
+		)
+		use z3 && mycmakeargs+=(
+			-DZ3_INCLUDE_DIR="${EPREFIX}/usr/include/z3"
+		)
+	else
+		mycmakeargs+=(
+			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		[[ -x "/usr/bin/clang-tblgen" ]] \
+			|| die "/usr/bin/clang-tblgen not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
+		)
+	fi
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+
+	# provide a symlink for tests
+	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
+		mkdir -p "${WORKDIR}"/lib || die
+		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check-clang
+	multilib_is_native_abi && cmake-utils_src_make check-clang-tools
+}
+
+src_install() {
+	MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Move runtime headers to /usr/lib/clang, where they belong
+	mv "${ED%/}"/usr/include/clangrt "${ED%/}"/usr/lib/clang || die
+	# move (remaining) wrapped headers back
+	mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die
+
+	# Apply CHOST and version suffix to clang tools
+	# note: we use two version components here (vs 3 in runtime path)
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1-2 "${llvm_version}")
+	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
+	local clang_tools=( clang clang++ clang-cl clang-cpp )
+	local abi i
+
+	# cmake gives us:
+	# - clang-X.Y
+	# - clang -> clang-X.Y
+	# - clang++, clang-cl, clang-cpp -> clang
+	# we want to have:
+	# - clang-X.Y
+	# - clang++-X.Y, clang-cl-X.Y, clang-cpp-X.Y -> clang-X.Y
+	# - clang, clang++, clang-cl, clang-cpp -> clang*-X.Y
+	# also in CHOST variant
+	for i in "${clang_tools[@]:1}"; do
+		rm "${ED%/}/usr/lib/llvm/${SLOT}/bin/${i}" || die
+		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
+		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
+	done
+
+	# now create target symlinks for all supported ABIs
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		for i in "${clang_tools[@]}"; do
+			dosym "${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
+			dosym "${abi_chost}-${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
+		done
+	done
+
+	# Remove unnecessary headers on FreeBSD, bug #417171
+	if use kernel_FreeBSD; then
+		rm "${ED}"usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
+	fi
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	# move headers to /usr/include for wrapping & ABI mismatch checks
+	# (also drop the version suffix from runtime headers)
+	rm -rf "${ED%/}"/usr/include || die
+	mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die
+	mv "${ED%/}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED%/}"/usr/include/clangrt || die
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+	if use static-analyzer; then
+		python_optimize "${ED}"usr/lib/llvm/${SLOT}/share/scan-view
+	fi
+
+	# install pre-generated manpages
+#	if ! use doc; then
+#		insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
+#		doins "${WORKDIR}/x/y/llvm-${PV}-manpages/clang"/*.1
+#	fi
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	# match 'html' non-compression
+	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
+	# +x for some reason; TODO: investigate
+	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
+}
+
+pkg_postinst() {
+	if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+}
+
+pkg_postrm() {
+	if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow clean all
+	fi
+}
diff --git a/sys-devel/dev86/Manifest b/sys-devel/dev86/Manifest
index 5dcf0bc64c38..b045e5cc6399 100644
--- a/sys-devel/dev86/Manifest
+++ b/sys-devel/dev86/Manifest
@@ -5,5 +5,5 @@ AUX dev86-pic.patch 574 BLAKE2B e6566a39aad0a48b2b1c626630fce8071567c98efd06a371
 DIST Dev86src-0.16.19.tar.gz 713688 BLAKE2B c62a552be801ff109ee30c403d43586e2601342bd6fe0902d287849a88778338764216663c5302e7401e2b09962e116f2e3569c144846e5fcec87523d69ff206 SHA512 4077f7ac800330eb4658ffaa53dc8cc982792b1dcd7a59625cba4a5dac494117c6bd4ec5307bf02349ad6ae3d0c0903ab2e41123a8df94373e469092fa005cd3
 DIST Dev86src-0.16.21.tar.gz 717215 BLAKE2B 977353422937f57d2046f151a53008dcec90f4060d60675dcb81fa58af5f1ed758a1950dcbd211cda57c84b55bf58ffbad28195ff115db50a7a1108d434b8b4e SHA512 6d35dc3c7f9735cf7967cdb2bc0f7bee967ae26667cd8cef56bbdf7d7855ef1d35057db4c0031ff86b9b95d3c8ee44aff408446115b35b6c10cf207a33838016
 EBUILD dev86-0.16.19.ebuild 1854 BLAKE2B 49f3ee0daa8a7b1410aadd978a733862cd6a40556bc49f89b3921da2a64d1bd5217c1455ef97e87bd62a0a17a6b35436923fc2e62b05c35eec39925a65b24548 SHA512 17d24085519121a56639ce740c315faaa2815731e63420c5ad164b148acfa507a14a2caa6651dc13c597de2d008adbf07c6a7995cac7fdf300c13d98881459e5
-EBUILD dev86-0.16.21-r2.ebuild 1872 BLAKE2B 691192c6fb7c6db1552a7b22849c4c9e3a851631e634f29427779fd312b436ad839b68a6f04a25f7b0809295a28de9dd7aa7a3c8704ac24fa5f67c4231b8c234 SHA512 5ebefb8e0b0b8ae26dbd345f237c12429922425d330354770988da597f058edf7bae9990b172f0fdd9819a9d5938995f6605a9cab93a41a25a911444a3e455a2
+EBUILD dev86-0.16.21-r2.ebuild 1871 BLAKE2B 3046eb3fe8f3896bb4ed3ba3fb12a2e3beab636d6ffd2bfc968933b7f4a09b5dfd85456fb00a48b4a07fd9c3d296b8761f81eaff9887ac8c75aa8152630dbdcd SHA512 2df3325a2aed9ea2a9051c8a8e3e28c71c268a726188a25a0bff078d89f8981f27051625b16e887f0e4eee2128921fe8772e1e1f78ae3c8eba65f1ba3cd5dce2
 MISC metadata.xml 269 BLAKE2B 52fbe2001fcfbc7e12accb112937522d10be0763440ba36e3377bfab21d75b4a4e9507d7974c3434bf8c01bb24e939f91023d31909bc962aa3ead89c607f6ff1 SHA512 fc49c52f63fc653414208095ec460b4d991d1710b0ea92ca8ab598bca9316b42144e498503b79e7f1db22e3a8c26c009f51cf2d5eb0163a6afc18ed40d4541f2
diff --git a/sys-devel/dev86/dev86-0.16.21-r2.ebuild b/sys-devel/dev86/dev86-0.16.21-r2.ebuild
index 701d48499a53..832575fed108 100644
--- a/sys-devel/dev86/dev86-0.16.21-r2.ebuild
+++ b/sys-devel/dev86/dev86-0.16.21-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://v3.sk/~lkundrak/dev86/Dev86src-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="sys-devel/bin86"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 7afb1b3def7c..80fbdacb4491 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -88,8 +88,8 @@ EBUILD gcc-4.7.4-r1.ebuild 1291 BLAKE2B 960d5072a4d03ee507cc5f7ea57f272165378dab
 EBUILD gcc-4.8.5-r1.ebuild 1401 BLAKE2B 669ceca836569aa02247049b00d1beb820b12a8fd08bc8da703b650a01629bb6b9b9607d83152889770cc7116a2ce9e058db7d5eee5e91921ae2342a32890c40 SHA512 22f68cc6733b59e3d4f43df088fa0440ebbb40c3cfbb88e538a1ccca849f1111a83c9a2cf0d0733eb16eec956e65c5accaae1c6598a8027a497d20f3293a2934
 EBUILD gcc-4.9.4.ebuild 1460 BLAKE2B 60ac80417d49608501a2956ad5b62162fc0e5ce089a8786c7482328cdf4b0d7ab8a10045c2479b3ecf602ca934796e9c32459c9b421a3444a3333b79faf3026d SHA512 c0a443c8c0629b12047f1bdad0b62a23a423f2fad4408b765d5093f8cb2a4ab54b6470f6f4e2b2d4f444817a2e71c11568fadc8d11bfdcc068a8fb4b7fd826f3
 EBUILD gcc-5.4.0-r4.ebuild 1275 BLAKE2B 22b567881a1abbccc5622724141d50c5344c3da7c02ed58d59775e1b0861d556a01bf06de3908115f47d22a204468850a8a57f9e088ad241f05bb004a6bad295 SHA512 c5638c9a78270e06db2423acd6a5a109befb0b883d569ed8978ecd6c7755ecce5ff3450a91ee2fe12a3dda88717b31364dce0e621cd475307dec18f204fc8cfe
-EBUILD gcc-6.4.0-r1.ebuild 527 BLAKE2B eaf3faad99c6d490834ff16f60afaf12f0b15e7be881f09659c27e16d71653c7ac66fbe4cf4c4d41f2d2cd150ea34110a6c204bd4f58572e5b6c0705ae21e60b SHA512 3f7491ee199b0cae0b8d7f37f05a75b233987e88ff6471650bc5822b31af4edb4ed6ffa10b038fba7d84bd955baeba09a98468b52681e216f4b7129569dd69bd
-EBUILD gcc-6.4.0.ebuild 527 BLAKE2B 4d663fbea8169b0583374c0ec493b672aa8710641f5bf67fc5495861cfbd424b7cf32e7a3ab94cc9a790d5b8c93790a8835d8d2230c9ce8743683ff15d487a6f SHA512 5f0b4c8adf0e8a0c7a8d99ccad3dc3773ed9a07308d3def3c915b1328b8526d4097777ac3e3098c919a4f1779bb2d0d5335d6dd9a501a6c30357e58f094bcae7
+EBUILD gcc-6.4.0-r1.ebuild 526 BLAKE2B 2d394a79bf91156edc350470aea8164b8dd6e8be618ed8644d1e664a837543634450ab8f8b0dfac70d090ad95d153a53cf42f4eb3005c81255125a23d531f7f5 SHA512 1653cf09a71591a469344892fe55ed93d3a5a3ddd9d0738d4fd63deefdde6611a61b71e53a91a184036e8e98ad25e18e764d486df37b0bed7dca3b2f6b5e28cb
+EBUILD gcc-6.4.0.ebuild 525 BLAKE2B 3244740cf1bd31d970e6387c72700c99bfed70ca2716a1ab35e2ba4612826442b7c0b8a9bd31c0627621cd3216f166e2075b2d9f84b4f34bd404b5e189ef32f2 SHA512 4de463f61639c720e6bb6a3ad0dbcdd37b8b4c4982e4bde78c6919fdade2397e4cc177fd59386c819b443d813fb7dbacf08cd15f8e015865c21aebabccc0a8aa
 EBUILD gcc-7.2.0-r1.ebuild 536 BLAKE2B c49fc3fc2d74e828ede929ad94484371cc1a7ccb6e3198ff6127aa755f2af20ef56d1319d3ecdd4dc00c2d318c8b5406a5476eb2519c9358f99683db4f9b5896 SHA512 307cfe3c63d2b4238b8493d7047e7266430fafc48625f07ac1d850fa696a95411b5dd8f335a0f7e51fa17396f1ec3c644e240bfd5e086fff2a7b0eb2e68a3697
 EBUILD gcc-7.2.0.ebuild 558 BLAKE2B 64f93aa345b418bd324c5962a0edee943d0d07499702a3468021a15b63915ff1486a0f2d07ea7f1ba0899556d4fec4fc0b51abea662d8e5299fc7b5989a9fbd5 SHA512 3ffb6eefa26a967fe075879b41e9fb67f7d6d0175762aa8044ed466bf37adc19a4eb090109f16c7b03874db67f39a39c9ae77a26e2682f7e3b145b45711ee51b
 EBUILD gcc-7.3.0.ebuild 536 BLAKE2B 74f6fb7636e0e80cd8ecc997e3c5f24e20ab43c4364e9c908c180eab3c04523e6071bf40100ddeafbf75f192c3b002426c25dabb92f581042c689a18031c361b SHA512 7c139390ff3d8eeb5c3b65296bc2859568f027ceabf602909658961193a0e87047e52269dafd383facc154eea8e75466994c846b632df8ab136aca7d01127295
diff --git a/sys-devel/gcc/gcc-6.4.0-r1.ebuild b/sys-devel/gcc/gcc-6.4.0-r1.ebuild
index d55c93326ffe..74891572e7a2 100644
--- a/sys-devel/gcc/gcc-6.4.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-6.4.0-r1.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-6.4.0.ebuild b/sys-devel/gcc/gcc-6.4.0.ebuild
index 193cad4d62b6..8d67f8f011e2 100644
--- a/sys-devel/gcc/gcc-6.4.0.ebuild
+++ b/sys-devel/gcc/gcc-6.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index d50bde60e40a..fd37371e6e5a 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -4,11 +4,13 @@ DIST gdb-7.9.1.tar.xz 17867692 BLAKE2B f5de07a4ebf1a5112a1b40341b217d08f1eb6820e
 DIST gdb-8.0.1-patches-1.tar.xz 8620 BLAKE2B 8595017a881c41cbe78846fae9f50460aa6a4aa8d3863b17e4b9119d886600ee086b642c44b427a2de29c5f3fd4697df838e85e23aafeac05a6ce3291546f099 SHA512 912ad1a51207ca1ec9d3c46e32b07d78a5d3368b617f277532f8a81e40875cc9ec5af8b62f9b1de67aa6d09520c6cc6ad32f48bd44415985d8ad03aa4a1bca7d
 DIST gdb-8.0.1.tar.xz 19583920 BLAKE2B c22e314a0fe3ccb84cef6eca66c51af60914160ac9760cbe517628079dfb15ec73a623badf070b3162d4bd9e44937f717fd44e1d569edba4532853c82b31ac1d SHA512 5eb328910033f0918058be2f92caebf1e8dfc6caa3c730d99d621627e53de3c1b43761c2f683d53555893253c2f06768cbf56cdea051a3d291ffb6cfae87b5e1
 DIST gdb-8.0.tar.xz 19588616 BLAKE2B 148965e33a42787b5fa39650c2b6c48e28895930e36f11b44e8391366be1cc3bd4265ea7df932a7d650291fb20e3f66956c7dff1923025f889e5c035d3bf4207 SHA512 e4044bdd162cbf95044ec1eaa44d2fa62a33e051bdbbacbc97afd4dfb07bae1bea514381fc1966aede89d6796ef2377a15748a93d95e2ad494c8497db489e886
+DIST gdb-8.1.tar.xz 20095080 BLAKE2B 9332058b8b723261ba215124f42a2d6ba916219efdfb3c23ae1f48fecf131c801bbd31b345f2c8339b23d74da690be0260ac31f8f2e79549b62f0880199bfdec SHA512 ffd82f415d7652d62dad1716c307836f594217a363429609beb7d70239e8bf06b73b393345b0e000796228e56681ed7656ac3c8be05e91d6d652ab0d5b1dc357
 EBUILD gdb-7.10.1.ebuild 6606 BLAKE2B f936b1f6fb0107c3b17db4833aba8cdd8f56060a62c644aafc96f05a274569856843d2f59f0415898c3bd547f9d69f6619fccf1e8743454a491ecfa6712878a7 SHA512 ac9409424ffdba44d825d16c0c9768ae0bc51c9deab4975845132f6b630ebf5cbb455344806b8a25425f9bb6a864ec06c3fc33f30abd0eb78e63e0af0f5d5665
 EBUILD gdb-7.12.1.ebuild 6619 BLAKE2B 242c000e9e32435b6aac5165c0e939da3de921eeb1eafd41f02ad2bb603f464f3ff5fad792a2d99e04ac03e909aefa17a0f334195abaa0970a53c8f980cc651d SHA512 5a8254939f70139ab28eeaaef5fe26825ddc438a7a8aacd84d917d5488ed6b224ae9d5b0b811d5257b1004e0c2413756d9b5bd415a6fdfbfc071954d043bec83
 EBUILD gdb-7.9.1.ebuild 5944 BLAKE2B 2065393cc5a34ff738626f997bec0a5e1e5d383d78bd774b04c85b683ff499f395fd87349917fc0bab911109ab6fa369176746b16fcfe40d3f996e85709fe6dd SHA512 7fe1fb5eba8ccb86f7b0fad0d433b7a5687421c9f8a57a4f6f393d09c840dd66e8f109873ff9772c2ea7209c5f4b95d2af6d8abe8e3e4c397bc0a96eba08871a
 EBUILD gdb-8.0.1-r1.ebuild 6986 BLAKE2B 4e9233b0b2a70ab4a4d33c36783c8ed7c2e5e7f0874700b370803a4c266982ac753541e667eb339787dababd2dfe39a2d6d87a93a11ddc86c89e2a1ebca2733f SHA512 9e9e52b5ea2ade456a243108aa20db3cdf2b5ab362376f0271669ea61a3a3fb6b2e8db1e0f37e5daed59f64d84a2fa8a3b9b7ebf36a936e7682a03a6798ca76f
 EBUILD gdb-8.0.1.ebuild 6869 BLAKE2B e35cc00c17a74c32e5aabc6c5b8e9e728fb80e00d06785a5ed131210a38374c468649ec1d553b6fc3ce2c6cbae6f84521625de39b9b5d0d79f984af937bd9f45 SHA512 1b39521e365127436d90b58cd442da0cb5b17f35a4ba1ea298b799fb9f5d058ac0a8425f09702ad8be001e7cba0baa88843e51499513a88313504fd4aba31db0
 EBUILD gdb-8.0.ebuild 6811 BLAKE2B 6d0985b62589a687217ea37b8170cada7c789cd301d6a2c2e2b54695251b2d3709766e070cb4a5315cab34ddd3d6ddd616ce8aa169e6b0bbcf37e54de2b36973 SHA512 3d6f7ce0483625f2772223de9fcbfac47d083cbb7278064f226ffa8476f68d8e236f131b6748b12ebf23a438ceb28e6c29b849607cc2fcb9af424bb772c43ab0
+EBUILD gdb-8.1.ebuild 7000 BLAKE2B 83bd6488369e76ac62713da1ac8b3dc87e471f22b0b9d8c908ffc8953a0a6ae87bb6d11f98048774a1932ca7f421602d97eb9479d836e50602930a78b2bb3890 SHA512 fe4a583c0ac27b9c9cb306ce4cfd958994fc054fa3ed415698fcb6eca596b778d31d1ea3eaac025e7f49fff4ae77675cfad020dadfcf498b1c780faac7629a42
 EBUILD gdb-9999.ebuild 6600 BLAKE2B a6f8cdaee3aa1cb9bd5656cb9cbbbb57d4e73c4ce283a595947f3c50b1ab645962ad66b8f8ec030e06a0515687265a3e453fe56b832f1f04ea1a3f16877ed4c8 SHA512 49415dad8c311943379a875926cb9254aa4c17f704c11a2cf292ae01028f5d6a1e99141c9f0301eedb85f8147af07ff6d4bbc44c31d31be94b03db5ef38ca734
 MISC metadata.xml 914 BLAKE2B 1260cb2638b32429345bd92c06c58074b3486ba3c516e25dab674b4589bf774f2f7192f7ed3ab9da4ed31e313038a389904bee6f9b77707d794530e3a244dfb4 SHA512 515a5bcd6c70fc87309cd4e3822d83e1b8fdf52e58cbf331df0c38b9096ad2410dfdad14aed100ea0a53457f57ecdf2b61b910b6a52765219815e1872872ee0c
diff --git a/sys-devel/gdb/gdb-8.1.ebuild b/sys-devel/gdb/gdb-8.1.ebuild
new file mode 100644
index 000000000000..d464d9858286
--- /dev/null
+++ b/sys-devel/gdb/gdb-8.1.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit flag-o-matic eutils python-single-r1
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+RPM=
+MY_PV=${PV}
+case ${PV} in
+9999*)
+	# live git tree
+	EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
+	inherit git-2
+	SRC_URI=""
+	;;
+*.*.50.2???????)
+	# weekly snapshots
+	SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
+	;;
+*.*.*.*.*.*)
+	# fedora versions; note we swap the rpm & fedora core versions.
+	# gdb-6.8.50.20090302-8.fc11.src.rpm -> gdb-6.8.50.20090302.11.8.ebuild
+	# gdb-7.9-11.fc23.src.rpm -> gdb-7.9.23.11.ebuild
+	inherit versionator rpm
+	gvcr() { get_version_component_range "$@"; }
+	parse_fedora_ver() {
+		set -- $(get_version_components)
+		MY_PV=$(gvcr 1-$(( $# - 2 )))
+		RPM="${PN}-${MY_PV}-$(gvcr $#).fc$(gvcr $(( $# - 1 ))).src.rpm"
+	}
+	parse_fedora_ver
+	SRC_URI="mirror://fedora-dev/development/rawhide/source/SRPMS/g/${RPM}"
+	;;
+*)
+	# Normal upstream release
+	SRC_URI="mirror://gnu/gdb/${P}.tar.xz
+		ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
+	;;
+esac
+
+PATCH_VER="1"
+PATCH_DEV="slyfox"
+DESCRIPTION="GNU debugger"
+HOMEPAGE="https://sourceware.org/gdb/"
+SRC_URI="${SRC_URI}
+	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PN}-8.0.1-patches-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+mirror://gentoo/${PN}-8.0.1-patches-${PATCH_VER}.tar.xz}
+"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+if [[ ${PV} != 9999* ]] ; then
+	# alpha #562128
+	KEYWORDS="-alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="+client lzma multitarget nls +python +server test vanilla xml"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	|| ( client server )
+"
+
+RDEPEND="server? ( !dev-util/gdbserver )
+	client? (
+		>=sys-libs/ncurses-5.2-r2:0=
+		sys-libs/readline:0=
+		lzma? ( app-arch/xz-utils )
+		python? ( ${PYTHON_DEPS} )
+		xml? ( dev-libs/expat )
+		sys-libs/zlib
+	)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	sys-apps/texinfo
+	client? (
+		virtual/yacc
+		test? ( dev-util/dejagnu )
+		nls? ( sys-devel/gettext )
+	)"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	[[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
+	! use vanilla && [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+
+	default
+
+	strip-linguas -u bfd/po opcodes/po
+}
+
+gdb_branding() {
+	printf "Gentoo ${PV} "
+	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
+		printf "p${PATCH_VER}"
+	else
+		printf "vanilla"
+	fi
+	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
+}
+
+src_configure() {
+	strip-unsupported-flags
+
+	local myconf=(
+		--with-pkgversion="$(gdb_branding)"
+		--with-bugurl='https://bugs.gentoo.org/'
+		--disable-werror
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{binutils,etc,gas,gold,gprof,ld}
+	)
+	local sysroot="${EPREFIX}/usr/${CTARGET}"
+	is_cross && myconf+=(
+		--with-sysroot="${sysroot}"
+		--includedir="${sysroot}/usr/include"
+		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
+	)
+
+	if use server && ! use client ; then
+		# just configure+build in the gdbserver subdir to speed things up
+		cd gdb/gdbserver
+		myconf+=( --program-transform-name='' )
+	else
+		# gdbserver only works for native targets (CHOST==CTARGET).
+		# it also doesn't support all targets, so rather than duplicate
+		# the target list (which changes between versions), use the
+		# "auto" value when things are turned on.
+		is_cross \
+			&& myconf+=( --disable-gdbserver ) \
+			|| myconf+=( $(use_enable server gdbserver auto) )
+	fi
+
+	if ! ( use server && ! use client ) ; then
+		# if we are configuring in the top level, then use all
+		# the additional global options
+		myconf+=(
+			--enable-64-bit-bfd
+			--disable-install-libbfd
+			--disable-install-libiberty
+			# Disable guile for now as it requires guile-2.x #562902
+			--without-guile
+			# This only disables building in the readline subdir.
+			# For gdb itself, it'll use the system version.
+			--disable-readline
+			--with-system-readline
+			# This only disables building in the zlib subdir.
+			# For gdb itself, it'll use the system version.
+			--without-zlib
+			--with-system-zlib
+			--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
+			$(use_with xml expat)
+			$(use_with lzma)
+			$(use_enable nls)
+			$(use multitarget && echo --enable-targets=all)
+			$(use_with python python "${EPYTHON}")
+		)
+	fi
+	if use sparc-solaris || use x86-solaris ; then
+		# disable largefile support
+		# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html
+		myconf+=( --disable-largefile )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	nonfatal emake check || ewarn "tests failed"
+}
+
+src_install() {
+	if use server && ! use client; then
+		cd gdb/gdbserver || die
+	fi
+	default
+	if use client; then
+		find "${ED}"/usr -name libiberty.a -delete || die
+	fi
+	cd "${S}" || die
+
+	# Delete translations that conflict with binutils-libs. #528088
+	# Note: Should figure out how to store these in an internal gdb dir.
+	if use nls ; then
+		find "${ED}" \
+			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
+			-delete || die
+	fi
+
+	# Don't install docs when building a cross-gdb
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
+		local f
+		for f in "${ED}"/usr/share/man/*/* ; do
+			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
+				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
+			fi
+		done
+		return 0
+	fi
+	# Install it by hand for now:
+	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
+	# Only install if it exists due to the twisted behavior (see
+	# notes in src_configure above).
+	[[ -e gdb/gdbserver/gdbreplay ]] && dobin gdb/gdbserver/gdbreplay
+
+	if use client ; then
+		docinto gdb
+		dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
+			gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
+	fi
+	docinto sim
+	dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
+	if use server ; then
+		docinto gdbserver
+		dodoc gdb/gdbserver/{ChangeLog,README}
+	fi
+
+	if [[ -n ${PATCH_VER} ]] ; then
+		dodoc "${WORKDIR}"/extra/gdbinit.sample
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
+}
+
+pkg_postinst() {
+	# portage sucks and doesnt unmerge files in /etc
+	rm -vf "${EROOT}"/etc/skel/.gdbinit
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "gdb is unable to get a mach task port when installed by Prefix"
+		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
+		ewarn "have to perform the following steps:"
+		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
+		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
+	fi
+}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 27afe1f348c2..a1f2a804a738 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -2,10 +2,13 @@ AUX 4.0.1/0002-test-Use-LLD-specific-binary-library-dirs-when-build.patch 4381 B
 AUX 4.0.1/0003-test-Fix-zlib-cond-when-building-stand-alone-clean-u.patch 2924 BLAKE2B d429f8354506562ed8b11e1c34344a3d3868a74125d794e291ab89753328da2fe615300a005fd74735bf13c02ed20672377d806b9676fe49a955a38a2d8bd5e2 SHA512 1b82f754fb872318740f77f78fa08647e2523d5b6d9cdd0dd9108bdac82a213d5d5c698a8915c0f6bd60b2163cce3c8bd1c13095dad52d0beb08079f851d30d8
 DIST lld-4.0.1.src.tar.xz 593796 BLAKE2B 58eb8f013a4562ef60dd7e17ddd741f434b8f0228a3d3d746ec8c30521ce667863d0b6db6565659a1b86cb91550cdaa43a27600d3a979460523faf24eac8ea3f SHA512 63bd0813094dc7fa9a95fdee93eb7b97026882a15548f819b5c67f3f0f9fa2a582d968af27ad8f802dbff1f6cd1b8c2fb26b3c7c80379488d05c4a4984d7af68
 DIST lld-5.0.1.src.tar.xz 672952 BLAKE2B 67bb6687f04f809b12e0b65a047c493f89a22984e8d3ac35aaf18bd3179a97efd7798e2b38e00cd00cde07ccf37a1361f4de8a3eb1481571c039195b5214d6b6 SHA512 62c9682ae4e18a64af2c9e13d45925fbe022ca332d03b1c4232c6b730dab327418555c8da2b2bf8c6126032dfd378a0b9dedba83351d928784bf2b1f30dfaaca
+DIST lld-6.0.0rc2.src.tar.xz 789408 BLAKE2B 7d4613666a81de7736216ca2f6bf5687cb4da8b23eb4d233632d4830700dc8ef206d05100ebbcda07b1d93bf83179265f1ea216d5a2ebc7d2f45c632a08a8901 SHA512 391938bd4b51a5275e4573d4500c342d1db3b80a07aac560b5d324c370563693b4ed09d62754aa91c033a3ded16466dabaa7efd859d9227123c394274503a11a
 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb
+DIST llvm-6.0.0rc2.src.tar.xz 25288140 BLAKE2B 095f054ce2ccb1eee3def2b8c6cecc610c4392283062338aa20d2de33c951484a2dc6774db2727e19e879307cfc95dda2730185cde8e52f4f45851d8dd809b3e SHA512 3cb3521ba8d90bf2a90c49d753ab5e92f1e0ccfc86946f3767c06d0f276e2c4cf8ff2f984680835efbaa4dae1cd2d3a074468e547785e05a67ea55311b94a0e9
 EBUILD lld-4.0.1.ebuild 1721 BLAKE2B f3e848199052fbec33376e9630afd80c031cd729457d1e3c302d78c42a128cc7d8baa626ed294bdde19dc2ec00683a01e4e9d5d0f6d893e24a575024b9e92556 SHA512 e971195cbf8976a0bd5140c62c3c4d9a375beaf3813119342f3f8f28db9843e53dc9804cb13b6f1a49a1b7dc60cd631cd69f742faf1de56001f59230625dbef1
 EBUILD lld-5.0.1.ebuild 1589 BLAKE2B ce6f2b7d0b095223600a236432966cbc44d89d781f6fe20b699aeb77b859bbcdf65bab0b1ad37df63918ce95f75c018a5eb9d56605e5d56d057e062399427271 SHA512 16b397e9d580a52fa430b07788a1c73aabfdc3dec87ed8ee12807e231c9590f637966f412a0657a574476b3b27b0a952718c61de955246cc1f585ab4526d49cc
-EBUILD lld-6.0.9999.ebuild 1572 BLAKE2B 5fdb41096f95d23e3f7287dd0b6adbdc51181d64f942871d2d6cb665e194f575bbec5b4e8dc58282645e12057dead82fcd5eac1edb93b63127a62e3767b30e65 SHA512 36f07056e215b21f221ade183c629643c93e56dd859635ef770c1742536831051220bfd11de663807e557b6cd03bd651e6b41abca3a1e2c17ad301a054763069
+EBUILD lld-6.0.0_rc2.ebuild 1632 BLAKE2B cf3967b3616cbdfa0d2ee5abe4abbe92240c2216970ae038c42ede3c8d3c7a8f1541551e094b67a389228b375a3fdb9b8583b4bd4f510b25bfcc0d9309b82ab8 SHA512 5e4b7a52b64eddbad01324571b8273a6f98744c8d209044a9302b2e15b340a1cdf105b6ae013ad1d497ab189a9e0fecc3acdd3fa63e8b4b8c5aa3db207465c0f
+EBUILD lld-6.0.9999.ebuild 1596 BLAKE2B c657496e25cd94aab34fbbb2ac02b165b3915bbaabc0543d4683ae3250f2bbba746b98249b82e3303d7a79096c640edbc4cdad75dcfe035adf56574b85fec149 SHA512 b240c2cb32dc7b72d772e1e95bfb9bdd2b8d34983c6a287aa5dd67e727c5aec30f7d1bc965c6eebc758accf1bcccc05a1a0565cb4e38b6a3e5cd8d94576c0d62
 EBUILD lld-9999.ebuild 1547 BLAKE2B 412347828e4f73c4a0c8481dc6e4e6a89421d25874131b3f95db1863d91a92af19f498b73dc3ce028c0d0b79786568d39653b14e81d1dd8a1673540de0d56d0e SHA512 63f3a8fcf6a52ca31131db36c4b6efe45bd913d44e62a9ef773ceb02f39d721e0e81149b7dc7304bb2b93f42485f184b734bdebf5243027a1822d30cf33c7278
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/lld/lld-6.0.0_rc2.ebuild b/sys-devel/lld/lld-6.0.0_rc2.ebuild
new file mode 100644
index 000000000000..855955c6e9de
--- /dev/null
+++ b/sys-devel/lld/lld-6.0.0_rc2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils llvm python-any-r1
+
+MY_P=${P/_/}.src
+LLVM_P=llvm-${PV/_/}.src
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="http://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
+	test? ( http://prereleases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="~sys-devel/llvm-${PV}"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
+
+S=${WORKDIR}/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Unpacking ${MY_P}.tar.xz ..."
+	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
+
+	if use test; then
+		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
+		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
+			"${LLVM_P}"/utils/{lit,unittest} || die
+		mv "${LLVM_P}" llvm || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="-vv"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_make check-lld
+}
diff --git a/sys-devel/lld/lld-6.0.9999.ebuild b/sys-devel/lld/lld-6.0.9999.ebuild
index b0e74d45d1fd..e09f7df135c6 100644
--- a/sys-devel/lld/lld-6.0.9999.ebuild
+++ b/sys-devel/lld/lld-6.0.9999.ebuild
@@ -35,7 +35,7 @@ python_check_deps() {
 }
 
 pkg_setup() {
-	llvm_pkg_setup
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	use test && python-any-r1_pkg_setup
 }
 
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 17a5e317bde0..f8909a574e96 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -1,7 +1,9 @@
 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb
+DIST llvm-6.0.0rc2.src.tar.xz 25288140 BLAKE2B 095f054ce2ccb1eee3def2b8c6cecc610c4392283062338aa20d2de33c951484a2dc6774db2727e19e879307cfc95dda2730185cde8e52f4f45851d8dd809b3e SHA512 3cb3521ba8d90bf2a90c49d753ab5e92f1e0ccfc86946f3767c06d0f276e2c4cf8ff2f984680835efbaa4dae1cd2d3a074468e547785e05a67ea55311b94a0e9
 EBUILD llvm-common-4.0.1.ebuild 642 BLAKE2B 52922fd0d0f331670cae15a48d691db72507f97c40e87182cfb583a902d694c17d5a654b50b2870701cc74ec0bea73b9397a5b5a6ae9ecb4f328921e3cc0a617 SHA512 8a361dbe22d8352b07bc531e32a18bf6aaa0dfc752f5ef63086653f346d87771600fbcefb23186f13c0682b6a07ed6ecec2fd52b4a3d05d78b6df9af2548ea19
 EBUILD llvm-common-5.0.1.ebuild 821 BLAKE2B 62a0f742d6b65c9bd2c84c4b711d2621f761b692446f8cda2c1973a89b0015caabd64e84a3ff903f34f5507e4a3ca07c1004b01c68418a7f395177c96d0c83e5 SHA512 25a5f742fa76a65dad332bbd24819922d6a31520e011666a03968bf03bac0b07e16e7262634fab8a5ced460e2ebe9f1ccec932f1c941f77638db2348bde43036
+EBUILD llvm-common-6.0.0_rc2.ebuild 756 BLAKE2B 0abf7cf2d6d5b707c45497a3d33b90d6ad57239b6a802c4ae3594b4fa57031a8c0ed52f044611628953f066746d241f0763a75c05c984213642b72bfb65b66ec SHA512 1e873d402e0bbc58632f93ed9654636240c0dfa8bdc09f69446fd5f71cddd87bf0246b4daaff367d89605a746df2342ed5bd3fac56d29ff8c9e75ebeb2f871cc
 EBUILD llvm-common-6.0.9999.ebuild 729 BLAKE2B 8455b714f371250a13d032a0bc9cc64fe16a670da92e3f9b46dbc05d79084083cc02db2eea0a1c477877e9c3b2c3b0bb5706539fc83a6089fb79ffd5f6d600d3 SHA512 a697745f5f07f002d3a789583bb3df163713b372147ddc41ca4e6395f9b9de51407aab376cfa8d6ef7276bc9c221f0a9ce2a763f347b3a04656fca5ecc93d258
 EBUILD llvm-common-9999.ebuild 704 BLAKE2B bfcd46a0c3754d0c5542eb1b03c8696ef355ebe34e94c98ab6a23442a88bc6b9a8aa8d2c89b18ed0ceea47bd2adcd7df67c8d201876a04ba7816257f83c53706 SHA512 4a7fd7260e93fa3b44a565c915a8be2e207085a506018b97263740851fd78dacf88e582b73d74a06aa36de2975b751c258ceb7997a5e6ee7db4d404fbed865bf
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvm-common/llvm-common-6.0.0_rc2.ebuild b/sys-devel/llvm-common/llvm-common-6.0.0_rc2.ebuild
new file mode 100644
index 000000000000..8657a663c9e5
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-6.0.0_rc2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=llvm-${PV/_/}.src
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="http://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="!sys-devel/llvm:0"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
+	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/utils/vim" || die
+}
+
+src_configure() { :; }
+src_compile() { :; }
+src_test() { :; }
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r utils/vim/*/
+	# some users may find it useful
+	newdoc utils/vim/README README.vim
+	dodoc utils/vim/vimrc
+}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 7e9a0e122994..82590450ced3 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -35,6 +35,7 @@ DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10
 DIST llvm-5.0.1-manpages.tar.bz2 94004 BLAKE2B 34eb29361ad7aa881e64d1dd2992fd89ce44adafd2521284c27b6ffe7082bc7e70458204e6f34d582b704bf7c5dad93c6a6dc41fc7abc41862aab8f5ec53ed07 SHA512 3444cc8e06009f5dd2669b92af662a1049d9294c8ca0dcf45486e1dc1aaf10160860b7856d30ad70bbe5864b21d1539316e89f5237549f5653954e23baf64334
 DIST llvm-5.0.1-patchset.tar.bz2 4204 BLAKE2B e7282e84578631d88549bdf34e5a44e0294e47ef1fee29c0cb954d7afd160d4b6a0f39bb3bd53791ea53503a60eaa0ada0a512a63d696ff096dc6f21f4aecdc7 SHA512 395ea2b13008e222c034e2bdd8c2bb033b9c01e61fb89c840f009f6cddb499b317df8b061d29f40968d8f0df5540a2f4a9de31eef1de886796c8c334f37254eb
 DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb
+DIST llvm-6.0.0rc2.src.tar.xz 25288140 BLAKE2B 095f054ce2ccb1eee3def2b8c6cecc610c4392283062338aa20d2de33c951484a2dc6774db2727e19e879307cfc95dda2730185cde8e52f4f45851d8dd809b3e SHA512 3cb3521ba8d90bf2a90c49d753ab5e92f1e0ccfc86946f3767c06d0f276e2c4cf8ff2f984680835efbaa4dae1cd2d3a074468e547785e05a67ea55311b94a0e9
 DIST llvm-manpages-4.0.1.tar.bz2 87981 BLAKE2B 79ffd254ee5c6e09159c954913ef820f74107d4fcea5e3ed82592dc36af8fdfbf1e850547ba8bfc20aa9a5ecdd26c50329e6a6d558ae3aa5475a930789ce3e01 SHA512 d5b3213567c25db58ef364d272314a79c311a80fc21d98c09a5540af45a8190a38f489228663fe9a9b63bf0f2b952c460c4196a8fc8d6f221619f6e7ed2fc415
 EBUILD llvm-3.4.2-r100.ebuild 7682 BLAKE2B 5915477569456fae852c4e6f29ffc405ced369e0cbaf9c2da54b3fa2b09237fdaa3afcda77df87534cf8c4343cf2f886e77a95e27e9861696395dbcad42fb815 SHA512 152d9d8167a153b3273a4e8c670eb50cd267354cc925584a416738de104f72bf66bc42d55a672c09e8d80c475ddcb254aff71878384df2266c112259d0822d69
 EBUILD llvm-3.5.2-r100.ebuild 7837 BLAKE2B 224f7bf982e0f65a512a873e6eca951d05d4e81e7ae636e95d03308c19faea77016357207c2e4d2534d9c4de561a7ff5215f37e9d02e6c6c68aa02191f63610f SHA512 3753dab4281fa0fd5061a9b4231e6fceb567bf40ac89f3bc9b2f52164e21e1b6283d3e6bb48b72dc8dfb0c21a7567ef0661d1a820943c032bb3a6ebdff59c5c9
@@ -43,6 +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 6771 BLAKE2B f10ac1c52e0ecb1e12a9352e87e59e6e3eed6b9c161282c57fd2a3a67000abd2a6650b8620e51f24e723abaecd325e9357f0abddd63f2d0a836f96b5855c57bf SHA512 bc75569a750f4e0b1740c46efe38756b812917cd3e69dc79b45292cf966b7b2a7d99627aa98f3f322315f554d3ebf093a2132763da160880b1c3a66bca0e646a
 EBUILD llvm-5.0.1.ebuild 7028 BLAKE2B 99aed6c21c5f73cb0e5c5c3523d0f3d22da1cc86ceb9470db6aff4921cfbd913e1531985353f4d6eb50fa11dec771d9f180acb55538d388d9e1eae2e5790e79a SHA512 07b55f488bdc8b6fa6a3ef854eda57f5daa64c87da4b4485c351b110f50f920d97aa0d7b4a5b104af0f1902dc323046878b2190705364adb6f2fd0f5b75b4ece
+EBUILD llvm-6.0.0_rc2.ebuild 6771 BLAKE2B f1187afa53ee18a88e342535e74a7030551082759afafc5a08cf86bdc9c2097423a8ebe2fd224d0367eb33fbfadac51a41ec9360a30c3bfaf4ae355c257b2968 SHA512 13a1c9e752e09cfb6d26c3cd4eea276ed84e8522177a54ba98bf4f1c7da3223ad34cf5c3e69df7dd5f6730273e1e5e96ea0071aabe9cc9d18bb855dab48d91ee
 EBUILD llvm-6.0.9999.ebuild 6537 BLAKE2B 8a6ab3519a21d28a193e2dc7a57a73fc701c61071154c63d4b1b4156d1c83618c58cbac002336f95d1b64223ef1569be999ce4d74eefcbe77a6a4a6e2a5581b7 SHA512 0a475543b2b36412649e46bc9c73fc1bf2aaa9bb7796155fc0774907706c8f11dd8c19bb0ac7a20389d4e27f0d8dfb2a8da27bab92c46dcc0c7718d4648771b2
 EBUILD llvm-9999.ebuild 6844 BLAKE2B bcec0d9b9aaeb57c7888ffa907b6badb9c0450e35b1bbee8502add788febbc82fe261561e8daa615c5a80b26e6f6ffba6d7105d5522d8745bebb603d3c9f906d SHA512 096cd498cf7d7f325783c990ccf3cfd3726aaeb3a1d27d0556640189a147b1aa27146eb2971baf795eee99cf1508196dcf8ce65e8d2c03664188a64e32471b05
 MISC metadata.xml 2861 BLAKE2B 3102fbcb2d2fe9f173f01dddc4617115e8cd569b2ced486c45affcba348a922cf09974e1bf977f0ac5ec8bb42b9fb87b1005cebcf74120cdb96f03ad8a1ae406 SHA512 0ea8dc63287f86428f6c7cce5f5be821d16f2b473c2b8d09c2edcc1e1d3ed445e3eaba1c96aaedbd13163f61e0c1deaad9df5c410bf1e73d05ad1bace88ec95e
diff --git a/sys-devel/llvm/llvm-6.0.0_rc2.ebuild b/sys-devel/llvm/llvm-6.0.0_rc2.ebuild
new file mode 100644
index 000000000000..5656b68b8b5f
--- /dev/null
+++ b/sys-devel/llvm/llvm-6.0.0_rc2.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eapi7-ver flag-o-matic multilib-minimal \
+	pax-utils python-any-r1 toolchain-funcs
+
+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/${P}-manpages.tar.bz2 )"
+
+# Keep in sync with CMakeLists.txt
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC Sparc SystemZ X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. ARM backend: LLVM Software Grant by ARM.
+# 3. MD5 code: public-domain.
+# 4. Tests (not installed):
+#  a. gtest: BSD.
+#  b. YAML tests: MIT.
+
+LICENSE="UoI-NCSA rc BSD public-domain
+	llvm_targets_ARM? ( LLVM-Grant )"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug doc gold libedit +libffi ncurses test xar xml
+	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=
+	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	xar? ( app-arch/xar )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
+		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
+	)
+	kernel_Darwin? (
+		<sys-libs/libcxx-$(ver_cut 1-3).9999
+		>=sys-devel/binutils-apple-5.1
+	)
+	doc? ( dev-python/sphinx )
+	gold? ( sys-libs/binutils-libs )
+	libffi? ( virtual/pkgconfig )
+	!!<dev-python/configparser-3.3.0.2
+	${PYTHON_DEPS}"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="${RDEPEND}
+	!sys-devel/llvm:0"
+PDEPEND="sys-devel/llvm-common
+	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}"/9999/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
+
+	# User patches + QA
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# 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}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-DLLVM_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DWITH_POLLY=OFF # TODO
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+		# used only for llvm-objdump tool
+		-DHAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+#	Note: go bindings have no CMake rules at the moment
+#	but let's kill the check in case they are introduced
+#	if ! multilib_is_native_abi || ! use go; then
+		mycmakeargs+=(
+			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+		)
+#	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="-vv"
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=$(usex doc)
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=$(usex doc)
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use doc && mycmakeargs+=(
+			-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF
+		)
+		use gold && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
+		[[ -x "${tblgen}" ]] \
+			|| die "${tblgen} not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DLLVM_TABLEGEN="${tblgen}"
+		)
+	fi
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${SLOT}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die
+}
+
+multilib_src_install() {
+	cmake-utils_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
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${SLOT} ))
+	cat <<-_EOF_ > "${T}/10llvm-${revord}" || die
+		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"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+_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}/${P}-manpages/llvm"/*.1
+#	fi
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+}
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index 70a3dae89240..5fad2e9ecf50 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -1,35 +1,15 @@
-AUX 3.80-memory.patch 2248 BLAKE2B 4de84c78d61b6db1a1663a4e894508387263778af6af3e68d601c95749a720aceb766eab37ee1fe1d6b2cb9f32f6ef0ff4c4f69de213364ac85b37d7c9962c05 SHA512 dc2654f236d72fcde4cc7c0249cec31cf46b3d80d4dc6c5659f65cab22c010a1edc202ab6b005237c78930939fe676461e04b426b348beaa912835ee04bc67cc
-AUX make-3.80-conditional-eval.patch 4144 BLAKE2B 8465dd064c0cff02409ebf73721584bd86e98453526b6a924972e6d7c671e288375b245daa1c40923e1e13759e529083ffeecb8eb244d7561ca5fb45a9e19a7c SHA512 6cc783cdfe315580f0143605a3f41ef48e06a510858178c5647145d05bd8a6b420080cfbbd0ffe640ad41385d197f6e7aba8f37dda2c3589c9316898658a4593
-AUX make-3.80-parallel-build-failure.patch 2210 BLAKE2B 4110117f898f876d6bd63fb6e3c804aaaa0882a34bc3c07d50213b8527b25c1c7b3aa2d42389995feec899b77c472d61f0673e89383303d732c1a5da921f061b SHA512 09d85abae6df739df02ca46fe7652a256cf9b6765c6599688795d0aae827608d9606e7870d634b8eb5662665d888c7316ca6c83c5be11fa9578c13334eb83330
-AUX make-3.81-jobserver.patch 543 BLAKE2B dc374210e8d5b32b665400650331a63090a11533947b78829045768a1437828c61f464c38f3cacb5d6dc05785b41737ad2292f624722718aa2b4d90131c610ca SHA512 0e9aa06a9bc4db784eaebf8b0689e3cc049a261a9948bfc16b2aee195b177a5e2f5b47f004c653807298513b000ed7ea2ed586fe758bfa2a0c9c08c97a71131c
-AUX make-3.81-long-cmdline.patch 2823 BLAKE2B 96d41024ec1d27d1f1325c8d822e70a5fcf113b733a2900eb840e702aaea6430f723b69419f9ed73208cea3d6cb4c80742eee272494e1f18ba738792708bade8 SHA512 40241b167bb724d3f50658338346d5b6674076fcd30bcb50c3e8e4e032d0745eb0d251856496d5ecdc47cb14aabb59ab3a47a4f48cabbf670c118e887897728d
-AUX make-3.81-tests-lang.patch 1788 BLAKE2B 981150d34a80b239aef5ee07765c0e4ae29280cc94bbeb963d9e008912513fb0e8f99ad089fb2f144eb49143750924e82adf1f4e0be3167d113d7fe62e396c32 SHA512 1717c35f8b87aa694be75f2ca42162d06a66488e9ba2c004f0daebf4cd3cf06f65aa980adf745179408d55d45b6bbb889596d5f39b28c928a0ddfd273405ec8b
-AUX make-3.81-tests-recursion.patch 514 BLAKE2B ad0e56d7322afccdc6b5aa83d770f87dfe39da54ee46bfe073858380b0df063c2988982885e1a3994b6faa00ab54d3060699703e16fd183bb71435e383b10fea SHA512 8119045661bb08d468a0975f6e0a9606768bb6122c9c5cdb9e8b74926cd37e0e1a5a60486aab306106d1c1de0b3a83b072a6999b3ba33d6a0befc333f658da00
-AUX make-3.82-MAKEFLAGS-reexec.patch 456 BLAKE2B 48a6f521fed05d379ac8f7aebaa502d867ba4b08a4047fa4362f3e64b5a48b5bc20d14b98f3532c6a3ef31cdc9edc053e15ae2a7de0a61f3760958e009c86e51 SHA512 675c528ea92c9df487c0a9d9058a304f970543f71991c70cc1399f3b6582316dac8b387aa1a744b0d6dcbe215775efea4e936b09553bccbfced3dcbc28af5532
-AUX make-3.82-archives-many-objs.patch 2110 BLAKE2B 90ab11f5b12c2fa201d90290e5a49e7dfb7eef150023787560ae98d951231a51b7dac441e685ac68a5652004a644bc0f11424be77f3f0e39b5294b0f2a147911 SHA512 c3669a4a2104621e3dab921793635c1443ec389ef160d1171d3181d58a1568d88ff35044b70298edef504f63e449ddb7fb27f9528cf588ca643dcdc3e40ebab7
-AUX make-3.82-construct-command-line.patch 2307 BLAKE2B a2ebd99372c97501afdb404a5d959952646441e351b5d0dda553f9e6331f3861af2ee354b8d5aa712cad24e0e5e172116b79ed87e31d7d90d4cc2acbebab12dc SHA512 7c72bd7b9da986a8a37b047b7944a07b729fb16cd3413bce0e17008f2bbc4afabc48835580c4302d1381552873d1f07c93fbc4dfb6862eab0e46c62b0d35f557
-AUX make-3.82-copy-on-expand.patch 1812 BLAKE2B 64f74b1e0e9aabf80093675ff66f1cac8e7d21dabe947d4e4613640d770089fddf4fe46a28b95c60f24effb6be2e84d8ba6cee8954476f67dea0d56babf599fc SHA512 e7e31edfe3f11a91a4e2d0377a15328d6b54ab7b614c9d0c8ab6b18b5a8a5e2fa852ac7469bee685fcbdaa46d22f81fd585d0683a762afaa4160d7a7d5a558c8
 AUX make-3.82-darwin-library_search-dylib.patch 439 BLAKE2B a1588c20c4e7236a7bf07876de44cc29ac9a7eaee377fee02dfcaade966874480af418fad168cc7e148448e6b11900e55fb34da3fed4057931ea6b7df25604b6 SHA512 aaabf2e7faaa6f116c0124d30e8bc5c049fa471defc39c454e03e3f484265f30fc0388ea13154559925935d803315b5594780b41bbf1d1f7d1599a60f85cd8ac
-AUX make-3.82-glob-speedup.patch 2833 BLAKE2B 1a9809fd27b883af4397de9c2a6cff538d2cc8712eebdcd6be9a1f457a8312bfad40e63b3fab1c103960f8eaf31c5be9afad7f252b1a193cc4aaf48f57217fd6 SHA512 de6bacc4e389c2308a92b77b6f21f752ed078af6f5320481f84e8344532825a5b2225ddb9c8eba40badf9d377d1e5546906ab265e5c08a815cce01b0832dfe1c
-AUX make-3.82-intermediate-parallel.patch 1863 BLAKE2B 2a19e770fa0471fdbb1b922564bad295a7ac879823da269137a823708bc311d86d8181c58aba1a1aac2a2d8428adb3ee08617ed4db84637971f0c5c4bbfbaaae SHA512 6cebec44deda36e1a25fd5b0641ecfb90dc708d7d5dca2dd6108cc2bf0be142f26e96a5979a7b456c6f29517853e1abb7a755b078fef3c0f452437c7f0c38379
-AUX make-3.82-long-command-line.patch 1598 BLAKE2B a169a88a1daf68e9bb9bb6925d506e58c5422bcdbb7dd14ec7e4acb63bf095d8b3eb75f5e42fcd7b57d154d7fd5b7fd3a2413cec6b137647ea5252c9d19cb71c SHA512 b86336d6e337a8d7524a90ec75944772aab48cba45ab003adc5b71c3a4604350ecb16c398a003cd3ac7ff900d841b915d771626e9a8485778ce72e43510f107c
-AUX make-3.82-memory-corruption.patch 899 BLAKE2B 4f68f41fedddff05ddaa4d847e70d21e6bf57a61f33eafa8d8d4e86ceaf2dc065e9ea0718c36266f29f8a79b87b93c3956ab02a5a3aaad97d4b96838848b5b8c SHA512 a65428bf6a1ff3bbe811cbf633577f15399bdaeab11fab0e66a104987df4dffc7779753aaaaad0534e591ca6df2fbebfca6522b35487e6bf9166b0681c271ae8
-AUX make-3.82-oneshell.patch 931 BLAKE2B ce13308f44dd9afdce9597e923de0b79cabd46b5976f273d3ea7a1163bfad902cfbf53f697f9987602a27570150a49a93a7c22f606f2bc5ee2f57a98dae0b3eb SHA512 85784dfcfeee2b7d7d3d659edc39a268165ab3f9dbd3d716ffcc7ba52cb44c3011cf5aa3e57cdab12f2f8aeec4ff00ffe82959aef242951f4dc1a7c6d4b55d89
-AUX make-3.82-parallel-remake.patch 1422 BLAKE2B 92b8a3d8acf52506097966c18d23246fcb61556afc113583971f0d396506712084002043aae066eea05549ee12ae1fca0220bd7a96dfccbe692288d409ff848b SHA512 640489810aa387524d5b7b0c38b22d13c423e1ca04c2a8915d1736904aa6e158f999eda5d6b0f17c21a85f97b490e73c85fd2d205d494c98099e379842a1fccc
 AUX make-4.0-char-cast.patch 1399 BLAKE2B c4923356f8b6807008dff15612d1c10ac729399f348bf45f9a276a79b8f9dabdc1d107b8c814bd85cbb5e542eab5995edfd590ecf1655cff49e83dffda5a76e8 SHA512 7d1490094b01362bba40cb0d2088d2ee79b9bd6756e4ea51920675ca305acfc653cdf92df5735e4e40360ece6c9de6dafcdd542df6b9821de8b1345b8ad2fb1b
 AUX make-4.1-fix_null_returns_from_ttyname.patch 1888 BLAKE2B 2aee82af5c6d2f8b5fb1d45be2708b6c0f5632236a0be948f16e1e59bd6619145913d4920c8428907479ae29fbc105663f9bbcbd3951ba60b8cead5793b34f65 SHA512 47eb22909be25618fbc120fe5b844207989135101ada960c69557f898b2345c52a25fc329945324cd968f19fc3835330d939cf4ec2faf5ccf5c54e20dc02a1da
 AUX make-4.2-default-cxx.patch 269 BLAKE2B 6bbadfe43e3494c7dbd423edc5caf1eba1b6c3bb8f3b2f04368ccbe5c03f248a2692ba1b2299b966bd630c94e2b66674c079eaafa9b3b3c54bd163e75ac53f9f SHA512 b9c6254c8111111d9986de617023fad1673a8992d5a8b2e1e5ce32a92f5e4d064e1a9677b44f1d647a54ddd1c62782eccfd2d71ddc8d41baee141f65bdc894fe
-DIST make-3.80.tar.bz2 920645 BLAKE2B 524d59d1e1518dbeb527475e07b187533fd1cc2233b01470e50329bf1069b0367185080355c557461b0fc5b8434e451718a9f459a03a10ecf093bb5f433321f9 SHA512 aadabe1f6a3acd438597b24465e06e34343fb020b4ca9336d2aa5b572ce530622785dde8215b3f4332ff75928f72c269b9b83dfecf470f522285e27109b7bdfd
-DIST make-3.81.tar.bz2 1151445 BLAKE2B 097f648459688d48cef8d4ef35d6de6f946801413ab3c3900d6c1b9fd3e2207cbcedfcb45ae4527b8996205d5a31c248afb14ed5de5e47db74d4ddb0a7ab0edf SHA512 f38b8219a966b4756149a13435f5b9dc760814aa62c6add8e1760e602f65a83cd0a45ed457a5dbdd2fab91043af4de2c60e62154f95c6b625af3703c824eb653
-DIST make-3.82.tar.bz2 1242186 BLAKE2B 4e5d7664fffdc60e250eb896168102c150884dfe98736f1194a893ab29fffca7dd4fa3f226eccc80892267ceb41c9e8774fbb80c9dc36723918258e63d176d98 SHA512 3260be0d1a9a7c5eb0dbb87179a9a9521fdfc7809ca51f13ee5a37ba5e63d21ad50a4249ec7d3929a9d0ce8c8f6cf302558743964f0f7ff742efe283b91df9de
+AUX make-4.2.1-glob-internals.patch 1752 BLAKE2B 97616f18dcc30dbda296942d7dfa5b1a70c65e6d0c24314c5ae6b30102b81ff5ca0114f9c2a2fa777173204bf5bb0ea9b793317d2d7f7d44ae734e9174c6f361 SHA512 79b5454fa2f1e976611ecf5de99e764d4c9a85917d3d97ce424cd56b0954430f3e31fd2254a30320469f0b30c464734e3633b89d8374b3e4b8d182a342325ab1
+AUX make-4.2.1-glob-v2.patch 845 BLAKE2B 8d5caeece460588fb22cee971e0e3257115fd5ce5b1dfc1b487f9d33fee8545b10bb69e6b2c34cbe54f416819ead8c45db67197332d0e82c1664722b87caa384 SHA512 0a52b1b204e26b397c1d90e27a3b79ea23847d2bdf83a25f620af96f20f81061301414e489422ca5bb313110c33bd142191672f6b188e9276b76f0ce6f0fd8bb
+AUX make-4.2.1-perl526.patch 655 BLAKE2B 98bc8bf7ec5bcdb0d726b046ae58cebada8e360087da4c212da19a4cda622c5bbc1c00782802589aee3142a62c3b8a2df18cfa8bc98c523e2eb65aaa29398a6d SHA512 3817f6efed5fbcd2bb9d1747bea4af5a197ef4aa552ab79accee5139d25241956eca669edd19eff32df2a51fee666b6bc398fb6277b1f92f6175eca2d2228d6e
 DIST make-4.0.tar.bz2 1341927 BLAKE2B 84cef70a3611da0172610f083ba18f87317c6bf89a71e53ebd7ed6881a6bc1c81897167cdd9dc09ba4754479b6337c746eb2716b2925aeae7d6488a3c1a81771 SHA512 82de265963cd08701491e02a4917cd2097762657257a9508119e5847050d0cb15580c163159463e822860435c5910190677d8e4aba644ba75df2895f26117376
 DIST make-4.1.tar.bz2 1327342 BLAKE2B 4a93f893d219e2ac16a87f19de018f1d794a1f4c70c2a57dea52ccaa452b288bfbea0e422a880efcb457f666f41a40913a214e0feae4cc7edcebb8ec945bd72c SHA512 3fcaf06660b7a5019937b81ee69fe54cdfe0a24d66286fc5cc6a34fa996d76dfe6fd5bc49ee59b727ae2b24ddca261ada0fdb5873ba2b38dcc63647ad3cdb193
 DIST make-4.2.1.tar.bz2 1407126 BLAKE2B fa6d43f5fd46182182a296c58dcd138a1a4568104eda760bbb3c241c023dee216789cf3128e5ac2b416cec76e1ba82d5b5e7852da12e86138a7d0865c85a42b4 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8
-EBUILD make-3.80-r4.ebuild 1024 BLAKE2B 5687ada5487bb28ec589a7391efab1b7b1a09bcb8d96d0d2169d148b45ace5d352e484ef271dd44aa010463b132e1d3bbbe398cf00019f9624bec4323e2387c0 SHA512 072bb62e7b41a1b1b7904f2bb4da50daa5d1355d7bccbac1ed58aad82dfe8e1fee5b963e2640566019617a9196880f93d1c3ea9a3ddfcd33d6e7e7af5aebee2b
-EBUILD make-3.81-r2.ebuild 1186 BLAKE2B e27d82e5d5974998c576d22d31657c30dc0435baa6b8bbf9a99bd2ea017d73109764d2bb1f593e04ec8d70dbad64112c8bd79d3d76082d044261989e0914fedf SHA512 a1161dc8233caf53faae46e2098890aabf4015e9939db82d280784cc0fa6488e0ec90698bedbc336bc754062d9f68145d10c43767a4574105164409eb6df494f
-EBUILD make-3.82-r4.ebuild 1686 BLAKE2B 297e3f87d00d308f6560a20e4b9d262721840379eb128f2e8d5a858285123d12c482630aea7954ea7d6d4e52618c32f844e1741b8948b14e4b23964c60b7271c SHA512 2894a438c9f2949b7b72e9a6fcb6421ddf6b906029e265ced98b504b7e1e42d1036f611a1ba703c3200e4d39c3d22caca5f0c97698b425f2a333d6dc4f79caa1
 EBUILD make-4.0-r1.ebuild 1284 BLAKE2B 124d6a7ba1e715ce7f584991c209b53e803fcdb2e9b423481a0e46f8e868a48a19db282554d21a7a75603a72865d25986f746647ceadfe2b833bf4f0b8875598 SHA512 5c2d8ff215eca2f4179c05646a3d5bb67d2aee689e0dae23b964feacada4c166096af46ebaf5b1af20f4cf74c4b3f5275df4a1d7571643079a09de407b64a38f
 EBUILD make-4.1-r1.ebuild 1294 BLAKE2B 79312e1a1af06a8a44aa014226e5c1dbdb16ffdeeb65053181552257f62231f0f5b0e88287a97c4c6eb721d76e02f4a07ea5f7523329ee5497f3f180034e9de5 SHA512 87afba6be03d935e44f94547d12f1bc265774481a065834694b42f083675fb7b01ad00233321c096e1e93e23436cdacb20933b164687b4713d821daecaaff0d1
-EBUILD make-4.2.1-r1.ebuild 1331 BLAKE2B 9568096a47d804c498a8d0565f6ba9a2fc286c7670b45223f99d5749353cd00e66521098c19a9475bdea11502719c756984ac860fa1bffcad37f02618460055e SHA512 495f0066f844d734a2d6b3f88fa61ea9a42a3206fe602c3e56955bbe05913215a4d71561f9e9361daec0af35eb654e2b2c1528afa1ab7299a139694ecfa104fe
-EBUILD make-4.2.1.ebuild 1279 BLAKE2B b66f41084e582559c27b35ab949de5882d6ee70482d65bf59a852ca25f082783ce8e87105d82cccb3b1ee097016767fff76b82a7e587a6b53a8c607eb4ac8b90 SHA512 9ea46005da11e9cd5093a57be8ea395ae619df2e9593a5ce3da5c2750289b6e2a5901fe15bb49ed55bd75cc4cb029d1632a49196dd100feb301012bc353bb60f
+EBUILD make-4.2.1-r1.ebuild 1474 BLAKE2B f36146c30046ecbc878b2d245c02252e28b8b73bde5a88e52e8659f7ebec40761a6f24c0b3c5ae8539f953881aa04461535cb9314a04b72ef80cc78fcfe4363b SHA512 91cfeba3d078190d0fa63fe47e54e7775deed15044a378ea700d1271d68cb2a726118efc970966f0677b2a6b3ff7ec8531438915b2862d61d9ad51e26e53766e
+EBUILD make-4.2.1.ebuild 1333 BLAKE2B 5c9786bcb8119c2e2f98ff07607686ab16638e663c21374504be9687d85752dc58654fcc0aa6e2ff4c9eea25be066fc5409017923e82517d3df32eb32e950568 SHA512 d89725d226ac924816623c6a7237cacd0001c22540c8788808ea59473d526ce8d1bd4d573751569fe605f7c46145d5d7e2a647e86dae6276077fa3aeff915402
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/make/files/3.80-memory.patch b/sys-devel/make/files/3.80-memory.patch
deleted file mode 100644
index 663acf52d77c..000000000000
--- a/sys-devel/make/files/3.80-memory.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: variable.h
-===================================================================
-RCS file: /cvsroot/make/make/variable.h,v
-retrieving revision 1.24
-diff -u -B -b -r1.24 variable.h
---- variable.h	8 Aug 2002 00:11:19 -0000	1.24
-+++ variable.h	25 Oct 2002 21:37:32 -0000
-@@ -107,6 +107,8 @@
- extern char *expand_argument PARAMS ((char *str, char *end));
- extern char *variable_expand_string PARAMS ((char *line, char *string,
-                                              long length));
-+extern void install_variable_buffer PARAMS ((char **bufp, unsigned int *lenp));
-+extern void restore_variable_buffer PARAMS ((char *buf, unsigned int len));
- 
- /* function.c */
- extern int handle_function PARAMS ((char **op, char **stringp));
-Index: expand.c
-===================================================================
-RCS file: /cvsroot/make/make/expand.c,v
-retrieving revision 1.33
-diff -u -B -b -r1.33 expand.c
---- expand.c	14 Oct 2002 21:54:04 -0000	1.33
-+++ expand.c	25 Oct 2002 21:37:32 -0000
-@@ -545,3 +545,28 @@
- 
-   return value;
- }
-+
-+/* Install a new variable_buffer context, returning the current one for
-+   safe-keeping.  */
-+
-+void
-+install_variable_buffer (char **bufp, unsigned int *lenp)
-+{
-+  *bufp = variable_buffer;
-+  *lenp = variable_buffer_length;
-+
-+  variable_buffer = 0;
-+  initialize_variable_output ();
-+}
-+
-+/* Restore a previously-saved variable_buffer setting (free the current one).
-+ */
-+
-+void
-+restore_variable_buffer (char *buf, unsigned int len)
-+{
-+  free (variable_buffer);
-+
-+  variable_buffer = buf;
-+  variable_buffer_length = len;
-+}
-Index: function.c
-===================================================================
-RCS file: /cvsroot/make/make/function.c,v
-retrieving revision 1.71
-diff -u -B -b -r1.71 function.c
---- function.c	14 Oct 2002 21:54:04 -0000	1.71
-+++ function.c	25 Oct 2002 21:37:32 -0000
-@@ -1196,7 +1196,17 @@
- static char *
- func_eval (char *o, char **argv, const char *funcname)
- {
-+  char *buf;
-+  unsigned int len;
-+
-+  /* Eval the buffer.  Pop the current variable buffer setting so that the
-+     eval'd code can use its own without conflicting.  */
-+
-+  install_variable_buffer (&buf, &len);
-+
-   eval_buffer (argv[0]);
-+
-+  restore_variable_buffer (buf, len);
- 
-   return o;
- }
-\ No newline at end of file
diff --git a/sys-devel/make/files/make-3.80-conditional-eval.patch b/sys-devel/make/files/make-3.80-conditional-eval.patch
deleted file mode 100644
index f4c1581f316f..000000000000
--- a/sys-devel/make/files/make-3.80-conditional-eval.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-Fix from upstream
-
-https://savannah.gnu.org/bugs/index.php?func=detailitem&item_id=1516
-http://bugs.gentoo.org/123317
-
-Index: read.c
-===================================================================
-RCS file: /cvsroot/make/make/read.c,v
-retrieving revision 1.124
-retrieving revision 1.125
-diff -u -p -r1.124 -r1.125
---- read.c	14 Oct 2002 21:54:04 -0000	1.124
-+++ read.c	25 Oct 2002 22:01:47 -0000	1.125
-@@ -272,6 +272,34 @@ read_all_makefiles (char **makefiles)
-   return read_makefiles;
- }
- 
-+/* Install a new conditional and return the previous one.  */
-+
-+static struct conditionals *
-+install_conditionals (struct conditionals *new)
-+{
-+  struct conditionals *save = conditionals;
-+
-+  bzero ((char *) new, sizeof (*new));
-+  conditionals = new;
-+
-+  return save;
-+}
-+
-+/* Free the current conditionals and reinstate a saved one.  */
-+
-+static void
-+restore_conditionals (struct conditionals *saved)
-+{
-+  /* Free any space allocated by conditional_line.  */
-+  if (conditionals->ignoring)
-+    free (conditionals->ignoring);
-+  if (conditionals->seen_else)
-+    free (conditionals->seen_else);
-+
-+  /* Restore state.  */
-+  conditionals = saved;
-+}
-+
- static int
- eval_makefile (char *filename, int flags)
- {
-@@ -388,6 +416,8 @@ int
- eval_buffer (char *buffer)
- {
-   struct ebuffer ebuf;
-+  struct conditionals *saved;
-+  struct conditionals new;
-   const struct floc *curfile;
-   int r;
- 
-@@ -402,8 +432,12 @@ eval_buffer (char *buffer)
-   curfile = reading_file;
-   reading_file = &ebuf.floc;
- 
-+  saved = install_conditionals (&new);
-+
-   r = eval (&ebuf, 1);
- 
-+  restore_conditionals (saved);
-+
-   reading_file = curfile;
- 
-   return r;
-@@ -412,13 +446,8 @@ eval_buffer (char *buffer)
- 
- /* Read file FILENAME as a makefile and add its contents to the data base.
- 
--   SET_DEFAULT is true if we are allowed to set the default goal.
-+   SET_DEFAULT is true if we are allowed to set the default goal.  */
- 
--   FILENAME is added to the `read_makefiles' chain.
--
--   Returns 0 if a file was not found or not read.
--   Returns 1 if FILENAME was found and read.
--   Returns 2 if FILENAME was read, and we kept a reference (don't free it).  */
- 
- static int
- eval (struct ebuffer *ebuf, int set_default)
-@@ -782,9 +811,7 @@ eval (struct ebuffer *ebuf, int set_defa
- 
- 	  /* Save the state of conditionals and start
- 	     the included makefile with a clean slate.  */
--	  save = conditionals;
--	  bzero ((char *) &new_conditionals, sizeof new_conditionals);
--	  conditionals = &new_conditionals;
-+	  save = install_conditionals (&new_conditionals);
- 
- 	  /* Record the rules that are waiting so they will determine
- 	     the default goal before those in the included makefile.  */
-@@ -810,14 +837,8 @@ eval (struct ebuffer *ebuf, int set_defa
-                 }
- 	    }
- 
--	  /* Free any space allocated by conditional_line.  */
--	  if (conditionals->ignoring)
--	    free (conditionals->ignoring);
--	  if (conditionals->seen_else)
--	    free (conditionals->seen_else);
--
--	  /* Restore state.  */
--	  conditionals = save;
-+	  /* Restore conditional state.  */
-+	  restore_conditionals (save);
- 
-           goto rule_complete;
- 	}
-Index: tests/scripts/functions/eval
-===================================================================
-RCS file: /cvsroot/make/make/tests/scripts/functions/eval,v
-retrieving revision 1.1
-retrieving revision 1.2
-diff -u -p -r1.1 -r1.2
---- tests/scripts/functions/eval	8 Jul 2002 02:26:48 -0000	1.1
-+++ tests/scripts/functions/eval	25 Oct 2002 22:01:47 -0000	1.2
-@@ -57,4 +57,35 @@ $answer = "A = A B = B\n";
- 
- &compare_output($answer,&get_logfile(1));
- 
-+# Test to make sure eval'ing inside conditionals works properly
-+
-+$makefile3 = &get_tmpfile;
-+
-+open(MAKEFILE,"> $makefile3");
-+
-+print MAKEFILE <<'EOF';
-+FOO = foo
-+
-+all:: ; @echo it
-+
-+define Y
-+  all:: ; @echo worked
-+endef
-+
-+ifdef BAR
-+$(eval $(Y))
-+endif
-+
-+EOF
-+
-+close(MAKEFILE);
-+
-+&run_make_with_options($makefile3, "", &get_logfile);
-+$answer = "it\n";
-+&compare_output($answer,&get_logfile(1));
-+
-+&run_make_with_options($makefile3, "BAR=1", &get_logfile);
-+$answer = "it\nworked\n";
-+&compare_output($answer,&get_logfile(1));
-+
- 1;
diff --git a/sys-devel/make/files/make-3.80-parallel-build-failure.patch b/sys-devel/make/files/make-3.80-parallel-build-failure.patch
deleted file mode 100644
index 717e0f3556ce..000000000000
--- a/sys-devel/make/files/make-3.80-parallel-build-failure.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-http://lists.gnu.org/archive/html/bug-make/2005-07/msg00050.html
-http://lists.gnu.org/archive/html/bug-make/2005-08/msg00019.html
-http://bugs.gentoo.org/107613
-
-2005-08-07  Paul D. Smith  <psmith@gnu.org>
-
-    Fix a bug reported by Michael Matz <matz@suse.de>: patch included.
-    If make is running in parallel without -k and two jobs die in a
-    row, but not too close to each other, then make will quit without
-    waiting for the rest of the jobs to die.
-
-    * main.c (die): Don't reset err before calling reap_children() the
-    second time: we still want it to be in the error condition.
-    * job.c (reap_children): Use a static variable, rather than err,
-    to control whether or not the error message should be printed.
-
-Index: job.c
-===================================================================
-RCS file: /cvsroot/make/make/job.c,v
-retrieving revision 1.166
-retrieving revision 1.167
-diff -u -p -r1.166 -r1.167
---- job.c	26 Jun 2005 03:31:30 -0000	1.166
-+++ job.c	8 Aug 2005 05:08:00 -0000	1.167
-@@ -475,9 +479,14 @@ reap_children (int block, int err)
- 
-       if (err && block)
- 	{
--	  /* We might block for a while, so let the user know why.  */
-+          static int printed = 0;
-+
-+	  /* We might block for a while, so let the user know why.
-+             Only print this message once no matter how many jobs are left.  */
- 	  fflush (stdout);
--	  error (NILF, _("*** Waiting for unfinished jobs...."));
-+          if (!printed)
-+            error (NILF, _("*** Waiting for unfinished jobs...."));
-+          printed = 1;
- 	}
- 
-       /* We have one less dead child to reap.  As noted in
-Index: main.c
-===================================================================
-RCS file: /cvsroot/make/make/main.c,v
-retrieving revision 1.210
-retrieving revision 1.211
-diff -u -p -r1.210 -r1.211
---- main.c	12 Jul 2005 04:35:13 -0000	1.210
-+++ main.c	8 Aug 2005 05:08:00 -0000	1.211
-@@ -2990,7 +2996,8 @@ die (int status)
- 	print_version ();
- 
-       /* Wait for children to die.  */
--      for (err = (status != 0); job_slots_used > 0; err = 0)
-+      err = (status != 0);
-+      while (job_slots_used > 0)
- 	reap_children (1, err);
- 
-       /* Let the remote job module clean up its state.  */
diff --git a/sys-devel/make/files/make-3.81-jobserver.patch b/sys-devel/make/files/make-3.81-jobserver.patch
deleted file mode 100644
index cd787ca769d2..000000000000
--- a/sys-devel/make/files/make-3.81-jobserver.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-related to bug #193258, but this is the final patch that Fedora went with
-
---- make-3.81/main.c	2007-09-24 15:28:34.000000000 +0200
-+++ make-3.81-pm/main.c	2007-09-24 15:32:50.000000000 +0200
-@@ -1669,8 +1669,12 @@ main (int argc, char **argv, char **envp
- 
-     if (job_slots > 0)
-       {
--        close (job_fds[0]);
--        close (job_fds[1]);
-+	if (restarts == 0)
-+	  {
-+	    close (job_fds[0]);
-+	    close (job_fds[1]);
-+	  }
-+
-         job_fds[0] = job_fds[1] = -1;
-         free (jobserver_fds->list);
-         free (jobserver_fds);
diff --git a/sys-devel/make/files/make-3.81-long-cmdline.patch b/sys-devel/make/files/make-3.81-long-cmdline.patch
deleted file mode 100644
index 9ceb5e8195e2..000000000000
--- a/sys-devel/make/files/make-3.81-long-cmdline.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-http://bugs.gentoo.org/301116
-
-tweaked a little to avoid regenerating autotools
-
-2009-07-29  Ralf Wildenhues  <Ralf.Wildenhues <at> gmx.de>
-
-	* configure.in: Check for sys/user.h and linux/binfmts.h
-	headers.
-	* job.c: Include them if available.
-	(construct_command_argv_internal): When constructing the command
-	line with 'sh -c', use multiple arguments together with eval
-	expansion to evade the Linux per-argument length limit
-	MAX_ARG_STRLEN if it is defined.
-	Problem reported against Automake by Xan Lopez <xan <at> gnome.org>.
-
---- job.c.orig	2010-01-15 18:36:53.000000000 +0200
-+++ job.c	2010-01-15 18:41:09.000000000 +0200
-@@ -29,6 +29,15 @@
- 
- #include <string.h>
- 
-+#if defined(__linux__) /* defined (HAVE_LINUX_BINFMTS_H) && defined (HAVE_SYS_USER_H) */
-+#include <sys/user.h>
-+#include <unistd.h>
-+#ifndef PAGE_SIZE
-+#define PAGE_SIZE sysconf(_SC_PAGE_SIZE)
-+#endif
-+#include <linux/binfmts.h>
-+#endif
-+
- /* Default shell to use.  */
- #ifdef WINDOWS32
- #include <windows.h>
-@@ -2697,9 +2702,19 @@
- #endif
-     unsigned int line_len = strlen (line);
- 
-+#ifdef MAX_ARG_STRLEN
-+    static char eval_line[] = "eval\\ \\\"set\\ x\\;\\ shift\\;\\ ";
-+#define ARG_NUMBER_DIGITS 5
-+#define EVAL_LEN (sizeof(eval_line)-1 + shell_len + 4 \
-+                 + (7 + ARG_NUMBER_DIGITS) * 2 * line_len / (MAX_ARG_STRLEN - 2))
-+#else
-+#define EVAL_LEN 0
-+#endif
-     char *new_line = (char *) alloca (shell_len + (sizeof (minus_c) - 1)
--				      + (line_len * 2) + 1);
-+				      + (line_len*2) + 1 + EVAL_LEN);
-+
-     char *command_ptr = NULL; /* used for batch_mode_shell mode */
-+    char *args_ptr;
- 
- # ifdef __EMX__ /* is this necessary? */
-     if (!unixy_shell)
-@@ -2712,6 +2727,30 @@
-     bcopy (minus_c, ap, sizeof (minus_c) - 1);
-     ap += sizeof (minus_c) - 1;
-     command_ptr = ap;
-+
-+#if !defined (WINDOWS32) && defined (MAX_ARG_STRLEN)
-+    if (unixy_shell && line_len > MAX_ARG_STRLEN)
-+      {
-+	unsigned j;
-+	memcpy (ap, eval_line, sizeof (eval_line) - 1);
-+	ap += sizeof (eval_line) - 1;
-+	for (j = 1; j <= 2 * line_len / (MAX_ARG_STRLEN - 2); j++)
-+	  ap += sprintf (ap, "\\$\\{%u\\}", j);
-+	*ap++ = '\\';
-+	*ap++ = '"';
-+	*ap++ = ' ';
-+	/* Copy only the first word of SHELL to $0.  */
-+	for (p = shell; *p != '\0'; ++p)
-+	  {
-+	    if (isspace ((unsigned char)*p))
-+	      break;
-+	    *ap++ = *p;
-+	  }
-+	*ap++ = ' ';
-+      }
-+#endif
-+    args_ptr = ap;
-+
-     for (p = line; *p != '\0'; ++p)
-       {
- 	if (restp != NULL && *p == '\n')
-@@ -2760,6 +2799,14 @@
-           }
- #endif
- 	*ap++ = *p;
-+
-+#if !defined (WINDOWS32) && defined (MAX_ARG_STRLEN)
-+	if (unixy_shell && line_len > MAX_ARG_STRLEN && (ap - args_ptr > MAX_ARG_STRLEN - 2))
-+	  {
-+	    *ap++ = ' ';
-+	    args_ptr = ap;
-+	  }
-+#endif
-       }
-     if (ap == new_line + shell_len + sizeof (minus_c) - 1)
-       /* Line was empty.  */
diff --git a/sys-devel/make/files/make-3.81-tests-lang.patch b/sys-devel/make/files/make-3.81-tests-lang.patch
deleted file mode 100644
index f4e514712a0e..000000000000
--- a/sys-devel/make/files/make-3.81-tests-lang.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Fix from upstream for running tests when LC_ALL is set to non-C
-
-http://bugs.gentoo.org/149147
-
-Index: make/tests/run_make_tests.pl
-===================================================================
-RCS file: /cvsroot/make/make/tests/run_make_tests.pl,v
-retrieving revision 1.22
-retrieving revision 1.23
-diff -u -p -r1.22 -r1.23
---- make/tests/run_make_tests.pl	8 Mar 2006 20:15:09 -0000	1.22
-+++ make/tests/run_make_tests.pl	1 Oct 2006 05:38:38 -0000	1.23
-@@ -228,11 +228,6 @@ sub set_more_defaults
-    local($string);
-    local($index);
- 
--   # Make sure we're in the C locale for those systems that support it,
--   # so sorting, etc. is predictable.
--   #
--   $ENV{LANG} = 'C';
--
-    # find the type of the port.  We do this up front to have a single
-    # point of change if it needs to be tweaked.
-    #
-Index: make/tests/test_driver.pl
-===================================================================
-RCS file: /cvsroot/make/make/tests/test_driver.pl,v
-retrieving revision 1.19
-retrieving revision 1.20
-diff -u -p -r1.19 -r1.20
---- make/tests/test_driver.pl	10 Mar 2006 02:20:45 -0000	1.19
-+++ make/tests/test_driver.pl	1 Oct 2006 05:38:38 -0000	1.20
-@@ -78,9 +78,9 @@ sub resetENV
- sub toplevel
- {
-   # Pull in benign variables from the user's environment
--  #
-+
-   foreach (# UNIX-specific things
--           'TZ', 'LANG', 'TMPDIR', 'HOME', 'USER', 'LOGNAME', 'PATH',
-+           'TZ', 'TMPDIR', 'HOME', 'USER', 'LOGNAME', 'PATH',
-            # Purify things
-            'PURIFYOPTIONS',
-            # Windows NT-specific stuff
-@@ -92,6 +92,10 @@ sub toplevel
-     $makeENV{$_} = $ENV{$_} if $ENV{$_};
-   }
- 
-+  # Make sure our compares are not foiled by locale differences
-+
-+  $makeENV{LC_ALL} = 'C';
-+
-   # Replace the environment with the new one
-   #
-   %origENV = %ENV;
diff --git a/sys-devel/make/files/make-3.81-tests-recursion.patch b/sys-devel/make/files/make-3.81-tests-recursion.patch
deleted file mode 100644
index 490e2a912cd8..000000000000
--- a/sys-devel/make/files/make-3.81-tests-recursion.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugs.gentoo.org/329153
-https://savannah.gnu.org/bugs/index.php?29968
-
---- tests/scripts/features/recursion	2005/02/10 00:10:58	1.2
-+++ tests/scripts/features/recursion	2010/07/01 07:16:00	1.3
-@@ -16,7 +16,7 @@
- 	@echo MAKELEVEL = $(MAKELEVEL)
- 	@echo THE END
- ',
--              ('CFLAGS=-O -w' . ($parallel_jobs ? '-j 2' : '')),
-+              ('CFLAGS=-O -w' . ($parallel_jobs ? ' -j 2' : '')),
-               ($vos
-                ? "#MAKE#: Entering directory `#PWD#'
- make 'CFLAGS=-O' -f #MAKEFILE# foo
diff --git a/sys-devel/make/files/make-3.82-MAKEFLAGS-reexec.patch b/sys-devel/make/files/make-3.82-MAKEFLAGS-reexec.patch
deleted file mode 100644
index a2f59657d4ca..000000000000
--- a/sys-devel/make/files/make-3.82-MAKEFLAGS-reexec.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugs.gentoo.org/331975
-https://savannah.gnu.org/bugs/?30723
-
---- main.c	2010/07/19 07:10:53	1.243
-+++ main.c	2010/08/10 07:35:34	1.244
-@@ -2093,7 +2093,7 @@
-             const char *pv = define_makeflags (1, 1);
-             char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
-             sprintf (p, "MAKEFLAGS=%s", pv);
--            putenv (p);
-+            putenv (allocated_variable_expand (p));
-           }
- 
- 	  if (ISDB (DB_BASIC))
diff --git a/sys-devel/make/files/make-3.82-archives-many-objs.patch b/sys-devel/make/files/make-3.82-archives-many-objs.patch
deleted file mode 100644
index abdcd3228014..000000000000
--- a/sys-devel/make/files/make-3.82-archives-many-objs.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-http://bugs.gentoo.org/334889
-https://savannah.gnu.org/bugs/?30612
-
-revision 1.194
-date: 2010-08-13 22:50:14 -0400;  author: psmith;  state: Exp;  lines: +9 -6;  commitid: 4UaslPqQHZTs5wKu;
-- Fix Savannah bug #30612: handling of archive references with >1 object
-
-Index: read.c
-===================================================================
-RCS file: /sources/make/make/read.c,v
-retrieving revision 1.193
-retrieving revision 1.194
-diff -u -p -r1.193 -r1.194
---- read.c	13 Jul 2010 01:20:42 -0000	1.193
-+++ read.c	14 Aug 2010 02:50:14 -0000	1.194
-@@ -3028,7 +3028,7 @@ parse_file_seq (char **stringp, unsigned
-             {
-               /* This looks like the first element in an open archive group.
-                  A valid group MUST have ')' as the last character.  */
--              const char *e = p + nlen;
-+              const char *e = p;
-               do
-                 {
-                   e = next_token (e);
-@@ -3084,19 +3084,19 @@ parse_file_seq (char **stringp, unsigned
-          Go to the next item in the string.  */
-       if (flags & PARSEFS_NOGLOB)
-         {
--          NEWELT (concat (2, prefix, tp));
-+          NEWELT (concat (2, prefix, tmpbuf));
-           continue;
-         }
- 
-       /* If we get here we know we're doing glob expansion.
-          TP is a string in tmpbuf.  NLEN is no longer used.
-          We may need to do more work: after this NAME will be set.  */
--      name = tp;
-+      name = tmpbuf;
- 
-       /* Expand tilde if applicable.  */
--      if (tp[0] == '~')
-+      if (tmpbuf[0] == '~')
- 	{
--	  tildep = tilde_expand (tp);
-+	  tildep = tilde_expand (tmpbuf);
- 	  if (tildep != 0)
-             name = tildep;
- 	}
-@@ -3152,7 +3152,10 @@ parse_file_seq (char **stringp, unsigned
-             else
-               {
-                 /* We got a chain of items.  Attach them.  */
--                (*newp)->next = found;
-+                if (*newp)
-+                  (*newp)->next = found;
-+                else
-+                  *newp = found;
- 
-                 /* Find and set the new end.  Massage names if necessary.  */
-                 while (1)
diff --git a/sys-devel/make/files/make-3.82-construct-command-line.patch b/sys-devel/make/files/make-3.82-construct-command-line.patch
deleted file mode 100644
index c504c45291ba..000000000000
--- a/sys-devel/make/files/make-3.82-construct-command-line.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-https://savannah.gnu.org/bugs/?23922
-
-From 6f3684710a0f832533191f8657a57bc2fbba90ba Mon Sep 17 00:00:00 2001
-From: eliz <eliz>
-Date: Sat, 7 May 2011 08:29:13 +0000
-Subject: [PATCH]  job.c (construct_command_argv_internal): Don't assume
- shellflags  is always non-NULL.  Escape-protect characters
- special to the  shell when copying the value of SHELL into
- new_line.  Fixes  Savannah bug #23922.
-
----
- ChangeLog |  7 +++++++
- job.c     | 23 ++++++++++++++++-------
- 2 files changed, 23 insertions(+), 7 deletions(-)
-
-diff --git a/job.c b/job.c
-index 67b402d..c2ce84d 100644
---- a/job.c
-+++ b/job.c
-@@ -2844,12 +2844,12 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
- 
-     unsigned int shell_len = strlen (shell);
-     unsigned int line_len = strlen (line);
--    unsigned int sflags_len = strlen (shellflags);
-+    unsigned int sflags_len = shellflags ? strlen (shellflags) : 0;
-     char *command_ptr = NULL; /* used for batch_mode_shell mode */
-     char *new_line;
- 
- # ifdef __EMX__ /* is this necessary? */
--    if (!unixy_shell)
-+    if (!unixy_shell && shellflags)
-       shellflags[0] = '/'; /* "/c" */
- # endif
- 
-@@ -2911,19 +2911,28 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
- 
- 	new_argv = xmalloc (4 * sizeof (char *));
- 	new_argv[0] = xstrdup(shell);
--	new_argv[1] = xstrdup(shellflags);
-+	new_argv[1] = xstrdup(shellflags ? shellflags : "");
- 	new_argv[2] = line;
- 	new_argv[3] = NULL;
- 	return new_argv;
-       }
- 
--    new_line = alloca (shell_len + 1 + sflags_len + 1
-+    new_line = alloca ((shell_len*2) + 1 + sflags_len + 1
-                              + (line_len*2) + 1);
-     ap = new_line;
--    memcpy (ap, shell, shell_len);
--    ap += shell_len;
-+    /* Copy SHELL, escaping any characters special to the shell.  If
-+       we don't escape them, construct_command_argv_internal will
-+       recursively call itself ad nauseam, or until stack overflow,
-+       whichever happens first.  */
-+    for (p = shell; *p != '\0'; ++p)
-+      {
-+	if (strchr (sh_chars, *p) != 0)
-+	  *(ap++) = '\\';
-+	*(ap++) = *p;
-+      }
-     *(ap++) = ' ';
--    memcpy (ap, shellflags, sflags_len);
-+    if (shellflags)
-+      memcpy (ap, shellflags, sflags_len);
-     ap += sflags_len;
-     *(ap++) = ' ';
-     command_ptr = ap;
--- 
-1.7.12
-
diff --git a/sys-devel/make/files/make-3.82-copy-on-expand.patch b/sys-devel/make/files/make-3.82-copy-on-expand.patch
deleted file mode 100644
index 3f202b4db96b..000000000000
--- a/sys-devel/make/files/make-3.82-copy-on-expand.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-fix from upstream cvs
-
-----------------------------
-revision 1.58
-date: 2011-08-29 12:20:19 -0400;  author: psmith;  state: Exp;  lines: +7 -13;  commitid: MdH0jSxpuIy7mqxv;
-Save strings we're expanding in case an embedded eval causes them
-to be freed (if they're the value of a variable that's reset for example).
-See Savannah patch #7534
-
-Index: expand.c
-===================================================================
-RCS file: /sources/make/make/expand.c,v
-retrieving revision 1.57
-retrieving revision 1.58
-diff -u -p -r1.57 -r1.58
---- expand.c	7 May 2011 20:03:49 -0000	1.57
-+++ expand.c	29 Aug 2011 16:20:19 -0000	1.58
-@@ -197,7 +197,7 @@ variable_expand_string (char *line, cons
- {
-   struct variable *v;
-   const char *p, *p1;
--  char *abuf = NULL;
-+  char *save;
-   char *o;
-   unsigned int line_offset;
- 
-@@ -212,16 +212,11 @@ variable_expand_string (char *line, cons
-       return (variable_buffer);
-     }
- 
--  /* If we want a subset of the string, allocate a temporary buffer for it.
--     Most of the functions we use here don't work with length limits.  */
--  if (length > 0 && string[length] != '\0')
--    {
--      abuf = xmalloc(length+1);
--      memcpy(abuf, string, length);
--      abuf[length] = '\0';
--      string = abuf;
--    }
--  p = string;
-+  /* We need a copy of STRING: due to eval, it's possible that it will get
-+     freed as we process it (it might be the value of a variable that's reset
-+     for example).  Also having a nil-terminated string is handy.  */
-+  save = length < 0 ? xstrdup (string) : xstrndup (string, length);
-+  p = save;
- 
-   while (1)
-     {
-@@ -411,8 +406,7 @@ variable_expand_string (char *line, cons
-       ++p;
-     }
- 
--  if (abuf)
--    free (abuf);
-+  free (save);
- 
-   variable_buffer_output (o, "", 1);
-   return (variable_buffer + line_offset);
diff --git a/sys-devel/make/files/make-3.82-glob-speedup.patch b/sys-devel/make/files/make-3.82-glob-speedup.patch
deleted file mode 100644
index c826c2c0e1fa..000000000000
--- a/sys-devel/make/files/make-3.82-glob-speedup.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-change from upstream to speed up by skipping unused globs
-https://bugs.gentoo.org/382845
-
-http://cvs.savannah.gnu.org/viewvc/make/read.c?root=make&r1=1.198&r2=1.200
-
-Revision 1.200
-Sat May 7 14:36:12 2011 UTC (4 months, 1 week ago) by psmith 
-Branch: MAIN 
-Changes since 1.199: +1 -1 lines 
-Inverted the boolean test from what I wanted it to be.  Added a
-regression test to make sure this continues to work.
-
-Revision 1.199
-Mon May 2 00:18:06 2011 UTC (4 months, 2 weeks ago) by psmith 
-Branch: MAIN 
-Changes since 1.198: +35 -25 lines 
-Avoid invoking glob() unless the filename has potential globbing
-characters in it, for performance improvements.
-
---- a/read.c	2011/04/29 15:27:39	1.198
-+++ b/read.c	2011/05/07 14:36:12	1.200
-@@ -2901,6 +2901,7 @@
-       const char *name;
-       const char **nlist = 0;
-       char *tildep = 0;
-+      int globme = 1;
- #ifndef NO_ARCHIVES
-       char *arname = 0;
-       char *memname = 0;
-@@ -3109,32 +3110,40 @@
- 	}
- #endif /* !NO_ARCHIVES */
- 
--      switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
--	{
--	case GLOB_NOSPACE:
--	  fatal (NILF, _("virtual memory exhausted"));
--
--	case 0:
--          /* Success.  */
--          i = gl.gl_pathc;
--          nlist = (const char **)gl.gl_pathv;
--          break;
--
--        case GLOB_NOMATCH:
--          /* If we want only existing items, skip this one.  */
--          if (flags & PARSEFS_EXISTS)
--            {
--              i = 0;
--              break;
--            }
--          /* FALLTHROUGH */
--
--	default:
--          /* By default keep this name.  */
-+      /* glob() is expensive: don't call it unless we need to.  */
-+      if (!(flags & PARSEFS_EXISTS) && strpbrk (name, "?*[") == NULL)
-+        {
-+          globme = 0;
-           i = 1;
-           nlist = &name;
--          break;
--	}
-+        }
-+      else
-+        switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
-+          {
-+          case GLOB_NOSPACE:
-+            fatal (NILF, _("virtual memory exhausted"));
-+
-+          case 0:
-+            /* Success.  */
-+            i = gl.gl_pathc;
-+            nlist = (const char **)gl.gl_pathv;
-+            break;
-+
-+          case GLOB_NOMATCH:
-+            /* If we want only existing items, skip this one.  */
-+            if (flags & PARSEFS_EXISTS)
-+              {
-+                i = 0;
-+                break;
-+              }
-+            /* FALLTHROUGH */
-+
-+          default:
-+            /* By default keep this name.  */
-+            i = 1;
-+            nlist = &name;
-+            break;
-+          }
- 
-       /* For each matched element, add it to the list.  */
-       while (i-- > 0)
-@@ -3174,7 +3183,8 @@
- #endif /* !NO_ARCHIVES */
-           NEWELT (concat (2, prefix, nlist[i]));
- 
--      globfree (&gl);
-+      if (globme)
-+        globfree (&gl);
- 
- #ifndef NO_ARCHIVES
-       if (arname)
diff --git a/sys-devel/make/files/make-3.82-intermediate-parallel.patch b/sys-devel/make/files/make-3.82-intermediate-parallel.patch
deleted file mode 100644
index df9b8d475b95..000000000000
--- a/sys-devel/make/files/make-3.82-intermediate-parallel.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://savannah.gnu.org/bugs/?30653
-https://bugs.gentoo.org/431250
-
-From d1ba0ee36b2bdd91434b5df90f0f4cceda7d6979 Mon Sep 17 00:00:00 2001
-From: psmith <psmith>
-Date: Mon, 10 Sep 2012 02:36:05 +0000
-Subject: [PATCH] Force intermediate targets to be considered if their
- non-intermediate parent needs to be remade.  Fixes Savannah
- bug #30653.
-
----
- ChangeLog                          |  4 ++++
- remake.c                           |  4 ++++
- tests/scripts/features/parallelism | 17 +++++++++++++++++
- 3 files changed, 25 insertions(+)
-
-diff --git a/remake.c b/remake.c
-index c0bf709..b1ddd23 100644
---- a/remake.c
-+++ b/remake.c
-@@ -612,6 +612,10 @@ update_file_1 (struct file *file, unsigned int depth)
-                 d->file->dontcare = file->dontcare;
-               }
- 
-+            /* We may have already considered this file, when we didn't know
-+               we'd need to update it.  Force update_file() to consider it and
-+               not prune it.  */
-+            d->file->considered = !considered;
- 
- 	    dep_status |= update_file (d->file, depth);
- 
-diff --git a/tests/scripts/features/parallelism b/tests/scripts/features/parallelism
-index d4250f0..76d24a7 100644
---- a/tests/scripts/features/parallelism
-+++ b/tests/scripts/features/parallelism
-@@ -214,6 +214,23 @@ rm main.x");
-     rmfiles(qw(foo.y foo.y.in main.bar));
- }
- 
-+# Ensure intermediate/secondary files are not pruned incorrectly.
-+# See Savannah bug #30653
-+
-+utouch(-15, 'file2');
-+utouch(-10, 'file4');
-+utouch(-5,  'file1');
-+
-+run_make_test(q!
-+.INTERMEDIATE: file3
-+file4: file3 ; @mv -f $< $@
-+file3: file2 ; touch $@
-+file2: file1 ; @touch $@
-+!,
-+              '--no-print-directory -j2', "touch file3");
-+
-+#rmfiles('file1', 'file2', 'file3', 'file4');
-+
- if ($all_tests) {
-     # Jobserver FD handling is messed up in some way.
-     # Savannah bug #28189
--- 
-1.7.12
-
diff --git a/sys-devel/make/files/make-3.82-long-command-line.patch b/sys-devel/make/files/make-3.82-long-command-line.patch
deleted file mode 100644
index 9266786e4da7..000000000000
--- a/sys-devel/make/files/make-3.82-long-command-line.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://savannah.gnu.org/bugs/?36451
-
-From a95796de3a491d8acfc8ea94c217b90531161786 Mon Sep 17 00:00:00 2001
-From: psmith <psmith>
-Date: Sun, 9 Sep 2012 23:25:07 +0000
-Subject: [PATCH] Keep the command line on the heap to avoid stack overflow.
- Fixes Savannah bug #36451.
-
----
- ChangeLog |  3 +++
- job.c     | 13 +++++++++----
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/job.c b/job.c
-index 754576b..f7b7d51 100644
---- a/job.c
-+++ b/job.c
-@@ -2984,8 +2984,8 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
- 	return new_argv;
-       }
- 
--    new_line = alloca ((shell_len*2) + 1 + sflags_len + 1
--                             + (line_len*2) + 1);
-+    new_line = xmalloc ((shell_len*2) + 1 + sflags_len + 1
-+                        + (line_len*2) + 1);
-     ap = new_line;
-     /* Copy SHELL, escaping any characters special to the shell.  If
-        we don't escape them, construct_command_argv_internal will
-@@ -3052,8 +3052,11 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
- 	*ap++ = *p;
-       }
-     if (ap == new_line + shell_len + sflags_len + 2)
--      /* Line was empty.  */
--      return 0;
-+      {
-+        /* Line was empty.  */
-+        free (new_line);
-+        return 0;
-+      }
-     *ap = '\0';
- 
- #ifdef WINDOWS32
-@@ -3194,6 +3197,8 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
-       fatal (NILF, _("%s (line %d) Bad shell context (!unixy && !batch_mode_shell)\n"),
-             __FILE__, __LINE__);
- #endif
-+
-+    free (new_line);
-   }
- #endif	/* ! AMIGA */
- 
--- 
-1.7.12
-
diff --git a/sys-devel/make/files/make-3.82-memory-corruption.patch b/sys-devel/make/files/make-3.82-memory-corruption.patch
deleted file mode 100644
index b28c07353ec2..000000000000
--- a/sys-devel/make/files/make-3.82-memory-corruption.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- function.c	2011/04/18 01:25:20	1.121
-+++ function.c	2011/05/02 12:35:01	1.122
-@@ -706,7 +706,7 @@
-   const char *word_iterator = argv[0];
-   char buf[20];
- 
--  while (find_next_token (&word_iterator, (unsigned int *) 0) != 0)
-+  while (find_next_token (&word_iterator, NULL) != 0)
-     ++i;
- 
-   sprintf (buf, "%d", i);
-@@ -1133,21 +1133,14 @@
- 
-   /* Find the maximum number of words we'll have.  */
-   t = argv[0];
--  wordi = 1;
--  while (*t != '\0')
-+  wordi = 0;
-+  while ((p = find_next_token (&t, NULL)) != 0)
-     {
--      char c = *(t++);
--
--      if (! isspace ((unsigned char)c))
--        continue;
--
-+      ++t;
-       ++wordi;
--
--      while (isspace ((unsigned char)*t))
--        ++t;
-     }
- 
--  words = xmalloc (wordi * sizeof (char *));
-+  words = xmalloc ((wordi == 0 ? 1 : wordi) * sizeof (char *));
- 
-   /* Now assign pointers to each string in the array.  */
-   t = argv[0];
diff --git a/sys-devel/make/files/make-3.82-oneshell.patch b/sys-devel/make/files/make-3.82-oneshell.patch
deleted file mode 100644
index fbade127ce61..000000000000
--- a/sys-devel/make/files/make-3.82-oneshell.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-fix from upstream cvs
-
-----------------------------
-revision 1.245
-date: 2010-08-13 22:50:14 -0400;  author: psmith;  state: Exp;  lines: +1 -1;  commitid: 4UaslPqQHZTs5wKu;
-- Add oneshell to $(.FEATURES) (forgot that!)
-
-Index: main.c
-===================================================================
-RCS file: /sources/make/make/main.c,v
-retrieving revision 1.244
-retrieving revision 1.245
-diff -u -p -r1.244 -r1.245
---- main.c	10 Aug 2010 07:35:34 -0000	1.244
-+++ main.c	14 Aug 2010 02:50:14 -0000	1.245
-@@ -1138,7 +1138,7 @@ main (int argc, char **argv, char **envp
-      a macro and some compilers (MSVC) don't like conditionals in macros.  */
-   {
-     const char *features = "target-specific order-only second-expansion"
--                           " else-if shortest-stem undefine"
-+                           " else-if shortest-stem undefine oneshell"
- #ifndef NO_ARCHIVES
-                            " archives"
- #endif
diff --git a/sys-devel/make/files/make-3.82-parallel-remake.patch b/sys-devel/make/files/make-3.82-parallel-remake.patch
deleted file mode 100644
index a19fe7b7d629..000000000000
--- a/sys-devel/make/files/make-3.82-parallel-remake.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-fix from upstream cvs
-
-----------------------------
-revision 1.247
-date: 2011-09-18 19:39:26 -0400;  author: psmith;  state: Exp;  lines: +5 -3;  commitid: 07NxO4T5PiWC82Av;
-When we re-exec the master makefile in a jobserver environment, ensure
-that MAKEFLAGS is set properly so the re-exec'd make runs in parallel.
-See Savannah bug #33873.
-
-Index: main.c
-===================================================================
-RCS file: /sources/make/make/main.c,v
-retrieving revision 1.246
-retrieving revision 1.247
-diff -u -p -r1.246 -r1.247
---- main.c	29 Aug 2010 23:05:27 -0000	1.246
-+++ main.c	18 Sep 2011 23:39:26 -0000	1.247
-@@ -2089,6 +2089,11 @@ main (int argc, char **argv, char **envp
- 
-           ++restarts;
- 
-+          /* If we're re-exec'ing the first make, put back the number of
-+             job slots so define_makefiles() will get it right.  */
-+          if (master_job_slots)
-+            job_slots = master_job_slots;
-+
-           /* Reset makeflags in case they were changed.  */
-           {
-             const char *pv = define_makeflags (1, 1);
-@@ -2825,9 +2830,6 @@ define_makeflags (int all, int makefile)
- 		       && (*(unsigned int *) cs->value_ptr ==
- 			   *(unsigned int *) cs->noarg_value))
- 		ADD_FLAG ("", 0); /* Optional value omitted; see below.  */
--	      else if (cs->c == 'j')
--		/* Special case for `-j'.  */
--		ADD_FLAG ("1", 1);
- 	      else
- 		{
- 		  char *buf = alloca (30);
diff --git a/sys-devel/make/files/make-4.2.1-glob-internals.patch b/sys-devel/make/files/make-4.2.1-glob-internals.patch
new file mode 100644
index 000000000000..9f70ae2084f0
--- /dev/null
+++ b/sys-devel/make/files/make-4.2.1-glob-internals.patch
@@ -0,0 +1,67 @@
+From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Sun, 24 Sep 2017 09:12:58 -0400
+Subject: [PATCH] glob: Do not assume glibc glob internals.
+
+It has been proposed that glibc glob start using gl_lstat,
+which the API allows it to do.  GNU 'make' should not get in
+the way of this.  See:
+https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html
+
+* dir.c (local_lstat): New function, like local_stat.
+(dir_setup_glob): Use it to initialize gl_lstat too, as the API
+requires.
+---
+ dir.c | 29 +++++++++++++++++++++++++++--
+ 1 file changed, 27 insertions(+), 2 deletions(-)
+
+diff --git a/dir.c b/dir.c
+index adbb8a9..c343e4c 100644
+--- a/dir.c
++++ b/dir.c
+@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf)
+ }
+ #endif
+ 
++/* Similarly for lstat.  */
++#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
++# ifndef VMS
++#  ifndef HAVE_SYS_STAT_H
++int lstat (const char *path, struct stat *sbuf);
++#  endif
++# else
++    /* We are done with the fake lstat.  Go back to the real lstat */
++#   ifdef lstat
++#     undef lstat
++#   endif
++# endif
++# define local_lstat lstat
++#elif defined(WINDOWS32)
++/* Windows doesn't support lstat().  */
++# define local_lstat local_stat
++#else
++static int
++local_lstat (const char *path, struct stat *buf)
++{
++  int e;
++  EINTRLOOP (e, lstat (path, buf));
++  return e;
++}
++#endif
++
+ void
+ dir_setup_glob (glob_t *gl)
+ {
+   gl->gl_opendir = open_dirstream;
+   gl->gl_readdir = read_dirstream;
+   gl->gl_closedir = free;
++  gl->gl_lstat = local_lstat;
+   gl->gl_stat = local_stat;
+-  /* We don't bother setting gl_lstat, since glob never calls it.
+-     The slot is only there for compatibility with 4.4 BSD.  */
+ }
+ 
+ void
+-- 
+2.16.1
+
diff --git a/sys-devel/make/files/make-4.2.1-glob-v2.patch b/sys-devel/make/files/make-4.2.1-glob-v2.patch
new file mode 100644
index 000000000000..a9aeb787cd72
--- /dev/null
+++ b/sys-devel/make/files/make-4.2.1-glob-v2.patch
@@ -0,0 +1,28 @@
+From 48c8a116a914a325a0497721f5d8b58d5bba34d4 Mon Sep 17 00:00:00 2001
+From: Paul Smith <psmith@gnu.org>
+Date: Sun, 19 Nov 2017 15:09:16 -0500
+Subject: [PATCH] * configure.ac: Support GLIBC glob interface version 2
+
+---
+ configure.ac | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8c72568..4710832 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -404,10 +404,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob],
+ #include <glob.h>
+ #include <fnmatch.h>
+ 
+-#define GLOB_INTERFACE_VERSION 1
+ #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
+ # include <gnu-versions.h>
+-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
++# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
+    gnu glob
+ # endif
+ #endif],
+-- 
+2.16.1
+
diff --git a/sys-devel/make/files/make-4.2.1-perl526.patch b/sys-devel/make/files/make-4.2.1-perl526.patch
new file mode 100644
index 000000000000..a935d1314ebb
--- /dev/null
+++ b/sys-devel/make/files/make-4.2.1-perl526.patch
@@ -0,0 +1,26 @@
+From d9d4e06084a4c7da480bd49a3487aadf6ba77b54 Mon Sep 17 00:00:00 2001
+From: Enrique Olaizola <enrique_olaizola16@hotmail.com>
+Date: Sat, 27 May 2017 14:24:33 -0400
+Subject: [PATCH] * tests/run_make_tests.pl: [SV 50902] Find Perl modules
+
+---
+ tests/run_make_tests.pl | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/tests/run_make_tests.pl b/tests/run_make_tests.pl
+index a74417a..a844094 100644
+--- a/tests/run_make_tests.pl
++++ b/tests/run_make_tests.pl
+@@ -64,6 +64,9 @@ if ($^O eq 'VMS')
+   $CMD_rmfile = 'delete_file -no_ask';
+ }
+ 
++use FindBin;
++use lib "$FindBin::Bin";
++
+ require "test_driver.pl";
+ require "config-flags.pm";
+ 
+-- 
+2.16.1
+
diff --git a/sys-devel/make/make-3.80-r4.ebuild b/sys-devel/make/make-3.80-r4.ebuild
deleted file mode 100644
index 91a6ec2b73d9..000000000000
--- a/sys-devel/make/make-3.80-r4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Standard tool to compile source trees"
-HOMEPAGE="https://www.gnu.org/software/make/make.html"
-SRC_URI="mirror://gnu//make/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls static"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-memory.patch
-	epatch "${FILESDIR}"/${P}-parallel-build-failure.patch
-	epatch "${FILESDIR}"/${P}-conditional-eval.patch #123317
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	econf \
-		$(use_enable nls) \
-		--program-prefix=g \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README*
-	if [[ ${USERLAND} == "GNU" ]] ; then
-		dosym gmake /usr/bin/make
-		dosym gmake.1 /usr/share/man/man1/make.1
-	fi
-}
diff --git a/sys-devel/make/make-3.81-r2.ebuild b/sys-devel/make/make-3.81-r2.ebuild
deleted file mode 100644
index 591e437df37c..000000000000
--- a/sys-devel/make/make-3.81-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Standard tool to compile source trees"
-HOMEPAGE="https://www.gnu.org/software/make/make.html"
-SRC_URI="mirror://gnu//make/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls static"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="nls? ( virtual/libintl )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-tests-lang.patch
-	epatch "${FILESDIR}"/${P}-long-cmdline.patch #301116
-	epatch "${FILESDIR}"/${P}-tests-recursion.patch #329153
-	epatch "${FILESDIR}"/${P}-jobserver.patch #193258
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	econf \
-		$(use_enable nls) \
-		--program-prefix=g \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README*
-	if [[ ${USERLAND} == "GNU" ]] ; then
-		# we install everywhere as 'gmake' but on GNU systems,
-		# symlink 'make' to 'gmake'
-		dosym gmake /usr/bin/make
-		dosym gmake.1 /usr/share/man/man1/make.1
-	fi
-}
diff --git a/sys-devel/make/make-3.82-r4.ebuild b/sys-devel/make/make-3.82-r4.ebuild
deleted file mode 100644
index 29a60321b85d..000000000000
--- a/sys-devel/make/make-3.82-r4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Standard tool to compile source trees"
-HOMEPAGE="https://www.gnu.org/software/make/make.html"
-SRC_URI="mirror://gnu//make/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="nls? ( virtual/libintl )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-archives-many-objs.patch #334889
-	epatch "${FILESDIR}"/${P}-MAKEFLAGS-reexec.patch #31975
-	epatch "${FILESDIR}"/${P}-memory-corruption.patch #355907
-	epatch "${FILESDIR}"/${P}-glob-speedup.patch #382845
-	epatch "${FILESDIR}"/${P}-copy-on-expand.patch
-	epatch "${FILESDIR}"/${P}-oneshell.patch
-	epatch "${FILESDIR}"/${P}-parallel-remake.patch
-	epatch "${FILESDIR}"/${P}-intermediate-parallel.patch #431250
-	epatch "${FILESDIR}"/${P}-construct-command-line.patch
-	epatch "${FILESDIR}"/${P}-long-command-line.patch
-	epatch "${FILESDIR}"/${P}-darwin-library_search-dylib.patch
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	econf \
-		--program-prefix=g \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README*
-	if [[ ${USERLAND} == "GNU" ]] ; then
-		# we install everywhere as 'gmake' but on GNU systems,
-		# symlink 'make' to 'gmake'
-		dosym gmake /usr/bin/make
-		dosym gmake.1 /usr/share/man/man1/make.1
-	fi
-}
diff --git a/sys-devel/make/make-4.2.1-r1.ebuild b/sys-devel/make/make-4.2.1-r1.ebuild
index 6a81c5417ba5..d0f079cef26d 100644
--- a/sys-devel/make/make-4.2.1-r1.ebuild
+++ b/sys-devel/make/make-4.2.1-r1.ebuild
@@ -23,10 +23,14 @@ RDEPEND="${CDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch
 	"${FILESDIR}"/${PN}-4.2-default-cxx.patch
+	"${FILESDIR}"/${PN}-4.2.1-perl526.patch
+	"${FILESDIR}"/${PN}-4.2.1-glob-internals.patch
+	"${FILESDIR}"/${PN}-4.2.1-glob-v2.patch
 )
 
 src_prepare() {
 	epatch "${PATCHES[@]}"
+	epatch_user
 }
 
 src_configure() {
diff --git a/sys-devel/make/make-4.2.1.ebuild b/sys-devel/make/make-4.2.1.ebuild
index 7433acf56961..05d12e38104b 100644
--- a/sys-devel/make/make-4.2.1.ebuild
+++ b/sys-devel/make/make-4.2.1.ebuild
@@ -22,10 +22,12 @@ RDEPEND="${CDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch
+	"${FILESDIR}"/${PN}-4.2.1-perl526.patch
 )
 
 src_prepare() {
 	epatch "${PATCHES[@]}"
+	epatch_user
 }
 
 src_configure() {
diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest
index 0105200b55d6..a5af64b910f0 100644
--- a/sys-devel/patch/Manifest
+++ b/sys-devel/patch/Manifest
@@ -1,3 +1,5 @@
 DIST patch-2.7.5.tar.xz 727704 BLAKE2B a7aefd05da73329ae301f0f6429306661d72fedd59c6d35acef4828c7e5951c0ce3e8cedfc8ed9ac45d45f6eff564c2e41c0ccb95fbe1c668f63844b7069520c SHA512 6620ac8101f60c0b456ce339fa5e371f40be0b391e2e9728f34f3625f9907e516de61dac2f91bc76e6fd28a9bd1224efc3ba827cfaa606d857730c1af4195a0f
-EBUILD patch-2.7.5.ebuild 910 BLAKE2B 08bf1c4632e99c913fa5134ceb366c60191e770a26eb4351d413b28616654233671925332f0fc78e66d97ed86cfa9d6e1e0267890eb52847a339423e3b5da94c SHA512 103a71c3bc37159dc12a21f60c3d3709c3bb6b18a6b18d255c89ed00ad4a28305afd4e58ce98b7109c364ca884d6247464e006e9bdccab299bebd7f0b7664fd8
+DIST patch-2.7.6.tar.xz 783756 BLAKE2B e3dd2d155a94c39cb60eafc26677e84de14c3a6d5814dff69de091ded52f21862490970254297795f2c42a0c3203f7e88a8f65bb66968f8dfd6e066bf53f2dfb SHA512 fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd
+EBUILD patch-2.7.5.ebuild 911 BLAKE2B 3eda3342754fb82470d8abbd3a9b9e3ee24b6e8ed62f8d0629fa3b6c3e248a4b522aa1a0074011108d8a74ddf4a94d00aa8d8423efd1b7755b4895438fbe3180 SHA512 f15e1b045b40506b1390a98bcf71834e153bc99d03fac764fea092ada307ac9f36444919052ff4c3a13ba3d5cb9b2afb089f0694f95a19f2636cef43cf149698
+EBUILD patch-2.7.6.ebuild 957 BLAKE2B 0fa435619e2068fbd100ca5947c52291b53b18755d7d19e45a8fa26c828e6b2f9e2d032296864ee8fe4e741a3b90b8eba41f5602475d22db2f453c172d06c696 SHA512 aec57551782124eef9727a693638a7a9965f5fedb417fa99dbb64377f4d4501d1d6ff1e2ca4b243f1a27cca25124edcb0ea784dea8744b1885e1be55365cafe3
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/patch/patch-2.7.5.ebuild b/sys-devel/patch/patch-2.7.5.ebuild
index 04f387d863c2..cbc18cb3dcd6 100644
--- a/sys-devel/patch/patch-2.7.5.ebuild
+++ b/sys-devel/patch/patch-2.7.5.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Utility to apply diffs to files"
 HOMEPAGE="https://www.gnu.org/software/patch/patch.html"
 SRC_URI="mirror://gnu/patch/${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static test xattr"
diff --git a/sys-devel/patch/patch-2.7.6.ebuild b/sys-devel/patch/patch-2.7.6.ebuild
new file mode 100644
index 000000000000..b16c1511b888
--- /dev/null
+++ b/sys-devel/patch/patch-2.7.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="Utility to apply diffs to files"
+HOMEPAGE="https://www.gnu.org/software/patch/patch.html"
+SRC_URI="mirror://gnu/patch/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static test xattr"
+
+RDEPEND="xattr? ( sys-apps/attr )"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/ed )"
+
+src_configure() {
+	use static && append-ldflags -static
+
+	local myeconfargs=(
+		$(use_enable xattr)
+		--program-prefix="$(use userland_BSD && echo g)"
+	)
+	# Do not let $ED mess up the search for `ed` 470210.
+	ac_cv_path_ED=$(type -P ed) \
+	econf "${myeconfargs[@]}"
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-02-11 16:09:52 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-02-11 16:09:52 +0000
commit	f78108598211053d41752a83e0345441bb9014ae (patch)
tree	dd2fc7ae0a1aea7bda4942ab0c453d1e55284b37 /sys-devel
parent	dc45b83b28fb83e9659492066e347b8dc60bc9e3 (diff)