gentoo resync : 04.01.2018

17 files changed, 235 insertions, 34 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 32021128ce6a..e7e0a446518a 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/creduce/Manifest b/dev-util/creduce/Manifest
index c79200eaae56..4d7c454374ea 100644
--- a/dev-util/creduce/Manifest
+++ b/dev-util/creduce/Manifest
@@ -1,8 +1,10 @@
+AUX creduce-2.7.0-llvm-5.patch 2491 BLAKE2B c2f7fed04c8da9095ad4c4995119181575c644231db6eed46fcfd7097e3ed5c85e46af52accfa8b78c59a3f8e61715df929e0d60c7693a7542fa83eecc9b05ce SHA512 31808043b9a9727632b76a81041a0ddffd318fb5ae8190b7e4cca70b1117c8c938dd7dda9d9785a841c3d62d51dc876a53dce63ab45695ae77d40f834073c08c
 DIST creduce-2.4.0.tar.gz 677706 BLAKE2B 49bdd8fbf8d354e237100f9a5a0f2154c7b6c55f44bbdfd3cd4a63727cd3b1220434f2ceee32fa37af72b05240c3ad61a5cb7050ec91ec38b2969ad74031a408 SHA512 75a603a8e2a967edfd12f9423f08b716a292f75e72ce770b083f4f9458510c3aaa16a91102c75f0ca098d08bb898fde998cae81e17c680dab330164fcffb5b33
 DIST creduce-2.6.0.tar.gz 763886 BLAKE2B 6da31e8c1cf33c667d792df86c019a1ccbbba24a25eedd0dc8ae2d7b676c39aaa1c44187e6fb436b27bfadf0b0ec67c3043822d438a4dede9d0275786bafcfde SHA512 e2a08127d2aea29b6934792eff4ff0d9f10952ca520671c60ef4b24a48522b19c48336d4b9d0b8e8c633dd8832b2a56d3d0daa311478e474e974c60a0ae381f1
 DIST creduce-2.7.0.tar.gz 768832 BLAKE2B ddc471b658a7feb8591dd4e402ac51d7c97a1705ef5b3787eec0b652bba64fb82cc39db21fa7c87ae0104977514f792b77802b6b35cf7afecb79b4cde16a5b52 SHA512 0ded47fdb4303d84619d63fbedd7bc12141b4857679dda8438683199dbdc98b985f848e797b9dc25a31dda591ee54bcb94580285890b23495fcf151aa3636226
 EBUILD creduce-2.4.0.ebuild 605 BLAKE2B 225498cfb81f8ba12950c633e46cada16fa2db17f14b94950ce8303e0f753a30f98865688f73cb89e258ed2282c119409ef1420c1e5b7d0457f0808f5dfe7c4a SHA512 9213fd59de68f2ab9353c3d080e4f041906b210adf73ecd0f0fdfaac1b22926b74f958cb70cac30ac1e66470d50b77c8ff75d5b741c3d0d4c5a4f58ecbd5e2e8
 EBUILD creduce-2.6.0.ebuild 685 BLAKE2B 4653902af6969da46109a8731b2d26246364e7b85f9360afdde9f912ff6bf9d9426ee48864b631bb9569ac4e7f35a8309ff0f83bd813249d2e70d25f3c55236c SHA512 57ed962054073e3220adfc02d5fccd6000359c189404cf3c01763312ae675876f52f6900a2d42431373c1ec56b78aa664f0fe9bd555f6e524196d22290985313
+EBUILD creduce-2.7.0-r1.ebuild 803 BLAKE2B 5eb0d8375ef74e0dc8ab8171ba73bcec3e956361d88065b09df35b9e111246a3fd536db1492f4941eacd305e564c3e8cafefb200ed6e09d054c097e66d4e8513 SHA512 87ffe139362504dd8b8c9914eebcc3b8e7de87bdc007c3d465ba0da0a655cca42457332f0bfd054343af39017ee4f90ecd7ceb5cc8de295d8b515f4deb55b6b1
 EBUILD creduce-2.7.0.ebuild 703 BLAKE2B 9e1bb8170ce619ef3fb23a67c8d5987a202a2608e4a366e6eab765b33f960ddbaa55299a4fb29fc79a2cada80809b66bdf58af7a3869c69e1dfb70fbc62b105f SHA512 dc9bb094eb8d54ec90e74a8031289936c0bd3fc5a5e5520bbedb7d457f73aaa458bf0c094542b94a4d32f508df4163b98651c1ead335a91f032478f498d1e0da
 EBUILD creduce-9999.ebuild 765 BLAKE2B 36967f9afcf36c7b72645f87c58c8edd795a49c69b457be719ba176a6416526592bf33503c7b214d17fa2ca391526c3ede457a7ad8f30d1214b8e964327d1d6d SHA512 26e023880d1143b27d11971f2f95e937f210630c9f2899c239d7f7076ac7741e9cde7e9ba2661c08f2b42e8c71f0dc6e4075f6421e927601ce1276616fe51da8
 MISC metadata.xml 349 BLAKE2B ee757f3e750c03cd87820c6170cb2c32298261d3a6cb4a303fa45256c847c1652d80c86eae8de5d1a40c50446101fb847d07a4cef3d53faeab2131c0a2c0a57a SHA512 1088fd88c07aa98bbbf8a8674d3b7908ea2bf707200f60640da713398556edaabca17924bae9a58745d266bc859b9269e677ac33405dcfca6df657e8cb9d06a4
diff --git a/dev-util/creduce/creduce-2.7.0-r1.ebuild b/dev-util/creduce/creduce-2.7.0-r1.ebuild
new file mode 100644
index 000000000000..ec92e4710d21
--- /dev/null
+++ b/dev-util/creduce/creduce-2.7.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+: ${CMAKE_MAKEFILE_GENERATOR=ninja}
+inherit cmake-utils llvm
+
+DESCRIPTION="C-Reduce - a plugin-based C program reducer"
+HOMEPAGE="https://embed.cs.utah.edu/creduce/"
+SRC_URI="https://embed.cs.utah.edu/creduce/${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-lang/perl-5.10.0
+	>=sys-devel/clang-4:="
+RDEPEND="${COMMON_DEPEND}
+	dev-perl/Benchmark-Timer
+	dev-perl/Exporter-Lite
+	dev-perl/File-Which
+	dev-perl/Getopt-Tabular
+	dev-perl/Regexp-Common
+	dev-perl/Sys-CPU
+	dev-util/astyle
+	dev-util/indent"
+DEPEND="${COMMON_DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-llvm-5.patch
+)
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
diff --git a/dev-util/creduce/files/creduce-2.7.0-llvm-5.patch b/dev-util/creduce/files/creduce-2.7.0-llvm-5.patch
new file mode 100644
index 000000000000..ecf2ac70fa81
--- /dev/null
+++ b/dev-util/creduce/files/creduce-2.7.0-llvm-5.patch
@@ -0,0 +1,54 @@
+From 97e2b29956adbe61973228ef7d8bff28e83d04d4 Mon Sep 17 00:00:00 2001
+From: Yang Chen <chenyang@cs.utah.edu>
+Date: Thu, 27 Apr 2017 20:55:32 -0700
+Subject: [PATCH] Fix build failure with LLVM trunk
+
+Patch provided by Markus Trippelsdorf. Thanks!
+
+"InputKind was refactored in Clang r301442.
+
+The IK_Preprocessed* comparisons are superfluous now and can be dropped."
+---
+ clang_delta/TransformationManager.cpp | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/clang_delta/TransformationManager.cpp b/clang_delta/TransformationManager.cpp
+index 8b6bdf454847..5db190cd71d1 100644
+--- a/clang_delta/TransformationManager.cpp
++++ b/clang_delta/TransformationManager.cpp
+@@ -101,16 +101,16 @@ bool TransformationManager::initializeCompilerInstance(std::string &ErrorMsg)
+   CompilerInvocation &Invocation = ClangInstance->getInvocation();
+   InputKind IK = FrontendOptions::getInputKindForExtension(
+         StringRef(SrcFileName).rsplit('.').second);
+-  if ((IK == IK_C) || (IK == IK_PreprocessedC)) {
+-    Invocation.setLangDefaults(ClangInstance->getLangOpts(), IK_C, T, PPOpts);
++  if (IK.getLanguage() == InputKind::C) {
++    Invocation.setLangDefaults(ClangInstance->getLangOpts(), InputKind::C, T, PPOpts);
+   }
+-  else if ((IK == IK_CXX) || (IK == IK_PreprocessedCXX)) {
++  else if (IK.getLanguage() == InputKind::CXX) {
+     // ISSUE: it might cause some problems when building AST
+-    // for a function which has a non-declared callee, e.g., 
+-    // It results an empty AST for the caller. 
+-    Invocation.setLangDefaults(ClangInstance->getLangOpts(), IK_CXX, T, PPOpts);
++    // for a function which has a non-declared callee, e.g.,
++    // It results an empty AST for the caller.
++    Invocation.setLangDefaults(ClangInstance->getLangOpts(), InputKind::CXX, T, PPOpts);
+   }
+-  else if(IK == IK_OpenCL) {
++  else if(IK.getLanguage() == InputKind::OpenCL) {
+     //Commandline parameters
+     std::vector<const char*> Args;
+     Args.push_back("-x");
+@@ -135,7 +135,7 @@ bool TransformationManager::initializeCompilerInstance(std::string &ErrorMsg)
+                                        &Args[0], &Args[0] + Args.size(),
+                                        ClangInstance->getDiagnostics());
+     Invocation.setLangDefaults(ClangInstance->getLangOpts(),
+-                               IK_OpenCL, T, PPOpts);
++                               InputKind::OpenCL, T, PPOpts);
+   }
+   else {
+     ErrorMsg = "Unsupported file type!";
+-- 
+2.15.1
+
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 34c16dca337e..3d910abdb768 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,5 @@
 DIST kdev-php-5.1.2.tar.xz 678624 BLAKE2B c351adfaa6be6c6c7c6d01e13e4de04d16eb4a0184ce5657a0152d3365e4006cf8bc4d89a5ce91c77c9e31c06fd8ad2ed2fb6e5c13d965f58450508f869762a9 SHA512 c5c6fa288b048fb19597c8cd9708a2d8570c8eaab4584a1ec0808cbd65788ae15b140e8c0437a3a18c2561c078c26208597c674efb37623b5199260ed5b3f851
 DIST kdev-php-5.2.1.tar.xz 683244 BLAKE2B b0418049ac8eeda1a57c7e5a863c91feda3f84638a69d018f4d5141815ebe2f34b94fcc166632c6146c4110015e8c42069ce3c129fb8c346a36f123ae682babf SHA512 4f2a0f08ff8f341d5b65c28d7392e794a20182d5f898a6723c6a9cd34bf1ce81ed2f8e505cad5a920a6d2a2c50210b0836b7718a892b61a27e8cf6c4d7f30f52
 EBUILD kdevelop-php-5.1.2.ebuild 1143 BLAKE2B 46b646ab5e0c34d42076473b89b52c100ca133e02fd91c8049d46f1365d419f952faffe5ca7f7587a3b0e677866a781ad57f0832c3e2e800acf17774b3d425b2 SHA512 8903207ea6055a10cf174d7c45873107c02decbf149457874030b34aa3451118cac3c1423761e9deb22f483949e6a22a5b42faa4034cf69b90fb1954ce76836d
-EBUILD kdevelop-php-5.2.1.ebuild 1063 BLAKE2B f5fc329a73b209f788199dfac8b536ba6b9c2817b01fd291e619ad33f024ba0c5e589c1ea756082f6c48675dfcf49a033de882c15a74c7f2af692e998097e9c9 SHA512 d11317bc8762386c4378c03920fb00e415f645659b88ec8c00c4fd9de911d289d7bbe7b8f52af89006d6b1173ea758e9c4d31c29a62dc3f2b84983556492d024
+EBUILD kdevelop-php-5.2.1.ebuild 1062 BLAKE2B cdf8d324b3c9cdf1d8242edef0fbcc55becf96c86f5871246beaf55083e1270312535a04ec7d821d39f62205c25b0a976d0a8a1571a2e5c3b0f3ead196d3fb73 SHA512 7415d13081b485f1aba68f71ff1be86673c1c4a396c9dcbd5349707f985e54f07621cb19473f2af4c2795754fa1e843fce197623fc5593302603c9c0a94a16d3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.2.1.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.2.1.ebuild
index 03ab96b2efcd..f7fc8d608f48 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.2.1.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.2.1.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
@@ -15,7 +15,7 @@ inherit kde5
 DESCRIPTION="PHP plugin for KDevelop"
 LICENSE="GPL-2 LGPL-2"
 IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 x86"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 2e96684c04c6..b2efba9d4128 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,5 @@
 DIST kdev-python-5.1.2.tar.xz 1069080 BLAKE2B 7727deeab491ba9e6dacbe29caa040cbacfbe07ef4a8060138e158e6317709fabeebc00d0bd45005f4bbefa768c238bd9c3f6235fe10dfd2f3d394de21c0b947 SHA512 1c91554bce3a1bb92b247a8b924e5b73865b68c8b6c2898d708d3b45f89f1ca9cb4207bd2f1a6f71e7df95781cd5d0ddaa610fa5c18e8f4e902306df5c38591a
 DIST kdev-python-5.2.1.tar.xz 1070708 BLAKE2B c1381e2a692446ac544e5e837236d90d5250c5b854f982374ff3c195d6d42d6534f6f81b118e872fbe4bea3f15e81b5396f3b581d6a64bf224e1a5ec631b9a89 SHA512 e65317a7da59cfaa5c14f0c10f965b1d7167e1e4e1b553f4c5f2ad9bce6d0ddbd93267cd9707a81a63117016fbc4dff77bca4ff2b2680ae585eb0f7354f3cf23
 EBUILD kdevelop-python-5.1.2.ebuild 1193 BLAKE2B 15ffd94275c1def1c4d5f4515fd29b24842bdb3f9b9a684a2b43ab247e275a89cf4934733d1a15fd3abd99b2eddc7bdac632051e37a8655de620710d22766ef6 SHA512 6e09543bcefb858af40fa21e193393da6b00c03ffb3d621bde29721b1312b90694ed603da1929ff60ac153da613db6791d549dc844a87b3d714a6efbda4be642
-EBUILD kdevelop-python-5.2.1.ebuild 1169 BLAKE2B bf08fef47017f600eddc7b7d9395dc7d67ae32cbcb8efc023296fff48e95a5f79c3e6da8e29f978818cf563fb0a908e815ccee1b57a8ab21aa968a1a7c1da2c7 SHA512 027edc8bcda48430313a8fbb1d50f6a3d49e9fdba9c8a5fe06acb26fe090fbbc56917304eae54c3598775d042288d207914e056bcfd810595f5fc589dcc6af96
+EBUILD kdevelop-python-5.2.1.ebuild 1168 BLAKE2B e6e88767249fd607486ad0bf766caa1305a352c21a5f7c8feea95c2ee017c943c9f316f1c5084fd0c7924ac6d1d523dfc3ec2f198768ac005b218f22d5f0123d SHA512 083555b74b7af5d028a7b690d30a46c202f19125a0a5a519d5237a406c06bfdea76bb28e8e80bb56499f3442fa87da4e078ff22c0595b2b372cc788792aa6a8c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.2.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.2.1.ebuild
index e59c88de6739..ba7fd2bc14f1 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.2.1.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.2.1.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
@@ -12,7 +12,7 @@ inherit kde5 python-single-r1
 
 DESCRIPTION="Python plugin for KDevelop"
 IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 x86"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 7a3e10f400ee..9faa0b017f81 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,5 @@
 DIST kdevelop-5.1.2.tar.xz 4688696 BLAKE2B 6ad2fa04bbeba54b92cfc3be48d21ad6bd22158b588e0342a5a00d7f3122f9261e40103fdfa622ba29114e86f6b36d335ffacf56de14ec430ff6a7eb23590bd5 SHA512 3f359587c7dca3ad4d0db4940cc9557bb61647672432f21c21d6f493e5e5c96e026c7dc155b66a7be4d20b06972fe961d8a3dda28e8aa273d0a4044a6242e39b
 DIST kdevelop-5.2.1.tar.xz 6653576 BLAKE2B 800ab50b62ca70e54d66bc7956b257e6d14f5a2c2fda7c7720aa0ddf1dad1dd2d7f993103c7f4caed0fc78734643a89f2710cb598319695d9ea6d79f62fd6305 SHA512 ee4a7f93c4f5168e6c63ca415a1f757cb7d2615370201700db16abdf1799e5c12421e382f5937be4a65af026a00df679b745fc4dab4d73974275d95d53173cd0
 EBUILD kdevelop-5.1.2.ebuild 2568 BLAKE2B 1b8c0c5dbb25f022cd088301419a65f99a8502e3b09551f8e7b6f896f4d662eadb562e8f9f9d1be43ee078c2d43d7aff5821fa3435cee5c8c83f2bd26f90a9db SHA512 57ca3389455999bab6baa88e35b8f54af7f49a529311ea44b39b20985de16763c29d1366e4933b432fc810673c359888ba30f1a8d8486bac43b787050f5e0d2f
-EBUILD kdevelop-5.2.1.ebuild 3810 BLAKE2B 45866728f5fb3517ad6fe62a41eeb91554d4f55364a429aeede14193dd3f7ee2c46fc3e8b325fb37d6c2bb1eb5728884d12719793e74816e01af3819cc23a7be SHA512 4339ffe88ed704ccd9445abd3ab3b8f6c2119b8b9d11e6791c3e929fcf26e36dc7d2657869ec291580767a826c1d890dae5100a728c9cbff2428f9460f3add89
+EBUILD kdevelop-5.2.1.ebuild 3809 BLAKE2B c257dade774330996d0b79de8f642a5bb9b9572f3b46b112ee6e9bff247ca32f6feafbaae34dd7e166681451c09b9d08be62c9f5c3df9597418ac14b33a10448 SHA512 151e56656694744c0054a6f0ea8f5849d03ecf791822ac49bd8f4205f7e7d91d337f2e7d5e646182f226b89d91bc9126b20c59ebdd35a140c9dd2333d4df8294
 MISC metadata.xml 794 BLAKE2B 765d868d9ca5ac71ee71a7c22d85beb02951dd7a601c2d52da87b1d49686494e8ce17c9e7e0f5f2767e0cb02625d74bcc6a95cfe3ae6793298150fcb651fcae4 SHA512 4d96ffa2a718e987a2d61531fe4a194c3fca3e863ab9cf8ac59d3b187a526c841066936f0a92591475672c6c22b57bd04a798908932f839644025b615ce8b417
diff --git a/dev-util/kdevelop/kdevelop-5.2.1.ebuild b/dev-util/kdevelop/kdevelop-5.2.1.ebuild
index cf401932b697..a453ea55d407 100644
--- a/dev-util/kdevelop/kdevelop-5.2.1.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.2.1.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
@@ -13,7 +13,7 @@ inherit kde5
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
 LICENSE="GPL-2 LGPL-2"
 IUSE="cvs +gdbui okteta +plasma +qmake reviewboard subversion webkit +welcomepage"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 x86"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
 
 REQUIRED_USE="test? ( welcomepage )"
 
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 3051b0476ca3..8ecac99af15e 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -9,5 +9,6 @@ DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412
 EBUILD lldb-4.0.1.ebuild 3061 BLAKE2B 8d46c18a5518403e73e40e38ecfafb6dffe59ac554c04dcfd92020a932c3a4a32cfc5dd19de649b1fd0d9c4cac4c2d70ede3bb0472adf3814259fc39389533dc SHA512 d88dc965435cddf490e5fb7ba36ecb43cdc3c4ecf5865d531f3141f40226bba0cc63ff604d62e8e1d436da2c48c4f5a435e0561f265b0e2961423770e9edc43a
 EBUILD lldb-5.0.0.ebuild 2811 BLAKE2B f8a5c12fe179486993f4ed0da5f4b6abb4e282c4c5702277af7853cb71b4cacd1fa998346d07373fdc0e5f051155c373e2c5cfc30131afbf08660a782ac7b81d SHA512 e4b38ef25db0a8b764bc7b1540190024557ddafcae6613d3c55fb98b67ca72a922b5224b8f65144050cc3055418bbde6769ae30bd90cb5d30083c018e1fee8f4
 EBUILD lldb-5.0.1.ebuild 3067 BLAKE2B 790a43c29244d006a3bf9ac3c8548f9348a2d18b96aecc156cef76d3145dbc34d22aa6534d8338d23e79113bf1a6d87c00464427aae5ee6b1c513d8fd2985e54 SHA512 41807a680175c6c836ef852b58f4306c32a21111da4b78c6584696a68e9424cb2de27bd2394164ac1cc91bcdf759a5fd0112d137bed9c9714ff60e66af9bd29d
+EBUILD lldb-6.0.9999.ebuild 3086 BLAKE2B a569f675b0a1da11c6cc663de56e2227a2c0a38ff01e69b0eb258655d6a7a1ed2d15ff5da9274f0fc3750a9ec3e07b8a6be4a8c07fbe004b36682944637a43f2 SHA512 ade71218d5aabd59cc5fdd7f8f39b69af49ee5be79abe7105c74b23d3abdb1c9a3c15fc09735111e31dfcf50013f00b985ebff89487c11e99129fa7cd81c8d7b
 EBUILD lldb-9999.ebuild 3061 BLAKE2B fc4cdb38222831d0e0f9fe93b44306160b56eeb1b23d1015dbfc5761fdfbd22f0deed91d420870469dc0e9fd777be8cf9ade79e3eb90f275a3e0e18205aa97f4 SHA512 facc16f2f3ab686f2247d833c9f4a12ab6c0ad2e70d72452d6d96234a5f6f66106ccd16175065dd6e6405ed014ef9e687494a877fe7eeaa3a64ac9cdaa292fb5
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-6.0.9999.ebuild b/dev-util/lldb/lldb-6.0.9999.ebuild
new file mode 100644
index 000000000000..002f1571b638
--- /dev/null
+++ b/dev-util/lldb/lldb-6.0.9999.ebuild
@@ -0,0 +1,122 @@
+# 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 git-r3 llvm python-single-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/lldb.git
+	https://github.com/llvm-mirror/lldb.git"
+EGIT_BRANCH="release_60"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="libedit ncurses python test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? ( dev-python/six[${PYTHON_USEDEP}]
+		${PYTHON_DEPS} )
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+# swig-3.0.9+ generates invalid wrappers, #598708
+# upstream: https://github.com/swig/swig/issues/769
+DEPEND="${RDEPEND}
+	python? ( <dev-lang/swig-3.0.9 )
+	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if use test; then
+		# needed for patched gtest
+		git-r3_fetch "https://git.llvm.org/git/llvm.git
+			https://github.com/llvm-mirror/llvm.git"
+	fi
+	git-r3_fetch
+
+	if use test; then
+		git-r3_checkout https://llvm.org/git/llvm.git \
+			"${WORKDIR}"/llvm '' lib/Testing/Support utils/unittest
+	fi
+	git-r3_checkout
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
+		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
+		-DLLDB_DISABLE_PYTHON=$(usex !python)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+		-DLLVM_BUILD_TESTS=$(usex test)
+		# compilers for lit tests
+		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
+		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
+		# compiler for ole' python tests
+		-DLLDB_TEST_COMPILER="$(type -P clang)"
+
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+	)
+	use test && mycmakeargs+=(
+		-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-lldb-lit
+	use python && cmake-utils_src_make check-lldb
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# oh my...
+	if use python; then
+		# remove bundled six module
+		rm "${D}$(python_get_sitedir)/six.py" || die
+
+		# remove custom readline.so for now
+		# TODO: figure out how to deal with it
+		# upstream is basically building a custom readline.so with -ledit
+		# to avoid symbol collisions between readline and libedit...
+		rm "${D}$(python_get_sitedir)/readline.so" || die
+
+		# byte-compile the modules
+		python_optimize
+	fi
+}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 211be7d4e147..76815322a87a 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,6 +1,6 @@
 DIST strace-4.16.tar.xz 966668 BLAKE2B b3c593b2fc17d540ca04a05886fc0d37b3445a4e88f5e93035bc9dbeb6fe21678b9018f052ba8e356a51d0a5013ec8863a50f8fcd5dcfd1d8b9ac4a6363f2d71 SHA512 d1a7b782cb8196eb95b431b66f9b0eff7886869a7e3a4618d985f73b2eed7590ba73150b9c33e55ee5c65fc8f863588b64c5611dca7b5d7a4183110eaf4451d5
 DIST strace-4.20.tar.xz 1132460 BLAKE2B 2e0e3080008ed1d5fd87572df740af8c62ebba44e0ece3c6b5ab581f246e79d8074a7fc2d0857abe158a055042fccbd880e11c9567beca1aeddc23f92d763c2d SHA512 869b3b9c48401619073a021e20e80cce37d8884f615bdb52dac9e6a2903df11507d7a0cb0ccad75bcc03d8dfafead0e68d14267e663503e94849079c9a2ebd4c
 EBUILD strace-4.16.ebuild 1804 BLAKE2B 3b572e70ba3f15553e3824eb39ed66cc21972ab0a9c98e2b58eb82de9639b8a14aea7506013256fb5c08f58cab143e33715dd21bede0aff9173b0196a66f28c4 SHA512 cfd07c1a3cc8794c4eb518b41ee9ba256e5019b68c0b8cae5dbf3c395731b918114da43289bd5c29ff0d06b2f169d23fbe76fcef2f5364a6dd72942f24ebbcaf
-EBUILD strace-4.20.ebuild 1969 BLAKE2B e065349e557ba84053c765524d968795651f69a7fb8d63e1719654c57fec834cf4d2c8335f9eb98b0609096370e2690fa2f5919c96dda0662730f1da2333d2d2 SHA512 8fc647be9828d12bade68e3791d9871d51c163997d9f4d841a68acd6056901a8a31ac0a57d69d296b9a646c4c475e35e19aa623c682488172866f37ec3452d0e
+EBUILD strace-4.20.ebuild 1967 BLAKE2B 2c92a9983965f72f74d18b2bd949aa7e658be2610e193921d1827121f4f8fffdb41cc4ee858f8176a6d56ebf65a2aa05aee2bc78948b0f1024ff61daceb91c36 SHA512 1638c9e885a22b6ea11f49ac6e51c1f9c4d6ae4928801df08dfacf9fba8e9117227de0fd428fe94c9bf3ff0ff0cd83fc3fb6275ae2d43405f5310b184622daff
 EBUILD strace-9999.ebuild 1973 BLAKE2B 412b8994c819e0e13e9e98f5b2e831046f77a48fff782deeb3f4715adcea979ffc1e51aa4fca4d8d34bd29ced21c7a729cb2c3281ba6e968d1c130e50a276e0b SHA512 0329814e518cab45d476d6fe4244b5b3a2bb9449f5cc4a33fa1a17e6af39624c6481b114ffebe5264c9e34bf78f32918a1e9070d37d36329fec96b95d8a29012
 MISC metadata.xml 593 BLAKE2B 8ee093aa497166817f6dc6086494cd01ea3a232d8d62fe36228cfb79ff8e5c5cc10a7880a6b2f3559cc2d2f190607d83228acacc77a44a0831202418dba64c44 SHA512 67300cfcaba830a47e49cd327bf2d8490b084b016a321fd6e19e52d8dc28968395b3ffc114675a7d4dc723a9ddd7b57c3ede10207a226d60a2225f88aceb59e4
diff --git a/dev-util/strace/strace-4.20.ebuild b/dev-util/strace/strace-4.20.ebuild
index 756217eb2e2f..8c125dbd1ca6 100644
--- a/dev-util/strace/strace-4.20.ebuild
+++ b/dev-util/strace/strace-4.20.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/trinity/Manifest b/dev-util/trinity/Manifest
index 68f944292212..7f701cc1e3c7 100644
--- a/dev-util/trinity/Manifest
+++ b/dev-util/trinity/Manifest
@@ -1,5 +1,4 @@
-AUX trinity-1.7-cflags.patch 538 BLAKE2B 4693cd94855c9b078672505f806375fd49bca3f5046fa7765529ce7500e4514242b1688724e7a96124a34509cc428b2170f788459de43e0c210da256f781b91a SHA512 48abb97ad496ab2f74aa5acb8266d7643ce0c6cbe1bc33dfa1acbe107978e7b53aa1a4de33dce18f77eef94408bc661b62dfa0776e87de4cb959dcfa26d51129
-DIST trinity-1.7.tar.xz 195488 BLAKE2B a2efd5fa2dd9ae40e943d96b2ae9232e292bb5cd41a350813a137a5910cf308a06d4e0b1be37e2ab8dc6325443101b6d956a593a778d9a7128e086ebbf6f2b61 SHA512 bb702ec79494591e04c74279e39d6dd0c5779f7cb2696c306c94bee3a8aefb524e369674daadf02f70b58dbb19ad5699d2c331bc4c9089046d2214403a95ba87
-EBUILD trinity-1.7.ebuild 862 BLAKE2B 9be5ba56841fd08a6ba58e4bbc7e0e7a67454200986149a9b04b248e5dd9c90f89f7859aa6d57ba18c427f661ec21244cfd5a36679fb098e3635807ae073d0bc SHA512 f91dfc4e754aefaa384ec40d7dc57a317de3b7db34badf85ef402b5cf0b4d19b734c8d6d984d45c5e2d2aedc3bfd4d3f191115047d0263d1c71205e1a59b86b3
+DIST trinity-1.8.tar.xz 213984 BLAKE2B 56f664023e2bc3648e941e4a3cb20e450cdcad3556289e201513d1755267eb013da2be035e81c87b3f1d1b0b1e12cb041c6bb345f7a84ee4c5c12f20a8e87f55 SHA512 686076dab2346cf9b5d8a20b14db31f460a352fa72eeadbe005a7423941918f5afef08b4987bb68cbbf4218d0cb620adb85f8036294d8df5ab5262e0031a44e4
+EBUILD trinity-1.8.ebuild 824 BLAKE2B d98c9332cbdd60749c0a1bf3dd1277842fa543100e9681b5721f3477b24d4d70f7d9c6dd7e3ced2743a0bb743bf8fbd3f7adda5c41b8e9eb6f3ca907f11a215a SHA512 defbdf6d43dd3458fbf52bf4fbf9fc9b518ef0186f7f6662bea0014240dd0331db45563a9062c8b45adcaa021994ef28f2bada65c2e12c4cf71f6720b5db0f97
 EBUILD trinity-9999.ebuild 804 BLAKE2B 446dab373eaa541bcb57b407e64f737a4117f8ebc130bb83cd11f0e75ee85d9a60fc534208ff60efdee531b89691d5d8ba27d1b7c9d387355e95bad3d1c876fc SHA512 6183f9cba7341792b559fddc183027a7d80fdc7a5531ee26c94aa04ca82663492827b2ee1fb1986d136c69826e1a79183f6c2c6e9ee9b4c018d6af8fdb44c384
 MISC metadata.xml 253 BLAKE2B e7d65a21b41d6fee02d2ca3ed68a52450a11debfcdf7e029100f010f6bab26aded65447d29bf374ee41d224f8105b57a8b2b6b0400f8ee4844900e6f2025a5cb SHA512 c6d2490fa32bc6e044a6b051ba21210f47d7545271a7437b9ed16f49924837e1c88dffc33efb94557b818a508e068e1405fae056c881078c37a001e30947aa25
diff --git a/dev-util/trinity/files/trinity-1.7-cflags.patch b/dev-util/trinity/files/trinity-1.7-cflags.patch
deleted file mode 100644
index accdae374bfa..000000000000
--- a/dev-util/trinity/files/trinity-1.7-cflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Makefile b/Makefile
-index c77d1f9..b970d08 100644
---- a/Makefile
-+++ b/Makefile
-@@ -10,7 +10,8 @@ endif
- CC := $(CROSS_COMPILE)$(CC)
- LD := $(CROSS_COMPILE)$(LD)
- 
--CFLAGS += -Wall -Wextra -g -O2 -I. -Iinclude/ -Wimplicit -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D__linux__
-+CFLAGS ?= -g -O2 -D_FORTIFY_SOURCE=2
-+CFLAGS += -Wall -Wextra -I. -Iinclude/ -Wimplicit -D_GNU_SOURCE -D__linux__
- 
- CFLAGS += $(shell if $(CC) -std=gnu11 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-std=gnu11"; else echo "-std=gnu99"; fi)
- 
diff --git a/dev-util/trinity/trinity-1.7.ebuild b/dev-util/trinity/trinity-1.8.ebuild
index a25cbb887f2f..1072988366ec 100644
--- a/dev-util/trinity/trinity-1.7.ebuild
+++ b/dev-util/trinity/trinity-1.8.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
 inherit toolchain-funcs
 
 DESCRIPTION="A Linux system call fuzz tester"
@@ -16,9 +15,8 @@ IUSE="examples"
 
 # We need newer headers to avoid compilation failures in the BPF stuff.
 DEPEND="app-arch/xz-utils
-	>=sys-kernel/linux-headers-4.8"
-
-PATCHES=( "${FILESDIR}/${P}-cflags.patch" )
+	>=sys-kernel/linux-headers-4.8
+"
 
 src_configure() {
 	tc-export CC
@@ -32,7 +30,8 @@ src_compile() {
 
 src_install() {
 	dobin "${PN}"
-	dodoc Documentation/* README
+	dodoc Documentation/*
+	einstalldocs
 
 	if use examples ; then
 		exeinto "/usr/share/doc/${PF}/scripts"