[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff/

[James Le Cuirot]

commit:     d7515e8c8142718c7a3056f3c2e9e139ca630b0b
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  9 22:31:27 2025 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 22:31:27 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7515e8c

dev-util/imediff: Version bump to 3.4.0

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 dev-util/imediff/Manifest             |  1 +
 dev-util/imediff/imediff-3.4.0.ebuild | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/dev-util/imediff/Manifest b/dev-util/imediff/Manifest
index d06d3c4740f7..2d987a16e0b6 100644
--- a/dev-util/imediff/Manifest
+++ b/dev-util/imediff/Manifest
@@ -1,2 +1,3 @@
 DIST imediff-3.3.1.tar.gz 98813 BLAKE2B 
af578358bd8670b15378879487cb7ee2096d0984251d39d4bb3cdd025794035a8a7e3f633afe80bf5805681614269abf6e03dae248b91470450d93e06256c885
 SHA512 
598cd499b757bd5f0255c5db909ffccce5ece3979af25a7919b9ad187744e89f321d6a97634dba3fa29fe7f0712212e3d16b7dabf9abf3d84893a7d30feec71b
+DIST imediff-3.4.0.tar.gz 98338 BLAKE2B 
9ca95917bae7222a7298c23fb2ccac52273f786b3486524d40808dd609f5581f0be591b2b5b9cc1efa149811f7ce0b1aa3a2e642697cd424e94d9da672af46dd
 SHA512 
abfa3614c884443df2ab7941a3e92e2753efe042d5f4ce9a6c50d1851f16a3b45ea1602746ccee71f5f4e7be506e8c451324756857cd3b9669a3bf2e2a2388f3
 DIST imediff2_1.1.2.1.orig.tar.gz 20393 BLAKE2B 
560eef8600bac8ad302907563bd8520ef7881009c8a35c74427d0d5d9e8d4303446f1eb39c01fec201c798f286023765776a84b1e1aaa9e2d585a45870375f16
 SHA512 
ad0e22f5f2f16efb976a0d6d16c34798cc8aace4251a99cb7764df6841f93c2a6bb9dc8cbb59d8f3ae5a5ad7c161a05b9c3c7b36cc7bdf98eac3ef3b735ef6c4

diff --git a/dev-util/imediff/imediff-3.4.0.ebuild 
b/dev-util/imediff/imediff-3.4.0.ebuild
new file mode 100644
index 000000000000..e4c8e702aa50
--- /dev/null
+++ b/dev-util/imediff/imediff-3.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="2-way/3-way merge tool (CLI, Ncurses)"
+HOMEPAGE="https://github.com/osamuaoki/imediff";
+SRC_URI="https://github.com/osamuaoki/${PN}/archive/upstream/${PV}.tar.gz -> 
${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-upstream-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+distutils_enable_tests unittest
+
+src_install() {
+       distutils-r1_src_install
+       rm "${ED}"/usr/bin/imediff_install || die
+       python_doscript "${ED}"/usr/bin/imediff
+       newbin usr/bin/git-ime.in git-ime
+       doman usr/share/man/man1/imediff.1 usr/share/man/man1/git-ime.1
+}