gentoo auto-resync : 29:05:2023 - 15:17:30

6 files changed, 178 insertions, 3 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 318f280e6df4..2d4b0893a442 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index dbda203a7c19..be4bbb4678a8 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -7,6 +7,7 @@ DIST binutils-apple-patches-8.2-r1.tar.bz2 10830 BLAKE2B 345db8619873e9e91b79c3f
 DIST cctools-795.tar.gz 1993795 BLAKE2B dc0915f8647eecba5352e34dfc5752b679df39ead9a4734c49955a824d2cc127308eed46a614665dfe08a9d3036eb37f587e1b765a7df727facc42a33befacb0 SHA512 5a34a73dc71d3574a357f6b0f26a48a99dd0995d62695b309cdfe85c4960934b410455b1ba6bdbc9a4e32106bb45b35555604975d2a80ad1be21f5d4eac69254
 DIST cctools-895.tar.gz 1716126 BLAKE2B 9706a6b243518693888e5e21dfe8d83b217380b47db621a7f1b35105eb72fb8997353ff85133224b0856f6b6ec710f54a4fe79076d9e228f89c98b6f517de309 SHA512 4ef9db870385cc2c4263bcbe42ff0de80386771f5acbc7082a1818ecd6b8d7bb1bfa02a7fcfecd3e7281481aeaaac4c331359aca3564bfe7a4c7dea1e0d06126
 DIST darwin-xtools-8.2.1-r101.tar.gz 3105898 BLAKE2B 3516cd252d4880b1e80c76365efef6f96830578bb5512befe33f86decdeb026fbad17fd3b27e9c3cf20d100897002e86ec08822041baa0291bb53e0b0ecf4d10 SHA512 f84cbde0853c14f03af40a124133d71d3e1710da021a593336eb4351c60edbca5753af0780f269ed4716cd194973f5437d428c5ff9615d9ce025dba3b7daef77
+DIST darwin-xtools-8.2.1-r102.tar.gz 3105944 BLAKE2B c60854e77afde1a109834e6bac2485f79387b37b871b00a83cfe42c8793685fc414a6a9fa8ef588badf824a9255478fd64c171015f22e848b41dc47d011e202a SHA512 e115e29b5b358cec5c254fc7e4f5d94567c6788f745fd48dfea464a69bd7f4e3a48bccf3334f9fbb26ca3a3cd1c4b366198e05f2f567c7fb43e81ea8f3bf151c
 DIST dyld-132.13.tar.gz 342690 BLAKE2B 011418ba5b91a28bb7c5f8188af2fac5478bad53581396b7c1c4623a854a8f0d5ecb92d023246157830ed2db83bbf28e23225a255188e2d07eeb6c933814bda6 SHA512 2c9d50fc32868b696d88730eb6ea6afa9bb9f56883cc2ea4f1d41f370f311b7487a29ce0eff6761e1eeb086a18e2513953989d8d5d3ef1043bb662e86baadd3f
 DIST dyld-421.2.tar.gz 625173 BLAKE2B 8f8325314861ae2ea10fbe78c74c7199b547973ac61a8e9cb76fb874a0e53395ea31c04e489f85ac7cfdb5715ae5051679453de75eb195e313113e7bbbc70340 SHA512 75f2fb840da980d44649aa3e045f50c4e37d4403fbdb1e2e5f1a85bf6d8859e1130053c3806f7ef992fdfc6573f7f18146263c690144bdd3df31452c6bdd8bd8
 DIST ld64-274.2.tar.gz 671652 BLAKE2B f45bb65bbe65c7baff54dec633a49b8ea472a59a7978aa050b329132963b26e4a2b3ef3dd034b04247531a11a07de5135b3726a429165cbfcae50e06c09531f4 SHA512 7b4e17f199909450b697bf719564c6841d46f5116c48dd47ff483ae7ddfe2965db1b7c024ed8ebeeaf90cd983ed353b95f7f23c93c8971536977dc892e6d6a9d
@@ -14,5 +15,6 @@ DIST ld64-97.17.tar.gz 421947 BLAKE2B 56820ef28490f2e0181d6e36b87506c6f00ae5759a
 DIST libunwind-30.tar.gz 82811 BLAKE2B 26993d6afa6930931c01b579326964a66832ed7a6ffa26eff10016c8d6d175d3b671753cf8700dcdbae7f0a9c01b16e9cbd3c9fe86697608f1f08a8eceb64782 SHA512 57106eafa1516791b4e0db2de6c6336bc0c1cbd8bf098a6d3a809fafa457802c95a7aeae9137f4ca5922a3018dfd8f597907ea4187b0afbbf267500eae00041f
 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-r102.ebuild 3256 BLAKE2B a5a4c8893ec393e5e1f99e29f27d74245d3153e671083f0f4102a07a0ebf259f9c6b40c93b7d9eeb5e67f58bd0e96adb67c6e64c0ce9c23c758de10cc019e444 SHA512 b633b77914440ca260d6cbbd02229e90b783b813f653eb91bf7d302c002c06c461d397112ad6ed449d8989c185f0626879667dce79abd1e0c061646b1ae65370
 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-8.2.1-r102.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r102.ebuild
new file mode 100644
index 000000000000..d892d1c763d9
--- /dev/null
+++ b/sys-devel/binutils-apple/binutils-apple-8.2.1-r102.ebuild
@@ -0,0 +1,118 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR=emake  # keep dependencies down
+
+inherit cmake
+
+DESCRIPTION="Darwin Xtools matching Xcode Tools ${PN}"
+HOMEPAGE="https://github.com/iains/darwin-xtools"
+SRC_URI="https://github.com/grobian/darwin-xtools/archive/gentoo-${PVR}.tar.gz -> darwin-xtools-${PVR}.tar.gz"
+
+LICENSE="APSL-2"
+SLOT="8"
+KEYWORDS="~arm64-macos ~ppc-macos ~x64-macos"
+
+# 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
+	dev-libs/libyaml"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/darwin-xtools-gentoo-${PVR}"
+
+src_configure() {
+	CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/xtools-${PV}
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/xtools-${PV}
+	if [[ ${CHOST} != ${CTARGET} ]] ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/xtools-${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/xtools-${PV}
+	fi
+
+	is-host-64bit() {
+		case ${CTARGET} in
+			x86_64-*|powerpc64-*|arm64-*)   echo YES   ;;
+			*)                              echo NO    ;;
+		esac
+	}
+
+	local mycmakeargs=(
+		-DCMAKE_OSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}
+		-DPACKAGE_VERSION="Gentoo ${PN}-${PVR}"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}${BINPATH%/*}" # cmake insists on /bin
+		-DCCTOOLS_LD_CLASSIC=NO  # fails to link, and is useless anyway
+		-DXTOOLS_AS_USE_CLANG=YES  # default to host as for unsupported targets
+		-DXTOOLS_AS_CLANG_USE_HOST=YES  # search for arch/as-host iso clang
+		-DXTOOLS_AS_SUBDIR="${EPREFIX}${LIBPATH}/"
+		-DXTOOLS_LTO_SUPPORT=NO
+		-DXTOOLS_HAS_LIBPRUNETRIE=YES
+		-DXTOOLS_TAPI_SUPPORT=ON
+		-DXTOOLS_USE_TAPILITE=ON
+		-DXTOOLS_HOST_IS_64B=$(is-host-64bit)
+		-DXTOOLS_BUGURL="https://bugs.gentoo.org/"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# cmake insists on installing in /bin, so move bins to the place we
+	# want them
+	mv "${ED}${BINPATH%/*}/bin" "${ED}${BINPATH}" || die
+
+	# move as impls into LIBPATH, such that binutils-config doesn't
+	# create links for this
+	dodir "${LIBPATH}"
+	local as
+	for as in "${ED}${BINPATH}"/*/as ; do
+		as=${as%/as}
+		mv "${as}" "${ED}${LIBPATH}"/ || die
+	done
+
+	# provide as-host wrappers, used on "unsupported" platforms: x86,
+	# x64, arm, arm64, the main reason here is missing support for
+	# instructions, e.g. the as works fine, until newer instruction sets
+	# are used like SSE4.1, AVX, etc.
+	local arch
+	for arch in i386 x86_64 arm arm64 ; do
+		mkdir -p "${ED}${LIBPATH}"/${arch}
+		as="${ED}${LIBPATH}"/${arch}/as-host
+		rm -f "${as}"
+		cat <<-EOF > "${as}"
+			#!/usr/bin/env bash
+			exec /usr/bin/as "\$@"
+		EOF
+		chmod 755 "${as}"
+	done
+
+	doman ld64/doc/man/man*/* cctools/man/*.[135]
+	dodir "${DATAPATH}"
+	mv "${ED}"/usr/share/man "${ED}/${DATAPATH}/" || die
+
+	cd "${S}"
+	insinto /etc/env.d/binutils
+	cat <<-EOF > env.d
+		TARGET="${CHOST}"
+		VER="xtools-${PV}"
+		FAKE_TARGETS="${CHOST}"
+	EOF
+	newins env.d ${CHOST}-xtools-${PV}
+}
+
+pkg_postinst() {
+	binutils-config ${CHOST}-xtools-${PV}
+}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 7f4315b967eb..c1f758756ae5 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -13,6 +13,7 @@ DIST gcc-11-20230525.tar.xz 76192248 BLAKE2B 58f0ca1b6a8daa8a7fc23da47d851e6345f
 DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B a2335e155fc57816fed822a648e0eaefafcba9d04e1ad0fd7baeea5a694ab6f5e3c1678cb406f2a1bd17bab25cb01699d032713a1ccf337948dfda2093844607 SHA512 17b84f907cb1bd763873655e6f35fd3ed55a40b602b70a626f04f83b4cc89c6261db1661de78d4d969187a8c56e9f6305b742515a3836b962248a21df0df5d0c
 DIST gcc-11.4.0-patches-10.tar.xz 13852 BLAKE2B 54937d13e30e2a5303c7e197fae09eeed35ca0b9783625e02578fcee829b5503fb22d664366322b304df7d01ae807d00af7c93db3e3ceebe4851e15647724f87 SHA512 31b4d7a2e7cc589e92e12c3583d13d41c523cafbd309bc0532df9b68ea2473c89daef4c0edd3ce2917b5823d81a7792f145b9449f16277d0d64c22ceff50bbb9
 DIST gcc-11.4.0-patches-9.tar.xz 14704 BLAKE2B 9aa2ecbac493d3040694e9930738e57d59a764b90ab92b91709c319b883f28ad108767e5d11e8b62af40bf1e583d5ff83a03e8c895f904bc6f41315ce9ab4f0a SHA512 ac8b7c6c382ffacc4e9d08299440fc237fa366ec36fb8eb7a8d426b64a4186384a262e6380dc83ed7f7240125ce26a8435c8a4e0e13976ef2652067a7129bd17
+DIST gcc-11.4.0.tar.xz 79837032 BLAKE2B 6e3b095a5837d4b5512719f848f4b9c4b4a6d7dc40ba96b269023ea5ea84f632c42a13855c030e255f3265445a45e6d2648dfe0e2cc0ea47da87c4660b052e24 SHA512 a5018bf1f1fa25ddf33f46e720675d261987763db48e7a5fdf4c26d3150a8abcb82fdc413402df1c32f2e6b057d9bae6bdfa026defc4030e10144a8532e60f14
 DIST gcc-12-20230428.tar.xz 79744932 BLAKE2B f9d0000cdd2f1b0af79f281851b3b0fe0ac50f14468844e1ee596f8ed1ccf33f55c7617464d88df7e4b3435d58fedecf640592e0661fd1be9ba163acd26dae68 SHA512 992f9cd71f9910efea401048540ba2b43360170f76ce992cf356b1ab383240f481e29c5b0ad32fa4efb2bdbb397477506cb83a825268cfbdd2cde7044d43c758
 DIST gcc-12-20230519.tar.xz 79757700 BLAKE2B 81c18adedc9f0eae729a72814a47ae496c9ae78f13e9cf2f442b3ea09c577e84e3261a6004d1634125bbc77c39298328a0879eea1dab26966b85f9f10887f114 SHA512 cd24ad69a6c47a95384d8fd4fcb7e895f8fb4d8e0c4b74d1300943fa8198624e3c40b0bd7702cb78f40849a09b5069e50e36bc191bd206b36c956ca25126ee02
 DIST gcc-12-20230526.tar.xz 79780444 BLAKE2B 6f6eca272ab506e16a231003c399e28572595c82fbaaec9deb14b78ff9fc493fb24afe1c375d4f2fd75e9813805934857ef2ceb6c05b7977dbfe2e50abdc3ec9 SHA512 fb190ce5bf3d38a1899016475c1551550d44c6f71f1f1a71ced545cbb2aff0446bd2765230b0920379579a13103a507ffc1e197ac69afb0a4f08efe11b50918d
@@ -37,7 +38,8 @@ EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B 2db612df53fbaec59c707acb56bac804a4ee797
 EBUILD gcc-11.3.1_p20230427.ebuild 1334 BLAKE2B cb480f1ae20bc31900948f61f48a050ed177d6303a76d555a596636767871bca8ff6446466970fbc43e2fe02f047c22a27416eb3b580812ee481b8ce4d630850 SHA512 fa62bf94450bae1fab07cc2e4030a13e2c58e06518ba44f86710049343ceeb8e535ce108225234e8b7fe50523d62414dcaf1d0148e80607bc1f6a8d0e13941b7
 EBUILD gcc-11.3.1_p20230518.ebuild 1343 BLAKE2B 8ecf0b1616754df373f3a76b1e663176eecefbd2ac79752053d8df7276046ad45187cb40900ab4f61e9ef9afb30fab0d09113476397fa8da8b06821d61ffe1ec SHA512 e7e28819115d9ec9626fbc83f5539dec278e45cb78781a48fd6f141b38a8cbf4cd459c1e134ae2636e7613a336322cafd42e7feef14fe793a8aacd29f6fafb53
 EBUILD gcc-11.3.1_p20230525.ebuild 1343 BLAKE2B 8ecf0b1616754df373f3a76b1e663176eecefbd2ac79752053d8df7276046ad45187cb40900ab4f61e9ef9afb30fab0d09113476397fa8da8b06821d61ffe1ec SHA512 e7e28819115d9ec9626fbc83f5539dec278e45cb78781a48fd6f141b38a8cbf4cd459c1e134ae2636e7613a336322cafd42e7feef14fe793a8aacd29f6fafb53
-EBUILD gcc-11.4.9999.ebuild 1315 BLAKE2B 45a8f481e0c08e5274d1797e421431e898753fce22426a1b2a1f4fd23c4dd44bed5f15da4c67f1c108b25d8393683fef631f998b8b524aa0d356be04625c0562 SHA512 fc4d8913f2aeed856b123a4545655813fe20544d841feca5121f85291a2aec99c770d845b14ce936c2fb14b5b9b1cd85166190ec657528bcb1710c7b48385c16
+EBUILD gcc-11.4.0.ebuild 1346 BLAKE2B 278dd8483ef6034566c4ae12f9dfde8aac418129742a5c54564ff44655272c463f1cd0c2effb80aeb478b9cb8e01ef3b9e5095a4aa8a58367b5471cb778c29df SHA512 bd6b229f3aceb94ab1b944b89af9db2f4ae76f3c5387cbb333d0b52b11cd39fb0d179efb932089512d9a845197d97d17dca8a77117943a1bbf70056dc0bdcc5b
+EBUILD gcc-11.5.9999.ebuild 1287 BLAKE2B a46795c477934aed68700e0dcfe9b0dbc860f08ba66daf9538e1efab58f435349e024f7cd1b6f9a2fc1426a43a873bc916af48b09327f671a1d97911f2676b00 SHA512 1b0393d7aeddd6c8440e5838d5c432f4d6f5930da1d2635de9e32ea7fa32b40bde470610ba883e0f4fc55f6669091ea46136f4da02fd78feced0f71f63a01f3d
 EBUILD gcc-12.2.1_p20230428-r1.ebuild 1475 BLAKE2B 69112653719b589bd72fe454b963d050194a8dc3a665fc7317989368cf0ff4281ac2f8519d7fc46311a3f91528d2e0457485357e67ff72765d6cfe743f0b4a2c SHA512 2e771e67e1668bf90695cc42517f46518e445a4af6e7cb9c8532efea047a4174d40f18b256cc99beec2b5fe5abde4f1ea7cb3ad84f4491032036d6b53f941e91
 EBUILD gcc-12.3.0.ebuild 1581 BLAKE2B a5895792b8a60592ed888bd9219f85fcbe71a26ac1351e4c393753da80263b9ec2937573e9a23de51b40666d7dc1fc3f78f27eeedc31a9b3a6cce3baed91e2b9 SHA512 eacce837d30335396e5ca78b53f3cb23fd181a132cdc832ecc31353ce71e599b5e43ac6333769b70bd084cace3ae96b551216b3e53b892a0b0f93465f5465edf
 EBUILD gcc-12.3.1_p20230519.ebuild 1581 BLAKE2B a5895792b8a60592ed888bd9219f85fcbe71a26ac1351e4c393753da80263b9ec2937573e9a23de51b40666d7dc1fc3f78f27eeedc31a9b3a6cce3baed91e2b9 SHA512 eacce837d30335396e5ca78b53f3cb23fd181a132cdc832ecc31353ce71e599b5e43ac6333769b70bd084cace3ae96b551216b3e53b892a0b0f93465f5465edf
diff --git a/sys-devel/gcc/gcc-11.4.0.ebuild b/sys-devel/gcc/gcc-11.4.0.ebuild
new file mode 100644
index 000000000000..9b57b16f07be
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.4.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="10"
+PATCH_GCC_VER="11.4.0"
+MUSL_VER="2"
+MUSL_GCC_VER="11.4.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+	BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-devel/gcc/gcc-11.4.9999.ebuild b/sys-devel/gcc/gcc-11.5.9999.ebuild
index f693ec815844..b99c205cd872 100644
--- a/sys-devel/gcc/gcc-11.4.9999.ebuild
+++ b/sys-devel/gcc/gcc-11.5.9999.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-TOOLCHAIN_PATCH_SUFFIX="xz"
 TOOLCHAIN_PATCH_DEV="sam"
 PATCH_GCC_VER="11.4.0"
 MUSL_GCC_VER="11.4.0"