12 files changed, 715 insertions, 193 deletions
diff --git a/dev-vcs/git-cola/git-cola-4.5.0.ebuild b/dev-vcs/git-cola/git-cola-4.5.0.ebuild
index b1495dcaf476..a7284e2ed744 100644
--- a/dev-vcs/git-cola/git-cola-4.5.0.ebuild
+++ b/dev-vcs/git-cola/git-cola-4.5.0.ebuild
@@ -20,8 +20,8 @@ RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
-		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
+		dev-python/pyqt5[${PYTHON_USEDEP},gui,widgets]
+		dev-python/qtpy[gui,network,${PYTHON_USEDEP}]
 		dev-python/send2trash[${PYTHON_USEDEP}]
 	')
 	dev-vcs/git
@@ -33,7 +33,7 @@ BDEPEND="
 		test? (
 			${VIRTUALX_DEPEND}
 			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
+			dev-python/pyqt5[\${PYTHON_USEDEP},gui,widgets]
 		)
 	")
 "
diff --git a/dev-vcs/git-cola/git-cola-4.8.2-r1.ebuild b/dev-vcs/git-cola/git-cola-4.8.2-r1.ebuild
index c4cf267205ec..cc31ca4ed9c8 100644
--- a/dev-vcs/git-cola/git-cola-4.8.2-r1.ebuild
+++ b/dev-vcs/git-cola/git-cola-4.8.2-r1.ebuild
@@ -14,14 +14,14 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/polib[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/QtPy[pyqt6,gui,network,${PYTHON_USEDEP}]
+		dev-python/qtpy[pyqt6,gui,network,${PYTHON_USEDEP}]
 		dev-python/send2trash[${PYTHON_USEDEP}]
 	')
 	dev-vcs/git
@@ -32,7 +32,7 @@ BDEPEND="
 		dev-python/setuptools-scm[\${PYTHON_USEDEP}]
 		test? (
 			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/QtPy[pyqt6,gui,network,\${PYTHON_USEDEP}]
+			dev-python/qtpy[pyqt6,gui,network,\${PYTHON_USEDEP}]
 		)
 	")
 "
diff --git a/dev-vcs/git-machete/git-machete-3.25.2.ebuild b/dev-vcs/git-machete/git-machete-3.25.2.ebuild
index 550b46b65536..f91dac7c798c 100644
--- a/dev-vcs/git-machete/git-machete-3.25.2.ebuild
+++ b/dev-vcs/git-machete/git-machete-3.25.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/VirtusLab/${PN}/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-vcs/git"
 BDEPEND="test? (
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 350fc3678800..8fc74a095af8 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -2,11 +2,14 @@ DIST git-2.44.2.tar.xz 7435020 BLAKE2B 625071528e6575af86aa51d7d5baeaa9b1b8be0e9
 DIST git-2.45.2.tar.xz 7487680 BLAKE2B 477acc786c26e0b04843ad6d07333607b2274d587263d72c6d036cade725e6f62f8c773903f401c799de71527d0473589afc507eec02f445e0c148dd7cbf407c SHA512 dce30d0d563f3f76ef49c8dc88105e0cf0941c8cd70303418d9d737f840ffba36bcc575c380c75080edf64af74487e1a680db146ec5f527a32104e887d4ceb73
 DIST git-2.46.2.tar.xz 7581344 BLAKE2B 1ea2a166bd2717d581020a9921cf7e82dc2c77e2a9bd6bc70f4b6396c214c74b30e8ae6815eba33bd2995f7a6e2570b96c51acbfce25ab85e05d5fdbd09d870c SHA512 d8d1cec9a4ddc7b1892b7f5b3c808d235bcd4bfb1714ce0ce0e721242acc94f9ae7c2ae3181311feb5b458b04e89cd32acd3e9c90adbc4e86e05e7d5589d8a00
 DIST git-2.47.0.tar.xz 7652728 BLAKE2B f1d767aad6a917efe0c2e7f52163daca796640fb7f7ac8c1d6ead91ce3019f9a5ddd7ce8890ff37aaff1320d1b0b59399469fc9cb0f66cfc6893d2b3bbeee56e SHA512 58683aa59dba25ffec9fe2c185267c77b34d573e9738c133a15d25071e37095e99486c231c35b8f71aabe3c1e305238b56d2c10039318bfc08f137919bad66ec
+DIST git-2.47.1.tar.xz 7654244 BLAKE2B 5dd5d1bde226469d8de0952456dbaa408739f8613cfefdd76715e6a2bc1fdf8695740f005cc3b2caab876fccfbff0609201a827e0bd9837ec68056ba2a41da34 SHA512 6abe551c464b307bc3f6f474257e0be3e1a9eba1406af6463216b796c55a35356009c2f7bd9b4fa2d1798da5f885a3843f6ad8750ab69595f748f9ea8ed76fea
 DIST git-htmldocs-2.44.2.tar.xz 1559412 BLAKE2B 9a62ab1d70b009a9bc29250c49ca835a46928703a73ec004ea57e7dc74212c5a29d7e0784cd752c8d2c1e23b70702e2c2f280904dfedefb3d4a687002a950596 SHA512 2a82e3c37aaca91643976d21fac3bd82b23fe2374856d73b0ba726339450ea6f8a5e8e38326546292f83923e28da280ca3bed549afff1aad684ebfb3926e4992
 DIST git-htmldocs-2.45.2.tar.xz 1569148 BLAKE2B 5013a13da54d87728f621a09d04dee1cba7b44d230360394b86e04269bf276399cf44de74ffc14a76ec1724e1015b630300d551b3a268273a768e0edc1a7fa45 SHA512 272bb31d8d43b270d5281c5d1beadea8e5a580c738ece2580d2c6ba7e7fe6fdbca71b672a2811273119495e62613f7a4d34764b4dfbc26e4dbf9dee5797fb440
 DIST git-htmldocs-2.46.2.tar.xz 1553104 BLAKE2B 9a7b784c1a01153dc660b4fe6eaa3ceac2d30eeb96015ab4ec73296811d27cc84715abd19f723ad16c64028114c2aceee2727380e7c9f8ff220ae4538dcc9c62 SHA512 51c5363ac48f04118071218ea095dae97676ac299a482511ef55e9267724f08e7c021ffa15418d9e32e676333ba31643c9049860f154f58a67d9604e141376c3
 DIST git-htmldocs-2.47.0.tar.xz 1564012 BLAKE2B 9d9d234ac8c7eb6861a2ee1bd9000ae7150b33346adf8e830712c0fa2c068e5173a52ff0f937f64a2f2a2270853ca7d62965361d124a98bfe4e39d63a8e0aae6 SHA512 4e8cfabfcdfaa12d23ba21ee3612a841e1731c174cb1d73c9fee12a345e5ee792c1ad0f5c15b4f73ad6eb4496a1e3450aaacdd65e5f875e60c9eb355cc4134fe
+DIST git-htmldocs-2.47.1.tar.xz 1564776 BLAKE2B ff8c313e00867423ddb122572e730868541ab22c76cb73aad54ee5dab298c4a8fdc29d50ebdceb658d7799132258dad9ffcaa582439a74463a8c212c3d82005c SHA512 7df2c572413d42f954c0ca01577f9324a60810dd712a8a36b0b503708d9795a90ffa95ee96b13c082796e276bcbc65094de32ade0f71ff744f6e45869cbbb4d7
 DIST git-manpages-2.44.2.tar.xz 574316 BLAKE2B ecfca8e05ca682097376ce6a1e8b9de8fcc36472860321987be12291a53d1a92befb950fd856775df65f28300b267b80975775cba046cfb89159887e8cba5516 SHA512 2ad6d922acf46028b3b7dd5a686c0396e5452e4d50b32ba9af0cc51cc3431003524b91279e2a795065a179af3d760ce72530580295ed09a53673274cf9567cc6
 DIST git-manpages-2.45.2.tar.xz 576428 BLAKE2B c89ebd25c0caf391fcd29cc8609252daf2cf742a8cc78ce5b64931befb126c951ebb7504bc8ccbee06b81727dc3e4ded67c69adf8d737f4df38dfda758e3c734 SHA512 d39a5c92c1cfcae145713b8ff1a84258947392a3cf1490e3f7d4f87836d05e79dc4fecbff16b7c1bc314572d6d32aa2c29e7fcde993b549b2fab71620734c19b
 DIST git-manpages-2.46.2.tar.xz 584812 BLAKE2B dd5592a1fd61b6eda0afa4f9292ce86dd14bca6a88016f96c53617f6505f27cc9a2ba9437c6330bb8003b3f57cd1e75bf441bf2a2168554bbda9c26db37db4cb SHA512 ce7a2a1fbb9376182b8ce3ed772fbeeef2cf338bc06bf9bcf3c07a65419e41b3754d6851a44886d0b07dfd82f8eefe7b8b1d9f5c28ed6b6a0ea4168ed457e121
 DIST git-manpages-2.47.0.tar.xz 586352 BLAKE2B 87a1de077672e3246df26d2603221bcd06ed1844bf43a092afb630335a7da62866f497144b97106aec8565fd847010aa20e64ee24a87fc05d3e24884047e9a89 SHA512 898bf91b88910a8046fc4eefc1bfb98910d38db28846e4e04c44664f34723e406566622fd443ff332556545ca90c6519557389b75f159bbaf07044ab0cc83ac5
+DIST git-manpages-2.47.1.tar.xz 586432 BLAKE2B df4eafa03ba235202c361d16fd6db1c6b2a4fea5501f62dcd7b53e3764542a2b70ab44e1525d5f4437dad9505c507ba88aa14b1e8e828713b81cb66b6d9a73c2 SHA512 9acd5207e6c2751ec87708eedc4f060ee6bed0841564f787cd3fd5dbce712c4c2afbb9ce4e85a466fb52a8f399420ca24c7cd4eb8e14edb7ea7a5c06e3c82a5e
diff --git a/dev-vcs/git/git-2.47.1.ebuild b/dev-vcs/git/git-2.47.1.ebuild
new file mode 100644
index 000000000000..39ba0bb5efe7
--- /dev/null
+++ b/dev-vcs/git/git-2.47.1.ebuild
@@ -0,0 +1,670 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit flag-o-matic toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd
+
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
+
+	inherit git-r3
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: seen
+	case ${PVR} in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=seen ;;
+	esac
+fi
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER="${MY_PV}"
+
+DESCRIPTION="Stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
+
+	[[ ${PV/rc} != ${PV} ]] && SRC_URI_KORG+='/testing'
+
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
+	SRC_URI+=" ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}"
+	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	fi
+fi
+
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
+
+# Common to both DEPEND and RDEPEND
+DEPEND="
+	dev-libs/openssl:=
+	sys-libs/zlib
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
+	iconv? ( virtual/libiconv )
+	pcre? ( dev-libs/libpcre2:= )
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:= )
+"
+RDEPEND="
+	${DEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		dev-perl/Authen-SASL
+		>=virtual/perl-libnet-3.110.0-r4[ssl]
+		cgi? (
+			dev-perl/CGI
+			highlight? ( app-text/highlight )
+		)
+		cvs? (
+			>=dev-vcs/cvsps-2.1:0
+			dev-perl/DBI
+			dev-perl/DBD-SQLite
+		)
+		mediawiki? (
+			dev-perl/DateTime-Format-ISO8601
+			dev-perl/HTML-Tree
+			dev-perl/MediaWiki-API
+		)
+		subversion? (
+			dev-vcs/subversion[-dso(-),perl]
+			dev-perl/libwww-perl
+			dev-perl/TermReadKey
+		)
+	)
+	perforce? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-git )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		app-text/xmlto
+		sys-apps/texinfo
+	)
+	keyring? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)
+"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND+=" app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	perforce? ( ${PYTHON_REQUIRED_USE} )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# Avoid automagic CVS, bug #350330
+	"${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch
+
+	# Make submodule output quiet
+	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned!"
+	fi
+
+	if use perforce ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local extlibs myopts
+
+	myopts=(
+		ASCIIDOC_NO_ROFF=YesPlease
+
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+
+		$(usev elibc_musl NO_REGEX=NeedsStartEnd)
+		$(usev !cvs NO_CVS=YesPlease)
+		$(usev !iconv NO_ICONV=YesPlease)
+		$(usev !nls NO_GETTEXT=YesPlease)
+		$(usev !perforce NO_PYTHON=YesPlease)
+		$(usev !subversion NO_SVN_TESTS=YesPlease)
+		$(usev !tk NO_TCLTK=YesPlease)
+	)
+
+	if use blksha1 ; then
+		myopts+=( BLK_SHA1=YesPlease )
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=( NO_EXPAT=YesPlease )
+	else
+		myopts+=( NO_CURL=YesPlease )
+	fi
+
+	# Broken assumptions because of static build system
+	myopts+=(
+		NO_FINK=YesPlease
+		NO_DARWIN_PORTS=YesPlease
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		NO_EXTERNAL_GREP=
+	)
+
+	# Can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
+
+	if use pcre; then
+		myopts+=( USE_LIBPCRE2=YesPlease )
+		extlibs+=( -lpcre2-8 )
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=(
+			NEEDS_LIBICONV=YesPlease
+			HAVE_CLOCK_MONOTONIC=1
+		)
+
+		if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then
+			myopts+=( HAVE_GETDELIM=1 )
+		fi
+	fi
+
+	myopts+=( ASCIIDOC8=YesPlease )
+
+	export MY_MAKEOPTS="${myopts[@]}"
+	export EXTLIBS="${extlibs[@]}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]] ; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+
+		cd "${S}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#cp "${FILESDIR}"/GIT-VERSION-GEN . || die
+	fi
+
+}
+
+src_prepare() {
+	if ! use safe-directory ; then
+		# This patch neuters the "safe directory" detection.
+		# bugs #838271, #838223
+		PATCHES+=(
+			"${FILESDIR}"/git-2.46.2-unsafe-directory.patch
+		)
+	fi
+
+	default
+
+	if use prefix ; then
+		# bug #757309
+		sed -i \
+			-e 's:/usr/local/opt/gettext/:/do/not/look/elsewhere/:g' \
+			-e 's:/opt/homebrew/:/do/not/look/elsewhere/:g' \
+			config.mak.uname || die
+	fi
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use perforce && PYTHON_PATH="${PYTHON}"
+
+	local mymakeargs=(
+		${MY_MAKEOPTS}
+
+		prefix="${EPREFIX}"/usr
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+		perllibdir="$(use perl && perl_get_raw_vendorlib)"
+		sysconfdir="${EPREFIX}"/etc
+
+		CC="$(tc-getCC)"
+		CFLAGS="${CFLAGS}"
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+
+		# TODO: --verbose?
+		GIT_TEST_OPTS="--no-color"
+
+		OPTAR="$(tc-getAR)"
+		OPTCC="$(tc-getCC)"
+		OPTCFLAGS="${CFLAGS}"
+		OPTLDFLAGS="${LDFLAGS}"
+
+		CURL_CONFIG="${ESYSROOT}/usr/bin/curl-config"
+		CURL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libcurl)"
+		CURL_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libcurl)"
+
+		PERL_PATH="${EPREFIX}/usr/bin/perl"
+		PERL_MM_OPT=""
+
+		PYTHON_PATH="${PYTHON_PATH}"
+
+		V=1
+		"$@"
+	)
+
+	emake "${mymakeargs[@]}"
+}
+
+src_configure() {
+	# https://lore.kernel.org/git/87ed3apy2u.fsf@gentoo.org/
+	append-cflags -std=gnu17
+
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake
+
+	if use perl && use cgi ; then
+		git_emake gitweb
+	fi
+
+	if use perl ; then
+		git_emake -C contrib/credential/netrc
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+		git_emake -C contrib/credential/osxkeychain
+	fi
+
+	pushd Documentation &>/dev/null || die
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man
+		if use doc ; then
+			git_emake info html
+		fi
+	else
+		if use doc ; then
+			git_emake info
+		fi
+	fi
+	popd &>/dev/null || die
+
+	if use keyring ; then
+		git_emake -C contrib/credential/libsecret
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake git-subtree
+	# git-subtree.1 requires the full USE=doc dependency stack
+	use doc && git_emake git-subtree.html git-subtree.1
+	popd &>/dev/null || die
+
+	git_emake -C contrib/diff-highlight
+
+	if use mediawiki ; then
+		git_emake -C contrib/mw-to-git
+	fi
+}
+
+src_test() {
+	local disabled=(
+		# We make safe-directory optional
+		t0033-safe-directory.sh
+	)
+
+	local tests_cvs=(
+		t9200-git-cvsexportcommit.sh
+		t9400-git-cvsserver-server.sh
+		t9401-git-cvsserver-crlf.sh
+		t9402-git-cvsserver-refs.sh
+		t9600-cvsimport.sh
+		t9601-cvsimport-vendor-branch.sh
+		t9602-cvsimport-branches-tags.sh
+		t9603-cvsimport-patchsets.sh
+		t9604-cvsimport-timestamps.sh
+	)
+
+	local tests_perl=(
+		t3701-add-interactive.sh
+		t5502-quickfetch.sh
+		t5512-ls-remote.sh
+		t5520-pull.sh
+		t7106-reset-unborn-branch.sh
+		t7501-commit.sh
+	)
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot=(
+		t0001-init.sh
+		t0004-unwritable.sh
+		t0070-fundamental.sh
+		t1004-read-tree-m-u-wf.sh
+		t3700-add.sh
+		t7300-clean.sh
+	)
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn=( t9100-git-svn-basic.sh )
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled+=( t5000-tar-tree.sh )
+	fi
+
+	local cvs=0
+	use cvs && let cvs=${cvs}+1
+	if [[ ${EUID} -eq 0 ]] ; then
+		if [[ ${cvs} -eq 1 ]] ; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled+=( ${tests_nonroot[@]} )
+	else
+		if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then
+			let cvs=${cvs}+1
+		fi
+
+		if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; then
+			let cvs=${cvs}+1
+		fi
+
+		if [[ ${cvs} -lt 3 ]] ; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled[@]} ; do
+		if [[ -f "${i}" ]] ; then
+			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
+		fi
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	# t0610-reftable-basics.sh uses $A
+	local -x A=
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!"
+
+	popd &>/dev/null || die
+	if use perl ; then
+		emake -C contrib/credential/netrc testverbose
+	fi
+}
+
+src_install() {
+	git_emake DESTDIR="${D}" install
+
+	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	local d
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	pushd contrib/subtree &>/dev/null || die
+	git_emake DESTDIR="${D}" install
+	if use doc ; then
+		# Do not move git subtree install-man outside USE=doc!
+		git_emake DESTDIR="${D}" install-man install-html
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - removed upstream
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	local i
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym ../gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
+			if [[ -d "${d}" ]] ; then
+				find "${d}" -name .packlist -delete || die
+			fi
+		done
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if use perl ; then
+		pushd contrib/credential/netrc &>/dev/null || die
+		dobin git-credential-netrc
+		popd &>/dev/null || die
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if ! use prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
+		fi
+	}
+	plocale_for_each_disabled_locale rm_loc
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
+		elog "completion."
+		elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+		elog "Note that the prompt bash code is now in that separate script"
+	fi
+
+	optfeature_header "Some scripts require additional dependencies:"
+	optfeature git-quiltimport dev-util/quilt
+	optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx
+}
diff --git a/dev-vcs/sourcegit/Manifest b/dev-vcs/sourcegit/Manifest
index 96444f76299c..7280904b7681 100644
--- a/dev-vcs/sourcegit/Manifest
+++ b/dev-vcs/sourcegit/Manifest
@@ -79,10 +79,9 @@ DIST skiasharp.nativeassets.webassembly.2.88.8.nupkg 52734847 BLAKE2B 415a13d090
 DIST skiasharp.nativeassets.win32.2.88.3.nupkg 10909359 BLAKE2B b9a7e8d30508f78a051f2d9dead01d9513f07b004830ef3d1ddb0f54dc5611b04e31b0f4ea6618dc82ca1e6dade57b8f279104f162830cee77bdf92558af5d85 SHA512 91711dda228905361393a39754dd08611b69b556af4725cbe9aef92ec8f11dac822338108aaeb1866e149c1e8b9dfc2dbd70c8f64fef11686ad59f69fc7f4420
 DIST skiasharp.nativeassets.win32.2.88.8.nupkg 10918061 BLAKE2B 5cd3273f99d994c19463685d8834d18f9062f7a6f39e22b5858a7103817a6d55d333d1a109590448ccbdf5633a10166fc1b3b6c4eb86854b90df33a4c61b616a SHA512 cf469d9b57e03bd775035db8da878241c7bfca0917195665fccf8f73de4d8b5bdf95613421c2fc3dc12c88d05163fa7e8f4cc7ca382cb4288302258ccfe88be8
 DIST sourcegit-8.31.tar.gz 2895984 BLAKE2B 94fbb71adc4013d1bca991dd2d6f1cc8b52ae752836cfea32f8380f5ffb7941acbda568279a62508ce83a35b25f5a96de87025fa7f7624f7a3d4af4dcba15da4 SHA512 38007669791275534ef04a0a0586c4ebecfa39360a90d1c8732c9bf8321952898b1dd447b52eea21b68330fd16b25bf25da4eef2c0bc6c54bea876c540bbb638
-DIST sourcegit-8.32.tar.gz 2897371 BLAKE2B 810cbac1e64a61c2861154cef3fb55bef2ab0eb7a9348c8e830bcf6826fbb37307ed949fe7387e86b2c46b0f8d92f279eb181edcb3cb7d20ef17a68081324708 SHA512 11d2cf007d1b9982a140c0bfcac9ed517d88debebc5afa2f4255eb0183d114d5c9b3a2c4e09aae14cc5024b39af720ce81f0e100ead5ad5db54b87b1cbbd69c3
 DIST sourcegit-8.37.tar.gz 2779046 BLAKE2B a581a71889681b8bcf6d531fa947e0cf2f6c891204224c9df3f69ee8f169f198deba57a6513af7ef3f0eef6f36324dd0ab8c9594e3957763f9257e6b63515fdd SHA512 2c3973b4c3b19eaa8cec7c5fd5817ed6573f2d68a61f3835796ed788cc7cb9621a4975ab6a4e3f53fdcaa49d38a9e48673a46a9ddf15671707f6cd7c63f5a901
-DIST sourcegit-8.38.tar.gz 2784491 BLAKE2B 64c4b2eb1463716f190071d49ad245e8861dbc2120c6f6f5754d0c9967c7a6b4531bb6103b07baf9662f9bffa2fa477be88c27a467dcb746e785e4f9a48709e5 SHA512 ac84834dcc3a1aae8ce16a5987dcd5b5c8f43a202aa2c7c8c1afdba6f5fa279eeba2b37c75b610284887e64fa25ae3ae763f1e050f49835920f0051be921156f
 DIST sourcegit-8.39.tar.gz 2791091 BLAKE2B 3561bb44bffa9c3c55c8d399c5e15d1781288077c995f7b9aaebb4ef6bfb545962fe1c0c4265caa897933d5c39bacea409db3ea39978e8c71566b21381caa0cd SHA512 0fa3158d1552e0d8ffe316a2b0b7db3d50f464083d21e0218a9605f4b491028b679b1a3b5dae8c54202abbeb656f3769136ced13b9c30aedabe4726991474d04
+DIST sourcegit-8.40.tar.gz 2796422 BLAKE2B e2606d0bc52ebcf3db501eb09b052cdafa83b020bf9f6ee3bf46370a59a43e6eaaef6a8fca82baa1cc61d19f975685bafeb2e2a2b5ddba4328ad52cf4f5de0c2 SHA512 64f0a097264e62f337d0abdd290daa541eba4297bb94ac74322906dcc935e3ec186e56a4b45b11ee2729e26b39876822dd0d9358dbad52017f42415565e4b042
 DIST system.io.pipelines.6.0.0.nupkg 221298 BLAKE2B 344160cc3e08c0a9004eac9672b89d8aa9fc726a0dbcb2aecd677f995157f90354d3c704862422bdf8a0195918a7411b6ad9315c2f68b01c0c24ca666f4dee53 SHA512 c5983b4510bc8ae4116133ffb9b280fe61d99d47ef52dd78e5bfd03e090901896d5d5fd738dae57006b971840a4d9422bded33ddefa5e927d75d309ef1f70dea
 DIST system.io.pipelines.8.0.0.nupkg 267394 BLAKE2B 612570554ee41ae37c8987df6ec797583c95b38160aa70b1c2fba9af23f4bd85ac0ba5b7036abfc1ee3cecdbfbdaa83b861e9c017e5fdf3e726478b24e83d957 SHA512 57eb6a11e84f40a48b57b1dc5786a01aa9852122b7d15363490d8a12c9a458bf99a8ddf4c0c0247be98559c2b42e769a10bda2c5a9817735484d960dc652eb12
 DIST system.numerics.vectors.4.5.0.nupkg 382792 BLAKE2B a97284a76a6729052d3a127e1875e2012ae5b90a40533783dc799b543d44cc084035374799e9e1b894083cb61f2639711f18b76ff31145140519a9674dd9d2aa SHA512 9c04ec0530f608aaf801837a791b33857e2ca6d2265a6049c01fd4e972825967e709cad3070f174829b7400f608e9a641d3afc3a45d4636d4c47dd43dd0657b3
diff --git a/dev-vcs/sourcegit/sourcegit-8.32.ebuild b/dev-vcs/sourcegit/sourcegit-8.32.ebuild
deleted file mode 100644
index 31ccff25abc3..000000000000
--- a/dev-vcs/sourcegit/sourcegit-8.32.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOTNET_PKG_COMPAT="8.0"
-NUGETS="
-avalonia.angle.windows.natives@2.1.22045.20230930
-avalonia.avaloniaedit@11.1.0
-avalonia.buildservices@0.0.29
-avalonia.controls.colorpicker@11.1.3
-avalonia.controls.datagrid@11.1.3
-avalonia.desktop@11.1.3
-avalonia.diagnostics@11.1.3
-avalonia.fonts.inter@11.1.3
-avalonia.freedesktop@11.1.3
-avalonia.native@11.1.3
-avalonia.remote.protocol@11.1.3
-avalonia.skia@11.0.0
-avalonia.skia@11.1.3
-avalonia.themes.fluent@11.1.3
-avalonia.themes.simple@11.1.3
-avalonia.win32@11.1.3
-avalonia.x11@11.1.3
-avalonia@11.1.3
-avaloniaedit.textmate@11.1.0
-communitytoolkit.mvvm@8.2.2
-harfbuzzsharp.nativeassets.linux@2.8.2.3
-harfbuzzsharp.nativeassets.linux@7.3.0.2
-harfbuzzsharp.nativeassets.macos@2.8.2.3
-harfbuzzsharp.nativeassets.macos@7.3.0.2
-harfbuzzsharp.nativeassets.webassembly@2.8.2.3
-harfbuzzsharp.nativeassets.webassembly@7.3.0.2
-harfbuzzsharp.nativeassets.win32@2.8.2.3
-harfbuzzsharp.nativeassets.win32@7.3.0.2
-harfbuzzsharp@2.8.2.3
-harfbuzzsharp@7.3.0.2
-livechartscore.skiasharpview.avalonia@2.0.0-rc3.3
-livechartscore.skiasharpview@2.0.0-rc3.3
-livechartscore@2.0.0-rc3.3
-microcom.runtime@0.11.0
-onigwrap@1.0.6
-skiasharp.harfbuzz@2.88.8
-skiasharp.nativeassets.linux@2.88.3
-skiasharp.nativeassets.linux@2.88.8
-skiasharp.nativeassets.macos@2.88.3
-skiasharp.nativeassets.macos@2.88.8
-skiasharp.nativeassets.webassembly@2.88.3
-skiasharp.nativeassets.webassembly@2.88.8
-skiasharp.nativeassets.win32@2.88.3
-skiasharp.nativeassets.win32@2.88.8
-skiasharp@2.88.3
-skiasharp@2.88.8
-system.io.pipelines@6.0.0
-system.numerics.vectors@4.5.0
-system.text.encodings.web@8.0.0
-system.text.json@8.0.4
-textmatesharp.grammars@1.0.63
-textmatesharp@1.0.63
-tmds.dbus.protocol@0.16.0
-"
-
-inherit check-reqs dotnet-pkg desktop xdg
-
-DESCRIPTION="Open Source Git GUI client using .NET AvaloniaUI"
-HOMEPAGE="https://github.com/sourcegit-scm/sourcegit/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/sourcegit-scm/${PN}.git"
-else
-	SRC_URI="https://github.com/sourcegit-scm/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-SRC_URI+=" ${NUGET_URIS} "
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	app-arch/brotli
-	app-arch/bzip2
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libpcre2
-	dev-vcs/git
-	media-gfx/graphite2
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	media-libs/harfbuzz
-	media-libs/libpng
-"
-
-CHECKREQS_DISK_BUILD="1G"
-DOTNET_PKG_PROJECTS=( src/SourceGit.csproj )
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	dotnet-pkg_pkg_setup
-}
-
-src_unpack() {
-	dotnet-pkg_src_unpack
-
-	if [[ -n "${EGIT_REPO_URI}" ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	sed -i "./build/resources/_common/applications/${PN}.desktop"	\
-		-e "s|/opt/sourcegit/sourcegit|sourcegit|g"	\
-		-e "s|/usr/share/icons/sourcegit.png|sourcegit|g"	\
-		|| die
-
-	dotnet-pkg_src_prepare
-}
-
-src_install() {
-	dotnet-pkg-base_install
-	dotnet-pkg-base_dolauncher "/usr/share/${P}/SourceGit" "${PN}"
-
-	doicon "./build/resources/_common/icons/${PN}.png"
-	domenu "./build/resources/_common/applications/${PN}.desktop"
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-vcs/sourcegit/sourcegit-8.37.ebuild b/dev-vcs/sourcegit/sourcegit-8.37.ebuild
index 9e2094df470c..1b39f5abd75e 100644
--- a/dev-vcs/sourcegit/sourcegit-8.37.ebuild
+++ b/dev-vcs/sourcegit/sourcegit-8.37.ebuild
@@ -73,7 +73,7 @@ else
 	SRC_URI="https://github.com/sourcegit-scm/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 SRC_URI+=" ${NUGET_URIS} "
diff --git a/dev-vcs/sourcegit/sourcegit-8.38.ebuild b/dev-vcs/sourcegit/sourcegit-8.40.ebuild
index 9e2094df470c..0402b40e9043 100644
--- a/dev-vcs/sourcegit/sourcegit-8.38.ebuild
+++ b/dev-vcs/sourcegit/sourcegit-8.40.ebuild
@@ -3,61 +3,52 @@
 
 EAPI=8
 
-DOTNET_PKG_COMPAT="8.0"
+DOTNET_PKG_COMPAT="9.0"
 NUGETS="
 avalonia.angle.windows.natives@2.1.22045.20230930
 avalonia.avaloniaedit@11.1.0
 avalonia.buildservices@0.0.29
-avalonia.controls.colorpicker@11.1.4
-avalonia.controls.datagrid@11.1.4
-avalonia.desktop@11.1.4
-avalonia.diagnostics@11.1.4
-avalonia.fonts.inter@11.1.4
-avalonia.freedesktop@11.1.4
-avalonia.native@11.1.4
-avalonia.remote.protocol@11.1.4
+avalonia.controls.colorpicker@11.2.1
+avalonia.controls.datagrid@11.2.1
+avalonia.desktop@11.2.1
+avalonia.diagnostics@11.2.1
+avalonia.fonts.inter@11.2.1
+avalonia.freedesktop@11.2.1
+avalonia.native@11.2.1
+avalonia.remote.protocol@11.2.1
 avalonia.skia@11.0.0
-avalonia.skia@11.1.4
-avalonia.themes.fluent@11.1.4
-avalonia.themes.simple@11.1.4
-avalonia.win32@11.1.4
-avalonia.x11@11.1.4
-avalonia@11.1.4
+avalonia.skia@11.2.1
+avalonia.themes.fluent@11.2.1
+avalonia.themes.simple@11.2.1
+avalonia.win32@11.2.1
+avalonia.x11@11.2.1
+avalonia@11.0.0
+avalonia@11.2.1
 avaloniaedit.textmate@11.1.0
 communitytoolkit.mvvm@8.3.2
-harfbuzzsharp.nativeassets.linux@2.8.2.3
 harfbuzzsharp.nativeassets.linux@7.3.0.2
-harfbuzzsharp.nativeassets.macos@2.8.2.3
 harfbuzzsharp.nativeassets.macos@7.3.0.2
-harfbuzzsharp.nativeassets.webassembly@2.8.2.3
-harfbuzzsharp.nativeassets.webassembly@7.3.0.2
-harfbuzzsharp.nativeassets.win32@2.8.2.3
+harfbuzzsharp.nativeassets.webassembly@7.3.0.3-preview.2.2
 harfbuzzsharp.nativeassets.win32@7.3.0.2
-harfbuzzsharp@2.8.2.3
 harfbuzzsharp@7.3.0.2
-livechartscore.skiasharpview.avalonia@2.0.0-rc3.3
-livechartscore.skiasharpview@2.0.0-rc3.3
-livechartscore@2.0.0-rc3.3
+livechartscore.skiasharpview.avalonia@2.0.0-rc4.5
+livechartscore.skiasharpview@2.0.0-rc4.5
+livechartscore@2.0.0-rc4.5
 microcom.runtime@0.11.0
 onigwrap@1.0.6
 skiasharp.harfbuzz@2.88.8
-skiasharp.nativeassets.linux@2.88.3
 skiasharp.nativeassets.linux@2.88.8
-skiasharp.nativeassets.macos@2.88.3
 skiasharp.nativeassets.macos@2.88.8
-skiasharp.nativeassets.webassembly@2.88.3
 skiasharp.nativeassets.webassembly@2.88.8
-skiasharp.nativeassets.win32@2.88.3
 skiasharp.nativeassets.win32@2.88.8
-skiasharp@2.88.3
 skiasharp@2.88.8
-system.io.pipelines@6.0.0
-system.numerics.vectors@4.5.0
-system.text.encodings.web@8.0.0
-system.text.json@8.0.4
-textmatesharp.grammars@1.0.63
-textmatesharp@1.0.63
-tmds.dbus.protocol@0.16.0
+system.io.pipelines@8.0.0
+system.text.json@8.0.5
+textmatesharp.grammars@1.0.59
+textmatesharp.grammars@1.0.64
+textmatesharp@1.0.59
+textmatesharp@1.0.64
+tmds.dbus.protocol@0.20.0
 "
 
 inherit check-reqs dotnet-pkg desktop xdg
diff --git a/dev-vcs/tortoisehg/tortoisehg-6.5.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-6.5.1.ebuild
index 275f985c283d..1c274fbd77ca 100644
--- a/dev-vcs/tortoisehg/tortoisehg-6.5.1.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-6.5.1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	${HG_DEPEND}
 	dev-python/iniparse[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt5[network,svg,${PYTHON_USEDEP}]
+	dev-python/pyqt5[network,svg,${PYTHON_USEDEP}]
 	>=dev-python/qscintilla-2.11.6[qt5(+),${PYTHON_USEDEP}]
 "
 BDEPEND="
@@ -70,7 +70,7 @@ python_install_all() {
 pkg_postinst() {
 	xdg_icon_cache_update
 	elog "When startup of ${PN} fails with an API version mismatch error"
-	elog "between dev-python/sip and dev-python/PyQt5 please rebuild"
+	elog "between dev-python/sip and dev-python/pyqt5 please rebuild"
 	elog "dev-python/qscintilla."
 
 	optfeature "the core git extension support" dev-python/pygit2
diff --git a/dev-vcs/tortoisehg/tortoisehg-6.6.3.ebuild b/dev-vcs/tortoisehg/tortoisehg-6.6.3.ebuild
index 5b6bc7eb0d3c..f8c05390f199 100644
--- a/dev-vcs/tortoisehg/tortoisehg-6.6.3.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-6.6.3.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	${HG_DEPEND}
 	dev-python/iniparse[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt5[network,svg,${PYTHON_USEDEP}]
+	dev-python/pyqt5[network,svg,${PYTHON_USEDEP}]
 	>=dev-python/qscintilla-2.11.6[qt5(+),${PYTHON_USEDEP}]
 "
 BDEPEND="
@@ -70,7 +70,7 @@ python_install_all() {
 pkg_postinst() {
 	xdg_icon_cache_update
 	elog "When startup of ${PN} fails with an API version mismatch error"
-	elog "between dev-python/sip and dev-python/PyQt5 please rebuild"
+	elog "between dev-python/sip and dev-python/pyqt5 please rebuild"
 	elog "dev-python/qscintilla."
 
 	optfeature "the core git extension support" dev-python/pygit2
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index eb848b46b641..6b4973f60df5 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	${HG_DEPEND}
 	dev-python/iniparse[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt5[network,svg,${PYTHON_USEDEP}]
+	dev-python/pyqt5[network,svg,${PYTHON_USEDEP}]
 	>=dev-python/qscintilla-2.11.6[qt5(+),${PYTHON_USEDEP}]
 "
 BDEPEND="
@@ -70,7 +70,7 @@ python_install_all() {
 pkg_postinst() {
 	xdg_icon_cache_update
 	elog "When startup of ${PN} fails with an API version mismatch error"
-	elog "between dev-python/sip and dev-python/PyQt5 please rebuild"
+	elog "between dev-python/sip and dev-python/pyqt5 please rebuild"
 	elog "dev-python/qscintilla."
 
 	optfeature "the core git extension support" dev-python/pygit2