gentoo auto-resync : 14:10:2024 - 04:04:03

6 files changed, 145 insertions, 25 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index a7b686ba72bb..d73aaa3a17ee 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 3e0a1563b7e6..e86e6d7385d2 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,6 +1,5 @@
 AUX git-2.21.0-quiet-submodules-testcase.patch 1233 BLAKE2B 45a9660d584e0bf928df781c77f4e5fea1f5f6f42a0a5c9ff74d08909790dc961abe4896016128a01992c1ceeb61236d4d11c9ccfdd4b8257ecd89829aaac435 SHA512 1fd1a3af27e2945d25cb24a60678c05aaa32edf312d2750d7aafa26bfcce1877d88e49f649c3ac572f75e8631fc979f82d75b3e8abbc02d1750421d4cda41321
 AUX git-2.37.0_rc1-optional-cvs.patch 14373 BLAKE2B b835715468cff979fdefcc42aeb7a48986c4ebba95f3e7ab033bc1b9c29eee9ded0b47a2c6d6831d4ece0662dd244f41a670d0805e1a5c8bd8c25531fcfb3493 SHA512 3c076c2865e930cfe2f0c9d01fb8e272037aeed99b46063e88942b89b1191e8149fd87ecbcbdb2d23ea37d556a971434938d7f4e4e2eef0e26e1b250534cc0e2
-AUX git-2.37.2-darwin-prefix-gettext.patch 922 BLAKE2B 172c5be167cf865a137f60fb0ffb022c3ffe54fb865f495bd10a160920a5448c842ee74a64d385730595cf329be0aeff56dd104b3da636feb1ce3f21f30206fd SHA512 2c5ad30d69e6333288231b2eff5219d815dfab3149119adcf799eff57030c2000061cc57add97992ac228225d40e97f4da86c46794c654334f667996efe325c1
 AUX git-2.37.2-unsafe-directory.patch 367 BLAKE2B 433c4b39777d1f24fbebb0b08dc09672c059c01bbd8930b3a235d66d2990dcc5e3f17e758ff7860ce3d37d778db1a8792fd847ad110fef730095e52430fb0c19 SHA512 f23b0c29977e33596daa4eab60fcc1f64522dac93f6baa39aea9c627740363073176aabf29fe680a9802be34d9c3948713e17ce798000895cec787ccb40f56a7
 AUX git-2.46.2-unsafe-directory.patch 429 BLAKE2B 5e6be22e89250d434e0b62b27d90619a2d3379c2829dee9390d5e3413eb803a0547164e4e12c7f144812b394ee5238f9f1ee087f8c8f553766e473689ad2abda SHA512 8ad143cb0221c83d0c13606354e4c46f7169877a7d901cd1cd3f25e41efbc9ba57feaab626c6e1a19e9f52a084af629f9a2686eaaa76ec9e03569a1013087878
 AUX git-daemon-r2.initd 378 BLAKE2B 1e4e553f550ee1cb428bec21dbaeede12daa87ef89664bfed0ab7c1ec15d32cf738f7adde23db7f76e9a7a2aeadc132affa3c42709e2ed789745240f8f72096b SHA512 a78043543e540a814eb1d1c76fbde7fd5cbc9f6dbe7486bc21a0cbb24a613f7a8661acb5460df474a7a0c5284b61bc9e700fa384163db6fc423645f699cc119a
diff --git a/dev-vcs/git/files/git-2.37.2-darwin-prefix-gettext.patch b/dev-vcs/git/files/git-2.37.2-darwin-prefix-gettext.patch
deleted file mode 100644
index af267347e65e..000000000000
--- a/dev-vcs/git/files/git-2.37.2-darwin-prefix-gettext.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Don't examine outside of the prefix for gettext on macOS/Darwin.
-https://bugs.gentoo.org/757309
---- a/config.mak.uname
-+++ b/config.mak.uname
-@@ -148,17 +148,6 @@ ifeq ($(uname_S),Darwin)
- 	HAVE_NS_GET_EXECUTABLE_PATH = YesPlease
- 	CSPRNG_METHOD = arc4random
- 
--	# Workaround for `gettext` being keg-only and not even being linked via
--	# `brew link --force gettext`, should be obsolete as of
--	# https://github.com/Homebrew/homebrew-core/pull/53489
--	ifeq ($(shell test -d /usr/local/opt/gettext/ && echo y),y)
--		BASIC_CFLAGS += -I/usr/local/include -I/usr/local/opt/gettext/include
--		BASIC_LDFLAGS += -L/usr/local/lib -L/usr/local/opt/gettext/lib
--		ifeq ($(shell test -x /usr/local/opt/gettext/bin/msgfmt && echo y),y)
--			MSGFMT = /usr/local/opt/gettext/bin/msgfmt
--		endif
--	endif
--
- 	# The builtin FSMonitor on MacOS builds upon Simple-IPC.  Both require
- 	# Unix domain sockets and PThreads.
- 	ifndef NO_PTHREADS
diff --git a/dev-vcs/sourcegit/Manifest b/dev-vcs/sourcegit/Manifest
index 0b40c773041c..edf542f30148 100644
--- a/dev-vcs/sourcegit/Manifest
+++ b/dev-vcs/sourcegit/Manifest
@@ -46,6 +46,7 @@ DIST skiasharp.nativeassets.win32.2.88.3.nupkg 10909359 BLAKE2B b9a7e8d30508f78a
 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.33.tar.gz 2898694 BLAKE2B 6026132fed3a6ed6e023566644cd62f625bc627821db928b66b2640818ee869acdb1dd24b85620a129d0c307f6360249aef7eaadbad86861616c15be55f3ded4 SHA512 f73ee46bd0721f529a9d31fb9297a81628b80c20409348e869767cceed8e872be6e58c023c885756d4287f043981dd922ce0d1ffb72aea21adfb33fb346d43b4
 DIST system.io.pipelines.6.0.0.nupkg 221298 BLAKE2B 344160cc3e08c0a9004eac9672b89d8aa9fc726a0dbcb2aecd677f995157f90354d3c704862422bdf8a0195918a7411b6ad9315c2f68b01c0c24ca666f4dee53 SHA512 c5983b4510bc8ae4116133ffb9b280fe61d99d47ef52dd78e5bfd03e090901896d5d5fd738dae57006b971840a4d9422bded33ddefa5e927d75d309ef1f70dea
 DIST system.numerics.vectors.4.5.0.nupkg 382792 BLAKE2B a97284a76a6729052d3a127e1875e2012ae5b90a40533783dc799b543d44cc084035374799e9e1b894083cb61f2639711f18b76ff31145140519a9674dd9d2aa SHA512 9c04ec0530f608aaf801837a791b33857e2ca6d2265a6049c01fd4e972825967e709cad3070f174829b7400f608e9a641d3afc3a45d4636d4c47dd43dd0657b3
 DIST system.text.encodings.web.8.0.0.nupkg 374440 BLAKE2B 97211e710df3dcd17932f168e254806d7c8692ac01d667a2e89a5ddc956b24fba8467fbc2d451057757b5c502442d2c91bcaf0f867da7e95456b2aa18136b354 SHA512 ba0822c38c3b658aba9495642d269e882b827e3be4ad2dc1426d8a97d3cbc5a2277c5f80847d0cb9381078af01523328c4992caa058146d5d8ee6b8a08609c32
@@ -53,7 +54,8 @@ DIST system.text.json.8.0.4.nupkg 1981785 BLAKE2B 32eaece9756c948453589d13f596d2
 DIST textmatesharp.1.0.63.nupkg 84136 BLAKE2B d727385f349767a082d28f2e8db088b2b00a39b9e7b1fcd3fef8fb1e83299b22a497c33c76c7e049f5774b357a1c9944bbe294246009dd79e799b1bbd638fb05 SHA512 be831797d046f0f043335608149e22757306027803a8f8b6c76d3c98c045a9ea453b292298c23c22da871c7dd1d651d80f2253e43e813a275da128cc9c02aa9e
 DIST textmatesharp.grammars.1.0.63.nupkg 866866 BLAKE2B 4ab3615f3d73d9ebde33ca6a41e42eb31e6a838ebf01cc117507413188778f006a03b28c075ef13a5d1f87c9c4b9ced2cba7e550dd2f2fc3cae88866cbe5cba9 SHA512 bbcb83e0697c4a673d9b0e0e7d0f263ad19a0d2b9a0aa6e4d6c7d004ad3789268880c496f7baea0f5109691a5a8db7a012d9c0f51047a32850b08045c13c35c1
 DIST tmds.dbus.protocol.0.16.0.nupkg 241531 BLAKE2B 186c927cbe193005849196ab8d6415790d8ec3435be9fa17f4c2fd50e33fdf5236a5c62679f383b68b37d855dc497208094493d10cb96a97d50ccb94aac2c567 SHA512 1e6e1bf8ea7c652e5502e96323984157e060ac728843f2104ff8dcab755483ff93ef4df7cc4e7dd4b56047ba42bf349c2681e2fb8d6518328eab002e63d371b2
-EBUILD sourcegit-8.31.ebuild 2672 BLAKE2B 37cbccf8ac103553718a55e92ee275080449d2c8d3ae6036fde606dd3642507cf79ee90bfb14b09dac7216703c897b26e4abf9f3ec7bc781245da63ac2c2f486 SHA512 9041ce60e25adece3aef435c2a928b759169901576ea6afac1556b01f0212e539fd72dc5343defc7836a09e453d373a04f6358c5f8e52885c07e93b4a97882d4
+EBUILD sourcegit-8.31.ebuild 2671 BLAKE2B 138c65d256b91244c20a7a6d74e103454cde7c239969d1d834ceebcf56c9788094cacc99fdd1f916d652f5e4a13e0965cdd7fa7a4a7af7ad0c83c3073e432774 SHA512 58a23578cac2a6538d41d0c3f7a3a66ae4c46398c754bd566d969b2988960bd79fcf3128f2ad3d3a0f05a6bfe209db482a351f172955ea6f6c63dcd13d3fa10f
 EBUILD sourcegit-8.32.ebuild 3301 BLAKE2B 1da7ca3086f79978f011d5ba27dcc7b26fe451953b8eaec6d54d95c6ec471ab2162d85360e7362adba01cb78514eabc79d172b71fff48707176520ae272a5e72 SHA512 22f359a6f28742c44d0079e4b70b43385cc2f5bbe833214266065150b373ba65400fdafca496d9d35776ec04d4c0a84bf793207695542295c9140119afab6ddf
+EBUILD sourcegit-8.33.ebuild 3301 BLAKE2B 1da7ca3086f79978f011d5ba27dcc7b26fe451953b8eaec6d54d95c6ec471ab2162d85360e7362adba01cb78514eabc79d172b71fff48707176520ae272a5e72 SHA512 22f359a6f28742c44d0079e4b70b43385cc2f5bbe833214266065150b373ba65400fdafca496d9d35776ec04d4c0a84bf793207695542295c9140119afab6ddf
 EBUILD sourcegit-9999.ebuild 3301 BLAKE2B 1da7ca3086f79978f011d5ba27dcc7b26fe451953b8eaec6d54d95c6ec471ab2162d85360e7362adba01cb78514eabc79d172b71fff48707176520ae272a5e72 SHA512 22f359a6f28742c44d0079e4b70b43385cc2f5bbe833214266065150b373ba65400fdafca496d9d35776ec04d4c0a84bf793207695542295c9140119afab6ddf
 MISC metadata.xml 509 BLAKE2B aab4770380a33bf4fb6bae2da226fb4304f1cd5383a05db987860840685c0d0527e01b0919b51825c6bfbf0dc4325b7ab36a089cd6f6831fa1d83914d2d85202 SHA512 f25b7979ba4a49b4d1a50b2c7b50ece83792ea2f34856eab1bf06b0d71075e54d6b896ff538d5cb7f722acfae2d7bf40bc4f277395047208dec3cefc4c14a6b6
diff --git a/dev-vcs/sourcegit/sourcegit-8.31.ebuild b/dev-vcs/sourcegit/sourcegit-8.31.ebuild
index ab5e67d5e060..579e5b16c6d3 100644
--- a/dev-vcs/sourcegit/sourcegit-8.31.ebuild
+++ b/dev-vcs/sourcegit/sourcegit-8.31.ebuild
@@ -58,7 +58,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.33.ebuild b/dev-vcs/sourcegit/sourcegit-8.33.ebuild
new file mode 100644
index 000000000000..31ccff25abc3
--- /dev/null
+++ b/dev-vcs/sourcegit/sourcegit-8.33.ebuild
@@ -0,0 +1,141 @@
+# 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
+}