gentoo resync : 12.01.2019

25 files changed, 83 insertions, 530 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 82df4eef58f4..6db5085d3459 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf-archive/Manifest b/sys-devel/autoconf-archive/Manifest
index cca5cd5fee6c..e5a2fb8b8a23 100644
--- a/sys-devel/autoconf-archive/Manifest
+++ b/sys-devel/autoconf-archive/Manifest
@@ -1,7 +1,5 @@
-DIST autoconf-archive-2017.03.21.tar.xz 633132 BLAKE2B d2dd681a3b8c30fe50ae70e8c938e6c235e2747475abc7bba62dc1836f9ca49733935ec5372d2497d6dcef43dbf306a5b53604cb300e24915d43c9fbb5a62b05 SHA512 826233fcdd0cb5a1fe18bd52477e3a8afcaf8719ea376b3be0864df6b481f0fef8fd8083485b1565a14c13ad64dbc0ae93149a62e16da9a4d24db8063120cc3a
-DIST autoconf-archive-2017.09.28.tar.xz 645388 BLAKE2B b7b62d30ddde199d0f1a61bb78c50f932ff4e66a57bc318f8dc096f506ab81c3308d389690fdf495c4b9cf405b0139126aea8f4cb3219ed8e94c9c0d707ad065 SHA512 2aa271fdd67fa3caf20e07eb8332d88f7008eefe1df447980d42cb2104313d99947b94ffdb0f6f4b4c8156cfc73d9e0b6c27a5f133c6b73787ef641d9951be90
 DIST autoconf-archive-2018.03.13.tar.xz 649496 BLAKE2B a69c381d734aa41337b8af783196f13e7aa49d936289df237c56a9be7662cd2b766ac42fa10f4cd46feac3998a12c49745d994c5df95b5dd449646dae300a8f8 SHA512 301832a02b1913dd46cc34f6479264b37032d78457b2df526f0aafc752996972ca9c74fdae68fbe0f490268019c45329d564f263cbaff30203bbb4b4a8d5ad5f
-EBUILD autoconf-archive-2017.03.21.ebuild 687 BLAKE2B 9bbda3ebd22e06f9ccac2bb9cd09c36ae37cadea5caa31095109d79978e6c1574148bfe091e9677e54d89520e80d357917869032441cf6ef9996a53affe12a2f SHA512 e7d95e98a548a02d48e784bc7ee2bc65b3fffdf49dbe0ce671cb0c6218a97fa61262ff0b38817d2dea34a63eb9d9303102e76503359a5aea4e2cca0ee3ffed31
-EBUILD autoconf-archive-2017.09.28.ebuild 698 BLAKE2B d10ceb151160380628dac564271da9586d01a3a44eefa8d9bd05cb6742f25233eb5fb80a1403a3fdf5f61cf38978cdf4cfcc3742426aafcd3b4c5c9c54bbb799 SHA512 9f7e4e77c305f4cffe360a75e05a9ab585e84d9b873049fb721bd5896dcff70fb3576f5c87f18ec2179f10f3f0f0f058586c9d83569b24cbf40680bf04df2cf4
+DIST autoconf-archive-2019.01.06.tar.xz 651320 BLAKE2B a311b8e6bdd45337194451a696e2435ce758e7c9b1d12639b5837f23c8ea051eb63152952fb944b14fc1db1baa1f1a3e3516fa931fa411b0f7aa08a2040ddcff SHA512 14bf8d0bf8be4a4dc078677de1977e496d4d9cf095bc897c174e331311b722cd3a34054e74c2146fff4b5c84269463e6a6fc61907d77d1c51bb221c8fb124fcb
 EBUILD autoconf-archive-2018.03.13.ebuild 725 BLAKE2B a0b61eace8f6ceb2780ed644aaf087521dcd9cb65449523242691906e6ee2cb2408e9d728a557d6c93db238152432f86c0e888c161ae9d216c813bb8b6b9795c SHA512 847e2eb96fb424f5ca363f1621e29b9545c9a413ae2bfa98de829a0f26c37654d869d5d4463494afa863cdf98ec7e20422371f467f7b3ee95d676fbbd8b6892e
+EBUILD autoconf-archive-2019.01.06.ebuild 673 BLAKE2B 0e3895dc2b8141d7c20b72925ee8cde27834c7dee2f9233e5f2eac6212e5e07e2a79f3860684485f035ca0d1a59ac89a19c54d8ba763a5b24c5e7af43b75c602 SHA512 ce43f4254e99628a9f3a57b605c756d2aa08e2763d8d63d6bbf4abaa0a8f3e522e7ec2cee9202846cbffc25b46bb2fc89aab29ec341a9a5e46ed6edcf1a41d09
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2017.09.28.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2017.09.28.ebuild
deleted file mode 100644
index f07985ef6361..000000000000
--- a/sys-devel/autoconf-archive/autoconf-archive-2017.09.28.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="GNU Autoconf Macro Archive"
-HOMEPAGE="https://www.gnu.org/software/autoconf-archive/"
-SRC_URI="mirror://gnu/${PN}/${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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-# File collisions. #540246
-RDEPEND="!=gnome-base/gnome-common-3.14.0
-	!>=gnome-base/gnome-common-3.14.0-r1[-autoconf-archive(+)]"
-DEPEND=""
-
-src_install() {
-	default
-	rm -r "${ED}/usr/share/${PN}" || die
-}
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2017.03.21.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
index 3d7b45ab32b8..6969fb01803c 100644
--- a/sys-devel/autoconf-archive/autoconf-archive-2017.03.21.ebuild
+++ b/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,15 +9,10 @@ SRC_URI="mirror://gnu/${PN}/${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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # File collisions. #540246
 RDEPEND="!=gnome-base/gnome-common-3.14.0
 	!>=gnome-base/gnome-common-3.14.0-r1[-autoconf-archive(+)]"
 DEPEND=""
-
-src_install() {
-	default
-	rm -r "${ED}/usr/share/${PN}" || die
-}
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index c774e0e49df0..6c116b834a8c 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -7,6 +7,7 @@ AUX 5.0.2/0002-test-Fix-clang-test-for-FreeBSD-and-NetBSD.patch 2846 BLAKE2B a5d
 AUX 5.0.2/extra/0001-Assume-the-shared-library-path-variable-is-LD_LIBRAR.patch 1376 BLAKE2B baa36d2b05118859ffc5af12e9b5a8ed0dac3c262736ef2bab5f89049267dca5a94e134b078c06f09cafcc678fb8adefcf84f940806b594777a1f05a1e216a80 SHA512 f4e31053c03429528fc193a4550784b21d60fa0487700c1f416952c5d92b71988ca481b53c00f95f0c8c39f5f30e9ddd5cc6bee5334294fd3e4df24b8a450e69
 AUX 6.0.1/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch 1256 BLAKE2B e71f32b08defa1ba59b574e9314e272107638676f1b1469a448efced144c680ffde4d76e34fa3fa5786859bf6e04050bd23150d7c0b98f8849f5d9355eacb646 SHA512 260096c1c7e6ba6f35537873cb6ba83f2271cb50446c50f6f1a5c88138c23508df16c99cac8664b5be0d56f2e0fe288f51a27424ff0b56c317d7a7e07562e0fc
 AUX 6.0.1/darwin_prefix-include-paths.patch 690 BLAKE2B cfb96eb259fb7d557d215be08ea3babcae6dc1353171fad7f297f787d476d28768c7c1bbe6efc7404ea638f1dc6b4b36e1c17e141faf82be623bbd96d5e09118 SHA512 5f8ecabaf43853964bffeb3953b205bea7e8928fd53637d01842723ac8344e19cc639f6f06c199f2be88b73e60b6eab1987bc5ee7dfeaea5e710eacab90f3533
+AUX 7.0.1/0001-clangd-Fix-detecting-atomics-in-stand-alone-builds.patch 1244 BLAKE2B 0a5f0b4af299ae49b13eac0e6ff06ce84264baf05bc09437b481830d4cfafab68ec2a3adf5814fcd8efbe91770e2dda0ce5fa5e10fcefc10d6fbe2c17ca067b6 SHA512 cec3d531b7d6121f7fc5da731d7d89d03a7d1a38e32abd5d7812790ffa62e6d3b9f18084983702203502905d447ad89bd4e2a7f3ca51ee7d696ebe623b035ac6
 DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d6ad24ff439a983f629711b4513b9c4bee4070f8df13b6b2a52d673b0706733a4c151ce5021a0233147debff14ac SHA512 936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964
 DIST cfe-5.0.2.src.tar.xz 11459216 BLAKE2B 80d9b2ab70b00c0dfd5c5386a44e0c15d8252e6175c9da55a0519c4f9b8192e32e215110d7d3808225786e2c7f906f2dfbe11dd09bdf21574e99709ae237ed0b SHA512 9931afceb5569ad6caec85d506180c810f7fea94af8c997143b0a37cbf413fcea0d92520478610627eeee1efb65fde684066ace0dfcbbf7b61ecd709d22dd0b1
 DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
@@ -31,7 +32,7 @@ EBUILD clang-3.9.1-r100.ebuild 1471 BLAKE2B a3f8f43d3f07cc8598a4bdd8e0c59d1da652
 EBUILD clang-4.0.1.ebuild 9614 BLAKE2B ef0c63cfe38db99be4b9236d04eba4107092869e6c4dcc64e5a4cddf2d7931652607fce6292a8158ea9ff545ffb0296bca3670fd386e132c05239384190bbde9 SHA512 77045fdf3606b88c4f7f3021399c34b61876e80be7fa84ccb3a464e8caa19fcdbc896eb4f2d08d4f9f39dd7bdb03b9557135a710a00b92714ac2b29d6ba8e2d5
 EBUILD clang-5.0.2.ebuild 10452 BLAKE2B 2f0af78f8cdaf88e643bccc474ff186db268307373cfe5130c09c2f07753c5eaa92220ab4f117ae1396ae5ff7cb13fb42765bcc44f7e0aa3decd1c7ce1c93dd2 SHA512 3dc65b62475430748da620f6dcd83943b5de88a28d666b321f107439a8cec88694285c6cf2cd90e0cca78b8f75d3c7af98ca70099500dfd1a59685aadb4fc630
 EBUILD clang-6.0.1.ebuild 10272 BLAKE2B 7f179071a60dad773c4fedd95aae8c7529e84f891f6001808576bf6523baebe92eee713522c03accdcbeff76afc0c0a1329e159eef2cd307a2ff4ba6b598edc1 SHA512 508dc2b7c6758f63e931f83ec851ccf6e07433719e4e8dcb1f366c736bd22cb4fc19723dc2f05f7ff90f1828fc41a71d808d4f7f8332625134294516dc52ce79
-EBUILD clang-7.0.1.ebuild 10131 BLAKE2B 62278d00c31e3945066fcca9215bcc9cf9d699a5015add6306470ef78944449453721f31e12477d9ce78baa4e6f8357483ff7de31022b25a971267e4cf1ff7d6 SHA512 b2ea37b1b873be7e44fc9536afe32685fe5c6bbecfb363c31150b1ba3a04306fe61de13f5d6ca644b5c66f469b775e272443b2acdaf61f5e9cfe0fc1f1481b16
+EBUILD clang-7.0.1.ebuild 10292 BLAKE2B 09856bbb082206962b40968f0553d40005a9b47000c2f612d2052bbca72e8c0e6e1bd5f3605deae0779167263e054e3f3c403a4bf5317cc48855dcc85664218f SHA512 f6239ddbad9a90e2006ab6358594ea035782a5f44fd5ffb76714c3ec85fd1f3711b1d9242f1e51a494a403b60eb03d8cade16bc2bf2e81af614d4942cc2a3583
 EBUILD clang-7.0.9999.ebuild 9427 BLAKE2B 60c2334a185dec4b05de6eb73eccd498bd707703dd80c429f6ffdfd74b2fb9ee82b916df14ff7433857cab5d5381b9e9527ab53560c4362a57f187fefc7e6e71 SHA512 dcdef2d19e4c10302607595349a2ad5b5e58fdcabb16a798713cf2e8f2dda0cd2d778b7f8b1769b8326bb75043daafeb2bcf48c722614c11dfcadc1b0861e49f
-EBUILD clang-9999.ebuild 9495 BLAKE2B 29efb16398715df4d7355f4baf6ea70d81e4c2785a4ea8cf8188130e495e9f1fe43fec81e507b1015bad36fdd957971d67b19fd8beaa942587094c897f09c267 SHA512 2df7920e0732a0d08564a61ac4a647cd54177117596d50dbda2c555b0925a16d87d67f00402f54d4ae15fd26ae877b17b14d6f203411ae56f2174ae8a3928953
+EBUILD clang-9999.ebuild 9507 BLAKE2B d80b2dea59f1e942e67fcf9ca322ee85be631b59e79adcb2cfd40577875248188cfc173607efac57febc0b1463083e991dda65244bd6663655ddf19564db6c70 SHA512 682d2c98a82d7b3be48820737ed46e363e53d9f4c74cb2f53e4cac4a546872af269dc1d40b601c05b42fd9ed886003f8ff2f1af1045e4edc7a97d660ad15d5f9
 MISC metadata.xml 1455 BLAKE2B 9dd88bba7158dfdc83bfc48fa4134e1f5a3357ab778cad400a51e348bbb4b44d2740ec417fdc888df0b4fd820441649e92b7adffdd4db558a2f4c3f4830a83a1 SHA512 369a87bd551e483e81ff56f5167177b1bcfedf9bc97f501ef2b07bfdfea3a25532f5e86af062568b3b22a53fe07318fd93dc55bd83b453dd10a0f4d3e88cb932
diff --git a/sys-devel/clang/clang-7.0.1.ebuild b/sys-devel/clang/clang-7.0.1.ebuild
index 628a17f3f484..e48ada0998b5 100644
--- a/sys-devel/clang/clang-7.0.1.ebuild
+++ b/sys-devel/clang/clang-7.0.1.ebuild
@@ -71,6 +71,10 @@ CMAKE_BUILD_TYPE=RelWithDebInfo
 PATCHES=(
 	# add Prefix include paths for Darwin
 	"${FILESDIR}"/6.0.1/darwin_prefix-include-paths.patch
+
+	# fix detecting atomics library in clangd
+	# https://bugs.gentoo.org/667016
+	"${FILESDIR}"/7.0.1/0001-clangd-Fix-detecting-atomics-in-stand-alone-builds.patch
 )
 
 # Multilib notes:
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index 9e95b51eaf98..bf5ab043a347 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
 	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
 	static-analyzer? (
 		dev-lang/perl:*
-		z3? ( >=sci-mathematics/z3-4.7.1:0= )
+		z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
 	)
 	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
 	${PYTHON_DEPS}"
@@ -137,7 +137,7 @@ multilib_src_configure() {
 		-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)
+		-DCLANG_ANALYZER_ENABLE_Z3_SOLVER=$(usex z3)
 	)
 	use test && mycmakeargs+=(
 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
diff --git a/sys-devel/clang/files/7.0.1/0001-clangd-Fix-detecting-atomics-in-stand-alone-builds.patch b/sys-devel/clang/files/7.0.1/0001-clangd-Fix-detecting-atomics-in-stand-alone-builds.patch
new file mode 100644
index 000000000000..151c2b5e8e8a
--- /dev/null
+++ b/sys-devel/clang/files/7.0.1/0001-clangd-Fix-detecting-atomics-in-stand-alone-builds.patch
@@ -0,0 +1,38 @@
+From 74aa5bb20b3d8e1ed2b590053fdd665e9dde8462 Mon Sep 17 00:00:00 2001
+From: Michal Gorny <mgorny@gentoo.org>
+Date: Thu, 3 Jan 2019 16:43:27 +0000
+Subject: [PATCH] [clangd] Fix detecting atomics in stand-alone builds
+
+Include CheckAtomic CMake module from LLVM in order to detect support
+for atomics when building stand-alone.  Otherwise,
+the HAVE_CXX_ATOMICS64_WITHOUT_LIB variable is undefined and clangd
+wrongly attempts to link -latomic on systems not using the library.
+
+Original bug report: https://bugs.gentoo.org/667016
+
+Differential Revision: https://reviews.llvm.org/D56061
+
+git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@350329 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ clangd/CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/clangd/CMakeLists.txt b/clangd/CMakeLists.txt
+index 39467bd5..251ee7fc 100644
+--- a/tools/extra/clangd/CMakeLists.txt
++++ b/tools/extra/clangd/CMakeLists.txt
+@@ -2,6 +2,11 @@ set(LLVM_LINK_COMPONENTS
+   Support
+   )
+ 
++if(CLANG_BUILT_STANDALONE)
++  # needed to get HAVE_CXX_ATOMICS64_WITHOUT_LIB defined
++  include(CheckAtomic)
++endif()
++
+ set(CLANGD_ATOMIC_LIB "")
+ if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
+   list(APPEND CLANGD_ATOMIC_LIB "atomic")
+-- 
+2.20.1
+
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index cab4e60c61af..bc27427c9a35 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -6,6 +6,6 @@ DIST gcc-config-2.0.tar.xz 15344 BLAKE2B 323b1e791b831ee610a375fc03532ab89e31b1f
 EBUILD gcc-config-1.8-r1.ebuild 1161 BLAKE2B db1db6716e17f201f125a9a758056cc14ce95eb90acb26805304525222022982ad2e67a47e879ea627a662063da899a07ed274dc2b22af8043ef0d36a11436c2 SHA512 57bab539041f364492082412524b643aaabb8fe1c40ec553429950a33b7578048a2b1395c1f586a9157c26eb87e528c53eba44de583f9232135a5a9cb4c47d69
 EBUILD gcc-config-1.9.0-r1.ebuild 1112 BLAKE2B 287025d72d30838127ee77f7d072e2bc8847c766c665544a41d23dd8e3a36beb24eb108052735b95dc881fc837ad184d4be15a84f81eaf9bce6fb1d7fbeb4489 SHA512 a7deecbd421587d539e89029abecba739a72e45174df8bcab09ae8afc966694a78ee8fea62b6a162446ff5d31a593caf0af73a88fb1e6f41270e6cc46e82f48a
 EBUILD gcc-config-1.9.1.ebuild 1220 BLAKE2B c742e71d7eec27b9b010ee84fdb08b70aa5e226d11f3317699bed8de606baff34b9a48ba30b39660b9decdfb27b8b6ea4c7eac67666c581814850d6e88ca564d SHA512 22c107f48ded4903572ccb8d5381114c17c4cd7210147b344bdf3556137e1b12f4d0a5ff2c148a41b435c3e2b6119fe7ad77084a36598f42b4eccc08c8ac6c5f
-EBUILD gcc-config-2.0.ebuild 1203 BLAKE2B 7c0953c929423ad9b59b7214034899700e28abb55f559fd6f873aa4670a49137af88cefa22357a1c4d9023531f9b5a0dce82fe2fa304c2720b678b2e0b84844c SHA512 8e3f9e82ac962013fcbcee8fb321f42f709dde46c07e1a4734582fe9ca2f29346fd562189c3c90dcdc7d3581646a6792d72df515aafcc5d9bd3dee9ba0dab40a
+EBUILD gcc-config-2.0.ebuild 1202 BLAKE2B 67972119247fcbfa65a03622ef6b92fe1f1f3f2cef8ab67cbf879aee3502971a37edaf7603855594d15000d9323bbbb5a0fc63aac303cd4ce7e69c620cfb5aa9 SHA512 f13d074cff84d5f4086a70b6b1a4dabe44d197800655a3b8daafed98073dc45752817c914a45fe5c9da6cd4f1a508d283e3a16ed8bec618efc18b3a4dba0c08d
 EBUILD gcc-config-9999.ebuild 1220 BLAKE2B c742e71d7eec27b9b010ee84fdb08b70aa5e226d11f3317699bed8de606baff34b9a48ba30b39660b9decdfb27b8b6ea4c7eac67666c581814850d6e88ca564d SHA512 22c107f48ded4903572ccb8d5381114c17c4cd7210147b344bdf3556137e1b12f4d0a5ff2c148a41b435c3e2b6119fe7ad77084a36598f42b4eccc08c8ac6c5f
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/gcc-config/gcc-config-2.0.ebuild b/sys-devel/gcc-config/gcc-config-2.0.ebuild
index 46440d36bc6e..027b650ca725 100644
--- a/sys-devel/gcc-config/gcc-config-2.0.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	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"
 fi
 
 DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gdb-apple/Manifest b/sys-devel/gdb-apple/Manifest
index 6da77e1abea1..f34b2379a413 100644
--- a/sys-devel/gdb-apple/Manifest
+++ b/sys-devel/gdb-apple/Manifest
@@ -1,20 +1,8 @@
-AUX gdb-apple-1461-darwin8.patch 3024 BLAKE2B f1a7b99fb8b0fef12261684b2791b8aa5851eb652ba386c6c21ebb745d0af4e7e221c3c3a1142b10801a5f0eeff63a8792c34017b3cbbf5622e51fb1741b5412 SHA512 a527366d60f80c9b771a2d130e12c27ec3c75c24119f49f417bc5a63a4d62a7725402d8616a464c8b359fea31396d28d454fa96797f7ef0accc58434a0ea73d9
-AUX gdb-apple-1461-dyld-info.patch 477 BLAKE2B 6bc4ef849402de1f3d1613a9a78dfb8bf00d349f89975f04af5a2d7f966a75891e7fb86ca909d9b0f4ada0e501c7dcbbc3119a29e66602c2ecad629032daf143 SHA512 6e54160f4fff7d36b1ef3740dea112d9cf84d75e52ab42c61caa9e2668d87921ba33c3e43123befa89e04d4e104b986c095a022d81a34d2c87006606a64d2bc4
 AUX gdb-apple-1518-darwin8-9.patch 2260 BLAKE2B 29c00d40a6f34f2f602b0ecfaa4079b7e70cbc2a30d1bf93c6c93cb03168bb93a1af749b8631b05950863fa8d46b0060f9270f4980bab937aac50c8c738afb3c SHA512 7c079c480b3ed1e9d6cfed78ea87358988a4c72a0e89f4cd76e12b235e9451ab6ea77679ad0953f224e6c30ba0d078c5ce4e1a25f6bbd1134214dd721b0420b6
 AUX gdb-apple-1518-darwin8.patch 3022 BLAKE2B e2c60e539fd81af137ac915a1c957ad62482686f196e941fcf9946f10682e35ecfe9438e04b6f0f9618b6fcb9c06ae363b97c2cf45cf1a13befad399b74df6c0 SHA512 efa100767336d0eba752d03d5d6ea6a77c80e40160208cd157abc444064c779f9d671e5a621cbeae8f7b2ae134e838e49a2726d1d9efcbd8421070a6b789679d
 AUX gdb-apple-1705-darwin8-10.patch 286 BLAKE2B f7f038e870aafe73ee79251bee1441e9186db898e211556212a53c1a0ec935059d1e16766d4bddffda980777c972bb661b09b6bb8973e6f3cc6b00008b37e3f3 SHA512 baf049e3a1e580faeb5b5481bbdda5cfd96abb22ec7dd2528986c4fa78113933565a9a1711f4dcf8bed9edd27190aa9f5f04d7df141b0eb1aa65b18b57915061
-AUX gdb-apple-768-darwin-arch.patch 571 BLAKE2B e77d26f86390b51758da726887b8cb376443a0bcf98225f5f8ee2de3b8e829f8b65380c67b83fb003b84822f12f0bbecddc4753fb6e3af3fc6672223bdc07443 SHA512 5d5345c0b9aab9610bfeb3adf98f92f2d132e198ce69278b8a7e35e59d9b45955b5eabd0cf2e6dd085a034369826804d833ec841726729a1272b06a8d7b8592b
 AUX gdb-apple-768-texinfo.patch 487 BLAKE2B b429247205cb241c1b876d3477310b201ab9191d582daf2f40bae92f782680df3d60fbaf335ef5a91db7bab0fffd87ff8783813f1efca690ae255157f9f98464 SHA512 fb40c8c713e0cdd34df82b368fbae5b9cc4180a6519f303750d72181dcac31436f947fc01c6949bbfc8bf8a7be4459cb2083e821433c1c4e9a587e2171933b92
-AUX gdb-apple-962-darwin64.patch 580 BLAKE2B e215baa922cce04b243546559d0136174b6148a3944eacb3099d1d2c30f187f808c5b102b12a5b7208209c8621b724b9288d57fa208f2b7143ebbe556732ef7d SHA512 2b940cfef9caeac9aa863ab53349de083026258458321108d54e4605d1030f496701e666a720e530d530ede0db7b59694f3fbc4ab28a6122ca1e28c03bbae8a2
-AUX gdb-apple-962-darwin8.patch 402 BLAKE2B da41ed1b548eee0ea0c46d98ded18810dff31b9d6dde7836ea487820def7d29a491b800489b09a5aa8e9a1a300d950908939c42a6bb492078d23bd5af11228ae SHA512 e6c8a48eef811c061e9ec48b4a99f653b6dcfd02d4c4cd7b0135e170eca8240183da563fe62de600156b065f5a74d64fbed84f9c3763324d6697168486750237
-AUX gdb-apple-962-demangle.patch 708 BLAKE2B a3e59d622b0e3892fe2dcfccf5657440a6dc73fb5af9889b152ae9cd8871a934b8062590983e24035bc263da88b3fc6d3e975755ff515f3615792d3c5effed4c SHA512 623db08a7c378f2644faf22a41cf57341f9bbecd7ad319e32651a8f4eff2935bb9914443143a749dabf255a1f99dea133daa487dc3192bacc1fc8f7eb088dec4
 AUX gdb-apple-no-global-gdbinit.patch 714 BLAKE2B 188d5f51bec24e54357b451e26e607b53e5009ded5232fb21c513c97e5833636d041d73d0d4411b7b49810a88ec432d3fa4ef83f765a9e5fedbc047478c43160 SHA512 e692621595562f002a8f2d170cf3aed087f09ddb0578e2a8bf4bdac77119ee7c4a921f9d4a10273a3c0b7cbe95299d936c93971b5ff1a73fd528f8d1984f7a4c
-DIST gdb-1461.2.tar.gz 17951571 BLAKE2B 53871df6574c73b37ce0a7ee353eca1fa81a6be4b6389ee41a9a140d091579df98f5fe44e0dfb9a14a0309cc3510c566a5af73af231a9070f55308434ea6373a SHA512 2d8b11ed575e26176a8f93eb7d2fbc052313114ffce10f0da6888ff9e7c30067d4db6d89c9443187bf7167823dfd631a7f56fe718160b5653791080df9b8163d
 DIST gdb-1752.tar.gz 17922994 BLAKE2B 9b27bca2b6a9f10e01d130d595270300a4e7f0040790c5b60337d41086e1238dc12d785cc88c484df630f742ddfe783f7baefc2132b47e41bb74a5d0b7ebbf1e SHA512 863a861a9a7708b8a763ea93599f6b519277f23fff35700d04e81a7747cc49421d0f051790deb92c440ced30ee15ba719b75066d5a614341e0f0b765d7a81094
-DIST gdb-768.tar.gz 17727326 BLAKE2B 9c233204d276c673f4f653888f947ecc73cb9e09c0cd9dd3879a0e47f2b50942a38513826c005cb3bd04019fbac5f7c01860f98304884ba8d3c81b63cffc89ac SHA512 40395d2e8ca30bb7aa0bbb0b270cbb9c18decc5a8fb37a764d43770e234b6281528d6feb301bcd97033c624c196851283fdbfc131f0336772a1e6e4b0168ae47
-DIST gdb-966.tar.gz 17769429 BLAKE2B c27a8fb6884eabf56855817fbcca2e0566df834d541bee1cf87954bdafd82d6eac673d46026ca8101ea5b2ac3ad1da14bcc9d9bf5a20fade099fdd7df54d6936 SHA512 daaf6f0329e311d46d82734df87fd501f70281edb511a8eb9123b6288a6a97f84725acc0f1c5e67dee3dc3e00cfa31bf7fc20594fbf3827a0ea35414f5ef7434
-EBUILD gdb-apple-1461.ebuild 1752 BLAKE2B b30ff64ae73f655f8694c775c5ec97c1333b6e5adb5dcddc616d5677b1aef2cbcc63b4fb85ee726348a90e557d7ed1266581261252585ffa7967987418b4432e SHA512 14abd93c0f62ca59b438737c17c0ad780dbfd3cbaab45a462f3ef421c9ebcec36a7568e2a17ed46a0fbefb4b98e42f0273868bc3e9b38c1f6fb9ce7a9cd772b8
-EBUILD gdb-apple-1752.ebuild 2119 BLAKE2B 0aa1606612bf991bc3d1fbdaefa3413fab413c3f03f24daaa8f1e7e1a08b88fa3f900d8474563350a924e3aa1a39edc64cfa0d15258186a354403810af6115a1 SHA512 c500687a44ca3296bd04c15e37ee060eeb8f9885f111a6d50230b1846252734d2e40e430d8a57c6a4c91a34f04f50a814a6fe2c524e4e649fe64ce511b7a1f4e
-EBUILD gdb-apple-768-r1.ebuild 1085 BLAKE2B 289bf19991c5e139409b4c89aa216cf57abe9848cb9afaec56969687d657a75d9a6841bb2865d3447958e1a1fc90b97d6d673fd21bbfc3b7a2a1eb5a343b05f4 SHA512 fb94c73b167e1aec67db74e210112df142d3f70500c4d2e3672a662d498ae6b321fa93e4fa087ce95a4e9085e57d9970d47856d6108184aa574af4e9fa95bb5c
-EBUILD gdb-apple-966.ebuild 1687 BLAKE2B 006394faba157c56404ac8fd0fb694228109e13b111ce94b8545dd918df969e827ecbcb3a9f5c0c58c5b25b6d1495643e0179a0b4b0e2d4b234b25e46e5fb477 SHA512 c222b6ea16b2cbcb9009182a66083fb7de5994ab529e5467e5c2031b37b6540d5607c017084b3ed8072341ae082c642575af10f63ec26487ab97e9d13953584b
+EBUILD gdb-apple-1752.ebuild 2716 BLAKE2B 2891ed93ac84cdfe1ee77ee0056e6252c4d656af5c5ebdef16af2f138d9b56fc13cd06ee1eeb1ee8a76efff47c4d666ba2771b5987ccff486db3d2821c48b6b6 SHA512 17ce69586a7e38e2dda5f6a9825a3d5a11fd72ba6cce5fa0ca06865d5b160a7e131f88c54e8604421bd9a43215a7a4a85d1ad1d1f80c4a3500b23de6bef1aa7f
 MISC metadata.xml 247 BLAKE2B 5589fe7154425e3eb144170de1f3a024df3fd2b642731f4565abc21498d16dc424613cae78f8b30f0d4341bd9ed1712fdb3beec8d0436192d3d8612c7db9b7c4 SHA512 ae91bc559b2380b04af0bacbaf419deb042e9a9235c596c1afdbbb3933e59ba4f895c6e7ebf8fa4884702d5b39febedfdcce109ab912d6ef4f51b3696bc82c18
diff --git a/sys-devel/gdb-apple/files/gdb-apple-1461-darwin8.patch b/sys-devel/gdb-apple/files/gdb-apple-1461-darwin8.patch
deleted file mode 100644
index c89c82a0d18c..000000000000
--- a/sys-devel/gdb-apple/files/gdb-apple-1461-darwin8.patch
+++ /dev/null
@@ -1,128 +0,0 @@
---- a/gdb/macosx/macosx-nat-inferior.c
-+++ b/gdb/macosx/macosx-nat-inferior.c
-@@ -60,13 +60,17 @@
- #include <sys/sysctl.h>
- #include <sys/proc.h>
- #include <mach/mach_error.h>
-+#if defined(TARGET_ARM)
- #include <spawn.h>
-+#endif
- 
- #include <semaphore.h>
- 
- #include <dlfcn.h>
-+#if 0
- #include <libproc.h>
- #include <sys/proc_info.h>
-+#endif
- 
- #include "macosx-nat-dyld.h"
- #include "macosx-nat-inferior.h"
---- a/gdb/macosx/macosx-nat-info.c
-+++ b/gdb/macosx/macosx-nat-info.c
-@@ -45,6 +45,22 @@
- #include "macosx-nat-inferior.h"
- #include "macosx-nat-inferior-debug.h"
- 
-+#ifdef __ppc__
-+#ifndef __darwin_ppc_thread_state
-+#define __darwin_ppc_thread_state ppc_thread_state
-+#define __r0       r0
-+#define __srr0     srr0
-+#define __srr1     srr1
-+#define __cr       cr
-+#define __xer      xer
-+#define __lr       lr
-+#define __ctr      ctr
-+#endif
-+#ifndef __darwin_ppc_exception_state
-+#define __darwin_ppc_exception_state ppc_exception_state
-+#endif
-+#endif
-+
- extern macosx_inferior_status *macosx_status;
- 
- #define CHECK_ARGS(what, args) \
---- a/gdb/macosx/macosx-nat-infthread.c
-+++ b/gdb/macosx/macosx-nat-infthread.c
-@@ -36,8 +36,10 @@
- #include <sys/dir.h>
- #include <inttypes.h>
- 
-+#if 0
- #include <libproc.h>
- #include <sys/proc_info.h>
-+#endif
- 
- #include "macosx-nat-inferior.h"
- #include "macosx-nat-inferior-util.h"
---- a/gdb/macosx/macosx-tdep.c
-+++ b/gdb/macosx/macosx-tdep.c
-@@ -63,7 +63,6 @@
- #include "gdbcore.h"
- 
- #include <dirent.h>
--#include <libgen.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/param.h>
---- a/gdb/remote.c
-+++ b/gdb/remote.c
-@@ -62,7 +62,6 @@
- #include "macosx-nat-dyld.h"
- #include "macosx-nat-dyld-process.h"
- #endif
--#include <execinfo.h>
- 
- /* Prototypes for local functions.  */
- static void cleanup_sigint_signal_handler (void *dummy);
-@@ -474,11 +473,13 @@
- static void
- remote_backtrace_self (const char *message)
- {
-+#if 0
-   void *bt_buffer[100];
-   int count = backtrace (bt_buffer, 100);
-   if (message && message[0])
-     fprintf_filtered (gdb_stderr, "%s", message);
-   backtrace_symbols_fd (bt_buffer, count, STDERR_FILENO);
-+#endif
- }
- 
- static void
---- a/gdb/symfile.c
-+++ b/gdb/symfile.c
-@@ -67,7 +67,6 @@
- #include <ctype.h>
- #include <time.h>
- #include <sys/time.h>
--#include <libgen.h>
- 
- #include <sys/mman.h>
- 
---- a/gdb/utils.c
-+++ b/gdb/utils.c
-@@ -27,7 +27,6 @@
- #include "gdb_string.h"
- #include "event-top.h"
- #include "exceptions.h"
--#include <execinfo.h>
- 
- #ifdef TUI
- #include "tui/tui.h"		/* For tui_get_command_dimension.   */
-@@ -874,6 +873,7 @@
-   target_terminal_ours ();
-   begin_line ();
- 
-+#if 0
-   /* APPLE LOCAL: Do a stack crawl of how we got here so we're more likely
-      to get useful bug reports.  */
-   {
-@@ -882,6 +882,7 @@
-     fprintf (stderr, "gdb stack crawl at point of internal error:\n");
-     backtrace_symbols_fd (bt_buffer, count, STDERR_FILENO);
-   }
-+#endif
- 
-   /* Create a string containing the full error/warning message.  Need
-      to call query with this full string, as otherwize the reason
diff --git a/sys-devel/gdb-apple/files/gdb-apple-1461-dyld-info.patch b/sys-devel/gdb-apple/files/gdb-apple-1461-dyld-info.patch
deleted file mode 100644
index fb9ca9c74115..000000000000
--- a/sys-devel/gdb-apple/files/gdb-apple-1461-dyld-info.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-If dyld-info is not available, don't try to compile unreachable code
-using it either.
-
---- a/gdb/macosx/macosx-nat-dyld.c
-+++ b/gdb/macosx/macosx-nat-dyld.c
-@@ -731,7 +731,7 @@
- {
- #if !defined (TASK_DYLD_INFO) || !defined (NM_NEXTSTEP)
-   return 0;
--#endif
-+#else
- 
-   if (target_is_remote () || value == NULL)
-     return 0;
-@@ -791,6 +791,7 @@
-     }
- #endif /* NM_NEXTSTEP */
-   return 0;
-+#endif
- }
- 
- /* Searches the target address space for dyld itself, returning it in
diff --git a/sys-devel/gdb-apple/files/gdb-apple-768-darwin-arch.patch b/sys-devel/gdb-apple/files/gdb-apple-768-darwin-arch.patch
deleted file mode 100644
index 5442ba8ba636..000000000000
--- a/sys-devel/gdb-apple/files/gdb-apple-768-darwin-arch.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-* configure checks for /usr/bin/arch to determine whether "arch" is ok
-  to use, so don't rely on the path at runtime, since GNU arch doesn't
-  understand -arch at all (and only returns the current arch name)
-
---- src/gdb/fork-child.c
-+++ src/gdb/fork-child.c
-@@ -243,7 +243,7 @@
- 	  arch_string = "x86_64";
- #endif
- 	if (arch_string != NULL)
--	  sprintf (shell_command, "%s exec arch -arch %s ", shell_command, arch_string);
-+	  sprintf (shell_command, "%s exec /usr/bin/arch -arch %s ", shell_command, arch_string);
- 	else
- 	  strcat (shell_command, "exec ");
-       }
diff --git a/sys-devel/gdb-apple/files/gdb-apple-962-darwin64.patch b/sys-devel/gdb-apple/files/gdb-apple-962-darwin64.patch
deleted file mode 100644
index 4417cee76e4d..000000000000
--- a/sys-devel/gdb-apple/files/gdb-apple-962-darwin64.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-* todo: extend for powerpc64 also
-
---- src/bfd/config.bfd.orig	2009-06-23 11:05:43 +0200
-+++ src/bfd/config.bfd	2009-06-23 11:05:47 +0200
-@@ -500,6 +500,12 @@
-     targ_archs="bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch"
-     targ_underscore=yes
-     ;;
-+  x86_64-*-darwin*)
-+    targ_defvec=mach_o_le_vec
-+    targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
-+    targ_archs="bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch"
-+    targ_underscore=yes
-+    ;;
-  i[3-7]86-sequent-bsd*)
-     targ_defvec=i386dynix_vec
-     targ_underscore=yes
diff --git a/sys-devel/gdb-apple/files/gdb-apple-962-darwin8.patch b/sys-devel/gdb-apple/files/gdb-apple-962-darwin8.patch
deleted file mode 100644
index 05a088b93fb3..000000000000
--- a/sys-devel/gdb-apple/files/gdb-apple-962-darwin8.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-* 10.4 doesn't have posix spawn, but fortunately it's only used on ARM
-  (iPhone), so we can still compile it
-
---- src/gdb/macosx/macosx-nat-inferior.c
-+++ src/gdb/macosx/macosx-nat-inferior.c
-@@ -58,7 +58,9 @@
- #include <sys/sysctl.h>
- #include <sys/proc.h>
- #include <mach/mach_error.h>
-+#ifdef TARGET_ARM
- #include <spawn.h>
-+#endif
- 
- #include "macosx-nat-dyld.h"
- #include "macosx-nat-inferior.h"
diff --git a/sys-devel/gdb-apple/files/gdb-apple-962-demangle.patch b/sys-devel/gdb-apple/files/gdb-apple-962-demangle.patch
deleted file mode 100644
index a302ce56ec91..000000000000
--- a/sys-devel/gdb-apple/files/gdb-apple-962-demangle.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-in 32-bits mode this goes /just/ right, in 64-bits mode Portage aborts
-because objc_demangle is implicitly turned into a pointer
-
---- src/gdb/maint.c.orig	2009-06-23 11:12:15 +0200
-+++ src/gdb/maint.c	2009-06-23 11:19:58 +0200
-@@ -31,6 +31,7 @@
- #include "symtab.h"
- #include "gdbtypes.h"
- #include "demangle.h"
-+#include "objc-lang.h"
- #include "gdbcore.h"
- #include "expression.h"		/* For language.h */
- #include "language.h"
-@@ -167,7 +168,7 @@
-       switch (current_language->la_language)
-         {
-         case language_objc:
--          demangled = objc_demangle (args);
-+          demangled = objc_demangle (args, 0);
-           break;
-         case language_objcplus:
-         case language_cplus:
diff --git a/sys-devel/gdb-apple/gdb-apple-1461.ebuild b/sys-devel/gdb-apple/gdb-apple-1461.ebuild
deleted file mode 100644
index 7127e61d2445..000000000000
--- a/sys-devel/gdb-apple/gdb-apple-1461.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-APPLE_PV=${PV}.2
-DESCRIPTION="Apple branch of the GNU Debugger, Developer Tools 3.2.2"
-HOMEPAGE="https://sourceware.org/gdb/"
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-${APPLE_PV}.tar.gz"
-
-LICENSE="APSL-2 GPL-2"
-SLOT="0"
-
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-
-IUSE="nls"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2
-	=dev-db/sqlite-3*"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/gdb-${APPLE_PV}/src
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-no-global-gdbinit.patch
-	"${FILESDIR}"/${PN}-768-texinfo.patch
-	"${FILESDIR}"/${P}-dyld-info.patch
-)
-
-src_prepare() {
-	default
-	[[ ${CHOST} == *-darwin8 ]] && eapply "${FILESDIR}"/${P}-darwin8.patch
-
-	# for FSF gcc / gcc-apple:42
-	sed -e 's/-Wno-long-double//' -i gdb/config/*/macosx.mh
-}
-
-src_configure() {
-	replace-flags -O? -O2
-	econf \
-		--disable-werror \
-		--disable-debug-symbols-framework \
-		$(use_enable nls) \
-		|| die
-}
-
-src_install() {
-	emake DESTDIR="${D}" libdir=/nukeme includedir=/nukeme install || die
-	rm -R "${D}"/nukeme || die
-	rm -Rf "${ED}"/usr/${CHOST} || die
-	mv "${ED}"/usr/bin/gdb "${ED}"/
-	rm -f "${ED}"/usr/bin/*
-	mv "${ED}"/gdb "${ED}"/usr/bin/
-}
-
-pkg_postinst() {
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -ge 9 ]] ; then
-		ewarn "Due to increased security measures in 10.5 and up, gdb is"
-		ewarn "not able 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/gdb-apple/gdb-apple-1752.ebuild b/sys-devel/gdb-apple/gdb-apple-1752.ebuild
index f374628fb7d5..6f9458c8f084 100644
--- a/sys-devel/gdb-apple/gdb-apple-1752.ebuild
+++ b/sys-devel/gdb-apple/gdb-apple-1752.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs
 
 APPLE_PV=${PV}
 DESCRIPTION="Apple branch of the GNU Debugger, Developer Tools 4.3"
@@ -17,10 +17,12 @@ KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 
 IUSE="nls"
 
-RDEPEND=">=sys-libs/ncurses-5.2-r2
+RDEPEND=">=sys-libs/ncurses-5.2-r2:0=
+	sys-libs/readline:0=
 	=dev-db/sqlite-3*"
 DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* )"
 
 S=${WORKDIR}/gdb-${APPLE_PV}/src
 
@@ -34,9 +36,22 @@ PATCHES=(
 src_prepare() {
 	default
 	[[ ${CHOST} == *-darwin8 ]] && eapply "${FILESDIR}"/${PN}-1518-darwin8.patch
+
+	# use host readline
+	sed -i -e '/host_libs/s/readline//' configure.in configure || die
+	sed -i \
+		-e '/^\(READLINE\|readline\)_/s/=.*$/=/' \
+		-e '/^READLINE /s/=.*$/= -lreadline/' \
+		gdb/Makefile.in || die
 }
 
 src_configure() {
+	if tc-is-gcc ; then
+		# force gcc-apple, FSF gcc doesn't grok this code
+		export CC=${CTARGET:-${CHOST}}-gcc-4.2.1
+		export CXX=${CTARGET:-${CHOST}}-g++-4.2.1
+	fi
+
 	replace-flags -O? -O2
 	econf \
 		--disable-werror \
@@ -47,11 +62,15 @@ src_configure() {
 
 src_compile() {
 	# unable to work around parallel make issue
-	emake -j2 || die
+	# ignore texinfo issues (version mismatch, to hard to fix or
+	# disable)
+	emake -j2 MAKEINFOFLAGS="--force" || die
 }
 
 src_install() {
-	emake -j2 DESTDIR="${D}" libdir=/nukeme includedir=/nukeme install || die
+	emake -j2 \
+		DESTDIR="${D}" libdir=/nukeme includedir=/nukeme \
+		MAKEINFOFLAGS="--force" install || die
 	rm -R "${D}"/nukeme || die
 	rm -Rf "${ED}"/usr/${CHOST} || die
 	mv "${ED}"/usr/bin/gdb "${ED}"/
diff --git a/sys-devel/gdb-apple/gdb-apple-768-r1.ebuild b/sys-devel/gdb-apple/gdb-apple-768-r1.ebuild
deleted file mode 100644
index e9f84fc168a6..000000000000
--- a/sys-devel/gdb-apple/gdb-apple-768-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Apple branch of the GNU Debugger, 10.5"
-HOMEPAGE="https://sourceware.org/gdb/"
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-${PV}.tar.gz"
-
-LICENSE="APSL-2 GPL-2"
-SLOT="0"
-
-KEYWORDS="~ppc-macos ~x86-macos"
-
-IUSE="nls"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2
-	=dev-db/sqlite-3*"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/gdb-${PV}/src
-
-PATCHES=(
-	"${FILESDIR}"/${P}-texinfo.patch
-	"${FILESDIR}"/${P}-darwin-arch.patch
-)
-
-src_prepare() {
-	default
-	# for FSF gcc / gcc-apple:42
-	sed -e 's/-Wno-long-double//' -i gdb/config/*/macosx.mh
-}
-
-src_configure() {
-	replace-flags -O? -O2
-	econf \
-		--disable-werror \
-		$(use_enable nls) \
-		|| die
-}
-
-src_install() {
-	emake DESTDIR="${D}" libdir=/nukeme includedir=/nukeme install || die
-	rm -r "${D}"/nukeme || die
-	rm -Rf "${ED}"/usr/${CHOST} || die
-	mv "${ED}"/usr/bin/gdb "${ED}"/
-	rm -f "${ED}"/usr/bin/*
-	mv "${ED}"/gdb "${ED}"/usr/bin/
-}
diff --git a/sys-devel/gdb-apple/gdb-apple-966.ebuild b/sys-devel/gdb-apple/gdb-apple-966.ebuild
deleted file mode 100644
index 7ffb29ce62ac..000000000000
--- a/sys-devel/gdb-apple/gdb-apple-966.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Apple branch of the GNU Debugger, Developer Tools 3.1.3"
-HOMEPAGE="https://sourceware.org/gdb/"
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-${PV}.tar.gz"
-
-LICENSE="APSL-2 GPL-2"
-SLOT="0"
-
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-
-IUSE="nls"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2
-	=dev-db/sqlite-3*"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/gdb-${PV}/src
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-768-texinfo.patch
-	"${FILESDIR}"/${PN}-768-darwin-arch.patch
-	"${FILESDIR}"/${PN}-962-darwin8.patch
-	"${FILESDIR}"/${PN}-962-darwin64.patch
-	"${FILESDIR}"/${PN}-962-demangle.patch
-)
-
-src_prepare() {
-	default
-	# for FSF gcc / gcc-apple:42
-	sed -e 's/-Wno-long-double//' -i gdb/config/*/macosx.mh
-}
-
-src_configure() {
-	replace-flags -O? -O2
-	econf \
-		--disable-werror \
-		$(use_enable nls) \
-		|| die
-}
-
-src_install() {
-	emake DESTDIR="${D}" libdir=/nukeme includedir=/nukeme install || die
-	rm -R "${D}"/nukeme || die
-	rm -Rf "${ED}"/usr/${CHOST} || die
-	mv "${ED}"/usr/bin/gdb "${ED}"/
-	rm -f "${ED}"/usr/bin/*
-	mv "${ED}"/gdb "${ED}"/usr/bin/
-}
-
-pkg_postinst() {
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -ge 9 ]] ; then
-		elog "Due to increased security measures in 10.5 and up, gdb is"
-		elog "not able to get a mach task port when installed by Prefix"
-		elog "Portage, unprivileged.  To make gdb fully functional you'll"
-		elog "have to perform the following steps:"
-		elog "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
-		elog "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
-	fi
-}
diff --git a/sys-devel/remake/Manifest b/sys-devel/remake/Manifest
index b88d4b524620..d0d036480cbb 100644
--- a/sys-devel/remake/Manifest
+++ b/sys-devel/remake/Manifest
@@ -1,8 +1,4 @@
 AUX make-4.2.1-glob-v2.patch 1073 BLAKE2B bcced0694ed0206394d750452cec2c0ee8356fd8b779b9ee4d6fbf0d3dd736a0465b0f12a1629508669efb7c4ffe1d17f1aeb9b925d86e9e75a5b90119ddd5c9 SHA512 2f19578979cc5af622d6571e4d9c97e5567acd4036076e9c426a8d4505b6da191cf9b6edb1cecc0aff14efce52d3062c21d10a36d569743acdfc660007f928f4
-DIST remake-3.82+dbg0.9.tar.bz2 1152677 BLAKE2B bb4c61b2bad39be1e50c919c2c4b2f069df31a6b6d6e51863257a20ecace2395a16349f8dcafcb4c5bf020d423d91d7d9c9a3098ff2f6d2891a5d3bdbf54b126 SHA512 94682e9d0317088456dac683d67be320fe10bb06a3384969fafefe091558b215105ba3c96a7c1d4e0d970ea2dc5c4f535a704256fe7a4eaa87bec11d78d074cf
-DIST remake-4.1+dbg1.1.tar.bz2 1254246 BLAKE2B be1b18329b36d6c34aaa3270ae2c69b042d467d19bc99ac13562df387a3f0cd0bf19c7e39aebfa983614355c2d0921620609894850e1eb66f24ed08aea36ead3 SHA512 e0dfb0f7a3f05968c3597e73f2fd486929893546a8f993e99ae73c6400050d1faa5baed1b0588d399bfc6e58e8504f857c8734e39a02efd875b522b26dfaa421
 DIST remake-4.2.1+dbg-1.4.tar.bz2 1508613 BLAKE2B f83bf8b1154d87d3c729b51797011511c6d9a249dffd212a551602a2af1c874d50d631d0f0e3f00d1b4484db758b7d167c416b0be185ad2a16897a077d04e9f4 SHA512 ffb7d641e0bc99794c17f634fe0aa5bf909c1e1c8eb14873dd27f2950d913db393c3532c34f417307eba351e8732c366131a23e661f5fec9529edc5d778da0d1
-EBUILD remake-3.82.0.9.ebuild 620 BLAKE2B b81d8e2b9c9e3bab02b116f21ad5484d7b2e49711a9ef5f9d71660aebc1e02c515e0ac82639fe51f752042a0fac4d7e6d995b36ad0ca090418e3b3be58733153 SHA512 78bfb6261ec1bf419ad9740154aa7caba439ad973adaca5a0c7cc7e68a5ba696195f097e3171f186e44f899a7e297d21c7fb8fb2b5828b98a4e7e5327edfb496
-EBUILD remake-4.1.1.1.ebuild 834 BLAKE2B d04bb04d37c434dc64790c4b744bd46b71857c547d44ddf735ba03d211381cb7ac408c2cf84d9c1cec3db7b855c7d4d58526390fd269fd9658f3e5251c3ee1cb SHA512 703662b02b790965479822a6017a0b64407641bb9bb3c8dc50d5aa3853a2a5da80b2c86d4849095383a519c6613b51b4ec0054deeb88c43878a1c17b38cb757f
-EBUILD remake-4.2.1.1.4-r1.ebuild 929 BLAKE2B 97e93ae9b76486eca715c5e8a6697619506aeffd1424c65fd18f405dbe1134afbbe9481097e833ee698140d22465aef9c4edc0da49bf24f1a65e60882c56acbd SHA512 0b981068e05d4119be97184471e4e89827233808a2e924ce3fce1ab02e55f71bbd3e7e787e48aff6d42211df8854b2b78d950852a05a656702878db44d3230a8
+EBUILD remake-4.2.1.1.4-r1.ebuild 926 BLAKE2B 7c60c017b473982373f252f49e50bac2fb124af42383f833e14292e1816060f62d2105f29cba669123a264005c8c0097ccdf47bf9d379cd142bd2e92cdc14de6 SHA512 81fad3dcfc5e6a98d930fd36e81b5f17a4c144d88475e0cd9d135baad7a7b297e2ad224b653b0d6c71a7cc218477fb7d3e20a15a445edbfc36ca9cf6f258fb53
 MISC metadata.xml 326 BLAKE2B 4ca7da15d02026b12d85b2329d0096bfc817d29b0618a97a61f54b9c6702b3cc89c4674510286c88b59eaa7142b98ff2fdada61ae5d56856b3e6a9e08116a954 SHA512 69c31da5d0fb8b94548ee398fc937405ae11224a415dc7ad6628c9b66362d43c4e3adcfba05016735298d31eba68faa19dab93f3d792629217660e51c382567c
diff --git a/sys-devel/remake/remake-3.82.0.9.ebuild b/sys-devel/remake/remake-3.82.0.9.ebuild
deleted file mode 100644
index d675aaf24fed..000000000000
--- a/sys-devel/remake/remake-3.82.0.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-MY_P="${PN}-${PV:0:4}+dbg${PV:5}"
-
-DESCRIPTION="patched version of GNU make with improved error reporting, tracing and debugging"
-HOMEPAGE="http://bashdb.sourceforge.net/remake/"
-SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86"
-IUSE="readline"
-
-RDEPEND="readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	default
-	# fix collide with the real make's info pages
-	rm -f "${D}"/usr/share/info/make.*
-}
diff --git a/sys-devel/remake/remake-4.1.1.1.ebuild b/sys-devel/remake/remake-4.1.1.1.ebuild
deleted file mode 100644
index bf782cdf5407..000000000000
--- a/sys-devel/remake/remake-4.1.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_P="${PN}-${PV:0:3}+dbg${PV:4}"
-
-DESCRIPTION="patched version of GNU make with improved error reporting, tracing and debugging"
-HOMEPAGE="http://bashdb.sourceforge.net/remake/"
-SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="guile readline"
-
-RDEPEND="readline? ( sys-libs/readline:0= )
-	guile? ( >=dev-scheme/guile-1.8:= )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	use readline || export vl_cv_lib_readline=no
-	econf $(use_with guile)
-}
-
-src_install() {
-	default
-	# delete files GNU make owns and remake doesn't care about.
-	rm -r "${ED}"/usr/include || die
-}
diff --git a/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild b/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild
index ad57875a4a96..41c678407557 100644
--- a/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild
+++ b/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="guile readline"
 
 RDEPEND="readline? ( sys-libs/readline:0= )