gentoo auto-resync : 25:09:2022 - 11:33:33

9 files changed, 115 insertions, 82 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 00e647b64633..22436a7ae625 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 4c1ec3266af6..56351f82e4bc 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,5 +1,5 @@
 DIST devscripts_2.22.1.tar.xz 989556 BLAKE2B 2a2e3ca9757c710e181e807f0369c137f21070d86b4c51d8b5132ca4add33677edbd26e04a2faae93e9e4586080286888880ce450119579aa40ad205c8e5d857 SHA512 260603e1a655035c5aca3c9734db1bc6aa7e9aa017ece7e9158c57e06a1ee548922ec2defdd9dcb4560743d78aef08d30695b1bc833bd4d77fe1c7497d157c45
 DIST devscripts_2.22.2.tar.xz 995524 BLAKE2B a7649ea5b790a64b5470a66425e487959b058e9af34be173210277765c8610f7d6da1b9105f97e1da2f84a578ca7514b1dabaa7c38a88c9b1eef29c2f34f97a1 SHA512 d6c47f604a252f58e1cf8ea9fe7387a390683757144bb76cce6915fca1ff7ccb71ce6c87d829f874097d869172774a806b506dc7fb4187876d14e50eaaf92593
 EBUILD checkbashisms-2.22.1.ebuild 800 BLAKE2B 327f2e2099acea61336d5a98166bf3383d1d00f6a9952845115c5b5f24cec50888d051a2daf193178bbe07343ff265a8351783052d15e787f24b9c3c69e13c96 SHA512 7c882651f86473cdeb4d922ab17ed9647295b528f16b8dfad90501fe3679717f877168c439f86a3ecf409bd7da62ef03790dbbf236daa7d0d33c316d8c0c726c
-EBUILD checkbashisms-2.22.2.ebuild 804 BLAKE2B 1798a5a4b56877b034c274220035f657876e6d7c5cf0ad75577d8e5d8c9fdec3e1af27cbe702469d0e4333b5087657c98f7f73c357654ca320c0bd8b823a281e SHA512 fc0ea5c0f99052c87acc456ea8d1a199c3c35ece49cb6fa3d2ee658c263dddc0e4ecd8941bd9106d853af3da011f36e4402684d9c1a66c3ee0e5fd9f897933e9
+EBUILD checkbashisms-2.22.2.ebuild 800 BLAKE2B d32ca9230c1950880d8dd3378768fad9594da7d2e96fd6080464704c2852ce02c26baf5f6c7341c2233c928ffd5e7f4ec0782629b3dc2694ad82ceea3cfb9991 SHA512 c5404bcbb54fd866a8608fc504f00908438c4018c8463b4caec23501910b6bc16c63399aeb85d4b9387ab07162e246d6c7e4ceea2f1b9d139799394128f4d685
 MISC metadata.xml 434 BLAKE2B 031cac658d94414702e897991f7e60858edca6ed7c49c6413b20523e4e1f39adaa109c9bd5b87054a2767ba1fb1deadeb4e5021dad58a5bee366e962d7d95ccd SHA512 c30bd0b32e0c851ef023de34a60207c353d8076fc84ec4be67cb23358cdd31ba9be8baa8f3dfacb526a7ac40ebde2b278d413f16595b412d0a9e9590f14bdd0d
diff --git a/dev-util/checkbashisms/checkbashisms-2.22.2.ebuild b/dev-util/checkbashisms/checkbashisms-2.22.2.ebuild
index b5bf37296fc9..80c4ac6c7ced 100644
--- a/dev-util/checkbashisms/checkbashisms-2.22.2.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.22.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}/scripts"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 
 # Requires python packages to check tools we don't need anyway
 RESTRICT="test"
diff --git a/dev-util/codespell/Manifest b/dev-util/codespell/Manifest
index 00bf0b7d6d4f..b6444fd220bd 100644
--- a/dev-util/codespell/Manifest
+++ b/dev-util/codespell/Manifest
@@ -1,5 +1,5 @@
 DIST codespell-2.1.0.tar.gz 187490 BLAKE2B 6114aa3a7ad8cd37ab868a3f27f641501dd0cc5bfe80bef0aa5cad0a86f8e2bba6e1f1030d5ac6fb06f78f9e01e37359d0fc17d17eb54608060300f676d3d56c SHA512 16d9a4239ae18fad6a06825a2afae6adc903d50eb90b759cdc61b1e1d145458bbfb1385837c4465b0a9858da100be074c597343c4816ca0260bbf6710d9c84e8
 DIST codespell-2.2.1.tar.gz 211593 BLAKE2B aba431119fd1f16ee51076cd4496ef3f3e80e56a124bbbd4ebbec5dcee5b7e49788db37bcdefd15946d12680596b33ab20ae845fd9a3a3a61ee8c3eed187fe2f SHA512 6c1ce9ed134ba4602cc91c1851a023911ff09ce7d4b1e8a33e655bf821a5b82ae8f0e75defef43e9a8537a6ffc7f0ad7e59af7b200a1294dfe3aff1651869e41
 EBUILD codespell-2.1.0.ebuild 905 BLAKE2B f841dc9d6189ac0325b8b4064aabaefe3fc71c936a4cd90340cd257cef494f3b3f99533b65c8bfef870a81b015f7a0b6c5e2ff8f2b77e79077dca0a4af6156ab SHA512 e031f094df22ead785a808d211b71fdf003aa0517ec885662c79070a27d5b1dacd0160333e2e260a135c49c0c176764bd8ee9cdb525242480291452a31432e1c
-EBUILD codespell-2.2.1.ebuild 945 BLAKE2B a022535462fbf62ca815c85ddd8d34d85169cde7ab682f3b30919cb38b85a5a2641323bb3609ddcddd1af4e5dd887a7fe63aa3fb4816293ff71edda286d9c46b SHA512 db4d94f424ea0ffd22b28d30782f84e2190f9a1fa27c7007d1cec4d625319e3402b02f969a12f41cb713e2f2ba08af29266196e68efce0d8cc3a9f91405871cc
+EBUILD codespell-2.2.1.ebuild 943 BLAKE2B 8f9df36a565abc5410bcfd924cca54fe5813ee4e067f731584fe17b57d8aaacace984f03014b60531048d3f36e7970d20a54ed14022a64991a485f3344cbc81b SHA512 aca34fd34e9ecbf0da4aeda3383a9b2fa4f189f3fe77116d0f1f98e889e8a64bf1217b5826f48104435d41505bc6b93396962f800ccdd98167b4001ddf478710
 MISC metadata.xml 774 BLAKE2B fe1de89542c86da21ef70e12bee327af41f09f4af419da14074f01c3d0d995ee51deb13748330d13b61a4e3e1ac392e581656973ece8df5290b21d3c4f1fec81 SHA512 e95c51eeb9da39aa2cc7ad6e5f584050407bd232fd77a9f25b339a2c25262f51194278b47d4e05e55a0c3fcc6daaa41bc0babb242aba83e0b87912400179afa6
diff --git a/dev-util/codespell/codespell-2.2.1.ebuild b/dev-util/codespell/codespell-2.2.1.ebuild
index b323c3f6c7cb..fcc89161f545 100644
--- a/dev-util/codespell/codespell-2.2.1.ebuild
+++ b/dev-util/codespell/codespell-2.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/codespell-project/codespell/archive/refs/tags/v${PV}
 # Dictionary licensed under CC-BY-SA-3.0
 LICENSE="GPL-2 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	sys-apps/help2man
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 7bf7fe2547b6..219967ef5178 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,7 @@
 DIST diffoscope-219.tar.gz 2711533 BLAKE2B 1b244a36ca2622244fb1f11f8fc895680bd1d77b544421e5e2c3662294fdf8e7efe3b67e370a83089c180f3c8563562847cc8b09bec85426e1b05f340575b724 SHA512 615b82cbd2b1a8bcdfae4274c051e4be52fb8ea90c5e56b041dd1d8c520c759d09cd4c080b31154257828316f7b4c0ac79cf0b1e09d762271ce01ffde353ee7a
 DIST diffoscope-221.tar.gz 3145331 BLAKE2B 76369a7719f9a256ca61cc097bc439c5ef267370b78b5e25c466f351fc262b6a9a18f2f82d88ae86fd382a11900c4350ff79c6217c53df42ad56706ee58fa42b SHA512 145390374378f699f7689af0e35897bc9d75cd805722f0db66e689135186eb43def17ec5aac4adf8f7e0045cbddec8a31dc5c8b68eb4e7b0d3bd1f0661f26416
+DIST diffoscope-222.tar.gz 3145249 BLAKE2B ae91a16b4c21754d4c677922fed0a2f6102ba1ee370eac42a4008fcd0898adc7b1e86a900476f08eae8705353f05837daf4fcc4026d5beb27ab982b72a0e12d7 SHA512 b4f2e17fbb755517d922dfcbc0ae57544a89600338bed7d98d59ab024ddc13bcedcddfa6ee808530e163b3f6c3cf627b159b9d0a011765d03a9268839226590f
 EBUILD diffoscope-219.ebuild 3324 BLAKE2B c9c95194b8d7d758834d27a1883bc1a884f6e3670ac81757bc251448e27afa437a4434966eb1cc5f79c026559241978eb913be3ec70b42f86dcba701a968db92 SHA512 5f53cf29280155a033b5aaf64512bd006fb1be72c6f8af2a1e0fc8669d1ac6f05441152fa66c41fbefa6ec74a31c2b1dbc11f08f27ca39f30e43cbc8c991b45e
 EBUILD diffoscope-221.ebuild 3333 BLAKE2B dbbd07f3ba1ed69c7a71444b046c190182a522415def1dfae5f8e4cf22a25bb93d19fc6e61b43e1da9cf95270de7e85ecc66c258635a7d03a81ee7709cf9b657 SHA512 857ddab39cf606bce9f2339986d1b55dfcccee9d774deb469a9c2a169f3799851457611e0250a5d0c3a4d58d7e477a86744568e9d8f15bc8f223810837b38f17
+EBUILD diffoscope-222.ebuild 3333 BLAKE2B dbbd07f3ba1ed69c7a71444b046c190182a522415def1dfae5f8e4cf22a25bb93d19fc6e61b43e1da9cf95270de7e85ecc66c258635a7d03a81ee7709cf9b657 SHA512 857ddab39cf606bce9f2339986d1b55dfcccee9d774deb469a9c2a169f3799851457611e0250a5d0c3a4d58d7e477a86744568e9d8f15bc8f223810837b38f17
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-222.ebuild b/dev-util/diffoscope/diffoscope-222.ebuild
new file mode 100644
index 000000000000..bd5c0dd544f8
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-222.ebuild
@@ -0,0 +1,109 @@
+# 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 ~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}]
+	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/librnp/Manifest b/dev-util/librnp/Manifest
index fa754a4ff2e7..4aa213b410de 100644
--- a/dev-util/librnp/Manifest
+++ b/dev-util/librnp/Manifest
@@ -1,5 +1,3 @@
-DIST librnp-0.16.1.tar.gz 2897069 BLAKE2B 0ce261a5f1229ab1567d4726b8d75eaf3fa72774ef66280bd587f28282371cde9691de24de329f8209f99c76dc6cf01e7c711e1bd3fd47b8b145762936a1b655 SHA512 948d8c1342c34ec850605b79b490d6da3094b4fb1f8435f4c928473c15a0df364f2ad56091f4b746afc98119d85137cf7b341c72054ccac79ab236f13cca48f4
 DIST librnp-0.16.2.tar.gz 2897137 BLAKE2B 5f756047506531e0ed3d431cebd3977f3492b464445f6dc54850badc795478f5d04ff036147e8212b4a3e2d4fd939f4bcf668e9a260c2e7fc616ef51dea02117 SHA512 5fd5fceb39429e130adafd4869d9a01149d9c08271770da4eedbe75910788f8256c8bf19e6bb0886a902b22dd5564eb93baddaf84689cbf5e6617674f4f0efac
-EBUILD librnp-0.16.1.ebuild 1747 BLAKE2B 09dd5d19778e51b1b66bc2ed5b6bcb2fc0a2fbac93283ea90f883cca8e5af26e138a5d4bfa8fd7421d58f9f980e53367bc6d2a7e9398fca25eeb6c37902d2790 SHA512 79f346bc6a991503d0791e12fce50f8e98ea604e14e9e5df3edb7b0317429cdb575c5bdd1328bcf7c9c356b18d032842704de848682d738d476e18cc1a74c43b
 EBUILD librnp-0.16.2.ebuild 1621 BLAKE2B 36d97936371e4c8c4f4c6abf21c2f34eb39b113731a89a4d595a191eaaa745940c05818eef87cfd653615b17b3fdba776c7c61d658c07cf2a26cf5efb299304b SHA512 802d1f54b978f8940abc18fb09af1964288aaef944c5b6f09c506e071cea19bf68a9669df894f0427430a354057e1457e56642abe38a1d70ecaed86cd22805a7
 MISC metadata.xml 430 BLAKE2B 739d6cddc56f385ad2b1679f6b3d9ba567ce77ec536894ca3861ad7ad127fd60c395db49b31d89963df12c03d8cf69fc6f083f5d3361b790079952c1e76ccf03 SHA512 ad7b3e6332741e1f2eae9e158d5ca767f5985a8f5c86eb5f21b7ee0214b9c7fdd2e90beddf1a9287218edf35aff39bd7ff1a4f1d15eb10552ab664738f8d1959
diff --git a/dev-util/librnp/librnp-0.16.1.ebuild b/dev-util/librnp/librnp-0.16.1.ebuild
deleted file mode 100644
index b6ba813ff651..000000000000
--- a/dev-util/librnp/librnp-0.16.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="High performance C++ OpenPGP library"
-HOMEPAGE="https://www.rnpgp.org/ https://github.com/rnpgp/rnp"
-SRC_URI="https://github.com/rnpgp/rnp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2"
-SLOT="0/0.16.1"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+botan man test"
-
-RDEPEND="app-arch/bzip2
-	dev-libs/json-c:=
-	sys-libs/zlib
-	botan? ( dev-libs/botan:2= )
-	!botan? ( >=dev-libs/openssl-1.1.1:= )"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-BDEPEND="man? ( dev-ruby/asciidoctor )"
-
-RESTRICT="!test? ( test )"
-S="${WORKDIR}/${P/*lib/}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test on off)
-
-		-DCRYPTO_BACKEND=$(usex botan botan openssl)
-
-		-DDOWNLOAD_GTEST=off
-		-DDOWNLOAD_RUBYRNP=off
-
-		-DENABLE_COVERAGE=off
-		-DENABLE_DOC=$(usex man on off)
-		-DENABLE_FUZZERS=off
-		-DENABLE_SANITIZERS=off
-	)
-
-	if use botan; then
-		local mycmakeargs+=(
-			-DENABLE_AEAD=on
-			-DENABLE_BRAINPOOL=on
-			-DENABLE_SM2=on
-			-DENABLE_TWOFISH=on
-		)
-
-	# OpenSSL support is still not as complete as botan.
-	# https://github.com/rnpgp/rnp/issues/1642 AEAD,
-	# https://github.com/rnpgp/rnp/issues/1902 BRAINPOOL,
-	# https://github.com/rnpgp/rnp/issues/1877 SM2,
-	# https://github.com/openssl/openssl/issues/2046 TWOFISH.
-	else
-		local mycmakeargs+=(
-			-DENABLE_AEAD=off
-			-DENABLE_BRAINPOOL=off
-			-DENABLE_SM2=off
-			-DENABLE_TWOFISH=off
-		)
-	fi
-
-	# Broken in 0.16.1.
-	# https://github.com/rnpgp/rnp/issues/1901
-	local mycmakeargs+=( -DENABLE_IDEA=off )
-
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	ctest -j"${MAKEOPTS}" -R .* --output-on-failure || die
-}