gentoo auto-resync : 26:07:2023 - 04:30:05

18 files changed, 656 insertions, 31 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index dea97cc5f92f..be069b112578 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 5331ad1780df..98c2796f2b67 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -18,11 +18,19 @@ DIST cmake-3.26.4-SHA-256.txt 1646 BLAKE2B a92cecbe635cb7a01be338ca9554de5603124
 DIST cmake-3.26.4-SHA-256.txt.asc 833 BLAKE2B c33f4d8cc1ba271a06b427e4bb5cb39e38f768c497aec6df07ffe9f7be997c5df88024e0de09902e6169cbad9020b20f024ef277cefc45b5cd172ed7a819e1bb SHA512 d3ddbe0c31a1093dfd4bed26dae7959e5682d367695fd4f6f021e327b8335d33fcf7b0259149f449be82da224ee74c276b135ac2860917535fb5a19b4f0f6334
 DIST cmake-3.26.4-docs.tar.xz 507352 BLAKE2B 9d7e4bb2292d22f93c5435e30317cb0701dc9c6ad6b397fc9108050217917f48ded84b2d6094782e2e8a502e693a8e45c5c659e65db3857dbcac261910890861 SHA512 95ef908381501bd8189113a7a520e70d81dbb4e1f416cfe38cbf7005e76f3571b964496d33980975835ff02634f85e1eb170a575e0ea30bfa749043cad84c605
 DIST cmake-3.26.4.tar.gz 10669686 BLAKE2B 34508c724e0d4967e010917f6fac6f426b0d835c38cd197b64e70a18febee1c3efff5f5edc5cd7c5080881bd5c1d77d03243b5dcf8b47f238fa4ac4e5996072f SHA512 fe817c8d5e247db3f0a9a58ee37c466a47220100d9e90711cd5d06c223cef87e41d1a756e75d1537e5f8cd010dcb8971cbeab4684b1ac12bcecf84bf7b720167
+DIST cmake-3.26.5-SHA-256.txt 1646 BLAKE2B 242688153008e99bab046fc6e32d20990cd5f654bed67a6d5de0c41b140a6b53adaa797de71ce4dce2cfb120e3472726ab79b871e7926600689e0ae11016ba2d SHA512 f333cdbb2a77ba4c697df3dc270c73e5847b1361d70f5900602226997362a22563b6e1c2eecce35a5cb4ee04a157795c78e4ed426d407aa63b5e04b2be7d1ece
+DIST cmake-3.26.5-SHA-256.txt.asc 833 BLAKE2B 4014785626e30f4ee2bb9bfeb1bb5398040c96b2303e657ee938fcfc6302f54515b4b2a4c2bcb1cb212a1c849b128e0f18e4f34c0ba7b99a5d25c606a631819a SHA512 fef08f30627641ac4ea0aabaec099ad0cae0c0b957419328f37b1ba88f9103069213d2bcf6f733941a254fd4913981e3c5367bf422b9873e59001644b4e760a5
+DIST cmake-3.26.5.tar.gz 10669227 BLAKE2B 23d9df4becaf26da6698f1601ed080a63124c1ab4df7b087423feeab4fd0e7596803eb807b52eb87bd50c894ec3ecef9c046349c1d2d14f7384a38fe9f61830d SHA512 43c17e00d6f326b96ea47c62bbffd19409281641b297b2362e4ed6a696e7e618d2ff265a213634bfa4c1200c3f581531fde6507f282a9460ab65af6c7bab61de
 DIST cmake-3.27.0-SHA-256.txt 1646 BLAKE2B 262ec1c374029603877015351bd3b25f60a9b311f98b4f9a85df573bfd468a06dce2161354c07affe17221633efcc2677d1c93f303c05b93a6e8548bdd8b9f72 SHA512 d91813fe3df1a5a3d06991c6abe3afa8dc5a9236b93e427b05c077a138e53a42e367cfacb76da562e6c6db01411bfea4ecb416363a3f724c10616cbcfb0a2ad4
 DIST cmake-3.27.0-SHA-256.txt.asc 833 BLAKE2B a86db55c45440770ae200e7e9e0b01329df8758588de15a8c3ed96f82f6493e3e3a059b81fe42e7fcae36ae52da7b4c8ee3b90359b6e35103596bfbe098b6af6 SHA512 441aa1a17973913005992079b3de54dea42239830ec52741de089ef978e084d1e233c375fccab1cee08d4d18bbd6197417771de6aec8335752a2ca5efebbf181
 DIST cmake-3.27.0-docs.tar.xz 521348 BLAKE2B 319c84195c37b1944bb5d3fde1aeae75623fc90a734c1ba74d730cd5678bff75806f7aa8aa8171fd7878a09b3316c9c0ee23c0c055e869a4385f54987f86d801 SHA512 e9c300526f9fe4e450e921308b7af42f4b8972f2f546f7bbf2dffb4ca696793fe09f1610636b05c82b1cf74ed8ef95377bec69e15f8c9197d6960e674e0d5400
 DIST cmake-3.27.0.tar.gz 10977223 BLAKE2B a031002dc662552c7af2da35494b536c359011c035216286d22dd78d3b6f607d1a552b5296f14117956f20dd61b94036004912f2e834957e0aacb8bb5037ed75 SHA512 8b5836ac1c1f1e741ebbf6c9a1c9dca322dfd963598838a8789cd926fc071bde2fc53e42b6a2d5d8697f12d96dbf2cebdf03817d7d84b68256ef80b779a27fed
+DIST cmake-3.27.1-SHA-256.txt 1646 BLAKE2B 3437dc50b66a014569e9194c609cdcb6022175f6220685d24f5276af4348ffd93db8a18108e54d00d62e54889181cccc09e722fccdd10475515f91b55859d12d SHA512 b0a48431e333dd0cc2670b630340e39015617f9d49a3c43c6181d8e669f33abc00d4c08fab8d59aecadbbbba031136136897a1f1a4cf5dec849ca868592c7e9f
+DIST cmake-3.27.1-SHA-256.txt.asc 833 BLAKE2B 17dbb29edcf09501455dffe090f3973083e38134559131572a55b065eae5494541b56589f78d55467cfa1ef1d3e8cba180a7dc3c949531193fc9ef3102feaad5 SHA512 bbe31efe4ffbae5d82483a677dab86586477b0af0e79dd6bfe85ae266b09a1881bf31249d91023f41fdcab066e558e52a1e7eb12dfbbea44f297d3d8eeaaea48
+DIST cmake-3.27.1.tar.gz 10977868 BLAKE2B dcb998e45d238ba94ff9422a30014b274d1db48f094c7e027717b7b271bb0c63e4f11cae29552683e747f9872ccddbaaefa4d90a0113dc409d556ad0743835f6 SHA512 d8831105fed3772bcb821a2b184fe0ffbff15795a5b0a89f2ad1cb0372a40c8f22f2bab72c671a6d17464521b7337067df929a5c3ece99f84848cc3a2fe6716f
 EBUILD cmake-3.26.4-r1.ebuild 8803 BLAKE2B 5cb4a2048398cdfe8aaaec90bf93a85db92f0a08186a630b077f05773b093731d12716521912424394e8e075310108c2cd744b9b4349e32498c0e239386f63af SHA512 dff8b4b6f2f1dc7b6be198b6f27150504022ce531497d32ce67194c0f09c8ce34ae972e88cf896f8163b751f8996d720440da540cc1dc7c080cc8aeef020531a
+EBUILD cmake-3.26.5.ebuild 8812 BLAKE2B 9a845bcc0ee3cabaa7991ada84cb0d0648f51d3ba697c99fb60c0d7ff02716b4af906619b7553b82d81f1019d9e3b60f9069a020c15799d5a6e0d63b79145e26 SHA512 98f990cccff54a27e8fd79b93fb6fa517ba8731fb149623d0ad53d6b8802a16b4a744830cfca089873f7d07f76db32abeb841d453cbab4b54ad260b7902f5530
 EBUILD cmake-3.27.0.ebuild 8848 BLAKE2B 62bbb6e9cfbcbb15a5f3b896aa9b6c77c83bc933f3fce5bbcd7de783005cab9a43539e96b593786cd987846f6ac253a4303602805a1e572a04f3ab64f85e4bb6 SHA512 8858b29223579bebc2b9c9d55abd36e91b696cdc6653111f5cb15fb97605585bf4ec69c39364a5bb4226d134608dc582824fbf58da8b468132426c472570598a
+EBUILD cmake-3.27.1.ebuild 8849 BLAKE2B 8ddd7aff93eade6a91e1aefa0e6dcbc067c68a5dbdb83351029f6b5ad73ce662d0dbde13a15cc161c03bd67a6ff9906697e5f94a85c1d373e567dfc567a644f3 SHA512 c9a1be2e5afd39e996ed60e00a682b7b20a4f6fec0b4ee13fc22b23db4f9ee0f826660ada29982bd6dcc5bf64050a5d5befeeac0e8d923f030c39242992d4fce
 EBUILD cmake-9999.ebuild 8848 BLAKE2B 62bbb6e9cfbcbb15a5f3b896aa9b6c77c83bc933f3fce5bbcd7de783005cab9a43539e96b593786cd987846f6ac253a4303602805a1e572a04f3ab64f85e4bb6 SHA512 8858b29223579bebc2b9c9d55abd36e91b696cdc6653111f5cb15fb97605585bf4ec69c39364a5bb4226d134608dc582824fbf58da8b468132426c472570598a
 MISC metadata.xml 588 BLAKE2B 59754f6dd52986589583b875b48cdfb28f0d22e97fd6cdac9763ed2aa8981c692d81f6cfe73a93f7defde3e58fc0df60fba647760e9f20d00bd8141e4c39055e SHA512 ac463b9402727ba83b276fc206d2ea9101c6edc85142957c9be33bd8841c0396262ceaad545d133a84f6c294b5beee289e84c3226a1aac2d1f041dbfe08c047f
diff --git a/dev-util/cmake/cmake-3.26.5.ebuild b/dev-util/cmake/cmake-3.26.5.ebuild
new file mode 100644
index 000000000000..d08f44f7d7f4
--- /dev/null
+++ b/dev-util/cmake/cmake-3.26.5.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${CMAKE_DOCS_PREBUILT:=1}
+
+CMAKE_DOCS_PREBUILT_DEV=sam
+#CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+CMAKE_DOCS_VERSION=3.26.4
+# 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 )"
+	fi
+fi
+
+[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="CMake"
+SLOT="0"
+IUSE="${CMAKE_DOCS_USEFLAG} emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/libarchive-3.3.3:=
+	app-crypt/rhash
+	>=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
+	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.16.0_rc4-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
+
+	# Handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
+	# Next patch needs to be reworked
+	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# Respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
+
+	# 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_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-3.27.1.ebuild b/dev-util/cmake/cmake-3.27.1.ebuild
new file mode 100644
index 000000000000..2d5e649322ed
--- /dev/null
+++ b/dev-util/cmake/cmake-3.27.1.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 )"
+	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
+	>=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/codespell/Manifest b/dev-util/codespell/Manifest
index 503c8f7d32b0..ad893b720c25 100644
--- a/dev-util/codespell/Manifest
+++ b/dev-util/codespell/Manifest
@@ -1,4 +1,7 @@
 AUX codespell-2.2.4-drop-coverage.patch 551 BLAKE2B 0873808ef9e57dbc9b8c75f58464105fb9c0150f32f85b6c3cc51cf936719112fd09b582b724fc738519d7844b2d529284c598fde7a13e9a9e05246465e7d3ca SHA512 6ebdf84e84742b8713d67e0bcfb3a838f73eee62060d2de48288e5f9a25dfc4840e9331160bc10a90c743ff6de0813741140c2bec26a2f1c6139e08fa2d9fc66
+AUX codespell-2.2.5-drop-coverage.patch 485 BLAKE2B dfe724bd70053345e239d021700292efb96ad760cdfe52096f67176d81f840cc19d1ee1e06fcc6d3e4390a7484ff3556736f7f44bd764ec21f9acc90dad32174 SHA512 55556a1e7ed95d007d7e8266e250bad29a64d40939db6b49031c982ce521abb3b5236b1ce5dbf1e849719afeaf32192e8714e2dc3d836524083b05ea3c970cfc
 DIST codespell-2.2.4.tar.gz 241664 BLAKE2B 5f40003fdb840b926615b6eed74df90055b2ee47c534321289c3ed895c47cd2672909b152a53640899cc21960c1b3aa80c41eb344d9e23cea8fd13e998c71af6 SHA512 efbc62a3dd49781565f6d901aa9b08fc1106adf2c516365dd8d3684846e23b23bfda1e65c6530edf0de9462ccafd9d835bd541a8f0e1de14163c723ce041052d
+DIST codespell-2.2.5.tar.gz 242918 BLAKE2B 18b4ff620edb54950ba2779ec610f15597d0aef5e4dded3ed2055ce7769e16d70dbac9cf990b2bdb6c216f8f6204e4a7790fe011ec53057553ca6981b4d8c851 SHA512 173eb13695ceccb4bb081907fc8d703e91922ec7adddc150aa2db1629353edff464c2318f2abaf78e8c96ab28f08e510897912f5bd48d69a6c50e025d470b53f
 EBUILD codespell-2.2.4.ebuild 644 BLAKE2B 4b96f6497dec7822909c8d5b6c850fea521bfdfacdc4f204239e7cd1d8b5ea7425fcb1b40522cca421a6a60fa81ada43c4ee7e96d2f1932e7f3902724dd39da7 SHA512 c4ae2f2bb56f75179f9f2e8ede253eaa0402f3d8b610f4cd3b1d7cef6f04c7134a9f365b3c6f76028f4aa7d50229c6dca02034401ec8c69da9726e0ffd3050a0
+EBUILD codespell-2.2.5.ebuild 646 BLAKE2B 5b9b7146f7b640d06398d689179570ca07975610bb6b75aac2b5554f2635d5844aef79e90b5cdedb3373fccc1c6bcc551ff82b63c8da5aadf9b2f993d795387f SHA512 603f1592d833d6c864ff263ec78836ebd03957c0710dc958cbd64ccc7e7d4b6968229f8b6408f15693dc1417d6b27bc9671bfa089797e94b9fd7bff6544f9775
 MISC metadata.xml 820 BLAKE2B b0584565c2ad113da730325836b4e847f38f9ec8c988f5a6537efa10f13a1a2d342cf1f9f6a872fe1e9d4ce915a45cb64ee302176507a774c1272a11328cd6ac SHA512 10c664900fdc603f206552aa90373d989bd822401ffba7c02c05f28fc77b9b0b697c822dc5a3c33b4be6f82f8f95e8c72afc87d5f0efb8dfc0a2c19c5b22eb51
diff --git a/dev-util/codespell/codespell-2.2.5.ebuild b/dev-util/codespell/codespell-2.2.5.ebuild
new file mode 100644
index 000000000000..ce8d9368fb0e
--- /dev/null
+++ b/dev-util/codespell/codespell-2.2.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Check text files for common misspellings"
+HOMEPAGE="https://pypi.org/project/codespell https://github.com/codespell-project/codespell"
+
+# Code licensed under GPL-2, dictionary licensed under CC-BY-SA-3.0
+LICENSE="GPL-2 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="test? ( dev-python/chardet[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.2.5-drop-coverage.patch )
+
+distutils_enable_tests pytest
diff --git a/dev-util/codespell/files/codespell-2.2.5-drop-coverage.patch b/dev-util/codespell/files/codespell-2.2.5-drop-coverage.patch
new file mode 100644
index 000000000000..498f419acca1
--- /dev/null
+++ b/dev-util/codespell/files/codespell-2.2.5-drop-coverage.patch
@@ -0,0 +1,13 @@
+diff -urEbw codespell-2.2.5/pyproject.toml codespell-2.2.5.new/pyproject.toml
+--- codespell-2.2.5/pyproject.toml	2023-06-14 19:28:54.000000000 +0200
++++ codespell-2.2.5.new/pyproject.toml	2023-07-03 16:19:11.225597607 +0200
+@@ -99,7 +99,7 @@
+ strict = true
+ 
+ [tool.pytest.ini_options]
+-addopts = "--cov=codespell_lib -rs --cov-report= --tb=short --junit-xml=junit-results.xml"
++addopts = "-rs --cov-report= --tb=short --junit-xml=junit-results.xml"
+ 
+ [tool.ruff]
+ extend-ignore = [
+
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 6fbc888e5e29..f4b2d34e080e 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -3,5 +3,5 @@ DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 295b46d19c8a1d64d326a6c826e2abe11d976890
 DIST meson-1.2.0.tar.gz 2182568 BLAKE2B a8239c41ab5d20c26c057293dc85e5577eb9e6eef7a39acc67a0b5b1e82b1afae341936431d96571ff83e96b7648a80a16cfd8eb581ff29b2ca88615657d5ca3 SHA512 8b5768cf0dab5f88d2f3e3962305910e707ff810cbd21b5997aab0bb6abe1c4d5dbd24ec59ab4072f1faa9b81daa8be993d56679445afa93700676f52e314d23
 EBUILD meson-1.1.1.ebuild 2938 BLAKE2B 1896e10e1d442716eaf50b776bdb52c6d438c9a3a6f2e3b5125f4de2f5bd01932dbd12a6e69016032defafd7a62068f810090342b766a8b14928bc38f3e72946 SHA512 3038284a26a397055050c8236b6c13f7a7b01ce94faa5f299dbf180366aed166bc3a22443febb5c9c32e966f789dec63b8e5ea293a976c871d86647afe529249
 EBUILD meson-1.2.0.ebuild 2886 BLAKE2B 3cc344e676d5c260f20942469e01da9bd6be5578cde92be8c91d55b80d3b18c018e16497b6f1015427fc65d712d5520db598d35f53e2035911718cc8ed27c588 SHA512 22ccf7c0a146e90e69eea1a821fdeeed0f240b6b6e071782a877ffad04038dae09cfa1370fb438036cd3cb04dd0889a477c1cdfe94f9e578cdec81a85a6036c2
-EBUILD meson-9999.ebuild 2946 BLAKE2B 0fc44fb33f5d79d53c15ab84caad219f80437530f4b3620f2c0a1f336a11710601bd2a3eb408ec6adf6204a1dafa09d97b3fe403d66a380c7017d753849aaca0 SHA512 3101b94bdb792a5bbc7b3411e5d77d7b36781d08b7746523c9e7584e65204b025ccbfba7cc924829b7f0a84309a6a90455293cc8dd0964e98de7798200a7241d
+EBUILD meson-9999.ebuild 2886 BLAKE2B 3cc344e676d5c260f20942469e01da9bd6be5578cde92be8c91d55b80d3b18c018e16497b6f1015427fc65d712d5520db598d35f53e2035911718cc8ed27c588 SHA512 22ccf7c0a146e90e69eea1a821fdeeed0f240b6b6e071782a877ffad04038dae09cfa1370fb438036cd3cb04dd0889a477c1cdfe94f9e578cdec81a85a6036c2
 MISC metadata.xml 348 BLAKE2B 101a8ed796dd4fe7bc790c1f4d1f693948c80ff57ceae9500d8034b007cb067e3e0277f1f6423d92b847da07a96a4a4bf405a2e0d0dfa8c07846aac195c26012 SHA512 8ffe88b93e7f0bbfa4fbd9b3b7e318b2df1da076b0e7ee47f4f520c44207f2f507efc7b1cbc9b6f8d432938a805e4ceb922a6f477836f64ea8a12d9e0d361740
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 86cedf266f21..fefd68d177e5 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -44,10 +44,6 @@ RDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.63-xtools-support.patch
-)
-
 python_prepare_all() {
 	local disable_unittests=(
 		# ASAN and sandbox both want control over LD_PRELOAD
diff --git a/dev-util/squashdelta/Manifest b/dev-util/squashdelta/Manifest
index 729db67860ba..c6a058b9cdab 100644
--- a/dev-util/squashdelta/Manifest
+++ b/dev-util/squashdelta/Manifest
@@ -1,6 +1,6 @@
 DIST squashdelta-0.1.1.tar.bz2 78504 BLAKE2B f9aa13b3af35bd97650b31fac718837763b73c2817548a3fde75841993092d717ea78826a3e29d472290d4f9164f8cfcc9f9999613f199c21251080584dbd9f7 SHA512 efe90831e412ed6627d44390054dc89339e85bcd3be452f16fb32d00989bbdc9480dbefcea624941b4866a686a356b0371c33de31903afa70af26eecbe902844
 DIST squashdelta-0.1.2.tar.bz2 79865 BLAKE2B fe375da70e25eaa5b70aa2e231f04b9ce47aa1aaea3872df331065ba8710a0e4ce1ca096715d18e5094f514ce3a8adb9d08109a4894ca75a4b3e5ef083f8e66f SHA512 802a1a6c6e7d117e4fb7f74a8144cc7b8b237e28f2028c72623b99a88b23d857ceb99f2d23653d253af829c3e6b290db98420923d613569cf523c2a7fc600f43
-EBUILD squashdelta-0.1.1.ebuild 775 BLAKE2B 380c011966dd9c065031c1f415695e639d93714767f68cd94af41fe41612d371ad560efeaa9ef397847826f7eaab4a8be57cb7797fd36ad82bb6c4db555c291b SHA512 bae17dae24389d9334fc987730440835f525cafe46f6099f7f396895f569461525caf1b14a07dfe55e9095258b29bc96400fa0df4f10b67d099e46767410c208
-EBUILD squashdelta-0.1.2.ebuild 775 BLAKE2B 1b40fb9704301a0b7de85d48fa1447b3cdd65f9bedd184d2f2f45f5d8574619c4b4667d9a0423a1a110792849f71ef61723563b8bdcaf46c404b16006e5a1734 SHA512 0ebce7726e023087efab24ae9ac5bfdfbbf9303b335a8f606ca3fbd3b3808c022a90827d4589b7215ebe78c94c3340e6e4893e903be86ee3e460c64d9e13afc4
-EBUILD squashdelta-9999.ebuild 808 BLAKE2B 6240a018da041f37e708b819b5624fc1f28595f921c73db988cdd481e4b6efac951690489c9478f3b142e60f0a718b1bd18bb63687f8d22edd0a311cc6e29057 SHA512 bffd8c45745d33b66b440e76fab1ee8c94e59a581d0ce0233526c7b46fcd03c14ffef61dad6b3eec21700d71d6b5a61eb0ad5112c8f983e04a2a458e61217088
-MISC metadata.xml 512 BLAKE2B bd9fa6d633f56bf5bcdaa3cf9e77b827adbf9d2a57b5c772995c2311c5e1fd6c8af4c9363c653dde38c1e73e1d02b490ac34c988089a955bf5d323b33d9a8715 SHA512 199dd6130bcd670796548f76207ab8b8e670db240f9542a35d71f7465cb20ebe2de5203ba08ab119b44905ed1becdbde8b258dcc402bebb50453ed571cf10c60
+EBUILD squashdelta-0.1.1.ebuild 775 BLAKE2B f1afeb2c38961aab534c2e41422f62a787a82da2765ac8819fda1d2f21e2675a7141c6aabd83fe3f4b1366f62b54c923e2f77e322d9d75af55b158d697e0158c SHA512 fc18e4fdff012f4fc675d84b9a94519f0b9adeaf29609d66ae6d012d4bcaa48fef2cb0b6db1b6d0c185f51cb548328a8a7fbd25018cfd8b4f6313201717ecd62
+EBUILD squashdelta-0.1.2.ebuild 775 BLAKE2B f1afeb2c38961aab534c2e41422f62a787a82da2765ac8819fda1d2f21e2675a7141c6aabd83fe3f4b1366f62b54c923e2f77e322d9d75af55b158d697e0158c SHA512 fc18e4fdff012f4fc675d84b9a94519f0b9adeaf29609d66ae6d012d4bcaa48fef2cb0b6db1b6d0c185f51cb548328a8a7fbd25018cfd8b4f6313201717ecd62
+EBUILD squashdelta-9999.ebuild 808 BLAKE2B 6dfe7a8cb417e27331b265193b906e6049b78bb2135090e463e3be9c45acad7c332e6eecd0b7ce267c58b9ecbb23c66223966647094a977b915f89ab72aee07b SHA512 43835ce90a00878f9e314aee44863e16b8c34bf51deb39344ec1fa88e48d268e663487237e6fd4e10e34157d6d8192b28ff2e462ec381a6a2f2c33dfdfeb7f87
+MISC metadata.xml 512 BLAKE2B 0bed1ec490b0dbf8283cc778199790ee21b7b7f183319c11b3831c47718cc5c9030b5396a54b5d8bca072d58063e06dce2d22fd7eb538b8ee1da69d9047e970b SHA512 4214c00f8948614df98530258d4ecf873da779fc73e7dec7dda5e182c6d75e9cec1bf7c147ab1e7ad975c2a879b9d8ad691dbac1c8d996bb54f6658d240055cf
diff --git a/dev-util/squashdelta/metadata.xml b/dev-util/squashdelta/metadata.xml
index 263cd632f779..4084bde7d1b1 100644
--- a/dev-util/squashdelta/metadata.xml
+++ b/dev-util/squashdelta/metadata.xml
@@ -10,7 +10,7 @@
 			<email>mgorny@gentoo.org</email>
 			<name>Michał Górny</name>
 		</maintainer>
-		<bugs-to>https://github.com/mgorny/squashdelta/issues/</bugs-to>
-		<remote-id type="github">mgorny/squashdelta</remote-id>
+		<bugs-to>https://github.com/projg2/squashdelta/issues/</bugs-to>
+		<remote-id type="github">projg2/squashdelta</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/squashdelta/squashdelta-0.1.1.ebuild b/dev-util/squashdelta/squashdelta-0.1.1.ebuild
index ea0756376a3d..5b2b0afe380c 100644
--- a/dev-util/squashdelta/squashdelta-0.1.1.ebuild
+++ b/dev-util/squashdelta/squashdelta-0.1.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Efficient (partially uncompressed) SquashFS binary delta tool"
-HOMEPAGE="https://github.com/mgorny/squashdelta/"
-SRC_URI="https://github.com/mgorny/squashdelta/releases/download/v${PV}/${P}.tar.bz2"
+HOMEPAGE="https://github.com/projg2/squashdelta/"
+SRC_URI="https://github.com/projg2/squashdelta/releases/download/v${PV}/${P}.tar.bz2"
 
 # uses public-domain murmurhash3
 LICENSE="BSD public-domain"
diff --git a/dev-util/squashdelta/squashdelta-0.1.2.ebuild b/dev-util/squashdelta/squashdelta-0.1.2.ebuild
index 3b8ffebd419f..5b2b0afe380c 100644
--- a/dev-util/squashdelta/squashdelta-0.1.2.ebuild
+++ b/dev-util/squashdelta/squashdelta-0.1.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Efficient (partially uncompressed) SquashFS binary delta tool"
-HOMEPAGE="https://github.com/mgorny/squashdelta/"
-SRC_URI="https://github.com/mgorny/squashdelta/releases/download/v${PV}/${P}.tar.bz2"
+HOMEPAGE="https://github.com/projg2/squashdelta/"
+SRC_URI="https://github.com/projg2/squashdelta/releases/download/v${PV}/${P}.tar.bz2"
 
 # uses public-domain murmurhash3
 LICENSE="BSD public-domain"
diff --git a/dev-util/squashdelta/squashdelta-9999.ebuild b/dev-util/squashdelta/squashdelta-9999.ebuild
index af4bc7cf66ba..b1ee7d10f874 100644
--- a/dev-util/squashdelta/squashdelta-9999.ebuild
+++ b/dev-util/squashdelta/squashdelta-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
+EGIT_REPO_URI="https://github.com/projg2/${PN}.git"
 inherit autotools git-r3
 
 DESCRIPTION="Efficient (partially uncompressed) SquashFS binary delta tool"
-HOMEPAGE="https://github.com/mgorny/squashdelta/"
+HOMEPAGE="https://github.com/projg2/squashdelta/"
 SRC_URI=""
 
 # uses public-domain murmurhash3
diff --git a/dev-util/squashmerge/Manifest b/dev-util/squashmerge/Manifest
index 2d5d2091a59c..847bbf1974c9 100644
--- a/dev-util/squashmerge/Manifest
+++ b/dev-util/squashmerge/Manifest
@@ -1,4 +1,4 @@
 DIST squashmerge-0.1.tar.bz2 76678 BLAKE2B 01e1a286081af8ac4f19c0c40c206f5d41c287b612e48750a6900d2a182dac31fbf1831e5e85891366c2edce6851f3d0128eda22b2e01f3b45594a06ee656b8b SHA512 a12e78d79a3f212a65c0b979a1ca3de9532ebf33f891ae2fd216425cd044a6f3357496e9f37bebc53a067aa592f7a1eecdeee653929eb443426e48fe342c7683
-EBUILD squashmerge-0.1.ebuild 715 BLAKE2B f1c20fecfabf47d62348aa73589207ffc362e268e8d30abd412bfee856dfd5418f68afa4935b1d33d2c1dff27eb5e9906ccf89a40dbf404452748608278fd5af SHA512 f5e16d4ad89335e85e6e431ee076508e757772c5a0f09d770e11a420d4251b5b0e263fb00a0c36e085321c7494a5ca55d15eed75656b357e896cb4adfa2f1a4c
-EBUILD squashmerge-9999.ebuild 754 BLAKE2B 2e352dca7242fd06ff0b858b176bb5dfb5fbe33ada66818d1dfd6827e5b3dfd9898c7d5e737a1772baf2937b3f282e40ebba5959d8a4d7b37e4b7eb67bcecf4a SHA512 2f9df1418b4d79371511f12fd7a6450c2bd3f6672a50a40bc2406e9a867ee9890834e81434e35ab2f0539a09fb725266c71964db5fc2d5c16d2c32b53013e4f2
-MISC metadata.xml 512 BLAKE2B 348095157dd2203b5f98021b24e4fa6902714e922b1f4f92e80823854a537e64133f0a4bf1f5687942dd35515b613902e8a5cfdb7521574c4cb09f5e4a411117 SHA512 61a34abaf2d4b62467e7c830ffee36a5195099b9e51570aa939a389ba8200eeee7cb4bc0dc17390297378f037b0a7cb3157b556125a905f317d6c26d0e1b29b0
+EBUILD squashmerge-0.1.ebuild 715 BLAKE2B d57ca7cd04b92582fefb0d9e1385baf24bc7b970c825508492a3bd77481a662ddb4ae1e0eff65e176b503094b330a6ba19459b137110bdee9a46c5230f606304 SHA512 0227518fd0732d05bbafb02915300027bc04ff6bdc466865661c606c48c8ecd004065d53e95ca47d3bb2e3d5c0369c0c01f6206aea072901bb68b83845b6ca64
+EBUILD squashmerge-9999.ebuild 754 BLAKE2B 3f31c55ad2e4118b35af52b10b5f2d90f2a2775b9d004e499dc7351807fa79e11ae4e330eb73c23c59d6ce13d38d10fe12454ed955e5496a9e55e1b1a14ee3be SHA512 9cace88d02e7d6e993101051e0ab4854c287eb078ea4881378b13836d5b608dbfbb41cdd96ca86f0f0a59379311e9f678ff1ef7839fb0fc13ffd40893e22919a
+MISC metadata.xml 512 BLAKE2B 0e8d8db592814d712795ac2cea1846f5ad87c6370f642a9b12c1bc2c3c5ca3bf40d33b0d90b70fc608308b729f9d87d49efbe1b5a7e872fab2ed6ef14d5f0919 SHA512 79c4dec5fe807c747dadda57ad299f9c632503249c44754425607f32886f543f58616ae6fcdfebddb412c9a8514c24842ccac25efe51aa55a6cfe4fe0ab5b4a4
diff --git a/dev-util/squashmerge/metadata.xml b/dev-util/squashmerge/metadata.xml
index 5afbd9b1ebc8..f4a6d0216817 100644
--- a/dev-util/squashmerge/metadata.xml
+++ b/dev-util/squashmerge/metadata.xml
@@ -10,7 +10,7 @@
 			<email>mgorny@gentoo.org</email>
 			<name>Michał Górny</name>
 		</maintainer>
-		<bugs-to>https://github.com/mgorny/squashmerge/issues/</bugs-to>
-		<remote-id type="github">mgorny/squashmerge</remote-id>
+		<bugs-to>https://github.com/projg2/squashmerge/issues/</bugs-to>
+		<remote-id type="github">projg2/squashmerge</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/squashmerge/squashmerge-0.1.ebuild b/dev-util/squashmerge/squashmerge-0.1.ebuild
index b85491ed9427..59e401567eec 100644
--- a/dev-util/squashmerge/squashmerge-0.1.ebuild
+++ b/dev-util/squashmerge/squashmerge-0.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="dev-util/squashdelta delta merge tool"
-HOMEPAGE="https://github.com/mgorny/squashmerge/"
-SRC_URI="https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+HOMEPAGE="https://github.com/projg2/squashmerge/"
+SRC_URI="https://github.com/projg2/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-util/squashmerge/squashmerge-9999.ebuild b/dev-util/squashmerge/squashmerge-9999.ebuild
index 3c0238bf3d47..df8bad852d08 100644
--- a/dev-util/squashmerge/squashmerge-9999.ebuild
+++ b/dev-util/squashmerge/squashmerge-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
+EGIT_REPO_URI="https://github.com/projg2/${PN}.git"
 inherit autotools git-r3
 
 DESCRIPTION="dev-util/squashdelta delta merge tool"
-HOMEPAGE="https://github.com/mgorny/squashmerge/"
+HOMEPAGE="https://github.com/projg2/squashmerge/"
 SRC_URI=""
 
 LICENSE="BSD"