gentoo auto-resync : 30:07:2023 - 22:42:58

6 files changed, 338 insertions, 18 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 47cc1b0864fe..e4495b9e9b98 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/mingw64-toolchain/Manifest b/dev-util/mingw64-toolchain/Manifest
index 0150357bc470..4e0b17453fd6 100644
--- a/dev-util/mingw64-toolchain/Manifest
+++ b/dev-util/mingw64-toolchain/Manifest
@@ -5,6 +5,7 @@ AUX mingw64-runtime-10.0.0-msvcr-extra-race.patch 1987 BLAKE2B 120aa8ad9ee269ee3
 AUX mingw64-runtime-10.0.0-tmp-files-clash.patch 572 BLAKE2B c0604bf4bcc3de23a4144bb1482e824c145e51e19468489702002c8d0e446dbd896424d1cd498329e144892e46349286d3d9fdf257a1cc181ee0ea6f87a25b3c SHA512 01eb77360b609a32bfa65da5b4ca4c737144514c43d1d05b462e2dec8051aef921fde23ec2c39c17444464ba46354dbe109e9267b8fa77a929be1550711290fd
 DIST binutils-2.39.tar.xz 25167756 BLAKE2B ac6a5296c6586d53eaadcbffc5c399a6d79edf72450b9bb8b3525ce525129cef3d2eb90c85ef3bb3270b5a03b0e1ffb8f0b705f028158726f9777ebb8685066f SHA512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3
 DIST binutils-2.40.tar.xz 25241484 BLAKE2B 8d799f7c595f878b9af5b17a490021dd8b8300ac2fe0ed8574c012929d22d2d0493e003a3e631a9436e8e712da801779b777c566167fe42b0bde119ffa5ad1c2 SHA512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925
+DIST binutils-2.41.tar.xz 26765692 BLAKE2B 3bccec2b52f7e82a727121bf2a2e51a6249ba63dcd74c665fd834e858645c912ffd8245d848435288b938852830b482905606f55c40df4061215fd75c52ffc75 SHA512 5df45d0bd6ddabdce4f35878c041e46a92deef01e7dea5facc97fd65cc06b59abc6fba0eb454b68e571c7e14038dc823fe7f2263843e6e627b7444eaf0fe9374
 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173
 DIST gcc-13.1.0.tar.xz 87451196 BLAKE2B b956a773cffe8b43bd6c9a99fe614f53f665438925a6b320975d301f547923e45d4d6fa577a143467fb03e0a9c1bab2b6719a1011d672367f3e644433a2d7606 SHA512 6cf06dfc48f57f5e67f7efe3248019329a14d690c728d9f2f7ef5fa0d58f1816f309586ba7ea2eac20d0b60a2d1b701f68392e9067dd46f827ba0efd7192db33
 DIST gcc-13.2.0.tar.xz 87858592 BLAKE2B 0034b29d3d6cc05821f0c4253ce077805943aff7b370729dd203bda57d89c107edd657eeddc2fb1e69ea15c7b0323b961f46516c7f4af89a3ccf7fea84701be2 SHA512 d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b789e1232a34a20be1a0b60097de9280efe47bdb71c73251e30b0862a2
@@ -13,4 +14,5 @@ DIST mingw-w64-v11.0.0.tar.bz2 10058657 BLAKE2B 3f7637bcc7c3f25b2141d35105ea086e
 EBUILD mingw64-toolchain-10.0.0_p1-r2.ebuild 10084 BLAKE2B ba491e66b82d7801d2678f97075309e2724bfda2566fdcb26d83d17c377451b4c583c1785792eaac72bde509e0b3e2d88ffd1daab3829f3ad12f51c4b0adc2a7 SHA512 f88435dcb643ddca15704a5ced522daf255a6aafd51d06ac30c83f77e2994d29e2da84dea0d78c85a6f81ef0ab411615697b8140d743c30f62504fe997134bd7
 EBUILD mingw64-toolchain-11.0.0.ebuild 10079 BLAKE2B d20d96fb2435fabd6feaad85c5e11fbb98d29344e8596845f8949c3c223b630ac8d16c00f651fdb49d79e3fd9ef6d1805af4bfa4b6e0e86e5fd8006f3a2648ab SHA512 164130a70dfdcb469e60d7c62e3406dcecfb851b6420950fb9e505fe74f91b954a5f5505f42c9a86a0652208aa6124d97e80d32208000e13f3f5ad38c094f332
 EBUILD mingw64-toolchain-11.0.0_p1.ebuild 10235 BLAKE2B 71b69f64a662bc2a47e3cba0a0f6454bcfebba59e19eee4be0e140c02847000dfaa414eadfd59e9251d94d6c06d3f2075138bacb153cba909aa3c6aecb9972a7 SHA512 882d63b4bdf873c02188758e16cd8c1d7077bf0bdd446adbc0f40426a89229fa94a3fb8ef3735c2b548bc46378639fa29d4e72e9f2499f837fc6df762013a612
+EBUILD mingw64-toolchain-11.0.0_p2.ebuild 10093 BLAKE2B ca1563604106ab4bcfd29794e1c443e3ca7e92f811388cdbf22feb97a9db44ea9749a5e25488dc1e07c632be449b5b83e196d618ffbf875c781d1acf4854c0c5 SHA512 bcf505e2f902e0d0d73449af3ef1bebb043996e441df83ddee15abac8460eb32b33ee131ffcf356b0af11ea4b3e8473f60a388657f45d516d5dd2a43a222fc5e
 MISC metadata.xml 432 BLAKE2B 273e7dd75d25bd1857a83a8fbad8705413e2780589beca8e9841fabd266f1e94d6f85875901829cbdd5bfd979d23c1ebacb3b07a04cb48388e0a10656ade6cca SHA512 71bf6b85f6b8b8640167a464296199f8d91d36ef048a21a1bd55383dc5ee6ccace50b153e6945163d197f8227f05c2f339899e5b3c5c67e01896241326b2f313
diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-11.0.0_p2.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-11.0.0_p2.ebuild
new file mode 100644
index 000000000000..924db6d0bca9
--- /dev/null
+++ b/dev-util/mingw64-toolchain/mingw64-toolchain-11.0.0_p2.ebuild
@@ -0,0 +1,330 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit edo flag-o-matic multilib-build toolchain-funcs
+
+# Pick versions known to work for wine+dxvk, and avoid too frequent updates
+# due to slow rebuilds. Do _p1++ rather than revbump on changes (not using
+# Gentoo patchsets for simplicity, their changes are mostly unneeded here).
+BINUTILS_PV=2.41
+GCC_PV=13.2.0
+MINGW_PV=$(ver_cut 1-3)
+
+DESCRIPTION="All-in-one mingw64 toolchain intended for building Wine without crossdev"
+HOMEPAGE="
+	https://www.mingw-w64.org/
+	https://gcc.gnu.org/
+	https://sourceware.org/binutils/
+"
+SRC_URI="
+	mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${MINGW_PV}.tar.bz2
+	mirror://gnu/binutils/binutils-${BINUTILS_PV}.tar.xz
+"
+if [[ ${GCC_PV} == *-* ]]; then
+	SRC_URI+=" mirror://gcc/snapshots/${GCC_PV}/gcc-${GCC_PV}.tar.xz"
+else
+	SRC_URI+="
+		mirror://gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz
+		mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz
+	"
+fi
+S="${WORKDIR}"
+
+# l1:binutils+gcc, l2:gcc(libraries), l3:mingw64-runtime
+LICENSE="
+	GPL-3+
+	LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 )
+	ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain
+"
+SLOT="0"
+# unkeyworded for testing binutils-2.41+gcc-13.2.0
+#KEYWORDS="-* ~amd64 ~x86"
+IUSE="+abi_x86_32 custom-cflags debug"
+
+RDEPEND="
+	dev-libs/gmp:=
+	dev-libs/mpc:=
+	dev-libs/mpfr:=
+	sys-libs/zlib:=
+	virtual/libiconv
+"
+DEPEND="${RDEPEND}"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	strerror_r # libstdc++ test using -Wimplicit+error
+)
+
+PATCHES=(
+	"${FILESDIR}"/gcc-12.2.0-drop-cflags-sed.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	tc-is-cross-compiler &&
+		die "cross-compilation of the toolchain itself is unsupported"
+}
+
+src_prepare() {
+	# rename directories to simplify both patching and the ebuild
+	mv binutils{-${BINUTILS_PV},} || die
+	mv gcc{-${GCC_PV},} || die
+	mv mingw-w64-v${MINGW_PV} mingw64 || die
+
+	default
+}
+
+src_compile() {
+	# not great but do everything in src_compile given bootstrapping
+	# process needs to be done in steps of configure+compile+install
+	# (done modular to have most package-specific things in one place)
+
+	CTARGET=$(usex x86 i686 x86_64)-w64-mingw32
+
+	MWT_D=${T}/root # moved to ${D} in src_install
+	local mwtdir=/usr/lib/${PN}
+	local prefix=${EPREFIX}${mwtdir}
+	local sysroot=${MWT_D}${prefix}
+	local -x PATH=${sysroot}/bin:${PATH}
+
+	filter-lto # requires setting up, and may be messy with mingw static libs
+	use custom-cflags || strip-flags # fancy flags are not realistic here
+
+	local multilib=false
+	use abi_x86_32 && use abi_x86_64 && multilib=true
+
+	# global configure flags
+	local conf=(
+		--build=${CBUILD:-${CHOST}}
+		--target=${CTARGET}
+		--{doc,info,man}dir=/.skip # let individual packages handle docs
+	)
+
+	# binutils
+	local conf_binutils=(
+		--prefix="${prefix}"
+		--host=${CHOST}
+		--disable-cet
+		--disable-default-execstack
+		--disable-nls
+		--disable-shared
+		--with-system-zlib
+		--without-debuginfod
+		--without-msgpack
+		--without-zstd
+	)
+	mwt-binutils() {
+		# symlink gcc's lto plugin for AR (bug #854516)
+		ln -s ../../libexec/gcc/${CTARGET}/${GCC_PV%%[.-]*}/liblto_plugin.so \
+			"${sysroot}"/lib/bfd-plugins || die
+	}
+
+	# gcc (minimal -- if need more, disable only in stage1 / enable in stage3)
+	local conf_gcc=(
+		--prefix="${prefix}"
+		--host=${CHOST}
+		--disable-bootstrap
+		--disable-cet
+		--disable-gcov #843989
+		--disable-gomp
+		--disable-libquadmath
+		--disable-libsanitizer
+		--disable-libssp
+		--disable-libvtv
+		--disable-shared
+		--disable-werror
+		--with-gcc-major-version-only
+		--with-system-zlib
+		--without-isl
+		--without-zstd
+	)
+	${multilib} || conf_gcc+=( --disable-multilib )
+
+	local conf_gcc_stage1=(
+		--enable-languages=c
+		--disable-libatomic
+		--with-sysroot="${sysroot}"
+	)
+	local -n conf_gcc_stage2=conf_gcc_stage1
+
+	local conf_gcc_stage3=(
+		--enable-languages=c,c++
+		--enable-threads=posix # needs stage3, and is required for dxvk/vkd3d
+		--with-sysroot="${prefix}"
+		--with-build-sysroot="${sysroot}"
+	)
+
+	# mingw64-runtime (split in several parts, 3 needed for gcc stages)
+	local conf_mingw64=(
+		--prefix="${prefix}"/${CTARGET}
+		--host=${CTARGET}
+		--with-sysroot=no
+		--without-{crt,headers}
+
+		# mingw .dll aren't used by wine and packages wouldn't find them
+		# at runtime, use crossdev if need dll and proper search paths
+		--disable-shared
+	)
+
+	local conf_mingw64_headers=(
+		--enable-idl
+		--with-headers
+	)
+	mwt-mingw64_headers() { ln -s ${CTARGET} "${sysroot}"/mingw || die; } #419601
+
+	local conf_mingw64_runtime=( --with-crt )
+	${multilib} ||
+		conf_mingw64_runtime+=( $(usex x86 --disable-lib64 --disable-lib32 ) )
+
+	local conf_mingw64_libraries=( --with-libraries )
+	local conf_mingw64_libraries32=(
+		--libdir="${prefix}"/${CTARGET}/lib32
+		--with-libraries
+		CC="${CTARGET}-gcc -m32"
+		RCFLAGS="--target=pe-i386 ${RCFLAGS}"
+	)
+
+	# mingw64-runtime's idl compiler (useful not to depend on wine for widl)
+	local conf_widl=( --prefix="${prefix}" )
+
+	# mwt-build [-x] <path/package-name> [stage-name]
+	# -> ./configure && make && make install && mwt-package() && mwt-package_stage()
+	# passes conf, conf_package, and conf_package_stage arrays to configure, and
+	# users can add options through environment with e.g.
+	#	MWT_BINUTILS_CONF="--some-option"
+	#	MWT_GCC_STAGE1_CONF="--some-gcc-stage1-only-option"
+	#	MWT_WIDL_CONF="--some-other-option"
+	#	EXTRA_ECONF="--global-option" (generic naming for if not reading this)
+	mwt-build() {
+		if [[ ${1} == -x ]]; then
+			(
+				# cross-compiling, cleanup and let ./configure handle it
+				unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP RANLIB RC STRIP
+				CHOST=${CTARGET}
+				filter-flags '-fuse-ld=*'
+				filter-flags '-mfunction-return=thunk*' #878849
+
+				# -mavx with mingw-gcc has a history of obscure issues and
+				# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
+				# crashes with -march=skylake >=wine-8.10, similar issues with
+				# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
+				append-flags -mno-avx
+
+				strip-unsupported-flags
+				mwt-build "${@:2}"
+			)
+			return
+		fi
+
+		local id=${1##*/}
+		local build_dir=${WORKDIR}/${1}${2+_${2}}-build
+
+		# econf is not allowed in src_compile and its defaults are
+		# mostly unused here, so use configure directly
+		local conf=( "${WORKDIR}/${1}"/configure "${conf[@]}" )
+
+		local -n conf_id=conf_${id} conf_id2=conf_${id}_${2}
+		[[ ${conf_id@a} == *a* ]] && conf+=( "${conf_id[@]}" )
+		[[ ${2} && ${conf_id2@a} == *a* ]] && conf+=( "${conf_id2[@]}" )
+
+		local -n extra_id=MWT_${id^^}_CONF extra_id2=MWT_${id^^}_${2^^}_CONF
+		conf+=( ${EXTRA_ECONF} ${extra_id} ${2+${extra_id2}} )
+
+		einfo "Building ${id}${2+ ${2}} in ${build_dir} ..."
+
+		mkdir -p "${build_dir}" || die
+		pushd "${build_dir}" >/dev/null || die
+
+		edo "${conf[@]}"
+		emake V=1
+		# -j1 to match bug #906155, other packages may be fragile too
+		emake -j1 V=1 DESTDIR="${MWT_D}" install
+
+		declare -f mwt-${id} >/dev/null && edo mwt-${id}
+		declare -f mwt-${id}_${2} >/dev/null && edo mwt-${id}_${2}
+
+		popd >/dev/null || die
+	}
+
+	# workaround race condition with out-of-source crt build (bug #879537)
+	mkdir -p mingw64_runtime-build/mingw-w64-crt/lib{32,64} || die
+
+	# build with same ordering that crossdev would do + stage3 for pthreads
+	mwt-build binutils
+	mwt-build mingw64 headers
+	mwt-build gcc stage1
+	mwt-build -x mingw64 runtime
+	mwt-build gcc stage2
+	${multilib} && mwt-build -x mingw64 libraries32
+	mwt-build -x mingw64 libraries
+	mwt-build gcc stage3
+	mwt-build mingw64/mingw-w64-tools/widl
+	# note: /could/ system-bootstrap if already installed, but gcc and
+	# libraries will use the system's older mingw64 headers/static-libs
+	# and make this potentially fragile without more workarounds/stages
+
+	if ${multilib}; then
+		# Like system's gcc, `x86_64-w64-mingw32-gcc -m32` can build for x86,
+		# but packages expect crossdev's i686-w64-mingw32-gcc which is the same
+		# just without 64bit support and would rather not build the toolchain
+		# twice. Dirty but wrap to allow simple interoperability with crossdev.
+		mwt-i686_wrapper() {
+			printf "#!/usr/bin/env sh\nexec \"${prefix}/bin/${bin}\" ${*} "'"${@}"\n' \
+				> ${bin32} || die
+			chmod +x ${bin32} || die
+		}
+		pushd "${sysroot}"/bin >/dev/null || die
+		local bin bin32
+		for bin in ${CTARGET}-*; do
+			bin32=${bin/x86_64-w64/i686-w64}
+			case ${bin#${CTARGET}-} in
+				as) mwt-i686_wrapper --32;;
+				cpp|gcc|gcc-${GCC_PV%%[.-]*}|g++|widl) mwt-i686_wrapper -m32;;
+				ld|ld.bfd) mwt-i686_wrapper -m i386pe;;
+				windres) mwt-i686_wrapper --target=pe-i386;;
+				*) ln -s ${bin} ${bin32} || die;;
+			esac
+		done
+		popd >/dev/null || die
+	fi
+
+	# portage doesn't know the right strip executable to use for CTARGET
+	# and it can lead to .a mangling, notably with 32bit (breaks toolchain)
+	dostrip -x ${mwtdir}/{${CTARGET}/lib{,32},lib/gcc/${CTARGET}}
+
+	# ... and instead do it here given this saves ~60MB
+	if use !debug; then
+		einfo "Stripping ${CTARGET} static libraries ..."
+		find "${sysroot}"/{,lib/gcc/}${CTARGET} -type f -name '*.a' \
+			-exec ${CTARGET}-strip --strip-unneeded {} + || die
+	fi
+}
+
+src_install() {
+	mv "${MWT_D}${EPREFIX}"/* "${ED}" || die
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Note that this package is primarily intended for Wine and related"
+		elog "packages to depend on without needing a manual crossdev setup."
+		elog
+		elog "Settings are oriented only for what these need and simplicity."
+		elog "Use sys-devel/crossdev if need full toolchain/customization:"
+		elog "    https://wiki.gentoo.org/wiki/Mingw"
+		elog "    https://wiki.gentoo.org/wiki/Crossdev"
+	fi
+
+	local cross_gcc=cross-$(usex x86 i686 x86_64)-w64-mingw32/gcc
+	if has_version ${cross_gcc}; then
+		# encourage cleanup given users may not realize if switch by default
+		ewarn "${cross_gcc} is installed, note that ${PN}"
+		ewarn "is redundant with the *-w64-mingw32/{binutils,gcc,mingw64-runtime}"
+		ewarn "packages and optionally only one needs to be kept."
+	fi
+}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 33047154b2cb..03a2865c0fa9 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,7 +1,7 @@
 AUX 50pkgcheck-gentoo.el 125 BLAKE2B db546b7f4e1517fb4f3bc46eff6a3294c8d677be031ecb33987daa84c355c3628ab7f24bbab90afb24b0bcec6c0ebebb56339374fa35a345481aa9808bd538be SHA512 31bad085867ebecedf0c9c3ed1223e7512238892d69b5224e850d744c5965bf7a2d7cb90978d9cce6da8dc554dba36803d604b8c6ac2b7cc9f2718ef7d6fc644
-DIST pkgcheck-0.10.23.tar.gz 568903 BLAKE2B 8b00dc93d0c3f597f7397d2e7b3686d11b12da715d6e8071f1b02a8085061cbb2d7cb24bde6a73ef6e5d1459637cb78e536ce80a162f188a42739a434c62c397 SHA512 3bcdb91bf73cde60fd9fc2f5e470c5ccdfd7b3564e83192201b0fa1dc38265e1e0c7f7052039accbb62c55d816a6e89317d7d388c0cc3da3b4836475cb82bd03
 DIST pkgcheck-0.10.24.tar.gz 572336 BLAKE2B 851d6e8d8a5402c539cb690e6e915d3875658f0f4c9e60e8f506d6a663d0732993f2af7a46b3dcf7c2fba11a3d7b521753aa537a893796b8cda216c9e9d370af SHA512 bb0eb962d9d6cafc5b4ca1280307aae8e154d813151841373334971b7613099ebeeb2b9eb3ca9755da43d76a6448b6a8f6570201810b182cf868a172992b40a5
-EBUILD pkgcheck-0.10.23.ebuild 2161 BLAKE2B 205f7a20d466ec9d3300d373e9aefea4420489b251b077543375fcf40636820fe2d258f8c10421434f167f4654e1da69d4b21c36b493236c241ff10929c2462e SHA512 3ac329f184a5708c80e3d1096c964054126f5d1f367598d881c526861160f0dab970ef9c2ee49db43fbbfd1f0af13a9c1edcca5d72a5ca7ff566ced3e82825ea
+DIST pkgcheck-0.10.25.tar.gz 580383 BLAKE2B 2f32bf413dcb68a59b82ee04147b7844efd7b69d932b5d57182e1c91be12750fe14fdd42bf40c652c69e8ac009b2346cc644a9407cf11f03eea2e74f4ab8edc6 SHA512 8d90b5629236f468b5553ca288dbd4843d83b09adc9b9b20a6ad6228a8bff74bf1c1e473575f85d1fb00bdd416e07cc77ea098fd6a2b29edf39f51da364c4831
 EBUILD pkgcheck-0.10.24.ebuild 2406 BLAKE2B b376ddbadd06396be6ad45901a89c6e17f1ce3cf3046234b8ae2cdd4f7e1d29c2c429fd53e75bc0856d8e2ec6ead97ea09568925c384785bd5c98687a4923581 SHA512 00b1e7ceeb65f9298f991cd85fbc0b3ecedca6b1884d9f49f893b83dedb85205bda2031a2ca5cbad7919997f3e13a030047862836efa42ec2873091c96ffa01e
-EBUILD pkgcheck-9999.ebuild 2414 BLAKE2B 1651e17e6ae033e62ff219ea55a4c343263f02b6bbd24b0c39c17fc678f10cdc968710774f9913d6c8374f594655c52d5159076ed1296239a2c452f13ebc60ea SHA512 7215066128e1a228150ed2d8e86ab911b54be93f31501f62bbcd3514b4c6c773e09f61262e7d2fab0297af46d6bc45fb7a29fb8a8cd51f9fb1c20bbfff56734a
+EBUILD pkgcheck-0.10.25.ebuild 2170 BLAKE2B 50e2951640449fca4366eaad381c7fa06f6264c11779eb0c52a962cbdf9bc18d7f6b294e0d342431f616d5cdfaae7267cab18608b8223f02caf64c2ed90edd7b SHA512 99321901bd54a6d94f0e2fb0ebda5f8fe7fa096968c5548bba3e341c020c620dea290cfdb85bd54325e00a00c8e513e799ab773ca49c6918852a2ced4c0a686b
+EBUILD pkgcheck-9999.ebuild 2170 BLAKE2B 50e2951640449fca4366eaad381c7fa06f6264c11779eb0c52a962cbdf9bc18d7f6b294e0d342431f616d5cdfaae7267cab18608b8223f02caf64c2ed90edd7b SHA512 99321901bd54a6d94f0e2fb0ebda5f8fe7fa096968c5548bba3e341c020c620dea290cfdb85bd54325e00a00c8e513e799ab773ca49c6918852a2ced4c0a686b
 MISC metadata.xml 455 BLAKE2B b544db3532ef1da966833d5edbc79988cc1fd85b6d6276476684b49d4485814d6e2d969e742d3633c8176e7f37cae6614dae1654fd1424d71475f022166f6e6a SHA512 5abd1584f486e88992bab8c51c191b4915a5854752130f8a591147ff4b2af2102fdc8ab182e7358c3e4bbb3fdc8400563a250e2dba1793d365f0edc7c5f7c33a
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.23.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.25.ebuild
index 60b9b8d6e828..1727c0d298cd 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.23.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.25.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit elisp-common distutils-r1 optfeature
 
 if [[ ${PV} == *9999 ]] ; then
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 		https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 	inherit pypi
 fi
 
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 25fe3d8378ba..1727c0d298cd 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -50,9 +50,7 @@ BDEPEND="${RDEPEND}
 	dev-python/wheel
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/requests[${PYTHON_USEDEP}]
-		' python3_{10..11} )
+		dev-python/requests[${PYTHON_USEDEP}]
 		dev-vcs/git
 	)
 "
@@ -73,16 +71,6 @@ src_compile() {
 	fi
 }
 
-python_test() {
-	if ! has_version -b "dev-python/requests[${PYTHON_USEDEP}]" ; then
-		EPYTEST_DESELECT=(
-			tests/checks/test_all.py::TestNetworkCheck::test_network_enabled
-		)
-	fi
-
-	epytest
-}
-
 python_install_all() {
 	local DOCS=( NEWS.rst )
 	[[ ${PV} == *9999 ]] || doman man/*