gentoo auto-resync : 11:01:2025 - 06:41:28

9 files changed, 590 insertions, 56 deletions

diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index fd5dc1befe2a..b97496fbe0de 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-build/bazel-buildtools/Manifest b/dev-build/bazel-buildtools/Manifest
index e720febe7d59..1184db8b12e7 100644
--- a/dev-build/bazel-buildtools/Manifest
+++ b/dev-build/bazel-buildtools/Manifest
@@ -1,4 +1,7 @@
 DIST bazel-buildtools-7.3.1-deps.tar.xz 3588840 BLAKE2B 9b0766803201b9bee5329865714b9ed798b06b32b77f3b80efbd31fe9cbe8f6397f9a29c9e0947b1609ae20a697bddb8c2db934c28609aa58bfd9cf343dab923 SHA512 136c1493f688b4b90d31a7f90c3c8e3e62cc26824dcf679d321a649c99638780fcd27771c31e21d6afc0272b249cbfdaf78a07fa2335c904c1f966da1ca0b561
 DIST bazel-buildtools-7.3.1.tar.gz 330909 BLAKE2B 15d3ce94411bbc33f166b15f94699ac4fee373ff29f7f8226800776845611f29b1e0557bb62441fa62540792b63f634062de376ba1587e7c91d0504d6a66424f SHA512 3c06bdf7b6bb7cbe9a9f455e31be16bf36b97769515c761bda2e11a39d4eb12d8e65e7ea051e58ad26b782a93fadb5dd8221c30f75cc96d5ddd3abadce7fdbe2
+DIST bazel-buildtools-8.0.0-deps.tar.xz 3587652 BLAKE2B d33d6136591c1e1835cb2de4b707e324a53034284fa54ff4beaddad90f2cc23b2f6d6a1cca9c856d0de38b32efd03a34affafaf7c1e4f97c6c6e23b44febab28 SHA512 d2ab670cd16667e4034ae3342aec00b1916739debaa9280f8efb4d7c8c482366014c7055201e96b4cb1a327b9d8141613ecb13bf44d5ed73f9002433b784febe
+DIST bazel-buildtools-8.0.0.tar.gz 332898 BLAKE2B 45a94e3bba1f0a4cc810f2e7f9b65cd11307e37f29b633936fc0f8661cf3439e8c25b79c011547e7f0394b141b21f7e565de1cd1d4b465fb901894238e701325 SHA512 3ff66b64001979e2b5fbb85dbb64b6452b1a0138ececcce0d3e3a29b9bf932346180fdff2f5f809073386d545721fc3a5b53e6bd106a05da2c1ab844e2daa436
 EBUILD bazel-buildtools-7.3.1.ebuild 1442 BLAKE2B de4231580489f7bdcc0a1cbd5f1209b03c0decba7f9f4b3d695038069fed0697105a2a53eba245ca1df3c0e6775451ca8367ac0835f69f15f0c89fe390c29869 SHA512 b61b09d4a8217c0c0a1add80e67ecde60c4f6a730b47d0ca96358db8a5fe263377fd1e53402e0258669245fedbb5a8e623f2324a0b61e3c90cd5733af31fb1dd
+EBUILD bazel-buildtools-8.0.0.ebuild 1442 BLAKE2B eb8697c61e936e7d3f80f7072167d13ff9390a132bad4c4d14961491a3efa29ceef5b0f47b4ebd5920fa7ca88b0197ec96790e965b65448f847a6979694209a2 SHA512 0ab7a19b97ebfa7464bbb0721c5d1f68325ddd99e28c4a87408670cf731f6b66856416bae85d590b8672d0b9e98e0e67576ce24fe6fa2b0320abd0fb30829c8c
 MISC metadata.xml 719 BLAKE2B 12b4496d75f6d7d139e28aad645477c8a4e4f72395b98859b7114d93cd3f3493b03faa79acdb34246faf11dc834cdb0ae1723a790449308a9e581b0c1eba18a9 SHA512 0be70ebe1ebd098018e7bb4d88e11b865267e3753b8bf392186a212d4d9e3ba10f4f05f0d262948d4d3a1672419fefee81b55246d86a6743308ae781c034070a
diff --git a/dev-build/bazel-buildtools/bazel-buildtools-8.0.0.ebuild b/dev-build/bazel-buildtools/bazel-buildtools-8.0.0.ebuild
new file mode 100644
index 000000000000..1f295e34f2cb
--- /dev/null
+++ b/dev-build/bazel-buildtools/bazel-buildtools-8.0.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+APP_PN="buildtools"
+
+inherit go-module
+
+DESCRIPTION="Tools for working with Google's Bazel BUILD files."
+HOMEPAGE="https://github.com/bazelbuild/buildtools/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/bazelbuild/${APP_PN}.git"
+else
+	SRC_URI="https://github.com/bazelbuild/${APP_PN}/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${APP_PN}-${PV}"
+
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+SRC_URI+="
+	https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DOCS=( README.md WARNINGS.md )
+
+src_prepare() {
+	default
+
+	rm ./warn/docs/docs.go || die
+}
+
+src_compile() {
+	local -r go_ldopts="
+		-X main.buildScmRevision=v${PV}
+		-X main.buildVersion=${PV}
+	"
+	local -a -r go_buildopts=(
+		-ldflags "${go_ldopts}"
+		-o ./bin/
+	)
+	ego build "${go_buildopts[@]}" ./...
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe ./bin/{buildifier{,2},buildozer}
+	newexe ./bin/generatetables bazel-generatetables
+	newexe ./bin/unused_deps bazel-unused_deps
+
+	local app=""
+	for app in buildifier buildozer unused_deps ; do
+		newdoc "${S}/${app}/README.md" "${app}.md"
+	done
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	einfo 'The "generatetables" binary is installed as "bazel-generatetables"'
+	einfo 'and the "unused_deps" binary is installed as "bazel-unused_deps"'.
+}
diff --git a/dev-build/cmake/Manifest b/dev-build/cmake/Manifest
index 83712b98c8de..d6e2fcb55a69 100644
--- a/dev-build/cmake/Manifest
+++ b/dev-build/cmake/Manifest
@@ -22,9 +22,13 @@ DIST cmake-3.31.0-docs.tar.xz 562756 BLAKE2B ef1d145658fd197ea515f05fbbad54b213b
 DIST cmake-3.31.3-SHA-256.txt 1646 BLAKE2B ad01a76e00bb35a48b617ae343bf10ea4f64e5057c595715d22c086cd371775f6bebc70c763049d426dc85073c966b41a3fbc05155c912835d97252371c7efc4 SHA512 cd5b8c8ea2bdfcc19a0d34b8f2051f932fde931f89cb40b3111badc476e92def3724ac6867e90bba070ad288ef8f73da1eb00c76bd32509027b4cfa0c6c03e01
 DIST cmake-3.31.3-SHA-256.txt.asc 833 BLAKE2B 03b24dd074e8f518713b58d44394bff7b4d3c2150bb1204ae5ca37b2e06031b60a96e1494bc19d100e4da9be78f71b093f6e66ddd5190d30528a09b87084a4c6 SHA512 e4549a1680b7ecfb1801b3f09d1504df07f2d3d383f021e1ea007f3ec23e35eeb3494d05eff6bf100ef165ad0267a05595dcc550e85879d2dd2f17b5fbb59d9a
 DIST cmake-3.31.3.tar.gz 11708383 BLAKE2B ab2114133bb0821c236c5e742f5af6abce81b7efd4ab16cca74af9030aa0439f545a06d5fd407794733bff3728ed0419e81168382f43caa5abd4ca2bdba68cde SHA512 d7209c023ce7d45aa3fe4aee78271b89b3c4b1b71b183e978ba0b709255c8db0530d565e083e2dd881df3a18274d901930f70827614ee4df7bb6f4c7d50eae7e
+DIST cmake-3.31.4-SHA-256.txt 1646 BLAKE2B d9bcb6f0c0e47e9ae1e82082371fdc9d78c4207b0e85c465ff7c843fb6fd09072fbb36e0232d3bdae4238a33df6ef384c77077b7e5244dca15bdb4a8ad8c1d30 SHA512 cbaa3a5b48139d44c09e97f4c540e69988beab4fe0b9d70e0129e61ca9c42906a647fee48c703a0e066286b4afa99b98981922344250542b59c0510279b9a200
+DIST cmake-3.31.4-SHA-256.txt.asc 833 BLAKE2B 934ed510e0c8e5b49d5ae57bae1bc32cda5425b0d9a4f516fd452b9550b2b9ba43d5ac0dc09ad4ca6752cbbc88843965c19e3f12c461f3d4d2f5700e7d80fd0c SHA512 6d7e3f520828cadeb8d458f78cf317f3ee0106e46102d02dc31bcaa4d45a974f7a6447826856f5e60ad8d60f8b453c6f923e5b99f2ca72125aa722c741f305c5
+DIST cmake-3.31.4.tar.gz 11708192 BLAKE2B 7b51c138fdabec174de74319fa9cc5920973e96f46b8fa9859c95763180c3f29c8ba9401936afd23ccf72790bd0fa12c4236eff1c487e78898442c7dd0a295d6 SHA512 86fef54e3c60a2d050bad97968a76f9c2a663fbd0be433fe3ecbb3268e3ef8243dfcb52f0d7ba9d8b03341c142ee02b33d367dd56597e1af79f6efb553b9eb82
 EBUILD cmake-3.28.5.ebuild 8722 BLAKE2B f6e341a4652c2a42cd495a670c19ed03520d609ca9df03f0b9c79934f34e7e54af3419758bdcc5fc0963c3046660d116aaf6c5a156c3bfe046e8924b17fc7478 SHA512 03f33e94c1fe7dfc53bba884f901cfeecf6f3dc60606f8e0c45814838f309e950d9239d49c62dc0079ec126dce600033d54acf4439193cb0a6e7e5186a64a2d0
 EBUILD cmake-3.30.5.ebuild 9177 BLAKE2B 19559d4c111e459929fbe5a59c730222468ab8fbead975782e3d5dbe5ca1e830415fcd1940bfc40c90e6334f827db3a7fce80d8298fb86cb81300b0a5f92387e SHA512 c40e018c4822014b840ce0097af17f1a0c580c4cf55b3584565a646e802e8f37bc17959325847ccb9ebf0306035a1a6d9443a93cd7aad8807da84bc62b61d959
 EBUILD cmake-3.30.6.ebuild 9179 BLAKE2B 1043cbade235c151cb58ed6e1931bac34f5f1d66965ba5e1e7a16b53aebc28a499e4819d4c0a3b64a04c234a83afb88fc8541cacc07d04b2d9bfa8e23bef10d2 SHA512 2b9dbb7eaa4712599b7d9f1322cb02997d610373418b457b4dfa3d186240db519be6ef43f94962962eae2aa4d76d9cba6c03a79c42e0730d5e3030d102ef2cf8
 EBUILD cmake-3.31.3.ebuild 9854 BLAKE2B e96779d56bb03bd5b540365194d6f802cebd7ffef03e60f6617aa6e10141f879e3165ce7d1fdf731cfdd25aa48fdba0a6dd286e475e0da909bce16227b895ea8 SHA512 6ee346cdb4cc6a1b48ef87073eb6ee4a754b73cc8dc0965b4e18f2fa5a39d3f75e28c81556f7b1d969ffcf7c6da670d428dd3deccfe20c4dae3ce27c74ecc93a
+EBUILD cmake-3.31.4.ebuild 9854 BLAKE2B 30b0e5dfdcbfb89a12a41003918a3388077bf8d0f0326a56018822ef43a60b8413c920c571ea937c445f79798833e9b5738d4d00a4c1b98f3f7015542d9c43c1 SHA512 0a5de9fb204a641c745d841a835b1f045e4eb599004e11c4c567ae28a97f73dbd8460708e674da8e8102eab2d87a6f45de4c31ed4c9f68910d53a03473715570
 EBUILD cmake-9999.ebuild 9823 BLAKE2B ad6c17d49ab8b6cce09488dca06ddad3fe8dc3904070c5ff2aea1cd83b55a6fee8bd579247a43959783ee885e7c2cf1eddfe9cb1002c29225ae7c42bd36ad4de SHA512 b467c07ec58780d59db1bd8848394a23c02690ece1725ff0bd97d848a7bf741cbeafb92dbbf65b7861daf84218881bab44ee367a547f411d08fdeb7329045158
 MISC metadata.xml 588 BLAKE2B 59754f6dd52986589583b875b48cdfb28f0d22e97fd6cdac9763ed2aa8981c692d81f6cfe73a93f7defde3e58fc0df60fba647760e9f20d00bd8141e4c39055e SHA512 ac463b9402727ba83b276fc206d2ea9101c6edc85142957c9be33bd8841c0396262ceaad545d133a84f6c294b5beee289e84c3226a1aac2d1f041dbfe08c047f
diff --git a/dev-build/cmake/cmake-3.31.4.ebuild b/dev-build/cmake/cmake-3.31.4.ebuild
new file mode 100644
index 000000000000..ef6a2ac29212
--- /dev/null
+++ b/dev-build/cmake/cmake-3.31.4.ebuild
@@ -0,0 +1,320 @@
+# Copyright 1999-2025 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-2).0
+# 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 flag-o-matic multiprocessing \
+	toolchain-funcs 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=/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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+		BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20230817 )"
+	fi
+fi
+
+[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses qt6 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/libarchive-3.3.3:=
+	app-crypt/rhash:0=
+	>=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
+	dap? ( dev-cpp/cppdap )
+	gui? (
+		!qt6? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtwidgets:5
+		)
+		qt6? ( dev-qt/qtbase:6[gui,widgets] )
+	)
+	ncurses? ( sys-libs/ncurses:= )
+"
+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.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch
+	# Misc
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch
+	# Cuda
+	"${FILESDIR}/${PN}-3.30.3-cudahostld.patch"
+
+	# 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"
+}
+
+pkg_pretend() {
+	if [[ -z ${EPREFIX} ]] ; then
+		local file
+		local errant_files=()
+
+		# See bug #599684 and  bug #753581 (at least)
+		for file in /etc/arch-release /etc/redhat-release /etc/debian_version ; do
+			if [[ -e ${file} ]]; then
+				errant_files+=( "${file}" )
+			fi
+		done
+
+		# If errant files exist
+		if [[ ${#errant_files[@]} -gt 0 ]]; then
+			eerror "Errant files found!"
+			eerror "The presence of these files is known to confuse CMake's"
+			eerror "library path logic. Please (re)move these files:"
+
+			for file in "${errant_files[@]}"; do
+				eerror " mv ${file} ${file}.bak"
+			done
+
+			die "Stray files found in /etc/, see above message"
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	elif [[ ${PV} == *_rc* ]] || ! use verify-sig ; 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 system integration, bug #933744
+		sed -i -e 's/__APPLE__/__DISABLED__/' \
+			Source/cmFindProgramCommand.cxx \
+			Source/CPack/cmCPackGeneratorFactory.cxx || die
+		sed -i -e 's/__MAC_OS_X_VERSION_MIN_REQUIRED/__DISABLED__/' \
+			Source/cmMachO.cxx || die
+		sed -i -e 's:CPack/cmCPack\(Bundle\|DragNDrop\|PKG\|ProductBuild\)Generator.cxx::' \
+			Source/CMakeLists.txt || 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"
+
+	## in theory we could handle these flags in src_configure, as we do in many other packages. But we *must*
+	## handle them as part of bootstrapping, sadly.
+
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	# ODR warnings, bug #858335
+	# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
+	filter-lto
+
+	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() {
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMake_ENABLE_DEBUGGER=$(usex dap)
+		-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)
+		-DBUILD_QtDialog=$(usex gui)
+	)
+
+	use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=$(usex qt6 6 5) )
+
+	cmake_src_configure
+}
+
+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
+
+	unset CLICOLOR CLICOLOR_FORCE CMAKE_COMPILER_COLOR_DIAGNOSTICS CMAKE_COLOR_DIAGNOSTICS
+
+	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)" \
+	)
+
+	local -x QT_QPA_PLATFORM=offscreen
+
+	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
+
+	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() {
+	if use gui; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use gui; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-build/melange/Manifest b/dev-build/melange/Manifest
index 371b65bf5997..0d6895840f96 100644
--- a/dev-build/melange/Manifest
+++ b/dev-build/melange/Manifest
@@ -1,7 +1,4 @@
 DIST melange-0.18.3-deps.tar.xz 424648416 BLAKE2B 2cf7e24f009e80bc774f70a99cd34776c0ab800d92434df3f555fc066603ae2fd2e83af9a0e6410d6c6bc6e509378285401b3d160295609de9c0af76dc91e8b8 SHA512 49d006dd4c8cd47a9e32e3be73270757f730878f2eabf64cdd71fec7cdb924daba73dcd3816760ed079de9bf91e444be04bdb6b4f287b74c1389df4e909c13d5
 DIST melange-0.18.3.tar.gz 1970781 BLAKE2B f646a0c0fe255ced2c2104b458a6b6983b0ea7c8b83f2a6fb65870d0104c91e7f9a8b37f1a0c85facdb8c292ea904a299e61fd4f699af474bdf534df44efbf6e SHA512 13f6e6bc86d49460572745506794abbe0a8ed071258c94e30f84c7b3739fbd6873a566871c28a503ef06593ebd6f2a7d7e1e82adafc0dea68f7ab2f40756e841
-DIST melange-0.8.1-deps.tar.xz 239749504 BLAKE2B feb4958b1c01226cefece8e746e8e83e5507bc7cc1feae8be0837971357993645fafffab505a249c96f01079a36cc5bd735d79a459fd81ebb88efb3cf3f85ffb SHA512 6df1448ad16995f31349a4a5c77d459501b99ec590483fab38ed08fd8aa6a425ef68ddddb5ddd8ff261ca37e2e41e40b63243806bd8d9d934d1bbded4cc0b35d
-DIST melange-0.8.1.tar.gz 1139855 BLAKE2B 46b18ddbff4044712db6df2c3d8195bc1cb714d686f0af4f3ad92907942e14296e01dad2b9a70bc9870ac727463faea779eb9d40b78923f93d7c1d653f85cd64 SHA512 55d4f94197b9b772daf629c6c24969ddb306e67ac4c0f07017e7d5a466863129ec984a8291c6fb33aded706f4deaa5c5432e1de81e67527ec8ce0f4e070a3218
 EBUILD melange-0.18.3.ebuild 1156 BLAKE2B e4fa1710640658ab7c0d70865e4a8470fbc313c17d075dd2cacaff8a9883241612752e54f37fc7ea62e03bb0b7965f5edefb19d7985a54af4dff8b1f3a7f8376 SHA512 5ada05118e88d3dd7e9f34e1f512cd3dff86c21698312f6b85d0603cab184f4e5340a9951523d68c3e84e2dbd6f1118448ba1bc596643ec68ddcf7fe160b4d59
-EBUILD melange-0.8.1.ebuild 1179 BLAKE2B 1b8f25fa975ebebb0314c043d01f25e7dfc925ad1d6062b692cb2a8b28c2331bc8a50a4f7f032afe30b2a26a7722eb0910eb5a2bb6961cfd26db03973488a21c SHA512 53f4a2d81e03b43006f1b1fd31e32ebc0e4c2ef39a279c055bfaf15582f0917e081a067198ab1aa65f63c7f96e079366332064ada9dc48d21d12b82fb3d84c0d
 MISC metadata.xml 803 BLAKE2B e13fe69a39f3d28d077a26d1cb6ae0b55070de6c0ac907efc7516cacc3b9f3a5296b4a210e81701e1ade002d3cb60b921b16d21718429c2563211bb75687b7bf SHA512 c77b32a1f7b99b6acbc7e3a155a3d1e169258ba55c44939fc38efba5edbd5aeb871200a24d2f1e2e5e709bcf8795a7de40ff9b3015321252f2bc61f938ec0424
diff --git a/dev-build/melange/melange-0.8.1.ebuild b/dev-build/melange/melange-0.8.1.ebuild
deleted file mode 100644
index 9f156703c547..000000000000
--- a/dev-build/melange/melange-0.8.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs go-module edo unpacker
-
-DESCRIPTION="Build APK packages from source code using declarative pipelines"
-HOMEPAGE="https://github.com/chainguard-dev/melange/"
-SRC_URI="
-	https://github.com/chainguard-dev/${PN}/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"                         # Does not work inside Portage sandbox.
-
-CHECKREQS_DISK_BUILD="1800M"
-
-DOCS=( NEWS.md README.md examples )
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_compile() {
-	local -a -r go_buildopts=(
-		-o ./
-	)
-	ego build "${go_buildopts[@]}"
-}
-
-src_test() {
-	local -a -r melange_opts=(
-		./pkg/sca/testdata/go-fips-bin/go-fips-bin.yaml
-		--arch="$(uname -m)"
-		--generate-index=false
-		--out-dir=pkg/sca/testdata/go-fips-bin/packages/
-		--source-dir=pkg/sca/testdata/go-fips-bin/
-	)
-	edo ./melange build "${melange_opts[@]}"
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe melange
-
-	einstalldocs
-	docompress -x "/usr/share/doc/${PF}/examples"
-}
diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index 9aa4a03d159c..92eab3199ca5 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -18,11 +18,14 @@ DIST meson-1.6.0.tar.gz 2277602 BLAKE2B c1d8f143b17fab90c6128a721ac45b9ed6b85d67
 DIST meson-1.6.0.tar.gz.asc 833 BLAKE2B 4cb8483a0b40330f71c86b9ede2dbccf2eb430138508983232924d70512100a36094974048783d814b9d83c11719f4be5a6541dc0eeaee3044048c38f28106c4 SHA512 4f1f47a5aafc8de8180a47303f2ea2d7dff1b792ee3e1dbf64bd96ea64b2a1696b664fb3ea4169b73c7a950f4371481c083f18ab11fdaf3bccf2b8671e40cd7d
 DIST meson-1.6.1.tar.gz 2276144 BLAKE2B 7ccdb3bf3f701fc787fabf91413db8301a8658b89e08c1d712711bd35845dc2468211e4b666cf46ad68ad9462e62b12b62d60c3767a2804f9b695b4390bb8235 SHA512 b4ca7a3b667db0ad370110abd8b20467b1c74ae7777a068db33f8974602c123881a7130b2340664abb52e36fe5195989a5cc8fa7de6212c37abf5b0900554425
 DIST meson-1.6.1.tar.gz.asc 833 BLAKE2B 6666eca8e5506b8692fc29ba66dc3ee9d725a7d720a7b43db720098f7e00671e71993586606c187d8314e3919474f5733d64a8d052be6552cbcf013a872905ab SHA512 543cf396de0a58998c3587aa05580fa9a56734db40b74fc5fbb22cd56124531804a5360d6b9acb9baa71753ac04c343364da4d78a0d366d8e8bc760030ebf8d3
+DIST meson-1.7.0rc1.tar.gz 2294319 BLAKE2B eb17bc0bd1bf5ba48ab973c3d093184524f3d0afdb14ed403026dc9dfef956abf1b1a8a434071ad4db02b1bcc0f636ffb504aed68e61f95fad7e92496d337504 SHA512 a4a410718fdb98452539b6ce6e6a8c5c5e96d8eaf08ab658ff5697f7ec70f5892da833562355d3e0f9975cfc13bb53153a4e75ff1ff31077439b4d522fce7197
+DIST meson-1.7.0rc1.tar.gz.asc 833 BLAKE2B 70b268d247a5340a94259ab6ab85f2f763c4668d585f220249d248108db7322ff01920ef855e8684271b0e41696df5245d0060f722b7bfae938ed96bcccc2c25 SHA512 e4bc1139a4d3895fe0f5d89ab95ff08428a054cb7e40c9209c323bc4e4017e13888c4eb52b8dfc60db3ffd1f9512fab78443a2821d3c96f1b81a4da06e7798af
 DIST meson-reference-1.4.2.3 339324 BLAKE2B 1a4fbd8c27a8cfba773777eabd2ebaa0f76ec0c61dcfe1c7b4483737b348ff9528d68f26e68d7d40b2e1875611eed5b9a31c1cf55fed8eabb42fc1e31d9ef14b SHA512 8b8ec43e812599203ec44c08805eb6818485805c45b9c69802261eaa35efc97846a96f6472c6b1ef5f6c703e7153fd957df7b805f173ca3400a2030dfbe002ca
 DIST meson-reference-1.5.1.3 341110 BLAKE2B 5267c2eea1b1281f87e63eb08aa928257dd98088b4d5c27c2785d2d8066c2c28536f7f56bf804ffe37d2f51552c91f31ff7e2729f3b2485d594a9e44a0df9ab1 SHA512 2d36e87e9bc2de0b958f4b20544b0bd9f2b0ffb646768e68fefcd5dfb8f09c24db40f27208b5f2d1f6ba02e7465f68a538ea72be118670c76e0959e090a42cf3
 DIST meson-reference-1.5.2.3 341110 BLAKE2B 0d588b796f7f2da2dcb0e7822acde6a9a461930da4bfead3cf9148fa0fac18cd0ccbc6e891f555c973836f1c16b4eae299908a838a0b6843293de8815d30fc23 SHA512 64715ce2113e362e7d67179fe13566bc8f84ce7f4e6d795b836f42455a871173fee06e3e969e2996022d7e6c9b4b5379587a4c0c3d97b4bca527fb8902d3547f
 DIST meson-reference-1.6.0.3 343730 BLAKE2B 18704b557298da2ea1f3edb4ed6c421bff3f973a215e56b340de2e78b1330e13eb00830cf44c3a8d04fd685ec6f8e6d078a4b9f03cf5b9e5413cbbfce55a22dd SHA512 2752b51dfa404ebae107f6579acca4268140aba8b1a672762fa4fa66819dc4449560313c5eb6c17433cc2cf273ce57d3d04b846bddf74902825b530de777f4ea
 DIST meson-reference-1.6.1.3 343730 BLAKE2B 55df822192781a70e4bc44cfe14fb363e3f820406260ca9705d7fdb5fad1bf0117e3f1325d37e58e23477bc075ab6bd84056409355ec694f72eeaa5bf982ecc7 SHA512 553cdcd86a7a600cda05ac970cc285c4c50017d1e7d2925645d7f19a62b34c2f079673cafecf4111aa102afbe9d8e4d56f166d1d9940b740eeec0bb99d6cbc0d
+DIST meson-reference-1.7.0rc1.3 344643 BLAKE2B a2615149175714f74d7ea1be426ce23475fa479d4f3ed4e9000b7bee46e15e7f1592d777334385d8858dedf3aa4256bcfaabf5f60150aa0854be6f67ad99ed59 SHA512 9834bbd7b35b1c3c2bfff7c46009f1e2dc6045c35ef07a3e105ad51c2fd48049f44cbbd48be6d68932cb66ee929a3ec6db7afec863720bd78da279b23ac457be
 EBUILD meson-1.1.1.ebuild 3281 BLAKE2B f66b4bab03d4692c4818444dbe24982451eac1378f7c3b4a1fb88568b5be78b8ff959566489328ed843aa21d7810062529a8656d2fedf9ad20f62166ad4070cc SHA512 c192a3c1ad7d78da4505c96e253acb7761ecdb920d786de9c08b1eacdfa11c977d28e97c1f3f225a8a077674a8a954e659651f6fa9d5822c3300e2d599d69909
 EBUILD meson-1.2.3.ebuild 3279 BLAKE2B faf4ee6ad678f436ce37af1ec074207eee2f2033ca5d8cece4944070e741f36966ac288bb282949c40e8b4e858c741ba14d3d32f0cee46a98fdf91d2650792d4 SHA512 ebd47115b9a6808cf3ebcc31f87671c6cd660f922bc7b5e1fae0c2a0b3cb79093d7f85e30d0fa745e2ac590457e744312127d2d0a6e8f8f1034664ae1e47eca0
 EBUILD meson-1.3.2.ebuild 3411 BLAKE2B 71d25e070379acab0e87c57fab8226afb5f7939e7761317f4351a3f3fa6b47fba484c08cc33ca63eaec3e070d7b4760a4c6fc0bcf1370002c35926c73f339e78 SHA512 c2e470732e9b2598f8c9ce30d635e17b4cacfc2ce1be280c0d5f1ece91ec392078f6ab2f50e09e228b28cc2d3ce7cae7c98b20b9f4f3fe68713b162be8dc9c4f
@@ -31,5 +34,6 @@ EBUILD meson-1.5.1.ebuild 4924 BLAKE2B 47ed021c4efbd4192172b27ae7dba70df733f426d
 EBUILD meson-1.5.2.ebuild 4927 BLAKE2B 187df2e74851a788fcda20d5d23751287644b3fcccd583101ce5fb2ce65757ad44d90766ee43781332517d6b4f7c6051068044871984262d3bd9aea68c7909f7 SHA512 03e0c192979ddbbbca9d43f6bcfb1cda6e6c1c81c8a50bb41b7468e107de2e66635176708a5b0962cd77c7b3bade9c37a14d5196d0f5cfd2b55b3dcb7a83da2c
 EBUILD meson-1.6.0-r1.ebuild 4986 BLAKE2B ed603f35e0b81a00cbde98062752c4850590271d7543d96685e8764460b94379e7c79c87f6f4116dd6625a63c39a4a8bb69a98a3ea5d06196a2961d3b31861d3 SHA512 b8e71c9ed86f82de2645ccee830bb2b076f89d53dacfe58ad68f3f1c803b873f141e00b835099f38139290807efa5b4fa8bc48de52cf7a3a68a24554a32e8443
 EBUILD meson-1.6.1.ebuild 4932 BLAKE2B bf5e036f3addab796648e9bdf5c7062103962530d10cd584a626a915ac10a32d12139504b47daf5e87e3bf7b63e7ded742f8cca0b4b01ec1e702c8ba41cd51e9 SHA512 80cff3afa1c0735ab06bc0747eace6d166286330fb599a090fc64397f772593df0f73540079170bc7956cab7795c696a1debcb7dd5adbb4ca37180c71fb6bdcc
+EBUILD meson-1.7.0_rc1.ebuild 4932 BLAKE2B d93dfea08ab31608f0754a25a6241eeeaeaff2bc51ad48c7d61f4db06017bee76bc56275af22791a0e4b20f7c8c8db2abe0f9cf09e0931801769b942c631f1ce SHA512 71dbaedf371cd419ed69455c6efd6f77b3da7c90ff2f4a17e505b7e53e64eda0c17f77ba10a9682e0fba83fa0f0392203a6848f450771b6e2bd3dea72fa6b1bd
 EBUILD meson-9999.ebuild 4932 BLAKE2B bf5e036f3addab796648e9bdf5c7062103962530d10cd584a626a915ac10a32d12139504b47daf5e87e3bf7b63e7ded742f8cca0b4b01ec1e702c8ba41cd51e9 SHA512 80cff3afa1c0735ab06bc0747eace6d166286330fb599a090fc64397f772593df0f73540079170bc7956cab7795c696a1debcb7dd5adbb4ca37180c71fb6bdcc
 MISC metadata.xml 457 BLAKE2B 65bcd07bc76772c13ef3f5cf602206330c3b7456180d140b82ee1ad759762a9d0066b4c60001862ce8e2f99150bea411eb804e5df65ef3f7824dc790626319f3 SHA512 aacb863efe3f8548eb8e97a4be3c013ad8d351c0a6173f6204ac4df46054bddf934bdd6ea5673fbf4671b7aa83405847626393ac012c0db3bbc062c234eec1f3
diff --git a/dev-build/meson/meson-1.7.0_rc1.ebuild b/dev-build/meson/meson-1.7.0_rc1.ebuild
new file mode 100644
index 000000000000..7c4c5f96b87d
--- /dev/null
+++ b/dev-build/meson/meson-1.7.0_rc1.ebuild
@@ -0,0 +1,190 @@
+# Copyright 2016-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit ninja-utils git-r3
+
+	BDEPEND="
+		${NINJA_DEPEND}
+		$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	"
+
+else
+	inherit verify-sig
+
+	MY_PV=${PV/_/}
+	MY_P=${P/_/}
+	S=${WORKDIR}/${MY_P}
+
+	SRC_URI="
+		https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz
+		verify-sig? ( https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc )
+		https://github.com/mesonbuild/meson/releases/download/${MY_PV}/meson-reference.3 -> meson-reference-${MY_PV}.3
+	"
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jpakkane )"
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	fi
+fi
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		app-alternatives/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+	)
+"
+RDEPEND="
+	!<dev-build/muon-0.2.0-r2[man(-)]
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.1-python-path.patch
+)
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+}
+
+python_prepare_all() {
+	local disable_unittests=(
+		# ASAN and sandbox both want control over LD_PRELOAD
+		# https://bugs.gentoo.org/673016
+		-e 's/test_generate_gir_with_address_sanitizer/_&/'
+
+		# ASAN is unsupported on some targets
+		# https://bugs.gentoo.org/692822
+		-e 's/test_pch_with_address_sanitizer/_&/'
+
+		# clippy-driver fails, but only when run via portage.
+		#
+		#   error[E0463]: can't find crate for `std`
+		#   error: requires `sized` lang_item
+		-e 's/test_rust_clippy/_&/'
+	)
+
+	sed -i "${disable_unittests[@]}" unittests/*.py || die
+
+	# Broken due to python2 script created by python_wrapper_setup
+	rm -r "test cases/frameworks/1 boost" || die
+	# nvcc breaks on essentially any LDFLAGS
+	# https://bugs.gentoo.org/936757
+	# https://github.com/mesonbuild/meson/issues/11234
+	rm -r "test cases/cuda"/* || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_check_deps() {
+	if [[ ${PV} = *9999* ]]; then
+		python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+	fi
+}
+
+python_configure_all() {
+	if [[ ${PV} = *9999* ]]; then
+		# We use the unsafe_yaml loader because strictyaml is not packaged. In
+		# theory they produce the same results, but pyyaml is faster and
+		# without safety checks.
+		edo ./meson.py setup \
+			--prefix "${EPREFIX}/usr" \
+			-Dhtml=false \
+			-Dunsafe_yaml=true \
+			docs/ docs/builddir
+	fi
+}
+
+python_compile_all() {
+	if [[ ${PV} = *9999* ]]; then
+		eninja -C docs/builddir
+	fi
+}
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# meson has its own tests for LTO support. We don't need to verify that
+		# all tests work when they happen to use it. And in particular, this
+		# breaks rust.
+		filter-lto
+
+		# remove unwanted python_wrapper_setup contents
+		# We actually do want to non-error if python2 is installed and tested.
+		remove="${T}/${EPYTHON}/bin:"
+		PATH=${PATH/${remove}/}
+
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		# 'test cases/unit/73 summary' expects 80 columns
+		export COLUMNS=80
+
+		# If JAVA_HOME is not set, meson looks for javac in PATH.
+		# If javac is in /usr/bin, meson assumes /usr/include is a valid
+		# JDK include path. Setting JAVA_HOME works around this broken
+		# autodetection. If no JDK is installed, we should end up with an empty
+		# value in JAVA_HOME, and the tests should get skipped.
+		export JAVA_HOME=$(java-config -O 2>/dev/null)
+
+		${EPYTHON} -u run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+
+	dobashcomp data/shell-completions/bash/meson
+
+	if [[ ${PV} = *9999* ]]; then
+		DESTDIR="${ED}" eninja -C docs/builddir install
+	else
+		newman "${DISTDIR}"/meson-reference-${MY_PV}.3 meson-reference.3
+	fi
+}