gentoo auto-resync : 22:04:2023 - 00:03:23

3 files changed, 72 insertions, 0 deletions

diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
index 22fbecb1e6f6..90a5a53e089c 100644
--- a/app-misc/icdiff/Manifest
+++ b/app-misc/icdiff/Manifest
@@ -1,6 +1,9 @@
 AUX icdiff-1.9.5-tests.patch 761 BLAKE2B a1e837489ea14ea0a2ee88dd23294bf9dc6368fa052b5bf888ca1a37401903717792651833e751a8711c8b865ce4a038615ad4c23f91586af6b46511d28dfb52 SHA512 c1587ce221b7c1e9191b429c1b16c84bdc698e889e5f3c0ce722442adcdb836f2b7f38c193163ba5bc210ef31da4a3e3afd90ae44d3ad285ebe563993125f8cb
+AUX icdiff-2.0.6-tests.patch 1765 BLAKE2B e088a9d704ae90e12df17a35a6fbb2f65a55988348d69901f7817f8498e556a6e3d330f933a418b13ca70306908eafbf46cb24f812732a32e525b1b8b838b54a SHA512 c19f6593bc09929bcb6157198ecb5911f9af9a3b8e5812c46133a9fce8f2d1d436378b6eb5b01629bf30fac1e0049f60914a51ab243d92cf34571b0468bebb2b
 DIST icdiff-1.9.5.tar.gz 31914 BLAKE2B 8d9b9b5104c3075addae2954b41c27ccebe3b4723b0e71ef88a214d7fa0ff7d8cb9ac52cada8ddec929d308a356daf37ef4463a52667f7e229a4a33d1d993e86 SHA512 f4c50da1e73a1af2fd63feabfd180125637a856a8757356eb3b48bbc21871f36a2c876acd2e2ba9d354c8f6e658f6e262fbbfd65fa4078d0adebc1353d87e40a
 DIST icdiff-2.0.5.tar.gz 33806 BLAKE2B b8b17f72ed32923fa436713f28263bd79ac899cc291581ba4aac4bbe64daa1749e10fb63ea597be58e5557854757943aeb2c718fa972496d12c24a2071248550 SHA512 9ac3705ba8fbc277b9af2c47a5b791bb8ed98da0546410cafc206992e25e98cc7fba6e920d6acd1a576c609be853ad52a5680e456a9c70132c5f323fb4b6694d
+DIST icdiff-2.0.6.tar.gz 39715 BLAKE2B 931799040c158c522b3788941bddaef074a5e769cc56b6d80ca9515ee0c437e0ec0b7453c7409133c5567b98e7d41355e1d9f647d1939c78d07c2bf4c010fa5e SHA512 23ed93cc68ae44e661d61cef7e489249fc39e9f8fd18cac5551e89a713aef8cd2ecb37b0f301f543a4ba7003c74b5a311430ab8666760a76ee8441a4ac920ff5
 EBUILD icdiff-1.9.5.ebuild 641 BLAKE2B 756d24a0f8275353841d2bb88619c70f5cf229a780bda4b9ba73a650f522f801cfc61acb69b80e3d8272cf9e7fdb9a54ea0cf5cef7082d5885ea3af92ad51486 SHA512 db877bdc114f54534f8ba3aff779db45a1a448ae549a261087be955c07cd4712913bf187812e09d872949bad91819dba39c1977d847f622f4b32e9fe428c64e1
 EBUILD icdiff-2.0.5.ebuild 653 BLAKE2B 098de61b8c2acc9b7e02ed4124fa49675a37ae8f747fd95e5bb4f1774684c7314686fccab4e5fd619238e824e49e828b558ec48ec6c2605e35b955bf773429a5 SHA512 5ade4fbd817a91eefb5d54c64da3dc1167cda9ced62308b4561ec0bbc888ad2ed085377d3a69ec40f4f980ef447f8434d99fcdb99bb77039a2220679673d0446
+EBUILD icdiff-2.0.6.ebuild 693 BLAKE2B 5507251e7bf057fd9342fd201a0b3697727347d705b53033ea0fe17ecffaa856126cc2c71d1016cfa67eeca6392ed0d26009047089de5ee5a83ed9025e6c83a5 SHA512 2de660d451e75f7a652ab2712e05d731b0a4661756669cd18aa9000fa64d705f018a9b9c14a51b12ee9d805e204d895342fad406b7318517aac36cc39ef4347a
 MISC metadata.xml 343 BLAKE2B a9942d59eb56cb6389a59b3d5c2995a5131f53cfe82ceabd2b608a57e9110066977b5eb1c7413f2a76a147c64a7580a4b75c76b2f03abd43d667b5a1d6aa8a23 SHA512 9b0da11632fa80fb598a5fe673cb15bdf3612ad9bd5cf84d9f5e2aa7217cd133039db509daabd6d98fac202c453b82ba40bd927401a346cf4c6039c47b45e697
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/icdiff-2.0.6.ebuild b/app-misc/icdiff/icdiff-2.0.6.ebuild
new file mode 100644
index 000000000000..1de8e780f963
--- /dev/null
+++ b/app-misc/icdiff/icdiff-2.0.6.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.6-tests.patch"
+)
+
+DOCS=(README.md ChangeLog)
+
+python_test() {
+	bash test.sh "${EPYTHON%.*}" || die "Tests failed with ${EPYTHON}"
+}