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

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     b1086e8f454e0e552aef9af7735e01ff966d064f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 30 15:02:12 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 30 17:50:16 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1086e8f

sys-devel/binutils-apple: drop 3.2.6-r1

At least get rid of one overshadowed version.

Bug: https://bugs.gentoo.org/963592
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sys-devel/binutils-apple/Manifest                  |   5 -
 .../binutils-apple/binutils-apple-3.2.6-r1.ebuild  | 266 ---------------------
 sys-devel/binutils-apple/metadata.xml              |   5 -
 3 files changed, 276 deletions(-)

diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index 9909b1d3989b..7eb6464dddb6 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -1,6 +1 @@
-DIST binutils-apple-patches-3.2.6-r0.tar.bz2 3500 BLAKE2B f10dcf71400ea5d4bf7efb8ad906240765cfb56743274b3e1684eeb4273a35171aa4202d475920cff2c5c39e89f9bd1d7e5b0d38ba6c2b4705b0a592ba47e063 SHA512 4ccb8ebd49ac8eac4dbd0c1f24ee1836f216efd2e9e15b13072cbc76d8f83fbf4f1f6b3b60736bf5d5482af3e49ec1eaedfce8dd0ce1e949f915faf9c92ee0ea
-DIST cctools-795.tar.gz 1993795 BLAKE2B dc0915f8647eecba5352e34dfc5752b679df39ead9a4734c49955a824d2cc127308eed46a614665dfe08a9d3036eb37f587e1b765a7df727facc42a33befacb0 SHA512 5a34a73dc71d3574a357f6b0f26a48a99dd0995d62695b309cdfe85c4960934b410455b1ba6bdbc9a4e32106bb45b35555604975d2a80ad1be21f5d4eac69254
 DIST darwin-xtools-8.2.1-r103.tar.gz 3106189 BLAKE2B f13e77f796eefc393389206d5663c98d55c3fe0eb5123b366155e7c993cea421a039121d705cab2aa5fcdab2ef08d2b17dd5b9d6e0b2c50c97db067b0ec10283 SHA512 241f402ac368606eb9b89421a3e0a2ebbde1ea79d6e84cc55680a7f3dbc31dfa402ee7b20f605627c1bfd9097bbe824dea466339a7ff9026810911ef70940bda
-DIST dyld-132.13.tar.gz 342690 BLAKE2B 011418ba5b91a28bb7c5f8188af2fac5478bad53581396b7c1c4623a854a8f0d5ecb92d023246157830ed2db83bbf28e23225a255188e2d07eeb6c933814bda6 SHA512 2c9d50fc32868b696d88730eb6ea6afa9bb9f56883cc2ea4f1d41f370f311b7487a29ce0eff6761e1eeb086a18e2513953989d8d5d3ef1043bb662e86baadd3f
-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-3.2.6-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.6-r1.ebuild
deleted file mode 100644
index 22d10d9f7b20..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-3.2.6-r1.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic toolchain-funcs
-
-RESTRICT="test" # the test suite will test what's installed.
-
-LD64=ld64-97.17
-CCTOOLS=cctools-795
-LIBUNWIND=libunwind-30
-DYLD=dyld-132.13
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2.6"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="https://opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
-	https://opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
-	http://www.opensource.apple.com/tarballs/libunwind/${LIBUNWIND}.tar.gz
-	http://www.opensource.apple.com/tarballs/dyld/${DYLD}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-3.2.6-r0.tar.bz2"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos"
-IUSE="test"
-
-RDEPEND="sys-devel/binutils-config"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/perl-5.8.8 )"
-
-SLOT="3"
-
-S=${WORKDIR}
-
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-eprepare_ld64() {
-	cd "${S}"/${LD64}/src
-	cp "${WORKDIR}"/Makefile Makefile || die
-
-	# provide missing headers from libunwind and dyld
-	mkdir -p include/{mach,mach-o/arm} || die
-	# never present because it's private
-	cp ../../${DYLD}/include/mach-o/dyld_priv.h include/mach-o || die
-	# missing on <= 10.5
-	cp ../../${LIBUNWIND}/include/libunwind.h include/ || die
-	ln -s ../../../${LIBUNWIND}/src include/libunwind || die
-	cp ../../${LIBUNWIND}/include/mach-o/compact_unwind_encoding.h include/mach-o || die
-	# missing on <= 10.4
-	cp ../../${DYLD}/include/mach-o/dyld_images.h include/mach-o || die
-	cp ../../${CCTOOLS}/include/mach-o/loader.h include/mach-o || die
-	# use copies from cctools because they're otherwise hidden in some SDK
-	cp ../../${CCTOOLS}/include/mach-o/arm/reloc.h include/mach-o/arm || die
-	# provide all required CPU_TYPEs on all platforms
-	cp ../../${CCTOOLS}/include/mach/machine.h include/mach/machine.h
-
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	sed -i \
-		-e '/^#define LTO_SUPPORT 1/s:1:0:' \
-		other/ObjectDump.cpp || die
-	echo '#undef LTO_SUPPORT' > include/configure.h
-	echo '' > linker_opts
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	# 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;
-
-	elog "Deleted $c tests that were bound to fail"
-}
-
-src_prepare() {
-	eprepare_ld64
-
-	cd "${S}"/${CCTOOLS}
-	eapply -p1 "${WORKDIR}"/${PN}-3.2.6-as-dir.patch
-	eapply -p1 "${WORKDIR}"/${PN}-3.1.1-libtool-ranlib.patch
-	eapply -p1 "${WORKDIR}"/${PN}-3.1.1-nmedit.patch
-	eapply -p1 "${WORKDIR}"/${PN}-3.1.1-no-headers.patch
-	eapply -p1 "${WORKDIR}"/${PN}-3.1.1-no-oss-dir.patch
-
-	# drop as targets which are not suported by anything
-	sed -i \
-		-e '/^all:/,/^$/s/\(a68\|a88\|a860\|ahppa\|asparc\)_build//g' \
-		-e '/^macos_install:/s/common_install//' \
-		-e '/^xcommon_install:/,/^$/{' \
-			-e '/\(m68k\|a68\|sparc\)/d' \
-		-e '}' \
-		as/Makefile || die
-
-	cd "${S}"/${LD64}
-	eapply -p1 "${WORKDIR}"/${PN}-3.1.1-testsuite.patch
-	eapply -p1 "${WORKDIR}"/${PN}-3.2.6-lto.patch
-
-	cd "${S}"
-	ebegin "cleaning Makefiles from unwanted CFLAGS"
-	find . -name "Makefile" -print0 | xargs -0 sed \
-		-i \
-		-e 's/ -g / /g' \
-		-e 's/^OFLAG =.*$/OFLAG =/' \
-		-e 's/install -c -s/install/g'
-	eend $?
-
-	# -pg is used and the two are incompatible
-	filter-flags -fomit-frame-pointer
-
-	eapply_user
-}
-
-src_configure() {
-	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}
-	INCPATH=${LIBPATH}/include
-	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
-
-	if tc-is-gcc && [[ $(gcc-fullversion) != 4.2.1 ]] ; then
-		# force gcc-apple
-		CC=${CTARGET}-gcc-4.2.1
-		CXX=${CTARGET}-g++-4.2.1
-	fi
-}
-
-compile_ld64() {
-	cd "${S}"/${LD64}/src
-	# 'struct linkedit_data_command' is defined in mach-o/loader.h on leopard,
-	# but not on tiger.
-	[[ ${CHOST} == *-apple-darwin8 ]] && \
-		append-flags -isystem "${S}"/${CCTOOLS}/include/
-	local myincs="-Iinclude -Iabstraction -Ild"
-	emake CFLAGS="${CFLAGS} ${myincs}" CXXFLAGS="${CXXFLAGS} ${myincs}"
-
-	use test && emake build_test
-}
-
-compile_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake \
-		LTO= \
-		TRIE= \
-		EFITOOLS= \
-		COMMON_SUBDIRS='libstuff ar misc otool' \
-		SUBDIRS_32= \
-		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}"
-
-	cd "${S}"/${CCTOOLS}/as
-	emake \
-		BUILD_OBSOLETE_ARCH= \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}"
-}
-
-src_compile() {
-	tc-export CC CXX
-	compile_ld64
-	compile_cctools
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase}
-	dosym ld64 ${BINPATH}/ld
-	insinto ${DATAPATH}/man/man1
-	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1
-}
-
-install_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake install_all_but_headers \
-		EFITOOLS= \
-		COMMON_SUBDIRS='ar misc otool' \
-		SUBDIRS_32= \
-		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
-		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}"
-
-	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() {
-	einfo "Running unit tests"
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	# need host arch, since GNU arch doesn't do what Apple's does
-	tc-export CC CXX
-	perl ../bin/make-recursive.pl \
-		ARCH="$(/usr/bin/arch)" \
-		RELEASEDIR="${S}"/${LD64}/src \
-		| perl ../bin/result-filter.pl
-}
-
-src_install() {
-	install_ld64
-	install_cctools
-
-	docompress /usr/share/binutils-data/${CTARGET}/${PV}/man
-
-	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/metadata.xml b/sys-devel/binutils-apple/metadata.xml
index d64768b87649..3ffd5f5ac91b 100644
--- a/sys-devel/binutils-apple/metadata.xml
+++ b/sys-devel/binutils-apple/metadata.xml
@@ -5,11 +5,6 @@
 		<email>prefix@gentoo.org</email>
 		<name>Gentoo Prefix</name>
 	</maintainer>
-	<use>
-		<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>
-	</use>
 	<upstream>
 		<remote-id type="github">grobian/darwin-xtools</remote-id>
 	</upstream>