From 6008cdc6c2b8e4e5e1ff163b9b649ad9ffbe08fe Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Sun, 26 Feb 2017 18:09:32 +0100
Subject: [PATCH] sys-devel/gdb-apples: cleanup, bump ebuilds to EAPI=6

Package-Manager: Portage-2.3.3, Repoman-2.3.1
---
 sys-devel/gdb-apple/Manifest                |  8 ---
 sys-devel/gdb-apple/gdb-apple-1344.ebuild   | 61 -----------------
 sys-devel/gdb-apple/gdb-apple-1346.ebuild   | 61 -----------------
 sys-devel/gdb-apple/gdb-apple-1461.ebuild   |  7 +-
 sys-devel/gdb-apple/gdb-apple-1518.ebuild   | 63 ------------------
 sys-devel/gdb-apple/gdb-apple-1705.ebuild   | 74 ---------------------
 sys-devel/gdb-apple/gdb-apple-1708.ebuild   | 74 ---------------------
 sys-devel/gdb-apple/gdb-apple-1752.ebuild   |  7 +-
 sys-devel/gdb-apple/gdb-apple-563.ebuild    | 51 --------------
 sys-devel/gdb-apple/gdb-apple-768-r1.ebuild |  7 +-
 sys-devel/gdb-apple/gdb-apple-960.ebuild    | 50 --------------
 sys-devel/gdb-apple/gdb-apple-962.ebuild    | 64 ------------------
 sys-devel/gdb-apple/gdb-apple-966.ebuild    |  7 +-
 13 files changed, 16 insertions(+), 518 deletions(-)
 delete mode 100644 sys-devel/gdb-apple/gdb-apple-1344.ebuild
 delete mode 100644 sys-devel/gdb-apple/gdb-apple-1346.ebuild
 delete mode 100644 sys-devel/gdb-apple/gdb-apple-1518.ebuild
 delete mode 100644 sys-devel/gdb-apple/gdb-apple-1705.ebuild
 delete mode 100644 sys-devel/gdb-apple/gdb-apple-1708.ebuild
 delete mode 100644 sys-devel/gdb-apple/gdb-apple-563.ebuild
 delete mode 100644 sys-devel/gdb-apple/gdb-apple-960.ebuild
 delete mode 100644 sys-devel/gdb-apple/gdb-apple-962.ebuild

diff --git a/sys-devel/gdb-apple/Manifest b/sys-devel/gdb-apple/Manifest
index dbd5cc77c102b..229ac875f18e2 100644
--- a/sys-devel/gdb-apple/Manifest
+++ b/sys-devel/gdb-apple/Manifest
@@ -1,12 +1,4 @@
-DIST gdb-1344.tar.gz 17916770 SHA256 96c37c4bd4e8446e7f22411ca3972ccb240e5cfc256fe0593b012f12fdbcb7a1 SHA512 8cbcb3cfd21fae2ecf8ef04c241b71607d96bb69e6c70232efee39337196668d4772a883228b3ae70ff94ea8bc4236be541833cf9a1d6acacd4d14b0b848d5fa WHIRLPOOL 580442bf1ca19ebf201e9b5e7472368306e6fb4b4c068e271a8d37e292672f29004b17916ac8c05c0fb95817e81123c2a60d3228b57e3db7130c30f9db78e48a
-DIST gdb-1346.tar.gz 17913352 SHA256 1bda1693366e052150ce680d80a81df70cb8e61fe29fb3f9f3556e52ae141387 SHA512 f8b66955ab5dd35bcd1981ab8c835810f367e96ad074381aa9cfdf7de71d44dea58f054032c5446c7ec9b84c3b4224053ee38519556068b81a35186422666b04 WHIRLPOOL 6c624ad725a2d4ec991a87243adb7acb7eae933eac820b21cb66d78ca48b060720fa123efb20f3a8e5f80bae0d97f74c86dd72ef0dc09b2a4437312bc43aaa0f
 DIST gdb-1461.2.tar.gz 17951571 SHA256 91d8cdbcd9cf36377d9c2d425921141085b5c79a6dce312a3dc0b6960f8e02f9 SHA512 2d8b11ed575e26176a8f93eb7d2fbc052313114ffce10f0da6888ff9e7c30067d4db6d89c9443187bf7167823dfd631a7f56fe718160b5653791080df9b8163d WHIRLPOOL 20f0bcf5d9c7a5f42ff3d46e074ad94ed7bd6c89e61c6887a66b8f04fe5eb7dd3d9adaaaa041af0ef3c5fd236b7c31faa40a51a2f90e6217bec59b56950de929
-DIST gdb-1518.tar.gz 17966113 SHA256 c3050f0be9cb60d86ffc5fd174da78bf986511a442526ef8b0eec1e77161f607 SHA512 241ddf90c53f0c2a867fba461772b2fdd535cf485b3e0076000c0442bb36d97cc046b79352d75d9d05c868dfb39992d8eb02c215481f7afd39644581d09f5996 WHIRLPOOL a25e3d91ac60548540a4c17c26c5f9bf3ab53d8a9517b820681cc66928c602094b5ed7bd11c90d5700a56b48a6de7a760efc5487835f52ad3cb5cffb477e0daf
-DIST gdb-1705.tar.gz 17919005 SHA256 f0c4c145f2ef795c4742e0cd8b3f6a95f06c9985eee04a82260b62bdd8293d37 SHA512 7de0bf11a9bf6de7bdd586aada953269a71e01fa67078a5f0f203d232a1d9889b48ae295b17e2749c7f57dd824206b23ff404dfdb5c1428fa29bc9651c7db09b WHIRLPOOL 30e1e91d414f69f78f95e481316348e3cb37e3ed2c96875f815a59b829c07d636638f8ce4930fc55e4e5a05c7c768d90f164f13f5fbbe4e8ec3737657f4b57b4
-DIST gdb-1708.tar.gz 17922049 SHA256 6ef5a8e09a28c78d3b7cee32b2886f72206ce519acaff5791fa08b90c9f0e327 SHA512 985c9fb902ba87020b3671e74d9a0f843d9a721270f1f4c83d35c9e9190c2e254a7a6100d9b68f0e5806803e84d98d2a7c19b1b94db0ba78e7f4f07a8816f4b6 WHIRLPOOL d19169e4e659653287496787a47e97be46ddb9196682bcf7ef9212a75819167faf877ea7c93fd87b45326acc82caa528ac1d21f4217d3c8b01219b955a624b52
 DIST gdb-1752.tar.gz 17922994 SHA256 8685227243cedc26954d175f28ed56ba5889410420aa888323e1eeaffb204ccf SHA512 863a861a9a7708b8a763ea93599f6b519277f23fff35700d04e81a7747cc49421d0f051790deb92c440ced30ee15ba719b75066d5a614341e0f0b765d7a81094 WHIRLPOOL f07fd8a5e3e8ed466a5f21df689c4b6b7f7deaafcfdb2a209573a1112c1720c423f87e1b82d559a0616aea0c089966ffe9d30e785112936469394a621c916611
-DIST gdb-563.tar.gz 17130626 SHA256 a41177e2edbac8982e01ca01dbd52bef65bd1604fb3a65278dd0f44509bb7179 SHA512 8bcc8adf779c5ffd169b24ad064bbd9abc55f5d420246a1fce411a0b74a4c7af66e5c4f6e40fe5ed1946ae5ddbddfbd79ffbc19e3e84331b4dfac1ad1c279ba6 WHIRLPOOL 9fb6675851100ed55280f5119862fdbe3970e247b9c914d8f1484b63fd95cfbfec4322fbef1a444e4f15b988f1cdd0bdc541808ec3ea00cfbcbe267f6ac463bd
 DIST gdb-768.tar.gz 17727326 SHA256 2342cbbf7c57dcc08011736c9823d5ca374156666ba73c4b67d9984ed944f24d SHA512 40395d2e8ca30bb7aa0bbb0b270cbb9c18decc5a8fb37a764d43770e234b6281528d6feb301bcd97033c624c196851283fdbfc131f0336772a1e6e4b0168ae47 WHIRLPOOL a824e5ff903df33327827545ca8dad0401846f368e6feb3dc1b8fc9d9d2359e37302a6fd2773a6ec09ce7c71cae6082728cb9ee7d62ec28c4ede7f2fe0630c56
-DIST gdb-960.tar.gz 17875803 SHA256 921cb5317b934008bd5f7669cca811a0377c40b779277e9326198f4919f22d97 SHA512 932a97ce5cc5c16f3ab6c9e61e66ae2ce6f8c76008c52a8c890ca7a77f518b427b689b351cfd0b5b366348c8615a98f37232ac16f2e2f8994b004cffb16150e6 WHIRLPOOL f18b5b8eb014e27e891d25be8e06fd31c45ee32a9d832950f84f970e6e8e5df3bfcf581ed144f52c22d4bb2fc48665b19bbff1bc0f28b5537a77e6952e69b7e4
-DIST gdb-962.tar.gz 17876280 SHA256 b0b98aaf864797c6ffeab61b8a3d2b05d544d872969245825e257aa421f30700 SHA512 a69c3c59c47b0c068e2c94ca821ef992ccffad1bd93fc64063a30655ffb86fe401c37ad49f4c3566c6cc2530c2423a1f60f9dddf3d52990fc1ec9a930af308e4 WHIRLPOOL dd99513738c05e11a74a9c027f28ee3cafcf66a7d6caab3c465466194bde87b5e5e9c9bdccfb56e3c9c33700be545b6025a8e7e7884f6ad7115018d0da81ddeb
 DIST gdb-966.tar.gz 17769429 SHA256 fc51d13dd4153e4ac6140fa5199699dc26387189fb0e37277bb50944410a445f SHA512 daaf6f0329e311d46d82734df87fd501f70281edb511a8eb9123b6288a6a97f84725acc0f1c5e67dee3dc3e00cfa31bf7fc20594fbf3827a0ea35414f5ef7434 WHIRLPOOL acb4fb07806c08f5e58aca3b067226ce789ecd35d77eecda2e12ff757c27f08102ac3bbc4e6cf81dde97e6b112e721a7db178a807ec84a108ccc50772d45a11d
diff --git a/sys-devel/gdb-apple/gdb-apple-1344.ebuild b/sys-devel/gdb-apple/gdb-apple-1344.ebuild
deleted file mode 100644
index f0c6616ee47eb..0000000000000
--- a/sys-devel/gdb-apple/gdb-apple-1344.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Apple branch of the GNU Debugger, Developer Tools 3.2"
-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
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-768-texinfo.patch
-	[[ ${CHOST} == *-darwin8 ]] && epatch "${FILESDIR}"/${PN}-1344-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 \
-		$(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-1346.ebuild b/sys-devel/gdb-apple/gdb-apple-1346.ebuild
deleted file mode 100644
index 9a0ba2134002a..0000000000000
--- a/sys-devel/gdb-apple/gdb-apple-1346.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Apple branch of the GNU Debugger, Developer Tools 3.2.1"
-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
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-768-texinfo.patch
-	[[ ${CHOST} == *-darwin8 ]] && epatch "${FILESDIR}"/${PN}-1344-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 \
-		$(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-1461.ebuild b/sys-devel/gdb-apple/gdb-apple-1461.ebuild
index 2e51937b66d56..39484c62c3176 100644
--- a/sys-devel/gdb-apple/gdb-apple-1461.ebuild
+++ b/sys-devel/gdb-apple/gdb-apple-1461.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="3"
+EAPI="6"
 
 inherit eutils flag-o-matic
 
@@ -33,6 +32,8 @@ src_prepare() {
 
 	# for FSF gcc / gcc-apple:42
 	sed -e 's/-Wno-long-double//' -i gdb/config/*/macosx.mh
+
+	eapply_user
 }
 
 src_configure() {
diff --git a/sys-devel/gdb-apple/gdb-apple-1518.ebuild b/sys-devel/gdb-apple/gdb-apple-1518.ebuild
deleted file mode 100644
index 84c5b1156d3d3..0000000000000
--- a/sys-devel/gdb-apple/gdb-apple-1518.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils flag-o-matic
-
-APPLE_PV=${PV}
-DESCRIPTION="Apple branch of the GNU Debugger, Developer Tools 4.0"
-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
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-no-global-gdbinit.patch
-	epatch "${FILESDIR}"/${PN}-768-texinfo.patch
-	epatch "${FILESDIR}"/${P}-task_dyld_info.patch
-	epatch "${FILESDIR}"/${P}-darwin8-9.patch
-	[[ ${CHOST} == *-darwin8 ]] && epatch "${FILESDIR}"/${P}-darwin8.patch
-}
-
-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-1705.ebuild b/sys-devel/gdb-apple/gdb-apple-1705.ebuild
deleted file mode 100644
index d6ce02a507473..0000000000000
--- a/sys-devel/gdb-apple/gdb-apple-1705.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils flag-o-matic
-
-APPLE_PV=${PV}
-DESCRIPTION="Apple branch of the GNU Debugger, Developer Tools 4.1"
-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
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-no-global-gdbinit.patch
-	epatch "${FILESDIR}"/${PN}-768-texinfo.patch
-	epatch "${FILESDIR}"/${PN}-1518-darwin8-9.patch
-	epatch "${FILESDIR}"/${PN}-1705-darwin8-10.patch
-	[[ ${CHOST} == *-darwin8 ]] && epatch "${FILESDIR}"/${PN}-1518-darwin8.patch
-}
-
-src_configure() {
-	replace-flags -O? -O2
-	econf \
-		--disable-werror \
-		--disable-debug-symbols-framework \
-		$(use_enable nls) \
-		|| die
-}
-
-src_compile() {
-	# unable to work around parallel make issue
-	emake -j2 || die
-}
-
-src_install() {
-	emake -j2 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
-	if use x86-macos || use x64-macos ; then
-		einfo "FSF gdb works on Intel-based OSX platforms, sometimes even"
-		einfo "better than gdb-apple.  You can consider installing FSF gdb"
-		einfo "instead of gdb-apple, since the FSF version is surely more"
-		einfo "advanced than this old 6.8 version modified by Apple."
-	fi
-}
diff --git a/sys-devel/gdb-apple/gdb-apple-1708.ebuild b/sys-devel/gdb-apple/gdb-apple-1708.ebuild
deleted file mode 100644
index 77c8d9e0fa2b9..0000000000000
--- a/sys-devel/gdb-apple/gdb-apple-1708.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils flag-o-matic
-
-APPLE_PV=${PV}
-DESCRIPTION="Apple branch of the GNU Debugger, Developer Tools 4.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
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-no-global-gdbinit.patch
-	epatch "${FILESDIR}"/${PN}-768-texinfo.patch
-	epatch "${FILESDIR}"/${PN}-1518-darwin8-9.patch
-	epatch "${FILESDIR}"/${PN}-1705-darwin8-10.patch
-	[[ ${CHOST} == *-darwin8 ]] && epatch "${FILESDIR}"/${PN}-1518-darwin8.patch
-}
-
-src_configure() {
-	replace-flags -O? -O2
-	econf \
-		--disable-werror \
-		--disable-debug-symbols-framework \
-		$(use_enable nls) \
-		|| die
-}
-
-src_compile() {
-	# unable to work around parallel make issue
-	emake -j2 || die
-}
-
-src_install() {
-	emake -j2 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
-	if use x86-macos || use x64-macos ; then
-		einfo "FSF gdb works on Intel-based OSX platforms, sometimes even"
-		einfo "better than gdb-apple.  You can consider installing FSF gdb"
-		einfo "instead of gdb-apple, since the FSF version is surely more"
-		einfo "advanced than this old 6.8 version modified by Apple."
-	fi
-}
diff --git a/sys-devel/gdb-apple/gdb-apple-1752.ebuild b/sys-devel/gdb-apple/gdb-apple-1752.ebuild
index cdd5c02629cad..6a6d6a5c511cf 100644
--- a/sys-devel/gdb-apple/gdb-apple-1752.ebuild
+++ b/sys-devel/gdb-apple/gdb-apple-1752.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="3"
+EAPI="6"
 
 inherit eutils flag-o-matic
 
@@ -31,6 +30,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1518-darwin8-9.patch
 	epatch "${FILESDIR}"/${PN}-1705-darwin8-10.patch
 	[[ ${CHOST} == *-darwin8 ]] && epatch "${FILESDIR}"/${PN}-1518-darwin8.patch
+
+	eapply_user
 }
 
 src_configure() {
diff --git a/sys-devel/gdb-apple/gdb-apple-563.ebuild b/sys-devel/gdb-apple/gdb-apple-563.ebuild
deleted file mode 100644
index 5dc3235555288..0000000000000
--- a/sys-devel/gdb-apple/gdb-apple-563.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Apple branch of the GNU Debugger, Xcode 2.4"
-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
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-darwin7.patch
-	epatch "${FILESDIR}"/${P}-no-64bit.patch
-	epatch "${FILESDIR}"/${PN}-768-texinfo.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 \
-		$(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-768-r1.ebuild b/sys-devel/gdb-apple/gdb-apple-768-r1.ebuild
index e86d161987feb..1206ecb0b60ae 100644
--- a/sys-devel/gdb-apple/gdb-apple-768-r1.ebuild
+++ b/sys-devel/gdb-apple/gdb-apple-768-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="3"
+EAPI="6"
 
 inherit eutils flag-o-matic
 
@@ -30,6 +29,8 @@ src_prepare() {
 
 	# for FSF gcc / gcc-apple:42
 	sed -e 's/-Wno-long-double//' -i gdb/config/*/macosx.mh
+
+	eapply_user
 }
 
 src_configure() {
diff --git a/sys-devel/gdb-apple/gdb-apple-960.ebuild b/sys-devel/gdb-apple/gdb-apple-960.ebuild
deleted file mode 100644
index b7463cef2088e..0000000000000
--- a/sys-devel/gdb-apple/gdb-apple-960.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Apple branch of the GNU Debugger, Xcode Tools 3.1"
-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
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-768-texinfo.patch
-	epatch "${FILESDIR}"/${PN}-768-darwin-arch.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 \
-		$(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-962.ebuild b/sys-devel/gdb-apple/gdb-apple-962.ebuild
deleted file mode 100644
index 52e53f7fc3033..0000000000000
--- a/sys-devel/gdb-apple/gdb-apple-962.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Apple branch of the GNU Debugger, Xcode Tools 3.1.2"
-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
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-768-texinfo.patch
-	epatch "${FILESDIR}"/${PN}-768-darwin-arch.patch
-	epatch "${FILESDIR}"/${PN}-962-darwin8.patch
-	epatch "${FILESDIR}"/${PN}-962-darwin64.patch
-	epatch "${FILESDIR}"/${PN}-962-demangle.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 \
-		$(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/gdb-apple/gdb-apple-966.ebuild b/sys-devel/gdb-apple/gdb-apple-966.ebuild
index c7c716ca04df3..15017df485c84 100644
--- a/sys-devel/gdb-apple/gdb-apple-966.ebuild
+++ b/sys-devel/gdb-apple/gdb-apple-966.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="3"
+EAPI="6"
 
 inherit eutils flag-o-matic
 
@@ -33,6 +32,8 @@ src_prepare() {
 
 	# for FSF gcc / gcc-apple:42
 	sed -e 's/-Wno-long-double//' -i gdb/config/*/macosx.mh
+
+	eapply_user
 }
 
 src_configure() {