gentoo resync : 15.01.2020

4 files changed, 3 insertions, 49 deletions

diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
index 26760c986f7e..d292475defd3 100644
--- a/app-misc/icdiff/Manifest
+++ b/app-misc/icdiff/Manifest
@@ -1,6 +1,3 @@
-AUX icdiff-1.7.3-dont-check-changelog.patch 546 BLAKE2B 28a4ea2becc7f9fb57a6bbcb648b4c61d0c0911e1df463cf1a566cee3e8916f3cc41f57fc912a05f733d0a73010b05e8d4ec6b2d0235edec4982a43ac2689225 SHA512 e3cf4f6238b3d49b6f3b1ce42a340815c535bc7482af22e722d0f5afcb0e3bbb1771b9de4a76fa77f5abe47b7b2f7c4b27e933e9e6a27d48b020975e95a7abc0
-DIST icdiff-1.7.3.tar.gz 20215 BLAKE2B 9946506e91d3d49144f2a997fcd364831b8ecc07a22cb79549a3751d53d682970ad555160959cbd58fdd4984023fe598df10926a6d4c7b72eb4c1eaa36236c41 SHA512 ae8ca394c3fdf820d4795282672bc44eb01f88f9614d6240f035c31f99130b188185a0e241c3c17974d76f604b85ef48aa8296835b5dfb46463a88cb1f68d305
 DIST icdiff-1.9.1.tar.gz 24387 BLAKE2B 482b128f03ac8af7e98db9b32ba7d9cf8bcd1a395eb50653a98ac186da26fea7933ee13f01840bb6c105e0f573a519a3e20ad83fbd8e513bfdd6c8c6d14b90c5 SHA512 f73108f6f3a4a2fc40e041bbe7b5934acd76684bb54a3fa544e9f146fd3c528528928378496f53ad92d649547ccc491a77296b6fa57e4534abb13d61c0df8d58
-EBUILD icdiff-1.7.3.ebuild 611 BLAKE2B 8302be0e057cb611b6c5fc2805c2df0c93039bd5dc307278731aa06f085edd946ab1e40370343972e1668639e8fc18ae9b2308f7d7418e61e0265bfbfd568ea2 SHA512 89a72c65a2996ca15cea189d99f3e436359d6df13421e2ff84ae7e63704d12b6b5212f8801d802f03ba3b79b34ea9611b53d51bfc19707521f85c5e02f3d98a6
-EBUILD icdiff-1.9.1.ebuild 550 BLAKE2B 1f1a425779601dd9bd462d1aa6f4925ce7d02dabbcaf09a49f0dc961cdad253162e3c2ffcda47ed2eb80a4471a98ce48418055e96243995232b09fe833923ae1 SHA512 fd66e8d60c29b48e59ebb79dca52647366dab6d80be078e4edc4107ed1c957bbef6a6fc85a85c62b7212a67bd41298237355fe27c0353ce4ca194c9de2580ff1
+EBUILD icdiff-1.9.1.ebuild 546 BLAKE2B 98b7efcb1aa7410ca384ff85c4a4cbcdbd495d261a7682ccdc5b5da23b54ba4b6e1ab2b0c1bbf7056d18ae18ac7c82956d3ae5e9cf476413fce7608266f0fafd SHA512 0b79e2ad90ffbc085711b328d2c7b14a703ebff4272cd54dc91e3f5dff4fedf449a803dbfb4bd3da814395e0ab8cd4b5198c804a66d092bb4239bc4f3bb1ec51
 MISC metadata.xml 342 BLAKE2B f87cbd730938f6bdefcadea3d8c3d0635466b3e25597d1a5b8e7c85b6c8855698a19b29049c5b6e596696d15a91481527d16f83adc5c7ffaad39937d7bb9b951 SHA512 a897866e5d709999db69d3b1a4c8d1d1b15328970b27015f7549cf7b4fc6be688063f94fe31b0144227318c252e80bfd189fdf9f34dfdbf4dbfe0412e0b818ed
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/icdiff-1.7.3.ebuild b/app-misc/icdiff/icdiff-1.7.3.ebuild
deleted file mode 100644
index 8d5e2ca1bb18..000000000000
--- a/app-misc/icdiff/icdiff-1.7.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python2_7 python3_5)
-
-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"
-
-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/icdiff-1.9.1.ebuild b/app-misc/icdiff/icdiff-1.9.1.ebuild
index df0f0d0c61e2..687c0aaf44b5 100644
--- a/app-misc/icdiff/icdiff-1.9.1.ebuild
+++ b/app-misc/icdiff/icdiff-1.9.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1