[gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils-apple/

[Fabian Groffen]

commit:     9ca9f406cf625ed40286adc4b900d3ca46eb41df
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 11:31:20 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 11:31:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ca9f406

sys-devel/binutils-apple: drop sys-libs/tapi dependency

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sys-devel/binutils-apple/Manifest                  |   4 -
 .../binutils-apple/binutils-apple-11.3.1-r1.ebuild | 378 ---------------------
 .../binutils-apple/binutils-apple-8.2.1-r1.ebuild  |  18 +-
 .../binutils-apple-8.2.1-r101.ebuild               |   8 +-
 sys-devel/binutils-apple/metadata.xml              |   1 -
 5 files changed, 17 insertions(+), 392 deletions(-)

diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index a6468db7cc6c..718995f313cf 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -1,4 +1,3 @@
-DIST binutils-apple-patches-11.3-r1.tar.bz2 9041 BLAKE2B c881117e19e119173dd8c126859f8ebab5ff4024697c9650b8ba145c021aa6e251086d3678d80fec2672e78637a5beca795b71ae871692e832ba4e69a7a8e04c SHA512 eda63cd89f67674556dc75de719cd318f534544db50165d4faac454f67c557c9944e7e024c4443e640f987ed8c8826ccd578427743a86d7220c2ba90ed2206d4
 DIST binutils-apple-patches-3.2.6-r0.tar.bz2 3500 BLAKE2B f10dcf71400ea5d4bf7efb8ad906240765cfb56743274b3e1684eeb4273a35171aa4202d475920cff2c5c39e89f9bd1d7e5b0d38ba6c2b4705b0a592ba47e063 SHA512 4ccb8ebd49ac8eac4dbd0c1f24ee1836f216efd2e9e15b13072cbc76d8f83fbf4f1f6b3b60736bf5d5482af3e49ec1eaedfce8dd0ce1e949f915faf9c92ee0ea
 DIST binutils-apple-patches-4.3-r1.tar.bz2 37363 BLAKE2B a5ad04d4bf746a864f03a25d052197ed9a6ecada1f34460f4e38bea8cd87dfe2cb6c7f99f2096acac2231cd1e0c13c53757854b07f729a7a0c5a162a908fbe83 SHA512 f5d64ad182891c3af971e6aabd3c0c1b717b6a1cb471632339cba61b41a998d15880d18de09aafa1c3d059e528c888d6e8b914025c79bc21897d90a6d0e2ebf5
 DIST binutils-apple-patches-5.1-r2.tar.bz2 51642 BLAKE2B 1b44020a05e0a91cfe569273f1e3dc65afaeac4bcdb80a626bdcc1f30cf8fbba6cc7bb522ece93126d4035b2d309defefd17fe0cee5bcaadcc58c4fa0feb4827 SHA512 37ba0dcae6c10b54a07c6208f6893ab80b0de1bd1c2f677902f707c8290629f7671a481e256b57a18bf304b95e41e4d59519bc1c88f15de488c0ef7e142f5cd8
@@ -6,12 +5,9 @@ DIST binutils-apple-patches-7.3-r2.tar.bz2 44551 BLAKE2B 036cd2a2e4a66b046467f29
 DIST binutils-apple-patches-8.2-r1.tar.bz2 10830 BLAKE2B 345db8619873e9e91b79c3fdc0685fc46f82366df0b6153c1a59fbe5c122622e799754397e980e8752ef01ef25bbac81bb8f0339e92168790211b1d9c03bef2d SHA512 e7ca8cbac75671846c044abcd5415cfcf5832ff71acd5a2799b643369b02f2f7148990398c51913a3758e589f9fbff875e333aadf568e2a8a2defeafaa2aca95
 DIST cctools-795.tar.gz 1993795 BLAKE2B dc0915f8647eecba5352e34dfc5752b679df39ead9a4734c49955a824d2cc127308eed46a614665dfe08a9d3036eb37f587e1b765a7df727facc42a33befacb0 SHA512 5a34a73dc71d3574a357f6b0f26a48a99dd0995d62695b309cdfe85c4960934b410455b1ba6bdbc9a4e32106bb45b35555604975d2a80ad1be21f5d4eac69254
 DIST cctools-895.tar.gz 1716126 BLAKE2B 9706a6b243518693888e5e21dfe8d83b217380b47db621a7f1b35105eb72fb8997353ff85133224b0856f6b6ec710f54a4fe79076d9e228f89c98b6f517de309 SHA512 4ef9db870385cc2c4263bcbe42ff0de80386771f5acbc7082a1818ecd6b8d7bb1bfa02a7fcfecd3e7281481aeaaac4c331359aca3564bfe7a4c7dea1e0d06126
-DIST cctools-949.0.1.tar.gz 1968671 BLAKE2B b38fbae5d2ec011a94c2e4ec299c1ecd173f2c2516664cf925b06aaa078e234b59068158ea29dfcbf763ca98c73bc1806a507fbbe49a8d4d0a2fd4e602f401ce SHA512 13c493a48852c980d2829d28616c18640ad5ebfe6acd55143c4c948665e0b65377a459560667074fdac5e69bb6360fea13d988303c49fd3dd4a58e9b5c54ebcb
 DIST darwin-xtools-8.2.1-r101.tar.gz 3105898 BLAKE2B 3516cd252d4880b1e80c76365efef6f96830578bb5512befe33f86decdeb026fbad17fd3b27e9c3cf20d100897002e86ec08822041baa0291bb53e0b0ecf4d10 SHA512 f84cbde0853c14f03af40a124133d71d3e1710da021a593336eb4351c60edbca5753af0780f269ed4716cd194973f5437d428c5ff9615d9ce025dba3b7daef77
 DIST dyld-132.13.tar.gz 342690 BLAKE2B 011418ba5b91a28bb7c5f8188af2fac5478bad53581396b7c1c4623a854a8f0d5ecb92d023246157830ed2db83bbf28e23225a255188e2d07eeb6c933814bda6 SHA512 2c9d50fc32868b696d88730eb6ea6afa9bb9f56883cc2ea4f1d41f370f311b7487a29ce0eff6761e1eeb086a18e2513953989d8d5d3ef1043bb662e86baadd3f
 DIST dyld-421.2.tar.gz 625173 BLAKE2B 8f8325314861ae2ea10fbe78c74c7199b547973ac61a8e9cb76fb874a0e53395ea31c04e489f85ac7cfdb5715ae5051679453de75eb195e313113e7bbbc70340 SHA512 75f2fb840da980d44649aa3e045f50c4e37d4403fbdb1e2e5f1a85bf6d8859e1130053c3806f7ef992fdfc6573f7f18146263c690144bdd3df31452c6bdd8bd8
-DIST dyld-551.4.tar.gz 832297 BLAKE2B e65c5b2ed90af6ec94f1295efc984404af99f0e5dc666bfc854379f13fd2e98b8048fae84b7bc8864fe27112abf12f741a33cc404b18ae7c88b7abd6a1d9e3c6 SHA512 896281c4b2330c92ed538af58f1b60906ed0a9ffa3099a5e8ef9a15b7ed974259bf546fd2ab7562739f2c8cf1fdfb44ea0ea7567092c77f2ea2cab377da064b0
 DIST ld64-274.2.tar.gz 671652 BLAKE2B f45bb65bbe65c7baff54dec633a49b8ea472a59a7978aa050b329132963b26e4a2b3ef3dd034b04247531a11a07de5135b3726a429165cbfcae50e06c09531f4 SHA512 7b4e17f199909450b697bf719564c6841d46f5116c48dd47ff483ae7ddfe2965db1b7c024ed8ebeeaf90cd983ed353b95f7f23c93c8971536977dc892e6d6a9d
-DIST ld64-530.tar.gz 744871 BLAKE2B 8117160ffe55c02b463559a52fcbd109629d6e2b4707f36391ec2151785cc1ab5be911129397af7bea05f06b2c718bc345a1e3b6b0838dae943f4083612af38f SHA512 0197ec05f9fbaf9e1902bb6e0819d0562573a433e0445809f1020e76126d3af57222a8e9e187fce793a5b581f825b48bfb5ec5cca9ae3eb77758cbc7f20e9e20
 DIST ld64-97.17.tar.gz 421947 BLAKE2B 56820ef28490f2e0181d6e36b87506c6f00ae5759afe304a063fb6bd1904ace566ef4aa69ff0d235d65968af547a1a5735cb23bcefa990f418740188d399b637 SHA512 841774a1a7c0e2f661ac7e66703f7578d8f11274897ffa15f8c49daf290a23465763f264a4dae99f15754891f44c425c0d327652112007b499bc8f755a7fc9d6
 DIST libunwind-30.tar.gz 82811 BLAKE2B 26993d6afa6930931c01b579326964a66832ed7a6ffa26eff10016c8d6d175d3b671753cf8700dcdbae7f0a9c01b16e9cbd3c9fe86697608f1f08a8eceb64782 SHA512 57106eafa1516791b4e0db2de6c6336bc0c1cbd8bf098a6d3a809fafa457802c95a7aeae9137f4ca5922a3018dfd8f597907ea4187b0afbbf267500eae00041f

diff --git a/sys-devel/binutils-apple/binutils-apple-11.3.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-11.3.1-r1.ebuild
deleted file mode 100644
index 42f2f2808cb7..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-11.3.1-r1.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic toolchain-funcs llvm prefix
-
-# versions:
-# XCode-11.3.1                 ld64-530        cctools-949.0.1
-# XCode-11.2.1                 ld64-520        cctools-949.0.1
-# XCode-11.0                   ld64-512.4      cctools-949.0.1
-# XCode-8.2.1                  ld64-274.2      cctools-895         <== binutils-apple-8.2.1-r1  (2019)
-
-# macOS-10.15.6                dyld-750.6                          Causes build failures with Xcode-11 tools
-# macOS-10.14.4-10.14.6        dyld-655.1.1                        Causes build failures with Xcode-11 tools
-# macOS-10.13.6                dyld-551.4
-# macOS-10.12.1-10.12.3        dyld-421.2                          <== binutils-apple-8.2.1-r1,8.1
-
-LD64=ld64-530
-CCTOOLS_VERSION=949.0.1
-CCTOOLS=cctools-${CCTOOLS_VERSION}
-DYLD=dyld-551.4
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools ${PV}"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
-	http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
-	http://www.opensource.apple.com/tarballs/dyld/${DYLD}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-4.3-r1.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-5.1-r2.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-7.3-r2.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-8.2-r1.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-11.3-r1.tar.bz2"
-
-LICENSE="APSL-2"
-KEYWORDS="~x64-macos"
-IUSE="lto classic test" # tapi is now required
-RESTRICT="!test? ( test )"
-
-# ld64 can now only be compiled using llvm and libc++ since it massively uses
-# C++11 language features. *But additionally* the as driver now defaults to
-# calling clang as the assembler on many platforms. This can be disabled using
-# -Wa,-Q but since it's default we make llvm a static runtime dependency.
-RDEPEND="sys-devel/binutils-config
-	lto? ( app-arch/xar )
-	sys-libs/tapi
-	sys-devel/llvm:*
-	sys-libs/libcxx"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/perl-5.8.8 )"
-
-SLOT="11"
-
-S=${WORKDIR}
-
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-llvm_pkg_setup() {
-	# eclass version will die if no LLVM can be found which will break prefix
-	# bootstrap
-	:
-}
-
-src_prepare() {
-	cd "${S}"/${LD64}/src
-	cp "${S}"/ld64-136-compile_stubs.h ld/compile_stubs.h
-	cp "${S}"/ld64-530-Makefile Makefile
-
-	epatch "${S}"/ld64-530-nolto.patch
-	epatch "${S}"/ld64-236.3-crashreporter.patch
-
-	# workound llvm-3.9.{0,1} issue
-	# https://bugs.gentoo.org/show_bug.cgi?id=603580
-	# https://groups.google.com/forum/#!topic/llvm-dev/JY6nuKE__sU
-	# http://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20160829/169553.html
-	sed -i -e '/COMPILE_TIME_ASSERT/d' ld/parsers/libunwind/*.hpp || die
-
-	# provide missing headers dyld
-	mkdir -p include/mach-o || die
-	# never present because it's private
-	cp ../../${DYLD}/include/mach-o/dyld_priv.h include/mach-o || die
-	# TARGET_OS_BRIDGE is undefined in TargetConditionals.h of newer MacOSX.sdk.
-	# We don't target BridgeOS. Disable it to avoid errors when clang adds:
-	# -Werror,-Wundef-prefix=TARGET_OS_
-	sed -i -e 's/#if TARGET_OS_BRIDGE/#if 0/' include/mach-o/dyld_priv.h
-
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	cd "${S}"/${CCTOOLS}
-	epatch "${S}"/${PN}-4.5-as.patch
-	epatch "${S}"/${PN}-5.1-as-dir.patch
-	epatch "${S}"/${PN}-5.1-ranlib.patch
-	epatch "${S}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${S}"/${PN}-3.1.1-no-headers.patch
-	epatch "${S}"/${PN}-4.0-no-oss-dir.patch
-	epatch "${S}"/cctools-839-intel-retf.patch
-	epatch "${S}"/${PN}-5.1-extraneous-includes.patch
-	epatch "${S}"/${PN}-5.1-strnlen.patch
-	epatch "${S}"/${PN}-7.3-make-j.patch
-	epatch "${S}"/${PN}-11.3.1-no-developertools-dir.patch
-	epatch "${S}"/${PN}-11.3.1-llvm-prefix.patch
-	epatch "${S}"/${PN}-11.3.1-llvm-shim.patch
-	epatch "${S}"/${PN}-11.3.1-nolto-fix.patch # bugfix
-	epatch "${S}"/${PN}-11.3.1-segaddrtable-fix.patch # bugfix
-	eprefixify libstuff/execute.c
-	cp ../${LD64}/src/other/prune_trie.h include/mach-o/ || die
-
-	# do not build profileable libstuff to save compile time
-	sed -i -e "/^all:/s, profile , ," libstuff/Makefile
-
-	# bugfix. args.c not built but args_expand_at is used in misc/libtool.c
-	sed -i -e "/^CFILES = /s, errors.c , errors.c args.c ," libstuff/Makefile
-
-	# cctools version is provided to make via RC_ProjectSourceVersion which
-	# generates and compiles it as apple_version[] into libstuff. From
-	# there it's picked up by the individual tools. Since
-	# RC_ProjectSourceVersion is also used as library version, we can't
-	# just append our local version info. So we hack the libstuff Makefile
-	# to include our Gentoo version.
-	sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \
-		libstuff/Makefile
-
-	eapply_user
-
-	# clean up test suite
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	local c
-
-	# we don't have llvm
-	((++c)); rm -rf llvm-integration;
-
-	# we don't have dtrace
-	((++c)); rm -rf dtrace-static-probes-coalescing;
-	((++c)); rm -rf dtrace-static-probes;
-
-	# a file is missing
-	((++c)); rm -rf eh-coalescing-r
-
-	# we don't do universal binaries
-	((++c)); rm -rf blank-stubs;
-
-	# looks like a problem with apple's result-filter.pl
-	((++c)); rm -rf implicit-common3;
-	((++c)); rm -rf order_file-ans;
-
-	# TODO no idea what goes wrong here
-	((++c)); rm -rf dwarf-debug-notes;
-
-	einfo "Deleted $c tests that were bound to fail"
-
-	cd "${S}"
-	ebegin "cleaning Makefiles from unwanted CFLAGS"
-	find . -name "Makefile" -print0 | xargs -0 sed \
-		-i \
-		-e 's/ -g / /g' \
-		-e 's/"-g /"/g' \
-		-e 's/^G =.*$/G =/' \
-		-e 's/^OFLAG =.*$/OFLAG =/' \
-		-e 's/install -c -s/install/g'
-	eend $?
-}
-
-src_configure() {
-	ENABLE_LTO=0
-	if use lto ; then
-		ENABLE_LTO=1
-
-		LLVM_INCDIR=$(get_llvm_prefix)/include
-		LLVM_LIBDIR=$(get_llvm_prefix)/lib
-
-		[ -n "${LLVM_INCDIR}" -a -n "${LLVM_LIBDIR}" ] || \
-			die "LLVM not found - LTO support can not be enabled"
-
-		# LTO and LLVM support currently both depend only on libLTO being
-		# present. So we can enable both.
-		CCTOOLS_LTO_CFLAGS="-DLTO_SUPPORT -I${LLVM_INCDIR}"
-		CCTOOLS_LLVM_CFLAGS="-DLLVM_SUPPORT -I${LLVM_INCDIR}"
-	fi
-
-	export CTARGET=${CTARGET:-${CHOST}}
-	if [[ ${CTARGET} == ${CHOST} ]] ; then
-		if [[ ${CATEGORY} == cross-* ]] ; then
-			export CTARGET=${CATEGORY#cross-}
-		fi
-	fi
-
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-	else
-		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-	fi
-
-	export CCTOOLS_CPPFLAGS="${CPPFLAGS}"
-	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
-	# what we want). Removed in compile_cctools.
-	append-cppflags -DNDEBUG
-
-	# Create configure.h for ld64 with SUPPORT_ARCH_<arch> defines in it.
-	DERIVED_FILE_DIR=${LD64}/src \
-		${LD64}/src/create_configure
-}
-
-compile_ld64() {
-	einfo "building ${LD64}"
-	cd "${S}"/${LD64}/src
-	emake \
-		LTO=${ENABLE_LTO} \
-		LTO_INCDIR=${LLVM_INCDIR} \
-		LTO_LIBDIR=${LLVM_LIBDIR} \
-		TAPI=1 \
-		TAPI_LIBDIR="${EPREFIX}"/usr/lib
-
-	use test && emake build_test
-}
-
-compile_cctools() {
-	einfo "building ${CCTOOLS}"
-	filter-flags -DNDEBUG
-
-	cd "${S}"/${CCTOOLS}
-	# Suppress running dsymutil because it will warn about missing debug
-	# info which is expected when compiling without -g as we normally do.
-	# This might need some more thought if anyone ever wanted to build us
-	# for debugging with Apple's tools.
-	emake \
-		LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \
-		EFITOOLS= \
-		LTO="${CCTOOLS_LTO_CFLAGS} ${CCTOOLS_LLVM_CFLAGS}" \
-		COMMON_SUBDIRS='libstuff ar misc otool' \
-		SUBDIRS_32= \
-		LEGACY= \
-		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
-		RC_CFLAGS="${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil"
-
-	cd "${S}"/${CCTOOLS}/as
-	emake \
-		BUILD_OBSOLETE_ARCH= \
-		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil"
-}
-
-src_compile() {
-	compile_ld64
-	compile_cctools
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,dyldinfo,unwinddump,ObjectDump,objcimageinfo,machocheck}
-	dosym ld64 ${BINPATH}/ld
-	insinto ${DATAPATH}/man/man1
-	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,dyldinfo,unwinddump}.1
-}
-
-install_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake install_all_but_headers \
-		EFITOOLS= \
-		COMMON_SUBDIRS='ar misc otool' \
-		SUBDIRS_32= \
-		DSTROOT=\"${D}\" \
-		BINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
-	cd "${S}"/${CCTOOLS}/as
-	emake install \
-		BUILD_OBSOLETE_ARCH= \
-		DSTROOT=\"${D}\" \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH}
-
-	# upstream is starting to replace classic binutils with llvm-integrated
-	# ones. In Xcode, nm and size are now symlinks to llvm-{nm,size} while the
-	# classic version is preserved as {nm,size}-classic. When asked to do so
-	# by use classic we statically link to the classic version.
-	#   binutils-bin/<version>/<tool>
-	#     -> binutils-bin/<version>/<tool>-classic
-	#
-	# Otherwise we try to find and use the llvm version of the tool. Since our
-	# binutils do not live in the same directory as the llvm installation and
-	# llvm tends to move around, we use a shim that tries to find the llvm
-	# version of the tool in prefix. It will fall back to the classic tool if
-	# it fails.
-	#  binutils-bin/<version>/<tool>
-	#    -> binutils-bin/<version>/llvm-<tool>
-	#    -> $EPREFIX/usr/lib/llvm/<major/bin/llvm-<tool>
-	#    -> $EPREFIX/usr/bin/llvm-<tool>
-	#    -> binutils-bin/<version>/<tool>-classic
-	budir=${D}/${EPREFIX}/${BINPATH}
-	for tool in nm size ; do
-		use classic && \
-			ln -sfn ${tool}-classic "${budir}/${tool}" || \
-			ln -sfn llvm-shim "${budir}/${tool}"
-	done
-
-	# Also, otool is now based on llvm-objdump. But a small wrapper installed
-	# as llvm-otool remains, providing command line compatibility.
-	use classic && \
-		ln -sfn otool-classic "${budir}/otool" || \
-		ln -sfn llvm-otool "${budir}/otool"
-
-	# And finally, although our cctools don't actually contain dsymutil and
-	# objdump, we provide access to the llvm versions of them via the shim to
-	# be in line with Xcode.
-	for tool in objdump dsymutil ; do
-		ln -sfn llvm-shim "${budir}/${tool}"
-	done
-
-	cd "${ED}"${BINPATH}
-	insinto ${DATAPATH}/man/man1
-	local skips manpage
-	# ar brings an up-to-date manpage with it
-	skips=( ar )
-	for bin in *; do
-		for skip in ${skips[@]}; do
-			if [[ ${bin} == ${skip} ]]; then
-				continue 2;
-			fi
-		done
-		manpage=${S}/${CCTOOLS}/man/${bin}.1
-		if [[ -f "${manpage}" ]]; then
-			doins "${manpage}"
-		fi
-	done
-	insinto ${DATAPATH}/man/man5
-	doins "${S}"/${CCTOOLS}/man/*.5
-}
-
-src_test() {
-	if ! [ "${EPREFIX}"/usr/bin/clang ] ; then
-		einfo "Test suite only works properly with clang - please install"
-		return
-	fi
-
-	einfo "Running unit tests"
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	# provide the new ld as a symlink to clang so that -ccc-install-dir
-	# will pick it up
-	ln -sfn ../../src/ld64 ld
-	# use our arch command because the System's will report i386 even for an
-	# x86_64 prefix
-	perl ../bin/make-recursive.pl \
-		BUILT_PRODUCTS_DIR="${S}"/${LD64}/src \
-		ARCH="$(arch)" \
-		LD="${S}"/${LD64}/src/ld64 \
-		CC="${CC} -ccc-install-dir $PWD" \
-		CXX="${CXX} -ccc-install-dir $PWD" \
-		OTOOL="${S}"/${CCTOOLS}/otool/otool.NEW \
-		| perl ../bin/result-filter.pl
-}
-
-src_install() {
-	install_ld64
-	install_cctools
-
-	cd "${S}"
-	insinto /etc/env.d/binutils
-	cat <<-EOF > env.d
-		TARGET="${CHOST}"
-		VER="${PV}"
-		FAKE_TARGETS="${CHOST}"
-	EOF
-	newins env.d ${CHOST}-${PV}
-}
-
-pkg_postinst() {
-	binutils-config ${CHOST}-${PV}
-}

diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
index 3d5c7e8105dc..06e3523c934f 100644
--- a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
@@ -1,10 +1,21 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 inherit eutils flag-o-matic toolchain-funcs llvm prefix
 
+# versions:
+# XCode-11.3.1                 ld64-530        cctools-949.0.1
+# XCode-11.2.1                 ld64-520        cctools-949.0.1
+# XCode-11.0                   ld64-512.4      cctools-949.0.1
+# XCode-8.2.1                  ld64-274.2      cctools-895         <== binutils-apple-8.2.1-r1  (2019)
+
+# macOS-10.15.6                dyld-750.6                          Causes build failures with Xcode-11 tools
+# macOS-10.14.4-10.14.6        dyld-655.1.1                        Causes build failures with Xcode-11 tools
+# macOS-10.13.6                dyld-551.4
+# macOS-10.12.1-10.12.3        dyld-421.2                          <== binutils-apple-8.2.1-r1,8.1
+
 LD64=ld64-274.2
 CCTOOLS_VERSION=895
 CCTOOLS=cctools-${CCTOOLS_VERSION}
@@ -22,7 +33,7 @@ SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
 
 LICENSE="APSL-2"
 KEYWORDS="~x64-macos"
-IUSE="lto tapi classic test"
+IUSE="lto classic test"
 RESTRICT="!test? ( test )"
 
 # ld64 can now only be compiled using llvm and libc++ since it massively uses
@@ -31,7 +42,6 @@ RESTRICT="!test? ( test )"
 # -Wa,-Q but since it's default we make llvm a static runtime dependency.
 RDEPEND="sys-devel/binutils-config
 	lto? ( app-arch/xar )
-	tapi? ( sys-libs/tapi )
 	sys-devel/llvm:*
 	sys-libs/libcxx"
 DEPEND="${RDEPEND}
@@ -200,7 +210,7 @@ compile_ld64() {
 		LTO=${ENABLE_LTO} \
 		LTO_INCDIR=${LLVM_INCDIR} \
 		LTO_LIBDIR=${LLVM_LIBDIR} \
-		TAPI=$(use tapi && echo 1 || echo 0) \
+		TAPI=0 \
 		TAPI_LIBDIR="${EPREFIX}"/usr/lib
 
 	use test && emake build_test

diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1-r101.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r101.ebuild
index 091e4e5990b4..da5d72becad1 100644
--- a/sys-devel/binutils-apple/binutils-apple-8.2.1-r101.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-8.2.1-r101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,14 +14,12 @@ SRC_URI="https://github.com/grobian/darwin-xtools/archive/gentoo-${PVR}.tar.gz -
 LICENSE="APSL-2"
 SLOT="8"
 KEYWORDS="~ppc-macos ~x64-macos"
-IUSE="tapi"
 
 # xtools uses c++11 features, not available in gcc-apple, hence gcc/clang dep
 DEPEND="sys-devel/binutils-config
 	|| ( sys-devel/gcc:* sys-devel/clang:* )
 	app-arch/xar
-	tapi? ( sys-libs/tapi )
-	!tapi? ( dev-libs/libyaml )"
+	dev-libs/libyaml"
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
@@ -65,7 +63,7 @@ src_configure() {
 		-DXTOOLS_LTO_SUPPORT=NO
 		-DXTOOLS_HAS_LIBPRUNETRIE=YES
 		-DXTOOLS_TAPI_SUPPORT=ON
-		-DXTOOLS_USE_TAPILITE=$(use tapi && echo OFF || echo ON)
+		-DXTOOLS_USE_TAPILITE=ON
 		-DXTOOLS_HOST_IS_64B=$(is-host-64bit)
 		-DXTOOLS_BUGURL="https://bugs.gentoo.org/"
 	)

diff --git a/sys-devel/binutils-apple/metadata.xml b/sys-devel/binutils-apple/metadata.xml
index e43e477505d4..481c99bd5bd5 100644
--- a/sys-devel/binutils-apple/metadata.xml
+++ b/sys-devel/binutils-apple/metadata.xml
@@ -9,6 +9,5 @@
 		<flag name="lto">Add support for Link-Time Optimization with LLVM</flag>
 		<flag name="classic">Use nm, otool, etc. from this ebuild
 			instead of llvm-based tools</flag>
-		<flag name="tapi">Build against <pkg>sys-libs/tapi</pkg></flag>
 	</use>
 </pkgmetadata>