gentoo auto-resync : 30:11:2023 - 04:55:37

9 files changed, 423 insertions, 6 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 40d73da36129..497623670a24 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 4153a6c0b4e3..dd4712310831 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -32,11 +32,15 @@ DIST cmake-3.27.7.tar.gz 10982558 BLAKE2B a20fac503ba54b4b7e85896056a614b67aa346
 DIST cmake-3.27.8-SHA-256.txt 1646 BLAKE2B e78bf23e703d9b89f3daa74d39794cadf5188c3b92f5d43a6b97fdbbeae27d86186cae16675560108391ee078072beddc855f7d92e7159a60ce3ad6c562f9907 SHA512 5c1b60500ce0915418c07f4b3770304d0b7d905bbefbd83bc9f21edea81b5c60d2b74a003e33aec851c2c691e5e57447d0ab2be51abb820180e45b43a90d36b8
 DIST cmake-3.27.8-SHA-256.txt.asc 833 BLAKE2B e516fccd908987d70f02da85c79e6e57811c560a6fba31625829b5c316969a8ef0516e74a2055b46297888072fa5b6dd58af637e59579f41cb276d45664c7863 SHA512 ac37186a282151a5edfea2c0f05597f021ffad2de8b9608093930a8d4d10f9afd9ff71a8ee25198902d8d3831ce95a264fb48bc23fb31fa65985ec529988e866
 DIST cmake-3.27.8.tar.gz 10983480 BLAKE2B 8c746d58fe07978bf0ccc92b31731bda46d13965bc3642846b41b7f2ab2d87e88122aa976f9b57a82d04ead4937d5c150b7ec3e9ae601985bfb5382509ddbe84 SHA512 ca7782caee11d487a21abcd1c00fce03f3172c718c70605568d277d5a8cad95a18f2bf32a52637935afb0db1102f0da92d5a412a7166e3f19be2767d6f316f3d
+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
 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
 EBUILD cmake-3.27.6.ebuild 9009 BLAKE2B 82b5995de0ecd5e8706135e37fe4b0fbee9741b392747fba00611596d772e8be355914a9d0fb8e864a1ab523c35c42993a42e7534dc3ae37734477acbe7f7217 SHA512 304cc1876385b5d664c5933898d1ac579cf00559c4da895b73d9fe1cf8aa5b6143f9020631a33bd4d98635f6d512635f89e465de5cfe9ef779bde3193103ee90
 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-9999.ebuild 8937 BLAKE2B 9fea7587c59cecfd5489081046ebb765f8cccec053f97be581d8f15f51de66e9297a239524fe6a9943353c68d5656a72521ba8cf8f9960e08df7a9729ec2bafd SHA512 18d9c8da0474731cf31119d6869041dd4d86d4493291a7bda185dfa0df346dab27fdeb39cd18528a7d7e0249c166b6add0a94e25b137e32513fa85df302d8ace
 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
new file mode 100644
index 000000000000..cc2a3ce1d1a4
--- /dev/null
+++ b/dev-util/cmake/cmake-3.27.9.ebuild
@@ -0,0 +1,296 @@
+# 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)
+	# pkgconf
+	# fixes https://github.com/pkgconf/pkgconf/issues/317
+	"${FILESDIR}"/${PN}-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.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/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest
index abfab763c937..17e0d10e52fd 100644
--- a/dev-util/cookiecutter/Manifest
+++ b/dev-util/cookiecutter/Manifest
@@ -6,5 +6,5 @@ DIST cookiecutter-2.5.0.tar.gz 276288 BLAKE2B 8f294d39a385909cf9c23511eae2ad2878
 EBUILD cookiecutter-2.1.1.ebuild 1341 BLAKE2B f5e1c613379acbe76d7e95051dc07792a9fe93d6bef4f82a9e6e0d800b4274c653634daa4b8baf1c1bb43f5f12f2d1f3ef94b19e4ae0aebd1a81ceab0bebf669 SHA512 6b9e6c4cb4dbd6563b521f1ef9919dd6cc79b2de2e9ca04d7dd25b170908616f8ca3becfaf5136f92a682d5438ea5801840a6316987ede58d7b8a555abb99be2
 EBUILD cookiecutter-2.3.1.ebuild 1370 BLAKE2B 9d6934ab9091fca9e91432d5714e85fc81df1a56b5a7f4b8281a2339409711fd247e8d12b850f120c87021dac4899263194ec5842abd21d7dfa0c7e838ac0a0a SHA512 a51e54faf453efcc9fd783990b0af2ab8feb3812b7d5927f25fd4ae30c5ab65df66a8ed896cbfc4fcbebcb3234c2a3d115969472ea7803eb90bda6dd134539c0
 EBUILD cookiecutter-2.4.0.ebuild 1371 BLAKE2B 1c21b71c71718c5a2a18c7cf626e5058576609657ead9902855274b5ee8187336f5049aaa97da603651766067f35fa7111fd8a57a0499c4a4945d39d79c4220e SHA512 8f396c2bbd41bbff3bd25094ab9b5e27f9df74cd73209be74861c4d4e237289ee69c13c017cc519915acad1e31e20147f52a649eecf6b83939a38e3dceb9421b
-EBUILD cookiecutter-2.5.0.ebuild 1371 BLAKE2B 1c21b71c71718c5a2a18c7cf626e5058576609657ead9902855274b5ee8187336f5049aaa97da603651766067f35fa7111fd8a57a0499c4a4945d39d79c4220e SHA512 8f396c2bbd41bbff3bd25094ab9b5e27f9df74cd73209be74861c4d4e237289ee69c13c017cc519915acad1e31e20147f52a649eecf6b83939a38e3dceb9421b
+EBUILD cookiecutter-2.5.0.ebuild 1378 BLAKE2B 5d6bfe6a8ce4cf7642c7ece9ea8720425b026be306906c5638d8860eaa5164e557f15907caf5d34d3f89dd82ca58f4ce95697500e49f79b6381a61258805f3f0 SHA512 e6b35023e7b0fce23725b8081379f41259a67b62737b9286a2ff2da686f953804014d41e4da239126453a38ab11e369bc2f013d9d8f646d8fd3bdb94abdd7f0a
 MISC metadata.xml 478 BLAKE2B 26a0ef11397a266f9b64252c88ffa45466adae6959d3f95d3d7c815a4820430dbd5de1b66c3dae57d4a6b947d69efe57e9eea5c448d288e7ceca3ef8b507356d SHA512 22ac873e11794cd7b00ee09d8ce643e018214f36b5bbc5eb3b53ef65cfadc2a9d7c1ca1515ea22657c9f0aa4afe041e45262280f53927f29a317ce4d2fbbc83b
diff --git a/dev-util/cookiecutter/cookiecutter-2.5.0.ebuild b/dev-util/cookiecutter/cookiecutter-2.5.0.ebuild
index d73849c2b159..f4f2ba68ec1e 100644
--- a/dev-util/cookiecutter/cookiecutter-2.5.0.ebuild
+++ b/dev-util/cookiecutter/cookiecutter-2.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/cookiecutter/cookiecutter/archive/${PV}.tar.gz -> ${
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/arrow[${PYTHON_USEDEP}]
diff --git a/dev-util/gitlab-runner/Manifest b/dev-util/gitlab-runner/Manifest
index a27dcec440ef..371932b0c861 100644
--- a/dev-util/gitlab-runner/Manifest
+++ b/dev-util/gitlab-runner/Manifest
@@ -6,9 +6,9 @@ DIST gitlab-runner-16.4.2-deps.tar.xz 218831500 BLAKE2B e639c446aafd9095e07a6dd6
 DIST gitlab-runner-16.4.2.tar.bz2 1371196 BLAKE2B 9ff9073fa69a4a04b59d9e3274eec9c86817fd198f3b3ab877352869eb5d5bb0f1aab69fd9500d9f87ac3ca4def9b6d286d82905be4e48014fa902f29dc9c6b5 SHA512 59817206b4d654ec27512fd0713d7d2a879ca4cd6e1abe46e0314c90db49795316f8b6d196f9b5bf11d9ff04efd16f8d580131a39ac20cc21ed4c3bc83e9d5b9
 DIST gitlab-runner-16.5.0-deps.tar.xz 218830692 BLAKE2B 91f1b48239f8da19c93f5b9ec3ba30a1fceb0d17f72395dc85cbbd2a584845977044b920ea19b1d01df62f90cfc86cfcd354e0c3d49b7dba8e216f8cbeae057c SHA512 3d07800019ef800d5db79d7f8696c4fbfb3ffebbe4c9367e0af02d2abcf56e5d09f837b6fdb29e12eb5a04b9a48c00fc0a6e8e955b1fe91c6bc87d0e8c33f2d6
 DIST gitlab-runner-16.5.0.tar.bz2 1373002 BLAKE2B 25ac77ffa71a633cad2b99211acf68595a3ee293f5af3e7cd813ec5a9b70a252413ed99d3b354ef713fb08b9dfeb140e7daa7a3cfd168d4af270034147657dac SHA512 59f03814a44d53c573b336f3eff9d1d273bc6b601e86cc58ca91778705a7897c999bd30e92361aa9294a91596505ca2950d56ad9cc64db7aa40a204ab4a4173d
-DIST gitlab-runner-16.6.0-deps.tar.xz 223036872 BLAKE2B 2ed2ec80bb6de33b2ba8ab002edb4f96da34ac2cdd52f289bb128b61c670335477f1cf46b384304b47b0972bb2d029fd5763385dc63b6b21fcc9148d905a7df0 SHA512 96fcd9555cb501daaaee114d0da2f2b5b83644f3c9154e31b2a6208ac4fd043a7457157da4b1ed0d287841ceaa4d9101f3a4d198804bcb7833b07db73a14ffd4
-DIST gitlab-runner-16.6.0.tar.bz2 1335612 BLAKE2B 431f8b393fdeec46eb8e7b61c8892c75be5c2183f9a04e1d3a078313e62e37863d9e59b7163e9cc2b6efdba79c719c4244ec64dbee997ea9e39b81fcaeda6794 SHA512 6dfbc0eb145752a7d1891aafdaf4641dafc263a97b4c4b37c2dad3bfc9a44db2aa4059f7f76ecf11280cf06c61a01648f41af22997ba79bcda57f241ef2686b1
+DIST gitlab-runner-16.6.1-deps.tar.xz 223030236 BLAKE2B 76866243ed71a907b0eb8d9991243683be45c7e426c2ba53f556ebb868ef42a6523d5eb421fdffe2ce0ec290f5d8a19db9e5690eec52b4bdb8a7e819ded11939 SHA512 907464fd819d1f331f8f19be5c6fcf64838f3d7ad2d27586d2799642ef3ea94c2860caca8d4dc1b11404b664e3e7201e8becf99fd1895c8a7ab548ce4d4ea65b
+DIST gitlab-runner-16.6.1.tar.bz2 1335597 BLAKE2B 5432b008c38e0ce4f6d9026f82f964a2b929b81165d5694b05d740e5db3d561e7856842dec1d0bd17595832a6321f5d060da6e1be0f12da6a66608226089af97 SHA512 14a30a276c46b43b7b5b6a766eb287beecb434a2c6cadaababdd6de0b265f23de2dc3b8387f8110889cf3cca70ad95bffcbfed7cf0d5543604ee3aebc4cad579
 EBUILD gitlab-runner-16.4.2.ebuild 1679 BLAKE2B 5adad30ce3b1953bad8bc9ab5ab5a09e60f65fcc55b535f2f59b237cda84937a771edeee723481e12832816fde72339be4d91e0b274eb14cbcdc0e76ec392cbb SHA512 231a4136d008a94f1e453c78c22a4f313a072d8840a26d45d7727bfc68564a939a39c7a6483591ce94f8bac73e0f0bd4a9796d8364c06cac85ac4d40e072b1d3
 EBUILD gitlab-runner-16.5.0.ebuild 1679 BLAKE2B c3922fd79181a2507c5a30aac3f1dda41035d8e13fba2a3da8e721ba3a13b44a32cd7ddd6d9e37c8359f07c92e65b97357929c9e17a233f4e391378c4c62c463 SHA512 1272ab8e54e3f210a05282eb55eea050dcbe78611990eab3f8a164d28811f66b62ad90e170975d27de6ecf006312fe61ae3f1e084e6826b1bde1c61941d33852
-EBUILD gitlab-runner-16.6.0.ebuild 1679 BLAKE2B 6d32fc8e4ccd9ca2cbf45f9752401721f4cc0f325ae5e229b7d6faceb503c772de38766cfdf3ced092da29366c9de7ba7f119bb26d1b4b89665d725699e031a1 SHA512 d2d373c3c95a73f59724e253688d2eab914066d35b796aac7cf72249ab47f8b67d5fd2b8849090c8b5c15398bf13c931d04de33a1e566a38bb6372231f161464
+EBUILD gitlab-runner-16.6.1.ebuild 1679 BLAKE2B 5e5cffac508bd7590482ad3e6c203e343e1c83a46d83cc90290020e384e715066756a6e4b5d679d3c76f31f3d70defde3e8aaf564686b33fc8ea843eadc80f19 SHA512 93692ca4173745e792981bf6fadc127aa6363580f4a185cc1a83ab59dbbf555b8e3c21598e541ce53eb361a44290994f738dc0d16f00f88f2070604bfc0cf63e
 MISC metadata.xml 338 BLAKE2B dfdcaaee18d3e5492674d3b4055002201342fa4d5b713f88240753002de2bde6244469fe42fe514cb82544d15deacd235cd031dcf71d661a24b26f422c67c392 SHA512 b12a8270df4f07c6b4359150a3b7341d3913a93598153824ec758384758e69667a89de20066735ccc24aea7af07b5c1bdd444fca3193be5402bce5154f90ec79
diff --git a/dev-util/gitlab-runner/gitlab-runner-16.6.0.ebuild b/dev-util/gitlab-runner/gitlab-runner-16.6.1.ebuild
index 7a4920e0ac49..7febea7444d1 100644
--- a/dev-util/gitlab-runner/gitlab-runner-16.6.0.ebuild
+++ b/dev-util/gitlab-runner/gitlab-runner-16.6.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 inherit go-module systemd tmpfiles
 
 # make sure this gets updated for every bump
-GIT_COMMIT=3046fee8
+GIT_COMMIT=f5da3c5a
 
 DESCRIPTION="The official GitLab Runner, written in Go"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner"
diff --git a/dev-util/intel_clc/Manifest b/dev-util/intel_clc/Manifest
index 3d9ba6e88ef2..05e3a8cb15ae 100644
--- a/dev-util/intel_clc/Manifest
+++ b/dev-util/intel_clc/Manifest
@@ -1,4 +1,6 @@
 DIST mesa-23.3.0-rc5.tar.xz 19227440 BLAKE2B 844eb3dacc6f579f1a7bff74fc20ec22021ac33dcdd716488487e66e9ef8c6be4a5eaf7260628eec58baa55fd70bfe4a6223e83ea8b163d6e16dd8677af3c7e3 SHA512 f1c2421ab262da422ed9ac5ca08b0e1c41264373e022de9413c65e1e7e8ee929979d1c80741497a0acba1d118665a7f6076e24139be0c9c70f3fe8f5d319c187
+DIST mesa-23.3.0.tar.xz 19234688 BLAKE2B 1b87d15cbe1b4c761653b7042c46eac3036f08dfcf3a0a81aa7bf6c1c0c402b05f37ce8da9d88df72e1745d66a648c2b8c161b04bf558107f548f6d8167cc798 SHA512 3568b571974a2c6c0c3a4cc614c851729962e39926f0af906ba91604f9d43c0618db7df004cbec5d9e5dbade2d6bde818608c9aa1686183994d68ad3e6ac4521
+EBUILD intel_clc-23.3.0.ebuild 2490 BLAKE2B e26856b1c348027490d3012ab18a732d1c8216f93c3ad57df6764818ec6b8e72d4e28a98bab9346bf5d0cc78f2becf2b2b8ba8f35e545753680109eb72ed4f80 SHA512 218a4bb0b8b4f07b24162c7743dee325b65cb9751a994d53fd2dc57fe132200593b5d65ea771b00405d798fdd43dfe937abbdf8331d4317fa536748f8b21508a
 EBUILD intel_clc-23.3.0_rc5-r1.ebuild 2490 BLAKE2B e26856b1c348027490d3012ab18a732d1c8216f93c3ad57df6764818ec6b8e72d4e28a98bab9346bf5d0cc78f2becf2b2b8ba8f35e545753680109eb72ed4f80 SHA512 218a4bb0b8b4f07b24162c7743dee325b65cb9751a994d53fd2dc57fe132200593b5d65ea771b00405d798fdd43dfe937abbdf8331d4317fa536748f8b21508a
 EBUILD intel_clc-9999.ebuild 2490 BLAKE2B e26856b1c348027490d3012ab18a732d1c8216f93c3ad57df6764818ec6b8e72d4e28a98bab9346bf5d0cc78f2becf2b2b8ba8f35e545753680109eb72ed4f80 SHA512 218a4bb0b8b4f07b24162c7743dee325b65cb9751a994d53fd2dc57fe132200593b5d65ea771b00405d798fdd43dfe937abbdf8331d4317fa536748f8b21508a
 MISC metadata.xml 388 BLAKE2B 0558cfe706987a93605fb383bc2c30ff4f4cf5837ca19afd3e16d9702ea7dcd3d575579d53aacb531e1d421c8b1692eb4607d713793a89240223c031d7781a31 SHA512 e0375912a94fa92b49ed78d9a88c4eacc8b441d8b2fa117a48df2d8a958f1cf91279299aca109e24f76b27ca04f0067f83e5b8e4141f85ac64d379bca0945d2a
diff --git a/dev-util/intel_clc/intel_clc-23.3.0.ebuild b/dev-util/intel_clc/intel_clc-23.3.0.ebuild
new file mode 100644
index 000000000000..e1a7520244d4
--- /dev/null
+++ b/dev-util/intel_clc/intel_clc-23.3.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit llvm meson python-any-r1
+
+MY_PV="${PV/_/-}"
+
+DESCRIPTION="intel_clc tool used for building OpenCL C to SPIR-V"
+HOMEPAGE="https://mesa3d.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	S="${WORKDIR}/intel_clc-${MY_PV}"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	S="${WORKDIR}/mesa-${MY_PV}"
+	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT SGI-B-2.0"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/libclc
+	dev-util/spirv-tools
+	>=sys-libs/zlib-1.2.8:=
+	x11-libs/libdrm
+"
+DEPEND="${RDEPEND}
+	dev-libs/expat
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	virtual/pkgconfig
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. Specify LLVM_MAX_SLOT (inclusive), e.g. 17.
+# 2. Specify LLVM_MIN_SLOT (inclusive), e.g. 15.
+LLVM_MAX_SLOT="17"
+LLVM_MIN_SLOT="15"
+PER_SLOT_DEPSTR="
+	(
+		dev-util/spirv-llvm-translator:@SLOT@
+		sys-devel/clang:@SLOT@
+		sys-devel/llvm:@SLOT@
+	)
+"
+LLVM_DEPSTR="
+	|| (
+		$(for ((slot=LLVM_MAX_SLOT; slot>=LLVM_MIN_SLOT; slot--)); do
+			echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}"
+		done)
+	)
+	<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=
+"
+RDEPEND="${RDEPEND}
+	${LLVM_DEPSTR}
+"
+unset LLVM_MIN_SLOT {LLVM,PER_SLOT}_DEPSTR
+
+llvm_check_deps() {
+	has_version "dev-util/spirv-llvm-translator:${LLVM_SLOT}" &&
+	has_version "sys-devel/clang:${LLVM_SLOT}" &&
+	has_version "sys-devel/llvm:${LLVM_SLOT}"
+}
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig"
+
+	local emesonargs=(
+		-Dllvm=enabled
+		-Dshared-llvm=enabled
+		-Dintel-clc=enabled
+
+		-Dgallium-drivers=''
+		-Dvulkan-drivers=''
+
+		# Set platforms empty to avoid the default "auto" setting. If
+		# platforms is empty meson.build will add surfaceless.
+		-Dplatforms=''
+
+		-Dglx=disabled
+		-Dzstd=disabled
+
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/src/intel/compiler/intel_clc
+}