8 files changed, 435 insertions, 2 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 19da9655e6c7..e2488165e3e4 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index dd4712310831..3ae04f0ae812 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -12,6 +12,7 @@ AUX cmake-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.p
 AUX cmake-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch 2339 BLAKE2B d9d1a8326dd9018e5d8138997f0d52eacbd953b6da51e04a1232974a3371c5349c285c5fb8b8e9b3786f4be0f20062ebe19f3a15ed802982bf1c4e95e78220a7 SHA512 06aa209c6057b7f9c0bbdd0086c01adc44bd613d57b97f90811c6ef8e65dfb51a37effe154672067d82ece2fc8f39d488d3f31f97848b150a6a0d1628c435bb4
 AUX cmake-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch 1207 BLAKE2B 4cd68da953268521965e04810e9b76a97dbc68c6c7e81cb23e0257166886787519122e425991c9bc9c9fd2d4d23a6a221206a8a3edc888adf58b1fe312cea149 SHA512 da5e897e7b8cc0973fb36ad82ac145c3cc790eadd10c1b7283decec67ede42d3ce132b1a71a3daa362941bd24208d9a3923af7331faac93ebda96df6aaf297dc
 AUX cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch 1600 BLAKE2B e2d381c5d81a5d8b5668eab8e1fb31f7c4d489c5900a4102983c1f573d5660c1281af5d8e1bf4d6b55839f609046e0ca6ba9781affe2a66b373833696dc45675 SHA512 c2e04ed6594892fa4a35cd67f0442184be76b5b9248e30cb6f316efccb5861c493e9151edf7ff2d40a03d18a871a612647e10c3b674cfc5dfa9859e5c149c3d3
+AUX cmake-3.28.0-c99.patch 3134 BLAKE2B 24b4692d5b888aebe672a55e4d8bec8704e20fb0095fa3082956092fb5443fbb913b2c9d8e29f5303e004250f7da7b5d42a0793f5803910b3d127ef4e29a7e32 SHA512 9b30fd18a3f7f9dfb3d23e375ec450976995580df596f97354801224286426f3b7a09fd8eb17dd4b89bb9f227bcdc9107d2aecdec0afc605ccc9af2d7b7ed195
 AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b656eb7f58d61c7d9e30db9dac36e934f2a529b4ea20d69c5f8a653c727bae34374ebcb7f5017fd70df41abd538164 SHA512 bab8960bfea3c29416bdc8f39c7dee59b89bd7951752401f24eeb9161ac7bc2c6dd200cb62c6b9f964d763b5d257a94d8b04dc7090d6fa947a04f2d0c2e8c479
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73d9ea26ecc86614aa3f12c94226aac4710dd0b9723c365b6f5def965069a54919bab13a33490facc6c5e64fad69d2e05a97d2812f SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
@@ -35,6 +36,9 @@ DIST cmake-3.27.8.tar.gz 10983480 BLAKE2B 8c746d58fe07978bf0ccc92b31731bda46d139
 DIST cmake-3.27.9-SHA-256.txt 1646 BLAKE2B abfef38f8994d7684a44caaa4a5efa1ac8fbe38bd8e8c98bf341cf813f77ee54bea58f7b3ab7f68b3f5d992519396fd15a1f72a1d9587f593d80b8d2f8ba36e7 SHA512 310c45281735cf9812d9d1cf22a656c5b44e596ef7032a8b7b09900ef838e74b884599b42ed2f5469946f371d431b7d4b1e44f6cd49dfb36ea49d88b187b4804
 DIST cmake-3.27.9-SHA-256.txt.asc 833 BLAKE2B 57d52fc2f3233662af13eb362ec82626c4821267f55f1313907513b61cee5b8481936da2b03c908c507b3e0919e4811e90c6cb47568420a8b2187c7942de9f1e SHA512 cad2007e356eac480b2cb93778f90152788e33be2e565b38535a2d205794054e5d67d4ed7db0765a05017aedc5f1af21556535a084014fe6c446bc13258253da
 DIST cmake-3.27.9.tar.gz 10984490 BLAKE2B 66f8fb6e301ed19f993fde6c4f9e336124be6373d49b58d130ce59f4e5225cd27e02813856636b51c2521403c3a56c200ce646de5c35be2b25b5e6240c98bdb4 SHA512 56ce723b0b6d09b420a2f89ba1636cdfb1bc305bc2df91ae716f866bee07f5d702d75efbddfbaf724f47382df809107fe1e6d046314cd2f1ff07bca34ad6340a
+DIST cmake-3.28.0-SHA-256.txt 1646 BLAKE2B d2ca3e3b06e0cb94d421d920e0a0b03c22d2ee170a452fbbac3688c41fd0306eb3c914495c2a94ede835d31872c29bb633c24827b5dcb1899a866a099dff1e78 SHA512 4f68c13e0f3bf51855a01f0d1258974aa352ae5a1f194a913ff0e637fbd9a2899d73bf889757faba27981a6629bc723ca27a4a64ab7e7c6a056fb80d14eaf058
+DIST cmake-3.28.0-SHA-256.txt.asc 833 BLAKE2B 6a7e266dfc873be04e75881d982ad7bffe21600992ddd79cd68a4b8322aeb2f5760361810cdd74af719ce004cd233e76e521e5853eabcef5b4c73b7e055a97ac SHA512 8c0fe1461d26ed2b7facbfd9294b3006d76ef00614416da4e22936808e53b76f029137d47c352223c8a4ed4ba385dcb9987acb5c1962cc3f2fa0783424059b17
+DIST cmake-3.28.0.tar.gz 11064707 BLAKE2B 8e03436d7e2b16d5865cef4ed94d12ffdf134d12ad59c4296589bad1a2836916cbb17367f4adda99a9bd835af8b891fee34b2e00441dd22696e396e4109f61f2 SHA512 54f0fa5754693ab0a58314301da6957fbee410cf3c5906eaf5a5eabe9d371d8eda84eba42832c29d0a223d954b580c955811f62be38b33b817cab7199f884b60
 EBUILD cmake-3.26.4-r3.ebuild 8794 BLAKE2B 982e137e469a24072c2f94f15bdddb4899c7d595ccf98cb72a7226bea8f87202c07d6e85329d59f53de58cad1e73a0eae885287f2e91f7c594520d269d08a463 SHA512 86e754256e8f19fac4b656a877555e9cd2d4c06f8e8d0bd84ecd3f944143adb65b8d526c8b300b8bee384bb9d40f35d330b7bd1d3922f5c34cefc2bb4e690f4e
 EBUILD cmake-3.26.5-r2.ebuild 8795 BLAKE2B c5d15b9c10766befa324beddcb54ae6eedbcfd4b19fd0930d0d8ea16e17c5229fa2379f6ce747de0f93d74eb9f9ef90f665f0b352856fc875aa85e3cd549f290 SHA512 02499b28af97b619ac17e6734393f1fde7a64bc1cb5de49ac4bcd3eb9128d3b1bd88737a277ec501f6b60bb3e0d4aad14d92e7e99514f8b561f45ae1de53dcce
 EBUILD cmake-3.27.6-r1.ebuild 9122 BLAKE2B 0ce77ab08f5fe9c7a9f3c8aa2534b39040b8de5d6e1204cc4720f6b3d1d19d85a00ae4cf3ae1be07fe446bcfa7cc572d1dc268459e2dcac93d7f6d627e939206 SHA512 d2edb5597fa8bd3e5a33242fab8797abba3ff59570a9ae04925591ee07c0b11af4a35be4558333ab7be83c514ef0d6a8e34ab4f78561465f0857a3af9d29cfe9
@@ -42,5 +46,6 @@ EBUILD cmake-3.27.6.ebuild 9009 BLAKE2B 82b5995de0ecd5e8706135e37fe4b0fbee9741b3
 EBUILD cmake-3.27.7.ebuild 9114 BLAKE2B b93f979ee932c7fe341bd99bd5ff17aabc2d70d418a2606d4d4102a4fddd17a73db0224e405e09c65e12898ef7f1c1254bab30e9e90cb1dfa99d08caf753bd9f SHA512 442eaf0c24ef5e8fc7e6161df86df549f9c8700b92422c2552be34d864a7283e28504aaf024fce6b53cd101782bf8dd414d73eefc1f00166ec3c441da06774f7
 EBUILD cmake-3.27.8.ebuild 9122 BLAKE2B 0ce77ab08f5fe9c7a9f3c8aa2534b39040b8de5d6e1204cc4720f6b3d1d19d85a00ae4cf3ae1be07fe446bcfa7cc572d1dc268459e2dcac93d7f6d627e939206 SHA512 d2edb5597fa8bd3e5a33242fab8797abba3ff59570a9ae04925591ee07c0b11af4a35be4558333ab7be83c514ef0d6a8e34ab4f78561465f0857a3af9d29cfe9
 EBUILD cmake-3.27.9.ebuild 9122 BLAKE2B 0ce77ab08f5fe9c7a9f3c8aa2534b39040b8de5d6e1204cc4720f6b3d1d19d85a00ae4cf3ae1be07fe446bcfa7cc572d1dc268459e2dcac93d7f6d627e939206 SHA512 d2edb5597fa8bd3e5a33242fab8797abba3ff59570a9ae04925591ee07c0b11af4a35be4558333ab7be83c514ef0d6a8e34ab4f78561465f0857a3af9d29cfe9
+EBUILD cmake-3.28.0.ebuild 9002 BLAKE2B 2f497d16acd44e8bdc1c79906df5497e88a86cb1547e4d0bf6a99e073765462798978de6ccac72fe095c5d067eadfdfe3e7a66f69841768027283de0bd0f17c6 SHA512 58d9ad0a1d38d9d1e3148e0efdd4fa633eda43fbc4931fc909d8b099717572cbecfcafc1de9d03e7507b04129115789d4e4d9cd7d76fdbb27d10155bdc6ef0b8
 EBUILD cmake-9999.ebuild 8937 BLAKE2B 9fea7587c59cecfd5489081046ebb765f8cccec053f97be581d8f15f51de66e9297a239524fe6a9943353c68d5656a72521ba8cf8f9960e08df7a9729ec2bafd SHA512 18d9c8da0474731cf31119d6869041dd4d86d4493291a7bda185dfa0df346dab27fdeb39cd18528a7d7e0249c166b6add0a94e25b137e32513fa85df302d8ace
 MISC metadata.xml 588 BLAKE2B 59754f6dd52986589583b875b48cdfb28f0d22e97fd6cdac9763ed2aa8981c692d81f6cfe73a93f7defde3e58fc0df60fba647760e9f20d00bd8141e4c39055e SHA512 ac463b9402727ba83b276fc206d2ea9101c6edc85142957c9be33bd8841c0396262ceaad545d133a84f6c294b5beee289e84c3226a1aac2d1f041dbfe08c047f
diff --git a/dev-util/cmake/cmake-3.28.0.ebuild b/dev-util/cmake/cmake-3.28.0.ebuild
new file mode 100644
index 000000000000..9554c4047fc1
--- /dev/null
+++ b/dev-util/cmake/cmake-3.28.0.ebuild
@@ -0,0 +1,294 @@
+# 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)
+CMAKE_DOCS_VERSION=3.27.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 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=/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 ~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 emacs 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 )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	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
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch
+
+	# Upstream fixes (can usually be removed with a version bump)
+	"${FILESDIR}"/${PN}-3.28.0-c99.patch
+)
+
+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 [[ ${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 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_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_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 gui; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+
+	if use gui; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-util/cmake/files/cmake-3.28.0-c99.patch b/dev-util/cmake/files/cmake-3.28.0-c99.patch
new file mode 100644
index 000000000000..3af9a5104f66
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.28.0-c99.patch
@@ -0,0 +1,90 @@
+https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9002
+
+From 9ede6138b71ac2ab961b0954b10a9dc03cf77b37 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Thu, 23 Nov 2023 08:45:05 +0100
+Subject: [PATCH] Tests: Improve C compatibility of LoadCommand tests
+
+The previous code used `char **` and `const char **`` types as if they
+were the same.  But they are distinct types in C, so when passing
+these pointers as function arguments, their types have to match.
+Future C compilers will treat this as an error, similar to what
+C++ compilers do today.
+---
+ Tests/LoadCommand/CMakeCommands/cmTestCommand.c   | 13 ++++++++-----
+ .../CMakeCommands/cmTestCommand.c                 | 15 +++++++++------
+ 2 files changed, 17 insertions(+), 11 deletions(-)
+
+diff --git a/Tests/LoadCommand/CMakeCommands/cmTestCommand.c b/Tests/LoadCommand/CMakeCommands/cmTestCommand.c
+index 7176ebe9d4b..ba13727d2b8 100644
+--- a/Tests/LoadCommand/CMakeCommands/cmTestCommand.c
++++ b/Tests/LoadCommand/CMakeCommands/cmTestCommand.c
+@@ -16,14 +16,14 @@ static int CCONV InitialPass(void* inf, void* mf, int argc, char* argv[])
+ {
+   char* file;
+   char* str;
+-  char* srcs;
++  const char* srcs;
+   const char* cstr;
+   char buffer[1024];
+   void* source_file;
+   char* args[2];
+-  char* ccArgs[4];
+-  char* ccDep[1];
+-  char* ccOut[1];
++  const char* ccArgs[4];
++  const char* ccDep[1];
++  const char* ccOut[1];
+   cmLoadedCommandInfo* info = (cmLoadedCommandInfo*)inf;
+ 
+   cmVTKWrapTclData* cdata =
+@@ -148,7 +148,10 @@ static int CCONV InitialPass(void* inf, void* mf, int argc, char* argv[])
+   if (info->CAPI->GetTotalArgumentSize(2, args) != 13) {
+     return 0;
+   }
+-  info->CAPI->ExecuteCommand(mf, "SET", 2, args);
++
++  ccArgs[0] = "TEST_EXEC";
++  ccArgs[1] = "TRUE";
++  info->CAPI->ExecuteCommand(mf, "SET", 2, ccArgs);
+ 
+   /* make sure we can find the source file */
+   if (!info->CAPI->GetSource(mf, argv[1])) {
+diff --git a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c
+index 7176ebe9d4b..e3b332c1aa9 100644
+--- a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c
++++ b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c
+@@ -16,14 +16,14 @@ static int CCONV InitialPass(void* inf, void* mf, int argc, char* argv[])
+ {
+   char* file;
+   char* str;
+-  char* srcs;
+-  const char* cstr;
++  const char* srcs;
++  char* cstr;
+   char buffer[1024];
+   void* source_file;
+   char* args[2];
+-  char* ccArgs[4];
+-  char* ccDep[1];
+-  char* ccOut[1];
++  const char* ccArgs[4];
++  const char* ccDep[1];
++  const char* ccOut[1];
+   cmLoadedCommandInfo* info = (cmLoadedCommandInfo*)inf;
+ 
+   cmVTKWrapTclData* cdata =
+@@ -148,7 +148,10 @@ static int CCONV InitialPass(void* inf, void* mf, int argc, char* argv[])
+   if (info->CAPI->GetTotalArgumentSize(2, args) != 13) {
+     return 0;
+   }
+-  info->CAPI->ExecuteCommand(mf, "SET", 2, args);
++
++  ccArgs[0] = "TEST_EXEC";
++  ccArgs[1] = "TRUE";
++  info->CAPI->ExecuteCommand(mf, "SET", 2, ccArgs);
+ 
+   /* make sure we can find the source file */
+   if (!info->CAPI->GetSource(mf, argv[1])) {
+-- 
+GitLab
diff --git a/dev-util/kdbg/Manifest b/dev-util/kdbg/Manifest
index 2530760e2461..5be457059b6f 100644
--- a/dev-util/kdbg/Manifest
+++ b/dev-util/kdbg/Manifest
@@ -1,5 +1,7 @@
 AUX kdbg-3.0.1-fix-rare-memleak.patch 1113 BLAKE2B 8bb235a47294c2d9d541dafcceedad3038db795aa869b6ca940a51da50d300db1e1d3735171e7e91c5eb43d21167dd3e8b2be50590689a8886e4b9d8f1eff626 SHA512 1caff1850cf21d09b46cc19ea8caf80066b2501901db044328bad64b89559759207629237d602146d214389055b780c180e100d8ee642b3d165da94a99f633fc
 AUX kdbg-3.0.1-usable-trace.patch 808 BLAKE2B 8286f826354d8b9035f2b4cef753206074d72e3a8aa1c5fd1888052f22a8725696e1f2326dc0a202d5ec3ad9675fff199e78daac14a69ea29eb5108ad945e7ea SHA512 71f2feb9ca41f75e78a5d689d1e76d7de0d48d03d54250f94beab03553a93eaa7f9302f6e6fe4dec670e211ad7b591e5abef4800bfad57711119ab0e343b203d
 DIST kdbg-3.0.1.tar.gz 431143 BLAKE2B 869bf9765650b2a4a2330f99303b51f599df764848ff18442c8c6813421fece2671e5e78a0e8c66a59bd77f06a7f02677ec08a49fb9a28874b92b0f84bf8f74f SHA512 9f3e0073bf37e56fa8ad0c3ae5f0be80331d8963b564ff376aee40c3ccebab5b5a482c31f110fd0f4dd14f9614cff31102d8edf62ffb33f4ae361d24346543ea
+DIST kdbg-3.1.0.tar.gz 444052 BLAKE2B d0083094f8ba3cb374b2df4a20b7697ddae4fb24579e18d883701a5e826e86041a8cdb7bd1919c881bc149c49e764221eb246d98bcebacbffbdb5e0f83264ad6 SHA512 e7da5bb1a4882b031077bd4344c6795b058088eb9a00ef3a2ba9c3d72c0a022bb16822525369ca7bcfb623c775cf73140caa114c1591d37f1d6f6a3b22ae649b
 EBUILD kdbg-3.0.1-r1.ebuild 1114 BLAKE2B 6aa6bfbd8f33a19dc44d722163627da1ee9fd844df4834f2b321f7e155f0ba7f10952739523799d3f7f1d6093aa13f2c055f91de6a31d66976bf74b08db11bf8 SHA512 fa97f8f3e6db10ae19c3ff9586b59228273b4e33de2a0dc31519c526b8f6a2ab08d262c9bdbbcf340839329087a350d358cd1ffd58b16c28349df1447971f093
+EBUILD kdbg-3.1.0.ebuild 1007 BLAKE2B f25ee0136c739c83cc6a017c7b00821a8b3d456e223054fbbbadf6c5564b82b6d45c1d7efdb834e6820af489ad02022f3012ff8f90e2a3b561866f44d9720b29 SHA512 29282659537dc9b6472b3d3aee3f812afe9ce058b7a5acfd1701f6829dec10fb7fc1cea0f24f8c5b1bd61e5d3375e2020b3285ae5a18dd58fef32514bffda823
 MISC metadata.xml 372 BLAKE2B f633a86dc35ba0a596d161b7789f01b22b32c4f501c9a5b68701ad352555956a433dadbf8856c1fdb0f331abb39fc89caee0cf2da6cf295095be993b24d1f414 SHA512 9f19dcf19b03626e2263f3bfccc611e6013da09b97de69a6673c5e79b9f1c1b3622d540d6e49bff59ced02f632ccc4b8734950690c4363556fa622edb3e576d9
diff --git a/dev-util/kdbg/kdbg-3.1.0.ebuild b/dev-util/kdbg/kdbg-3.1.0.ebuild
new file mode 100644
index 000000000000..57a3dbff3ff6
--- /dev/null
+++ b/dev-util/kdbg/kdbg-3.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="true"
+KFMIN=5.85.0
+QTMIN=5.15.2
+inherit ecm
+
+DESCRIPTION="Graphical debugger interface"
+HOMEPAGE="https://www.kdbg.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	sys-devel/gdb
+"
+
+src_prepare() {
+	# allow documentation to be handled by eclass
+	mv kdbg/doc . || die
+	sed -i -e '/add_subdirectory(doc)/d' kdbg/CMakeLists.txt || die
+	echo 'add_subdirectory(doc)' >> CMakeLists.txt || die
+
+	ecm_src_prepare
+}
diff --git a/dev-util/samurai/Manifest b/dev-util/samurai/Manifest
index 4ac33a35511f..8b1fd23c96e3 100644
--- a/dev-util/samurai/Manifest
+++ b/dev-util/samurai/Manifest
@@ -1,5 +1,5 @@
 AUX samurai-1.2-null_pointer_fix.patch 2089 BLAKE2B f721cec4d42b4826ec52d4e88ee86b907956739f30427eeaee047eef8e59f953c1bcb2fda301cf3a8214c707954cbbb0abf0901c63ec557f4d9cc614962894d1 SHA512 5ead4b0aa47fd9c3bc84cf437744a36a9a1ed21b438883d32ab98b598c98a20561ba46954255553befdb9f46efa4f6251f73342de9000415f09bce63064e52eb
 DIST samurai-1.2.tar.gz 32709 BLAKE2B 86ed79f7d6ab492216cf3bf0e19ff8be8c1ca37e5c99de84b457875fa710d720624bd0de53105ed0b1d382c417aeb7397929cb9a35a8d1b36a11e053bf8d7ff5 SHA512 bbe6a582c34b04f1df53b76c1647aa3e03c4698ebf7591a203935f11ffa05971bbcb86dc1a8c06aeb904cdc741abb08918122810fc47216fed0a6d9f87fd1225
-EBUILD samurai-1.2-r2.ebuild 731 BLAKE2B 175140876b1189d8690cc7a75d092a9620ae47c162c5e728aafb0cc29e9ef27e798df0bf81b3786bdb8d171491f596a9ad9d446031e553e45b3bae1bf65710b7 SHA512 2026feee0fcd41dd25fb0b68500c44613f1edc32e484925cfc010ce6bf8753b057eefe94ae085d79ad7f27cc238f283e0abbbbfa601db4885c9bc0e00ed07baf
+EBUILD samurai-1.2-r2.ebuild 736 BLAKE2B b30054daf249dcba44258235b4f4777682a6990aa627398bd79f45a0b38c643395c3f80b00e692428960311b8455ff4df1b20db97ead73b6eb56e22385f674aa SHA512 509c24b3800e1eb2d4bb4a27c4c24da12ac8988793587d76bed93c40a87fa878a3c1ae6f657862e5918196423cc54cf5d8de8711fa14e9047699e27554cb8d58
 EBUILD samurai-9999.ebuild 660 BLAKE2B 07025a4190abf3106c4616c32728c375a567bc369c7bc41da0128b0880b077879c55e57e7fe37e4de280d8c4c3d9f063846d67b352507a2daab3f75bb3aaef4e SHA512 c589c262cf3b6c76c7be16c78ba945cd20b4a5d3f7fc08220ec68d9271f35ad9b7c54eb3123bb69696e86040e9b3eda8bbed9ba7c93c66b2c2c7aff788c4b586
 MISC metadata.xml 454 BLAKE2B b3f71bd78021685a69254816df743ace390d3aadeaaf9adb1cdeb5f7c3f567623b863fe87b7b230e45efd65bb74b306e0615081f14d396882197c178eb2f77e7 SHA512 527fa97c53904b68ef8f182d6faf8c18116bf3b60099a1b0152a7326cbb372130bd2de0fda38c7ec66dac6d10dba9af29d50d1b98a12999108eab90cd5ed1b79
diff --git a/dev-util/samurai/samurai-1.2-r2.ebuild b/dev-util/samurai/samurai-1.2-r2.ebuild
index add970ecc2ef..efe6d050980b 100644
--- a/dev-util/samurai/samurai-1.2-r2.ebuild
+++ b/dev-util/samurai/samurai-1.2-r2.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/michaelforney/samurai.git"
 else
 	SRC_URI="https://github.com/michaelforney/samurai/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+	KEYWORDS="amd64 arm arm64 hppa ppc ppc64 x86"
 fi
 
 LICENSE="ISC Apache-2.0 MIT"