gentoo auto-resync : 22:08:2023 - 03:45:27

3 files changed, 69 insertions, 0 deletions

diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
index 5e9e7fbbe049..38fb8cb68027 100644
--- a/app-misc/icdiff/Manifest
+++ b/app-misc/icdiff/Manifest
@@ -1,5 +1,8 @@
 AUX icdiff-1.9.5-tests.patch 761 BLAKE2B a1e837489ea14ea0a2ee88dd23294bf9dc6368fa052b5bf888ca1a37401903717792651833e751a8711c8b865ce4a038615ad4c23f91586af6b46511d28dfb52 SHA512 c1587ce221b7c1e9191b429c1b16c84bdc698e889e5f3c0ce722442adcdb836f2b7f38c193163ba5bc210ef31da4a3e3afd90ae44d3ad285ebe563993125f8cb
 AUX icdiff-2.0.6-tests.patch 1765 BLAKE2B e088a9d704ae90e12df17a35a6fbb2f65a55988348d69901f7817f8498e556a6e3d330f933a418b13ca70306908eafbf46cb24f812732a32e525b1b8b838b54a SHA512 c19f6593bc09929bcb6157198ecb5911f9af9a3b8e5812c46133a9fce8f2d1d436378b6eb5b01629bf30fac1e0049f60914a51ab243d92cf34571b0468bebb2b
+AUX icdiff-2.0.7-tests.patch 784 BLAKE2B e9551960101822173623eb411d67116d6691ceee687d102247ef01e960af4a5d66197edc91eec47828618cab65c0575886dd32be81f886548c68f87fd6f99ea2 SHA512 9c402168c6e87fa68eaa0bfdc7476fb42ea2e66488dd05bbe59713acba43d62db7639b3c831d4d34195091ee4b3720bf5418e8903b53d3da0991231f7b5191c4
 DIST icdiff-2.0.6.tar.gz 39715 BLAKE2B 931799040c158c522b3788941bddaef074a5e769cc56b6d80ca9515ee0c437e0ec0b7453c7409133c5567b98e7d41355e1d9f647d1939c78d07c2bf4c010fa5e SHA512 23ed93cc68ae44e661d61cef7e489249fc39e9f8fd18cac5551e89a713aef8cd2ecb37b0f301f543a4ba7003c74b5a311430ab8666760a76ee8441a4ac920ff5
+DIST icdiff-2.0.7.tar.gz 40150 BLAKE2B 54e8528a5e0fec305787a42657dc6f54849a1732509b231ecf948856f4e681ba75654bedf7bc964d96a2b1c2e95d672c837e1ebc55c9a291f572c91600a2e4aa SHA512 0fb3a8f91120ecd5dd55254fdea0f055bc46905c3b257efcd1b8b0b47927b2b2575b7255e3e260c97b76cd2f40548c8a3653a622a7a1aaac528a4cdae64a8b16
 EBUILD icdiff-2.0.6.ebuild 693 BLAKE2B 5507251e7bf057fd9342fd201a0b3697727347d705b53033ea0fe17ecffaa856126cc2c71d1016cfa67eeca6392ed0d26009047089de5ee5a83ed9025e6c83a5 SHA512 2de660d451e75f7a652ab2712e05d731b0a4661756669cd18aa9000fa64d705f018a9b9c14a51b12ee9d805e204d895342fad406b7318517aac36cc39ef4347a
+EBUILD icdiff-2.0.7.ebuild 693 BLAKE2B dcbdc93344a504bab496fc4def39d5525f7d435ce02e47f231bf0a30c1d1db3bd9c4bb3e33f31856ddb7234d6b30b20168239070752b17c25633c969f02f007b SHA512 eee62adb2eceb2a0de770c0c82a573b05e267d89064962fae2e4236d663f62f0cbab74d2ea9cc5a13f7ccbf40315049f2200cb6ed3d3a1b543c50c3843109085
 MISC metadata.xml 343 BLAKE2B a9942d59eb56cb6389a59b3d5c2995a5131f53cfe82ceabd2b608a57e9110066977b5eb1c7413f2a76a147c64a7580a4b75c76b2f03abd43d667b5a1d6aa8a23 SHA512 9b0da11632fa80fb598a5fe673cb15bdf3612ad9bd5cf84d9f5e2aa7217cd133039db509daabd6d98fac202c453b82ba40bd927401a346cf4c6039c47b45e697
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-2.0.7.ebuild b/app-misc/icdiff/icdiff-2.0.7.ebuild
new file mode 100644
index 000000000000..730d47332909
--- /dev/null
+++ b/app-misc/icdiff/icdiff-2.0.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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}/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}"
+}