gentoo auto-resync : 12:12:2022 - 21:25:47

4 files changed, 61 insertions, 61 deletions

diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index 5fead6fd6229..dbda203a7c19 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -12,7 +12,7 @@ DIST dyld-421.2.tar.gz 625173 BLAKE2B 8f8325314861ae2ea10fbe78c74c7199b547973ac6
 DIST ld64-274.2.tar.gz 671652 BLAKE2B f45bb65bbe65c7baff54dec633a49b8ea472a59a7978aa050b329132963b26e4a2b3ef3dd034b04247531a11a07de5135b3726a429165cbfcae50e06c09531f4 SHA512 7b4e17f199909450b697bf719564c6841d46f5116c48dd47ff483ae7ddfe2965db1b7c024ed8ebeeaf90cd983ed353b95f7f23c93c8971536977dc892e6d6a9d
 DIST ld64-97.17.tar.gz 421947 BLAKE2B 56820ef28490f2e0181d6e36b87506c6f00ae5759afe304a063fb6bd1904ace566ef4aa69ff0d235d65968af547a1a5735cb23bcefa990f418740188d399b637 SHA512 841774a1a7c0e2f661ac7e66703f7578d8f11274897ffa15f8c49daf290a23465763f264a4dae99f15754891f44c425c0d327652112007b499bc8f755a7fc9d6
 DIST libunwind-30.tar.gz 82811 BLAKE2B 26993d6afa6930931c01b579326964a66832ed7a6ffa26eff10016c8d6d175d3b671753cf8700dcdbae7f0a9c01b16e9cbd3c9fe86697608f1f08a8eceb64782 SHA512 57106eafa1516791b4e0db2de6c6336bc0c1cbd8bf098a6d3a809fafa457802c95a7aeae9137f4ca5922a3018dfd8f597907ea4187b0afbbf267500eae00041f
-EBUILD binutils-apple-3.2.6.ebuild 6926 BLAKE2B f21d41b62afb49a2aca002388c503797d61b3b92387098c8879982ef7eec9f77834ecdd99ff6e30c0fb9b2faad04edc67d484f5943d712f59578324e98334ed5 SHA512 048e828128b4436cdfe1df71ed01c686b5837327696533b455e38c28eab73cb395a1c40810e6d9c58e3224f6787275cbb32e569d13aa616be33833fda8124a9e
-EBUILD binutils-apple-8.2.1-r1.ebuild 11966 BLAKE2B b561733cb862382f6c742998531429d117ddf5d888bc3aac2939b8ae04197e9a3ca71b7efa4c992e2e8ef33449dac5f1b45de8373dba05b30339681bec784fbe SHA512 b92e6557c7c406364ea2d1afe92dd2ffe85015cc3cd0d0faafaf0d63728c547b229384625e965a0c138361e06d0ba86ecf89ae870dd6db1e17ba30fda0ea76c3
-EBUILD binutils-apple-8.2.1-r101.ebuild 3314 BLAKE2B e9a4b7dc06c54e4f3605be0a545f7797a0cf6b963166a00951d7785b4a86df01053e6c76657b04cea316bb1eeaa76ff23a9d4a4660eeb81e256c0a74c48e9a72 SHA512 99a298f2e54a72605fedbab256d1d0d281613ed05792dcf297f0ad4df3d78d773280e464d1a1c188d9933dec6493a0f06e32fda48402a1ed323b0a020f50d0e7
+EBUILD binutils-apple-3.2.6-r1.ebuild 6969 BLAKE2B 194a027f153a1d820c61bb249de57b25365cd2b94f4ecda063551990bae3e06b5d6ebf93aa57d0a295580a0d3b28030d4352ebb795026180b0ca5d750dce088f SHA512 86b264a87b816c7e34709605db5f2b5d5146290337a11591203b68acf397d2f8c88f02c2370c3f168a9f7f11372f303bcb584f716d0795c534eed599bc415d25
+EBUILD binutils-apple-8.2.1-r101.ebuild 3298 BLAKE2B 4e5ed4c40442106e6df08ae03e1768daaca5ded22f57c31103516486c801268089817cd2be2ea865d2a2e908658bda1036c2c9154a7faf0fdeaeb51ccc6afb9c SHA512 cbc1582631eec56a8a1926c239de6a9b493f00c2f931331711e53205d452a9213f75b0d20b028d375a0d0e1412175f000c963cf9a406a7f703d143d70cfdca53
+EBUILD binutils-apple-8.2.1-r2.ebuild 12050 BLAKE2B 246cc8b1f678daa4838e0f1e7147b36448a4331fd26a92d294d847245dffc0d479d8c6b810bef83c383fc16ea006d531083350bbd7a819470c70d9155fa725ba SHA512 79e136bbc5507b289f8ec5286fccaf636733697a16799ec75d4ce47e098b25d9740e15717f85d2c921ce7600dc7355296f46b6f91ce36ef14181815f871f455f
 MISC metadata.xml 436 BLAKE2B f120e4772814634938465022b29afcd08e96fe15150e5757a1b4f9e193bab557bd26a394d0cf67e2f58fdbf3d5e5c7156f6c19056eeeed2544fd102c1870bed2 SHA512 d8faccf2a0994f67be13f412a278c83250d234e9cda2657f1181d2a2865e5738c3caa488d69f27d2223d7043ba569d26bf62fccb718081f88136e69c96f77c26
diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.6-r1.ebuild
index 49c5ce262a52..d096612de55a 100644
--- a/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-3.2.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 RESTRICT="test" # the test suite will test what's installed.
 
@@ -34,7 +34,7 @@ S=${WORKDIR}
 
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
 
-prepare_ld64() {
+eprepare_ld64() {
 	cd "${S}"/${LD64}/src
 	cp "${WORKDIR}"/Makefile Makefile || die
 
@@ -90,14 +90,14 @@ prepare_ld64() {
 }
 
 src_prepare() {
-	prepare_ld64
+	eprepare_ld64
 
 	cd "${S}"/${CCTOOLS}
-	epatch "${WORKDIR}"/${PN}-3.2.6-as-dir.patch
-	epatch "${WORKDIR}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${WORKDIR}"/${PN}-3.1.1-nmedit.patch
-	epatch "${WORKDIR}"/${PN}-3.1.1-no-headers.patch
-	epatch "${WORKDIR}"/${PN}-3.1.1-no-oss-dir.patch
+	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 \
@@ -109,8 +109,8 @@ src_prepare() {
 		as/Makefile || die
 
 	cd "${S}"/${LD64}
-	epatch "${WORKDIR}"/${PN}-3.1.1-testsuite.patch
-	epatch "${WORKDIR}"/${PN}-3.2.6-lto.patch
+	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"
@@ -200,19 +200,19 @@ install_cctools() {
 		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/
+		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}
+		DSTROOT="\"${D}\"" \
+		USRBINDIR="\"${EPREFIX}\"${BINPATH}" \
+		LIBDIR="\"${EPREFIX}\"${LIBPATH}" \
+		LOCLIBDIR="\"${EPREFIX}\"${LIBPATH}"
 
 	cd "${ED}"${BINPATH}
 	insinto ${DATAPATH}/man/man1
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 da5d72becad1..5c87dd7ecf22 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
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR=emake  # keep dependencies down
 
-inherit cmake toolchain-funcs
+inherit cmake
 
 DESCRIPTION="Darwin Xtools matching Xcode Tools ${PN}"
 HOMEPAGE="https://github.com/iains/darwin-xtools"
diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r2.ebuild
index b38e12eebe33..8d4f21c88bb0 100644
--- a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-8.2.1-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit eutils flag-o-matic toolchain-funcs llvm prefix
+inherit flag-o-matic llvm prefix
 
 # versions:
 # XCode-11.3.1                 ld64-530        cctools-949.0.1
@@ -64,12 +64,12 @@ src_prepare() {
 	cp "${S}"/ld64-136-compile_stubs.h ld/compile_stubs.h
 	cp "${S}"/ld64-274.2-Makefile Makefile
 
-	epatch "${S}"/ld64-274.1-nolto.patch
-	epatch "${S}"/ld64-236.3-crashreporter.patch
-	epatch "${S}"/ld64-264.3.102-bitcode-case.patch
-	epatch "${S}"/ld64-274.1-unknown-fixup.patch
-	epatch "${S}"/ld64-274.1-notapi.patch
-	epatch "${S}"/ld64-274.2-cfi-info-type.patch
+	eapply -p2 "${S}"/ld64-274.1-nolto.patch
+	eapply -p2 "${S}"/ld64-236.3-crashreporter.patch
+	eapply -p2 "${S}"/ld64-264.3.102-bitcode-case.patch
+	eapply -p2 "${S}"/ld64-274.1-unknown-fixup.patch
+	eapply -p2 "${S}"/ld64-274.1-notapi.patch
+	eapply -p2 "${S}"/ld64-274.2-cfi-info-type.patch
 
 	# workound llvm-3.9.{0,1} issue
 	# https://bugs.gentoo.org/show_bug.cgi?id=603580
@@ -87,27 +87,27 @@ src_prepare() {
 	cp ../../${CCTOOLS}/include/mach/machine.h include/mach/machine.h
 	# add alias for newer identifiers, because ld64 uses both but cctools
 	# header only defines the older
-	epatch "${S}"/ld64-236.3-missing-cputypes.patch
+	eapply -p2 "${S}"/ld64-236.3-missing-cputypes.patch
 
 	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
 	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
 
-	epatch "${S}"/ld64-123.2-debug-backtrace.patch
+	eapply -p0 "${S}"/ld64-123.2-debug-backtrace.patch
 
 	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}-7.3-no-developertools-dir.patch
-	epatch "${S}"/${PN}-8.2.1-llvm-prefix-3.patch
-	epatch "${S}"/${PN}-8.2.1-llvm-shim.patch
+	eapply -p1 "${S}"/${PN}-4.5-as.patch
+	eapply -p1 "${S}"/${PN}-5.1-as-dir.patch
+	eapply -p2 "${S}"/${PN}-5.1-ranlib.patch
+	eapply -p1 "${S}"/${PN}-3.1.1-libtool-ranlib.patch
+	eapply -p1 "${S}"/${PN}-3.1.1-no-headers.patch
+	eapply -p0 "${S}"/${PN}-4.0-no-oss-dir.patch
+	eapply -p1 "${S}"/cctools-839-intel-retf.patch
+	eapply -p2 "${S}"/${PN}-5.1-extraneous-includes.patch
+	eapply -p1 "${S}"/${PN}-5.1-strnlen.patch
+	eapply -p1 "${S}"/${PN}-7.3-make-j.patch
+	eapply -p1 "${S}"/${PN}-7.3-no-developertools-dir.patch
+	eapply -p1 "${S}"/${PN}-8.2.1-llvm-prefix-3.patch
+	eapply -p1 "${S}"/${PN}-8.2.1-llvm-shim.patch
 	eprefixify libstuff/execute.c
 	cp ../${LD64}/src/other/prune_trie.h include/mach-o/ || die
 
@@ -263,19 +263,19 @@ install_cctools() {
 		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/
+		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}
+		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
@@ -294,7 +294,7 @@ install_cctools() {
 	#    -> $EPREFIX/usr/lib/llvm/<major/bin/llvm-<tool>
 	#    -> $EPREFIX/usr/bin/llvm-<tool>
 	#    -> binutils-bin/<version>/<tool>-classic
-	budir=${D}/${EPREFIX}/${BINPATH}
+	budir="${D}"/${EPREFIX}/${BINPATH}
 	for tool in nm size ; do
 		use classic && \
 			ln -sfn ${tool}-classic "${budir}/${tool}" || \
@@ -314,7 +314,7 @@ install_cctools() {
 		ln -sfn llvm-shim "${budir}/${tool}"
 	done
 
-	cd "${ED}"${BINPATH}
+	cd "${ED}"/${BINPATH}
 	insinto ${DATAPATH}/man/man1
 	local skips manpage
 	# ar brings an up-to-date manpage with it