4 files changed, 106 insertions, 16 deletions

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 @@
+-tests/input-1.txt                       /dev/fd/63                             
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
+