gentoo resync : 12.01.2019

11 files changed, 26 insertions, 424 deletions

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
-}