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

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

[Patrice Clement]

commit:     6fbe68fee60da84b521f8f1f55b17bed6b600d2b
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Apr 27 07:46:40 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue May  1 21:15:20 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fbe68fe

dev-util/imediff2: use HTTPS.

Closes: https://github.com/gentoo/gentoo/pull/8158

 dev-util/imediff2/imediff2-1.1.2-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/imediff2/imediff2-1.1.2-r3.ebuild b/dev-util/imediff2/imediff2-1.1.2-r3.ebuild
index 7291ee8d470..9c30e2e0359 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r3.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ inherit python-single-r1 versionator
 MY_P=${PN}_$(replace_version_separator 3 -)
 
 DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
-HOMEPAGE="http://elonen.iki.fi/code/imediff/"
+HOMEPAGE="https://elonen.iki.fi/code/imediff/"
 SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
 
 LICENSE="GPL-2"

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

[Brian Evans]

commit:     11a8aa42ee569a289e1e38dc8f8547fff2b1a4e4
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 25 13:27:38 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Jun 25 13:28:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11a8aa42

dev-util/imediff2: Drop old revision

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-util/imediff2/imediff2-1.1.2-r3.ebuild | 37 ------------------------------
 1 file changed, 37 deletions(-)

diff --git a/dev-util/imediff2/imediff2-1.1.2-r3.ebuild b/dev-util/imediff2/imediff2-1.1.2-r3.ebuild
deleted file mode 100644
index 9c30e2e0359..00000000000
--- a/dev-util/imediff2/imediff2-1.1.2-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses"
-
-inherit python-single-r1 versionator
-
-MY_P=${PN}_$(replace_version_separator 3 -)
-
-DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
-HOMEPAGE="https://elonen.iki.fi/code/imediff/"
-SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	# Otherwise the docs get regenerated :)
-	:
-}
-
-src_install() {
-	python_doscript imediff2
-	dodoc AUTHORS README
-	doman imediff2.1
-}

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

[Brian Evans]

commit:     8852af0bb98206c59057fa90044f1c2507b90791
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 25 13:19:05 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Jun 25 13:28:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8852af0b

dev-util/imediff2: Add myself as a maintainer

 dev-util/imediff2/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev-util/imediff2/metadata.xml b/dev-util/imediff2/metadata.xml
index 5c23291b521..b01015a7e56 100644
--- a/dev-util/imediff2/metadata.xml
+++ b/dev-util/imediff2/metadata.xml
@@ -5,4 +5,8 @@
 		<email>dev-zero@gentoo.org</email>
 		<name>Tiziano Müller</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>grknight@gentoo.org</email>
+		<name>Brian Evans</name>
+	</maintainer>
 </pkgmetadata>

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

[Brian Evans]

commit:     4007466ddbdb917f45e0741286539e59dd99c3f3
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 11 23:38:38 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sat Aug 11 23:38:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4007466d

dev-util/imediff2: Replace versionator with eapi7-ver

Package-Manager: Portage-2.3.45, Repoman-2.3.10

 dev-util/imediff2/imediff2-1.1.2-r5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
index 22d3fb364d1..52fad5519ff 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
@@ -6,9 +6,9 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
 PYTHON_REQ_USE="ncurses"
 
-inherit python-single-r1 versionator
+inherit python-single-r1 eapi7-ver
 
-MY_P=${PN}_$(replace_version_separator 3 -)
+MY_P=${PN}_$(ver_rs 3 -)
 
 DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
 HOMEPAGE="https://elonen.iki.fi/code/imediff/"

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

[Brian Evans]

commit:     b909bb72e5979366d7e184b1b4ecc3f767056ba5
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 31 13:54:00 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Aug 31 13:54:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b909bb72

dev-util/imediff2: Mark stable on amd64 and x86

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 dev-util/imediff2/imediff2-1.1.2-r5.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
index 52fad5519ff..6e8fc59be1f 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="ncurses"
 
 inherit python-single-r1 eapi7-ver
 
-MY_P=${PN}_$(ver_rs 3 -)
+MY_P="${PN}_$(ver_rs 3 -)"
 
 DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
 HOMEPAGE="https://elonen.iki.fi/code/imediff/"
@@ -16,14 +16,14 @@ SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 PATCHES=( "${FILESDIR}/${PV}-python-3.patch" )
 

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

[Michał Górny]

commit:     ba012d85c5fa149d4a8fff13d1ce410f8fce7431
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 10 11:41:04 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 11:54:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba012d85

dev-util/imediff2: Remove py2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-util/imediff2/imediff2-1.1.2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
index 1e0262909eb..4e119dda418 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-single-r1 eapi7-ver

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

[Brian Evans]

commit:     3973b94df329231c969b59a4304b0d1f91b30673
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 13 14:04:48 2020 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 14:04:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3973b94d

dev-util/imediff2: Enable python 3.7

Tests OK

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 dev-util/imediff2/imediff2-1.1.2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
index 4e119dda418..a6ac1bd2e64 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-single-r1 eapi7-ver

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

[James Le Cuirot]

commit:     742150467ecca03c7aa2cae1069247326322f9df
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 21:54:21 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 21:54:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74215046

dev-util/imediff2: Add ~arm keyword

Tested and working.

Package-Manager: Portage-2.3.96, Repoman-2.3.20
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 dev-util/imediff2/imediff2-1.1.2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
index a6ac1bd2e64..367b5313edf 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"

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

[Brian Evans]

commit:     48e7133b98ccbfd0cf5d3d4fdc1b41674aa1f517
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  1 16:15:02 2020 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Sep  1 16:16:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48e7133b

dev-util/imediff2: Revbump for 3.8 support

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 dev-util/imediff2/imediff2-1.1.2-r6.ebuild | 39 ++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/dev-util/imediff2/imediff2-1.1.2-r6.ebuild b/dev-util/imediff2/imediff2-1.1.2-r6.ebuild
new file mode 100644
index 00000000000..53ef872d434
--- /dev/null
+++ b/dev-util/imediff2/imediff2-1.1.2-r6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="ncurses"
+
+inherit python-single-r1
+
+MY_P="${PN}_$(ver_rs 3 -)"
+
+DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
+HOMEPAGE="https://elonen.iki.fi/code/imediff/"
+SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PV}-python-3.patch" )
+
+src_compile() {
+	# Otherwise the docs get regenerated :)
+	:
+}
+
+src_install() {
+	python_doscript imediff2
+	dodoc AUTHORS README
+	doman imediff2.1
+}

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

[Brian Evans]

commit:     406016e4f83f23a127e2909b3f1df422fe45707b
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 18:15:00 2020 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 18:15:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=406016e4

dev-util/imediff2: Stable 1.1.2-r6 for all arches

Closes: https://bugs.gentoo.org/757639
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 dev-util/imediff2/imediff2-1.1.2-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/imediff2/imediff2-1.1.2-r6.ebuild b/dev-util/imediff2/imediff2-1.1.2-r6.ebuild
index 53ef872d434..a210685fab7 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r6.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"

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

[Brian Evans]

commit:     002b67d13460dd5e0f5dff3e27f2b9ec087e68c6
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 18:16:32 2020 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 18:16:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=002b67d1

dev-util/imediff2: Add ALLARCHES to metadata.xml

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 dev-util/imediff2/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-util/imediff2/metadata.xml b/dev-util/imediff2/metadata.xml
index 7782eaa2297..dc74e8075c1 100644
--- a/dev-util/imediff2/metadata.xml
+++ b/dev-util/imediff2/metadata.xml
@@ -5,4 +5,5 @@
 		<email>grknight@gentoo.org</email>
 		<name>Brian Evans</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>

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

[Brian Evans]

commit:     add3da60addf37ca795f6abb3ff6b728ec5bf09c
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 18:17:28 2020 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 18:17:28 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=add3da60

dev-util/imediff2: Drop old revision

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 dev-util/imediff2/imediff2-1.1.2-r5.ebuild | 39 ------------------------------
 1 file changed, 39 deletions(-)

diff --git a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
deleted file mode 100644
index 367b5313edf..00000000000
--- a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="ncurses"
-
-inherit python-single-r1 eapi7-ver
-
-MY_P="${PN}_$(ver_rs 3 -)"
-
-DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
-HOMEPAGE="https://elonen.iki.fi/code/imediff/"
-SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PV}-python-3.patch" )
-
-src_compile() {
-	# Otherwise the docs get regenerated :)
-	:
-}
-
-src_install() {
-	python_doscript imediff2
-	dodoc AUTHORS README
-	doman imediff2.1
-}

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

[Agostino Sarubbo]

commit:     67ed3f5cfbb81ea9467c3e159f07ae695a0f13cc
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  1 06:32:27 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Jun  1 06:32:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67ed3f5c

dev-util/imediff2: amd64/x86 stable (ALLARCHES policy) wrt bug #793338

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-util/imediff2/imediff2-1.1.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/imediff2/imediff2-1.1.2.1.ebuild b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
index 464fc4d97d2..ea0b4c61018 100644
--- a/dev-util/imediff2/imediff2-1.1.2.1.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"

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

[Brian Evans]

commit:     aa6968f4c5473e8cb3deb9b91fc53cfec7fdc09f
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 13:37:58 2022 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sat May 21 13:37:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa6968f4

dev-util/imediff2: Expand python targets

Closes: https://bugs.gentoo.org/845954
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 dev-util/imediff2/imediff2-1.1.2.1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-util/imediff2/imediff2-1.1.2.1.ebuild b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
index ea0b4c610181..5a59a527a4a8 100644
--- a/dev-util/imediff2/imediff2-1.1.2.1.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-single-r1

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

[James Le Cuirot]

commit:     ce33d669733cb6251cab53ec3c563b79b5f2e35c
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 23:21:22 2022 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 23:21:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce33d669

dev-util/imediff2: Keyword 1.1.2.1 for ~arm64

Tested and working.

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

 dev-util/imediff2/imediff2-1.1.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/imediff2/imediff2-1.1.2.1.ebuild b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
index 5a59a527a4a8..32f81ba94a30 100644
--- a/dev-util/imediff2/imediff2-1.1.2.1.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"

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

[James Le Cuirot]

commit:     7c6bf4364221708a3748f1344521c1ebc5f4efef
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 16:45:44 2023 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 16:45:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c6bf436

dev-util/imediff2: Add Python 3.11, update metadata

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

 dev-util/imediff2/imediff2-1.1.2.1.ebuild | 4 ++--
 dev-util/imediff2/metadata.xml            | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-util/imediff2/imediff2-1.1.2.1.ebuild b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
index 3efa6758d2a3..c1519e6bfc83 100644
--- a/dev-util/imediff2/imediff2-1.1.2.1.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-single-r1
@@ -11,7 +11,7 @@ inherit python-single-r1
 MY_P="${PN}_${PV}"
 
 DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
-HOMEPAGE="https://elonen.iki.fi/code/imediff/"
+HOMEPAGE="https://github.com/osamuaoki/imediff"
 SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
 
 LICENSE="GPL-2"

diff --git a/dev-util/imediff2/metadata.xml b/dev-util/imediff2/metadata.xml
index 898553d0c3fb..3ee8eee9efef 100644
--- a/dev-util/imediff2/metadata.xml
+++ b/dev-util/imediff2/metadata.xml
@@ -5,5 +5,8 @@
 		<email>grknight@gentoo.org</email>
 		<name>Brian Evans</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">osamuaoki/imediff</remote-id>
+	</upstream>
 	<stabilize-allarches/>
 </pkgmetadata>

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

[James Le Cuirot]

commit:     af12d78e6190b0b91855dddd7aab2fdfcb301b28
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  1 21:41:09 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Apr  1 21:44:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af12d78e

dev-util/imediff2: Add Python 3.12

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

 dev-util/imediff2/imediff2-1.1.2.1.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev-util/imediff2/imediff2-1.1.2.1.ebuild b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
index c1519e6bfc83..e2e1bb5b5818 100644
--- a/dev-util/imediff2/imediff2-1.1.2.1.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-single-r1
@@ -17,7 +17,6 @@ SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}"