* [gentoo-commits] repo/gentoo:master commit in: dev-util/imediff/
@ 2025-01-16 23:27 James Le Cuirot
0 siblings, 0 replies; 4+ messages in thread
From: James Le Cuirot @ 2025-01-16 23:27 UTC (permalink / raw
To: gentoo-commits
commit: 76b9038dbff24e43f81b0665c6ab5e9eb67ef805
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Wed Nov 13 21:59:03 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 23:26:50 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76b9038d
dev-util/imediff: add 3.3.1
use setuptools
add test with unittest
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Closes: https://github.com/gentoo/gentoo/pull/39317
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
dev-util/imediff/Manifest | 1 +
dev-util/imediff/imediff-3.3.1.ebuild | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+)
diff --git a/dev-util/imediff/Manifest b/dev-util/imediff/Manifest
index 90751ecabb58..d06d3c4740f7 100644
--- a/dev-util/imediff/Manifest
+++ b/dev-util/imediff/Manifest
@@ -1 +1,2 @@
+DIST imediff-3.3.1.tar.gz 98813 BLAKE2B af578358bd8670b15378879487cb7ee2096d0984251d39d4bb3cdd025794035a8a7e3f633afe80bf5805681614269abf6e03dae248b91470450d93e06256c885 SHA512 598cd499b757bd5f0255c5db909ffccce5ece3979af25a7919b9ad187744e89f321d6a97634dba3fa29fe7f0712212e3d16b7dabf9abf3d84893a7d30feec71b
DIST imediff2_1.1.2.1.orig.tar.gz 20393 BLAKE2B 560eef8600bac8ad302907563bd8520ef7881009c8a35c74427d0d5d9e8d4303446f1eb39c01fec201c798f286023765776a84b1e1aaa9e2d585a45870375f16 SHA512 ad0e22f5f2f16efb976a0d6d16c34798cc8aace4251a99cb7764df6841f93c2a6bb9dc8cbb59d8f3ae5a5ad7c161a05b9c3c7b36cc7bdf98eac3ef3b735ef6c4
diff --git a/dev-util/imediff/imediff-3.3.1.ebuild b/dev-util/imediff/imediff-3.3.1.ebuild
new file mode 100644
index 000000000000..e4c8e702aa50
--- /dev/null
+++ b/dev-util/imediff/imediff-3.3.1.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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/imediff/
@ 2025-02-09 22:31 James Le Cuirot
0 siblings, 0 replies; 4+ messages in thread
From: James Le Cuirot @ 2025-02-09 22:31 UTC (permalink / raw
To: gentoo-commits
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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/imediff/
@ 2025-03-21 15:45 Petr Vaněk
0 siblings, 0 replies; 4+ messages in thread
From: Petr Vaněk @ 2025-03-21 15:45 UTC (permalink / raw
To: gentoo-commits
commit: 9a66be528834d841c011e3b21ecd0a756c4a9330
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 21 15:06:38 2025 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Fri Mar 21 15:44:23 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a66be52
dev-util/imediff: drop 3.3.1
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
dev-util/imediff/Manifest | 1 -
dev-util/imediff/imediff-3.3.1.ebuild | 35 -----------------------------------
2 files changed, 36 deletions(-)
diff --git a/dev-util/imediff/Manifest b/dev-util/imediff/Manifest
index 2d987a16e0b6..ae480ce53950 100644
--- a/dev-util/imediff/Manifest
+++ b/dev-util/imediff/Manifest
@@ -1,3 +1,2 @@
-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.3.1.ebuild b/dev-util/imediff/imediff-3.3.1.ebuild
deleted file mode 100644
index e4c8e702aa50..000000000000
--- a/dev-util/imediff/imediff-3.3.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/imediff/
@ 2025-04-26 1:45 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2025-04-26 1:45 UTC (permalink / raw
To: gentoo-commits
commit: 734d2411e7e06f7d40cf3f2807b2d32d8474d6aa
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 26 01:44:13 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 26 01:44:13 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=734d2411
dev-util/imediff: Stabilize 3.4.0 ALLARCHES, #954411
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/imediff/imediff-3.4.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/imediff/imediff-3.4.0.ebuild b/dev-util/imediff/imediff-3.4.0.ebuild
index e4c8e702aa50..4da162d1a528 100644
--- a/dev-util/imediff/imediff-3.4.0.ebuild
+++ b/dev-util/imediff/imediff-3.4.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-upstream-${PV}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
DEPEND="${PYTHON_DEPS}"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-04-26 1:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-04-26 1:45 [gentoo-commits] repo/gentoo:master commit in: dev-util/imediff/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-03-21 15:45 Petr Vaněk
2025-02-09 22:31 James Le Cuirot
2025-01-16 23:27 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox