6 files changed, 161 insertions, 100 deletions
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 1cc959114726..cb6b0362dba4 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-absorb/Manifest b/dev-vcs/git-absorb/Manifest
index fb2b5d1bcb5e..71931cdccf9c 100644
--- a/dev-vcs/git-absorb/Manifest
+++ b/dev-vcs/git-absorb/Manifest
@@ -26,6 +26,7 @@ DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d7705
 DIST getrandom-0.2.12.crate 36163 BLAKE2B 0afef8504932ea0ea051cde1d14bd5b79edde68d6ebae6fe88fa4aaa532605a16f466d0d9c0d0aa619eaa105600b6d5ee4e191865a3fa041549a78f78ca82396 SHA512 dd97d7dae1a7ba653abdaf2db719e1a9c8eb721b08b4af0f1c45b1ed5079069d1b57e4f6d9d879e7fae3a890763f4b6aea9bc2d945392b98e811e7b348589bee
 DIST git-absorb-0.6.16.tar.gz 29086 BLAKE2B cfa00dc0f3b339269af7360199f357ee0e787c7cff8cd16d452f9bb46dcedec95e7360fe02a3061bd74a6c6b2ba7a01b739e44da197c42dd995fb5aca2878a1f SHA512 fe335d97b5c8e45046365da7830a8582763465e5d779dc1729fa3eba21949638eb339db9ca9178af9b2a487bf45bab796312c726f44b624a65eb3a07de337ddf
 DIST git-absorb-0.6.17.tar.gz 29449 BLAKE2B 4633066d8e1316378e5d7902d007fc40a55fcbfdbda201887de9686ffb5b5c5ce7bc0719ad0d67b559b465ae67f6572de356a6b4ae71b49b3898c6f711325b39 SHA512 45dd0f25731e4109dd92a3619e33230740beb442fe4ded40b83c66ceaeca8872c18869d0c63e603777ad9533b5411fc2f88e933a201ffde15e10bee498f712e4
+DIST git-absorb-0.7.0.tar.gz 31320 BLAKE2B dc70447f6a7a228007c3a1009343543c0de8788a4c2f91ac774620dd153ec30366f285b785c3ded057f772dd59415d802f1f90a9ec7927249f3ec517b4ce08e8 SHA512 ac748a123e4619bd387438a160c072550fa86b4f321fa6d8a3779bf711035914de09942959fc8e679cb2aa713db7b81c7ff6fd23ff0720c333b7c9824374668a
 DIST git2-0.19.0.crate 215910 BLAKE2B e6dfbc292dd580dfe2b5964745d73c29ab4e43d91af37893eb2b915c7967d557940284c388b5693c8f366d98979cfb43f184627319799a359b2ec40c6d875a83 SHA512 9d868ba1594ace291002c4a10dcd43f192dbb8c2070abd74883e57a7f53825c7a29080ecbe4279f6c7ee845c261bcbc93b10004b99df27de41cd29bd48e137e8
 DIST git2-0.20.0.crate 219198 BLAKE2B ecc6e070ef2a431ead9c2f0aef774dadcc08db0985ff1d0b3cf002926cd6dbbbba5bd740c8ed9e4bc4da47b85b7d741698f18a7ce47c9b4ee76f32af55b46a1f SHA512 ca86f70b2b1aea95906618791f8093abb6366896c2c7a1db3c054ed3719081c73581f02ba1cdfb58f047df2eccea7108ba933bb9dd9b255d48e1f8159666278d
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
@@ -102,4 +103,5 @@ DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d2789
 DIST windows_x86_64_msvc-0.52.4.crate 828019 BLAKE2B 08163b63d934114457cd64b1c372f8a0cfc1ebf48a2efb41d79031c58ea64e023acd32d2f5075b8b78536998188138562e584ece95f2021b4bc71087ac45f026 SHA512 0671fa3c0463c6d65b525ece8bc91eab2f75cb534de86ba2b1e854d4136fcb439717441881206dba7cfb602493bc24d2aefa96abf8977f5a0fe38d41eadc90f1
 EBUILD git-absorb-0.6.16-r1.ebuild 3175 BLAKE2B a4985ba35f4cec6b49c69899d7027cc1a59415fe9bad5c9321eb385a9014b159ea6e71048389c3f8a1721bbbff1180779fc5d56f36b42076219fa9479f3d555b SHA512 f5563c18139476beba2143f7f17adb130a0883b30ec0fa8759d7eeab541e6204ba36ec61b608d4094f0297df5a33e7139b95de4cce56beed2af660c0bd77599f
 EBUILD git-absorb-0.6.17-r2.ebuild 3087 BLAKE2B 4ca5dd439f148aa425180f6a6d4d584fc68db3ddadf080b1695b937542de24e50744b749897170fa4ba242dba20f5982324100f004dd87c969695c653a52f05c SHA512 0ab8503a5835e65d7a2673c904c511491a8b918ced64c69186f1f2485fd18e7cb3dbd80e925fe66cf2df22d708f1fb8c02edad1d5a096734c631e1b84390c11b
+EBUILD git-absorb-0.7.0.ebuild 3132 BLAKE2B 91be3d1c915cd6b2886c91313de83164c82d396b862112c39bf2f8774de613ba2fa2be39901bd4b03b9da0714a486b5ae8c3d19da05514a8f02e2bb1702d3019 SHA512 f70e99112909a4b9f6efb5b313de542858bf9a958abbd1beb32e7ec6979076175b963251f14b5104b7074fa5298c47185fceee31314e65ac3f9fec75d4755b7b
 MISC metadata.xml 326 BLAKE2B 1ce61af807d0db7a5decbffc79fc653d7213c40b44fc1fe7441a0e787034e408ee167d5d2c4adc3f004b90c6ec520952504d66add287bbd540b3418c36f47de4 SHA512 9e288f04912600a55bbf5464eed414de2ea8911ce5bef9fe92d99e5d2a872652b3638d00235fea858151eebbf46905ed9108003297276202d4a1bd80ac0fc720
diff --git a/dev-vcs/git-absorb/git-absorb-0.7.0.ebuild b/dev-vcs/git-absorb/git-absorb-0.7.0.ebuild
new file mode 100644
index 000000000000..12d660c41aec
--- /dev/null
+++ b/dev-vcs/git-absorb/git-absorb-0.7.0.ebuild
@@ -0,0 +1,159 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.5
+
+EAPI=8
+
+CRATES="
+	anstream@0.6.13
+	anstyle-parse@0.2.3
+	anstyle-query@1.0.2
+	anstyle-wincon@3.0.2
+	anstyle@1.0.6
+	anyhow@1.0.81
+	bitflags@1.3.2
+	bitflags@2.5.0
+	cc@1.0.90
+	cfg-if@1.0.0
+	clap@4.5.3
+	clap_builder@4.5.2
+	clap_complete@4.5.1
+	clap_complete_nushell@4.5.1
+	clap_derive@4.5.3
+	clap_lex@0.7.0
+	colorchoice@1.0.0
+	deranged@0.3.11
+	dirs-next@2.0.0
+	dirs-sys-next@0.1.2
+	errno@0.3.8
+	fastrand@2.0.1
+	form_urlencoded@1.2.1
+	getrandom@0.2.12
+	git2@0.20.0
+	heck@0.5.0
+	hermit-abi@0.3.9
+	idna@0.5.0
+	is-terminal@0.4.12
+	itoa@1.0.10
+	jobserver@0.1.28
+	libc@0.2.155
+	libgit2-sys@0.18.0+1.9.0
+	libredox@0.0.1
+	libz-sys@1.1.16
+	linux-raw-sys@0.4.13
+	log@0.4.21
+	memchr@2.7.1
+	num-conv@0.1.0
+	once_cell@1.19.0
+	percent-encoding@2.3.1
+	pkg-config@0.3.30
+	powerfmt@0.2.0
+	proc-macro2@1.0.79
+	quote@1.0.35
+	redox_syscall@0.4.1
+	redox_users@0.4.4
+	rustix@0.38.32
+	rustversion@1.0.14
+	serde@1.0.197
+	serde_derive@1.0.197
+	slog-term@2.9.1
+	slog@2.7.0
+	strsim@0.11.0
+	syn@2.0.53
+	tempfile@3.10.1
+	term@0.7.0
+	terminal_size@0.3.0
+	thiserror-impl@1.0.58
+	thiserror@1.0.58
+	thread_local@1.1.8
+	time-core@0.1.2
+	time-macros@0.2.18
+	time@0.3.36
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.1
+	unicode-bidi@0.3.15
+	unicode-ident@1.0.12
+	unicode-normalization@0.1.23
+	url@2.5.0
+	utf8parse@0.2.1
+	vcpkg@0.2.15
+	wasi@0.11.0+wasi-snapshot-preview1
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-targets@0.48.5
+	windows-targets@0.52.4
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.4
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.4
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.4
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.4
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.4
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.4
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.4
+"
+
+inherit cargo shell-completion
+
+DESCRIPTION="Automatically absorb staged changes into git current branch"
+HOMEPAGE="https://github.com/tummychow/git-absorb"
+SRC_URI="${CARGO_CRATE_URIS}"
+SRC_URI+=" https://github.com/tummychow/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+# Dependent crate licenses
+LICENSE+=" MIT Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	>=dev-libs/libgit2-1.9:=
+	<dev-libs/libgit2-1.10
+"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+"
+
+DOCS=( README.md )
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_compile() {
+	export LIBGIT2_NO_VENDOR=1
+
+	cargo_src_compile
+
+	GIT_ABSORB_BIN="$(cargo_target_dir)/${PN}"
+
+	emake -C Documentation
+
+	# Prepare shell completion generation
+	mkdir completions || die
+	local shell
+	for shell in bash fish zsh; do
+		"${GIT_ABSORB_BIN}" --gen-completions \
+					 ${shell} \
+					 > completions/${PN}.${shell} \
+			|| die
+	done
+}
+
+src_install() {
+	cargo_src_install
+	doman Documentation/${PN}.1
+
+	newbashcomp "completions/${PN}.bash" "${PN}"
+	dofishcomp "completions/${PN}.fish"
+	dozshcomp "completions/${PN}.zsh"
+
+	default
+}
diff --git a/dev-vcs/rsvndump/Manifest b/dev-vcs/rsvndump/Manifest
index 93a3b897b532..bd5134d7d1b6 100644
--- a/dev-vcs/rsvndump/Manifest
+++ b/dev-vcs/rsvndump/Manifest
@@ -2,9 +2,6 @@ AUX rsvndump-0.6-asciidoc-9.patch 1245 BLAKE2B ddfeb84964f0d5f6403c2a4b91d4e0de4
 AUX rsvndump-0.6-configure-ar.patch 536 BLAKE2B 7d5c4961ae636c4a7940e7c000ae44eb3342d412bcae01209bb7dd4b7512abad7ffdf958401468e278fe4e8a7d59cd3a631cc98684190ca4d1a422caf023a182 SHA512 a3d00bd5b1a40ce5861532f97053084dcd979990e90e332aaf69325af4593c0c2d592ba707a54121e824926bccfce208ef7c41cfc62c5adbef5aba229086af77
 DIST rsvndump-0.6.1.tar.bz2 233503 BLAKE2B eee3c0c61724544bc5b335d97eb76b0826cadaa883830f84e9be6fab4f901121d0cb2517633b5a53f2bc465d5ce384ce234d052860eadfd7c5237ac0192ab771 SHA512 3055070b8e128dad0ef099130d3ac7fe147a334b97c3db71354f37a00dfba3ec34194bf4dc5f1e31315852681501422986ac3d6b032fa4d6a6f9d87c45c5b391
 DIST rsvndump-0.6.2.tar.bz2 234950 BLAKE2B 8c42ca253573df0fdadac28ae19602c02fbf156c0cdc136607191c666498707610929d0c535f743c9a7f978ef0b2e42da33c696abc7ed377fc486d01a1e11830 SHA512 a33d262c9a5e6c82129fa11fc503439d903e7237275e7fd14ab728c1d4c37496bcc7a5b59e3dd937df7108ccf0b24078635771b6297c1337912d6eda396cd406
-DIST rsvndump-0.6.tar.bz2 220891 BLAKE2B 97792a13beb0a37452df941599a753297f0322d04608e86da0740cb553a9da7d1a2f9b6e712c15698ae9d5f2c8d4911d8bed45e66c58ca46b2d1b0c29ec4f275 SHA512 cadb10b48e66be1ea562fa6b96460b5c864e2f16a1e0d5fbb4be4d31023b6d5dfa978634900b1649530a12335eb712032d9d9cc82f663737581521121d3b2120
-EBUILD rsvndump-0.6-r1.ebuild 1373 BLAKE2B 77d7080519e4e888fbd46fc8576b4cd049d970968eef4ea16a93981ae9b6c366d984b8b3609d4dcb39b7771540cbca5c8f65c6a34b04a7dc31c19eba66976722 SHA512 6bf0fab3a5ffe92428561d128ffc573b88b7aaa7dcf2ac374467817e8be20de67cbdc2607817b7fda495d62ba4f2794a04ccfcc6fb42d64647f51a975959845e
 EBUILD rsvndump-0.6.1-r1.ebuild 1323 BLAKE2B 05a5d914e457326e99ffe0e8e930344d605e57c40dc1c1b4d2e0bf307e5b606428f78fef5d9d66ef598567fa31c14bcaa40b13ca1d0ce7143f06827ab38094cf SHA512 b9ed0bc2d94edffd402719b3bcbcb147e224257b171c42a2e091a2b8b744659df2cc147cd98f29629dfba55b2f1a578d688e1457daed6c0b730b2c8e3d6d21a1
-EBUILD rsvndump-0.6.1.ebuild 1274 BLAKE2B 44e5312044824976d443030537d6f2d6797120057c76e35637b931f6113f83edf89a0a19c9230b1d3c96dc306e5b081a07736cdbc695fae2aa0e3070c32d37aa SHA512 6b4f36725d1ebf55189fa3a62a1c4f4222ae541c1b30acee582ddf453c4a1f980e39db1d48b8c55f870a82e4c646db1f3281a894b9d3d117521a40fe4ee64273
 EBUILD rsvndump-0.6.2.ebuild 1323 BLAKE2B 05a5d914e457326e99ffe0e8e930344d605e57c40dc1c1b4d2e0bf307e5b606428f78fef5d9d66ef598567fa31c14bcaa40b13ca1d0ce7143f06827ab38094cf SHA512 b9ed0bc2d94edffd402719b3bcbcb147e224257b171c42a2e091a2b8b744659df2cc147cd98f29629dfba55b2f1a578d688e1457daed6c0b730b2c8e3d6d21a1
 MISC metadata.xml 328 BLAKE2B 61f20d9402fae8339c10e55d228dc822c9c4ea778be47c7d2b49a96f920e09cb7c4bb322e75813661bd27c71d91e8377bad14552587fedefb37fca89c7eb9c4e SHA512 fef92b57961bf9e0846f9d87c2f5944993c8e958bb183e659df4d271084816233a4bb3751365742cca0d6dd9f53b559a0b0423156c2aa871cbf456ce23c413b9
diff --git a/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild b/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild
deleted file mode 100644
index fcf6eca15a6e..000000000000
--- a/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Dump a remote Subversion repository"
-HOMEPAGE="http://rsvndump.sourceforge.net"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3+ BSD public-domain"  # rsvndump, snappy-c, critbit89
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc"
-
-RDEPEND="dev-vcs/subversion
-	dev-libs/apr
-	dev-libs/apr-util
-	sys-devel/gettext"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto
-		>=app-text/asciidoc-8.4 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6-configure-ar.patch
-	"${FILESDIR}"/${PN}-0.6-asciidoc-9.patch
-)
-
-src_prepare() {
-	default
-
-	# We need to patch use of /usr/lib because it is a problem with
-	# linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/739028).
-	# The grep sandwich acts as a regression test so that a future
-	# version bump cannot break patching without noticing.
-	grep -wq svn_prefix/lib m4/find_svn.m4 || die
-	sed "s,svn_prefix/lib,svn_prefix/$(get_libdir)," -i m4/find_svn.m4 || die
-	grep -w svn_prefix/lib m4/find_svn.m4 && die
-	grep -wq SVN_PREFIX/lib configure.ac || die
-	sed "s,SVN_PREFIX/lib,SVN_PREFIX/$(get_libdir)," -i configure.ac || die
-	grep -w SVN_PREFIX/lib configure.ac && die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable doc man) \
-		$(use_enable debug)
-}
diff --git a/dev-vcs/rsvndump/rsvndump-0.6.1.ebuild b/dev-vcs/rsvndump/rsvndump-0.6.1.ebuild
deleted file mode 100644
index a75f24026576..000000000000
--- a/dev-vcs/rsvndump/rsvndump-0.6.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Dump a remote Subversion repository"
-HOMEPAGE="http://rsvndump.sourceforge.net"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3+ BSD public-domain"  # rsvndump, snappy-c, critbit89
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc"
-
-RDEPEND="dev-vcs/subversion
-	dev-libs/apr
-	dev-libs/apr-util
-	sys-devel/gettext"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto
-		>=app-text/asciidoc-8.4 )"
-
-src_prepare() {
-	default
-
-	# We need to patch use of /usr/lib because it is a problem with
-	# linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/739028).
-	# The grep sandwich acts as a regression test so that a future
-	# version bump cannot break patching without noticing.
-	grep -wq svn_prefix/lib m4/find_svn.m4 || die
-	sed "s,svn_prefix/lib,svn_prefix/$(get_libdir)," -i m4/find_svn.m4 || die
-	grep -w svn_prefix/lib m4/find_svn.m4 && die
-	grep -wq SVN_PREFIX/lib configure.ac || die
-	sed "s,SVN_PREFIX/lib,SVN_PREFIX/$(get_libdir)," -i configure.ac || die
-	grep -w SVN_PREFIX/lib configure.ac && die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable doc man) \
-		$(use_enable debug)
-}