gentoo auto-resync : 09:03:2023 - 06:01:36

13 files changed, 394 insertions, 7 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 2d071bd2d284..38a70bbbfa5d 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 36db04648100..f14aaaa0f587 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -16,10 +16,15 @@ DIST cmake-3.25.2-SHA-256.txt 1646 BLAKE2B 10289acf1a74e45ad1109bb0759ce82024553
 DIST cmake-3.25.2-SHA-256.txt.asc 833 BLAKE2B 823c1132836529c3ca1c9060f504ad9904169621e3284c489b92f6334454ffa82791d336c78a27e705eca686e63131aed249c44e61b5f7fb915e80cca0155edc SHA512 16d5f8e0071db7f29b2f502b8a26e71e73519980555f64a548f1b3d5e917ec377cdfa49a4750dffde952e6b818dd37d000992bf67b553902b2117809f02b9486
 DIST cmake-3.25.2-docs.tar.xz 500144 BLAKE2B 9f45daf51c3acddce8e273649cd7445d00324883f2feccc98632a35d2ba72e7f6fd286f65bc362969f41d13cd5f34881aac8a229c9f6533caf0d86e1092075a8 SHA512 191daffb9a244fac79700bb0d21b3d65c7b94685dafd589122d37017660d13768e3e3257170bbfe46871efc59da6e7e2fcad0ce860cf87f1dc149c80df73cf91
 DIST cmake-3.25.2.tar.gz 10561266 BLAKE2B ca093cf0b2a0254494965c8b46ab188024b6d745cd56461451f4fa023fbb4f2cca7077877f1698c082d8a3b52c898d6f793657d8da3879f19f7b24139cbab7f0 SHA512 20146d06a1722c36249192944a58e4780aad334d2bc5ce2a3d8c4f24656630c5b71ca0ae7ed53587e3d46f488bd773452fa60c3fc7045fe54db2dbc6ffd86390
+DIST cmake-3.25.3-SHA-256.txt 1646 BLAKE2B 2b4febaa4c486f42c773621efe5ab3ff903578373c3df3ed060add6b42f1d16fe760a4b8825bf753ef0f72fe4584ffb3130a2ffc9397b12a93e1f14d5fba6128 SHA512 8d2f39c50206f6912ad575507f3172fb87b425f461990ba0f703c85b152aaa0bccb9d72a2e7dd38449b3c40bb7a1664ba9f4d5879d96c1928bb77effdcf25ada
+DIST cmake-3.25.3-SHA-256.txt.asc 833 BLAKE2B 7db637e3383915cb659b176ffc72508460ef73a245dc5ff99d9ba2649d8db0666e04ff2d428fefaa86cd14a07047bc7b7df0e0bed91ac80d9a8bb993f1d70102 SHA512 26f6c584d8f8bb44fc10b227f81ef3655d35140a1825270877e2be5460e4f0bfa92ca7d7186f55ef08085814c7f79e50cfc9cd7ba9880620aba25661ed1f75ac
+DIST cmake-3.25.3-docs.tar.xz 500216 BLAKE2B 5c6474328e2bfa17f5aa39693dabb19f33ac1f6875119e41d60f97c94bf1441b9d9528e96e4dd36d5d68e711c4bf4d32fe84a454df796755eccb1483fa55e3c8 SHA512 6e9ce5fc545324c327d8216dbbc316bbd5966640ae2b3e17ada00926004d55df75c5d25e6590ed53a8033d9638c5b6282bedd115ddf28b27980a80e40a3cba0c
+DIST cmake-3.25.3.tar.gz 10562254 BLAKE2B b7ae9f129731da30f89967eac20bdfcebd9c4f6ca3b28decc2016ab18292e4b51eb5a43b5797f874e23e64e1d01eeb98b18a927035aab8edc63a069f1bfce32b SHA512 ebcb5616ca418fe164863b157f67cff6e8c49b0f8f723c0bd219466211f3cfe8b93c4b3ad0fe6d2d3772881fd867b0905340945156f6d70a9ea08bfb7eb98550
 DIST cmake-3.26.0-rc4.tar.gz 10668045 BLAKE2B 2f768c69dcc4476a90bad3e6ffeed91c07ae349999057cbca450acc2aaccd12039a1131b0a268370b21c12ef41e7eafcb8a0dc3fc7b650337a97bf9a314bf674 SHA512 647c44833eaffb65400a1909fe29d502c633c76e0be6245bea57e337d2a81d04b0c5fd00ad556c668469bc5391e896679369c979fe3abe8e09fc2090986595a7
 DIST cmake-3.26.0_rc4-docs.tar.xz 507420 BLAKE2B 554d4d49053230c5c5f435ba31e7e82bcb5024e126511f91c767294e5e6739a36ff94f425c5deadd7b31b9bbd9df3f91c83b4b3578cad2f84959502950c4d0f4 SHA512 cef63824bb8c59e70b527f8f20a49cffa59ef69ca32b4f74d7c75a620bd3472e06200fb01f1ee393c3fc3e8607fe9df4ae2416e1c68a755c8cb2f89eca60a623
 EBUILD cmake-3.24.3.ebuild 8809 BLAKE2B ead6e18dc3b681108680c13cde096e898cb0cfb0afddb85c52596dc8df0b5e2b7553889d6de59e53eec0fc76e27d4240355c6e9af7eeb2780af7e2f72d394896 SHA512 9131ae15daeffc6570fe433ce18de40237a7663fc9a45dc8fd91801f442b2a0eb91b55ab611e00c6db2c15726c7b7c484615d002b65ab22cc7f987e00767e148
 EBUILD cmake-3.25.2.ebuild 8811 BLAKE2B ad918055cd12a4f6751e54dd6e65a41d96a339c147c7c66ef33d91115383df4c5d9d53ee872ff98a0a9d4db0f3c369800693e751c4813bbe546c5f62e535f6b0 SHA512 22a1559cbcfc4fdcb82cb43aa9a832035f416d152199fce538ff44fb502b7b86d4b716d50aa2c03d3457885dcf56cff530dd620c5677dea41a6459b27710210e
+EBUILD cmake-3.25.3.ebuild 8817 BLAKE2B 27df0065700970defcef1d429d98ff6f6d0d798d2dd2d0c1fb203eb820bf5b0229f3d803f88f34867de877d3cb341dc62e9a0f8db48509735ee9caa18a75762f SHA512 11ae2131ff707092c2d09ae01acaecce14ddf2ccc19cff4acb738f453a389c265543f7fce10620d7917f3b6ce77dd46a80ef1f6273b37bcd3128b497224082f6
 EBUILD cmake-3.26.0_rc4.ebuild 8843 BLAKE2B 5c9cdbb3cf940d6a91073f66e4a02968e6f6ba0fc148123e40fda54b5091410d6d0362bb47b200d2ec54f9ff07eb9d580a870a17b8a581287de43aeb8dbf7381 SHA512 774d3e77ec2d16bf33bb7956b850015182bce6c482667793fda9429bdd1d34644a48aa5fb42dc0fb062c4cee86e3a411d4ffb96a545069a38ef5cb03c0f78f9e
 EBUILD cmake-9999.ebuild 8843 BLAKE2B 5c9cdbb3cf940d6a91073f66e4a02968e6f6ba0fc148123e40fda54b5091410d6d0362bb47b200d2ec54f9ff07eb9d580a870a17b8a581287de43aeb8dbf7381 SHA512 774d3e77ec2d16bf33bb7956b850015182bce6c482667793fda9429bdd1d34644a48aa5fb42dc0fb062c4cee86e3a411d4ffb96a545069a38ef5cb03c0f78f9e
 MISC metadata.xml 456 BLAKE2B 2dc475cae4d2f65744e25381b1e4fe8b6399225380d0f9fa81870813221d180b1c4b538c3f9249f80e921a1db8afab7071db206898fdec294372811dc456d1f5 SHA512 347c1e13f459dfb9bec9d52ce556526eb74e6c432ff28aed28f05dc17bba17934fff1ce2fc27765b390bb55aaa7b02d0800939eb4382eba6c4b85a62ec136f5a
diff --git a/dev-util/cmake/cmake-3.25.3.ebuild b/dev-util/cmake/cmake-3.25.3.ebuild
new file mode 100644
index 000000000000..bcb269c0b956
--- /dev/null
+++ b/dev-util/cmake/cmake-3.25.3.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${CMAKE_DOCS_PREBUILT:=1}
+
+CMAKE_DOCS_PREBUILT_DEV=sam
+CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+CMAKE_DOCS_USEFLAG="+doc"
+
+# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
+# ... but seems fine as of 3.22.3?
+# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+	toolchain-funcs virtualx xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+if [[ ${PV} == 9999 ]] ; then
+	CMAKE_DOCS_PREBUILT=0
+
+	EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
+	inherit git-r3
+else
+	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+	if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )"
+	fi
+
+	if [[ ${PV} != *_rc* ]] ; then
+		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
+		inherit verify-sig
+
+		SRC_URI+=" verify-sig? (
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
+		)"
+
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
+	fi
+fi
+
+[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="CMake"
+SLOT="0"
+IUSE="${CMAKE_DOCS_USEFLAG} emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/libarchive-3.3.3:=
+	app-crypt/rhash
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/jsoncpp-1.9.2-r2:0=
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( >=app-editors/emacs-23.1:* )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND+="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+	test? ( app-arch/libarchive[zstd] )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# Prefix
+	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
+
+	# Handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
+	# Next patch needs to be reworked
+	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# Respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# disable running of cmake in bootstrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+		|| die "Bootstrap failed"
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then
+		default
+	else
+		cd "${DISTDIR}" || die
+
+		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
+		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
+		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
+
+		cd "${WORKDIR}" || die
+
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Disable Xcode hooks, bug #652134
+		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
+			Source/CMakeLists.txt || die
+		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
+			-e '/cmGlobalXCodeGenerator.h/d' \
+			Source/cmake.cxx || die
+
+		# Disable isysroot usage with GCC, we've properly instructed
+		# where things are via GCC configuration and ldwrapper
+		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+			Modules/Platform/Apple-GNU-*.cmake || die
+		# Disable isysroot usage with clang as well
+		sed -i -e '/_SYSROOT_FLAG/d' \
+			Modules/Platform/Apple-Clang.cmake || die
+		# Don't set a POSIX standard, system headers don't like that, #757426
+		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmLoadCommandCommand.cxx \
+			Source/cmStandardLexer.h \
+			Source/cmSystemTools.cxx \
+			Source/cmTimestamp.cxx
+		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmStandardLexer.h
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	# ODR warnings, bug #858335
+	# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
+	filter-lto
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DBUILD_TESTING=$(usex test)
+	)
+	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	# Fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    TestUpload, which requires network access
+	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
+	local myctestargs=(
+		--output-on-failure
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
+	)
+
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-util/dbus-test-runner/Manifest b/dev-util/dbus-test-runner/Manifest
index b0e920e24291..19f5dab3291c 100644
--- a/dev-util/dbus-test-runner/Manifest
+++ b/dev-util/dbus-test-runner/Manifest
@@ -1,4 +1,4 @@
 AUX dbus-test-runner-19.04.0-fix-deprecation-warnings.patch 1197 BLAKE2B 47323d9a859b24e478732be15a33ad5f96cb692d03132ee2923bca041bfef38b40cb54e3fc16f0ecc2232029fee80d5fbd03410a32dc93dc3acc580bd099118c SHA512 41c283e256df1d2436d1d3cb1ebdb1e89971dba17eec588800cba5f65da10766de523f0f891e559c405c6fa05ae020525ee30d7b15f57e55dd9681d5ad2ae78c
 DIST dbus-test-runner-19.04.0.tar.gz 444289 BLAKE2B dc3b11c8d376103b320d98d211bf1ace035a2de5a1caceadd946bfdc46a6aab3fcf69fae15c7142500b9487a9832275a6157f887c8efcbbb56d13c8841609dd0 SHA512 5906225f0ce429ea218d7eb4c67281b7ef368d6a173965b214f4f4501e729002ca3293a94fd8afd3002f301cd1f2208cba01c733f678c2d51661220e8a7ce971
-EBUILD dbus-test-runner-19.04.0-r2.ebuild 1353 BLAKE2B b73993230d2ab983cab718b88032955bcb1c560b9d07a507ec53891a1ba28d3d213638fc4211955fe24850974747ac7f61716224ab62e6a6e1f2680fcccaad8e SHA512 74065b5043caeec5d529091dce52ec00824c7266ce6607fd49c7c24d80d3a935bf7712e57b2a0aab5a8637cb5abbc27f5a7fd885702cf792a480d2a22bd8eca8
+EBUILD dbus-test-runner-19.04.0-r2.ebuild 1359 BLAKE2B 766f76b2e892fff169e035fe28e3220832137df0bb798f094da261b8da402bbf295b47de8edb48ec7bb6915ab7dc2fae56dba8dd377920381fe45ec78b2b8107 SHA512 31e405d91fc10141d3722ebf96c672c2a5877784090b10547a8471f6a426ea8351b4fa831ba7dcbc4097e2eb329039dfbb06becfa807b07df9feeab705fd4e42
 MISC metadata.xml 334 BLAKE2B 27ab7a8e8a84b7a33f23751ebe0957ee5275e95f97ace2983a3b1f05235cc5aff143b18ab4ce6deb611fabb34d2ab749cf110e682cbc250f5170ef72bfc66439 SHA512 a3208a00f3d7eda6ed24c70fde9eae4ce763c2ae20225fd41e430362e14ad6796ac43c5a9ae1926f44c2210fb4eb81885b6f37031197e34358398a4072b1d93d
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r2.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r2.ebuild
index 7b4079f7bb02..f80116f2c200 100644
--- a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r2.ebuild
+++ b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/fq/Manifest b/dev-util/fq/Manifest
index c82717330c69..47d9d880dd2b 100644
--- a/dev-util/fq/Manifest
+++ b/dev-util/fq/Manifest
@@ -2,6 +2,9 @@ DIST fq-0.2.0-deps.tar.xz 23494148 BLAKE2B 59400200a814d08fac88d9bcedc5db0ea2ae5
 DIST fq-0.2.0.tar.gz 12762736 BLAKE2B 7f1496b1da231b804b7e3af40f252381e83c62ca5e4779af65a502e9dc6a15a0a5267af68b83569c996f726870234c03952711e8262f360b2061bf34df5b2e4e SHA512 faf88faf0121a837c32dfbfe4c9e05261f28c2eec50d981f7840937ad121e45b0fa6809f428c45c0b41c99d1ae12a667a81911943e0601f2d81922ac670e03fe
 DIST fq-0.3.0-deps.tar.xz 23500960 BLAKE2B ed03e21c6ad2bedad72c68018518394b6438791d88edf14a725c56752fd83003e486d5e2d9e139742683b1adc43d8931b9a99f06e68d0c4abb389f20de0e1969 SHA512 1ca347a8b057948880fc049ac51810acd8212df5a74410bdeb1fba9f470369cf377f185d1fb36fa603bcaa7aeb0c25e50389935223a4f6a1786f919421933ec2
 DIST fq-0.3.0.tar.gz 12772624 BLAKE2B 07fb3109b89ca3c1a77210d0d59930c4a5665a0dc256d3daf6727d96fedd5fc3ac151b1623a5354cef96e21a0009023702759edd50712a4e76554b6cff71618d SHA512 725b9e7fc3fd481af1d792dcdb37a42d2cf0bb634b424df801909208c2479493219d08649e943296dd187f27f3ff1f16779f1ec3318e6eb99c9fe13943c5e9ae
+DIST fq-0.4.0-deps.tar.xz 23528264 BLAKE2B e547edf1bdd5ffdc567d820f3a8dbe5a87a1b7bb2bc6f5cbdd4b16d57d1458b36a08dd0cb5c3804eaf595876ae445851ae57fdb69b324012681bc410913c264c SHA512 fbf3dfa7e79e0a1eea2228f991c00b87bcbdba4dae24e27730d9824840ca5aeb5b21d6141ed5e5c8586422c171d4ffa3ad1e4bdde8de8bf91c7f309661ce0c92
+DIST fq-0.4.0.tar.gz 14024197 BLAKE2B d3de6e8b88aa4589d4edb18539bc13110bcfcdd3599f3c9b0759e5883e72f31ebe14eeb70a71b6333fd68b5ea97c0f0d1568788d94b7fb6a922f4fccf32d964f SHA512 8c8eeec5f701cbd9310f0cf44cbb5853602df84d21071a481a62cb864fe96925f0c143593c8c90b29c646aeb54d535c274e6745bfd51fddc8cfedffcfc57c712
 EBUILD fq-0.2.0-r1.ebuild 942 BLAKE2B ea4d2d52f01d9755017efa28328962ee53200b0bf3b8a038a2ca88042cdde44516839fc9dc1213b1d84599948c9e435205f563a9c848a7e90ef6ecbd00384ecc SHA512 89622e1bf2898438250b808e8398581fd0e1973233a77f7d94b26071e19f41dac107292bd9e5dde9bebd4f4e8c236448e45bec808714832fedcef4ae1c03ae28
 EBUILD fq-0.3.0.ebuild 860 BLAKE2B 118ad811631095bb7fd2b80ca52a826f8ee54c213e18c919bd4dfc18f9a4e5ec54a41f28d0e906e98b3760e7c2b7e3a05c76d78145d22a846f983d7644f2e891 SHA512 c04502e39c0ce7deeb17f3293f8bb84089588226691bb51077bb10058e26e42d8ac0c3786623be0965973a3213185608fed4963cf65e7c79124e5ac3671e53a6
+EBUILD fq-0.4.0.ebuild 860 BLAKE2B 118ad811631095bb7fd2b80ca52a826f8ee54c213e18c919bd4dfc18f9a4e5ec54a41f28d0e906e98b3760e7c2b7e3a05c76d78145d22a846f983d7644f2e891 SHA512 c04502e39c0ce7deeb17f3293f8bb84089588226691bb51077bb10058e26e42d8ac0c3786623be0965973a3213185608fed4963cf65e7c79124e5ac3671e53a6
 MISC metadata.xml 313 BLAKE2B 49888cd21e49fca7d7913fbd265cbffd73dcfaa5080e09ccd1f5b9c62804e5b9fb1de1e21df96609079c18c481b2847897b4fe1a9fc499d0e6dc2559e677a27f SHA512 1d125e77b24aeffe27b0d54b8b9f247e1e2b62037bdb127f232d3089d63e1b92c2062e37446067850defc382d7e49785152e9af86cd46f44827e2e037dd291a7
diff --git a/dev-util/fq/fq-0.4.0.ebuild b/dev-util/fq/fq-0.4.0.ebuild
new file mode 100644
index 000000000000..5df96c3f076c
--- /dev/null
+++ b/dev-util/fq/fq-0.4.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Tool for working with binary data (app-misc/jq for binary formats)"
+HOMEPAGE="https://github.com/wader/fq"
+SRC_URI="https://github.com/wader/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="MIT BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-tcltk/expect )"
+
+src_prepare() {
+	default
+
+	# Don't unconditionally (and therefore twice) build tests
+	# TODO: upstream
+	sed -i -e 's/all: test fq/all: fq/' Makefile || die
+}
+
+src_compile() {
+	# Avoid -s being set in Makefile (stripping)
+	export GO_BUILD_LDFLAGS="-w"
+
+	default
+}
+
+src_install() {
+	einstalldocs
+
+	dobin fq
+}
diff --git a/dev-util/ftjam/Manifest b/dev-util/ftjam/Manifest
index 840a4947bead..a12793c5fe88 100644
--- a/dev-util/ftjam/Manifest
+++ b/dev-util/ftjam/Manifest
@@ -3,5 +3,5 @@ AUX ftjam-2.5.3-false-flags.patch 1682 BLAKE2B 5b57ea37f2d99439e8ff550a6a8100922
 AUX ftjam-2.5.3-i-hate-yacc.patch 1756 BLAKE2B 26aefb56b2125b765eee2b6dc9a55fd0d3accc9244b8aa70dedca621a3ca69cb89218ba7920f2a47a4af6548b5343960fcde8701fc11c15c0ebe0bcd1f8ea452 SHA512 e02948ccccb963ddfeb777c217efafaf19239cacff80514c167166ec666a6301b90e1a86a2b97ab58fee006f509106cc0e3dacbbde822efd0db2b9f5f4645be8
 AUX ftjam-2.5.3-nostrip.patch 780 BLAKE2B 7299ec77c1ed3ccbc87669850ee54d6d61534983793f076e56d95ea83e9c8617c80ec08d84bad24bbf45f11b6e0275167f4454223366ef041a81a4360d1b1d09 SHA512 6d8b399f8a4047c34b1315a230cf47e8ab76c7fbad9089fd4c3c18b2ba7fbb2f3ecbcb2d3a1075f0d95d36e547490de345167ba55fed75221b2b8162796ccc25
 DIST ftjam-2.5.3rc2.tar.bz2 215963 BLAKE2B 77e92dba10dd2b99b53bea87dc47c7f1d5da2a39789cc938d8141debf3ba5d6e25ab4092e1a3b69266b3353866c76e72706d13d3751a321e42bc5aafdf87e8cd SHA512 18a40c6741493adf293f032d9c7a9ab419402505a37993fa859e36e7a1655ec9d3d07662e6ee242487b143aa7e0f6c46f253bc7e23c3162c7381aaced001bfcd
-EBUILD ftjam-2.5.3_rc2-r3.ebuild 921 BLAKE2B b2134c4795c734702e82f61dc14cf558169a05ce8b9ac3452f6c8146ef9505fa9940e1eb917cc180b97a2c55646952381201f86b40ad31d0db28fe8ae3ab1c5a SHA512 b5a52dbb5206d5a515a5c68ba814e6cf0d77f11331d93c7cf921954512eff489b282ccb699c37a09f8fb4ba8bddebe01404089e964ef54a77e8d2ec8dbefa57b
+EBUILD ftjam-2.5.3_rc2-r3.ebuild 927 BLAKE2B 033a193cf2149f08d20786109ace0990f6998e637464b5b932d2d091643d5327b66d521c332499a0cfe7b44dd6702b86aa65ad564d98332920a65a43e79d8d30 SHA512 4deb257a048e0713f2db776a8ad0cbef5b412f2db1b1cccb6c84c1e984a27a4d9c67d69753cf9b1268e42702f658e984a18410fa16a7c6960392101ce9673deb
 MISC metadata.xml 244 BLAKE2B 33747d916a648b727052b6ee2491cbec9390bbae7d04bfcbf809cdcd02c9476d8d9b5998a3f8193982bc614fe18f01a6e69b06178229fdf28d36e099be5aa4ca SHA512 a6646b07e17e55dad569f4a35ba0a2f995e62adf1250fb4ccf1270b22c56e81e0fe193b2ec3ef7c536779c9c813a4c9f63d7f85428d51cb5a82e41b2695cd65f
diff --git a/dev-util/ftjam/ftjam-2.5.3_rc2-r3.ebuild b/dev-util/ftjam/ftjam-2.5.3_rc2-r3.ebuild
index ccae3059497f..7197d4222a7d 100644
--- a/dev-util/ftjam/ftjam-2.5.3_rc2-r3.ebuild
+++ b/dev-util/ftjam/ftjam-2.5.3_rc2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://david.freetype.org/jam/ftjam-${MY_PV}.tar.bz2"
 
 LICENSE="perforce GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 BDEPEND="sys-devel/bison"
 
diff --git a/dev-util/gcovr/Manifest b/dev-util/gcovr/Manifest
index 0e5141cc228a..469b4fab343b 100644
--- a/dev-util/gcovr/Manifest
+++ b/dev-util/gcovr/Manifest
@@ -1,5 +1,7 @@
 DIST gcovr-5.1.tar.gz 1676960 BLAKE2B 106c30c7e349f8ffa7a9c52d70e59c32799a8def11986027e3b794ada07fc11ab27b322c377b553f4bb96ca8662bf152eeb7de2d1913381e6068123d2430aa6c SHA512 ae2f0d9ad04f2dc851db9bc99a30a5dc1b1f43dbc6336422ecf5228d37f6994406a83e50f1ee6b5c8d6ec6d7b9e2bba726fd3d502dc5022fe359d480e6d267a5
 DIST gcovr-5.2.tar.gz 1381017 BLAKE2B 8dcd7eb5d482f2020eb29da74e215f0b7731654a66b4ca6d0d919ad6b7eebe564c211a8ec5c4ef87efd61e7c18bfa524aae56d653522f23e4bb902a3921f9522 SHA512 d1a4dd63129ac1d2b9a892ced9b4a0644dc49dc3a115d81ddf348e43fea0e7809c6533104106da8f89a666a4af9ff5a62429b4270ff2272ca61bbebecb7fb921
+DIST gcovr-6.0.tar.gz 1054940 BLAKE2B 1947950d06926cf48d456e6bc389db46cfe4c7ed0395da1ebdb75aa1ea4b85f3cea536d77a4ddca5621885daaaf54462160592a5a384247f12ad3ed5c299b0b7 SHA512 3b4d30417b5000d2d28bc156dc9db43ba62cf8756aa5a9619391457d0042dc8eaf1743c5defdaabffb6b423bf2fcf8172b3e6c8795419758abc1acf4853de4bb
 EBUILD gcovr-5.1.ebuild 1010 BLAKE2B 5ab8716f554c9d28731df15f064bf96f6184dfba6f58da14c1fdfb7e98c61d7809085e790c98e65b078716304bb3ec660385b929726123fe7aa993d1dfa2fad7 SHA512 a0e57036967b5b3256c2a77792dbe92c8c5f1a2c1f5258131f2c279bcef6a780be385d3942d3ae95a2f723844099187e4b44b627cd5399ae828fc8d43f02ae3d
 EBUILD gcovr-5.2.ebuild 1056 BLAKE2B 71f8295c2334e921391bb5ec57cfbbaff2f5e8c17f1efce79c308d1ea2e4d85ac740dd243bfa5762b26f7ccec66a01948a60011744dc08bc15cc806dcc247139 SHA512 f88ee9df9e9ae5b448915791aaca18cfb0d3c23e86073922260897080c4dcb27d5634392b61fee0c3f9144d5de2dd6072b6e7f9d0cc11a4825590cf84d188a01
+EBUILD gcovr-6.0.ebuild 976 BLAKE2B 8c873c7f1a59c10b23121d4fcdacb5a42e8d5a7ae7db483dcb37576bcc19c015af53d14bdb86e4a7abc1559c6e9e7c17c02a0ddf1f34cd1ade6bf01dabd7b643 SHA512 9bcd505563aeec23cccca7599e14383f175e27d927e3687dc19de208d40c699c2cb7ab7399ff94129c7ef9a8a309303eafd27c04ea5eff376759701555b55465
 MISC metadata.xml 326 BLAKE2B 0ff392fe3a804fc6d8ea83de983357676a8155dee2fbb5204baf0ead2800210ea30a0171398c71dc60b1d9423a6fd65c0a9032d4511caa459c9b4d4f70ee4132 SHA512 5f5a49bfbbd3d3b77314f7de0c5981a3e700b42733d1c4f6868a7c25d12bb6227ebd254925cbbb6a5d73bf8a0b9f99115d396009d55797e39b53dc43a1a79107
diff --git a/dev-util/gcovr/gcovr-6.0.ebuild b/dev-util/gcovr/gcovr-6.0.ebuild
new file mode 100644
index 000000000000..f721625bc8ed
--- /dev/null
+++ b/dev-util/gcovr/gcovr-6.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python script for summarizing gcov data"
+HOMEPAGE="https://github.com/gcovr/gcovr"
+SRC_URI="https://github.com/gcovr/gcovr/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~x86"
+
+RDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/yaxmldiff[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PATH="${TEST_DIR}/scripts:${PATH}" \
+		PYTHONPATH="${TEST_DIR}/lib"
+
+	local deselect=(
+		# those tests fail on gcc newer than 5.8
+		# https://github.com/gcovr/gcovr/issues/206
+		gcovr/tests/test_gcovr.py
+	)
+
+	epytest gcovr ${deselect[@]/#/--deselect }
+}
diff --git a/dev-util/gi-docgen/Manifest b/dev-util/gi-docgen/Manifest
index cb2a8ba6a949..54cf6195bfc0 100644
--- a/dev-util/gi-docgen/Manifest
+++ b/dev-util/gi-docgen/Manifest
@@ -1,3 +1,3 @@
 DIST gi-docgen-2023.1.tar.gz 2516453 BLAKE2B d97ca86f1e9c29de3b1500a08b93a1617dddfc6f29314f1d0f1cbd3ec7b367f4de7b8d7d7eba9fbe5af0a8bbcdd4c4bb0786dfd4deda0acd19ac6372dea24d0a SHA512 fb19af318a66ba475e04826d9b61163ec85e6ea4503847ec6685940424bac8108cf385546bad1de80fedd1ddbb21054644083dc4908caf7e2e616c6e0673b0e3
-EBUILD gi-docgen-2023.1-r1.ebuild 1027 BLAKE2B 4744ea9cad2e148acf40c0631ea495371971a06fe50d3374bcdff231231441b360c0c7add25ace9aa8d2d8d075109e430b362d3ac5c25cad45e57c6e92675c0f SHA512 b05956da0aaf0c9962f26cb11a7e55269121749a518ca37070cd24dea9d08f45d7760be19c07cb7364f065ebf06c2f0771ac09ab78a031c855c1c0ec188e2c6a
+EBUILD gi-docgen-2023.1-r1.ebuild 1033 BLAKE2B f418cfaa9a34e7e34e6ef5afc204af967981167091f80b05949d10c243efbff0b75f4d50c2c4e547c152728d3f360493a4eaf794f66abca4919ae06a5bca3146 SHA512 b83b67fa9e03fdfda7290b71a1cc737f061aea4361eaaa73aaacc7e4f245feecacb196ddc31762cce050ff351da4ef769021ec9fcabd3628717247564af68261
 MISC metadata.xml 350 BLAKE2B 157af2fde028e5332e19fa28df298bd81e9aa0d61981ed034f4a270cb41de1ed1b8aa96c1537c4ea6e6588811d08456ba65678c47747bc744ceecf45531bdb2a SHA512 6aab61ec8a175dd2d6a1010753d1e70df2e7a030d708acb61ee4158dc0d2afc214aed20f0e01fa565c7b463617305f2a2d3347e5e80259f9b5b2e03383870c80
diff --git a/dev-util/gi-docgen/gi-docgen-2023.1-r1.ebuild b/dev-util/gi-docgen/gi-docgen-2023.1-r1.ebuild
index 2c400a82ca25..1d4c77144f15 100644
--- a/dev-util/gi-docgen/gi-docgen-2023.1-r1.ebuild
+++ b/dev-util/gi-docgen/gi-docgen-2023.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 GPL-3+ ) CC0-1.0 OFL-1.1 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="