gentoo resync : 05.12.2021

6 files changed, 2 insertions, 449 deletions

diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index e971a478b72d..7cab5f6c430b 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,13 +1,5 @@
-DIST diffoscope-180.tar.gz 1600542 BLAKE2B 0cc34106f039e0682b32de284b3ce1be90e8629fb4ba18cffa31d7c970a9d18392060f37b201d4ee9ab3f4f65401684c72edf2d00d56827cbaacbfde0ce81d11 SHA512 abf2c514b9f3b074a5b9a6e19f09a474a8ba58e00974a48ebd860cc31547204fb4690224cb752b4248a0674d979bd20c6d4c77ffb912f2b85499d48d90affeb4
-DIST diffoscope-186.tar.gz 2685030 BLAKE2B b9fcb05fbdd939ece3727f232777c56119aa5df837699dcdc752a816bb656aa09c4cce99e225425e09d55914523a6456587bf232877fa22924c623f854016712 SHA512 13d42ba600cc9c5e716162a73f42d8453358f689f4148b138121e1f2190b1334a66a01fd0e227bc9e7190d3229c286be91d6ccbdd21c13694fc2edab8e5019cd
-DIST diffoscope-187.tar.gz 2699208 BLAKE2B 193eb0575814df7ee1d0a0e989a936782a52d4c8dc3e56d47db7ff5d631776559a604755e1d1be6687c1168ef7bb9d899f3b5ea8cab9506ef5b2da195485d7e0 SHA512 b3ba6743c9c4e0460f56a0830801f72e00bf7500c54dd9392e6e1de470a3b7348d900a8b9012f17b509abbc59575c7b9ee8e1048b3b23e5813a5ddabeadb1be4
-DIST diffoscope-188.tar.gz 2703049 BLAKE2B 2d517a6067a70221a34545456e23eefb42b5dbae1daa3459366ad429446844d64714ab5d229cd909de533b8994e870d16314282454ce2ebbf3408685e6b94f5f SHA512 b2c17bd577d5450439d2871f027f675f4e5bbfdc26e0f18bbe3579f214b023e1610a2095aec4b9d91c52e4a4c3e5fb226209e8f1c643b1c82ec190124d5d47d5
-DIST diffoscope-189.tar.gz 2703482 BLAKE2B 9c3a86b71d02c456b72955ddc2c9df580c60c898b00cdebaeea369065536b531fd93cbc12f25d9d94ca6bf1cb11bf90f28e6c77f3573a623b35174e59466778d SHA512 4c9a8c909cc18fa524be3979e211420b1240b7336a5895ec7e8682786e01952c6ae2ed494796aa08cdff2b21d13a55c4f47cb8e947743407e38790e8b40fb04c
 DIST diffoscope-190.tar.gz 2704083 BLAKE2B a2a0313f87fdb9c20b0dc696a1aea570857dd7005e0f69dc2dd139bca86a4b5711f98862b60f4d1a581bf3e0dfd38ef3be96991b96862584f289f1eb80415480 SHA512 646380d52730cf2efef57e3fa2995c7b2d5958d75597a59a24027bca1fc35c5b59dd96352faac9b7bd1d5bc053064f11760877651d52099f6b1ca0b3ad65d63c
-EBUILD diffoscope-180.ebuild 3300 BLAKE2B 772740c2ff3ace8fe0d25181eacd6b5dd6e5a10c19d450a95771cc1f7d93b8c4427d3d683d3a92a62db593a011d3788a9f8e14a782391352d06b689a7d7eb086 SHA512 c7a2f2a21037214cb024524966ac0e30fb21297e12ef93fa440a69d86a931f9f8272340e4861ec5cbbabc3b1178724299d5870cf9e2668161ddffd37bd217036
-EBUILD diffoscope-186.ebuild 3257 BLAKE2B d555e26e75a60536d7f029202cfd37da1748a6a6c54c7413a2f6cfbead22073d15c4b121009e17f981ab714418dc1c48004ebb7f6124f640aff26e659345be13 SHA512 3a7755c5559b806d70e5c89e356ea2515ea517c22a7bfe5d681799b9445002bc22a3fc66b488db00210a7fc6c372776be95a8546757dc8453d00b9005d86ad27
-EBUILD diffoscope-187.ebuild 3259 BLAKE2B c37f83432809a3f68eadd09f916a8f89602555600f2139f56bb0d20cee66b4823b4ab53b3b23d57423bab6ff07453eaaf99d70a4277f445b83f6e13a8a50caeb SHA512 d880e78e3dd9619cb8b1f614a1ed0163bef10489707468f5223e9c89517a18862a9f08c8dfb00ffd4fca170db492d1ae43448a26aaab72347b451dcb1ac172fc
-EBUILD diffoscope-188.ebuild 3259 BLAKE2B c37f83432809a3f68eadd09f916a8f89602555600f2139f56bb0d20cee66b4823b4ab53b3b23d57423bab6ff07453eaaf99d70a4277f445b83f6e13a8a50caeb SHA512 d880e78e3dd9619cb8b1f614a1ed0163bef10489707468f5223e9c89517a18862a9f08c8dfb00ffd4fca170db492d1ae43448a26aaab72347b451dcb1ac172fc
-EBUILD diffoscope-189.ebuild 3293 BLAKE2B 26e073fdc8f3fd5d40e8794f6fcba5abf8498652e0a2cf8b15dbe7fb8e1eae67cf6b290233e45ce3af43ae1a9ecb3ccc0afe1166db7a0bd0b428d922dbf6973e SHA512 c11b5e22b64c95763995798f7b153d34c1d866982d82f9dd6b4cc61899e44217d83c2ce9e60a7638fdd8b3d6b7317b535a0b768806fc014d74e427b3c5141db1
+DIST diffoscope-194.tar.gz 2704634 BLAKE2B ca080f07ab23d48cd772302f47fff67c38ca3106d2fd96de37b9112aa316ec095acb07062316abf60ac3457de99b6e3f69adef166ab4b24943dff9e8a127f99f SHA512 cfdd30ea12326ca08f200a78fd77b5b681bbe31cd292fa22fcab294a64717a06f431bcc8c3def7c75f9fb554108e48b8043bc3901d5e57a2be3cc38d20a303e5
 EBUILD diffoscope-190.ebuild 3291 BLAKE2B bc2d73c19425cb02d4594514f9ae8c53e5bf5304360cd82b9bfc338ce914d81e41f6bde68b2aa9c3137a0de1dbb6c15a0992d2808bd97b5a28189d8818bab362 SHA512 bb63244ba0a19fe88ded3a684bf3cf78f7b6519c6708f073b7d1fec1f12373beffd7398066f6f95978dfd25783e1e87fff49dab97202bbd4beef10be7568859e
+EBUILD diffoscope-194.ebuild 3293 BLAKE2B 26e073fdc8f3fd5d40e8794f6fcba5abf8498652e0a2cf8b15dbe7fb8e1eae67cf6b290233e45ce3af43ae1a9ecb3ccc0afe1166db7a0bd0b428d922dbf6973e SHA512 c11b5e22b64c95763995798f7b153d34c1d866982d82f9dd6b4cc61899e44217d83c2ce9e60a7638fdd8b3d6b7317b535a0b768806fc014d74e427b3c5141db1
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-180.ebuild b/dev-util/diffoscope/diffoscope-180.ebuild
deleted file mode 100644
index d09677ec2c10..000000000000
--- a/dev-util/diffoscope/diffoscope-180.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-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
-ssh tar test tcpdump zip zlib zstd"
-
-RESTRICT="!test? ( test )"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		app-text/docx2txt
-		media-libs/libcaca
-	)
-"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	lzma? ( app-arch/xz-utils )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	zip? ( app-arch/unzip )
-	zlib? ( app-arch/gzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
-
-distutils_enable_tests pytest
-
-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
-
-		# needs triage
-		tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
-
-		# 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
-
-		# docx2txt based falures, bug #797688
-		tests/comparators/test_docx.py::test_diff
-	)
-	epytest ${exclude[@]/#/--deselect }
-}
diff --git a/dev-util/diffoscope/diffoscope-186.ebuild b/dev-util/diffoscope/diffoscope-186.ebuild
deleted file mode 100644
index 268a539b1b50..000000000000
--- a/dev-util/diffoscope/diffoscope-186.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-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
-ssh tar test tcpdump zip zlib zstd"
-
-RESTRICT="!test? ( test )"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-BDEPEND="test? (
-		app-text/docx2txt
-		media-libs/libcaca
-	)"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	lzma? ( app-arch/xz-utils )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	zip? ( app-arch/unzip )
-	zlib? ( app-arch/gzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
-
-distutils_enable_tests pytest
-
-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
-
-		# needs triage
-		tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
-
-		# 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
-
-		# docx2txt based falures, bug #797688
-		tests/comparators/test_docx.py::test_diff
-	)
-	epytest ${exclude[@]/#/--deselect }
-}
diff --git a/dev-util/diffoscope/diffoscope-187.ebuild b/dev-util/diffoscope/diffoscope-187.ebuild
deleted file mode 100644
index de3d809fe6a8..000000000000
--- a/dev-util/diffoscope/diffoscope-187.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-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
-ssh tar test tcpdump zip zlib zstd"
-
-RESTRICT="!test? ( test )"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-BDEPEND="test? (
-		app-text/docx2txt
-		media-libs/libcaca
-	)"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	lzma? ( app-arch/xz-utils )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	zip? ( app-arch/unzip )
-	zlib? ( app-arch/gzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
-
-distutils_enable_tests pytest
-
-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
-
-		# needs triage
-		tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
-
-		# 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
-
-		# docx2txt based falures, bug #797688
-		tests/comparators/test_docx.py::test_diff
-	)
-	epytest ${exclude[@]/#/--deselect }
-}
diff --git a/dev-util/diffoscope/diffoscope-188.ebuild b/dev-util/diffoscope/diffoscope-188.ebuild
deleted file mode 100644
index de3d809fe6a8..000000000000
--- a/dev-util/diffoscope/diffoscope-188.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-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
-ssh tar test tcpdump zip zlib zstd"
-
-RESTRICT="!test? ( test )"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-BDEPEND="test? (
-		app-text/docx2txt
-		media-libs/libcaca
-	)"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	lzma? ( app-arch/xz-utils )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	zip? ( app-arch/unzip )
-	zlib? ( app-arch/gzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
-
-distutils_enable_tests pytest
-
-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
-
-		# needs triage
-		tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
-
-		# 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
-
-		# docx2txt based falures, bug #797688
-		tests/comparators/test_docx.py::test_diff
-	)
-	epytest ${exclude[@]/#/--deselect }
-}
diff --git a/dev-util/diffoscope/diffoscope-189.ebuild b/dev-util/diffoscope/diffoscope-194.ebuild
index bd59e85cceb9..bd59e85cceb9 100644
--- a/dev-util/diffoscope/diffoscope-189.ebuild
+++ b/dev-util/diffoscope/diffoscope-194.ebuild