[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/files/, dev-util/imediff/, dev-util/imediff2/, ...

[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/files/, dev-util/imediff/, dev-util/imediff2/, ...

[James Le Cuirot]

commit:     7c44b688d5b3df6ffa400b51fd74f9db3ac27864
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Wed Nov 13 21:51:59 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 23:26:46 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c44b688

dev-util/imediff2: pkgmove to dev-util/imediff

Package name without '2',
since it supports diff for not only 2 files but also 3 files.

PYTHON_COMPAT updated to python3_13

Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 dev-util/{imediff2 => imediff}/Manifest                   |  0
 .../{imediff2 => imediff}/files/1.1.2.1-python-3.patch    |  0
 .../imediff-1.1.2.1.ebuild}                               | 15 ++++++++-------
 dev-util/{imediff2 => imediff}/metadata.xml               |  0
 profiles/updates/4Q-2024                                  |  1 +
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/dev-util/imediff2/Manifest b/dev-util/imediff/Manifest
similarity index 100%
rename from dev-util/imediff2/Manifest
rename to dev-util/imediff/Manifest

diff --git a/dev-util/imediff2/files/1.1.2.1-python-3.patch b/dev-util/imediff/files/1.1.2.1-python-3.patch
similarity index 100%
rename from dev-util/imediff2/files/1.1.2.1-python-3.patch
rename to dev-util/imediff/files/1.1.2.1-python-3.patch

diff --git a/dev-util/imediff2/imediff2-1.1.2.1.ebuild b/dev-util/imediff/imediff-1.1.2.1.ebuild
similarity index 67%
rename from dev-util/imediff2/imediff2-1.1.2.1.ebuild
rename to dev-util/imediff/imediff-1.1.2.1.ebuild
index e2e1bb5b5818..6afd7b40665a 100644
--- a/dev-util/imediff2/imediff2-1.1.2.1.ebuild
+++ b/dev-util/imediff/imediff-1.1.2.1.ebuild
@@ -1,18 +1,21 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-single-r1
 
-MY_P="${PN}_${PV}"
+MY_PN="${PN}2"
+MY_P="${MY_PN}_${PV}"
 
-DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
+DESCRIPTION="2-way/3-way merge tool (CLI, Ncurses)"
 HOMEPAGE="https://github.com/osamuaoki/imediff"
-SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
+SRC_URI="mirror://debian/pool/main/i/${MY_PN}/${MY_P}.orig.tar.gz"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,8 +25,6 @@ DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-#S="${WORKDIR}/${PN}"
-
 PATCHES=( "${FILESDIR}/${PV}-python-3.patch" )
 
 src_compile() {

diff --git a/dev-util/imediff2/metadata.xml b/dev-util/imediff/metadata.xml
similarity index 100%
rename from dev-util/imediff2/metadata.xml
rename to dev-util/imediff/metadata.xml

diff --git a/profiles/updates/4Q-2024 b/profiles/updates/4Q-2024
index 819daf818b22..4613d02bafbe 100644
--- a/profiles/updates/4Q-2024
+++ b/profiles/updates/4Q-2024
@@ -84,3 +84,4 @@ move dev-ml/llvm-ocaml dev-ml/llvm
 move dev-python/clang-python dev-python/clang
 slotmove kde-frameworks/kapidox 5 0
 move dev-python/publicsuffix dev-python/publicsuffix2
+move dev-util/imediff2 dev-util/imediff