Merge updates from master

7 files changed, 60 insertions, 17 deletions

diff --git a/app-containers/cosign/cosign-2.6.1.ebuild b/app-containers/cosign/cosign-2.6.1.ebuild
index 42786c3995aa..27ca584fb35c 100644
--- a/app-containers/cosign/cosign-2.6.1.ebuild
+++ b/app-containers/cosign/cosign-2.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RESTRICT="test"
 
diff --git a/app-editors/xemacs/xemacs-21.5.36-r4.ebuild b/app-editors/xemacs/xemacs-21.5.36-r5.ebuild
index e54e3b01a628..9c71caa62cdc 100644
--- a/app-editors/xemacs/xemacs-21.5.36-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.36-r5.ebuild
@@ -1,9 +1,6 @@
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Note: xemacs currently does not work with position independent code
-# so the build forces the use of the -no-pie option
-
 EAPI=8
 
 inherit flag-o-matic xdg-utils desktop autotools
@@ -83,10 +80,6 @@ src_prepare() {
 src_configure() {
 	local myconf=""
 
-	# bug #639642
-	test-flags -no-pie >/dev/null && append-flags -no-pie
-	filter-flags -pie
-
 	if use X; then
 
 		myconf="${myconf} --with-widgets=athena"
diff --git a/app-editors/xemacs/xemacs-21.5.9999.ebuild b/app-editors/xemacs/xemacs-21.5.9999.ebuild
index a37d6b38b307..ef5200b254e2 100644
--- a/app-editors/xemacs/xemacs-21.5.9999.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.9999.ebuild
@@ -1,9 +1,6 @@
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Note: xemacs currently does not work with position independent code
-# so the build forces the use of the -no-pie option
-
 EAPI=8
 
 inherit flag-o-matic xdg-utils desktop autotools
@@ -82,10 +79,6 @@ src_prepare() {
 src_configure() {
 	local myconf=""
 
-	# bug #639642
-	test-flags -no-pie >/dev/null && append-flags -no-pie
-	filter-flags -pie
-
 	if use X; then
 
 		myconf="${myconf} --with-widgets=athena"
diff --git a/dev-db/redis/redis-8.2.3.ebuild b/dev-db/redis/redis-8.2.3.ebuild
index 81d1d9abcd16..772ca12f4753 100644
--- a/dev-db/redis/redis-8.2.3.ebuild
+++ b/dev-db/redis/redis-8.2.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="|| ( AGPL-3 RSAL-2 SSPL-1 ) Boost-1.0 MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+jemalloc selinux ssl systemd tcmalloc test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/kea/kea-3.0.2.ebuild b/net-misc/kea/kea-3.0.2.ebuild
index f8d6e1454084..d899b2a2584c 100644
--- a/net-misc/kea/kea-3.0.2.ebuild
+++ b/net-misc/kea/kea-3.0.2.ebuild
@@ -17,7 +17,7 @@ else
 		https://downloads.isc.org/isc/kea/${PV}/${P}.tar.xz
 		!doc? ( https://codeberg.org/peter1010/kea-manpages/archive/kea-manpages-${PV}.tar.gz )
 	"
-	KEYWORDS="~amd64 arm arm64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~x86"
 fi
 
 LICENSE="MPL-2.0"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 5ff0c01ee845..17937fbffd54 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -26,6 +26,7 @@ DIST gcc-15-20251108.tar.xz 92349104 BLAKE2B 40c890e2d61dd02f20a190c8d82175a1df2
 DIST gcc-15-20251115.tar.xz 92358784 BLAKE2B 8dcf640bd61c0e2379df666bdf9afb6a43492ac5aeb1023dc322b136dff7831166931a6953ac5b883fed45efa855740013e385cd478d0449f61eb8ff7ad296b0 SHA512 fc609f058a6683d6e0496d48ff4240e4f871b378ce1765844c56c5ac96cac04c556f3418b1e1b03a615a0b968c1e92ecfc3e4310e93a654327a718d00672fd14
 DIST gcc-15-20251122.tar.xz 92364288 BLAKE2B 6c7795992430e3a650f43033b135613c5cd56e4b6e4ff5b121f665dba47c038b4ccc339c50b3e3367e2f6436f5a7cf761bca1cd13dc3d42a50b1f1105b8b1c3c SHA512 0534c9ea6c2684e01d93b32301ed11df4a716637e0d68fae4659730dbfc5e23f3e28c41a6b86b25c1bf8b97816b076abcd24f5c2841516031dbc4473bdf28797
 DIST gcc-15-20251129.tar.xz 92340416 BLAKE2B afaa162576a96d304cf82dccbcd695f76b797e1da1506033b810d35d717d1e8f6a73a4939752a3495c81bda4826512e4db4f67534a6ce84a84fea8d3120c5cbe SHA512 c2cb111f6becd6f38ace9527029ef0cdc23c4ec14e1076ab514261b88efa42a354f8797c219f4db2c74d77340df4910a4bd1b30abfe38ea3c86bb9b9680db4cf
+DIST gcc-15-20251206.tar.xz 92344176 BLAKE2B 4aacac593eeb4a2dbefe8ac695d7df2ef732cac3a6e7f58b700c61402b9bbcbf36d550a13d118aad57b9917bb89cc5c877f256cc6c6b6a44d8b032ef0a93ea39 SHA512 04870762b7be62a14324b1a81f4d50eedcae1a306992bd14fb0f8f07f670bcbdcc26ed1a9cadf4bcff06527f6cbb99a23335ee0315cbc1d447435afb5cd8cc07
 DIST gcc-15.2.0-musl-patches-1.tar.xz 7168 BLAKE2B 6b7cfb123c3a691693240db815e6852a1e6c3820baa499368c463e0a0c1490c701053cfea10bf1d33f89dd2ba7bbddf63c4e6e0976590e3aaf1fee78b9282079 SHA512 ab80ffd69b9ead1fe06a9433faaa97ae53947d214999e77ea363fa6435de080d031a1aa6869e1dc088e800317952f2dc249a9e872113db56fb76f0a432240871
 DIST gcc-15.2.0-patches-2.tar.xz 18708 BLAKE2B 09c54bd1b8436e12a3da1c3ee41017cd3e960268a5d4637252152b44a4cc93934d4dc93eff842d7dcee4d1688b7f2d98be48114ef5c864793242177f7549c933 SHA512 f11cfafe00f7d18e05a316bd1dc522477cc4118fdd65019cf85bca674ff0180951506fef84ce0b5b13190ccfe44c777a64afdc602a4580595005b43b79ae7411
 DIST gcc-15.2.0-patches-3.tar.xz 17436 BLAKE2B ae72e3c5feb7b96c10eb0706efe95047f0516a66ec19488ad7281dd4c62d4c6f1d1d594c6a865c808293b30b4f57ee8bc018b90fcf5944ccb935bc391752aa74 SHA512 4d23fd0dacc33c069528ef0bd6ece3029a4b221e55c82347c2df8a6fa8b890c6e7eeaf15284204a4a29841678b033af2272481bde6fca8ebcc08f8c233f4e7e3
diff --git a/sys-devel/gcc/gcc-15.2.1_p20251206.ebuild b/sys-devel/gcc/gcc-15.2.1_p20251206.ebuild
new file mode 100644
index 000000000000..b31e36a7d0a9
--- /dev/null
+++ b/sys-devel/gcc/gcc-15.2.1_p20251206.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintenance notes and explanations of GCC handling are on the wiki:
+# https://wiki.gentoo.org/wiki/Project:Toolchain/sys-devel/gcc
+
+TOOLCHAIN_PATCH_DEV="sam"
+TOOLCHAIN_HAS_TESTS=1
+PATCH_GCC_VER="15.2.0"
+PATCH_VER="4"
+MUSL_VER="1"
+MUSL_GCC_VER="15.2.0"
+PYTHON_COMPAT=( python3_{11..14} )
+
+if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=master
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~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}"
+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 "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
+	eapply_user
+}