gentoo resync : 09.07.2022

4 files changed, 2 insertions, 222 deletions

diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 91a00a67f908..3947acf2a81a 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,8 +1,5 @@
-DIST diffoscope-207.tar.gz 2707223 BLAKE2B e20f21c9e0acc78cadfce082f874b3e3cbbbd26cfa5041012eb07a347f177724506d1263b6636c71c5304993e52b81e8ac1fa82ee7231d892346ede2d00de37f SHA512 ebbcf3e7e41f042626f2d175cea027392fc52f65dd11ded8e2a65ed3d58129fe4948e6129c2aec74d58d8f6b58855ada23be8231b426a9473b165eba0f182955
 DIST diffoscope-214.tar.gz 2710707 BLAKE2B 6acd7fa9c69ad831c6d362b805c2094b2f55d57fa87f69e9e153a99a71c90a67884796696df0d24d6b3c94c0b9a41736292d44208f4d8de4262eaa5f2eec6c90 SHA512 67a9b68ce5f7934747e30e41506d7e30f018673314b777ab86af89e3dd56212c442abe6e246741f7b842b5c58f14006442167cf9089823ba4ef1ba07e78eaaa7
-DIST diffoscope-216.tar.gz 2711117 BLAKE2B d4818fc89a511c2387c486a38df0b925a78b4676c0351c2cb3d81ee91856bb48a396e4f09d70d3ec7a67a302f11f94977f015fcf71d2865caea95f01aa80a23f SHA512 ba8ee78516770b623756dea8c48999cc1e4c731a0ac16a4ad38ed2d534ff867534bb31162c10664eda07ab22332e4dae5438a7d33de69c63c2cf25ba7c34a6be
-EBUILD diffoscope-207.ebuild 3297 BLAKE2B 38b17dc44cf8feccd717f69ae028dbada341c4b0dae653cc00fa4032da7c26a9d9026b5d8d29f6dc6f4cda42ee66ffb0d25f63c6dc253dbd0320e1848d01dfc7 SHA512 b97eb645cf2fcd16d472c265913373247d1b923586955860008ce2325369d10b6616704b88001e6260dc39bf409f2d4b5645ee4efec9c9e81f59731cce67ed74
-EBUILD diffoscope-214-r1.ebuild 3314 BLAKE2B 4249250c8390bc42972a495b2df794abf1818873c7223153758995e56d151e8cd901832f6c755e8f3e5f89663e1ccb4a8f417fb3b9f45e462cf98bc958775367 SHA512 2e53328aae5099f552df69f22bfd458109a3668885feeab4022effdf02686d001140006aa556e5b49f1e7080fe8bf91155d8fb6741c3d484992331d5d6c0432f
+DIST diffoscope-217.tar.gz 2711094 BLAKE2B 93bb0f5e7967337a3b5f8a951f8d1bdbb6583b33d0a676fbad8ef7102f920ca9efa653a7a563adba7f151641fddc8b0271a8fe7377df000f6873f319959bad92 SHA512 5b55b04abad2c8bef71125eb4266b6f397fa61d6369a0ab83d15d948c3e558f39a10f4378e7a8e461a56dc1b0a442ef72790012f4ce9d6c5b5f179002143158a
 EBUILD diffoscope-214.ebuild 3296 BLAKE2B 0d6f5c5ffa8be6470d622af2cf72181d283ece6bad089459d6ca12847df804b1174e104d74d39c447e632c6be4c182b56de8fb484c41e6afad9cbd0991ea98b9 SHA512 b8d9e8d6fdc0ab77d79d5f78a3718a6cf90c23afda16a37cad7fb70209f936eca1236f7b3058c89d14e36c1ffe645a81cc08963b2c25ec4c78b39320af30db37
-EBUILD diffoscope-216.ebuild 3326 BLAKE2B ef5314ab8e78b5e93dbdd56dae8bb48df59eeefc8d42d918c29ff87189ee5fe2df07879b2abe04893557265417050c39e68b265fd9c21ecc7e546ab4b15fe21b SHA512 3a73dec69cdef67b5cf7439f5263158c37e5a868376c185da25a447305a25da3b992ad2c0f81469ca5e4a182f85c709a5fd899a84162dd55e7154e948d15ee84
+EBUILD diffoscope-217.ebuild 3326 BLAKE2B ef5314ab8e78b5e93dbdd56dae8bb48df59eeefc8d42d918c29ff87189ee5fe2df07879b2abe04893557265417050c39e68b265fd9c21ecc7e546ab4b15fe21b SHA512 3a73dec69cdef67b5cf7439f5263158c37e5a868376c185da25a447305a25da3b992ad2c0f81469ca5e4a182f85c709a5fd899a84162dd55e7154e948d15ee84
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-207.ebuild b/dev-util/diffoscope/diffoscope-207.ebuild
deleted file mode 100644
index 304d6efd1313..000000000000
--- a/dev-util/diffoscope/diffoscope-207.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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
-		virtual/imagemagick-tools[jpeg]
-	)"
-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"
-
-EPYTEST_DESELECT=(
-	# 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
-
-	# 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
-
-	# Formatting
-	tests/test_source.py::test_code_is_black_clean
-)
-
-distutils_enable_tests pytest
diff --git a/dev-util/diffoscope/diffoscope-214-r1.ebuild b/dev-util/diffoscope/diffoscope-214-r1.ebuild
deleted file mode 100644
index d3cec4443ea4..000000000000
--- a/dev-util/diffoscope/diffoscope-214-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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"
-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
-		virtual/imagemagick-tools[jpeg]
-	)"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/tlsh[${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"
-
-EPYTEST_DESELECT=(
-	# 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
-
-	# 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
-
-	# Formatting
-	tests/test_source.py::test_code_is_black_clean
-)
-
-distutils_enable_tests pytest
diff --git a/dev-util/diffoscope/diffoscope-216.ebuild b/dev-util/diffoscope/diffoscope-217.ebuild
index 177ba73b1c19..177ba73b1c19 100644
--- a/dev-util/diffoscope/diffoscope-216.ebuild
+++ b/dev-util/diffoscope/diffoscope-217.ebuild