[gentoo-commits] repo/gentoo:master commit in: app-misc/icdiff/

[Arthur Zamarin]

commit: 291c97b65696c1d889c5b4d522da03f792dabbd1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Sep 17 13:03:37 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Sep 17 13:03:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=291c97b6

app-misc/icdiff: Keyword 2.0.7-r1 arm64, #937386

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-misc/icdiff/icdiff-2.0.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/icdiff/icdiff-2.0.7-r1.ebuild 
b/app-misc/icdiff/icdiff-2.0.7-r1.ebuild
index 8b8fd9dff54e..d08f8f95a65d 100644
--- a/app-misc/icdiff/icdiff-2.0.7-r1.ebuild
+++ b/app-misc/icdiff/icdiff-2.0.7-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-release-${PV}"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 PATCHES=(
"${FILESDIR}/icdiff-1.9.5-tests.patch"

[gentoo-commits] repo/gentoo:master commit in: app-misc/icdiff/

[Michał Górny]

commit: a2ea8fc63f934755e3ee933378e7bf97df88cc41
Author: Michał Górny  gentoo  org>
AuthorDate: Mon May  1 12:31:27 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon May  1 12:31:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2ea8fc6

app-misc/icdiff: Remove old

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

 app-misc/icdiff/Manifest|  2 --
 app-misc/icdiff/icdiff-1.9.5.ebuild | 28 
 app-misc/icdiff/icdiff-2.0.5.ebuild | 28 
 3 files changed, 58 deletions(-)

diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
index 19af1998942b..3e848abd44a7 100644
--- a/app-misc/icdiff/Manifest
+++ b/app-misc/icdiff/Manifest
@@ -1,3 +1 @@
-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

diff --git a/app-misc/icdiff/icdiff-1.9.5.ebuild 
b/app-misc/icdiff/icdiff-1.9.5.ebuild
deleted file mode 100644
index 01d8bbefe04c..
--- a/app-misc/icdiff/icdiff-1.9.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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 )
-
-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"
-)
-
-DOCS=(README.md ChangeLog)
-
-python_test() {
-   bash test.sh "${EPYTHON%.*}" || die "Tests failed with ${EPYTHON}"
-}

diff --git a/app-misc/icdiff/icdiff-2.0.5.ebuild 
b/app-misc/icdiff/icdiff-2.0.5.ebuild
deleted file mode 100644
index 5c90f0bcd246..
--- a/app-misc/icdiff/icdiff-2.0.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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"
-)
-
-DOCS=(README.md ChangeLog)
-
-python_test() {
-   bash test.sh "${EPYTHON%.*}" || die "Tests failed with ${EPYTHON}"
-}

[gentoo-commits] repo/gentoo:master commit in: app-misc/icdiff/, app-misc/icdiff/files/

[Patrick McLean]

commit: e86ce217ac592d335a008684c533b3b0eff2b19f
Author: Patrick McLean  gentoo  org>
AuthorDate: Fri Apr 21 20:46:18 2023 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Fri Apr 21 20:46:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e86ce217

app-misc/icdiff: add 2.0.6

Signed-off-by: Patrick McLean  gentoo.org>

 app-misc/icdiff/Manifest   |  1 +
 app-misc/icdiff/files/icdiff-2.0.6-tests.patch | 40 ++
 app-misc/icdiff/icdiff-2.0.6.ebuild| 29 +++
 3 files changed, 70 insertions(+)

diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
index 69855a9847fb..19af1998942b 100644
--- a/app-misc/icdiff/Manifest
+++ b/app-misc/icdiff/Manifest
@@ -1,2 +1,3 @@
 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

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 ..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 ..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}"
+}

[gentoo-commits] repo/gentoo:master commit in: app-misc/icdiff/

[Patrick McLean]

commit: 22d8446a7f78e16d44117233c43d4726fdb9f065
Author: Patrick McLean  gentoo  org>
AuthorDate: Tue May 24 19:05:21 2022 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Tue May 24 19:05:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22d8446a

app-misc/icdiff: add 2.0.5

Closes: https://bugs.gentoo.org/845507
Signed-off-by: Patrick McLean  gentoo.org>

 app-misc/icdiff/Manifest|  1 +
 app-misc/icdiff/icdiff-2.0.5.ebuild | 28 
 2 files changed, 29 insertions(+)

diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
index ed442368fcd6..69855a9847fb 100644
--- a/app-misc/icdiff/Manifest
+++ b/app-misc/icdiff/Manifest
@@ -1 +1,2 @@
 DIST icdiff-1.9.5.tar.gz 31914 BLAKE2B 
8d9b9b5104c3075addae2954b41c27ccebe3b4723b0e71ef88a214d7fa0ff7d8cb9ac52cada8ddec929d308a356daf37ef4463a52667f7e229a4a33d1d993e86
 SHA512 
f4c50da1e73a1af2fd63feabfd180125637a856a8757356eb3b48bbc21871f36a2c876acd2e2ba9d354c8f6e658f6e262fbbfd65fa4078d0adebc1353d87e40a
+DIST icdiff-2.0.5.tar.gz 33806 BLAKE2B 
b8b17f72ed32923fa436713f28263bd79ac899cc291581ba4aac4bbe64daa1749e10fb63ea597be58e5557854757943aeb2c718fa972496d12c24a2071248550
 SHA512 
9ac3705ba8fbc277b9af2c47a5b791bb8ed98da0546410cafc206992e25e98cc7fba6e920d6acd1a576c609be853ad52a5680e456a9c70132c5f323fb4b6694d

diff --git a/app-misc/icdiff/icdiff-2.0.5.ebuild 
b/app-misc/icdiff/icdiff-2.0.5.ebuild
new file mode 100644
index ..b7380fdb9b62
--- /dev/null
+++ b/app-misc/icdiff/icdiff-2.0.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..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"
+)
+
+DOCS=(README.md ChangeLog)
+
+python_test() {
+   bash test.sh "${EPYTHON%.*}" || die "Tests failed with ${EPYTHON}"
+}

[gentoo-commits] repo/gentoo:master commit in: app-misc/icdiff/

[Michał Górny]

commit: ba96866d8373f7528d2ff54086b3213e0a350918
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jan  1 00:43:32 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jan  1 00:46:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba96866d

app-misc/icdiff: Remove old (py3.6)

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

 app-misc/icdiff/Manifest|  1 -
 app-misc/icdiff/icdiff-1.9.1.ebuild | 23 ---
 2 files changed, 24 deletions(-)

diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
index bbdd5ae7dfa..ed442368fcd 100644
--- a/app-misc/icdiff/Manifest
+++ b/app-misc/icdiff/Manifest
@@ -1,2 +1 @@
-DIST icdiff-1.9.1.tar.gz 24387 BLAKE2B 
482b128f03ac8af7e98db9b32ba7d9cf8bcd1a395eb50653a98ac186da26fea7933ee13f01840bb6c105e0f573a519a3e20ad83fbd8e513bfdd6c8c6d14b90c5
 SHA512 
f73108f6f3a4a2fc40e041bbe7b5934acd76684bb54a3fa544e9f146fd3c528528928378496f53ad92d649547ccc491a77296b6fa57e4534abb13d61c0df8d58
 DIST icdiff-1.9.5.tar.gz 31914 BLAKE2B 
8d9b9b5104c3075addae2954b41c27ccebe3b4723b0e71ef88a214d7fa0ff7d8cb9ac52cada8ddec929d308a356daf37ef4463a52667f7e229a4a33d1d993e86
 SHA512 
f4c50da1e73a1af2fd63feabfd180125637a856a8757356eb3b48bbc21871f36a2c876acd2e2ba9d354c8f6e658f6e262fbbfd65fa4078d0adebc1353d87e40a

diff --git a/app-misc/icdiff/icdiff-1.9.1.ebuild 
b/app-misc/icdiff/icdiff-1.9.1.ebuild
deleted file mode 100644
index 970ccd6a9fb..000
--- a/app-misc/icdiff/icdiff-1.9.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-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"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DOCS=(README.md ChangeLog)
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-python_test() {
-   ./test.sh "${EPYTHON%.*}" || die "Tests failed"
-}

[gentoo-commits] repo/gentoo:master commit in: app-misc/icdiff/files/, app-misc/icdiff/

[Patrick McLean]

commit: 936f9af6ded55fccbaa72cba829766c20853bd03
Author: Patrick McLean  sony  com>
AuthorDate: Sun May 31 19:36:50 2020 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Sun May 31 19:36:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=936f9af6

app-misc/icdiff-1.9.5: Version bump (bug #713096)

Closes: https://bugs.gentoo.org/713096
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Patrick McLean  gentoo.org>

 app-misc/icdiff/Manifest   |  1 +
 app-misc/icdiff/files/icdiff-1.9.5-tests.patch | 29 ++
 app-misc/icdiff/icdiff-1.9.5.ebuild| 28 +
 3 files changed, 58 insertions(+)

diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
index 868fbc3812a..bbdd5ae7dfa 100644
--- a/app-misc/icdiff/Manifest
+++ b/app-misc/icdiff/Manifest
@@ -1 +1,2 @@
 DIST icdiff-1.9.1.tar.gz 24387 BLAKE2B 
482b128f03ac8af7e98db9b32ba7d9cf8bcd1a395eb50653a98ac186da26fea7933ee13f01840bb6c105e0f573a519a3e20ad83fbd8e513bfdd6c8c6d14b90c5
 SHA512 
f73108f6f3a4a2fc40e041bbe7b5934acd76684bb54a3fa544e9f146fd3c528528928378496f53ad92d649547ccc491a77296b6fa57e4534abb13d61c0df8d58
+DIST icdiff-1.9.5.tar.gz 31914 BLAKE2B 
8d9b9b5104c3075addae2954b41c27ccebe3b4723b0e71ef88a214d7fa0ff7d8cb9ac52cada8ddec929d308a356daf37ef4463a52667f7e229a4a33d1d993e86
 SHA512 
f4c50da1e73a1af2fd63feabfd180125637a856a8757356eb3b48bbc21871f36a2c876acd2e2ba9d354c8f6e658f6e262fbbfd65fa4078d0adebc1353d87e40a

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 000..3e2467460d2
--- /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/icdiff-1.9.5.ebuild 
b/app-misc/icdiff/icdiff-1.9.5.ebuild
new file mode 100644
index 000..1b4fa11ae9d
--- /dev/null
+++ b/app-misc/icdiff/icdiff-1.9.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+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"
+)
+
+DOCS=(README.md ChangeLog)
+
+python_test() {
+   bash test.sh "${EPYTHON%.*}" || die "Tests failed with ${EPYTHON}"
+}

[gentoo-commits] repo/gentoo:master commit in: app-misc/icdiff/

[Michał Górny]

commit: be674499f61b10aa591f3af4bc10e24aabe46b61
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Feb 11 11:28:26 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Feb 11 11:38:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be674499

app-misc/icdiff: Remove py2

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

 app-misc/icdiff/icdiff-1.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/icdiff/icdiff-1.9.1.ebuild 
b/app-misc/icdiff/icdiff-1.9.1.ebuild
index 687c0aaf44b..970ccd6a9fb 100644
--- a/app-misc/icdiff/icdiff-1.9.1.ebuild
+++ b/app-misc/icdiff/icdiff-1.9.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 

[gentoo-commits] repo/gentoo:master commit in: app-misc/icdiff/

[Pacho Ramos]

commit: c9393fffd57a25c6eb04a2a02ddf4979c9ba9d01
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jun 27 17:21:16 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jun 27 17:49:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9393fff

app-misc/icdiff: Support python3.6

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 app-misc/icdiff/icdiff-1.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/icdiff/icdiff-1.9.1.ebuild 
b/app-misc/icdiff/icdiff-1.9.1.ebuild
index 190d11b72b6..ba4846bf442 100644
--- a/app-misc/icdiff/icdiff-1.9.1.ebuild
+++ b/app-misc/icdiff/icdiff-1.9.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python2_7 python3_4 python3_5)
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 

[gentoo-commits] repo/gentoo:master commit in: app-misc/icdiff/

[Aaron Bauman]

commit: 025e76514f54fc683fe57963584496ce4191d113
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu Apr 26 10:27:48 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu Apr 26 14:43:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=025e7651

app-misc/icdiff: use HTTPS

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

 app-misc/icdiff/icdiff-1.7.3.ebuild | 4 ++--
 app-misc/icdiff/icdiff-1.9.1.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-misc/icdiff/icdiff-1.7.3.ebuild 
b/app-misc/icdiff/icdiff-1.7.3.ebuild
index aab477b10c4..c1f6ccba26d 100644
--- a/app-misc/icdiff/icdiff-1.7.3.ebuild
+++ b/app-misc/icdiff/icdiff-1.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ PYTHON_COMPAT=(python2_7 python3_4 python3_5)
 inherit distutils-r1
 
 DESCRIPTION="Colourized diff that supports side-by-side diffing"
-HOMEPAGE="http://www.jefftk.com/icdiff";
+HOMEPAGE="https://www.jefftk.com/icdiff";
 SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="PSF-2"

diff --git a/app-misc/icdiff/icdiff-1.9.1.ebuild 
b/app-misc/icdiff/icdiff-1.9.1.ebuild
index eda476f4a61..190d11b72b6 100644
--- a/app-misc/icdiff/icdiff-1.9.1.ebuild
+++ b/app-misc/icdiff/icdiff-1.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ PYTHON_COMPAT=(python2_7 python3_4 python3_5)
 inherit distutils-r1
 
 DESCRIPTION="Colourized diff that supports side-by-side diffing"
-HOMEPAGE="http://www.jefftk.com/icdiff";
+HOMEPAGE="https://www.jefftk.com/icdiff";
 SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="PSF-2"

[gentoo-commits] repo/gentoo:master commit in: app-misc/icdiff/

[Patrick McLean]

commit: 073f42bd9abeb9d4870a74fcc612d1b3ed96dd7c
Author: Patrick McLean  gentoo  org>
AuthorDate: Fri Oct 27 21:47:45 2017 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Fri Oct 27 21:47:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=073f42bd

app-misc/icdiff: Version bump to 1.9.1 (bug #619834)

Closes: https://bugs.gentoo.org/619834
Package-Manager: Portage-2.3.12, Repoman-2.3.4

 app-misc/icdiff/Manifest|  1 +
 app-misc/icdiff/icdiff-1.9.1.ebuild | 23 +++
 2 files changed, 24 insertions(+)

diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
index 8063740b43e..b89bf875039 100644
--- a/app-misc/icdiff/Manifest
+++ b/app-misc/icdiff/Manifest
@@ -1 +1,2 @@
 DIST icdiff-1.7.3.tar.gz 20215 SHA256 
5161265f72a7c9c1d2d7b0780a381743ef3d3127944a96786422802a6bc14ca5 SHA512 
ae8ca394c3fdf820d4795282672bc44eb01f88f9614d6240f035c31f99130b188185a0e241c3c17974d76f604b85ef48aa8296835b5dfb46463a88cb1f68d305
 WHIRLPOOL 
994bbc53673db6559444908b9a08e71283060648fdbc86e607b5ee229a933d13627b4e02b7b41fc25bf41021b9d86bed4d9e1b9df978922102b724e7be0a4642
+DIST icdiff-1.9.1.tar.gz 24387 SHA256 
18cf11866150eba1ecec1370611921246918310f4b5cb101045db523a05fb37d SHA512 
f73108f6f3a4a2fc40e041bbe7b5934acd76684bb54a3fa544e9f146fd3c528528928378496f53ad92d649547ccc491a77296b6fa57e4534abb13d61c0df8d58
 WHIRLPOOL 
6599f4fb4bd399ca89510f7a1980d86cab9443e97850f9ba77f6431a74cb4cb363b2c32d6bf7e834b55bc8ac9698177c104484656c02df6ada2d3ba85ed7f8b3

diff --git a/app-misc/icdiff/icdiff-1.9.1.ebuild 
b/app-misc/icdiff/icdiff-1.9.1.ebuild
new file mode 100644
index 000..eda476f4a61
--- /dev/null
+++ b/app-misc/icdiff/icdiff-1.9.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python2_7 python3_4 python3_5)
+
+inherit distutils-r1
+
+DESCRIPTION="Colourized diff that supports side-by-side diffing"
+HOMEPAGE="http://www.jefftk.com/icdiff";
+SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=(README.md ChangeLog)
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+python_test() {
+   ./test.sh "${EPYTHON%.*}" || die "Tests failed"
+}

[gentoo-commits] repo/gentoo:master commit in: app-misc/icdiff/, app-misc/icdiff/files/

[Patrick McLean]

commit: 943afa316d2f61be563211f68c6d5ec0625debd5
Author: Patrick McLean  gentoo  org>
AuthorDate: Mon Mar 14 18:53:04 2016 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Mon Mar 14 18:53:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=943afa31

app-misc/icdiff: new package

Package-Manager: portage-2.2.28

 app-misc/icdiff/Manifest   |  1 +
 .../files/icdiff-1.7.3-dont-check-changelog.patch  | 16 +
 app-misc/icdiff/icdiff-1.7.3.ebuild| 28 ++
 app-misc/icdiff/metadata.xml   | 15 
 4 files changed, 60 insertions(+)

diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
new file mode 100644
index 000..8063740
--- /dev/null
+++ b/app-misc/icdiff/Manifest
@@ -0,0 +1 @@
+DIST icdiff-1.7.3.tar.gz 20215 SHA256 
5161265f72a7c9c1d2d7b0780a381743ef3d3127944a96786422802a6bc14ca5 SHA512 
ae8ca394c3fdf820d4795282672bc44eb01f88f9614d6240f035c31f99130b188185a0e241c3c17974d76f604b85ef48aa8296835b5dfb46463a88cb1f68d305
 WHIRLPOOL 
994bbc53673db6559444908b9a08e71283060648fdbc86e607b5ee229a933d13627b4e02b7b41fc25bf41021b9d86bed4d9e1b9df978922102b724e7be0a4642

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
new file mode 100644
index 000..1a9f0c9
--- /dev/null
+++ b/app-misc/icdiff/files/icdiff-1.7.3-dont-check-changelog.patch
@@ -0,0 +1,16 @@
+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/icdiff-1.7.3.ebuild 
b/app-misc/icdiff/icdiff-1.7.3.ebuild
new file mode 100644
index 000..5c53d1f
--- /dev/null
+++ b/app-misc/icdiff/icdiff-1.7.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=(python2_7 python3_4 python3_5)
+
+inherit distutils-r1
+
+DESCRIPTION="Colourized diff that supports side-by-side diffing"
+HOMEPAGE="http://www.jefftk.com/icdiff";
+SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-1.7.3-dont-check-changelog.patch"
+)
+
+DOCS=(README.md ChangeLog)
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+python_test() {
+   ./test.sh "${EPYTHON%.*}" || die "Tests failed"
+}

diff --git a/app-misc/icdiff/metadata.xml b/app-misc/icdiff/metadata.xml
new file mode 100644
index 000..81d6a4b
--- /dev/null
+++ b/app-misc/icdiff/metadata.xml
@@ -0,0 +1,15 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+  
+pyt...@gentoo.org
+Python
+  
+  
+chutz...@gentoo.org
+Patrick McLean
+  
+  
+jeffkaufman/icdiff
+  
+