gentoo resync : 16.01.2021

3 files changed, 27 insertions, 29 deletions

diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index e0b0c34238c5..92542640750a 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,7 +1,7 @@
-DIST diffoscope-190.tar.gz 2704083 BLAKE2B a2a0313f87fdb9c20b0dc696a1aea570857dd7005e0f69dc2dd139bca86a4b5711f98862b60f4d1a581bf3e0dfd38ef3be96991b96862584f289f1eb80415480 SHA512 646380d52730cf2efef57e3fa2995c7b2d5958d75597a59a24027bca1fc35c5b59dd96352faac9b7bd1d5bc053064f11760877651d52099f6b1ca0b3ad65d63c
 DIST diffoscope-197.tar.gz 2705041 BLAKE2B 1d66462d3f1cdbba177d24d194ce14ae51274c6b60139e56724213a6b4fc0b41e6a71f9f2e250ecc7d6330186bf774470b2153801b375ffb63e8390c425e1073 SHA512 d8411ad166738b29caa28abbc10f21e0906b7b19bd5ab644db36c04b1f9c5af9f4cbdb31eb850da7249380a6774bde355f0e815f4d3cdd0df76570df9df7fd0a
-DIST diffoscope-198.tar.gz 2705246 BLAKE2B c0a10fb81f320825e3112104c06adf3861b310c56fd355b6ab533b818a210b56881d7978644496ffd1f787ff98c92c851c8b21493e9c3b4897bb73c8a0c728d4 SHA512 b8620600bba8691650768879a248b10f8417c0aaa12c4f59063eb77210dc93b91a9e8b9f83bbe915932cbbb1f45ea6b8c49cb5ac62622a114fe9a411a6384277
-EBUILD diffoscope-190.ebuild 3291 BLAKE2B bc2d73c19425cb02d4594514f9ae8c53e5bf5304360cd82b9bfc338ce914d81e41f6bde68b2aa9c3137a0de1dbb6c15a0992d2808bd97b5a28189d8818bab362 SHA512 bb63244ba0a19fe88ded3a684bf3cf78f7b6519c6708f073b7d1fec1f12373beffd7398066f6f95978dfd25783e1e87fff49dab97202bbd4beef10be7568859e
+DIST diffoscope-199.tar.gz 2705444 BLAKE2B c17752a504cef75d1a9d6f1c0dfdb896abd1ce7dfd5a2494022d4a7b9e098822db80b52e3cd0d4367e28bcc9ad6316746d10cd82df2ac7c24c19d74b3ea0de5d SHA512 e4caa9d5d8d7f1671acecf2f6240cd587bbfd4087eb6e69021303ec3e7bfde15fbd409139b7658eeed64d75f05b3768f1a585640fcfee6bae63ff7d27227e4d0
+DIST diffoscope-200.tar.gz 2705536 BLAKE2B c931430a7e8159f135446709866106e4646b087c30d9d3cdf82810e8ac9273075af80d67f19858b71656d73c078478f96083c6d784a7e1bf8af5d620765cde78 SHA512 74317603e8416e2decea4d6fae9c16a5a931986a6fb8660c518e1363f99cbb523d69316be6b19f0a6168622780f4642bd901f376c3d38cfd1a600d9ac1ce1fbb
 EBUILD diffoscope-197.ebuild 3271 BLAKE2B ade3cf501f71ee523ed95a2f10f71753989edc12d8107320f389f6b05b4733c0dc7e6e886c19bd1682273f3cd5e115d770b8b06ae20e02bb096c14048bbe7a3b SHA512 cad1ff3dda20a61954833f6219ab695387cde56425009b2c781cab88950cb9f3752cbfa8e24914ad05fe3916d3b5299bb254c06cab8044d5d05abe30ac58fbe4
-EBUILD diffoscope-198.ebuild 3268 BLAKE2B 62547024451bbe8e19d6eefd8ad5ddb46a425223e51e7246c3e68f61558c33799b1ae2bb79b4c57fa6e689f96968f4d85ad63259364f0f22d113a9bd344d2ede SHA512 05c07ccfd94eb1315bf1aac9675eb352e6ed6dce9e09a91f8e67b6a1e9282ca90e331e8da7b97bfdf25168a4068b55775db3c2b88989dbefb5c1bab21bacf2f2
+EBUILD diffoscope-199.ebuild 3268 BLAKE2B 62547024451bbe8e19d6eefd8ad5ddb46a425223e51e7246c3e68f61558c33799b1ae2bb79b4c57fa6e689f96968f4d85ad63259364f0f22d113a9bd344d2ede SHA512 05c07ccfd94eb1315bf1aac9675eb352e6ed6dce9e09a91f8e67b6a1e9282ca90e331e8da7b97bfdf25168a4068b55775db3c2b88989dbefb5c1bab21bacf2f2
+EBUILD diffoscope-200.ebuild 3268 BLAKE2B 62547024451bbe8e19d6eefd8ad5ddb46a425223e51e7246c3e68f61558c33799b1ae2bb79b4c57fa6e689f96968f4d85ad63259364f0f22d113a9bd344d2ede SHA512 05c07ccfd94eb1315bf1aac9675eb352e6ed6dce9e09a91f8e67b6a1e9282ca90e331e8da7b97bfdf25168a4068b55775db3c2b88989dbefb5c1bab21bacf2f2
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-198.ebuild b/dev-util/diffoscope/diffoscope-199.ebuild
index ec72907f21dc..ec72907f21dc 100644
--- a/dev-util/diffoscope/diffoscope-198.ebuild
+++ b/dev-util/diffoscope/diffoscope-199.ebuild
diff --git a/dev-util/diffoscope/diffoscope-190.ebuild b/dev-util/diffoscope/diffoscope-200.ebuild
index 405700c77a18..ec72907f21dc 100644
--- a/dev-util/diffoscope/diffoscope-190.ebuild
+++ b/dev-util/diffoscope/diffoscope-200.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
 find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
 mono opendocument pascal pdf postscript R rpm sqlite squashfs
@@ -80,31 +80,29 @@ RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
 # of dev-python/python-magic: https://bugs.gentoo.org/716482
 RDEPEND+=" !dev-python/filemagic"
 
-distutils_enable_tests pytest
+EPYTEST_DESELECT=(
+	# Test seems to use different tarball
+	tests/test_presenters.py::test_text_proper_indentation
 
-python_test() {
-	local exclude=(
-		# test seems to use different tarball
-		tests/test_presenters.py::test_text_proper_indentation
+	# Needs triage
+	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
+	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
 
-		# needs triage
-		tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
+	# img2txt based failures, bug #797688
+	tests/comparators/test_ico_image.py::test_diff
+	tests/comparators/test_ico_image.py::test_diff_meta
+	tests/comparators/test_ico_image.py::test_diff_meta2
+	tests/comparators/test_ico_image.py::test_has_visuals
+	tests/comparators/test_jpeg_image.py::test_diff
+	tests/comparators/test_jpeg_image.py::test_compare_non_existing
+	tests/comparators/test_jpeg_image.py::test_diff_meta
+	tests/comparators/test_jpeg_image.py::test_has_visuals
 
-		# needs triage
-		tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
+	# docx2txt based falures, bug #797688
+	tests/comparators/test_docx.py::test_diff
 
-		# img2txt based failures, bug #797688
-		tests/comparators/test_ico_image.py::test_diff
-		tests/comparators/test_ico_image.py::test_diff_meta
-		tests/comparators/test_ico_image.py::test_diff_meta2
-		tests/comparators/test_ico_image.py::test_has_visuals
-		tests/comparators/test_jpeg_image.py::test_diff
-		tests/comparators/test_jpeg_image.py::test_compare_non_existing
-		tests/comparators/test_jpeg_image.py::test_diff_meta
-		tests/comparators/test_jpeg_image.py::test_has_visuals
+	# Formatting
+	tests/test_source.py::test_code_is_black_clean
+)
 
-		# docx2txt based falures, bug #797688
-		tests/comparators/test_docx.py::test_diff
-	)
-	epytest ${exclude[@]/#/--deselect }
-}
+distutils_enable_tests pytest