[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc/

[Fabian Groffen]

commit:     78584815905d5133850551dee2940ac4e1221358
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 22 21:30:36 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec 22 21:30:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=78584815

sys-devel/gcc: drop ~ppc-aix

Bug: https://bugs.gentoo.org/760057
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sys-devel/gcc/Manifest             |  6 ---
 sys-devel/gcc/gcc-10.1.0-r1.ebuild |  3 +-
 sys-devel/gcc/gcc-4.1.2.ebuild     | 13 +-----
 sys-devel/gcc/gcc-4.2.4-r2.ebuild  | 78 ++-----------------------------
 sys-devel/gcc/gcc-4.7.3-r1.ebuild  | 48 +------------------
 sys-devel/gcc/gcc-4.8.5-r1.ebuild  | 81 +-------------------------------
 sys-devel/gcc/gcc-4.9.4.ebuild     | 85 +---------------------------------
 sys-devel/gcc/gcc-5.4.0-r4.ebuild  | 85 +---------------------------------
 sys-devel/gcc/gcc-6.4.0-r2.ebuild  |  6 +--
 sys-devel/gcc/gcc-7.3.0-r6.ebuild  | 92 ------------------------------------
 sys-devel/gcc/gcc-7.4.0.ebuild     |  5 +-
 sys-devel/gcc/gcc-8.2.0-r5.ebuild  | 95 --------------------------------------
 sys-devel/gcc/gcc-8.3.0.ebuild     |  5 +-
 sys-devel/gcc/gcc-9.2.0-r3.ebuild  |  3 +-
 14 files changed, 17 insertions(+), 588 deletions(-)

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index d3970689d3..7549317634 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -28,12 +28,8 @@ DIST gcc-5.4.0.tar.bz2 95661481 BLAKE2B bf882acfa28cc1064cddd21e25332fff6bc65505
 DIST gcc-6.4.0-patches-1.4.tar.bz2 13451 BLAKE2B 9934558989405141ae22c941fc4f5b4fb9dc425b0f35b458ab9c2704b8fbf61975a93c3d0e4c9ebde0cc7f935be868e9ad7ebdd78441235b81316fcca339fc42 SHA512 6d94f1ac196deabc8fcd30215bcbec4bbb19924929ef11c3000c8bfa189c59d87f95d37ac8cb0ff2d59cc2fc632b5767dbb80cbe7a354084cb2bc5e14cfbabb2
 DIST gcc-6.4.0-uclibc-patches-1.0.tar.bz2 1586 BLAKE2B 21f97a9e1c349b3d52def092a03e5a90533521da9af586be7ee527594f2d65745491ff8758d88c99a7ac215bde7ebf4e47a0a36cfcd7e66f70e0bebf2dadd922 SHA512 266dbe2bb53d892a24cd752d5c6833ea33f8df8b11b0471700ee53865243cd41f412f9bea8a369b474c9cd1435faff2e03902c7cb5638dd3ddcaa665aa2ec522
 DIST gcc-6.4.0.tar.xz 76156220 BLAKE2B 2018c338b28ea644cdd1b327cb0dfe7ee9aa2010357c93f7e71969f587c58d3fdfa2bb4c82a309490c48bc86924400022fa93f41dc6c4345878d1bc1d8204265 SHA512 02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90
-DIST gcc-7.3.0-patches-1.8.tar.bz2 14435 BLAKE2B 3e5c1abad56ccd6e0aa7739cb7cd651ec07ef9bf25be554343f1fa0444f251de41bde5fe6f8bb9e85e3f7a5cf8b2b83515647d93d62f338fa7843581fcaff2f8 SHA512 4d9d76b3d47f1af4f23cae15278d165b22065a3d1512323d1e31b5e0cb47e4654733dc43fa11906a3bd18e827621c9a5ec62b73563f8e5ead663c29f7d0d7345
-DIST gcc-7.3.0.tar.xz 62462388 BLAKE2B dc8f132b21bd0543c3d9dd17557038aafe65675aa73c540954234a3c972b4c31c939149bd50183d072ab6c8d16919e19daeaaffd619ce2ccd62dbdf9a5bb3302 SHA512 ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4
 DIST gcc-7.4.0-patches-1.1.tar.bz2 8778 BLAKE2B 52b02b3c619b99912ee254599788abebe3963cf85e49b56166069318e340a8e271d767e82798e6062fc2a042a86a88da66ab95f2d9e42933ff17688d616a903f SHA512 02ec2eb2460e24cf46f7a04ca3b80ca120719389a54a740070e991d9c96b6fd55d1fa04eb4249fd3043edc9c0f6519b5babcce76036cd0146183512aaae2d573
 DIST gcc-7.4.0.tar.xz 62601888 BLAKE2B df91ec680d5389736d3a37a2d85cf2e12fbe87b642fdf4b332e67a043e00944aca00243cc6709f86abd92115cb5a78502146636395571d1ea4899531e15d5d0e SHA512 8864d8e4b97c2e1a4f17422f6e68120172ebefeab97b1757734f7185ca68a6b9a89011c6833c03fa454c17b0ac35b15e1d284881e6971035948ac6100f3aa45e
-DIST gcc-8.2.0-patches-1.6.tar.bz2 17138 BLAKE2B edbeba9c41972836de072955c0db51406603aaf0dbb5f84ac1c5d8d2d61a8df6d725356655b69e3678950a0dc6dacc1bc2bf56f3620d685fe5c32045b3893f96 SHA512 32e7bddb5ec288def1e5c79d58023d90e29d77e83b70e3f21a22f4da78061cc49184d92c43807bdfd56a5067cbb9a8cfbfcb514016662aa1a24d791c7bd87b6b
-DIST gcc-8.2.0.tar.xz 63460876 BLAKE2B c5372b0bdfcd2729577dca287b294623b78c583491998404eb307768c573618bdaaedb7d9ae0e39ba41a62a14b9525dff0e3083285754b7f5bb9987ecf635185 SHA512 64898a165f67e136d802a92e7633bf1b06c85266027e52127ea025bf5fc2291b5e858288aac0bdba246e6cdf7c6ec88bc8e0e7f3f6f1985f4297710cafde56ed
 DIST gcc-8.3.0-patches-1.0.tar.bz2 12278 BLAKE2B 793465c5de0af850c7f3017b3011e68f3bd1664e6ce3500a3dc3003d37c03fe81857698957770a135eadd395a7767fa804d354ecdcdeb1d83623280ca569d4ec SHA512 0efadd2481713992807fed2683666f1094b3757674754601c079569f3ef70cd7aed3cefc9f815f4e59a21d37e4e940c122df714e16f3878a5f966450c4273669
 DIST gcc-8.3.0.tar.xz 63694700 BLAKE2B 71df2ff5bd6874d57519c2e9af6b22152c8c4d7fab906a5f427b41bc4e8e742127592a8684120d9d3c9ce6241439531850be08ec0a4f29dbfdee95435655fdca SHA512 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802
 DIST gcc-9.2.0-patches-4.tar.bz2 21655 BLAKE2B 2acf6d83ec934a65e77d2079a024b42622e1234f0516f12839f7d03c2f3e1bb275037b020e35ba847d6809d5577ba966619c78345b75355df0a754d02ccf9819 SHA512 114e01a7b08ecb1feab24ef3cfc72c8953748f1526722b80c18602025eef132e2b4c05db59c7a23eb2e7f42ed48eb02d92bcd73b1ca932374d6bedaf89cc66d0
@@ -41,6 +37,4 @@ DIST gcc-9.2.0.tar.xz 70607648 BLAKE2B 41a5e148f9a6857d6599679964c203533f76f330a
 DIST gcc-cygwinports-0de6b2ae6b6577eb0891a7ca8d551bdfa79bf5e8.tar.gz 20183 BLAKE2B dc9a4c78f98851ed77720d4c06d3fbf9f2d7d0e81a825cc89026994060fd29214f111fd3a52cec6518417cab2be89caf4a844a0869136287f174147ca7a6ebf3 SHA512 d01ee85a1327e7f6f16b3c2de6659699764f365215bd3e58247c5c65594153b9232bdc43ff89420cac75ad908ed39c7ff9fa4006818f5dd209b792d34d9ae7de
 DIST gcc-cygwinports-11fa2eec213324d64673ad41358f726f6523667f.tar.gz 23047 BLAKE2B 83e44a2eed9e134ea2531e3ecff4479f4d305a55d14729ed11c91199c1f56ec7e2d4df48d56de11ba43a9e936019943edc370a04a26f6b3bfd5616230feeffa5 SHA512 f8cbf3b2b20c1950d0984fe672536d92f7d05b065495d93205d72b7578e696847f074430c6e642668d1c0c26fa9d98a4dfd3fce7030d45f2d04f80499437587c
 DIST gcc-cygwinports-a03d77536f40d1a6335b6d313a4e4a4dff38ce66.tar.gz 35809 BLAKE2B e009012e86b83032a7d316580eddfc8f03dccdaa9f573ce9a0e80209ef545748c4c98388238bc22c6666394346d5d4d42d21bf964454a6c05da1f80cd95f6ada SHA512 989b3b0bc0c55715d7c87fa59f465d2af7042e052a5d01e9cdb26fd61e08504a596a604aa482438560e011b8ea5d015da75f172ea5c2ea5b9a90e8943f355734
-DIST gcc-cygwinports-d83e3d1ac0a9adfacdf120f013870472e8e712c3.tar.gz 27216 BLAKE2B 0f4737d1f115d95d3e752c02e4f6eb8cde3e42653ece6aaa0eb90edf74bfad1e9b91514b49bc2b3dcb822de99d4bb37e697a3a37c555c6c306e8debd02bd283d SHA512 0bf2e75d788a8e2dce352a084c44d6ae2c470ced178f257f464963041e13fc217ff31e970efb77261ac1916fe849eac110703343773ee1ec4d45c69c6b9200eb
 DIST gcc-cygwinports-f44d762eb3551ea0d81aa8e4b428bcb7caabb628.tar.gz 32780 BLAKE2B 364353bf379a2a950050148caf2cef86239f2418a98f72b3edec4cf56e43e7d07601f4d1ca8103c691ddddff0fca96a6a8c728e2e50bca373c34441bdc7505be SHA512 d5bc37965745fa32a3ddd357e658bd066d4aadf19eee7a30047f4dc6f47450d320e33cbbe4bf22fa6f5e30f7f41ec6ec3a250df56760a38df0f14fea3e34a83e
-DIST gdc-0.24-src.tar.bz2 1012099 BLAKE2B 2c85058aad09af328719a702f69d655b9aa9655f2a83bb46bd21367cd442ed72c9b471ddaa764753f782dcb2f22fe51b052a965ed08290e0d9415b543481d144 SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686

diff --git a/sys-devel/gcc/gcc-10.1.0-r1.ebuild b/sys-devel/gcc/gcc-10.1.0-r1.ebuild
index e4e696251a..ce7e8d3a7d 100644
--- a/sys-devel/gcc/gcc-10.1.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-10.1.0-r1.ebuild
@@ -14,8 +14,7 @@ BDEPEND="
 	kernel_linux? ( ${CATEGORY}/binutils )
 	kernel_Darwin? (
 		|| ( ${CATEGORY}/binutils-apple ${CATEGORY}/native-cctools )
-	)
-	kernel_AIX? ( ${CATEGORY}/native-cctools )"
+	)"
 
 src_prepare() {
 	toolchain_src_prepare

diff --git a/sys-devel/gcc/gcc-4.1.2.ebuild b/sys-devel/gcc/gcc-4.1.2.ebuild
index da6e33eac7..83751a153f 100644
--- a/sys-devel/gcc/gcc-4.1.2.ebuild
+++ b/sys-devel/gcc/gcc-4.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.2.ebuild,v 1.37 2014/01/19 01:51:34 dirtyepic Exp $
 
@@ -18,7 +18,6 @@ KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 RDEPEND=""
 DEPEND="${RDEPEND}
 	kernel_Darwin? ( ${CATEGORY}/binutils-apple )
-	kernel_AIX? ( ${CATEGORY}/native-cctools )
 	!kernel_Darwin? ( !kernel_AIX? (
 		ppc? ( >=${CATEGORY}/binutils-2.17 )
 		ppc64? ( >=${CATEGORY}/binutils-2.17 )
@@ -61,16 +60,6 @@ src_configure() {
 			# todo: some magic for native vs. GNU linking?
 			EXTRA_ECONF="${EXTRA_ECONF} --with-gnu-ld"
 		;;
-		*-aix*)
-			# AIX doesn't use GNU binutils, because it doesn't produce usable
-			# code
-			EXTRA_ECONF="${EXTRA_ECONF} --without-gnu-ld --without-gnu-as"
-		;;
-		*-darwin7)
-			# libintl triggers inclusion of -lc which results in multiply
-			# defined symbols, so disable nls
-			EXTRA_ECONF="${EXTRA_ECONF} --disable-nls"
-		;;
 	esac
 	# Since GCC 4.1.2 some non-posix (?) /bin/sh compatible code is used, at
 	# least on Solaris, so force it into our own bash

diff --git a/sys-devel/gcc/gcc-4.2.4-r2.ebuild b/sys-devel/gcc/gcc-4.2.4-r2.ebuild
index 2435f93e96..30089080d7 100644
--- a/sys-devel/gcc/gcc-4.2.4-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.2.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.2.4-r1.ebuild,v 1.16 2014/01/19 01:51:34 dirtyepic Exp $
 
@@ -12,20 +12,18 @@ inherit eutils toolchain flag-o-matic prefix
 DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 SRC_URI+=" https://dev.gentoo.org/~grobian/distfiles/gcc-4.2.3-mint.patch"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
 	kernel_Darwin? ( ${CATEGORY}/binutils-apple )
-	kernel_AIX? ( ${CATEGORY}/native-cctools )
-	elibc_Interix? ( || ( ${CATEGORY}/native-cctools >=${CATEGORY}/binutils-2.16 ) )
-	!kernel_Darwin? ( !kernel_AIX? ( !elibc_Interix? (
+	!kernel_Darwin? (
 		ppc? ( >=${CATEGORY}/binutils-2.17 )
 		ppc64? ( >=${CATEGORY}/binutils-2.17 )
 		>=${CATEGORY}/binutils-2.15.94
-	) ) )"
+	)"
 
 src_prepare() {
 	toolchain_src_prepare
@@ -73,46 +71,14 @@ src_prepare() {
 		eprefixify "${S}"/gcc/gcc.c
 	fi
 
-	# interix patch from http://gcc.gnu.org/bugzilla/show_bug.cgi?id=15212
-	epatch "${FILESDIR}"/4.2.2/interix-x86.patch.bz2
-	# gcc sources are polluted with old stuff for interix 3.5 not needed here
-	epatch "${FILESDIR}"/4.2.2/interix-3.5-x86.patch
-	# define _ALL_SOURCE by default on Interix
-	epatch "${FILESDIR}"/${P}-interix-all-source.patch
-	# support for the $@#$% dir structure on 64bit SUA
-	epatch "${FILESDIR}"/${P}-interix-x64-support.patch
-	# make long double be 64bit on intierx, as libc was built with VC++ (which
-	# has 64 bit long doubles).
-	epatch "${FILESDIR}"/${P}-interix-long-double.patch
-
 	if [[ ${CHOST} == *-mint* ]] ; then
 		epatch "${DISTDIR}"/gcc-4.2.3-mint.patch
 		epatch "${FILESDIR}"/gcc-4.2.3-mint2.patch
 	fi
 
-	# http://gcc.gnu.org/PR20366
-	epatch "${FILESDIR}"/${P}-aix-largefiles.patch
-
-	# Always behave on AIX as if:
-	#   -fPIC was passed (packages know that "everything on AIX is PIC")
-	#   -pthread was passed (#266548)
-	#   -Wl,-bsvr4 was passed (#213277 runtime linking, hold -L paths off the runpath)
-	#   -Wl,-G,-bernotok was passed for shared libraries (runtime linking, --no-undefined)
-	epatch "${FILESDIR}"/4.2.2/aix-force-pthread-r1.patch
-	epatch "${FILESDIR}"/4.2.2/aix-runtimelinking-r1.patch
-	echo '#define DRIVER_SELF_SPECS "-fPIC -pthread %x{-bsvr4} %{shared:%x{-G} %x{-bernotok}}"' \
-		>> "${S}"/gcc/config/rs6000/aix.h || die
-
 	# allow gcj compilation to succeed on platforms with libiconv
 	epatch "${FILESDIR}"/gcj-${PV}-iconvlink.patch
 
-	epatch "${FILESDIR}"/${PN}-4.2-pa-hpux-libgcc_s-soname.patch
-	epatch "${FILESDIR}"/${PN}-4.2-ia64-hpux-always-pthread.patch
-	epatch "${FILESDIR}"/4.2.2/pr26189-pa.patch
-	epatch "${FILESDIR}"/4.2.2/aix-bnoerok.patch
-	epatch "${FILESDIR}"/4.2.2/aix-lineno.patch
-	epatch "${FILESDIR}"/4.2.2/aix-pr46072.patch
-
 	# try /usr/lib32 in 32bit profile on x86_64-linux (needs --enable-multilib)
 	# but this does make sense in prefix only.
 	use prefix && epatch "${FILESDIR}"/${P}-linux-x86-on-amd64.patch
@@ -121,10 +87,6 @@ src_prepare() {
 
 	[[ ${CTARGET} == *-softfloat-* ]] && epatch "${FILESDIR}"/4.0.2/gcc-4.0.2-softfloat.patch
 
-	epatch "${FILESDIR}"/4.2.2/aix-minimal-toc.patch
-	epatch "${FILESDIR}"/4.2.2/aix61-longdouble64.patch
-	epatch "${FILESDIR}"/4.2.2/aix-soname.patch
-	epatch "${FILESDIR}"/4.2.2/aix-libssp.patch
 	epatch "${FILESDIR}"/4.2.2/ro-string.patch
 }
 
@@ -134,17 +96,6 @@ src_configure() {
 			# todo: some magic for native vs. GNU linking?
 			EXTRA_ECONF="${EXTRA_ECONF} --with-gnu-ld --with-gnu-as"
 		;;
-		*-aix*)
-			# AIX doesn't use GNU binutils, because it doesn't produce usable
-			# code
-			EXTRA_ECONF="${EXTRA_ECONF} --without-gnu-ld --without-gnu-as"
-			append-ldflags -Wl,-bbigtoc,-bmaxdata:0x10000000 # bug#194635
-		;;
-		*-darwin7)
-			# libintl triggers inclusion of -lc which results in multiply
-			# defined symbols, so disable nls
-			EXTRA_ECONF="${EXTRA_ECONF} --disable-nls"
-		;;
 		i[34567]86-*-linux*:*" prefix "*)
 			# to allow the linux-x86-on-amd64.patch become useful, we need
 			# to enable multilib, even if there is just one multilib option.
@@ -158,15 +109,6 @@ src_configure() {
 				CXX="${CC} -m32"
 			fi
 		;;
-		*-interix*" bootstrap "*)
-			# with suacomp, on interix, we need to have some header files
-			# available, which complement the system headers. adding this
-			# to CC/CXX is the only way to get a stage1 gcc built during
-			# bootstrap. the rest will work as normal.
-			tc-export CC CXX
-			CC="${CC} -I${EPREFIX}/usr/include"
-			CXX="${CXX} -I${EPREFIX}/usr/include"
-		;;
 	esac
 	# Since GCC 4.1.2 some non-posix (?) /bin/sh compatible code is used, at
 	# least on Solaris, and AIX /bin/sh is ways too slow,
@@ -179,17 +121,6 @@ src_configure() {
 src_install() {
 	toolchain_src_install
 
-	if [[ ${CTARGET} == *-interix* ]] && ! is_crosscompile; then
-		# interix delivers libdl and dlfcn.h with gcc-3.3.
-		# Since those parts are perfectly usable by this gcc (and
-		# required for example by perl), we simply can reuse them.
-		# As libdl is in /usr/lib, we only need to copy dlfcn.h.
-		# When cross compiling for interix once, ensure that sysroot
-		# contains dlfcn.h.
-		cp /opt/gcc.3.3/include/dlfcn.h "${ED}${INCLUDEPATH}" \
-		|| die "Cannot gain /opt/gcc.3.3/include/dlfcn.h"
-	fi
-
 	# create a small profile.d script, unsetting some of the bad
 	# environment variables that the system could set from the outside.
 	# (GCC_SPECS, GCC_EXEC_PREFIX, CPATH, LIBRARY_PATH, LD_LIBRARY_PATH,
@@ -211,4 +142,3 @@ src_install() {
 	insinto /etc/profile.d
 	doins "${T}"/00-gcc-paths.sh
 }
-

diff --git a/sys-devel/gcc/gcc-4.7.3-r1.ebuild b/sys-devel/gcc/gcc-4.7.3-r1.ebuild
index 527dcc3f45..5379d56552 100644
--- a/sys-devel/gcc/gcc-4.7.3-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.7.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.7.3-r1.ebuild,v 1.16 2014/01/19 01:51:34 dirtyepic Exp $
 
@@ -31,7 +31,6 @@ RDEPEND=""
 DEPEND="${RDEPEND}
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.8 ) )
 	kernel_Darwin? ( ${CATEGORY}/binutils-apple )
-	kernel_AIX? ( ${CATEGORY}/native-cctools )
 	kernel_linux? ( >=${CATEGORY}/binutils-2.18 )"
 
 if [[ ${CATEGORY} != cross-* ]] ; then
@@ -93,11 +92,6 @@ src_prepare() {
 		epatch "${FILESDIR}"/4.7.2/pr52714.patch
 	fi
 
-	# Always behave as if -pthread were passed on AIX and HPUX (#266548)
-# fails, likely still necessary though
-#	epatch "${FILESDIR}"/4.5.1/aix-force-pthread.patch
-#	epatch "${FILESDIR}"/4.5.1/ia64-hpux-always-pthread.patch
-
 	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
 }
 
@@ -114,27 +108,6 @@ src_configure() {
 			# todo: some magic for native vs. GNU linking?
 			EXTRA_ECONF="${EXTRA_ECONF} --with-gnu-ld --with-gnu-as"
 		;;
-		*-aix*)
-			# AIX doesn't use GNU binutils, because it doesn't produce usable
-			# code
-			EXTRA_ECONF="${EXTRA_ECONF} --without-gnu-ld --without-gnu-as"
-			append-ldflags -Wl,-bbigtoc,-bmaxdata:0x10000000 # bug#194635
-		;;
-		*-interix*)
-			# disable usage of poll() on interix, since poll() only
-			# works on the /proc filesystem (.......)
-			export glibcxx_cv_POLL=no
-
-			# if using the old system as, gcc's configure script fails
-			# to detect that as cannot handle .lcomm with alignment.
-			# on interix, it is rather easy to detect the as, since there
-			# is only _one_ build of it with a fixed date in the version
-			# header...
-			if as --version | grep 20021111 > /dev/null 2>&1; then
-				einfo "preventing gcc from detecting .lcomm alignment option in interix system as."
-				export gcc_cv_as_lcomm_with_alignment=no
-			fi
-		;;
 		i[34567]86-*-linux*:*" prefix "*)
 			# to allow the linux-x86-on-amd64.patch become useful, we need
 			# to enable multilib, even if there is just one multilib option.
@@ -161,25 +134,6 @@ src_configure() {
 src_install() {
 	toolchain_src_install
 
-	if [[ ${CTARGET} == *-interix* ]] && ! is_crosscompile; then
-		# interix delivers libdl and dlfcn.h with gcc-3.3.
-		# Since those parts are perfectly usable by this gcc (and
-		# required for example by perl), we simply can reuse them.
-		# As libdl is in /usr/lib, we only need to copy dlfcn.h.
-		# When cross compiling for interix once, ensure that sysroot
-		# contains dlfcn.h.
-		cp /opt/gcc.3.3/include/dlfcn.h "${ED}${INCLUDEPATH}" \
-		|| die "Cannot gain /opt/gcc.3.3/include/dlfcn.h"
-	fi
-
-	if [[ ${CTARGET} == *-interix3* ]]; then
-		# interix 3.5 has no stdint.h and no inttypes.h. This breaks
-		# so many packages, that i just install interix 5.2's stdint.h
-		# which should be ok.
-		cp "${FILESDIR}"/interix-3.5-stdint.h "${ED}${INCLUDEPATH}/stdint.h" \
-		|| die "Cannot install stdint.h for interix3"
-	fi
-
 	# create a small profile.d script, unsetting some of the bad
 	# environment variables that the sustem could set from the outside.
 	# (GCC_SPECS, GCC_EXEC_PREFIX, CPATH, LIBRARY_PATH, LD_LIBRARY_PATH,

diff --git a/sys-devel/gcc/gcc-4.8.5-r1.ebuild b/sys-devel/gcc/gcc-4.8.5-r1.ebuild
index 88fcbf6709..36bc87b575 100644
--- a/sys-devel/gcc/gcc-4.8.5-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.8.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -28,7 +28,6 @@ DEPEND="${RDEPEND}
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.8 ) )
 	kernel_linux? ( >=${CATEGORY}/binutils-2.20 )
 	kernel_Darwin? ( ${CATEGORY}/binutils-apple )
-	kernel_AIX? ( ${CATEGORY}/native-cctools )
 "
 
 if [[ ${CATEGORY} != cross-* ]] ; then
@@ -69,28 +68,6 @@ src_prepare() {
 
 	# make it have correct install_names on Darwin
 	epatch "${FILESDIR}"/4.3.3/darwin-libgcc_s-installname.patch
-	# filename based versioning of libgcc_s for AIX
-	epatch "${FILESDIR}"/gcc-4.8.4-aix-soname-libgcc.patch.xz
-	# let --with-specs=-pthread work for libgcc_s on AIX without multilib
-	epatch "${FILESDIR}"/gcc-4.8.4-aix-pthread-specs.patch
-	# drop -B flag when ./nm encounters -P
-	epatch "${FILESDIR}"/gcc-4.8.4-aix-soname-nm-weak.patch
-	# support --with-aix-soname=aix|both|svr4 for libtool libs
-	epatch "${FILESDIR}"/gcc-4.8.4-aix-soname-libtool.patch.xz
-	epatch "${FILESDIR}"/gcc-4.8.4-aix-soname-regen.patch.xz
-	epatch "${FILESDIR}"/gcc-4.8-aix-extref.patch # PR target/65058
-	if [[ ${CHOST} == *-aix* ]]; then
-		# -fPIC breaks stage2/3 comparison, use per-build random seed
-		local myseed=$(echo $(
-			head -c32 /dev/urandom | uuencode - | tr -d -c a-zA-Z0-9_+/.,
-		))
-		echo "STAGE2_CFLAGS += -frandom-seed=${myseed}" >> config/mh-ppc-aix
-		echo "STAGE3_CFLAGS += -frandom-seed=${myseed}" >> config/mh-ppc-aix
-		is_crosscompile ||
-		echo "CFLAGS_FOR_TARGET += -frandom-seed=${myseed}" >> config/mh-ppc-aix
-		# build large insn-*.o one at a time
-		epatch "${FILESDIR}"/gcc-4.8.4-lowmem-build.patch
-	fi
 
 	if [[ ${CHOST} == *-mint* ]] ; then
 		epatch "${FILESDIR}"/4.3.2/${PN}-4.3.2-mint3.patch
@@ -122,39 +99,6 @@ src_configure() {
 			# todo: some magic for native vs. GNU linking?
 			myconf+=( --with-gnu-ld --with-gnu-as )
 		;;
-		*-aix*)
-			# AIX doesn't use GNU binutils, because it doesn't produce usable
-			# code
-			myconf+=( --without-gnu-ld --without-gnu-as --disable-lto )
-			append-ldflags -Wl,-bbigtoc,-bmaxdata:0x10000000 # bug#194635
-			# we have backports of the aix-soname upstream patches
-			myconf+=( --with-aix-soname=svr4 )
-			# Always behave on AIX as if:
-			#   -fPIC was passed (packages know that "everything on AIX is PIC")
-			#   -pthread was passed (#266548)
-			#   -Wl,-bsvr4 was passed (runtime linking, hold -L paths off the runpath)
-			#   -Wl,-G,-bernotok was passed for shared libraries (runtime linking, --no-undefined)
-			myconf+=( --with-specs="-fPIC -pthread %x{-bsvr4} %{shared:%x{-G} %x{-bernotok}}" )
-		;;
-		ia64*-*-hpux*)
-			# Always behave as if -pthread were passed on HPUX (#266548)
-			myconf+=( --with-specs=-pthread )
-			;;
-		*-interix*)
-			# disable usage of poll() on interix, since poll() only
-			# works on the /proc filesystem (.......)
-			export glibcxx_cv_POLL=no
-
-			# if using the old system as, gcc's configure script fails
-			# to detect that as cannot handle .lcomm with alignment.
-			# on interix, it is rather easy to detect the as, since there
-			# is only _one_ build of it with a fixed date in the version
-			# header...
-			if as --version | grep 20021111 > /dev/null 2>&1; then
-				einfo "preventing gcc from detecting .lcomm alignment option in interix system as."
-				export gcc_cv_as_lcomm_with_alignment=no
-			fi
-		;;
 		i[34567]86-*-linux*:*" prefix "*)
 			# to allow the linux-x86-on-amd64.patch become useful, we need
 			# to enable multilib, even if there is just one multilib option.
@@ -175,26 +119,3 @@ src_configure() {
 	export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
 	toolchain_src_configure "${myconf[@]}"
 }
-
-src_install() {
-	toolchain_src_install
-
-	if [[ ${CTARGET} == *-interix* ]] && ! is_crosscompile; then
-		# interix delivers libdl and dlfcn.h with gcc-3.3.
-		# Since those parts are perfectly usable by this gcc (and
-		# required for example by perl), we simply can reuse them.
-		# As libdl is in /usr/lib, we only need to copy dlfcn.h.
-		# When cross compiling for interix once, ensure that sysroot
-		# contains dlfcn.h.
-		cp /opt/gcc.3.3/include/dlfcn.h "${ED}${INCLUDEPATH}" \
-		|| die "Cannot gain /opt/gcc.3.3/include/dlfcn.h"
-	fi
-
-	if [[ ${CTARGET} == *-interix3* ]]; then
-		# interix 3.5 has no stdint.h and no inttypes.h. This breaks
-		# so many packages, that i just install interix 5.2's stdint.h
-		# which should be ok.
-		cp "${FILESDIR}"/interix-3.5-stdint.h "${ED}${INCLUDEPATH}/stdint.h" \
-		|| die "Cannot install stdint.h for interix3"
-	fi
-}

diff --git a/sys-devel/gcc/gcc-4.9.4.ebuild b/sys-devel/gcc/gcc-4.9.4.ebuild
index 656da303d7..a3dd30c472 100644
--- a/sys-devel/gcc/gcc-4.9.4.ebuild
+++ b/sys-devel/gcc/gcc-4.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -28,7 +28,6 @@ DEPEND="${RDEPEND}
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.8 ) )
 	kernel_linux? ( >=${CATEGORY}/binutils-2.20 )
 	kernel_Darwin? ( ${CATEGORY}/binutils-apple )
-	kernel_AIX? ( ${CATEGORY}/native-cctools )
 "
 
 if [[ ${CATEGORY} != cross-* ]] ; then
@@ -55,11 +54,7 @@ src_prepare() {
 	use vanilla && return 0
 	# Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
 
-	# make sure solaris-x64 doesn't misdetect tls support, bug #505446
-	#epatch "${FILESDIR}"/4.7.2/solaris-x64-tls-gnu-as.patch
-
 	# make sure 64-bits native targets don't screw up the linker paths
-	#epatch "${FILESDIR}"/4.7.1/solaris-searchpath.patch
 	epatch "${FILESDIR}"/no-libs-for-startfile.patch
 	if use prefix; then
 		epatch "${FILESDIR}"/4.5.2/prefix-search-dirs.patch
@@ -70,28 +65,6 @@ src_prepare() {
 
 	# make it have correct install_names on Darwin
 	epatch "${FILESDIR}"/4.3.3/darwin-libgcc_s-installname.patch
-	# filename based versioning of libgcc_s for AIX
-	#epatch "${FILESDIR}"/gcc-4.8.4-aix-soname-libgcc.patch.xz
-	# let --with-specs=-pthread work for libgcc_s on AIX without multilib
-	#epatch "${FILESDIR}"/gcc-4.8.4-aix-pthread-specs.patch
-	# drop -B flag when ./nm encounters -P
-	#epatch "${FILESDIR}"/gcc-4.8.4-aix-soname-nm-weak.patch
-	# support --with-aix-soname=aix|both|svr4 for libtool libs
-	#epatch "${FILESDIR}"/gcc-4.8.4-aix-soname-libtool.patch.xz
-	#epatch "${FILESDIR}"/gcc-4.8.4-aix-soname-regen.patch.xz
-	#epatch "${FILESDIR}"/gcc-4.8-aix-extref.patch # PR target/65058
-	if [[ ${CHOST} == *-aix* ]]; then
-		# -fPIC breaks stage2/3 comparison, use per-build random seed
-		local myseed=$(echo $(
-			head -c32 /dev/urandom | uuencode - | tr -d -c a-zA-Z0-9_+/.,
-		))
-		echo "STAGE2_CFLAGS += -frandom-seed=${myseed}" >> config/mh-ppc-aix
-		echo "STAGE3_CFLAGS += -frandom-seed=${myseed}" >> config/mh-ppc-aix
-		is_crosscompile ||
-		echo "CFLAGS_FOR_TARGET += -frandom-seed=${myseed}" >> config/mh-ppc-aix
-		# build large insn-*.o one at a time
-		epatch "${FILESDIR}"/gcc-4.8.4-lowmem-build.patch
-	fi
 
 	if [[ ${CHOST} == *-mint* ]] ; then
 		epatch "${FILESDIR}"/4.3.2/${PN}-4.3.2-mint3.patch
@@ -123,39 +96,6 @@ src_configure() {
 			# todo: some magic for native vs. GNU linking?
 			myconf+=( --with-gnu-ld --with-gnu-as )
 		;;
-		*-aix*)
-			# AIX doesn't use GNU binutils, because it doesn't produce usable
-			# code
-			myconf+=( --without-gnu-ld --without-gnu-as --disable-lto )
-			append-ldflags -Wl,-bbigtoc,-bmaxdata:0x10000000 # bug#194635
-			# we have backports of the aix-soname upstream patches
-			myconf+=( --with-aix-soname=svr4 )
-			# Always behave on AIX as if:
-			#   -fPIC was passed (packages know that "everything on AIX is PIC")
-			#   -pthread was passed (#266548)
-			#   -Wl,-bsvr4 was passed (runtime linking, hold -L paths off the runpath)
-			#   -Wl,-G,-bernotok was passed for shared libraries (runtime linking, --no-undefined)
-			myconf+=( --with-specs="-fPIC -pthread %x{-bsvr4} %{shared:%x{-G} %x{-bernotok}}" )
-		;;
-		ia64*-*-hpux*)
-			# Always behave as if -pthread were passed on HPUX (#266548)
-			myconf+=( --with-specs=-pthread )
-			;;
-		*-interix*)
-			# disable usage of poll() on interix, since poll() only
-			# works on the /proc filesystem (.......)
-			export glibcxx_cv_POLL=no
-
-			# if using the old system as, gcc's configure script fails
-			# to detect that as cannot handle .lcomm with alignment.
-			# on interix, it is rather easy to detect the as, since there
-			# is only _one_ build of it with a fixed date in the version
-			# header...
-			if as --version | grep 20021111 > /dev/null 2>&1; then
-				einfo "preventing gcc from detecting .lcomm alignment option in interix system as."
-				export gcc_cv_as_lcomm_with_alignment=no
-			fi
-		;;
 		i[34567]86-*-linux*:*" prefix "*)
 			# to allow the linux-x86-on-amd64.patch become useful, we need
 			# to enable multilib, even if there is just one multilib option.
@@ -176,26 +116,3 @@ src_configure() {
 	export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
 	toolchain_src_configure "${myconf[@]}"
 }
-
-src_install() {
-	toolchain_src_install
-
-	if [[ ${CTARGET} == *-interix* ]] && ! is_crosscompile; then
-		# interix delivers libdl and dlfcn.h with gcc-3.3.
-		# Since those parts are perfectly usable by this gcc (and
-		# required for example by perl), we simply can reuse them.
-		# As libdl is in /usr/lib, we only need to copy dlfcn.h.
-		# When cross compiling for interix once, ensure that sysroot
-		# contains dlfcn.h.
-		cp /opt/gcc.3.3/include/dlfcn.h "${ED}${INCLUDEPATH}" \
-		|| die "Cannot gain /opt/gcc.3.3/include/dlfcn.h"
-	fi
-
-	if [[ ${CTARGET} == *-interix3* ]]; then
-		# interix 3.5 has no stdint.h and no inttypes.h. This breaks
-		# so many packages, that i just install interix 5.2's stdint.h
-		# which should be ok.
-		cp "${FILESDIR}"/interix-3.5-stdint.h "${ED}${INCLUDEPATH}/stdint.h" \
-		|| die "Cannot install stdint.h for interix3"
-	fi
-}

diff --git a/sys-devel/gcc/gcc-5.4.0-r4.ebuild b/sys-devel/gcc/gcc-5.4.0-r4.ebuild
index 5c7b566a76..e98d8d8b50 100644
--- a/sys-devel/gcc/gcc-5.4.0-r4.ebuild
+++ b/sys-devel/gcc/gcc-5.4.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -29,7 +29,6 @@ DEPEND="${RDEPEND}
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.8 ) )
 	kernel_linux? ( >=${CATEGORY}/binutils-2.20 )
 	kernel_Darwin? ( ${CATEGORY}/binutils-apple )
-	kernel_AIX? ( ${CATEGORY}/native-cctools )
 "
 
 if [[ ${CATEGORY} != cross-* ]] ; then
@@ -59,7 +58,6 @@ src_prepare() {
 	#epatch "${FILESDIR}"/4.7.2/solaris-x64-tls-gnu-as.patch
 
 	# make sure 64-bits native targets don't screw up the linker paths
-	#epatch "${FILESDIR}"/4.7.1/solaris-searchpath.patch
 	epatch "${FILESDIR}"/no-libs-for-startfile.patch
 	epatch "${FILESDIR}"/${P}-libc_name_p.patch #631976
 	if use prefix; then
@@ -71,28 +69,6 @@ src_prepare() {
 
 	# make it have correct install_names on Darwin
 	epatch "${FILESDIR}"/4.3.3/darwin-libgcc_s-installname.patch
-	# filename based versioning of libgcc_s for AIX
-	#epatch "${FILESDIR}"/gcc-4.8.4-aix-soname-libgcc.patch.xz
-	# let --with-specs=-pthread work for libgcc_s on AIX without multilib
-	#epatch "${FILESDIR}"/gcc-4.8.4-aix-pthread-specs.patch
-	# drop -B flag when ./nm encounters -P
-	#epatch "${FILESDIR}"/gcc-4.8.4-aix-soname-nm-weak.patch
-	# support --with-aix-soname=aix|both|svr4 for libtool libs
-	#epatch "${FILESDIR}"/gcc-4.8.4-aix-soname-libtool.patch.xz
-	#epatch "${FILESDIR}"/gcc-4.8.4-aix-soname-regen.patch.xz
-	#epatch "${FILESDIR}"/gcc-4.8-aix-extref.patch # PR target/65058
-	if [[ ${CHOST} == *-aix* ]]; then
-		# -fPIC breaks stage2/3 comparison, use per-build random seed
-		local myseed=$(echo $(
-			head -c32 /dev/urandom | uuencode - | tr -d -c a-zA-Z0-9_+/.,
-		))
-		echo "STAGE2_CFLAGS += -frandom-seed=${myseed}" >> config/mh-ppc-aix
-		echo "STAGE3_CFLAGS += -frandom-seed=${myseed}" >> config/mh-ppc-aix
-		is_crosscompile ||
-		echo "CFLAGS_FOR_TARGET += -frandom-seed=${myseed}" >> config/mh-ppc-aix
-		# build large insn-*.o one at a time
-		epatch "${FILESDIR}"/gcc-4.8.4-lowmem-build.patch
-	fi
 
 	if [[ ${CHOST} == *-mint* ]] ; then
 		epatch "${FILESDIR}"/4.3.2/${PN}-4.3.2-mint3.patch
@@ -110,9 +86,6 @@ src_prepare() {
 	# upstream shipped since gcc-6.1.0.
 	find libstdc++-v3 -name Makefile.in -exec sed -i -e \
 		'/^AM_CPPFLAGS = \$(GLIBCXX_INCLUDES)$/s/$/ $(CPPFLAGS)/p' {} +
-
-	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
-	#[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
 }
 
 src_configure() {
@@ -129,39 +102,6 @@ src_configure() {
 			# todo: some magic for native vs. GNU linking?
 			myconf+=( --with-gnu-ld --with-gnu-as --enable-largefile )
 		;;
-		*-aix*)
-			# AIX doesn't use GNU binutils, because it doesn't produce usable
-			# code
-			myconf+=( --without-gnu-ld --without-gnu-as --disable-lto )
-			append-ldflags -Wl,-bbigtoc,-bmaxdata:0x10000000 # bug#194635
-			# we have backports of the aix-soname upstream patches
-			myconf+=( --with-aix-soname=svr4 )
-			# Always behave on AIX as if:
-			#   -fPIC was passed (packages know that "everything on AIX is PIC")
-			#   -pthread was passed (#266548)
-			#   -Wl,-bsvr4 was passed (runtime linking, hold -L paths off the runpath)
-			#   -Wl,-G,-bernotok was passed for shared libraries (runtime linking, --no-undefined)
-			myconf+=( --with-specs="-fPIC -pthread %x{-bsvr4} %{shared:%x{-G} %x{-bernotok}}" )
-		;;
-		ia64*-*-hpux*)
-			# Always behave as if -pthread were passed on HPUX (#266548)
-			myconf+=( --with-specs=-pthread )
-			;;
-		*-interix*)
-			# disable usage of poll() on interix, since poll() only
-			# works on the /proc filesystem (.......)
-			export glibcxx_cv_POLL=no
-
-			# if using the old system as, gcc's configure script fails
-			# to detect that as cannot handle .lcomm with alignment.
-			# on interix, it is rather easy to detect the as, since there
-			# is only _one_ build of it with a fixed date in the version
-			# header...
-			if as --version | grep 20021111 > /dev/null 2>&1; then
-				einfo "preventing gcc from detecting .lcomm alignment option in interix system as."
-				export gcc_cv_as_lcomm_with_alignment=no
-			fi
-		;;
 		i[34567]86-*-linux*:*" prefix "*)
 			# to allow the linux-x86-on-amd64.patch become useful, we need
 			# to enable multilib, even if there is just one multilib option.
@@ -182,26 +122,3 @@ src_configure() {
 	export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
 	toolchain_src_configure "${myconf[@]}"
 }
-
-src_install() {
-	toolchain_src_install
-
-	if [[ ${CTARGET} == *-interix* ]] && ! is_crosscompile; then
-		# interix delivers libdl and dlfcn.h with gcc-3.3.
-		# Since those parts are perfectly usable by this gcc (and
-		# required for example by perl), we simply can reuse them.
-		# As libdl is in /usr/lib, we only need to copy dlfcn.h.
-		# When cross compiling for interix once, ensure that sysroot
-		# contains dlfcn.h.
-		cp /opt/gcc.3.3/include/dlfcn.h "${ED}${INCLUDEPATH}" \
-		|| die "Cannot gain /opt/gcc.3.3/include/dlfcn.h"
-	fi
-
-	if [[ ${CTARGET} == *-interix3* ]]; then
-		# interix 3.5 has no stdint.h and no inttypes.h. This breaks
-		# so many packages, that i just install interix 5.2's stdint.h
-		# which should be ok.
-		cp "${FILESDIR}"/interix-3.5-stdint.h "${ED}${INCLUDEPATH}/stdint.h" \
-		|| die "Cannot install stdint.h for interix3"
-	fi
-}

diff --git a/sys-devel/gcc/gcc-6.4.0-r2.ebuild b/sys-devel/gcc/gcc-6.4.0-r2.ebuild
index 90607ab35b..cdf69fdfb8 100644
--- a/sys-devel/gcc/gcc-6.4.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-6.4.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,15 +9,13 @@ CYGWINPORTS_GITREV="a03d77536f40d1a6335b6d313a4e4a4dff38ce66" # gcc-6.4.0-3
 
 inherit eutils toolchain flag-o-matic
 
-#KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.13 ) )
 	kernel_linux? ( >=${CATEGORY}/binutils-2.20 )
-	kernel_Darwin? ( ${CATEGORY}/binutils-apple )
-	kernel_AIX? ( ${CATEGORY}/native-cctools )"
+	kernel_Darwin? ( ${CATEGORY}/binutils-apple )"
 
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.13 ) )"

diff --git a/sys-devel/gcc/gcc-7.3.0-r6.ebuild b/sys-devel/gcc/gcc-7.3.0-r6.ebuild
deleted file mode 100644
index c6d17395b3..0000000000
--- a/sys-devel/gcc/gcc-7.3.0-r6.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.8"
-#UCLIBC_VER="1.0"
-CYGWINPORTS_GITREV="d83e3d1ac0a9adfacdf120f013870472e8e712c3" # gcc-7.3.0
-
-inherit eutils toolchain flag-o-matic
-
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.13 ) )
-	kernel_linux? ( >=${CATEGORY}/binutils-2.20 )
-	kernel_Darwin? ( ${CATEGORY}/binutils-apple )
-	kernel_AIX? ( ${CATEGORY}/native-cctools )"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.13 ) )"
-fi
-
-src_prepare() {
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	# make sure 64-bits native targets don't screw up the linker paths
-	epatch "${FILESDIR}"/no-libs-for-startfile.patch
-	if use prefix; then
-		epatch "${FILESDIR}"/4.5.2/prefix-search-dirs.patch
-		# try /usr/lib32 in 32bit profile on x86_64-linux (needs
-		# --enable-multilib), but this does make sense in prefix only
-		epatch "${FILESDIR}"/${PN}-4.8.3-linux-x86-on-amd64.patch
-	fi
-
-	# make it have correct install_names on Darwin
-	epatch "${FILESDIR}"/4.3.3/darwin-libgcc_s-installname.patch
-
-	# fix for powerpc-darwin, from upstream, fixed for 7.4
-	epatch "${FILESDIR}"/${P}-powerpc-darwin.patch
-}
-
-src_configure() {
-	local myconf=()
-	case ${CTARGET}:" ${USE} " in
-		powerpc*-darwin*)
-			# bug #381179
-			filter-flags "-mcpu=*" "-mtune=*"
-			# bug #657522
-			# A bug in configure checks whether -no-pie works, but the
-			# compiler doesn't pass -no-pie onto the linker if -fno-PIE
-			# isn't passed, so the configure check always finds -no-pie
-			# is accepted.  (Likewise, when -fno-PIE is passed, the
-			# compiler passes -no_pie onto the linker.)
-			# Since our linker doesn't grok this, avoid above checks to
-			# be run
-			# NOTE: later ld64 does grok -no_pie, not -no-pie (as checked)
-			export gcc_cv_c_no_fpie=no
-			export gcc_cv_no_pie=no
-		;;
-		*-solaris*)
-			# todo: some magic for native vs. GNU linking?
-			myconf+=( --with-gnu-ld --with-gnu-as --enable-largefile )
-			# Solaris 11 defines this in its headers, but that causes a
-			# mismatch whilst compiling, bug #657514
-			export ac_cv_func_aligned_alloc=no
-			export ac_cv_func_memalign=no
-			export ac_cv_func_posix_memalign=no
-		;;
-		i[34567]86-*-linux*:*" prefix "*)
-			# to allow the linux-x86-on-amd64.patch become useful, we need
-			# to enable multilib, even if there is just one multilib option.
-			myconf+=( --enable-multilib )
-			if [[ ${CBUILD:-${CHOST}} == "${CHOST}" ]]; then
-				# we might be on x86_64-linux, but don't do cross-compile, so
-				# tell the host-compiler to really create 32bits (for stage1)
-				# (real x86-linux-gcc also accept -m32).
-				append-flags -m32
-			fi
-		;;
-	esac
-
-	# Since GCC 4.1.2 some non-posix (?) /bin/sh compatible code is used, at
-	# least on Solaris, and AIX /bin/sh is way too slow,
-	# so force it to use $BASH (that portage uses) - it can't be EPREFIX
-	# in case that doesn't exist yet
-	export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
-	toolchain_src_configure "${myconf[@]}"
-}

diff --git a/sys-devel/gcc/gcc-7.4.0.ebuild b/sys-devel/gcc/gcc-7.4.0.ebuild
index 207bc01b30..c1ad3f6c2f 100644
--- a/sys-devel/gcc/gcc-7.4.0.ebuild
+++ b/sys-devel/gcc/gcc-7.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,8 +14,7 @@ RDEPEND=""
 DEPEND="${RDEPEND}
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.13 ) )
 	kernel_linux? ( >=${CATEGORY}/binutils-2.20 )
-	kernel_Darwin? ( ${CATEGORY}/binutils-apple )
-	kernel_AIX? ( ${CATEGORY}/native-cctools )"
+	kernel_Darwin? ( ${CATEGORY}/binutils-apple )"
 
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.13 ) )"

diff --git a/sys-devel/gcc/gcc-8.2.0-r5.ebuild b/sys-devel/gcc/gcc-8.2.0-r5.ebuild
deleted file mode 100644
index ad49175f0e..0000000000
--- a/sys-devel/gcc/gcc-8.2.0-r5.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.6"
-#UCLIBC_VER="1.0"
-#CYGWINPORTS_GITREV="d83e3d1ac0a9adfacdf120f013870472e8e712c3" # gcc-7.3.0
-
-inherit eutils toolchain flag-o-matic
-
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.13 ) )
-	kernel_linux? ( >=${CATEGORY}/binutils-2.20 )
-	kernel_Darwin? ( ${CATEGORY}/binutils-apple )
-	kernel_AIX? ( ${CATEGORY}/native-cctools )"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.13 ) )"
-fi
-
-src_prepare() {
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	# make sure 64-bits native targets don't screw up the linker paths
-	epatch "${FILESDIR}"/no-libs-for-startfile.patch
-	if use prefix; then
-		epatch "${FILESDIR}"/4.5.2/prefix-search-dirs.patch
-		# try /usr/lib32 in 32bit profile on x86_64-linux (needs
-		# --enable-multilib), but this does make sense in prefix only
-		epatch "${FILESDIR}"/${PN}-4.8.3-linux-x86-on-amd64.patch
-	fi
-
-	# make it have correct install_names on Darwin
-	epatch "${FILESDIR}"/4.3.3/darwin-libgcc_s-installname.patch
-
-	if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=44107
-		sed -i -e 's|^ifeq (/usr/lib,|ifneq (/usr/lib,|' \
-			libgcc/config/t-slibgcc-darwin || die
-	fi
-}
-
-src_configure() {
-	local myconf=()
-	case ${CTARGET}:" ${USE} " in
-		powerpc*-darwin*)
-			# bug #381179
-			filter-flags "-mcpu=*" "-mtune=*"
-			# bug #657522
-			# A bug in configure checks whether -no-pie works, but the
-			# compiler doesn't pass -no-pie onto the linker if -fno-PIE
-			# isn't passed, so the configure check always finds -no-pie
-			# is accepted.  (Likewise, when -fno-PIE is passed, the
-			# compiler passes -no_pie onto the linker.)
-			# Since our linker doesn't grok this, avoid above checks to
-			# be run
-			# NOTE: later ld64 does grok -no_pie, not -no-pie (as checked)
-			export gcc_cv_c_no_fpie=no
-			export gcc_cv_no_pie=no
-		;;
-		*-solaris*)
-			# todo: some magic for native vs. GNU linking?
-			myconf+=( --with-gnu-ld --with-gnu-as --enable-largefile )
-			# Solaris 11 defines this in its headers, but that causes a
-			# mismatch whilst compiling, bug #657514
-			export ac_cv_func_aligned_alloc=no
-			export ac_cv_func_memalign=no
-			export ac_cv_func_posix_memalign=no
-		;;
-		i[34567]86-*-linux*:*" prefix "*)
-			# to allow the linux-x86-on-amd64.patch become useful, we need
-			# to enable multilib, even if there is just one multilib option.
-			myconf+=( --enable-multilib )
-			if [[ ${CBUILD:-${CHOST}} == "${CHOST}" ]]; then
-				# we might be on x86_64-linux, but don't do cross-compile, so
-				# tell the host-compiler to really create 32bits (for stage1)
-				# (real x86-linux-gcc also accept -m32).
-				append-flags -m32
-			fi
-		;;
-	esac
-
-	# Since GCC 4.1.2 some non-posix (?) /bin/sh compatible code is used, at
-	# least on Solaris, and AIX /bin/sh is way too slow,
-	# so force it to use $BASH (that portage uses) - it can't be EPREFIX
-	# in case that doesn't exist yet
-	export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
-	toolchain_src_configure "${myconf[@]}"
-}

diff --git a/sys-devel/gcc/gcc-8.3.0.ebuild b/sys-devel/gcc/gcc-8.3.0.ebuild
index 9fd18b937f..2da9f162cf 100644
--- a/sys-devel/gcc/gcc-8.3.0.ebuild
+++ b/sys-devel/gcc/gcc-8.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,8 +14,7 @@ RDEPEND=""
 DEPEND="${RDEPEND}
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.13 ) )
 	kernel_linux? ( >=${CATEGORY}/binutils-2.20 )
-	kernel_Darwin? ( ${CATEGORY}/binutils-apple )
-	kernel_AIX? ( ${CATEGORY}/native-cctools )"
+	kernel_Darwin? ( ${CATEGORY}/binutils-apple )"
 
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.13 ) )"

diff --git a/sys-devel/gcc/gcc-9.2.0-r3.ebuild b/sys-devel/gcc/gcc-9.2.0-r3.ebuild
index 5956e684c1..6d345e0357 100644
--- a/sys-devel/gcc/gcc-9.2.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-9.2.0-r3.ebuild
@@ -13,8 +13,7 @@ RDEPEND=""
 DEPEND="${RDEPEND}
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.13 ) )
 	kernel_linux? ( >=${CATEGORY}/binutils-2.20 )
-	kernel_Darwin? ( ${CATEGORY}/binutils-apple )
-	kernel_AIX? ( ${CATEGORY}/native-cctools )"
+	kernel_Darwin? ( ${CATEGORY}/binutils-apple )"
 
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.13 ) )"