repo/gentoo:master commit in: dev-vcs/mergiraf/
"Arthur Zamarin" <[email protected]>
| Newsgroups | gmane.linux.gentoo.cvs |
|---|---|
| Message-ID | <1786985484.95e9e30b62e6d9df50881351a7440ed6da968698.arthurzam@gentoo> |
commit: 95e9e30b62e6d9df50881351a7440ed6da968698
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 17 16:51:24 2026 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 16:51:24 2026 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95e9e30b
dev-vcs/mergiraf: add 0.19.0
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-vcs/mergiraf/Manifest | 2 ++
dev-vcs/mergiraf/mergiraf-0.19.0.ebuild | 37 +++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+)
diff --git a/dev-vcs/mergiraf/Manifest b/dev-vcs/mergiraf/Manifest
index 31e8caf77ef8..6e78f7486668 100644
--- a/dev-vcs/mergiraf/Manifest
+++ b/dev-vcs/mergiraf/Manifest
@@ -6,3 +6,5 @@ DIST mergiraf-0.17.0-crates.tar.xz 17012604 BLAKE2B 91a8980e1ff1d86a20aa76eeeca1
DIST mergiraf-0.17.0.tar.gz 1235092 BLAKE2B 1510b28291b6fc22078479a64e5529748dc25c3d464cf7dbf7bc8f75a71b54a3eac5b124d9d7071294b0a3df6aa7efb8ab00783624aad33ea3481a571157f9d5 SHA512 71d995078014348a4ba31b6c661f28cc2bc157da323be3dd58fef31bb99037005e31ba3aaade993c61bf2a2c613dcda086eff23d6820e2ec56a264c42ee4273c
DIST mergiraf-0.18.0-crates.tar.xz 14506268 BLAKE2B 3446a437d9a890025b466686bd833b6fd49dd7191f9fdcb38c9963c347917de6d5401f1290f397df5ae904490b17a6dd16c85b3a8e2b420020748043816e55c9 SHA512 2d270230f0b77146172d178e828993015d7b0e606b3127a9f8dd11be272e69cb0520e35341fac7f775f9bae6b2211767f87c7c875c89b3e654426792316cac57
DIST mergiraf-0.18.0.tar.gz 1241036 BLAKE2B 93c7155694fa706858c4f7d03cebfad37c3c5c3998f4787aa2b49c8f55d3d9665dcd349d7f3df2ae5fdc0489509eea7e77d251ebc861eb0900e491cc565e0c18 SHA512 e4242abc61d565a05a412c2b6db27f9c1e8754772ab56be21d3d56a7a5b97c9e18eafe802c8be8905189a19163e22f7d8e362c3f6915ec1d1400ee27caf75f2e
+DIST mergiraf-0.19.0-crates.tar.xz 14734628 BLAKE2B 402466fef3e301a6ecab5d6361c2c9463efd8e2f775e63654381e9802eab6fe04b1d362d514d62467f95ea121d6d97eb9aca776ea77fa6a97848f195a4e62860 SHA512 a2d0059837c4e29157b061da0f0965ac79f9194d01018aa31067e067d7bbeedd11063f967ec7692a45bb697352d3779cc15894788c4bf4b2a48c28d6ec4d9a61
+DIST mergiraf-0.19.0.tar.gz 1246273 BLAKE2B f4fa8538d91fb18f781fc42efd90b87f5b1211d2143a7b2eebf6f15312dda80d67306ba62b857b928293fb094df41680d616a1bce2162dc95a3c8a7623e5a3a6 SHA512 1b03130a2336990ff2aa693f278b88677add58819f29023e9d388b7613302efcbc3e43b8b9944d591c9905d8f75cc48e3a738fab5ed41c9b6491fb0e4bc2c40a
diff --git a/dev-vcs/mergiraf/mergiraf-0.19.0.ebuild b/dev-vcs/mergiraf/mergiraf-0.19.0.ebuild
new file mode 100644
index 000000000000..80007a8ca27b
--- /dev/null
+++ b/dev-vcs/mergiraf/mergiraf-0.19.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2025-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=" "
+
+RUST_MIN_VER="1.92"
+inherit cargo
+
+DESCRIPTION="Syntax-aware git merge driver"
+HOMEPAGE="https://mergiraf.org/"
+SRC_URI="https://codeberg.org/mergiraf/mergiraf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://github.com/gentoo-crate-dist/mergiraf/releases/download/v${PV}/${P}-crates.tar.xz"
+S=${WORKDIR}/${PN}
+
+LICENSE="GPL-3"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 MIT Unicode-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ test? (
+ dev-vcs/git
+ dev-vcs/jj
+ )
+"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_install() {
+ default
+ cargo_src_install
+}