gentoo auto-resync : 05:01:2024 - 14:04:25

19 files changed, 480 insertions, 238 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c182212a056e..85c9fdd9e7a8 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index ac8b177cb069..a5090bf23c53 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1,3 +1,3 @@
 DIST catfish-4.18.0.tar.bz2 295952 BLAKE2B bf05a8f272217936b8f010157c585ab90a9b5858c06a72c6145da62999221725a990d544c67a8469b08d3accbcf28af59bc59a6585e3c8781fb88dc48fb026c0 SHA512 57a3cc5043281bd9527e4faa6a3afcba2e8948fb6dc9e8d93d26ceb0358a84850b3e892105f81b4f2a30bb2964d65b2083fd07b55f145f3ae6ea653acd098539
-EBUILD catfish-4.18.0.ebuild 1179 BLAKE2B ef7b9dcc697ba42676366add0d832c13718904931c8a40fc287057d90a6c01b6cc745248eb6480cd8cb19e9b7af7acba4b5a87e119ff8aaee02dad2fe49db436 SHA512 6d3c97b9da4903e503ffc686278b308e37ceda1967ef0d00e674c963305e400b952d639df64d0fba3b2c475a0dac9a8530518b32b6e55dfc69e826e8ec9b0a8c
+EBUILD catfish-4.18.0.ebuild 1186 BLAKE2B ea19754c485afb1a904cb49ac3c0059fd7ea01fe30135f0cfea6141c288dee6b6830b628ee63632ee7628bb71e77a37539ee3b97ba74dbc8c7af877c490b425f SHA512 c22d038f7a31e514d89a21adee891dea58886a9ef1149e96837c92dc41c0f1a1355494acfb632be973e19985983cf05e29ce9b649b159485326eb28c2d2dd2ac
 MISC metadata.xml 217 BLAKE2B dbd6f28308a539b2f2d27b9b2bb6d44ce324db803a3ed7218ac091711f3cfcd5f01f505c084c0b714f19257af70483906135c68caa1964252b6a9c9fe71b4ac7 SHA512 ba66b524e0287ac4326c527d973ed2ff6a40e330f38f3f1333db2c66a7672e6b24a6212ddf430ee454ed943d89d04a12e42eb670f3dcf1567f59c6e51d5677aa
diff --git a/dev-util/catfish/catfish-4.18.0.ebuild b/dev-util/catfish/catfish-4.18.0.ebuild
index fa5ef5484e8c..5a127eae9d39 100644
--- a/dev-util/catfish/catfish-4.18.0.ebuild
+++ b/dev-util/catfish/catfish-4.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
 # yep, GPL-2 only
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.42
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 54a626fc8768..85b4c173c4ea 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -32,7 +32,8 @@ DIST cmake-3.28.1-SHA-256.txt.asc 833 BLAKE2B 43dc31958ef0ff848d582652e7988a343e
 DIST cmake-3.28.1.tar.gz 11065923 BLAKE2B 7c6d3876633024b8a22dd6aca078e4bd7649c18a810ada68378435e9cfc30878b89529dc69e6e2dcecd114c9686fe6ce937fa5587e47f00128504349cecb967b SHA512 62693c423dd46d252d046662ac34cf9c927b7ec23c213c6b5cd1683636b8bbb5326698af1e7f851f3c01fe3f14dd769b9a8bd405f8f9e73e6d8defae7517cbcb
 EBUILD cmake-3.26.5-r2.ebuild 8795 BLAKE2B c5d15b9c10766befa324beddcb54ae6eedbcfd4b19fd0930d0d8ea16e17c5229fa2379f6ce747de0f93d74eb9f9ef90f665f0b352856fc875aa85e3cd549f290 SHA512 02499b28af97b619ac17e6734393f1fde7a64bc1cb5de49ac4bcd3eb9128d3b1bd88737a277ec501f6b60bb3e0d4aad14d92e7e99514f8b561f45ae1de53dcce
 EBUILD cmake-3.27.7.ebuild 9114 BLAKE2B b93f979ee932c7fe341bd99bd5ff17aabc2d70d418a2606d4d4102a4fddd17a73db0224e405e09c65e12898ef7f1c1254bab30e9e90cb1dfa99d08caf753bd9f SHA512 442eaf0c24ef5e8fc7e6161df86df549f9c8700b92422c2552be34d864a7283e28504aaf024fce6b53cd101782bf8dd414d73eefc1f00166ec3c441da06774f7
-EBUILD cmake-3.27.9.ebuild 9122 BLAKE2B 0ce77ab08f5fe9c7a9f3c8aa2534b39040b8de5d6e1204cc4720f6b3d1d19d85a00ae4cf3ae1be07fe446bcfa7cc572d1dc268459e2dcac93d7f6d627e939206 SHA512 d2edb5597fa8bd3e5a33242fab8797abba3ff59570a9ae04925591ee07c0b11af4a35be4558333ab7be83c514ef0d6a8e34ab4f78561465f0857a3af9d29cfe9
+EBUILD cmake-3.27.9.ebuild 9117 BLAKE2B 224e77dc4d33017b95c1e2eaffbc862371d0cc7e43654b04fd503aece26749b9ac13d1637f60b5d267b9c5cab25e7d7c810e16a02895c2ceb8c6cc4db71fe33e SHA512 d03b91bf49501cbcc69733d42b594297db5c66a22f1c64aff1505c34753f6902278f008e803d03b107e419be6c3fcc0af7b5a3dcfec6627007da4490c7f7188f
+EBUILD cmake-3.28.1-r1.ebuild 8642 BLAKE2B 0e84a237686ae818aa117529c845a63325028ff6718a72c9698c811e862ee254c0b720f71f021d84638b42b1fe260b4998d770bfaf0c60dcca7932e3af3f6515 SHA512 a72646c09452aa1efb4ab5f965893a8dfa664666faf70f6bb51096c357cfbf7e330e28b51663d312f1d56f1f3c9879048890cfcb9de7c6392bb613411b530fce
 EBUILD cmake-3.28.1.ebuild 9002 BLAKE2B 2f497d16acd44e8bdc1c79906df5497e88a86cb1547e4d0bf6a99e073765462798978de6ccac72fe095c5d067eadfdfe3e7a66f69841768027283de0bd0f17c6 SHA512 58d9ad0a1d38d9d1e3148e0efdd4fa633eda43fbc4931fc909d8b099717572cbecfcafc1de9d03e7507b04129115789d4e4d9cd7d76fdbb27d10155bdc6ef0b8
-EBUILD cmake-9999.ebuild 8937 BLAKE2B 9fea7587c59cecfd5489081046ebb765f8cccec053f97be581d8f15f51de66e9297a239524fe6a9943353c68d5656a72521ba8cf8f9960e08df7a9729ec2bafd SHA512 18d9c8da0474731cf31119d6869041dd4d86d4493291a7bda185dfa0df346dab27fdeb39cd18528a7d7e0249c166b6add0a94e25b137e32513fa85df302d8ace
+EBUILD cmake-9999.ebuild 8604 BLAKE2B 5b984b7845e9ecf0862cecc826804935e0d9bc3944c4f92cc3178ed86a1fb8c760f08ef26b6c4df169816f412928fbb18e0c7867f5073fa81b178bd3fa61fdd3 SHA512 e52cb4186e14ebdd02b8c2b3f9c6e5b6b3d22589af7802e71a91d760ac19a980dc430bf77029bffed5abd30334164cb8b31b814b1a82d0476786e4d7ada8c7c2
 MISC metadata.xml 588 BLAKE2B 59754f6dd52986589583b875b48cdfb28f0d22e97fd6cdac9763ed2aa8981c692d81f6cfe73a93f7defde3e58fc0df60fba647760e9f20d00bd8141e4c39055e SHA512 ac463b9402727ba83b276fc206d2ea9101c6edc85142957c9be33bd8841c0396262ceaad545d133a84f6c294b5beee289e84c3226a1aac2d1f041dbfe08c047f
diff --git a/dev-util/cmake/cmake-3.27.9.ebuild b/dev-util/cmake/cmake-3.27.9.ebuild
index cc2a3ce1d1a4..e35c50985681 100644
--- a/dev-util/cmake/cmake-3.27.9.ebuild
+++ b/dev-util/cmake/cmake-3.27.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -48,7 +48,7 @@ else
 			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"
+		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
diff --git a/dev-util/cmake/cmake-3.28.1-r1.ebuild b/dev-util/cmake/cmake-3.28.1-r1.ebuild
new file mode 100644
index 000000000000..defa28f4cf1f
--- /dev/null
+++ b/dev-util/cmake/cmake-3.28.1-r1.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2024 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 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 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
+	"${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_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
+
+	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-util/cmake/cmake-9999.ebuild b/dev-util/cmake/cmake-9999.ebuild
index c13fb3391127..45477a10bfce 100644
--- a/dev-util/cmake/cmake-9999.ebuild
+++ b/dev-util/cmake/cmake-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,8 @@ EAPI=8
 : ${CMAKE_DOCS_PREBUILT:=1}
 
 CMAKE_DOCS_PREBUILT_DEV=sam
-CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+#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"
@@ -19,7 +20,7 @@ CMAKE_DOCS_USEFLAG="+doc"
 # 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 \
+inherit bash-completion-r1 cmake flag-o-matic multiprocessing \
 	toolchain-funcs virtualx xdg-utils
 
 MY_P="${P/_/-}"
@@ -59,7 +60,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="${CMAKE_DOCS_USEFLAG} dap emacs gui ncurses qt6 test"
+IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses qt6 test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -72,7 +73,6 @@ RDEPEND="
 	sys-libs/zlib
 	virtual/pkgconfig
 	dap? ( dev-cpp/cppdap )
-	emacs? ( >=app-editors/emacs-23.1:* )
 	gui? (
 		!qt6? (
 			dev-qt/qtcore:5
@@ -211,11 +211,6 @@ src_configure() {
 	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
@@ -254,11 +249,6 @@ src_install() {
 		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
 
@@ -272,8 +262,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
-
 	if use gui; then
 		xdg_icon_cache_update
 		xdg_desktop_database_update
@@ -282,8 +270,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use emacs && elisp-site-regen
-
 	if use gui; then
 		xdg_icon_cache_update
 		xdg_desktop_database_update
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index 481edc8533b3..62dbd84bd54b 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -1,8 +1,5 @@
 AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d890364edc33f0a55983b9a1ae76bcaf78a784fae92eaa66dc24c270ecf160f747e848872fa17e9c331dce7ad2deb498492b1 SHA512 5fc03fb9c9eea7d4c19c9b263413fb4f7f247b6bd40a7452b26f7e175646dc9b3af945d25cafc42a01a8d95059324652c56baa4bb5768b62dbd58f3ae4f05fe3
-AUX desktop-file-utils-0.26-support-version-1.5.patch 2957 BLAKE2B d4f896c28719c871e32a54c8e535bf499ad2bc9e3bb5e8d294138156add9ebfc32228d79617d19f75fadbbd029a547964bf57c5a4c05a22d3aacc0898b21d6a8 SHA512 643d7e4cfe3445d929fe349d282c4fbabb1426175768e24a2ca933173d69121203f2a8c124640352370fde38d9c841aa364e5905f35c059f201d42b57cfd980e
-DIST desktop-file-utils-0.26.tar.xz 83132 BLAKE2B fdbe5427a0278ebe4a9b1bc15a148ecdc3f54b54058b355ae4f9a962fb1c4ec309d24a075973caf8f187a1c74b013e9bed0a7c3668bf888274e77fac9e077ec8 SHA512 5b4e435f0b635d8f898ac7f5759f74a08ffbe2a56d41fee0e84ff57e73b98d08b57b4416f20b99f696dad8bcb1c20792b39acf836b0814220c0b386ea5f6b831
 DIST desktop-file-utils-0.27.tar.xz 80808 BLAKE2B 66708cd11d5f81824cad814846cdeac6c339e8e93a7f1dceaeed545d9dc1940523fd64ae890e54632b3d32cc91b258aabd41d6d467081539f978ae2993fdfb22 SHA512 81356239a92fb17885aa85a5192c84c2757ebb2e540920d0d41d07035795f08f4162f41b1a87bb2bfcf70ec61f19f1f158e4395a359f46b46f68cb9e24f259a8
-EBUILD desktop-file-utils-0.26-r1.ebuild 1116 BLAKE2B b315c54d8cf8c185201d6b2de9b87d84930ede08f8a55eb371ff0c7255542f2a899cdc3c61d79d161e27bc996f219a8e111a60a1875f45ed5696658defa7f2e6 SHA512 080c56a20a248ba78d914ee898fa7f33a18d47daa253836b38051451388a57333376fa24f345a19d47aa719421593915237f25653cd4bb162c0a173bb9b1d7e6
-EBUILD desktop-file-utils-0.26-r2.ebuild 1221 BLAKE2B 9cbf764d8b1b8599c5a4ae2a5a9c44f14fe9ab9ce24d54ad9188d9ab79c9f7f7758a6a9c6176d52733791f0d0bf0613120e3f35d2bb01f773417859bc62f394a SHA512 e4d2f21bc6622e942c84bb476f9da3eb6340833fb72a0af0903347425aba7d10dfae9199487345430b0199e8a86228b97dba77c581b4e5398e231470586a70a9
+EBUILD desktop-file-utils-0.27-r1.ebuild 687 BLAKE2B 6e23adfa5e3d873d57df9d6ebfff52be30943439a23cb65e0ec4fd9b0158906b9992db41356710a6e761f2989105537bd4eb30f8f717c9fa7b50a01296d649f7 SHA512 c3442f46e158281c84b23a6cd6e6506eba89c52101b3b2c0743603de26da914ff30f2d5b73369c0e7d1385e65ac04c2db024c9f8e0fc7db8f4cf05a3a24ad168
 EBUILD desktop-file-utils-0.27.ebuild 1138 BLAKE2B 663705e02f3db2d6ae263e7369b5486ac0ea72a1278a5194492f76abf226fba159f46014cce32e442fdce91a47fbb6010ffa10ef1d007f0c402fca80a1d33b93 SHA512 b7cfff1f16bc53f53e9ca288d617f91d7fe18b4cc38cf0bb36b4a42c7a3b8442b54505bdeac273c3e9e9a5ee7313e8da7032a0f1654d4cb9848afa5585ac328f
 MISC metadata.xml 225 BLAKE2B 293ebc97ac40be7df2825c558f7def8026a2c8b49af06c8a5fc0dfb58657ee3093306f2a6b90bce5f7fc10f9c3165eee3cd77b58fcea8d293dacff5ba2f04657 SHA512 6f3645f7fe9f5362268973d150b122dcaef666c61e30ddc96917485c617568105aadf7b8d78bf06e402f8592c90369fdc7d949832b9fda13258b4693f1c4c6f3
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
deleted file mode 100644
index 33328074b152..000000000000
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit elisp-common meson
-
-DESCRIPTION="Command line utilities to work with desktop menu entries"
-HOMEPAGE="https://freedesktop.org/wiki/Software/desktop-file-utils"
-SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="emacs"
-
-RDEPEND=">=dev-libs/glib-2.12:2"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-
-src_compile() {
-	meson_src_compile
-	use emacs && elisp-compile misc/desktop-entry-mode.el
-}
-
-src_install() {
-	meson_src_install
-	if use emacs; then
-		elisp-install ${PN} misc/*.el misc/*.elc || die
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r2.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r2.ebuild
deleted file mode 100644
index 4bbe6a30efca..000000000000
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit elisp-common meson
-
-DESCRIPTION="Command line utilities to work with desktop menu entries"
-HOMEPAGE="https://freedesktop.org/wiki/Software/desktop-file-utils/"
-SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="emacs"
-
-RDEPEND=">=dev-libs/glib-2.12:2"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-
-# Will be in next release
-PATCHES=( "${FILESDIR}/${P}-support-version-1.5.patch" )
-
-src_compile() {
-	meson_src_compile
-	use emacs && elisp-compile misc/desktop-entry-mode.el
-}
-
-src_install() {
-	meson_src_install
-	if use emacs; then
-		elisp-install ${PN} misc/*.el misc/*.elc || die
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild
new file mode 100644
index 000000000000..4e192a93a3f6
--- /dev/null
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Command line utilities to work with desktop menu entries"
+HOMEPAGE="https://freedesktop.org/wiki/Software/desktop-file-utils/"
+SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+
+RDEPEND=">=dev-libs/glib-2.12:2"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
diff --git a/dev-util/desktop-file-utils/files/desktop-file-utils-0.26-support-version-1.5.patch b/dev-util/desktop-file-utils/files/desktop-file-utils-0.26-support-version-1.5.patch
deleted file mode 100644
index f4b57d8f2584..000000000000
--- a/dev-util/desktop-file-utils/files/desktop-file-utils-0.26-support-version-1.5.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-# Adds support for Desktop Entry Specification 1.5. Gentoo bug 795570.
-# Upstream commit URLs:
-#   https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/commit/425177a28b6215e0745f95100160a08e810fd47c
-#   https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/commit/56d220dd679c7c3a8f995a41a27a7d6f3df49dea
-
-From 425177a28b6215e0745f95100160a08e810fd47c Mon Sep 17 00:00:00 2001
-From: David King <amigadave@amigadave.com>
-Date: Tue, 15 Feb 2022 10:54:40 +0000
-Subject: [PATCH 1/2] validate: support SingleMainWindow key from 1.5
-
-Fixes https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/issues/59
----
- src/validate.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/validate.c b/src/validate.c
-index 62406ab..ebb03b5 100644
---- a/src/validate.c
-+++ b/src/validate.c
-@@ -326,6 +326,9 @@ static DesktopKeyDefinition registered_desktop_keys[] = {
-   /* Since 1.4 */
-   { DESKTOP_BOOLEAN_TYPE,           "PrefersNonDefaultGPU", FALSE, FALSE, FALSE, NULL },
- 
-+  /* Since 1.5 */
-+  { DESKTOP_BOOLEAN_TYPE,           "SingleMainWindow", FALSE, FALSE, FALSE, NULL },
-+
-   /* Keys reserved for KDE */
- 
-   /* since 0.9.4 */
--- 
-GitLab
-
-
-From 56d220dd679c7c3a8f995a41a27a7d6f3df49dea Mon Sep 17 00:00:00 2001
-From: David King <amigadave@amigadave.com>
-Date: Tue, 15 Feb 2022 10:56:04 +0000
-Subject: [PATCH 2/2] validate: Support version 1.5
-
-Bump CURRENT_SPEC_VERSION to 1.5.
----
- man/desktop-file-validate.1 | 2 +-
- src/validate.c              | 3 +++
- src/validate.h              | 2 +-
- 3 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/man/desktop-file-validate.1 b/man/desktop-file-validate.1
-index 8e17411..ce87c47 100644
---- a/man/desktop-file-validate.1
-+++ b/man/desktop-file-validate.1
-@@ -9,7 +9,7 @@ desktop-file-validate \- Validate desktop entry files
- .B desktop-file-validate [\-\-no-hints] [\-\-no-warn-deprecated] [\-\-warn-kde] FILE...
- .SH DESCRIPTION
- The \fIdesktop-file-validate\fP program is a tool to validate desktop
--entry files according to the Desktop Entry specification 1.4.
-+entry files according to the Desktop Entry specification 1.5.
- .PP
- The specification describes a file format to provide information such as
- name, icon and description for an application. Such a file can then be
-diff --git a/src/validate.c b/src/validate.c
-index ebb03b5..f9eedee 100644
---- a/src/validate.c
-+++ b/src/validate.c
-@@ -961,6 +961,9 @@ handle_version_key (kf_validator *kf,
-                     const char   *locale_key,
-                     const char   *value)
- {
-+  if (!strcmp (value, "1.5"))
-+    return TRUE;
-+
-   if (!strcmp (value, "1.4"))
-     return TRUE;
- 
-diff --git a/src/validate.h b/src/validate.h
-index e6efd93..a7952cd 100644
---- a/src/validate.h
-+++ b/src/validate.h
-@@ -30,7 +30,7 @@
- 
- #include <glib.h>
- 
--#define CURRENT_SPEC_VERSION "1.4"
-+#define CURRENT_SPEC_VERSION "1.5"
- 
- #define GROUP_KDE_DESKTOP_ENTRY "KDE Desktop Entry"
- #define GROUP_DESKTOP_ACTION "Desktop Action "
--- 
-GitLab
-
diff --git a/dev-util/gperf/Manifest b/dev-util/gperf/Manifest
index 36fbc41284a4..e284dad4c627 100644
--- a/dev-util/gperf/Manifest
+++ b/dev-util/gperf/Manifest
@@ -3,4 +3,5 @@ AUX gperf-3.1-parallel-tests.patch 1323 BLAKE2B fcbbd6e26fec78a9325b616e093ff760
 AUX gperf-3.1-strncmp-decl-mismatch.patch 819 BLAKE2B 627af81f91b5fdfd1bd3978adeed9a0d00a5d6b3f8aae54fe0ce21cfaf9384734a61a5986723f72f4c55efdccbed90ec651008d6df651a10322c04b4099431bf SHA512 167823f5908951c79e9ec5b77106a1acbc011bc34636a845d50f55689cf9a7a1f4652a628dc786a29d1dd764e94d1055e32eea1f8c3852d9622e14816969c7f4
 DIST gperf-3.1.tar.gz 1215925 BLAKE2B bc4c54ade3f7dce484714d77cb5759dcc02b7a607d7b1aff6bdbcd06ee4c83e9449038a7217d5f25bcbef058ba56e1fce9383b9599de005154e5a9b566ac9c69 SHA512 855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4
 EBUILD gperf-3.1-r1.ebuild 751 BLAKE2B d35fe2c21e0d0abe91959e4c6b243e682d3bf2130e1ade012263dd3d0a0fdb86c7711bd7e4f4283c168edb44fa8612f17b14d7f768e50389671fd8ccb84bee47 SHA512 d77340398aec5398d52df3c0b1aaedd4d461b712a8a8bdba7470c419679d872f1f50698e93071770e22291b7d4ed43f959507252a51a3b07162b5fe821f813d1
+EBUILD gperf-3.1-r2.ebuild 865 BLAKE2B b495d6e4bd218df46d3afc69a38dc6d75f6e451131b57ef1e82d7250640f95e0d401848d64361d6932aa44e0158e192a114d827f7069b7d3b39a6cf8978aafbc SHA512 904d76fce20a57534ef2eab8972c2587b08a4037968d45ea986fe6401148eac9c1e5356cf71ee0c777bc42b5244071807c65761991737b0b85610dcd380a0ef6
 MISC metadata.xml 340 BLAKE2B 50b364949bb779503aa29072024bb8d13a2195fc05911da90071b08742d63cc6bfcad152fdbd149c90eede93fb01165c95b46359a9b20bb3d32a87a1f19d4333 SHA512 19b11707d3d714c5ee69a1f17eac7cff18ccca9fefccc2d1d68305b3c86f4992db90529365340cb7f6ee07bfc01f3b690360d07f858da916c1136853172155d6
diff --git a/dev-util/gperf/gperf-3.1-r2.ebuild b/dev-util/gperf/gperf-3.1-r2.ebuild
new file mode 100644
index 000000000000..f5fd37924abf
--- /dev/null
+++ b/dev-util/gperf/gperf-3.1-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="A perfect hash function generator"
+HOMEPAGE="https://www.gnu.org/software/gperf/"
+SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+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"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-strncmp-decl-mismatch.patch
+	"${FILESDIR}"/${P}-clang-16-wregister.patch
+	"${FILESDIR}"/${P}-parallel-tests.patch
+)
+
+src_prepare() {
+	sed -i \
+		-e "/^CPPFLAGS /s:=:+=:" \
+		*/Makefile.in || die #444078
+
+	default
+}
+
+src_configure() {
+	# Aliasing violation (bug #858377)
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	econf --cache-file="${S}"/config.cache
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 64ca1855fb19..730736156739 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -30,7 +30,7 @@ EBUILD meson-1.2.2-r1.ebuild 3298 BLAKE2B df141e7d10d26fdb41e298cdf856fe46e632ad
 EBUILD meson-1.2.2.ebuild 3285 BLAKE2B 1b38a024705bc9a5046a19ed80f2ba126ff984112a5761283778207d1cce3e33ea39260cc3e6ce864b3f5d07ceaf7a0431f56638830491814da0455cfd2a7e7a SHA512 c581592f28a3a39834afa3369af14ddc267a1e3c2f35e2c41674354da560828fd2037550a6314f0063700528414b0bdfa42aecc82ea86340384985db8aee0fc3
 EBUILD meson-1.2.3.ebuild 3277 BLAKE2B 8a19cba268c31b8adc4f4852eca184639f0d6344934c321279a7dd48f5e3de02ce63bd4f3cff5814d8e42beff6733c9cf52c3742c254b051fa1d7a07d1885c33 SHA512 7fa82018c0f7d0179e1ccd5df33651e0e59561d2a35ccb189a32f7dc298cbe25bdfe4fd5db0eaf314a22b181ed111b74d957e240ab77cad62e2de9b3be9be512
 EBUILD meson-1.3.0-r1.ebuild 3402 BLAKE2B 86c1be84d1a2a95ef3a2c325754d773502fc38e0e689f8eb449c4a26e1498148383f608612d3f82fe223402b6d09b58a7f38f52c24211e1285512c7f134b9fa0 SHA512 28e238d500cfcd0afc8b01f1bb22c957fc86c0d85b3c17814861e2ffc4dee2024a022cb08b991dd73d32e0fef1c01ab411a2db6df6595851bbf70e1211e51aa0
-EBUILD meson-1.3.0-r2.ebuild 3560 BLAKE2B d9de2564ccd2ff2bdb4bfb313852ae2de0b2068ac7fc9666eb79b5494091ea689550aed971f184c5645c023f86eee3dd4559b77e061bee40c57b2d62825fe4b5 SHA512 74df7aa1a41950ff05da696f1ead22bd0e4a1c9e77eba0029416535ef801e9aa4b1b8315207d28bd29ffe97f76cd281c40b8c998b15f74e2c0d5bc27f99b2733
+EBUILD meson-1.3.0-r2.ebuild 3559 BLAKE2B e887d5bf12d52341f51c4122cf4554863b122199d27da1eed5f69caa798ceed206de449ae7c03eaf4406f13f947db29eba628d5fdecb08f7285ef50accf0bb9d SHA512 11310ec5a56151275b1647ba1e7f17cf2adacb1379325e63c3d836187ebcf0e8aec633bf679c43c2289fe544a9f9bd175bccceea4086cac9b507ddeb2bf57ec6
 EBUILD meson-1.3.1.ebuild 3580 BLAKE2B 1dd390f3ca0606952cf5bd2c10ccbed5f1b1c69fe179ecd70dffd73d8e9b7a81f8d5002129c4fc365af9554c848df17099e6c45559f85f6f155d6d8de55e38bc SHA512 cc92c6aa97b7005dc5f3865b74b1e432391a43e114e28239e7b36d5ac7ec1852dc75fdd10cbdca2e0d494b4e50e759b48da7def6d7f2357939a205176241d5b2
 EBUILD meson-9999.ebuild 3227 BLAKE2B 8c8e99032af1d188ca7a8a227c992a4f53676523bcbdb5d7a0b44e254f897f6c2ed597bc6bd8472ddcf67f27e0d9117129fe93ebb452b80603dddf2d1664023e SHA512 a483a7433c22951f9da4d82c13eaff36f94b3772324641483129a4d7a138438382d6b349079808579d4fee22d59631f00a20759a8ac01f73a506c73f7e077218
 MISC metadata.xml 472 BLAKE2B 559073667cf007cd507f379014c8d0d494908742f606ca5eeb2a0cef3b5a8cb63cea4e9aa33b228163211dff8f794d178cbcd6c91bb283f894e6b072db28bacc SHA512 9232fe05900dca57d21f41023255c9a6fba57b213737ac8842ea180681488d9a2a306c8fbeba66cf02204f4523192e64af745aa65db946beac723cfe271e4fd5
diff --git a/dev-util/meson/meson-1.3.0-r2.ebuild b/dev-util/meson/meson-1.3.0-r2.ebuild
index 731af5e71112..7ba217e693ce 100644
--- a/dev-util/meson/meson-1.3.0-r2.ebuild
+++ b/dev-util/meson/meson-1.3.0-r2.ebuild
@@ -24,7 +24,7 @@ else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
 
 	if [[ ${PV} != *_rc* ]] ; then
-		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"
+		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"
 	fi
 fi
 
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 38a90530365b..81078231b9f4 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -2,5 +2,6 @@ AUX ninja-cflags.patch 738 BLAKE2B ec025836197d41d96cfcab0a7363ab3bda50cb7fc3f91
 DIST ninja-1.11.1.tar.gz 229479 BLAKE2B c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5 SHA512 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403
 EBUILD ninja-1.11.1-r2.ebuild 2542 BLAKE2B b97833127e9f27880fd8e8dbf7d9cef4233ebd6a83eb88bf4131d21d12fac8ca076b48252be7909cf346fc416dcb31457ca4bcf63915a916a2f9057a7cb8e3dd SHA512 dfa83ca9aedc01c5a8c5a39843626bfe9b0d7543fc320013695538a1faf163654f54f10176201438fd4b1c9c7198e7fe66fd15e95d83751d5ac14969e5483599
 EBUILD ninja-1.11.1-r3.ebuild 2698 BLAKE2B 556911ca4e02ff8c4319a27b7121b4a877cb99ff6e81deed69364c5b5d8e8e6c113da14b22115baf72836d3494b46260866e593abfa34b04e1696ec69cc9af9b SHA512 376dff0bc9693a8d3c8db98f04b4f93e5077459a424610b1da6d05601867a019ab78a269474b6f972bf291d8f968b570637436081711e9a062a3b696cc1807e6
-EBUILD ninja-9999.ebuild 2706 BLAKE2B 5e5fae0c0c1bae2d6cfba87f32bb30f80a73bf6221e5f49ab1d918104309497df4e2ef0fc533cc92741f43ee34e141c7640ebe266ffe8d92f51179abb330339e SHA512 c7483d2e62f6b90ea66460782cb8958fa461cd6d2d60a7ad8167745a059bc8a5ac010b2f9a37fceaeb3192a79ca7c97552d8ab44001fe13736c3100773d0dcbf
+EBUILD ninja-1.11.1-r4.ebuild 2408 BLAKE2B 3fcb2019ec82acc7dd8879ba43f135b37f85604a69b0311e2c998803f08faaa88ca9a50fb7f2f9c2ea94943964d41cab358ce121cc6720bddb9cb79ea4b61f42 SHA512 fe16ac9c646ee904bb60317a3e73d050fab5ff7c2e4d82fe9cf68954c52ffb451eecd5c27d21539a5a0706a1323965eafedacd735cb280731fe77d25896c31b1
+EBUILD ninja-9999.ebuild 2408 BLAKE2B 3fcb2019ec82acc7dd8879ba43f135b37f85604a69b0311e2c998803f08faaa88ca9a50fb7f2f9c2ea94943964d41cab358ce121cc6720bddb9cb79ea4b61f42 SHA512 fe16ac9c646ee904bb60317a3e73d050fab5ff7c2e4d82fe9cf68954c52ffb451eecd5c27d21539a5a0706a1323965eafedacd735cb280731fe77d25896c31b1
 MISC metadata.xml 463 BLAKE2B 4094365ee9f5db41a29df26eada46bc42050da4043003bc265733666475d950df0b53cc475585b5d0ad79a1b9cbe83a53076911e564960d21568479e52bc4b33 SHA512 2d08b1e9f5377ba2d1976093fc9a3a9ceec51e80a7473e3d80e536585d1adb21c90d954205b97dd063dc99fe60b7b0c5335a16e05d0a2fa79e951c4833697880
diff --git a/dev-util/ninja/ninja-1.11.1-r4.ebuild b/dev-util/ninja/ninja-1.11.1-r4.ebuild
new file mode 100644
index 000000000000..74b611b5aeca
--- /dev/null
+++ b/dev-util/ninja/ninja-1.11.1-r4.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2012-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit edo bash-completion-r1 flag-o-matic python-any-r1 toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	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"
+fi
+
+DESCRIPTION="A small build system similar to make"
+HOMEPAGE="https://ninja-build.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/re2c
+	doc? (
+		app-text/asciidoc
+		app-doc/doxygen
+		dev-libs/libxslt
+		media-gfx/graphviz
+	)
+	test? ( dev-cpp/gtest )
+"
+PDEPEND="
+	app-alternatives/ninja
+"
+
+PATCHES=(
+	"${FILESDIR}"/ninja-cflags.patch
+)
+
+run_for_build() {
+	if tc-is-cross-compiler; then
+		local -x AR=$(tc-getBUILD_AR)
+		local -x CXX=$(tc-getBUILD_CXX)
+		local -x CFLAGS=
+		local -x CXXFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	echo "$@" >&2
+	"$@"
+}
+
+src_compile() {
+	tc-export AR CXX
+
+	# configure.py appends CFLAGS to CXXFLAGS
+	unset CFLAGS
+
+	append-lfs-flags
+
+	run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
+
+	if tc-is-cross-compiler; then
+		mv ninja ninja-build || die
+		${EPYTHON} configure.py || die
+		./ninja-build -v ninja || die
+	else
+		ln ninja ninja-build || die
+	fi
+
+	if use doc; then
+		./ninja-build -v doxygen manual || die
+	fi
+}
+
+src_test() {
+	if ! tc-is-cross-compiler; then
+		# Bug 485772
+		ulimit -n 2048
+		edo ./ninja -v ninja_test
+		edo ./ninja_test
+	fi
+}
+
+src_install() {
+	dodoc README.md CONTRIBUTING.md
+
+	if use doc; then
+		docinto html
+		dodoc -r doc/doxygen/html/.
+		dodoc doc/manual.html
+	fi
+
+	newbin ninja ninja-reference
+
+	newbashcomp misc/bash-completion ${PN}
+
+	insinto /usr/share/vim/vimfiles/syntax/
+	doins misc/ninja.vim
+
+	echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}"/ninja.vim || die
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${T}"/ninja.vim
+
+	insinto /usr/share/zsh/site-functions
+	newins misc/zsh-completion _ninja
+}
+
+pkg_postinst() {
+	if ! [[ -e "${EROOT}/usr/bin/ninja" ]]; then
+		ln -s ninja-reference "${EROOT}/usr/bin/ninja" || die
+	fi
+}
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index c4874b6be066..74b611b5aeca 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2012-2023 Gentoo Authors
+# Copyright 2012-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit edo bash-completion-r1 elisp-common flag-o-matic python-any-r1 toolchain-funcs
+inherit edo bash-completion-r1 flag-o-matic python-any-r1 toolchain-funcs
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
@@ -20,8 +20,7 @@ HOMEPAGE="https://ninja-build.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-
-IUSE="doc emacs test"
+IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -35,8 +34,9 @@ BDEPEND="
 	)
 	test? ( dev-cpp/gtest )
 "
-RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
-PDEPEND="app-alternatives/ninja"
+PDEPEND="
+	app-alternatives/ninja
+"
 
 PATCHES=(
 	"${FILESDIR}"/ninja-cflags.patch
@@ -75,10 +75,6 @@ src_compile() {
 	if use doc; then
 		./ninja-build -v doxygen manual || die
 	fi
-
-	if use emacs; then
-		elisp-compile misc/ninja-mode.el || die
-	fi
 }
 
 src_test() {
@@ -112,20 +108,10 @@ src_install() {
 
 	insinto /usr/share/zsh/site-functions
 	newins misc/zsh-completion _ninja
-
-	if use emacs; then
-		cd misc || die
-		elisp-install ninja ninja-mode.el* || die
-	fi
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
 	if ! [[ -e "${EROOT}/usr/bin/ninja" ]]; then
 		ln -s ninja-reference "${EROOT}/usr/bin/ninja" || die
 	fi
 }
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}