commit: f493ede76fe7927bb128cde3c8f357686c57b977 Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Mon Oct 20 11:57:41 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Oct 21 15:18:51 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f493ede7
dev-util/imediff: add 3.4.1 fix the license to GPL2-+ (seems old) update python_compat 10..13 -> 11..14 remove implicit deps w/ distutils-r1 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/44270 Closes: https://github.com/gentoo/gentoo/pull/44270 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/imediff/Manifest | 1 + dev-util/imediff/imediff-3.4.1.ebuild | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dev-util/imediff/Manifest b/dev-util/imediff/Manifest index ae480ce53950..d557b22fa096 100644 --- a/dev-util/imediff/Manifest +++ b/dev-util/imediff/Manifest @@ -1,2 +1,3 @@ DIST imediff-3.4.0.tar.gz 98338 BLAKE2B 9ca95917bae7222a7298c23fb2ccac52273f786b3486524d40808dd609f5581f0be591b2b5b9cc1efa149811f7ce0b1aa3a2e642697cd424e94d9da672af46dd SHA512 abfa3614c884443df2ab7941a3e92e2753efe042d5f4ce9a6c50d1851f16a3b45ea1602746ccee71f5f4e7be506e8c451324756857cd3b9669a3bf2e2a2388f3 +DIST imediff-3.4.1.tar.gz 98759 BLAKE2B 1bada99f611a177bde5d1bc9821be25220c2cf75642a621fe9a65d694c9f0a21ca0448bafc22af46832fe7a402b9e6c10f8c714008d811b039d17caf922d2583 SHA512 9f5dd99495119c98cb4630c25bbdde5fb0af3ed50e10ba1794318e296a8be99c7a0b05f3afbac335f31ddfb075d96750bdc4ef8fb7072c59529ae45233aeb416 DIST imediff2_1.1.2.1.orig.tar.gz 20393 BLAKE2B 560eef8600bac8ad302907563bd8520ef7881009c8a35c74427d0d5d9e8d4303446f1eb39c01fec201c798f286023765776a84b1e1aaa9e2d585a45870375f16 SHA512 ad0e22f5f2f16efb976a0d6d16c34798cc8aace4251a99cb7764df6841f93c2a6bb9dc8cbb59d8f3ae5a5ad7c161a05b9c3c7b36cc7bdf98eac3ef3b735ef6c4 diff --git a/dev-util/imediff/imediff-3.4.1.ebuild b/dev-util/imediff/imediff-3.4.1.ebuild new file mode 100644 index 000000000000..8e944fc34f57 --- /dev/null +++ b/dev-util/imediff/imediff-3.4.1.ebuild @@ -0,0 +1,30 @@ +# 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_{11..14} ) +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" + +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 +}
