9 files changed, 159 insertions, 32 deletions
diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
index 15569369da22..3c8e2fb889a7 100644
--- a/app-misc/icdiff/Manifest
+++ b/app-misc/icdiff/Manifest
@@ -1,2 +1,2 @@
-DIST icdiff-1.7.3.tar.gz 20215 BLAKE2B 9946506e91d3d49144f2a997fcd364831b8ecc07a22cb79549a3751d53d682970ad555160959cbd58fdd4984023fe598df10926a6d4c7b72eb4c1eaa36236c41 SHA512 ae8ca394c3fdf820d4795282672bc44eb01f88f9614d6240f035c31f99130b188185a0e241c3c17974d76f604b85ef48aa8296835b5dfb46463a88cb1f68d305
-DIST icdiff-1.9.1.tar.gz 24387 BLAKE2B 482b128f03ac8af7e98db9b32ba7d9cf8bcd1a395eb50653a98ac186da26fea7933ee13f01840bb6c105e0f573a519a3e20ad83fbd8e513bfdd6c8c6d14b90c5 SHA512 f73108f6f3a4a2fc40e041bbe7b5934acd76684bb54a3fa544e9f146fd3c528528928378496f53ad92d649547ccc491a77296b6fa57e4534abb13d61c0df8d58
+DIST icdiff-2.0.6.tar.gz 39715 BLAKE2B 931799040c158c522b3788941bddaef074a5e769cc56b6d80ca9515ee0c437e0ec0b7453c7409133c5567b98e7d41355e1d9f647d1939c78d07c2bf4c010fa5e SHA512 23ed93cc68ae44e661d61cef7e489249fc39e9f8fd18cac5551e89a713aef8cd2ecb37b0f301f543a4ba7003c74b5a311430ab8666760a76ee8441a4ac920ff5
+DIST icdiff-2.0.7.tar.gz 40150 BLAKE2B 54e8528a5e0fec305787a42657dc6f54849a1732509b231ecf948856f4e681ba75654bedf7bc964d96a2b1c2e95d672c837e1ebc55c9a291f572c91600a2e4aa SHA512 0fb3a8f91120ecd5dd55254fdea0f055bc46905c3b257efcd1b8b0b47927b2b2575b7255e3e260c97b76cd2f40548c8a3653a622a7a1aaac528a4cdae64a8b16
diff --git a/app-misc/icdiff/files/icdiff-1.7.3-dont-check-changelog.patch b/app-misc/icdiff/files/icdiff-1.7.3-dont-check-changelog.patch
deleted file mode 100644
index 1a9f0c957cd5..000000000000
--- a/app-misc/icdiff/files/icdiff-1.7.3-dont-check-changelog.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/test.sh b/test.sh
-index 264c696..1bb7290 100755
---- a/test.sh
-+++ b/test.sh
-@@ -97,11 +97,6 @@ check_gold gold-67-wf.txt           tests/input-{6,7}.txt --cols=80 --whole-file
- check_gold gold-67-ln.txt           tests/input-{6,7}.txt --cols=80 --line-numbers
- check_gold gold-67-u3.txt           tests/input-{6,7}.txt --cols=80 -U 3
- 
--if [ $(./icdiff --version | awk '{print $NF}') != $(head -n 1 ChangeLog) ]; then
--  echo "Version mismatch between ChangeLog and icdiff source."
--  fail
--fi
--
- if ! $REGOLD; then
-   echo PASS
- fi
diff --git a/app-misc/icdiff/files/icdiff-1.9.5-tests.patch b/app-misc/icdiff/files/icdiff-1.9.5-tests.patch
new file mode 100644
index 000000000000..3e2467460d2c
--- /dev/null
+++ b/app-misc/icdiff/files/icdiff-1.9.5-tests.patch
@@ -0,0 +1,29 @@
+diff --git a/test.sh b/test.sh
+index fd1679e..5b756f3 100755
+--- a/test.sh
++++ b/test.sh
+@@ -86,6 +86,8 @@ function check_git_diff() {
+   local gitdiff=tests/$1
+   shift
+ 
++  # does not work with newer versions of git
++  if false; then
+   echo "    check_gitdiff $gitdiff matches git icdiff $@"
+   # Check when using icdiff in git
+   if $FIRST_TIME_CHECK_GIT_DIFF; then
+@@ -96,13 +98,14 @@ function check_git_diff() {
+     export PATH=$PATH:"$(pwd)"
+   fi
+   local tmp=/tmp/git-icdiff.output
+-  git icdiff $1 $2 &> $tmp
++  git icdiff --no-index $1 $2 &> $tmp
+   if ! diff $tmp $gitdiff; then
+     echo "Got: ($tmp)"
+     cat $tmp
+     echo "Expected: ($gitdiff)"
+     fail
+   fi
++  fi
+ }
+ 
+ check_gold gold-recursive.txt       --recursive tests/{a,b} --cols=80
diff --git a/app-misc/icdiff/files/icdiff-2.0.6-tests.patch b/app-misc/icdiff/files/icdiff-2.0.6-tests.patch
new file mode 100644
index 000000000000..d45073ebbd86
--- /dev/null
+++ b/app-misc/icdiff/files/icdiff-2.0.6-tests.patch
@@ -0,0 +1,40 @@
+diff --git a/test.sh b/test.sh
+index 317a752..10456ff 100755
+--- a/test.sh
++++ b/test.sh
+@@ -158,9 +158,9 @@ check_gold 0 gold-identical-on.txt tests/input-{1,1}.txt -s
+ check_gold 2 gold-bad-encoding.txt tests/input-{1,2}.txt --encoding=nonexistend_encoding
+ check_gold 0 gold-recursive-with-exclude.txt --recursive -x c tests/{a,b} --cols=80
+ check_gold 1 gold-recursive-with-exclude2.txt --recursive -x 'excl*' tests/test-with-exclude/{a,b} --cols=80
+-check_gold 0 gold-exit-process-sub tests/input-1.txt <(cat tests/input-1.txt) --cols=80
++check_gold 0 gold-exit-process-sub tests/input-1.txt <(cat tests/input-1.txt) --no-headers --cols=80
+ 
+-rm tests/permissions-{a,b}
++rm -f tests/permissions-{a,b}
+ touch tests/permissions-{a,b}
+ check_gold 0 gold-permissions-same.txt tests/permissions-{a,b} -P --cols=80
+ 
+@@ -173,7 +173,7 @@ check_gold 1 gold-permissions-diff-text.txt tests/permissions-{a,b} -P --cols=80
+ 
+ echo -e "\04" >> tests/permissions-b
+ check_gold 1 gold-permissions-diff-binary.txt tests/permissions-{a,b} -P --cols=80
+-rm tests/permissions-{a,b}
++rm -f tests/permissions-{a,b}
+ 
+ if git show 4e86205629 &> /dev/null; then
+   # We're in the repo, so test git.
+@@ -209,7 +209,7 @@ function ensure_installed() {
+ 
+ ensure_installed "black"
+ echo 'Running black formatter...'
+-if ! black icdiff --line-length 79 --check; then
++if ! black icdiff --quiet --line-length 79 --check; then
+   echo ""
+   echo 'Consider running `black icdiff --line-length 79`'
+   fail
+diff --git a/tests/gold-exit-process-sub b/tests/gold-exit-process-sub
+index 3885e20..e69de29 100644
+--- a/tests/gold-exit-process-sub
++++ b/tests/gold-exit-process-sub
+@@ -1 +0,0 @@
+-[0;34mtests/input-1.txt[m                       [0;34m/dev/fd/63[m                             
diff --git a/app-misc/icdiff/files/icdiff-2.0.7-tests.patch b/app-misc/icdiff/files/icdiff-2.0.7-tests.patch
new file mode 100644
index 000000000000..3ef2f83a20f6
--- /dev/null
+++ b/app-misc/icdiff/files/icdiff-2.0.7-tests.patch
@@ -0,0 +1,37 @@
+From 741d8b24bf7694d535b68fdbe23db6c33f4a5420 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 21 Aug 2023 23:52:20 +0200
+Subject: [PATCH] test.sh: Stop running flake8 and black
+
+---
+ test.sh | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/test.sh b/test.sh
+index 4fc09fb..fb22fb0 100755
+--- a/test.sh
++++ b/test.sh
+@@ -213,20 +213,6 @@ function ensure_installed() {
+   fi
+ }
+ 
+-ensure_installed "black"
+-echo 'Running black formatter...'
+-if ! black icdiff --quiet --line-length 79 --check; then
+-  echo ""
+-  echo 'Consider running `black icdiff --line-length 79`'
+-  fail
+-fi
+-
+-ensure_installed "flake8"
+-echo 'Running flake8 linter...'
+-if ! flake8 icdiff; then
+-  fail
+-fi
+-
+ if ! $REGOLD; then
+   echo PASS
+ fi
+-- 
+2.41.0
+
diff --git a/app-misc/icdiff/icdiff-1.7.3.ebuild b/app-misc/icdiff/icdiff-2.0.6.ebuild
index 8d5e2ca1bb18..1de8e780f963 100644
--- a/app-misc/icdiff/icdiff-1.7.3.ebuild
+++ b/app-misc/icdiff/icdiff-2.0.6.ebuild
@@ -1,27 +1,29 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=(python2_7 python3_5)
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="Colourized diff that supports side-by-side diffing"
 HOMEPAGE="https://www.jefftk.com/icdiff"
 SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-release-${PV}"
 
 LICENSE="PSF-2"
 SLOT="0"
 KEYWORDS="~amd64"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.7.3-dont-check-changelog.patch"
+	"${FILESDIR}/icdiff-1.9.5-tests.patch"
+	"${FILESDIR}/icdiff-2.0.6-tests.patch"
 )
 
 DOCS=(README.md ChangeLog)
 
-S="${WORKDIR}/${PN}-release-${PV}"
-
 python_test() {
-	./test.sh "${EPYTHON%.*}" || die "Tests failed"
+	bash test.sh "${EPYTHON%.*}" || die "Tests failed with ${EPYTHON}"
 }
diff --git a/app-misc/icdiff/icdiff-2.0.7-r1.ebuild b/app-misc/icdiff/icdiff-2.0.7-r1.ebuild
new file mode 100644
index 000000000000..8b8fd9dff54e
--- /dev/null
+++ b/app-misc/icdiff/icdiff-2.0.7-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Colourized diff that supports side-by-side diffing"
+HOMEPAGE="https://www.jefftk.com/icdiff"
+SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-release-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PATCHES=(
+	"${FILESDIR}/icdiff-1.9.5-tests.patch"
+	"${FILESDIR}/icdiff-2.0.7-tests.patch"
+)
+
+DOCS=( README.md ChangeLog )
+
+python_test() {
+	bash test.sh "${EPYTHON%.*}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/app-misc/icdiff/icdiff-1.9.1.ebuild b/app-misc/icdiff/icdiff-2.0.7.ebuild
index df0f0d0c61e2..730d47332909 100644
--- a/app-misc/icdiff/icdiff-1.9.1.ebuild
+++ b/app-misc/icdiff/icdiff-2.0.7.ebuild
@@ -1,23 +1,29 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="Colourized diff that supports side-by-side diffing"
 HOMEPAGE="https://www.jefftk.com/icdiff"
 SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-release-${PV}"
 
 LICENSE="PSF-2"
 SLOT="0"
 KEYWORDS="~amd64"
 
-DOCS=(README.md ChangeLog)
+PATCHES=(
+	"${FILESDIR}/icdiff-1.9.5-tests.patch"
+	"${FILESDIR}/icdiff-2.0.7-tests.patch"
+)
 
-S="${WORKDIR}/${PN}-release-${PV}"
+DOCS=(README.md ChangeLog)
 
 python_test() {
-	./test.sh "${EPYTHON%.*}" || die "Tests failed"
+	bash test.sh "${EPYTHON%.*}" || die "Tests failed with ${EPYTHON}"
 }
diff --git a/app-misc/icdiff/metadata.xml b/app-misc/icdiff/metadata.xml
index 392b1b8c731f..f3889d81bc2d 100644
--- a/app-misc/icdiff/metadata.xml
+++ b/app-misc/icdiff/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>chutzpah@gentoo.org</email>