9 files changed, 381 insertions, 3 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 5930a97044fd..b01e3b347df2 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 155418c671fa..eb5b44d1377a 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -31,10 +31,14 @@ DIST cmake-3.27.1.tar.gz 10977868 BLAKE2B dcb998e45d238ba94ff9422a30014b274d1db4
 DIST cmake-3.27.2-SHA-256.txt 1646 BLAKE2B 89e437e7f6750d81bcc7a207a2c8ea49ac5385e8e5dc3c420d3c7c099d82102d4e7bf9886e86a939c38f07efe413a3ccc7dc63b240204dadc6be7e13896799fe SHA512 50f8d75222d4e767aba90a09eb4bb4cab14dcfe04795f7b4d525f0fd64384c112a64d12a26a2722b086b42a7f3c2176ad1445983f63c6af57771099bbeb3a2b6
 DIST cmake-3.27.2-SHA-256.txt.asc 833 BLAKE2B ec2994faeb1aab675ec02dd6ce10444e972d3599e48efbba2634a62b628c653c1aa067e461e6d8483628d142a5ba86df987ac8907a8916d47a077f93dad7d8e8 SHA512 b1d527e7481d90346c8a1ed61942f48eecf4089a5768691fdcd9592b8cb24af5496aa56aff0e2101c5533f4d19b727105d9cda5c140b60eabc2984ad91f1600a
 DIST cmake-3.27.2.tar.gz 10978264 BLAKE2B 709e6c2769365daf1003ce4bb443291286cd236ab3b1f2b52f13b795e680231a0791b677d59c7389966a1f6d3e716a5e528dd87843e8cbd3a674902d2c92aa04 SHA512 a5fee6e97c69c525a5679c77f1615dbfde982fdbebb68b137a3fd2adf94a0a09773cc21fdc55936f039c13ebfc20ef852814158685e821a8545fcb314a6115f9
+DIST cmake-3.27.3-SHA-256.txt 1646 BLAKE2B 937aea86f553e65b17d3ec5b3c67d790cb614510bfc054cd24c4a39c1f1d6961798ccc067465b6ea2c837ce9a422075d160820c368c3897a37d60c0c8e0c942f SHA512 5d88128a559581924112e04b6049cf293c64e5f095a5685844ad553caf6d66c8589a2665ccd4cc4b546bd670aa932b529dbca82c1a4db4e611c8a341cc241277
+DIST cmake-3.27.3-SHA-256.txt.asc 833 BLAKE2B a73010dead5d44a0d146bbf1c84d303eb07e51ca752f5c3396f534abcd8353afb453f9e00eb77958075ec622e42f48faa70deb1626164607efd521e86477cf55 SHA512 965d62f92133b68911846f65d50dadc2a99c4034fcff9abc1c9e94780049a4e35d621a379079d77bdab18ab22d21bb287ee166cdd6ca2c1f7be0cf6500c11746
+DIST cmake-3.27.3.tar.gz 10978618 BLAKE2B 00376f64031365b5b3ed53d18a51d64ac33b3722933fb48e041fd28942688022e003697450228e46f9bfbfdc81f402552a7f741542dd800b34f7520cf5ba7087 SHA512 cbb845d2a8724faf5c9b57c6350a130c981ef5d209eb34fd52a5940ff7e176b0ae6512f766ee9ee6f03063269179ba15e123690a0d62ac65e32ffe8027806d9f
 EBUILD cmake-3.26.4-r2.ebuild 8806 BLAKE2B 34001cd55b038eebab7027a8a03cc8c82dedab319973478c2c382203df958b8deaa8751e616e4f04bcd4e0cbe8b5ff4d790c272846bfa0f03d691bec8e9199a9 SHA512 0f957da9686f0f700c3e01db4975bb05ce6e29f40d11d65042010183d648ccbe5ad0b14d1a85ac2c7a337b2298dc6d32d34f009c2c76458dc04dd429b399a29e
 EBUILD cmake-3.26.5-r1.ebuild 8808 BLAKE2B abda7e6f200bef6ee2ce48f2f2f6ec5942c08c7996c4a5e339edf2c31bb141afd10fa8f1e6ea77dc5a7c9e8393cddc0f859d288dd85d930f3c5ad4e1fcf77429 SHA512 9b010c5148b6632f24e799f085ee5e6ebd5d52a00678616355bb600737b32af990549a1afb1a127c0870e0a822f69d0ea71b77252e3acd9a1884efa04e6ac563
 EBUILD cmake-3.27.0-r1.ebuild 8851 BLAKE2B dde9c2574bf45a7c7b8b418cee3dde264287ed993f9f63de84a9bbc4ee6fe29575c5c585fe0d9a9534cf5507adf4a1006082ae4fdbb52f7b18ab3cd83a22355b SHA512 6b3e4ea98878deacf99fbbe33eedc2c16e93a19fc099c06cb4cf2fa6a8b3dae8253432dc15655d2a15628601a8f792490a99815246e66f1adffb71fa1fb8f6ce
 EBUILD cmake-3.27.1-r1.ebuild 8852 BLAKE2B 54e4cb4acc90c22fac4822c3f1a52c684a4264ac9c1dfe566c6601c648feee5ff608cabe8c5dea89fcb0d7515ffdd6a0b01ee25263ed1d6852d9c11954aa5f3d SHA512 4c02a90c4c97471b8a19212870da77c10352b3d89b8fc9388bd76c65d0b8813c9f5e886f112b18bcd8837bb441a171d4bff4fc8d7b5b027d054e88c6667327b2
 EBUILD cmake-3.27.2.ebuild 8852 BLAKE2B 54e4cb4acc90c22fac4822c3f1a52c684a4264ac9c1dfe566c6601c648feee5ff608cabe8c5dea89fcb0d7515ffdd6a0b01ee25263ed1d6852d9c11954aa5f3d SHA512 4c02a90c4c97471b8a19212870da77c10352b3d89b8fc9388bd76c65d0b8813c9f5e886f112b18bcd8837bb441a171d4bff4fc8d7b5b027d054e88c6667327b2
-EBUILD cmake-9999.ebuild 8851 BLAKE2B dde9c2574bf45a7c7b8b418cee3dde264287ed993f9f63de84a9bbc4ee6fe29575c5c585fe0d9a9534cf5507adf4a1006082ae4fdbb52f7b18ab3cd83a22355b SHA512 6b3e4ea98878deacf99fbbe33eedc2c16e93a19fc099c06cb4cf2fa6a8b3dae8253432dc15655d2a15628601a8f792490a99815246e66f1adffb71fa1fb8f6ce
+EBUILD cmake-3.27.3.ebuild 8863 BLAKE2B 98ffa92320d780ed4546f736c32989a98aa6ec92915890d65ff9eff0aae9726acb2976da3d388459ab93975813ccb9808e723f6f3e7ca54e132910df3f377088 SHA512 1c84044b8bf47b3cace42ae55da52d38fc40e4cab48ed0c32b87e8659d9b665ab35eee7a22ed18a66285fcb65167de1588d36cc1ae875167bf4ed87dede350fd
+EBUILD cmake-9999.ebuild 8862 BLAKE2B da07ee2ffcd63a65cd68984a06eec53306c6475cae465e67392e1cca660f03d95e278bef7d7cb589e3fa2af7ee30a381c7c69e007ea169702a681d7c8fdb5b34 SHA512 a10e9dfbf3f9a5ea247e4ab01d4938bce73dad78676ba5f62f2efa11ef2735134c4ce1a60c72966380674703f279b9b4f00b0def0596e845d73ceb5670f57ffd
 MISC metadata.xml 588 BLAKE2B 59754f6dd52986589583b875b48cdfb28f0d22e97fd6cdac9763ed2aa8981c692d81f6cfe73a93f7defde3e58fc0df60fba647760e9f20d00bd8141e4c39055e SHA512 ac463b9402727ba83b276fc206d2ea9101c6edc85142957c9be33bd8841c0396262ceaad545d133a84f6c294b5beee289e84c3226a1aac2d1f041dbfe08c047f
diff --git a/dev-util/cmake/cmake-3.27.3.ebuild b/dev-util/cmake/cmake-3.27.3.ebuild
new file mode 100644
index 000000000000..9d8fb19a3c79
--- /dev/null
+++ b/dev-util/cmake/cmake-3.27.3.ebuild
@@ -0,0 +1,288 @@
+# 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="${BROOT}"/usr/share/openpgp-keys/bradking.asc
+		inherit verify-sig
+
+		SRC_URI+=" verify-sig? (
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
+		)"
+
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~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="CMake"
+SLOT="0"
+IUSE="${CMAKE_DOCS_USEFLAG} dap emacs ncurses qt5 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:* )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND+="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+	test? ( app-arch/libarchive[zstd] )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# Prefix
+	"${FILESDIR}"/${PN}-3.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)
+)
+
+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)
+	)
+	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	# Fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    TestUpload, which requires network access
+	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
+	local myctestargs=(
+		--output-on-failure
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
+	)
+
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-util/cmake/cmake-9999.ebuild b/dev-util/cmake/cmake-9999.ebuild
index 4afe435263ca..af4d290f6ee3 100644
--- a/dev-util/cmake/cmake-9999.ebuild
+++ b/dev-util/cmake/cmake-9999.ebuild
@@ -50,7 +50,7 @@ else
 
 		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 )"
+		BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20230817 )"
 	fi
 fi
 
diff --git a/dev-util/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest
index 489f90958c70..b0ebdb5f72a7 100644
--- a/dev-util/cookiecutter/Manifest
+++ b/dev-util/cookiecutter/Manifest
@@ -1,6 +1,8 @@
 AUX test_cli-1.7.2.patch 579 BLAKE2B 8a77388ddac5bf4aaf1f2f3d950318a8f3af582df9bca9004a6701c7347ff81abea25b0c33586153198906358583a2acf8e17b20248ad98215c44411739df581 SHA512 d5906423db6cf8254c411a5f33f4f0c6b9b2760bace1db5e131ac8ec47b740d5b78feb7caa450efcec6cfb05997ff8038fb9e3fff81585d9b64b455b492e5a52
 DIST cookiecutter-2.1.1.tar.gz 263100 BLAKE2B 6f054cc5e03328db3198443fe1f99bbef285fe03a1f9bf588b4b80d2314da10f6c998221cf6c41bff9c7fdc3c92680290468dfb070ade4a868ab80f941c1f6a4 SHA512 7833bfc0e6d2d32060e099a97a4477114c2e6f9b09f951c4a5519153fd7c1f9659c22596e443392272f4a6f80eabb2a346417bac56ea7ea4108fc6b36fc0072c
 DIST cookiecutter-2.2.3.tar.gz 271925 BLAKE2B 01c981b2650f6b4a962e231b5642fe99d8456e000d4ffc83be67df4c092d7192851cfdeb8d157d5c2db481346e4abf9671b9d80b24b17b0cc56cd9238ef11e6c SHA512 40df677c27c0b226cca36ecb983bd3b3e17b5aa0aac39df390064fdd54397971d3d8f2e2242c78459573bd9e49cdee0d42370cf65a6f752e6f372905b05baadb
+DIST cookiecutter-2.3.0.tar.gz 273048 BLAKE2B 9515ae58271c61a040b176fbede49bed198343a51a136509933ced4712252f359a1027e9fe5797a1ab0e37cdaaa962ad4a65927ddfd4514641f87bfb9507e566 SHA512 f1930ce79781119ea12e18dd1dfb05777989bc121a3292294314f4320e124ac62945120f85c7a720b6bd475acb07b162fb247486855e6180449eb50c8c5ee93c
 EBUILD cookiecutter-2.1.1.ebuild 1341 BLAKE2B f5e1c613379acbe76d7e95051dc07792a9fe93d6bef4f82a9e6e0d800b4274c653634daa4b8baf1c1bb43f5f12f2d1f3ef94b19e4ae0aebd1a81ceab0bebf669 SHA512 6b9e6c4cb4dbd6563b521f1ef9919dd6cc79b2de2e9ca04d7dd25b170908616f8ca3becfaf5136f92a682d5438ea5801840a6316987ede58d7b8a555abb99be2
 EBUILD cookiecutter-2.2.3.ebuild 1329 BLAKE2B 56ffefa5667296297af2b1d5d164462f08bce6913e7e5e904694bda2464f8f2369a03d1d8a7a4ac7d0e7e951aca43f7f2f6453f116aef3278257bff12ec87c0a SHA512 5d64d7b8b1c9d9f9aeb9c04833b86d67545f1bd15762294ac1e3d0aead57884506d8c63f6b2d7b34d59393c3a30f64b16676c95d3a5b35cbea583ebd30a77c1c
+EBUILD cookiecutter-2.3.0.ebuild 1364 BLAKE2B 61daae50355389d21518ac604eebe8f55dbc6cf40cd50ffd2c4db98c272b6fc752be2c4bd7a5a5679c8a2fe33d03e491acddbddacc32553bd95ff897451c13af SHA512 380cfd521b57fca8cdd658bc1ac0543363d1240a517a999cc242f75b955a41bd3e15cf3cda2b98ec3eef9e578e4fb94a21b66540851defdd9a06ad33cac6441a
 MISC metadata.xml 478 BLAKE2B 26a0ef11397a266f9b64252c88ffa45466adae6959d3f95d3d7c815a4820430dbd5de1b66c3dae57d4a6b947d69efe57e9eea5c448d288e7ceca3ef8b507356d SHA512 22ac873e11794cd7b00ee09d8ce643e018214f36b5bbc5eb3b53ef65cfadc2a9d7c1ca1515ea22657c9f0aa4afe041e45262280f53927f29a317ce4d2fbbc83b
diff --git a/dev-util/cookiecutter/cookiecutter-2.3.0.ebuild b/dev-util/cookiecutter/cookiecutter-2.3.0.ebuild
new file mode 100644
index 000000000000..a87e03b56fbb
--- /dev/null
+++ b/dev-util/cookiecutter/cookiecutter-2.3.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Command-line utility to create projects from cookiecutters (project templates)"
+HOMEPAGE="https://github.com/cookiecutter/cookiecutter"
+SRC_URI="https://github.com/cookiecutter/cookiecutter/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/arrow[${PYTHON_USEDEP}]
+	>=dev-python/binaryornot-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	<dev-python/click-9.0.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+	<dev-python/jinja-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/python-slugify-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.23.0[${PYTHON_USEDEP}]
+	dev-python/rich[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+DOCS=( README.md HISTORY.md CONTRIBUTING.md )
+
+PATCHES=(
+	"${FILESDIR}/test_cli-1.7.2.patch"
+)
+
+distutils_enable_tests pytest
+# TODO: Package sphinx-click
+# distutils_enable_sphinx docs \
+# 	dev-python/sphinx-rtd-theme \
+# 	dev-python/recommonmark
+
+python_test() {
+	epytest -o addopts=
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 93fe79dcc893..5dc49b9328e8 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,9 +1,10 @@
 AUX meson-0.63-xtools-support.patch 1136 BLAKE2B 7600b29f1c4accbf33ca587b848566d4f9d30e26695b125aa895ec8a48ee0f7355c7692845c0d9bbb59eb452fc0cd8b634bd2a90d8918efa0b65ef4759b56d8e SHA512 725b193afe229690b6ef0d7a2a832695b7c09ca3376512097baec597a84df6e8e18791e9f29221e8a4a3537ad2371672e74041aa05ec6a218ed9b6218ea2ab61
+AUX meson-1.2.1-python-path.patch 1233 BLAKE2B 0e40fae6cbb9a66929d7f8d5d4e73f6e0105730722ec8db0236fc5376ad58fb4ef961531bf459d69eb4521efa3d26d74332a97fa0012b6107a49b20a86667c33 SHA512 0f072ff2eb310c9884db2fa255a6b7634d69e28f3a1e9ec3782fe63aeec1b544ff0208c5c087bb29ce08dc28a998482a5d3854bcaac372e958b483830d3c8c08
 DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a SHA512 c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb
 DIST meson-1.2.0.tar.gz 2182568 BLAKE2B a8239c41ab5d20c26c057293dc85e5577eb9e6eef7a39acc67a0b5b1e82b1afae341936431d96571ff83e96b7648a80a16cfd8eb581ff29b2ca88615657d5ca3 SHA512 8b5768cf0dab5f88d2f3e3962305910e707ff810cbd21b5997aab0bb6abe1c4d5dbd24ec59ab4072f1faa9b81daa8be993d56679445afa93700676f52e314d23
 DIST meson-1.2.1.tar.gz 2182126 BLAKE2B b79fa78618cbebfb26ea40e698c495e63d722ba3204d4fed92d087e4a588b49666b476c55916f1435b7ca62f24843c683f1da09751754e928c838c1bf138ce58 SHA512 6221a14a6046aaba2c6eb601a9a5b928308bbd9da813ccec16b8f7578296b27d741e30e9343723770c3c7825c86b53193b41b9672dd17468d06d3b8d743bf52e
 EBUILD meson-1.1.1.ebuild 2938 BLAKE2B 1896e10e1d442716eaf50b776bdb52c6d438c9a3a6f2e3b5125f4de2f5bd01932dbd12a6e69016032defafd7a62068f810090342b766a8b14928bc38f3e72946 SHA512 3038284a26a397055050c8236b6c13f7a7b01ce94faa5f299dbf180366aed166bc3a22443febb5c9c32e966f789dec63b8e5ea293a976c871d86647afe529249
 EBUILD meson-1.2.0.ebuild 2886 BLAKE2B 3cc344e676d5c260f20942469e01da9bd6be5578cde92be8c91d55b80d3b18c018e16497b6f1015427fc65d712d5520db598d35f53e2035911718cc8ed27c588 SHA512 22ccf7c0a146e90e69eea1a821fdeeed0f240b6b6e071782a877ffad04038dae09cfa1370fb438036cd3cb04dd0889a477c1cdfe94f9e578cdec81a85a6036c2
-EBUILD meson-1.2.1.ebuild 2886 BLAKE2B 3cc344e676d5c260f20942469e01da9bd6be5578cde92be8c91d55b80d3b18c018e16497b6f1015427fc65d712d5520db598d35f53e2035911718cc8ed27c588 SHA512 22ccf7c0a146e90e69eea1a821fdeeed0f240b6b6e071782a877ffad04038dae09cfa1370fb438036cd3cb04dd0889a477c1cdfe94f9e578cdec81a85a6036c2
+EBUILD meson-1.2.1-r1.ebuild 2937 BLAKE2B 108fdc572cbe9b4b0b39e64c15aed62d79c889c151837cc2abbd5a78c1a6667d27511df47e273c4a6a6ecbfe71a442877d73ac8fc8deee8e415b338838c39d69 SHA512 f6682ba580cb130d18371b22961919ab94ca15f94af6265828eed8efc5b7d4efd330facbc25808009d697d86f9900ac48ea253c80e6a04f1d79e60b935c1acae
 EBUILD meson-9999.ebuild 2886 BLAKE2B 3cc344e676d5c260f20942469e01da9bd6be5578cde92be8c91d55b80d3b18c018e16497b6f1015427fc65d712d5520db598d35f53e2035911718cc8ed27c588 SHA512 22ccf7c0a146e90e69eea1a821fdeeed0f240b6b6e071782a877ffad04038dae09cfa1370fb438036cd3cb04dd0889a477c1cdfe94f9e578cdec81a85a6036c2
 MISC metadata.xml 348 BLAKE2B 101a8ed796dd4fe7bc790c1f4d1f693948c80ff57ceae9500d8034b007cb067e3e0277f1f6423d92b847da07a96a4a4bf405a2e0d0dfa8c07846aac195c26012 SHA512 8ffe88b93e7f0bbfa4fbd9b3b7e318b2df1da076b0e7ee47f4f520c44207f2f507efc7b1cbc9b6f8d432938a805e4ceb922a6f477836f64ea8a12d9e0d361740
diff --git a/dev-util/meson/files/meson-1.2.1-python-path.patch b/dev-util/meson/files/meson-1.2.1-python-path.patch
new file mode 100644
index 000000000000..d6151881f83f
--- /dev/null
+++ b/dev-util/meson/files/meson-1.2.1-python-path.patch
@@ -0,0 +1,26 @@
+From 2b33c94e6315e9a397dd48a58a5becb0df3b8aba Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sat, 12 Aug 2023 09:56:44 +0100
+Subject: [PATCH 2/2] python module: Respect PATH when python is not given in
+ machine file
+
+We should only fall back to the Python interpreter running Meson itself
+if `python3` is not found in the PATH.
+
+https://github.com/mesonbuild/meson/pull/12116
+
+diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
+index 5654e4231..2b2395a9b 100644
+--- a/mesonbuild/modules/python.py
++++ b/mesonbuild/modules/python.py
+@@ -381,7 +381,9 @@ class PythonModule(ExtensionModule):
+ 
+     def _find_installation_impl(self, state: 'ModuleState', display_name: str, name_or_path: str, required: bool) -> MaybePythonProg:
+         if not name_or_path:
+-            python = PythonExternalProgram('python3', mesonlib.python_command)
++            python = PythonExternalProgram('python3')
++            if not python.found():
++                python = PythonExternalProgram('python3', mesonlib.python_command)
+         else:
+             tmp_python = ExternalProgram.from_entry(display_name, name_or_path)
+             python = PythonExternalProgram(display_name, ext_prog=tmp_python)
diff --git a/dev-util/meson/meson-1.2.1.ebuild b/dev-util/meson/meson-1.2.1-r1.ebuild
index fefd68d177e5..2f54a0120763 100644
--- a/dev-util/meson/meson-1.2.1.ebuild
+++ b/dev-util/meson/meson-1.2.1-r1.ebuild
@@ -44,6 +44,10 @@ RDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-python-path.patch
+)
+
 python_prepare_all() {
 	local disable_unittests=(
 		# ASAN and sandbox both want control over LD_PRELOAD