gentoo auto-resync : 10:11:2022 - 09:27:33

18 files changed, 314 insertions, 21 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c5718226f05d..3c9b26f5cd3c 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bcpp/Manifest b/dev-util/bcpp/Manifest
index 04ee5548b05d..306071c044e0 100644
--- a/dev-util/bcpp/Manifest
+++ b/dev-util/bcpp/Manifest
@@ -1,3 +1,6 @@
 DIST bcpp-20210108.tgz 150080 BLAKE2B 5614b1e9957d63532ed6ba6d4588ae8b899201c363984bc99726bf48ae49ee9d16a71c407e3988fdeb715fef5e67343bc56c94eb1c8e977a14a6c2b08ee6668a SHA512 46a8fff766bbca4833c898d550ce4f0ac5e6ea64a2e05e63e4680186345a080aa30e54a4a5a3d22d47df8e8c8cbc4e738578fd59ec647d305c32a228d3b01e73
+DIST bcpp-20221002.tgz 151426 BLAKE2B 6978b30ca684ec5e9eb781955679d333e7efdb389af2b29a341b466387bf4147bc72c54d80eaa6d57770cd720c2074881594418ccbe7aa81241ebeac938499e3 SHA512 a1d2c57e5acabf90f19d3721c79f76867c2b93af51b717af80089ab9dc5117ac28263ceb6aff6544a1040b6fc5115a229759631309c4f6ea9808c6b6eb7d1c92
+DIST bcpp-20221002.tgz.asc 729 BLAKE2B 64a211fb84ac6ca2926cb54b06945a908bb19ef15fb8784f4201b29dbc1ebe1be85e8bb0d05d14ebde126508cb33bb9e2d2411fa54b1290246263829d1f4f7f0 SHA512 867b2c04c957daff028a0eaa14ce2c7fd8718dbe9a9af5bf46b293ce51a0a49f823b18978f10f77b7363ff62691683e2945d0d71280185386f19dc7f1cc883d5
 EBUILD bcpp-20210108.ebuild 903 BLAKE2B 3748ffc0caa34f1a2a64e29bd7f586406ff45ac63ad6b9fa4a5bc6eb90040d71df74eba132ada63340b1e450d90d961de1e02c6e1921d5395d2ff8771eb7a916 SHA512 59c925ed7e6bd7015bdef7febdc9682e424793df4e568f70b5fc641d2fc65f286deb9b5d421af9159496871a64507c97a896274ac03e430a97f95369ae771f07
+EBUILD bcpp-20221002.ebuild 1160 BLAKE2B f2a1011fd6e3602833bbad59cc2de8084a257ecde8391ac6465b33cb7f560d3af558f62a425fed8e4f329dc42213ca96dd7642c81a5ef8178db1d5eff84202c1 SHA512 1ae3b0e4c0d908cc4baf4b808c759fbd6f4cfe68deffcf2f78b2b22955070f1c8ee219ba94050989dfe717666a935184fcff6c1d00c0afe4f006104de4a03bcd
 MISC metadata.xml 327 BLAKE2B 98cfc008c1157e6c7bf26938ee9cb85afed7b4ca15f625a6bfb4f10a4a7ec9b7ad101c38c6b5bde51ac8ff8f6ebc15ca0cdd2903db65f1d691c13f534f5783e1 SHA512 ebaa5a7e3f02bc91337c50366007ffb65ef5a8a5604c43872d3a45f50a372adca5ac279b84309e3045fd34b81d0a9a138d2f73141955e15f0e827a42fab70673
diff --git a/dev-util/bcpp/bcpp-20221002.ebuild b/dev-util/bcpp/bcpp-20221002.ebuild
new file mode 100644
index 000000000000..08c0120f1997
--- /dev/null
+++ b/dev-util/bcpp/bcpp-20221002.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
+
+DESCRIPTION="Indents C/C++ source code"
+HOMEPAGE="https://invisible-island.net/bcpp/"
+SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
+
+src_compile() {
+	emake CPPFLAGS='-DBCPP_CONFIG_DIR=\"/etc/bcpp/\"'
+}
+
+src_install() {
+	default
+	dodoc CHANGES MANIFEST README VERSION txtdocs/hirachy.txt \
+		txtdocs/manual.txt
+
+	insinto /etc/bcpp
+	doins bcpp.cfg indent.cfg
+}
+
+pkg_postinst() {
+	elog "Check the documentation for more information on how to"
+	elog "Run bcpp.  Please note that in order to get help for"
+	elog "bcpp, please run bcpp -h and not the command by itself."
+	elog ""
+	elog "Configuration files are at ${EPREFIX}/etc/bcpp."
+	elog "To use them, use the -c option followed by the filename."
+}
diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index f26d565906ce..aaeab823ce17 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,5 +1,7 @@
 DIST bear-2.4.4.tar.gz 50347 BLAKE2B 73fa332cf97413e55c588f8830806a26c6905299af902c6cf1f39fd576c6261690239c1b502b28b5a2aa24e5ca521c3f1dd58aacd60e00ece4fe1840f5656155 SHA512 4ee3fd5c846149029fe9e4104e2a0d0e318a15215aa80fc5dc376e22ebea510384b02d4d62765495343cab537bacd2b1b0130c00246e081feb4e543761a594e5
 DIST bear-3.0.19.tar.gz 125086 BLAKE2B 0c6a27359e8c88ab0dbaa3f5442a87efeaba4f6a9b8d0912ad026231421e2555a524b194a19972f549600951bc1f6620398c48338f7eac8850ba6c3969f2e6ac SHA512 688766a76cc3bee1dc82478d29d6e8754618f92633c842586fce95f2f1096764902ffd64a6f2f59101e58eba5472bf39ddb178c3dfcd48491fa4eb63d111585c
+DIST bear-3.0.20.tar.gz 125393 BLAKE2B 826a774beeb0596038f69b345a3659fe58f897bdb1a63f5faeac1d4242ae3cf4bf346ab82d2f87934d0786e5c0d4e835837b838a62f5a92c28ffe5e6a3d6a900 SHA512 4cf0e648b73fd4c0ac109c4a853e203efccb34ac7373d6c2f3ee3d5089853b791008990df768871dfd1268324bcce97c44657b4c3a2d1383134cba3eaec40bdd
 EBUILD bear-2.4.4-r1.ebuild 1829 BLAKE2B 0f87691b8ee68c1176236f4cf1608892941195893b4a1ebdf5872333b05196f81f1b98469bd90534f7de062bb613dbc649ccc2e99ccc739501d4d57b57d48a61 SHA512 be4c5dee00262ac6681cc2486965732ba5f196e70e7cbf21424e96d3154f3171d1db68b7493f802ba359699999664f92bc64488f3922cbf9ac34d785dc61dd8e
 EBUILD bear-3.0.19.ebuild 2151 BLAKE2B f71d8ca7f99cf5e07b27a1a390075dd8a13acd4d99b05b8d66743de94630f99eeec424e75836377b103945a4425ef6fd7a5acedfd47bc9f58d3142c5ce513637 SHA512 4702e73afe41c9756a1fba67f2680aeea1cf8ce920b4679288af9924c5dd7a7218cbd6ece08303f521d8156487624a1f157f66670602fe652415761ad4f1408c
+EBUILD bear-3.0.20.ebuild 2130 BLAKE2B 978885e8d079c5b1ba4445826316fb161dd8b14ccacb1e93a87e34f7c90d82514cfbef39e89a59bb27db72b613d15ffb3158c76bcd4d377cbb0c985d56cd84b5 SHA512 c22df13d713c0ddb8538bc3acaf82cc83e0a27c20f96eeae6f88b2e570b15e658f6300a462100ad5d83f3b2110f7d440a845bec2a49cd0b4efeb9b76d380b34e
 MISC metadata.xml 915 BLAKE2B 74d981eed24b95353d225061c11b11e3f7aedddd6fb3b79a96bc98f2d348d64ea4598337f5b946d94ac64278eaa9bce5a3ade0f9564d9e3f3b4031574569f20c SHA512 010b17d6da15e7b5a4079864c7c2f3f11c8531faddee1ab226c1d6c3f646079c52ef4495e4685bae6eeec8702801ddbd41c4bd2e1aaa82400c1265e2ecad1957
diff --git a/dev-util/bear/bear-3.0.20.ebuild b/dev-util/bear/bear-3.0.20.ebuild
new file mode 100644
index 000000000000..d4c5a6e6cc28
--- /dev/null
+++ b/dev-util/bear/bear-3.0.20.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake python-any-r1
+
+DESCRIPTION="Build EAR generates a compilation database for clang tooling"
+HOMEPAGE="https://github.com/rizsotto/Bear"
+SRC_URI="https://github.com/rizsotto/Bear/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-cpp/nlohmann_json-3.7.3:=
+	>=dev-db/sqlite-3.14:=
+	dev-libs/libfmt:=
+	dev-libs/protobuf:=
+	>=dev-libs/spdlog-1.5
+	>=net-libs/grpc-1.26:=
+"
+
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-cpp/gtest-1.10
+	)
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		sys-devel/libtool
+		$(python_gen_any_dep '
+			dev-python/lit[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${P^}"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	# Turn off testing before installation
+	sed -i 's/TEST_BEFORE_INSTALL/TEST_EXCLUDE_FROM_MAIN/g' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_UNIT_TESTS="$(usex test)"
+		-DENABLE_FUNC_TESTS="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if has sandbox ${FEATURES}; then
+		ewarn "\'FEATURES=sandbox\' detected"
+		ewarn "Bear overrides LD_PRELOAD and conflicts with gentoo sandbox"
+		ewarn "Skipping tests"
+	elif
+		has usersandbox ${FEATURES}; then
+		ewarn "\'FEATURES=usersandbox\' detected"
+		ewarn "Skipping tests"
+	elif
+		has network-sandbox ${FEATURES}; then
+		ewarn "\'FEATURES=network-sandbox\' detected"
+		ewarn "Skipping tests"
+	elif
+		has_version -b 'sys-devel/gcc-config[-native-symlinks]'; then
+		ewarn "\'sys-devel/gcc-config[-native-symlinks]\' detected, tests call /usr/bin/cc directly (hardcoded)"
+		ewarn "and will fail without generic cc symlink"
+		ewarn "Skipping tests"
+	else
+		einfo "test may use optional tools if found: qmake gfortran valgrind"
+		# unit tests
+		cmake_run_in "${BUILD_DIR}/subprojects/Build/BearSource" ctest --verbose
+		# functional tests
+		cmake_run_in "${BUILD_DIR}/subprojects/Build/BearTest" ctest --verbose
+	fi
+}
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 8494abf07301..2293068b3151 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,4 +1,7 @@
 DIST byacc-20220128.tgz 896513 BLAKE2B a5dd491702274ed84fdddc8b2d2d240d8ddcc9350db82eee067978297ceda012ab99d7c8f53102f8190ce6e6bb3feb8d9beb62969ddf222b4ba967041b746c00 SHA512 e8ae4c56f5be4cc0ef1d281c43f02c6296fdc40f630269f2a61af511f270ae059ad185b9718190b8133018f7b74b7ca6f84ced5d63a359960b52ea2a3ef562ea
 DIST byacc-20220128.tgz.asc 729 BLAKE2B 7e43d182d06419fdfc925f078535163cf1bba49c7ec05788e2268adc34fbca8ce368516cbd46605bfe2c700950e3c9a202ed120f8a9ff507599a1a2acf6998dd SHA512 84140b9aa4aaada776c580be7adb265bf281decd1d24661b1368e0ffdaf52257751931e61ad0bcc59977e966c32125f751f889d5bfa806b7e0bdeaf96dd629e3
+DIST byacc-20221106.tgz 896951 BLAKE2B 36be6de11f06ed38068d35ac7ace6ca9585ac001d1ad2bc1aee3f9da47aa40a0a01820e3c0183dc9ce49d90d474608d19e45653b937d0dd960e9368b19813480 SHA512 866933b4eb2296565ce70b4ade565e4679f3b652715f0066072bbcc42b95389fa47a2f96cd03de577807dcc49bf453b1d4f7e22b96c80fef1aa66898d3de5d5c
+DIST byacc-20221106.tgz.asc 729 BLAKE2B 89142646f85d6ec86c2e227f773e1091771c8218ade06190f1218d5b2cf37a4699e90d8fba0e67f42e4c0ce299960ce3eb505f715a51264d321bf55467b47be4 SHA512 ffdf93c720dcc73356fd7035cdbca36081383b3f75b34286432cfcd292076386ba4ddbc8d7bd23ae10331f281553f7d8b0a5d19f1b03cc6178ee9d0715bf81a3
 EBUILD byacc-20220128-r1.ebuild 857 BLAKE2B 23568cb5640c370af78fa38d50661e7ca86f10e98271414f958aec50923a50d4b094e26c6d9417172d74923e86618f3d5d17ad2289b5851ca5d7b8b81f54631c SHA512 5cf4477919d18b5e1146ebe85f2b7333b4956cbc7dbd03a485e44be80734d868975633d11310d251f56cf0cd7ddc7513e397986616830d77944874e430e91fd0
+EBUILD byacc-20221106.ebuild 864 BLAKE2B 16e225c0c59b8a601cb7443c38ac59044b5f8efd40e012f7e3096c48fcde66d39da467d137eee9138dc5aaf5a2eb6df8b86d9fe1588cbe7335e38b80215414e1 SHA512 a381052ecf6b2468664dc41f4c02cc53985c5cc304bcaaf84031add0c6ec4246307232a9dbd2eb4a2944348d3d37a96882f44536221182324236fc2db1dd5f3c
 MISC metadata.xml 424 BLAKE2B f7c1172e12c784d254658b3743db6fec9d6ef008891fe84114c71c1d0edf24a37f00ad61a1705716bbaf6c912b763756995185f2cffd95c831b8ca57abec6d68 SHA512 8bbdcf35f0499db09f1d55d038d93f8c3aa516e0baa74ec078c7a3032d4885110530be47cdd309de1a44b8c92e6dca3f4353d3ff1d3da04b052d492c91549067
diff --git a/dev-util/byacc/byacc-20221106.ebuild b/dev-util/byacc/byacc-20221106.ebuild
new file mode 100644
index 000000000000..0f65a03aaf8a
--- /dev/null
+++ b/dev-util/byacc/byacc-20221106.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
+
+DESCRIPTION="The best variant of the Yacc parser generator"
+HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
+SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
+
+src_configure() {
+	econf --program-prefix=b
+}
diff --git a/dev-util/coccinelle/Manifest b/dev-util/coccinelle/Manifest
index 9d68a21f890d..33a7ede5eb94 100644
--- a/dev-util/coccinelle/Manifest
+++ b/dev-util/coccinelle/Manifest
@@ -1,4 +1,4 @@
 AUX 50coccinelle-gentoo.el 154 BLAKE2B debbfe7a00bf6195db370b33430d18fb7121123da26f97c01703704918f977f886090abfa0b6f226f8d713bca566ff6e39fabefb07e098a2bfd7cbd64eaebe6a SHA512 dc99ec43c65fc3b6735b8d06f664c09dabe89bb6dec2a0c0390e97ea2bacb1d76ff33d94124c2a2d1f16795648480c33e0306020e151d67d530e35aa9f4f009d
 DIST coccinelle-1.1.1.tar.bz2 2118055 BLAKE2B 7efb0c86432c88daa1bce2710acdf2f62b6210c69245b4896ea8c5e39a0b28c538d94deae6ed1544e0ced66b2baa6edf8670f5e02dad40c2d1f5562326ce23e3 SHA512 fcb83203c91dae18122cf95f7db931d2e1576559b74a7a1c664c795437904acdffa005a8b9e732c1d99c8f0ab1c5f529d143eafe79c6397d28c4879848afca45
-EBUILD coccinelle-1.1.1-r2.ebuild 2882 BLAKE2B 40ab6babfa3fcbfd05c40bfc8f045ea8bef1a9844530e646a5244bdeb9d3a41e6451f59a6ecf9578d609f17e25ff9e96c2da9be4ac283d79b1af838a719bb6fd SHA512 23c8f07b66635aa98ab386f83b68758fa69ee265fda3252b7fe68cb353fe979e6786cf4c61bb498a0235eee309c03161ca13eda5b2679383f825705979a4832e
+EBUILD coccinelle-1.1.1-r3.ebuild 2902 BLAKE2B 303eaf9e70f5a19d1e92e3aa541811fc11257d9bfe00f66e98cbbfcc4902a2b658be547332d0d356f227286e7818915451a58b8e185d4a687a2a2dcd070e1d0e SHA512 e495955e8735ad2d9eddb85127d86542ed103980dd4ebea5a86fc91de33bb23c0ec58b4d4a9eb7eab91ad466b7fc536216ad02b1d0a12aafd4d609d69aa9b82b
 MISC metadata.xml 318 BLAKE2B 0d950c53a548409db938f27ae7e6941875f2d3260237c72fb3771659ed35e876e456e48823f2340122e68da18bf80bc4f16b58182937117977567579d49d48ad SHA512 c32dd8ca3473e147b69f305fe58412f10ba00dd939eba5fb871d366c6440cffbd623ce4922cd5879b2fefed19a3cf3ffb29bd588021e707623a32f85640905c4
diff --git a/dev-util/coccinelle/coccinelle-1.1.1-r2.ebuild b/dev-util/coccinelle/coccinelle-1.1.1-r3.ebuild
index da7c3d3ec5db..dcca7af3cc71 100644
--- a/dev-util/coccinelle/coccinelle-1.1.1-r2.ebuild
+++ b/dev-util/coccinelle/coccinelle-1.1.1-r3.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	dev-ml/camlp4:=[ocamlopt?]
 	dev-ml/parmap:=[ocamlopt?]
 	dev-ml/findlib:=[ocamlopt?]
+	dev-ml/stdcompat:=
 	emacs? ( >=app-editors/emacs-23.1:* )
 	pcre? (
 		dev-libs/libpcre
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index e7290f10b71a..7070955cd278 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,7 @@
 DIST diffoscope-223.tar.gz 3145330 BLAKE2B 47ebe733c6330c2c8a7a78dfaad4c364ac3570d5a691b889f3154dcc5f7bec7b97744f04433cf56544ca208233271bbbca8bb767ed43844786fca4e77505d95b SHA512 5f83177133fd4689a77fb08038222998f9597cd63b0f328d3ae55c2ef6f5136f55ab1f5841b70ce1f64a62d216e2332bb4cecb82a3edcc90a6a5841e95955d4c
 DIST diffoscope-224.tar.gz 3145263 BLAKE2B 918de272781a7829ad4a16f5db3f8d98e05fd1c7e342e18028bf448bf94ede09d5c475a3c1cadf255fa35f46bc8912374cb6cedf2cea878dcaf59380188b084f SHA512 2efbf2ea45e3a43a86eb6a3432852e0eb5a299d3745d8acb3f8857638cb4775d4322d844f2020ed718e4d28419c8a5ca8ab26f66b9bedeea15da57f33a008909
+DIST diffoscope-226.tar.gz 3164328 BLAKE2B 96fbafcd00c695fd3391122b8468abb0bb27936c45d97d01b2e0bb44bb1f18dc46b7ed2c7cf365993d6303c96a6cc8aeaa780808f23c6dfee5066e0cb377456b SHA512 59e8fd73fcf6e94a603c7e5fa8793f4746e770b0ff84d13379e155d3b4eb91defed79b688109785b62ae5cca1faf9b536454b3107ea93aa361eb511916601615
 EBUILD diffoscope-223.ebuild 3444 BLAKE2B ace11e44d106488caa6e2e2014236e1d5889667c48348ef29b6b34b719f5b95392cc0f2aaf73ecf0a01085263e4dea21c3ba4280802abca4fe95ac2c2c018c17 SHA512 e9cb6a0ec3fe55146081dd3336409c49112b55dda2e7edb97c9c0b6269ca29f9706dbf9b1cc5061d4d0869f980824ea8ebe447e191d015510af58a50014f659b
 EBUILD diffoscope-224.ebuild 3446 BLAKE2B 24aa2e6955914e21505310a6c935ad141627be46c1a22505fe371e4c3e6623866a6984090967eaddbab9905391b299ea2fe1cc7714b2b7d2a9d068e105a45275 SHA512 562d8964cd5d939e7280ef1d69d7b034b76cf27072391b262536fb3502c9d915562cee2464dda4c5a3e67b210aa3cc8897aaa0616e50b6a04b9c433c93718b32
+EBUILD diffoscope-226.ebuild 3546 BLAKE2B 18cd87610740fc78a59edb01e5fc3ba390ce3f73b6a023cdd3fe3f0b14a4e24f41122beee19a644cca308110e998b64a1a1688996392045879c7826209f12a7b SHA512 5b975cef495c7dcbcc5d5fd9cae76439c0dc6381df9f425c41d704140e61883736fcbb808aea09b8c9e325be9e89843fbe190d42cfa7f91551e213e61aa12489
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-226.ebuild b/dev-util/diffoscope/diffoscope-226.ebuild
new file mode 100644
index 000000000000..24af754a0edd
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-226.ebuild
@@ -0,0 +1,120 @@
+# 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 ~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 )"
+
+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 of filemagic's magic.py breaks imports
+# of dev-python/python-magic: bug #716482
+RDEPEND+=" !dev-python/filemagic"
+
+# pull in optional tools for tests:
+# img2txt: bug #797688
+# docx2txt: bug #797688
+BDEPEND="
+	test? (
+		app-text/docx2txt
+		app-text/html2text
+		media-libs/libcaca
+		virtual/imagemagick-tools[jpeg]
+	)
+"
+
+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
+	tests/comparators/test_gif.py::test_has_visuals
+
+	# 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
+
+	# Fails on ZFS
+	tests/test_main.py::test_non_unicode_filename
+
+	# Fails on (unreleased) LLVM 16 with minor difference
+	tests/comparators/test_macho.py::test_llvm_diff
+)
+
+distutils_enable_tests pytest
diff --git a/dev-util/diffstat/Manifest b/dev-util/diffstat/Manifest
index e28932d98c18..ef331a15c0cd 100644
--- a/dev-util/diffstat/Manifest
+++ b/dev-util/diffstat/Manifest
@@ -1,5 +1,6 @@
-DIST diffstat-1.63.tgz 270855 BLAKE2B 01a54c49200396a102c42d982e952d38d23c78452ae467e799d29ae1199aa179927ff719955d700081c4b4f4296c0b73229fa35823e3e18f80b2edc51e3316e2 SHA512 e1319f95088e615d442b0b02af922605d0c76e15ba2f0e8cf8c4db56949ac63f4a6e3e42099254480b9aab388cbd6550f515ed4d4995c6723d24f392d1872b16
 DIST diffstat-1.64.tgz 278873 BLAKE2B 41500977adacf492498a7ea38d5f5a7bb5a31d5e39a202c72ee344ad1996f36c493ff18af74cf4dda18d47617832351fd55e386f008493c39f4b64e6d3f01910 SHA512 d647477beb49b0999c5de41d084da827528571c4848f40c69c2d64d060fc89848d15d03d59b1a31d79f02180f81d92cdf6e19d0172482bc569cf2a87476f12cf
-EBUILD diffstat-1.63.ebuild 450 BLAKE2B a6ec1ed16911eca0a032c80a7125f390dc60cedec668a02c521bbc0d7f67e88cd2529c741492b4479f6106d6023f6be8f3ca45cf74fc5eaf7a4ecb2a3b9d77ae SHA512 6f04a0d1760b91762740d3f03b0901e445a9c427ead2d6ed2a78be326c82c958f1e1beb1cc3e29242c9e927c69edf4bf45f29c8d48a9e4dc851468933c7f4426
+DIST diffstat-1.65.tgz 295596 BLAKE2B 85a0967854473d7893fac7e49c7e22d9039bd46a45cd00cfbf85c0d20d48bb05876d3e68d97ca6ae785d0cf9cf90540dbd248d39503ebccb195cb9b69dbe4111 SHA512 8b516201d3070ccc37522f3e57aa8b1abf4ddb52956e5a7c7a7027ac0ada1630bb54c95c57e6acdbe6e110867073d1cec2b1726edb2d60d326caded1501b1e89
+DIST diffstat-1.65.tgz.asc 729 BLAKE2B 31dc2cf15df97d83dbc466f30c7eebf451450395fba76d9561dcee5a7dbb7f3972928c60634fdd78b947f7d3cff6dc1eb3d3ae77270e960fc8ce5ee1a60d8b3c SHA512 f25b88b5f70e30ada85650a081fa3f67409d06d2a0ead446c038d08dcd9ccb7c0ee711d12ebc202669456bbeb9807cfc891018048f5a08c20b46d56433fac6ec
 EBUILD diffstat-1.64.ebuild 449 BLAKE2B 14fcfaa6a09b61516c0dbfc215595b13885a5072fa8423548f507bea573ef1d2c675485780c586a0cb1560fdd4ea431f1a06457fd9b19cf19728dad8a3fff672 SHA512 1ff0e572792bcacfb2a02f538d8e8e6a978fd7347a9763092bb526ca80106876fda488461ff8fb6b0cb7dc4963e341727df5e733decd2454c9c6451958642cda
-MISC metadata.xml 372 BLAKE2B 9899694280a5260ab30206373057dd7821e5745a7bad366c388b03da0d77884e1e21b3be7f7abd8bd68a4880fd79f57d2cb206e579ac0e75f84b5fe82ea5478a SHA512 260d0e4229e8c1bc3465a85a1fccea6fc1bdbc1231c2a1cc89ea23d266fcaea2895503313d3c1501e82586d54e381bed2ede7af0121b0d581f05e9a29ab9510f
+EBUILD diffstat-1.65.ebuild 702 BLAKE2B c40076a96294ab5ccfe2d5e0cdccfc8239ba66ebd05dd53e0604449a093017f9edd752bf725e105068327d5c54394f41b60d764b25c040a58b73a20a9d641b4c SHA512 3d3ebea0887341a29ff99fc233dd7175d8e9fd8f70872da1b0c18343f561beb652ae9cf3ff4f7a7129e4c2d2e6f37f8aa7748d67b25d029689025e86c554e699
+MISC metadata.xml 445 BLAKE2B a07a359b64943c219636468163918f32cfe9a053879f32b4275ab2659788e3c59251b2d1c478c234fa807924947fbdd24db7c693fb2803d9f8335eb5ec9c1ccd SHA512 b8a077397848122d36f000d993280f1f2f8b0783021d1423f5b8dee1a43c159fb790819b0a475ae9b148ae25108292e11a396af3cef086679fb2eaeec5a587af
diff --git a/dev-util/diffstat/diffstat-1.63.ebuild b/dev-util/diffstat/diffstat-1.63.ebuild
deleted file mode 100644
index dbb0ae8eb11f..000000000000
--- a/dev-util/diffstat/diffstat-1.63.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Display a histogram of diff changes"
-HOMEPAGE="https://invisible-island.net/diffstat/"
-SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
diff --git a/dev-util/diffstat/diffstat-1.65.ebuild b/dev-util/diffstat/diffstat-1.65.ebuild
new file mode 100644
index 000000000000..06e5391b4e8d
--- /dev/null
+++ b/dev-util/diffstat/diffstat-1.65.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
+
+DESCRIPTION="Display a histogram of diff changes"
+HOMEPAGE="https://invisible-island.net/diffstat/"
+SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
diff --git a/dev-util/diffstat/metadata.xml b/dev-util/diffstat/metadata.xml
index 1050bc28611f..8a804831c723 100644
--- a/dev-util/diffstat/metadata.xml
+++ b/dev-util/diffstat/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <changelog>https://invisible-island.net/diffstat/CHANGES</changelog>
+    <remote-id type="github">ThomasDickey/diffstat-snapshots</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index e5e51176fe98..ad2de33bdc14 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -9,6 +9,6 @@ EBUILD nvidia-cuda-toolkit-11.5.1-r1.ebuild 7595 BLAKE2B efbc0f8747cfb8468203114
 EBUILD nvidia-cuda-toolkit-11.6.0.ebuild 7885 BLAKE2B 738dddb098d327bc4bcfdb464ef6599f5dd499f9afebe9540137f07ed19f445214039d7a7a584914644db56d1adc3e2d0da1358b344f462e266db10b87fbf3b0 SHA512 be71bac77074319782dff9f9a52ec093228f3079950c7aca3c05dc33e32ca3dfce4fb45a6bfdfb025f62ebf6ed872af95fa7a8b4d11c42726682e09f8d013f5e
 EBUILD nvidia-cuda-toolkit-11.6.1.ebuild 7885 BLAKE2B cde8e87114871685e4891be06633065dc181c1ede3c7690a6d8cfe5537f518147862b426d01187c9265c452628b3db340aa1d7bcc3a63507c3d576aa79005ea7 SHA512 aff120e1c3140cb353aa37366d58c9a08185ab4ca603f4161ff33253d1e5fd065ec1a8e9d73490ca8fa2eff87464c1a15a35944b012c93c5d8560f46de1d1b57
 EBUILD nvidia-cuda-toolkit-11.6.2.ebuild 7885 BLAKE2B cde8e87114871685e4891be06633065dc181c1ede3c7690a6d8cfe5537f518147862b426d01187c9265c452628b3db340aa1d7bcc3a63507c3d576aa79005ea7 SHA512 aff120e1c3140cb353aa37366d58c9a08185ab4ca603f4161ff33253d1e5fd065ec1a8e9d73490ca8fa2eff87464c1a15a35944b012c93c5d8560f46de1d1b57
-EBUILD nvidia-cuda-toolkit-11.7.0-r2.ebuild 7901 BLAKE2B e17c9639dde2e4f3d237a993589a35b2b73ccb881c67a494552dcafc8531286b2f18c6c191453779cd79b2a9c9a93eff611dc359d70156cc9fd32d8f8b21c97c SHA512 146327a76cb8d01808f4537db3bc77ec24cfb5b91c442e33451c7b8fdaad9939a5a2023b30a52eee9052bcc0750dffde1e30b200b2cd66712c403c4e0c58c519
-EBUILD nvidia-cuda-toolkit-11.8.0-r1.ebuild 7926 BLAKE2B d42c1047d0b8d32ad6423f44f541a34e9dc9e6b9e5219b278aa3185908244d38d0b393c16b92b287f79383c21d55e4d0974aca302f2da7b8ca7dbb4bd0c9b247 SHA512 27cfdc191f459320547f4cd42185b17870539a8afb35d26acc38d9981fcd96862d5183e6e65f2f5b1e77f891031583ad995e5c8a27ad1cc6393a1ef1de545aff
+EBUILD nvidia-cuda-toolkit-11.7.0-r2.ebuild 7903 BLAKE2B 2ee716a575c9b702686e139b32f0b95bc423826751138cd6f6d623d40e022a16aaa4a942e6c5fbc5ade38f9146a6abd1d8ae15cdc8da17e48522292c75c30cd4 SHA512 3d13107d58d80ce59ef48b904f6a8d9b10751a38d06764444e57b32979795978e6c80ebec48422948cd66aea5fe187f1f51404d53ca7e714ed0b0b88f1dd5c72
+EBUILD nvidia-cuda-toolkit-11.8.0-r1.ebuild 7928 BLAKE2B 5773d7cd97251f3e5cca49a8424475a8dfcf084b615d16ca3ae27c7f8a0cf5acde456cc93bb25751b4be767a229f39922c8f644f078ea5de57ba0f3105487a48 SHA512 7ec3eb88afd2cb179edf0c08166cde6462c894a4d0bfbe5b197033440bcf033bb92dd661e6ba819777cfa8222600ca29bc46c12e7b65b6f78794ee8af280ea3a
 MISC metadata.xml 671 BLAKE2B 20d0b15061270bdb0604e9e76e8913c9d304c51a05102f92b2ef64cddb1b369705a742aefca28f4d36976bb633d0a2cf090bf3d307ea579121578d29c41264e1 SHA512 09fe8a1c60ca7924e433c5aca460d6a757c9962371b3f2a3c42c2ff1b0dd819f1704dd5943bd31a3e74337ad0f14aa4d7836912a435396c15e4f0daaed33800e
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.7.0-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.7.0-r2.ebuild
index ddd576b50961..b4b3850015f4 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.7.0-r2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.7.0-r2.ebuild
@@ -232,7 +232,7 @@ src_install() {
 }
 
 pkg_postinst_check() {
-	local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	local a="$("${EROOT}"/opt/cuda/bin/cuda-config -s)"
 	local b="0.0"
 	local v
 	for v in ${a}; do
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r1.ebuild
index 6892b8af6f78..14112f7a0201 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r1.ebuild
@@ -232,7 +232,7 @@ src_install() {
 }
 
 pkg_postinst_check() {
-	local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	local a="$("${EROOT}"/opt/cuda/bin/cuda-config -s)"
 	local b="0.0"
 	local v
 	for v in ${a}; do