gentoo resync : 25.10.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-10-26 00:10:07 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2021-10-26 00:10:07 +0100
commit: 95461df035e3867364495f065e5e805bf629b2d7 (patch)
tree: 867dce371a84a696e91be255d89f282975aa0480 /dev-util
parent: 46eedbedafdb0040c37884982d4c775ce277fb7b (diff)
46 files changed, 716 insertions, 278 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 6078f11d5afc..6b55161a0ea8 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 914878b434c4..5f97d7b9abce 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -4,5 +4,5 @@ DIST android-tools-dont-install-license.patch 1016 BLAKE2B da65a414d046995358e91
 DIST android-tools-fix-gcc11.patch 137252 BLAKE2B 0e80aab92cb69e3223f81834d53c1d84aef866787261305fd539cb8cb75a21361c65f091b2f7d83f6f8236816f43510f4f0f8b51dee4b03d99af31c78dc53a79 SHA512 fb4d8d13f9022f0472c81fe6b9252000d93ba5f77b84d7ac7d6846753078b6fdac0687fcb7157e445bba02cbf008ea3744d84e8fc5d534ee3807f61674e3238c
 DIST android-tools-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff5ae820101628399540f3e5b87bf69224f4a61a6b76b8b6b3b06f8e7162a6c1e7ee43eee928cfa96824f5efff72317b4bbfe160d8e72d96aa84e0a1d6 SHA512 d5fd63c108ca6b880b1b79cf362468335f19fad7bf2042fb667b56e34dc95acc47e1bf9c9e72be1d2bd8252a529cd49eb030d141bf735524bdaeb85482d544a9
 DIST android-tools-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423
-EBUILD android-tools-31.0.0_p1.ebuild 3448 BLAKE2B 4fb9987fecefa86e9a2d55dd37c29d0684122f03419cf29630fc4a05d0012a1e66beffa5bc1529224bf46e7431ee3dcc84d27d1c241883948bf0f77d4f223928 SHA512 f0a32bb626d224bfb4729333ce63fd45bbbc4f39053aed2494b36022850673e32724e548353b67391c4101a4b6e186f5d8638ecb6d496bd869674a47761d031d
+EBUILD android-tools-31.0.0_p1.ebuild 3403 BLAKE2B 494f2436c3c883bdc56c3a7dcca03c8e970f30f9eda1d5097985e547a515b8ede94405a483b8869d6b850163b170ca24f63a7526f8146d509bb0cd01e2120d05 SHA512 9b74696df9597428739015aa67163ba1ede670c3821a331ba540104eeb998b4e93592377a3207df25585ab456be91a049ac9b30ad2e592b1581068dab2e157d7
 MISC metadata.xml 715 BLAKE2B 86f1b747788d730497f2b94265ac665cd5af7d4c203f07d30134fe310c82c6f054e09dce0469f091dad560df58bd6db1ef72dfb8684d413b81429bf57d067106 SHA512 73326b3b0a91b8b39965c7fd7be6aa30d0e5326fdadceba9a2b9f3f20f47e22fe93581fe170c2f1b8f7299d887796a8143505bce1921565056d14a5529fc1354
diff --git a/dev-util/android-tools/android-tools-31.0.0_p1.ebuild b/dev-util/android-tools/android-tools-31.0.0_p1.ebuild
index cd63e3a63f4a..b322fd0f0ba5 100644
--- a/dev-util/android-tools/android-tools-31.0.0_p1.ebuild
+++ b/dev-util/android-tools/android-tools-31.0.0_p1.ebuild
@@ -12,10 +12,10 @@ HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/
 
 MY_PV="${PV//_/}"
 SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
-	https://github.com/mid-kid/android-tools/commit/32d76cdbeb8a4fc2bb5fe22f496a9b82b68305a3.patch -> ${PN}-no-gtest.patch
-	https://github.com/mid-kid/android-tools/commit/9806fe4b730e15027ace235c62e166ae6148df56.patch -> ${PN}-fix-gcc11.patch
-	https://github.com/mid-kid/android-tools/commit/557182ba3f912327e747c3c3638d6ee7c529fb96.patch -> ${PN}-dont-install-license.patch
-	https://github.com/mid-kid/android-tools/commit/5971ec8ebab527fa17c91eaebe012d2a89a838db.patch -> ${PN}-install-e2fsdroid-ext2simg.patch
+	https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-no-gtest.patch -> ${PN}-no-gtest.patch
+	https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-fix-gcc11.patch -> ${PN}-fix-gcc11.patch
+	https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-dont-install-license.patch -> ${PN}-dont-install-license.patch
+	https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-install-e2fsdroid-ext2simg.patch -> ${PN}-install-e2fsdroid-ext2simg.patch
 "
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-util/bats/Manifest b/dev-util/bats/Manifest
index 8b47af2c2786..5c0f49289452 100644
--- a/dev-util/bats/Manifest
+++ b/dev-util/bats/Manifest
@@ -1,5 +1,7 @@
 DIST bats-1.3.0.tar.gz 78392 BLAKE2B 5dbc87ee87aba0b001d25f1304939604b1682603fb0d2fae19f852171e8bd76f1a6c262b661a373aeeb9b79818eae3387b3e4d6bcf4f0f95b87dc2430caf029f SHA512 47f67681b380a70863805691eca39532af76670b7bba2406293c58f95cbbe3dade4f792177ee00d8ca72684731efb6db2c1ca8eeabe2fa48359e81c257f95b2c
 DIST bats-1.4.1.tar.gz 98964 BLAKE2B e7cb70d2d0f448e4336ccf1fe51e93730a7179a782247e28ee906eb576fc02305aeeb2a580b5d34220daf8dfd2ee1d3269fb86a386fdf00483bd3b234df3b75e SHA512 3b00af13ac97d38349f09db79179e170e2b37c5364815e0e1fb957e6593a564d291bb50c54776088dd5784ef8cd597f0c332ec3a574bcef65e3083a5f2fc1f0e
+DIST bats-1.5.0.tar.gz 108052 BLAKE2B 68bba9d263e4206ead7039da2b09c5211c834445efdf429dca6c53acc5409de1052ce7ffa9143e732d3aeaeb6ea6dcaf9b419adc02776e601545557dea776e36 SHA512 e0386fb32214db67ae001a2040c44277988af7fa909a820843237c7d47eedfa4e370238d5b2d06a4667b874cad4b00f2cd14624b1bc45628192e5d693bd5073a
 EBUILD bats-1.3.0.ebuild 1052 BLAKE2B e731850ba81d19258305e08aec742f4331a0afac06d2b6f44062da69ba188292720c265b25a8281674a2f8fed23f1969db9ded73f84060068dd0bcbdffd01f18 SHA512 8c6465b749fd4ac514a3bc1da62a27820652e67284d8e79fdfbe2e58ac10a3ae11ba1a6f28e728851d8f9b8e950d91144c5feb0873b9c5f812bf59a69436957a
 EBUILD bats-1.4.1.ebuild 1182 BLAKE2B d734dd2e2e032a69020267f7c734185ddbd022d75fa48a66225cd400dfeec66afe5249a19de7a38692ef3f368a42abae90d60c838f2369a57f71a2c1457552bf SHA512 175c7d4671350fe14ff4bccf5c0c7aeddaf0cccd42c4d98ff92a5889c5c5c9dd9956f03adca447e35b883b2b98519daf793e586ac57023d7cb1fa2b84e95468f
+EBUILD bats-1.5.0.ebuild 944 BLAKE2B 7d052a43e4d9d7394dae56e05127e1d897d8417ded97c068d5194b1769d37704ee4f3b589fb2dc8fa0430367c5493f5f8db0061230703abc520633b52b1a4448 SHA512 4d66e1727d9f11854cb5343c12eeef44f3d50d641773963f4d00eba025eb35a943f63a98278c21475b07c25e49561c3ec0afa3decc189e12eec2ffc40c7330d0
 MISC metadata.xml 960 BLAKE2B 1eef5273fa063fbeb31bf73be2dd264f83a37a75ae5bfc116cfe6e97a0707349b9fdd6e0700505d7f698e63eeffeec2f72f9f9e853be3c3eb70ea80891fddde0 SHA512 906495ef8f00981f362302c4cc0f24aca8a9a7d4898e4f729941836b3bb126590c7d4863b37b6d216c1485cc96502c330ca03801c9cb271793ebd298285f8923
diff --git a/dev-util/bats/bats-1.5.0.ebuild b/dev-util/bats/bats-1.5.0.ebuild
new file mode 100644
index 000000000000..b9ed1b8d1482
--- /dev/null
+++ b/dev-util/bats/bats-1.5.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing optfeature
+
+MY_PN="bats-core"
+DESCRIPTION="Bats-core: Bash Automated Testing System"
+HOMEPAGE="https://github.com/bats-core/bats-core/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="app-shells/bash:*"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_test() {
+	local my_jobs=$(makeopts_jobs)
+	if ! command -v parallel >/dev/null; then
+		my_jobs=1
+	fi
+	bin/bats --tap --jobs "${my_jobs}" test || die "Tests failed"
+}
+
+src_install() {
+	exeinto /usr/libexec/${MY_PN}
+	doexe libexec/${MY_PN}/*
+	exeinto /usr/lib/${MY_PN}
+	doexe lib/${MY_PN}/*
+	dobin bin/${PN}
+
+	dodoc README.md
+	doman man/${PN}.1 man/${PN}.7
+}
+
+pkg_postinst() {
+	optfeature "Parallel Execution" sys-process/parallel
+}
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index 4e39419d78cf..eb82a7f22334 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -6,5 +6,5 @@ DIST bcc-0.20.0.tar.gz 5193274 BLAKE2B ea78004d114e8187d82d6e58bf2c8e17d93b96a65
 DIST bcc-0.22.0.tar.gz 5247927 BLAKE2B 896d22c9540180e015f7be03b2ce8e6957fd7ba3e7f28fb57247bc8455b35bc82ecf321140e80f714bc01a2c01721e0544e249bc07be7b467c650788014793f0 SHA512 946ec8ed96a83cb7a9d7e44436901445588dc5e37c5cbc8b720a7a0d226b2769ab780294fa7c52099f579f4f1b6935f662be19c739d13979044723dce8ed7792
 EBUILD bcc-0.19.0-r1.ebuild 2258 BLAKE2B ce5df0ce4181d14c1836e52ea25f40d31cc3776cb823540c839b6890854859aaf08eb78e229b9ab69066a40157955f1a6eb68c566a499b842d520b091ce917a2 SHA512 ec0faa3ae0a97e31d6424c621fa5166929f98a0fdbc13aef749bce6e5beb98c4a765f8db67a3554f8380fd82de89db9004824990e4a9deba1a2bf4e616eb0cbc
 EBUILD bcc-0.20.0-r1.ebuild 2258 BLAKE2B 329dd78d04cc25a380fa4421a1553442e8084af2a615c160b06354e92bbef5003e2283969872eb608216443135848b397c9e15a78ade1e0d50a6849f2ce17035 SHA512 138bc254388898b03ebf0d17b95651753f6c08e5496e6b0306ad2380ba343333d2d32169f0851e2121e51d57c733574cde9557b6cb31e73e5023dc45bb870e3d
-EBUILD bcc-0.22.0.ebuild 2533 BLAKE2B f5379c1d341c9cf8cf1f629b3f22545ff5edcf5752db7b1192704d84d84aa56c4232b192befd3423ddc447da7b6cf9b5721605a8f4cc486a9b93032f45f4204c SHA512 f3e42b5c4c62c03ecee48a515c31b3b6909a5238f1ffdf10716386137550b3ecfe72cf5e81b6d16ecf5a3786570824effa4052e5d6806780e19ef0f8eb6b77d8
+EBUILD bcc-0.22.0.ebuild 2533 BLAKE2B 948441d97a61b7ef0925bc6c03c130ebb56d25ada7be353bd087efaf8d37423c2b9ea407b93efffa963cd09c999e941f9f24efa20c863f07f3dc8b8b9a7084f8 SHA512 180d12f060eda41a33e57539f22eb7334e116a7d3227a2bc041e897213f19344ccb499b5d9e7ec4d455aac66e896ff88d989c866a727aad8ba304dc9dd4c4a29
 MISC metadata.xml 387 BLAKE2B 01669ac6fdf60ea78bc4c7fff0838ea0877a961591fd5fd069e4e4f44a991978c1de7966ae175d761d06ab5c78a142ddb451b116f29c182944795362f3c219f9 SHA512 6fc774ad3f929b31dbe44ab2413c480e4ddb5fb7eec0566fac65190391facd50fc65b6bd91a4dde51b00be2e1c1ef157e74e0f4bff0a5417df1e56a0e79f700c
diff --git a/dev-util/bcc/bcc-0.22.0.ebuild b/dev-util/bcc/bcc-0.22.0.ebuild
index 7e7f541d74ce..d3f591ee94f5 100644
--- a/dev-util/bcc/bcc-0.22.0.ebuild
+++ b/dev-util/bcc/bcc-0.22.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 		~dev-libs/libbpf-9999
 	)
 	dev-libs/libbpf:=[static-libs(-)]
-	>=sys-kernel/linux-headers-4.14
+	>=sys-kernel/linux-headers-5.13
 	>=dev-libs/elfutils-0.166:=
 	<=sys-devel/clang-13:=
 	<=sys-devel/llvm-13:=[llvm_targets_BPF(+)]
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 4225fbc8927a..28fe5fc631a2 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,7 +1,9 @@
 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
 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
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-188.ebuild b/dev-util/diffoscope/diffoscope-188.ebuild
new file mode 100644
index 000000000000..de3d809fe6a8
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-188.ebuild
@@ -0,0 +1,109 @@
+# 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/glslang/Manifest b/dev-util/glslang/Manifest
index 1465dc0aa9b5..907d1a96ca6b 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -5,6 +5,6 @@ DIST glslang-11.6.0.tar.gz 3419655 BLAKE2B fb510b0e6e5986da117fb3d1ea7f1c543c5ac
 EBUILD glslang-10.11.0.0_pre20201216.ebuild 890 BLAKE2B d2ae97e1228f30154c2e0674284aeee59943c6b97c619a594106e0765353c14a58e5a03ab03a024a934ccd6b6d66091764af9ad181dc79f577a495037415ef77 SHA512 889bd334d5a13e3ad22e97de659687bdcdc575f30cb45e21a4c253e469181008a5fdb05ef6ca5a21dc03ae22ef3ebbcf88ac8d09941c1d7ce0442942d826f5a0
 EBUILD glslang-11.2.0.ebuild 855 BLAKE2B 76f4c363a7ef228854cd948e1017f92c5cda2bca6240a4e011745775981a35266e06a84d9aa77092d111b4685218027facdf7390a020f1bfb074598ce5529ea7 SHA512 c6032b4b76e3cdcb80ff17e7c6dacc1df7930fc58869a6a48df3132665f4ad6661cf3b726f70ad2b5ee660331f90daa1607285aec6dbabcaa063e3b41d963f5f
 EBUILD glslang-11.4.0.ebuild 855 BLAKE2B 76f4c363a7ef228854cd948e1017f92c5cda2bca6240a4e011745775981a35266e06a84d9aa77092d111b4685218027facdf7390a020f1bfb074598ce5529ea7 SHA512 c6032b4b76e3cdcb80ff17e7c6dacc1df7930fc58869a6a48df3132665f4ad6661cf3b726f70ad2b5ee660331f90daa1607285aec6dbabcaa063e3b41d963f5f
-EBUILD glslang-11.6.0.ebuild 861 BLAKE2B bffd4abe4cf2742a3b4b69c8462175a09dca24545000686ef3fd3a5620abf5aa2af5648b0bfadd90871674b3b21534eb3b8f777306c657e56da3b95edfad50ad SHA512 96086d4cade525c556c58b6c869fae8c14dc8d2096b792cc028e989ad65fa5e7a9ca66cad22d01c708abeee810575924c49748b1b27ea18b5ce6d8c686a749fd
-EBUILD glslang-9999.ebuild 758 BLAKE2B 802d3dec30280cea4dc1c5b8dc652495537f93ef3b52c7d60740d8f9d6ea1343f22b0f0f4b6bc127eb3bca925daf6b1837a1763416cb27489e6db07173aec4ca SHA512 c8db05953380d7c0709e25a9507d5f043a05da423d9e119ae09ef00e5afae939c209b078a0b6da9d6072f07d04c3c20fd9d3827f6fdd71c793ea21036d4e03a6
+EBUILD glslang-11.6.0.ebuild 861 BLAKE2B 8e8d0ba9c6267dd859cce1f5f0bc27f70cd22be0a5cecb524f282b3d8cec5bb7e2d317116178d20d8f9c1f78e5178fd32727e82c0eb118d4064fd6b8fbdcdd4a SHA512 934af1c892fce857e59fd344108a8175b76a8c148ffdba33675033366801903586e359f64db56271adb46f8afacf0ba733983e4b40fdbce093a3522c8ea938dc
+EBUILD glslang-9999.ebuild 758 BLAKE2B 6a3a5b145b048e33843d1db82b7bc94765b793a87c264e45e351a62d1d1162252e1f718fe62f859145a6ab83fb1c286ef9df26e9ed7d80646f5c0e58a541194b SHA512 6d3e6b61e5b5680b37c8cfde18db1de5d28de91211fd1d7d2a2d347ee4e1573ce7d6008d6ced6f76251bf7f629334ea706b281ca4db6d0011054ab4362bc4418
 MISC metadata.xml 330 BLAKE2B c3874bbe807a8dd1a55897feadfc0a89e4cb806441390ee7e7cc317f3b533a08338a669834122ede89cefd9b6532d789aece2c29fcc6cdfc7f76a81bf382192b SHA512 1c591a28214fb76334171e4a49c8ac302b6f174f265749ad005f2503df1312e8303c92a68248775ed3db98d65107471f9cfc8cfb758c89261f283711beaac764
diff --git a/dev-util/glslang/glslang-11.6.0.ebuild b/dev-util/glslang/glslang-11.6.0.ebuild
index 2fe500d17138..ca3f1905892b 100644
--- a/dev-util/glslang/glslang-11.6.0.ebuild
+++ b/dev-util/glslang/glslang-11.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
index ae66106f0080..bae2c9f13ff2 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index e45839c3b300..51b51fd63c2f 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,14 +1,9 @@
-AUX intel-graphics-compiler-1.0.8173-fix-missing-limits.patch 744 BLAKE2B 61e7fc376d7e5aa197794f8cc7f9cd4fc469ca4a7f0e9463c4d066ad119869da7ce6501d542e3c660326bd6131769534339fbedc18e954c49eb471243c48059c SHA512 c1ca22cb158c2c83e9bc355cc9c9aa4d710877c2431c0d769013e91fe15f6c4245e529de08b889548dcdecec34ce3708a2b976fb9ccd7b4b69e11c066878582d
 AUX intel-graphics-compiler-1.0.8173-opencl-clang_version.patch 1807 BLAKE2B ec6aac8c78d7584e043a258585cbae6218fd8aa167d853e1eea96313298df7347ab7652ec2bf83199129e07e534d52fcd200858036e3d0af2c4f79ff249104f2 SHA512 1a0db341aab280aa205965dfc82d17b29f681bde76932f8291243afad985523f601c7279b1fb772ebc4d9197e5016941a1ad07cea2b6d7199710a7ee22fd81dc
-AUX intel-graphics-compiler-1.0.8365-cmake-minimum-version.patch 1572 BLAKE2B 978ee89e5067a56a168f74b9707307a2f2dc6aedac1521f0494b4891ee269dfceedb06b951d0e0a6bc68d157bca83ed8f3285f770afc7facfe0cf8921a0e4ae8 SHA512 e751206b5a14be92e6bacf2b39cbd87efd462dcba935be028a8b648e4a36870456237b66c361f3ac5481896cd2c1beb145b75708fa6b52219fe3a42e238193ee
 AUX intel-graphics-compiler-1.0.8365-cmake-project.patch 774 BLAKE2B 7b117f1acecf2aca35e8ef46725da4e1f4b077e87b06bd99b64504cfb21b2834dc921bbe7cfaebd34ebf864a85506859b3689d5cae76e6506c4d96e4304735dc SHA512 23c754019408cb12e9341545a627847db853c92618c58fba87b295fb4430d077154f20e241f692354dee50e624f008e8b765c60e17339988c04c583f4636a56f
 AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c30c3e50a71e9eac39eccbcc9bc798be574324016c6c31ed3a3f82e1499f1aada5a2c475bd6b6c467b1b236635fdd6b5145904bc63dc53f8d75e5 SHA512 d1d53a6f4a47031ec4cdcf3f57c059536ccf571a72929da3d9070487686f91f4202d20c4d626da616250f66b31815b61fafa82b903b1f5157a226ee748097bda
-AUX intel-graphics-compiler-1.0.8517-fix-missing-limits.patch 661 BLAKE2B bcfdbe8442511cc6b0c6458da9728c64dc740c1e67673e2a8c29288b6f6c51b3d48ad9134e39e386aa6302333dcddf30a6dce3f6f20d476bd7a32041ed31d617 SHA512 a1ae9d3c4d8bbcb5977d150dbf1ba3686870d959d7cadfd0c487bd724ba02369e09c1efb8d8cd55179c37791500aecf889f7a4368e54ad1f89c538f56744ddaa
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
-DIST intel-graphics-compiler-1.0.8517.tar.gz 7539946 BLAKE2B 034d2e3dcfc25186e29eebfabffbca7b8a5adab1f766c7515b4a3206c9c52eca3dd766e17320ea0c40067385fc6235d92eec13f1d12909915b86fb42a7862825 SHA512 35f09d1f6b117e78814cc235d03b1f1164f11a2d2a5d188b6658677c4b759422048764e765f7690f4789dc8b8c068714a68642c2d956ccc84b387a959f9af07f
 DIST intel-graphics-compiler-1.0.8708.tar.gz 7574517 BLAKE2B 578b29a103d3d0b7f481971a801fa11bc14430b7ecd00c99492f5d80ce713b84d00d278726a425edf5884ac15f4877c96a39a3f3f3f1c22bc972db039be28dc2 SHA512 3685c2fe0750d860facd7f378a1de4ac21127e7720d7a8889ac0ae8ab9e58dfacfc50b5bbe37d5744c9a17958b057512871125b58784a8c62ddffc2997f80ba8
 DIST intel-graphics-compiler-1.0.8744.tar.gz 7586378 BLAKE2B 0f20f99a2659f733521af35c1dd63c2b1398bf4fc5745a217b96ad62cfa53f105d4c9a34eba09651d0f0679d6957820011446f5657170f5ad07d110372b8b1f3 SHA512 dbbe6c08f32b80be305add570187df883aacefbf90b252c70b5705ecc7732f25873732a85558f0aed2ee8db5bcd1a59aec4d7ba110774922dbb19d4d3522a539
-EBUILD intel-graphics-compiler-1.0.8517-r1.ebuild 2318 BLAKE2B aba7063f8d157c725b96e0ba9b70a477b118b6dafc38297b504441ada084c47b5cde1b257e22d17544305117b240f692a90001c19087ed5b7f41ec2563b399f7 SHA512 1c4379d581c748b8f33f7cb0c2800207d5ad9ca078758d4df9dabd49cb4347ef5764a2ab4ea2647950cc214a4078f82084a41923934945c2687a11a8fbaa368b
-EBUILD intel-graphics-compiler-1.0.8708.ebuild 2151 BLAKE2B da55de9cac3423aebbd2351da31b893e0dc88c66db6cd55d2b7e0910436ee61e602903f793933103f6b8b1020e6d751dc2fd3ac2c701b115c8a983adbbdd1d2f SHA512 eddacd9ca77a9327b01b160c8e7d15201707e027f237f99d8fb1382d9e81764cbde555ec7a36eb822eb013f351f1367ddf775521ffada6ba412de35b8551f5e7
+EBUILD intel-graphics-compiler-1.0.8708.ebuild 2150 BLAKE2B 217fa07639962ee989287889658a1816c9a21237f862fa0a40f0d96c149769c6c778c798b95ef4e2dfef31dede8bfa0b17723b69b3f96fae5f654cad026b5256 SHA512 35be130f95ef04a171293c885c9c3d7df549cbfd21e28f454d0dc4fa3c575e8a40c91988cd2e9a70ac6df05facc44bda036828154014fb00fbb64c4e29e9c1f4
 EBUILD intel-graphics-compiler-1.0.8744.ebuild 2151 BLAKE2B da55de9cac3423aebbd2351da31b893e0dc88c66db6cd55d2b7e0910436ee61e602903f793933103f6b8b1020e6d751dc2fd3ac2c701b115c8a983adbbdd1d2f SHA512 eddacd9ca77a9327b01b160c8e7d15201707e027f237f99d8fb1382d9e81764cbde555ec7a36eb822eb013f351f1367ddf775521ffada6ba412de35b8551f5e7
 MISC metadata.xml 594 BLAKE2B de9f434fc853417b9d1c6199c7501c9fe702aa68b0eaa0f88d298563431de126fbdc259f0d541e85674b0205444f5d1febf0433b292a6ac40661d62af23457d8 SHA512 b939b315122a5fe3252242ccab8fbf049d9234ee67c6910969c178bcb56fc835bc954380f8c15bab23905ac852fa0fe0640f6ef2ee9d48502ae0e3379d7f7460
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8173-fix-missing-limits.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8173-fix-missing-limits.patch
deleted file mode 100644
index 406262d2d914..000000000000
--- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8173-fix-missing-limits.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix compilation with >=gcc-11, taken from upstream:
-https://github.com/intel/intel-graphics-compiler/pull/190
-
-From 8e1a461d3e6b85a6cf018caf6abf4a3ba9a1758d Mon Sep 17 00:00:00 2001
-From: Bruno Pagani <bruno.n.pagani@gmail.com>
-Date: Wed, 4 Aug 2021 20:54:21 +0200
-Subject: [PATCH] Fix missing include
-
----
- visa/iga/IGALibrary/IR/RegDeps.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/visa/iga/IGALibrary/IR/RegDeps.cpp b/visa/iga/IGALibrary/IR/RegDeps.cpp
-index 83c226a316..585896631e 100644
---- a/visa/iga/IGALibrary/IR/RegDeps.cpp
-+++ b/visa/iga/IGALibrary/IR/RegDeps.cpp
-@@ -10,6 +10,7 @@ SPDX-License-Identifier: MIT
- #include "../asserts.hpp"
- #include "../bits.hpp"
- 
-+#include <limits>
- #include <sstream>
- #include <cstring>
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-minimum-version.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-minimum-version.patch
deleted file mode 100644
index dcf762872a18..000000000000
--- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-minimum-version.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 419ae48d0e2cb932a6618e9012b4164e93e58279 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conikost@gentoo.org>
-Date: Sat, 28 Aug 2021 00:16:23 +0200
-Subject: [PATCH] IGC: CMakeLists: adjust minimum_version
-
-As CMake warns about possible compatibility problems,
-the minimum version should be updated, as it should be compatible.
-
-Otherwise, the warning is printed:
-Compatibility with CMake < 2.8.12 will be removed from a future version of CMake.
-
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- visa/CMakeLists.txt                             | 2 +-
- visa/iga/GEDLibrary/GED_external/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/visa/CMakeLists.txt b/visa/CMakeLists.txt
-index c70d80d5726..3e54bd93079 100644
---- a/visa/CMakeLists.txt
-+++ b/visa/CMakeLists.txt
-@@ -68,7 +68,7 @@ if(WIN32)
-   cmake_minimum_required(VERSION 3.1)
-   cmake_policy(SET CMP0043 OLD)
- else()
--  cmake_minimum_required(VERSION 2.8)
-+  cmake_minimum_required(VERSION 2.8.12)
- endif(WIN32)
- 
- # In the case where this is the IGC build we need to add a dummy custom target check_headers
-diff --git a/visa/iga/GEDLibrary/GED_external/CMakeLists.txt b/visa/iga/GEDLibrary/GED_external/CMakeLists.txt
-index d3011ddae6a..e40313fc194 100644
---- a/visa/iga/GEDLibrary/GED_external/CMakeLists.txt
-+++ b/visa/iga/GEDLibrary/GED_external/CMakeLists.txt
-@@ -10,7 +10,7 @@
- if(WIN32)
-     cmake_minimum_required(VERSION 3.1)
- else()
--    cmake_minimum_required(VERSION 2.8)
-+    cmake_minimum_required(VERSION 2.8.12)
- endif(WIN32)
- 
- project(GEDLibrary)
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8517-fix-missing-limits.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8517-fix-missing-limits.patch
deleted file mode 100644
index fa7e86806d04..000000000000
--- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8517-fix-missing-limits.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 212e98dd569187455976a8d2b26ce6398a9c3cc1 Mon Sep 17 00:00:00 2001
-From: Troels Nielsen <bn.troels@gmail.com>
-Date: Tue, 31 Aug 2021 23:02:08 +0200
-Subject: [PATCH] Include limits
-
----
- visa/Passes/InstCombine.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/visa/Passes/InstCombine.cpp b/visa/Passes/InstCombine.cpp
-index 10152aaab36..29b9d5e50e2 100644
---- a/visa/Passes/InstCombine.cpp
-+++ b/visa/Passes/InstCombine.cpp
-@@ -7,6 +7,7 @@ SPDX-License-Identifier: MIT
- ============================= end_copyright_notice ===========================*/
- #include "InstCombine.hpp"
- 
-+#include <limits>
- #include <functional>
- #include <unordered_set>
- 
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8517-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8517-r1.ebuild
deleted file mode 100644
index ae38d6757579..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8517-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="11"
-MY_PN="igc"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake flag-o-matic llvm python-any-r1
-
-DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="debug"
-
-DEPEND="
-	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
-	sys-devel/llvm:${LLVM_MAX_SLOT}=
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	>=sys-devel/lld-${LLVM_MAX_SLOT}
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
-	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
-	"${FILESDIR}/${PN}-1.0.8173-fix-missing-limits.patch"
-	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
-	"${FILESDIR}/${PN}-1.0.8365-cmake-project.patch"
-	"${FILESDIR}/${PN}-1.0.8365-cmake-minimum-version.patch"
-	"${FILESDIR}/${PN}-1.0.8517-fix-missing-limits.patch"
-)
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# Since late March 2020 cmake.eclass does not set -DNDEBUG any more,
-	# and the way IGC uses this definition causes problems for some users.
-	# See bug #718824 for more information.
-	! use debug && append-cppflags -DNDEBUG
-
-	# Get LLVM version
-	local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
-
-	local mycmakeargs=(
-		# Those options are ensuring, that we are using
-		# the system LLVM with the correct slot.
-		-DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
-		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
-		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
-		-DIGC_OPTION__CLANG_MODE="Prebuilds"
-		-DIGC_OPTION__LLD_MODE="Prebuilds"
-		-DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
-		-DIGC_OPTION__LLVM_MODE="Prebuilds"
-		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
-
-		# VectorCompiler needs work, as at the moment upstream
-		# only supports building vc-intrinsics in place.
-		-DIGC_BUILD__VC_ENABLED="NO"
-
-		# This will suspress some CMake warnings,
-		# which cannot be fixed at the moment.
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8708.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8708.ebuild
index 0e7e9889129e..21d5303b49fa 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8708.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8708.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="debug"
 
 DEPEND="
diff --git a/dev-util/intel-graphics-system-controller/Manifest b/dev-util/intel-graphics-system-controller/Manifest
index bd97124374ac..0963edeffe6b 100644
--- a/dev-util/intel-graphics-system-controller/Manifest
+++ b/dev-util/intel-graphics-system-controller/Manifest
@@ -1,5 +1,3 @@
-DIST intel-graphics-system-controller-0.2.3.tar.gz 124505 BLAKE2B 50bfaf5dee2fd55d92cd7e544faa8c26930f809b1f4d6dbdc332aec0ace0ced9e21817479c87c4ec12d1117209696b2146c2c6aeb1cfde4ad654d065547e8a6b SHA512 a3ecac36170b0f5c508e077c35336f5c2122d4cc2917e68237af3c92fb82b5f080deee4dded68cb36922cb9edd4d78f7b7a6ed2295649a538ab83ad30c280761
 DIST intel-graphics-system-controller-0.2.4.tar.gz 125476 BLAKE2B 82c803dc654240a364416dcca6c1104ec96eca6a0ffec058394ec2594d87bdd6854a3b0143ad6e114b5b4359b15f787679c995fa60fcbbcf5097467c15252217 SHA512 57b0aa1f5cfb6c103903be590d94f4a07c33c90180e688b62b2434baddf16637a6fb6c160c225fa08cf2d0efc80a42c6b86de48b71fb6aa08bd3f9fe2ff79fa6
-EBUILD intel-graphics-system-controller-0.2.3.ebuild 1095 BLAKE2B f81e54e15daa0a3583a41c44e012e1862f327ed59518d4fc5490e7200356861c57fc4736b7f46a5d8881ee5e34f4f9d00c611a5031b57480e40f6094017dba61 SHA512 3a5820321d723a95a86c64daa5d2d1161bfcc9daa75cbc49916d5118a6efbd089757561bbf55c873c8306c34e69b739a0cf904345ea81390b6d82777cee9ac62
-EBUILD intel-graphics-system-controller-0.2.4.ebuild 1096 BLAKE2B 368b10a3c4a1d920ea2653edcda7ec720982f82a39369b16c8f0f968ea11c634d061d9f8f89dd3d3ed2fa25902bbe5bf38fb81f61752055127d76eaea33fe475 SHA512 f2607af18461daf5db2adc1775ab0c55796cd78063cb34f65306ddd76ee5782ebb94de93de0755496dd8564a146b745291ba29949c969fcc82237e67531e08c8
+EBUILD intel-graphics-system-controller-0.2.4.ebuild 1095 BLAKE2B 4f263d9a3f0a324229cda02102f060750dca8a51e494441e779ba2ad9755fd4b003613aecee1701d0cb2e9750d1dd8e170f377c72853f64a90d891f74a9aa2a9 SHA512 23fef1e0fa26ab9e5cc4fd7bc80bf41023ecb81e8c03569af97d01be8a97bf8ca04f66b6fbaa2dcffb8f97143c20472140146e2a771b34d72e943015d883bd62
 MISC metadata.xml 674 BLAKE2B a0d4f2c1989040b8cddb6ec87f0758bcd758e442b802f61a1f04da442288724ff296185e8c982247663fea70bf8a05f3cd1091033e4bf081ec3af9a03d623c2e SHA512 afcf2cfffad24226e64efc6116e01ec0750b8ba2df62871f090727e5300f98b8e166dcc7b025a29365cf83ea38575d8f63a705ebb478c83c416b8abf4ddb0fb3
diff --git a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.2.3.ebuild b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.2.3.ebuild
deleted file mode 100644
index f38cef881cca..000000000000
--- a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.2.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="igsc"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-any-r1
-
-DESCRIPTION="Intel graphics system controller firmware update library"
-HOMEPAGE="https://github.com/intel/igsc"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/V${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+cli doc"
-
-RDEPEND="dev-libs/metee"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		app-doc/doxygen
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-	)
-"
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CLI="$(usex cli)"
-		-DENABLE_DOCS="$(usex doc)"
-		-DENABLE_ENUM="ON"
-		-DENABLE_PERF="OFF"
-		-DENABLE_WERROR="OFF"
-
-		# If enabled, tests are automatically run during
-		# the compile phase and we cannot run them because
-		# they require permissions to access the hardware.
-		-DENABLE_TESTS="OFF"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.2.4.ebuild b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.2.4.ebuild
index bb2e878960cc..500c29ddd3f3 100644
--- a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.2.4.ebuild
+++ b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.2.4.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+cli doc"
 
 RDEPEND="dev-libs/metee"
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index 4152e49d245b..4f0982b10d84 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -340,5 +340,5 @@ DIST winreg-0.7.0.crate 21225 BLAKE2B 5841db683dc0aa8b92de8ec43100403b029c8d3e54
 DIST xattr-0.2.2.crate 11750 BLAKE2B a5fc393d16935411a89e152e7afe9622f5b78cc207c1f3980c65f26adbe177efaa6c93e0c6ecac4ee0687609a932c957efb11678c9176d44010eebee651fc84c SHA512 a89d34313c35ab02d6ea25675c99f9c9650dee40a76223d62941edda43b3d2db83ed223bada129625b3cf8487c293646ce9980afc6dba8888fa078d5aa035cab
 DIST zip-0.5.13.crate 48237 BLAKE2B 0ffd9c41535f3e49d091b831925e8b639f3128702deafc75e0ea712b67df6f0900ec79628dd2640eb9b91fba7e828abd8b5c9edad87fbe7b22e042ef9909b07f SHA512 b30950ede91cdb1d4ef4f9d6aee8f62a3aa5a1a6422bd10507dfd76edc02c1bd24d41c7bf2ac416a5ee045562cacda0d17cd04938ec02b8be0a0d64acbaf7e01
 EBUILD maturin-0.11.1.ebuild 5275 BLAKE2B 9f97bf1e93b11e3835e9b3b971a3b84c581e386f931c40a32932d838a84d431e9df70e1af00cf15850e91eff081121c49cd4a81bec96a7cd551c7adf0a18338c SHA512 94f9ea78018432bea6a102f7019cb81e695df088182a4e5eb03a0515fa091fcdeda15ce199915fd7319ec5b1c6ee8a07a7975e2158ba1702391eaa384afdd329
-EBUILD maturin-0.11.5.ebuild 5436 BLAKE2B 371050840f00457fca54a64ddee726e9a58fa64bfb362ed87ef0ea682deaea707c0147f26e898b0c5b8a5605b23b6fcdce08869b5707294f6cd69541c4a74027 SHA512 d11769cb7b1954f30a1d8f8397345fab96c6c9caaa4d5ec91c942f4f1b2bdf58b8b6d16df3c7fe455a404b14a3dad0ec291870ed5cb356d9e8fcec8e2a90b939
+EBUILD maturin-0.11.5.ebuild 5553 BLAKE2B 4ed1a53fa77f99f5cb3356064860e1b5bb83765ff9b556330ec1647b3cd195f3c55c3fcecb309072c8a8be2a6b71e71efeafb605ee0385b5fdff464d97702891 SHA512 0f02023d890b66e453274f9880e1547b5a4342109523942010ded8803466789823001e7a1dff0f57522f970c127ed42c64803eda42306e4189277bd5c9808b58
 MISC metadata.xml 536 BLAKE2B a94fef48d69a1f23ab4cb0c676c47c8b3b3337f78f2095384e9ef73fcf04a9c117766b633cca82c8bde782e70051a944d7508863e36e69f821de7399ea4afab8 SHA512 b66a31403684e70656c7cc25cb0654ac04e4e5c79f822ef3c4ae8aa9ff44fbd13914a90290c922e98c2e55e90a06f9250b93d71fdab51a7d2a727c33d872f247
diff --git a/dev-util/maturin/maturin-0.11.5.ebuild b/dev-util/maturin/maturin-0.11.5.ebuild
index e4c63d8660ab..896159452b6d 100644
--- a/dev-util/maturin/maturin-0.11.5.ebuild
+++ b/dev-util/maturin/maturin-0.11.5.ebuild
@@ -243,7 +243,7 @@ CRATES_TEST="
 	scopeguard-1.1.0
 	smallvec-1.7.0"
 PYTHON_COMPAT=( python3_{8..10} )
-inherit cargo python-any-r1
+inherit cargo flag-o-matic python-any-r1
 
 DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
 HOMEPAGE="https://github.com/pyo3/maturin"
@@ -254,7 +254,7 @@ SRC_URI="
 
 LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0 openssl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="test"
 PROPERTIES="test_network"
 RESTRICT="test" # uses venv+pip
@@ -278,6 +278,12 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
+src_configure() {
+	filter-flags '-flto*' # undefined references with ring crate
+
+	cargo_src_configure
+}
+
 src_test() {
 	cargo_src_test -- --skip locked_doesnt_build_without_cargo_lock
 }
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 610918d10084..482c620e7f5e 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -3,8 +3,10 @@ AUX meson-tests-rust-add-libm.patch 828 BLAKE2B 1d1165703aa3c82295a25860d85c6f3e
 DIST meson-0.58.2.tar.gz 1899464 BLAKE2B 48c4c0cec2cb1c55e51cd56e08461ad7d95211d83bb60085f32493cb8d53cfeb00234fa1ab62ba8fbf3baf726231c7e9b098a0630281fda63402a860337528e0 SHA512 31496da729ede0813d5b6cfcc891e8376108252ee8a8148d23e8a4c2a4109b9b0dbc7e9e59acd954fb7de38ceb35f05c3a916eb6d4e106656d9ea8e7536ac4b1
 DIST meson-0.59.1.tar.gz 1944678 BLAKE2B 08dee8ada7824faf93b730bd8cf86113fe85ecf57c53a7ee4be89371004e13b99e14933761398e6db5a359c5aad07a96f99c0b5be144a75c749e40d153cefa7f SHA512 c45e29869dc681675b2643c37c892e7fff365c051edce4f2ec278fc6cee25bac6818add819e4db69d2fe3c1ba9572fc55bb8f67fe791cdc9c187627c71b01963
 DIST meson-0.59.2.tar.gz 1952115 BLAKE2B f3946976e793540c78c54de367c6576bb35c1217fdc45c1e6f62e12edb9f755d6bceb850fecd313ec71e49e59fc3ab856d68af8874333b787d302c4f41784543 SHA512 910e4a8c9828506b576dc8ae0b5765efec24f44a34a5694f782c8a533d75053b10b4167564c06456d05f7a32c5fd9bd657faa62329e1e4ed24bfc4c9ac1ef73e
+DIST meson-0.59.3.tar.gz 1953620 BLAKE2B 333ae9ac7925101b0371c9171d0e8368bbff1669a3c9709becb95e73e53042aa2e4223c3272d0b0a3f24b5b43035a58d73c72655a55e10314cc027ababd485cf SHA512 4ffca094474c09567a69f576b25588c38e18d3a96d0b1d592adb05493a5d6dcfcd1a6549a821862a5aabd3df34d81b3a90d01e012e62c7f46bd98152337c0ea6
 EBUILD meson-0.58.2-r1.ebuild 2757 BLAKE2B b64fd553319824c0c05059a41b639b4b8260196f17c4bca32cb587ff9775d11d97cf75e5634b1880105920169a950abc777946182a6c54da04d7f108cb406d1e SHA512 d43bb51ac9853a6820b40c2e683882982aea1ed8334d000459c7fa46607d56c8737651e48f313062345c68f1ceba66197e46f6d7d5bddfc08693ad242403ba54
 EBUILD meson-0.59.1-r1.ebuild 2804 BLAKE2B 8ea60235201c73c667985ea4cb48d45ced5453e2da646352cb52368a6b28a4fba4d664c1405254205a1697dcf4e94885a1028c28faefa35f93ecb715197a3b32 SHA512 bdebf4f3646e6d32318647d9edf5a1845edcc0e23ce36fb2d498c3d53260d68a7b89050d8371153c8394da7d89ec5aec5d9aff8df878ce03311979f086b9d61d
 EBUILD meson-0.59.2.ebuild 2812 BLAKE2B 67d7f42cfadfc3152a4a1b2f95be694439b34040c20d56b1d533d30668ec58ffd89305438a38dcd0c1f3d1afe4ca817ee8eca5d05ec36cb88ebeafd1851412a0 SHA512 90f775a4130d9570e01d8db6e35f7ba94371062735837e18f77f9b2b3ccff7e35ed6fe4342d0b132a8b7b157562e39fb3da1ebe19d8037280582c55e31317662
+EBUILD meson-0.59.3.ebuild 2765 BLAKE2B bcedeae1c647c0c1b9616919db71562b2c3326ab3e94a3f3fde83d2525af2ec1623c726b841f7e72784e717fce408a450d8e69f53773aa05713c8b1306394b5c SHA512 1f3c9bff2134fa8d5a79b810ba37c9970021208cb616b46dbb227b34bbeadd2884f06d76ccb2fc89a38be4fc1fcde834fe1cb97ac0923a551e0c102faeefc674
 EBUILD meson-9999.ebuild 2686 BLAKE2B 01ac1e0754290c41a97cf65b5505a2a811efcec356322e1c315cb124f77c2afaf182b8cb0fb98a5c89244ff0e1933062afd83f0acebc760cf43b8b1f89071a0f SHA512 d2883e8cc040e67e215150bae5a52f3e7b1db566f0becdf2f411e1c10941c0b3586ab93426f5ef0cf273737ca76ffd0b288853bdf841e87106c23e08acb5752b
 MISC metadata.xml 424 BLAKE2B 9e8cee51a5a6699950f1f4fc203732032afa7b36229bd4117a2b2164761ba0375bbc2c6001a81b48b67171f4b9850e948f6da229cffb9649acc0f514a675c922 SHA512 266b94131a352512bfac11c3db7ff840a6d050eb71c814a5223c9d3bb6f1be30506c9188ef1725a2b435c0b44923aa3efcea5f3d041f0acce0141dfe37ba66c4
diff --git a/dev-util/meson/meson-0.59.3.ebuild b/dev-util/meson/meson-0.59.3.ebuild
new file mode 100644
index 000000000000..5d637ceeeddc
--- /dev/null
+++ b/dev-util/meson/meson-0.59.3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2016-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/meson-mcompile-treat-load-average-as-a-float.patch"
+)
+
+python_prepare_all() {
+	local disable_unittests=(
+		# ASAN and sandbox both want control over LD_PRELOAD
+		# https://bugs.gentoo.org/673016
+		-e 's/test_generate_gir_with_address_sanitizer/_&/'
+
+		# ASAN is unsupported on some targets
+		# https://bugs.gentoo.org/692822
+		-e 's/test_pch_with_address_sanitizer/_&/'
+
+		# https://github.com/mesonbuild/meson/issues/7203
+		-e 's/test_templates/_&/'
+
+		# Broken due to python2 wrapper
+		-e 's/test_python_module/_&/'
+	)
+
+	sed -i "${disable_unittests[@]}" run_unittests.py || die
+
+	# Broken due to python2 script created by python_wrapper_setup
+	rm -r "test cases/frameworks/1 boost" || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		# 'test cases/unit/73 summary' expects 80 columns
+		export COLUMNS=80
+
+		# If JAVA_HOME is not set, meson looks for javac in PATH.
+		# If javac is in /usr/bin, meson assumes /usr/include is a valid
+		# JDK include path. Setting JAVA_HOME works around this broken
+		# autodection. If no JDK is installed, we should end up with an empty
+		# value in JAVA_HOME, and the tests should get skipped.
+		export JAVA_HOME=$(java-config -O 2>/dev/null)
+
+		${EPYTHON} -u run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+}
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 90456e2db6b0..cc8b137275e4 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -1,6 +1,8 @@
 AUX cuda-config.in 406 BLAKE2B 1f1bb67d1f13da52821d640ac1875affb0ba1562df8c3eb6d2fed24c0639f8e6ff43428701c5a2d1538e444356db5e9854e6ea629a1e3b2e1399ebacef2ca388 SHA512 df6d16bd2e800868bdf8401b6f82a387b701ea297ddf6e8feb0daf5222e62a33f156e5f45cf1ee4e1aa51559dfbd56b897c257dae1bb9568e839bf806bfebd5b
 DIST cuda_10.2.89_440.33.01_linux.run 2645419389 BLAKE2B 236aa70a7b45e3636c2c229fffa7d1ca0699ab4365865a73edab607a209c42c2899133dd6a83c61c5929fa754668ad15aec4d847639af1c00a8e6657c8487c77 SHA512 ad8da539ff5df7caf411d1e497ff3d6978cfa8a1fd9150fa4846089e92a604ea56be8631f3efdfe7229a655b8d2d28e6edb32f5731530a77d6f00241cc7aab6e
 DIST cuda_11.4.2_470.57.02_linux.run 3833993301 BLAKE2B b12710da9f31e3255f31dd6b0dab8545463983a4cd1c4432bea027d4e5cc4d1ad9183e09b70ac4ea19c7d3e959df0d19bb41ea896d726e877fd3917a3045a9a4 SHA512 50c80141bfe458aa7216173d9d548f25ade03c68fff59ffe63f842773e5afba7635fb8fd79eda416507e1e88b5fe28b39ac8bdc66b168c73a72995824af5c689
-EBUILD nvidia-cuda-toolkit-10.2.89-r3.ebuild 3925 BLAKE2B 5b193f9ba23ffe42a4a23a5e4dc0b526246286fa27c14b7d1bf41e50e24ab46c619f73e371bc1c0034ecd549839631c9f184b2ece8499150e9fa6350ed137add SHA512 30b1a97475666e9e19a1390ebac946d9c1c1b8c61fd35a44239ed751b53943eb66b4002e3b17bf9dff33d45a730db7b1b7c4d0a57cc09bac38609822eebe9fa6
-EBUILD nvidia-cuda-toolkit-11.4.2.ebuild 7136 BLAKE2B 5448967cc8b24db1cf2c382f93c83c29aa8f5fd105ae3f4389b0c9a7f652c527e0262d11068727fa4712a30f36b98548072a11d765692998bb883e2d6e7b0dff SHA512 28b7317bb2f044d5fbe25bcb098387de8c8406181de666c48c1ea43ea97ed39b8047e5f36224acc9e8c87e2d2d8bd5649120fd666443f462df710b590198f87c
+DIST cuda_11.5.0_495.29.05_linux.run 3392192516 BLAKE2B f23587ff49e3fb247b3d7f6959695079955531503b202b4a93d907f81a8598ee01d44060cf60df0b0099d7f53d8025acf9e0d1766fb79639eb1b049f30919973 SHA512 577127699e8f91892f29b58b959cc15ed48dd96940184cc23970efdf419671a8232b5f291d39cb1721f465d59539eeb1c9a3d528acfd776fa8387ba235fea2e7
+EBUILD nvidia-cuda-toolkit-10.2.89-r3.ebuild 3928 BLAKE2B 00b7552cbc2663ca5a95b9a89e076816e10d4629a9c276e8258debf0de67fac36e29b4937d42637d4890d0cf27773d3a7409ee121838df956878c7ed6f1ddf13 SHA512 2ce3292d3128e7dc647b9dfe0694b53ca27ec50b37238f894a2736c8a9e2617b918c3fe85492e9589bc4dd6ebba42f4ad3dea4385d86262fd1b15e03b3df4c02
+EBUILD nvidia-cuda-toolkit-11.4.2.ebuild 7157 BLAKE2B 612adad65b311fdc6c609ab1af213486f5f8a13f40f805d3ed1b48036248ae9cd86012dc019727db57cf6ee9b09658d4b799e302895e9f059b48ad9b9316db90 SHA512 b3f3202162548f79f60d04be1e4a144148daba3068a8e1b84648a92acfa21c3ab6d7a409f1f534ce9357bd22bb3638a87be877e721c1023ea42dc413c7f6a060
+EBUILD nvidia-cuda-toolkit-11.5.0.ebuild 7157 BLAKE2B 3eeabf492013f812b4feb6f99f64d272a9c7e71da21d32c3a8db10dd418291676f1e2b8c7c7e4261fec9273de8e0e35854b4e1ee7f51cfc208fc3e6045cf2ea3 SHA512 a3d48c5f0c0a6da9e138c0747a35ba5602f10eda97eba55f49c861e9ba9ee05f525832cf9c67124379925c88add1978395badd32e3c52a406f6329be17a8ba52
 MISC metadata.xml 725 BLAKE2B d956929a7ec405eda0ca359de7edac9760a5b781af053c1ef54405612eae5380796601d13a443c48aed6ff0e7819339d8728dfe3b7a27fef17781aa1a1b6b36a SHA512 c8f9bce93904f604b5bd89367dc7d06c977ba574f3ed8bfe9f8afde0bd7b55706987a79e3e4d3cd79d609cac83a8db2efa693e348a6c825136872ea5d0de4df1
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r3.ebuild
index 9c782027dba0..53782c8b93a7 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r3.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r3.ebuild
@@ -95,7 +95,7 @@ src_install() {
 	for i in "${remove[@]}"; do
 		ebegin "Cleaning ${i}..."
 		rm -r "${i}" || die
-		eend
+		eend $?
 	done
 
 	dodir ${cudadir}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.2.ebuild
index c929782ee396..88637c0358d5 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.2.ebuild
@@ -92,7 +92,7 @@ src_install() {
 		if [[ -d ${d}/extras ]]; then
 			doins -r "${d}"/extras
 		fi
-		eend
+		eend $?
 	done
 	dobin "${T}"/cuda-config
 
@@ -101,11 +101,11 @@ src_install() {
 	ebegin "Installing nvvm"
 	doins -r builds/cuda_nvcc/nvvm
 	fperms +x ${cudadir}/nvvm/bin/cicc
-	eend
+	eend $?
 
 	ebegin "Installing nvml"
 	doins -r builds/cuda_nvml_dev/nvml
-	eend
+	eend $?
 
 	if use sanitizer; then
 		ebegin "Installing sanitizer"
@@ -113,7 +113,7 @@ src_install() {
 		doins -r builds/cuda_sanitizer_api/compute-sanitizer
 		# special handling for the executable
 		fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer
-		eend
+		eend $?
 	fi
 
 	use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64"
@@ -123,7 +123,7 @@ src_install() {
 		doins -r builds/cuda_nvvp/libnvvp
 		# special handling for the executable
 		fperms +x ${cudadir}/libnvvp/nvvp
-		eend
+		eend $?
 		pathextradirs+=":${ecudadir}/libnvvp"
 	fi
 
@@ -145,7 +145,7 @@ src_install() {
 		)
 
 		dobin builds/integration/nsight-compute/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
-		eend
+		eend $?
 
 		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
 		ebegin "Installing ${nsys_dir}"
@@ -170,7 +170,7 @@ src_install() {
 		)
 
 		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui}
-		eend
+		eend $?
 
 		# nsight scripts and binaries need to have their executable bit set, #691284
 		for f in "${exes[@]}"; do
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.5.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.5.0.ebuild
new file mode 100644
index 000000000000..84b21d734454
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.5.0.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs toolchain-funcs unpacker
+
+DRIVER_PV="495.29.05"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+S="${WORKDIR}"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger nsight profiler vis-profiler sanitizer"
+RESTRICT="bindist mirror"
+
+BDEPEND=""
+RDEPEND="
+	<sys-devel/gcc-12_pre[cxx]
+	>=x11-drivers/nvidia-drivers-${DRIVER_PV}
+	debugger? (
+		dev-libs/openssl
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses-compat:5[tinfo]
+	)
+	vis-profiler? (
+		dev-libs/openssl
+		>=virtual/jre-1.8:*
+	)"
+
+QA_PREBUILT="opt/cuda/*"
+CHECKREQS_DISK_BUILD="6800M"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	# ATTENTION: change requires revbump
+	local cuda_supported_gcc="8.5 9.4 9.5 10.3 10.4 11.1 11.2 11.3"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+	local pathextradirs ldpathextradirs
+	dodir ${cudadir}
+	into ${cudadir}
+
+	# Install standard sub packages
+	local builddirs=(
+		builds/cuda_{cudart,cuobjdump,memcheck,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx,thrust}
+		builds/lib{cublas,cufft,curand,cusolver,cusparse,npp,nvjpeg}
+		$(usex profiler "builds/cuda_nvprof builds/cuda_cupti" "")
+		$(usex vis-profiler "builds/cuda_nvvp" "")
+		$(usex debugger "builds/cuda_gdb" "")
+	)
+
+	local d f
+	for d in "${builddirs[@]}"; do
+		ebegin "Installing ${d}"
+		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
+
+		if [[ -d ${d}/bin ]]; then
+			for f in ${d}/bin/*; do
+				if [[ -f ${f} ]]; then
+					dobin "${f}"
+				else
+					insinto ${cudadir}/bin
+					doins -r "${f}"
+				fi
+			done
+		fi
+
+		insinto ${cudadir}
+		if [[ -d ${d}/targets ]]; then
+			doins -r "${d}"/targets
+		fi
+		if [[ -d ${d}/share ]]; then
+			doins -r "${d}"/share
+		fi
+		if [[ -d ${d}/extras ]]; then
+			doins -r "${d}"/extras
+		fi
+		eend $?
+	done
+	dobin "${T}"/cuda-config
+
+	doins builds/EULA.txt
+	# nvml and nvvm need special handling
+	ebegin "Installing nvvm"
+	doins -r builds/cuda_nvcc/nvvm
+	fperms +x ${cudadir}/nvvm/bin/cicc
+	eend $?
+
+	ebegin "Installing nvml"
+	doins -r builds/cuda_nvml_dev/nvml
+	eend $?
+
+	if use sanitizer; then
+		ebegin "Installing sanitizer"
+		dobin builds/integration/Sanitizer/compute-sanitizer
+		doins -r builds/cuda_sanitizer_api/compute-sanitizer
+		# special handling for the executable
+		fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer
+		eend $?
+	fi
+
+	use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64"
+
+	if use vis-profiler; then
+		ebegin "Installing libnvvp"
+		doins -r builds/cuda_nvvp/libnvvp
+		# special handling for the executable
+		fperms +x ${cudadir}/libnvvp/nvvp
+		eend $?
+		pathextradirs+=":${ecudadir}/libnvvp"
+	fi
+
+	if use nsight; then
+		local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${ncu_dir}"
+		mv builds/nsight_compute builds/${ncu_dir} || die
+		doins -r builds/${ncu_dir}
+
+		# check this list on every bump
+		local exes=(
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libexec/QtWebEngineProcess
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/CrashReporter
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherSubreaper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu
+		)
+
+		dobin builds/integration/nsight-compute/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
+		eend $?
+
+		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${nsys_dir}"
+		mv builds/nsight_systems builds/${nsys_dir} || die
+		doins -r builds/${nsys_dir}
+
+		# check this list on every bump
+		exes+=(
+			${nsys_dir}/host-linux-x64/nsys-ui
+			${nsys_dir}/host-linux-x64/nsys-ui.bin
+			${nsys_dir}/host-linux-x64/ResolveSymbols
+			${nsys_dir}/host-linux-x64/ImportNvtxt
+			${nsys_dir}/host-linux-x64/CrashReporter
+			${nsys_dir}/host-linux-x64/QdstrmImporter
+			${nsys_dir}/host-linux-x64/libexec/QtWebEngineProcess
+			${nsys_dir}/target-linux-x64/nsys
+			${nsys_dir}/target-linux-x64/launcher
+			${nsys_dir}/target-linux-x64/nvgpucs
+			${nsys_dir}/target-linux-x64/nsys-launcher
+			${nsys_dir}/target-linux-x64/sqlite3
+			${nsys_dir}/target-linux-x64/python/bin/python
+		)
+
+		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui}
+		eend $?
+
+		# nsight scripts and binaries need to have their executable bit set, #691284
+		for f in "${exes[@]}"; do
+			fperms +x ${cudadir}/${f}
+		done
+
+		# remove foreign archs (triggers SONAME warning, #749903)
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-glibc_2_19_0-ppc64le || die
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-t210-a64 || die
+		rm -r "${ED}"/${cudadir}/${nsys_dir}/target-linux-armv8 || die
+
+		# TODO: unbundle qt5
+		# TODO: unbundle boost
+		# TODO: unbundle icu
+		# TODO: unbundle openssl
+		# TODO: unbundle mesa
+		# TODO: unbundle libz
+		# TODO: unbundle libstdc++
+		# TODO: unbundle libSshClient
+		# TODO: unbundle sqlite
+		# TODO: unbundle libpfm ?
+	fi
+
+	# Add include and lib symlinks
+	dosym targets/x86_64-linux/include ${cudadir}/include
+	dosym targets/x86_64-linux/lib ${cudadir}/lib64
+
+	newenvd - 99cuda <<-EOF
+		PATH=${ecudadir}/bin${pathextradirs}
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64${ldpathextradirs}
+	EOF
+
+	# Cuda prepackages libraries, don't revdep-build on them
+	insinto /etc/revdep-rebuild
+	newins - 80${PN} <<-EOF
+		SEARCH_DIRS_MASK="${ecudadir}"
+	EOF
+	# TODO: Add pkgconfig files for installed libraries
+}
+
+pkg_postinst_check() {
+	local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	local b="0.0"
+	local v
+	for v in ${a}; do
+		ver_test "${v}" -gt "${b}" && b="${v}"
+	done
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		ver_test $(gcc-version) -gt "${b}"; then
+			ewarn
+			ewarn "gcc > ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+
+	if use profiler || use nsight; then
+		einfo
+		einfo "nvidia-drivers restrict access to performance counters."
+		einfo "You'll need to either run profiling tools (nvprof, nsight) "
+		einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
+		einfo "a modprobe configuration file "
+		einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
+		einfo
+		einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
+		einfo
+	fi
+}
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 36eaa8b6548b..bd7b573a96ae 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,4 +1,4 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
 DIST pycharm-community-2021.1.2.tar.gz 466806126 BLAKE2B 403cc5949ccb0e5f7d39d55b91d962889e35342715501466c007a5b3b044cbe33260de99e7d299f35a6e789c6f7e5726bc7106bc206d4e4890f8948eab7a15a2 SHA512 180d813d1162456312eb4482f414443350d784effab56cc53f2f6c2c79931f9af597849ec395089d8fc1ca2b87015722fad3cc43e03bfb4418e2c926b5af0107
 EBUILD pycharm-community-2021.1.2-r1.ebuild 3198 BLAKE2B 94d0ce4a952f182fcca3d10ab2f405d9fec7dbfa10638e5bf73f870300cb4b172fe6c1717ebf2dbeb3a731900ac981c87ebc327d6108b2917498e1a26f0ba607 SHA512 6fa94b51a29292e428850e99ae95776339a49afa4d8840d2f5b876546e797755c09778e60387fba9442f4a4b19ac6c8caaaca44d94cee59413231e4eb8042db9
-MISC metadata.xml 306 BLAKE2B 56b4f20dca3d6e6b39229962378e2ce466b3f92bdd9486f601b7fd2fb6dfc0f5b57bb8064976318e2a9f2c62f9d2ef681d7ebde2dd033b40d57efcb50b8640ff SHA512 029ff3f0a4566a567d59c559622ea419296b191ac06e0e2f73f6eef2ea6c29802a51e24a0387ec8b8f6d33b5a238548cd18fd74d5884e0c3a8770004f0c9cabf
+MISC metadata.xml 229 BLAKE2B 1b25fb59c17f81a5c4b6dce7e07acb9de3bc64fef368805a0e1b45043dc13ab4898990b02b35d25ec3eb586aa67e236cc56519ed9a6bdb0d940f91b280e83141 SHA512 fcff4719a8e6c3cb446c48872c2278fa50ace7765d204b58d24f9ac0d47cb9fdaa7ed37080290ebc06d8dae864ccfdd8a48c9d9251a69862a6e5b58d5c26969b
diff --git a/dev-util/pycharm-community/metadata.xml b/dev-util/pycharm-community/metadata.xml
index 2ca1ee944530..abe40f18a4e9 100644
--- a/dev-util/pycharm-community/metadata.xml
+++ b/dev-util/pycharm-community/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<name>Mikle Kolyada</name>
-	<email>zlogene@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 	<flag name="bundled-jdk">Use bundled jdk</flag>
 </use>
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index 387974812e05..04705d8e05b3 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,4 +1,4 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
 DIST pycharm-professional-2021.1.2.tar.gz 580807899 BLAKE2B ba21f9ba000c34f3073b778b7314c727e5204de480afd34fd79e97aca2da673252324897d3f40bda998e8d6ad2645c173f9c0abfbaf745de2c58782faa18c29d SHA512 c76c3113c620084cb6a3a647998cde61b3a6b2e9ff05870469f3f980295d5853911521095e26fae365cd94d2f6843866ced39db5e510bef3495931c60094f49c
 EBUILD pycharm-professional-2021.1.2-r1.ebuild 3268 BLAKE2B 6faa46fe37be0396878a12d2fdc26ac332d6dbf75ba108b0aa81880af6bc316003b89afba7b67bdbfcb9947454f68cff6fd305d1075d350259206460b6b8830d SHA512 8694257403d8db978feec69b73546c59bc90db1c618ab10eaa1df56223f8e0d9cc07f15f05851e8781150c9cf1735917a592da6053208f77482e47aa1c238882
-MISC metadata.xml 306 BLAKE2B 56b4f20dca3d6e6b39229962378e2ce466b3f92bdd9486f601b7fd2fb6dfc0f5b57bb8064976318e2a9f2c62f9d2ef681d7ebde2dd033b40d57efcb50b8640ff SHA512 029ff3f0a4566a567d59c559622ea419296b191ac06e0e2f73f6eef2ea6c29802a51e24a0387ec8b8f6d33b5a238548cd18fd74d5884e0c3a8770004f0c9cabf
+MISC metadata.xml 229 BLAKE2B 1b25fb59c17f81a5c4b6dce7e07acb9de3bc64fef368805a0e1b45043dc13ab4898990b02b35d25ec3eb586aa67e236cc56519ed9a6bdb0d940f91b280e83141 SHA512 fcff4719a8e6c3cb446c48872c2278fa50ace7765d204b58d24f9ac0d47cb9fdaa7ed37080290ebc06d8dae864ccfdd8a48c9d9251a69862a6e5b58d5c26969b
diff --git a/dev-util/pycharm-professional/metadata.xml b/dev-util/pycharm-professional/metadata.xml
index 2ca1ee944530..abe40f18a4e9 100644
--- a/dev-util/pycharm-professional/metadata.xml
+++ b/dev-util/pycharm-professional/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<name>Mikle Kolyada</name>
-	<email>zlogene@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 	<flag name="bundled-jdk">Use bundled jdk</flag>
 </use>
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index aa76b1963e90..f39219ce405a 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -2,5 +2,5 @@ DIST spirv-headers-1.5.4.2_pre20210526.tar.gz 406038 BLAKE2B e10042a4c09668a6eb0
 DIST spirv-headers-20210817.tar.gz 414897 BLAKE2B f10997c6bca46d48a592ce12b59817d31b0e5cd77fa0518c8ecb0d1da56d54a49562fb8f6fd355feb964f93129a6304ec14ed2a5f1776c130c8e3b727fd93192 SHA512 837ebac5afe05b2eb08029058240a8f08d49eca701201f93181e3a9076a15b67421122e8322a4230d6e21766dc85396be6415d352769791d6a44dbae59ce908b
 EBUILD spirv-headers-1.5.4.2_pre20210526.ebuild 514 BLAKE2B 411e68b89f8ca47e4d7b28c863cc933df12034186ef6c811b65522aec05655be4d87bb20b9648cf51a31933447a7a22844325b4da7ff3b3cec37371ea28845aa SHA512 2595b8d59279ad0eb28beb55c4946c1848a7ab86fb8fff6e17a9ac085918a7f9f3c226729c5af86b19c860f6b7d2e65dabb754601df9e92073d88858435d871e
 EBUILD spirv-headers-20210817.ebuild 520 BLAKE2B 113a986d9b15fb5d3f5fb0357736a570fb5403a43514236a8094c1d632b4111b9d3bbf4bea703306c83b2542d98d7a2c41703368f60d74a2bc123851c48247f2 SHA512 4aa5bc2b62deca9958ba2a4072d026a8d166b403e81ecaffae7d1d42c8756e3dfe79a10236d0d1aa0f64fbdb7afc42065b2827ceb9583aea89a146b116928490
-EBUILD spirv-headers-9999.ebuild 600 BLAKE2B e52054009b4c2a119218fe8e7d1d7606a5355fa93c8a9e14d7e6174dc212d2c87a7d2c57106bd4d217c8fd0ab88234e5a186f700664ccbd04de8b3520afef10e SHA512 420d7be91c892302e0b052c9bf1a628d663f95051a6d38580944aafd1c43c395cb87cec8df6d2d756b8fb4a177b23671911f58c05e9e5b035a41b0b9bb399dfe
+EBUILD spirv-headers-99999999.ebuild 600 BLAKE2B 729bb67b02b0daed93cb0313be74c44443921d28f64cafce463efef0e6e7c50a0113dd770bbea8c07c5bbb606389e2f721909c3928a152a6c7f90cfde0b9f367 SHA512 2fe9de8cd13eb45914844fa56829c0e165a05ad721b5cae1db2bbc676a7f1e7d6ae76d7dbf9e226b21754db962750da4211ef31788d0b50524c7f7c82bd6e785
 MISC metadata.xml 431 BLAKE2B c29407612814c966f4134687e901ffff31be3990b771b3584f6517640098ba2cdf131ae84bcdc3da8398d77d1d51e3d6fe0180c564c0e8272406d246a5661578 SHA512 599da456349756e1ec66a1b36d9c05322c5aff088dc4741239a647550ba816333a2dab0e05049215e6d4b08222e06f3aa5a1f76697c7a15eda31b571afa3299a
diff --git a/dev-util/spirv-headers/spirv-headers-9999.ebuild b/dev-util/spirv-headers/spirv-headers-99999999.ebuild
index 7da32106bb4b..a20a5880576a 100644
--- a/dev-util/spirv-headers/spirv-headers-9999.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 6d7e0678eee7..d7d6f0567f05 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -2,5 +2,5 @@ DIST spirv-tools-2021.1.tar.gz 2613619 BLAKE2B ab5816e3407ba827f5db69cb391b0e482
 DIST spirv-tools-20210825.tar.gz 2852443 BLAKE2B 87c24d6c5506097cf24b3008450e54a652c1e9d0ad1dd61499b65cc93e4783db2f86b3138ef2c8f33b8b242fc55dfa279d135d347bd21dd8977773ae302ae430 SHA512 d99cb85527810413e6df386342a5d0de201defe401fd175f0cd15604dcba0f8c157b63b4d49be64b5161b6a97c0a6ae16fe82080368ec6eb64cd71300d056bea
 EBUILD spirv-tools-2021.1.ebuild 1254 BLAKE2B f59d178590ac5c0985abb3698c6a2b7618e6f199fbc5018cac01b2e9f63b73ed87e6f1d05bd5bbfaf6edc929e9ab119e46bfae51573b621c7a7f6a694634b9bc SHA512 6a47a37de6a9b741e37c279f8cd910486b1978ab3e94bb89013d7d30b648e511e90559d1798d95b8a9d1816c18509668e5182125b8e7f790c02a53c99c4f434d
 EBUILD spirv-tools-20210825.ebuild 1249 BLAKE2B 0ed3b9118c7ee8068f67d50db3400ab1cc0a953d7720e049f40b50cbcd6aba39af44b6c13afe876cc1847bb15f20a88e4461e8ab2f7606f3f81a29739c0199f3 SHA512 794f2c7a03e71fada2ebdc627a2a75fc7121c5719b2794d9402e44d60453adf429b721b038156c7449d778fd268945c4a914e3e83aa0bcb7ec3684ec47ba3f85
-EBUILD spirv-tools-9999.ebuild 1249 BLAKE2B fff6ed718fed7223911810ad47847230aa3f77c08925893e63e04cd55d4c3486b4e653d26e638a44bce7d9cdce178dff9a01e8b5d99777b245eac9b8563453b3 SHA512 0081fdbc259e420597b3efcd1985cc4e30a963bbc08e49701fb1b7218b092d2af373d510cc484a2e8a1de8e9032f91d0d49272e09f9a5645042bebd9cf278dd1
+EBUILD spirv-tools-99999999.ebuild 1249 BLAKE2B fff6ed718fed7223911810ad47847230aa3f77c08925893e63e04cd55d4c3486b4e653d26e638a44bce7d9cdce178dff9a01e8b5d99777b245eac9b8563453b3 SHA512 0081fdbc259e420597b3efcd1985cc4e30a963bbc08e49701fb1b7218b092d2af373d510cc484a2e8a1de8e9032f91d0d49272e09f9a5645042bebd9cf278dd1
 MISC metadata.xml 429 BLAKE2B 8d9917ace6eaaab8b826f48bc6f38c629efc5245a5356d821632867b8a65246180dcc14927db6ed1e025a32d7bb248aa35e3a7095c79bff5a2e91b3d880de997 SHA512 3f076c95eb788258a2451c3b54a013eeb936fed744b68499f53970590fc846d79b9724198ed54300a57395b1f4f2a657840bf8aa7ff25dcef8cdf28aa7f35ae3
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-99999999.ebuild
index fa22fe6b2b6d..fa22fe6b2b6d 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-99999999.ebuild
diff --git a/dev-util/tkdiff/Manifest b/dev-util/tkdiff/Manifest
index 76c91e00e0e7..c8308fbd00ec 100644
--- a/dev-util/tkdiff/Manifest
+++ b/dev-util/tkdiff/Manifest
@@ -1,5 +1,7 @@
 DIST tkdiff-4.2.tar.gz 92063 BLAKE2B 4c3d1fbbc4bc76c8a39dca454a6630b8022acf33aa11b899db8960534f3df91fa068162fd0a7f16a00c6dde697d8cfd6dbcc4157035a340e162e113ceaf102ac SHA512 6c16475b808a9ac4d51a3e0b348d12739d821743eb205281473408a722ef7329e7dee61b4e0536741fab0c88eb67b00080d84598fca5e3215d4b183a858f6984
 DIST tkdiff-5-1.zip 233467 BLAKE2B 711d5bf0ea1d919d235e5cfcb76c2597a849293652544a5bc5ed969ca8d1a9720a406504b07d382a1ae84447709984fddf627129e70f4d043648731bea54039e SHA512 76301e74a1396ae540470fd0f4b8c7b4e214bdb4027f5ed52d98e5ea48afd99971a7880d1ec54812f6f13a3f1e92c7cd0d2c4d6d0b6e098e47fd36759fe7a047
+DIST tkdiff-5-2-1.zip 245828 BLAKE2B 9241224d40aa229c169fe87beca7a276a00c9a37de8c9e92c50103954a56e2fe117e06985f5885ffe0e9a87abbbf1a8098a7832d3b6afd4a44f3457ce83c6e32 SHA512 d151c1bc755010f797458db9d8689c727beeff2bede5245dc79239f738fe63e49a95207b5d034dcd69e1ee2e699b78acdc94799f4dc5530c293435c902c387e9
 EBUILD tkdiff-4.2.ebuild 464 BLAKE2B d7a1c7a5d5fde9dc93380cc85f0ca8f8db194f2e8aec60c1d53c4e3f2391d026587a840877f945bc08d9020d7d6234d5ba3e9cd5691dfdc852d9521af71835a8 SHA512 fc42bcfce5cd905ca23f7f81a53c6c8882c5a51eafb441737656e2592a35a4a5a5b5500f4b3ecbfb3a0436906bbc09f81a1e3fe8da78c874bb9cab93b3e9d3c3
 EBUILD tkdiff-5.1.ebuild 513 BLAKE2B 475f427a466e817a89e0221c91fc9afc5cb33d0e1fb972fc818982f8a9971fd477e43f91c9d9002ab0ee4150f80970a4616cffba92bf63e42fe551d6b5bc8661 SHA512 7e45a9d06c7d68756ba0f94c70c465ab3d3bf058812c9af62f78da5ad37bf11f0f726f9aebdcb3573c6f8856920f4f1c07931b088f99ca2f8cb8b5c3cbb0fee7
+EBUILD tkdiff-5.2.1.ebuild 513 BLAKE2B 475f427a466e817a89e0221c91fc9afc5cb33d0e1fb972fc818982f8a9971fd477e43f91c9d9002ab0ee4150f80970a4616cffba92bf63e42fe551d6b5bc8661 SHA512 7e45a9d06c7d68756ba0f94c70c465ab3d3bf058812c9af62f78da5ad37bf11f0f726f9aebdcb3573c6f8856920f4f1c07931b088f99ca2f8cb8b5c3cbb0fee7
 MISC metadata.xml 330 BLAKE2B 5f4b2faa0f86877607bd86340353c8a9d85fc2b8c55e730baedccaa909ea212ee3092203f52f6c7470683f694af352879d00215da4f425f496caad5ad2b6e7e8 SHA512 2f9e7941ab8b77689ea2545524b639909ba09439aad65d496ae02f124c7d41fea1fec6a187b0ce39c9884f943860a6ac495186128880e9081e9ca95794250da7
diff --git a/dev-util/tkdiff/tkdiff-5.2.1.ebuild b/dev-util/tkdiff/tkdiff-5.2.1.ebuild
new file mode 100644
index 000000000000..e56f5cfb63a3
--- /dev/null
+++ b/dev-util/tkdiff/tkdiff-5.2.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MYP=${PN}-$(ver_rs 1- -)
+
+DESCRIPTION="Graphical front end to the diff program"
+HOMEPAGE="http://tkdiff.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${MYP}.zip"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-lang/tk"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MYP}"
+
+src_install() {
+	dobin tkdiff
+	dodoc CHANGELOG.txt
+}
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 87e1ecaf926b..28496b29abaa 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -3,7 +3,9 @@ AUX valgrind-3.17.0-lld.patch 2837 BLAKE2B 331c5eb91f476271a82d6730b5aa628ecf3a9
 AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2309f4b138915bd0315090cebd902747678a5b655a8178a8ec8e88782286470922aed505d2a69d6da4d295fd2053d640b035 SHA512 efdb017283b6a5829d1a5acc31b42ddd177a3ab468eb062b8c4fd90b2dbd06679e8d8bc2d6f813e3001efdda831d4410cc8da3a3e42ee2e49efea0423e4b3ca3
 DIST valgrind-3.16.1.tar.bz2 16262776 BLAKE2B 1c333c26827f7a8356869e8758da9dd6a7444642ac4f6377c84fdab8349b9cee1e9bf2cf2eb86043c4feffab342dd97da20e76d7566d0296189e6ea8483a8c65 SHA512 2a4173efe1b6facdd2f5c5ee8ed006704168eba1813736fccc8191d60363afd96197512cf42037e65f18d4ddd49adc74a54c47210df216fba3c46bf68ef0f950
 DIST valgrind-3.17.0.tar.bz2 16459075 BLAKE2B 96569db9bc3c25ca195a4caa64da6e96b9bff7edd82727fccccaa8307162e29f4e150386c7c9611152fc1afde609d0922aa84067957b72dff03810ee23045e9c SHA512 94de78942a7059e1ab84d1c0c0b8f3efd1c2d15c70b97bc7edc8136812778adb6f8187149d53a60a8c6a7c8b40534f9be5cfed0eb3c0c314545b681f950b108f
-EBUILD valgrind-3.16.1.ebuild 3702 BLAKE2B 606e290548a4dc97c07e0de746a8cf2bbc770b2235acff42862118c924c89486925d6074ce74428942999c6b5fb5682d8a9e18c05edcbdb894044e17fecb6ac4 SHA512 feadc6b2c6958bd9a873740e33fdd514cfc71715ae0d786cf6d03be733bea663889d05f6d282d78c76e1ca53d828138aeaed4ea0dff7f10a35ebe33a9333da52
-EBUILD valgrind-3.17.0.ebuild 3748 BLAKE2B 7323bfbd62cff9b57c3d7f61c182f579890fdfc9a2f8ed5748e834fabf29cba0cc81eb9492095c7f89c20875848cbef124860268bb01ddb16a7781ac903ccb0f SHA512 883440bcce991fa03a659a9e29838345b4531db773ad8ddc7ee63d421bf8bafabef747acaf5b4e3c773c5cbd929bd70443f0c2e56fdeeb6a9934e46c6f06bf1b
-EBUILD valgrind-9999.ebuild 3708 BLAKE2B 9061d6fc5afc28e07e64315e237be661a7f44aa1c1a4c85059caad534ca4b3ef87e1f89b5227287da255408c2ca7df62ba36a2acfe49497db08878a5c5379f72 SHA512 dc8d35a72e7b4bf46557ba710b4e42a54707dd547a58bfcbf404fffa5a78213a2a31a59206137d2af824eaa836763ab4edf5eb8dce73400c0d60dc8c4778fb66
+DIST valgrind-3.18.1.tar.bz2 16149159 BLAKE2B a98322e4c12ae1bc495659217bd398b85e459288e775ba5f543b9ce1faa5bdfc17791178c0e7b9703a31588cc4c7cbde814b7a43b2ec76e7362e2aeeb100d935 SHA512 a03b5cd7eafab4a1cea07f46464c1546ae1cb3d106649626b1e55658badf90e58d1f3854a38a33d5dffd8237f5555ae7e1f27a4b40e06254f87825c7fc61b59b
+EBUILD valgrind-3.16.1.ebuild 3703 BLAKE2B 311cbc2ba147e6bde2c6e8352eed928361be75f96c84086870b45decf3675107a2fdae7ae48bca5ddbc1ea5dbbd29bdb886b15f514bbb40d7eaf65772e46f5f3 SHA512 9f87ff366eb7e51d697527350c8135778537b8d2a09ceddc38e96b830f07eed040ade236bb204637e625b336f12508ed36240d0f8818aaa2e60a64e136947ead
+EBUILD valgrind-3.17.0.ebuild 3749 BLAKE2B 6d2fa93b2b3beee059041ea84c24ce99b96379907b707745d90799db4a4e5d034cd34cbaf22c8ef1a61be0c5d4f47877e71ea40080e36f58e5310153a46d0e86 SHA512 c892f4b885b12b9acd73e1a7c1af38256c72329d322ba9f1d1a9d4e815c1eea03e5754376be404a752735c84a1ec8213b0fcf2b010d222967ef71c409d7aea0c
+EBUILD valgrind-3.18.1.ebuild 3709 BLAKE2B f9d4b6fed9499012219a21a1de7e0344e4a39092ad7335619d0477b061dee65920cc344307dd4783a07bbf1ddc40af2bd94f24ce4c32a1e638b897275ec12095 SHA512 541920a4ce774a5d4b393da076417782d15bed8d0c09595137bfd92f7aeeeb6cd7871ac514d6864ce3a5709f23fbee95a6d648908026c5dd41a048fd151788d8
+EBUILD valgrind-9999.ebuild 3709 BLAKE2B f9d4b6fed9499012219a21a1de7e0344e4a39092ad7335619d0477b061dee65920cc344307dd4783a07bbf1ddc40af2bd94f24ce4c32a1e638b897275ec12095 SHA512 541920a4ce774a5d4b393da076417782d15bed8d0c09595137bfd92f7aeeeb6cd7871ac514d6864ce3a5709f23fbee95a6d648908026c5dd41a048fd151788d8
 MISC metadata.xml 1028 BLAKE2B 5e6d52b6a5e657f56dc8da70f83d340c8ad8ff1448b109916d77a51b62f9018dafaf20586684d9d5c0984647df9fb3886b9fc0fabcfd62bcd13ef8d5e1de223e SHA512 1b9bd9d815de416b73e03bb13f88b662b14b4c135a36549ea5ad69a59c9395a240b80c30e6847eaecc2318ca88a2081e71fed41af2e9eed5162dfca78c7af920
diff --git a/dev-util/valgrind/valgrind-3.16.1.ebuild b/dev-util/valgrind/valgrind-3.16.1.ebuild
index 7594d5e1682f..268884944a78 100644
--- a/dev-util/valgrind/valgrind-3.16.1.ebuild
+++ b/dev-util/valgrind/valgrind-3.16.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
 
 DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="http://www.valgrind.org"
+HOMEPAGE="https://www.valgrind.org"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="mpi"
diff --git a/dev-util/valgrind/valgrind-3.17.0.ebuild b/dev-util/valgrind/valgrind-3.17.0.ebuild
index 589e08e8b7d6..d1d6fdd5f4cc 100644
--- a/dev-util/valgrind/valgrind-3.17.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.17.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
 
 DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="http://www.valgrind.org"
+HOMEPAGE="https://www.valgrind.org"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="mpi"
diff --git a/dev-util/valgrind/valgrind-3.18.1.ebuild b/dev-util/valgrind/valgrind-3.18.1.ebuild
new file mode 100644
index 000000000000..4ccbda36806f
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.18.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="https://www.valgrind.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="mpi"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+fi
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
+
+	# Don't force multiarch stuff on OSX, bug #306467
+	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
+
+	# Respect CFLAGS, LDFLAGS
+	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+
+	eapply "${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# upstream doesn't support this, but we don't build with
+		# Sun/Oracle ld, we have a GNU toolchain, so get some things
+		# working the Linux/GNU way
+		find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \
+			sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die
+		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
+	fi
+
+	# Allow users to test their own patches
+	eapply_user
+
+	# Regenerate autotools files
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	# Respect ar, bug #468114
+	tc-export AR
+
+	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
+	#                       while compiling insn_sse.c in none/tests/x86
+	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
+	#                       because valgrind doesn't link to glibc (bug #114347)
+	# -fstack-protector-all    Fails same way as -fstack-protector/-fstack-protector-strong.
+	#                          Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it
+	# -fstack-protector-strong See -fstack-protector (bug #620402)
+	# -m64 -mx32			for multilib-portage, bug #398825
+	# -ggdb3                segmentation fault on startup
+	filter-flags -fomit-frame-pointer
+	filter-flags -fstack-protector
+	filter-flags -fstack-protector-all
+	filter-flags -fstack-protector-strong
+	filter-flags -m64 -mx32
+	replace-flags -ggdb3 -ggdb2
+
+	if use amd64 || use ppc64; then
+		! has_multilib_profile && myconf+=("--enable-only64bit")
+	fi
+
+	# Force bitness on darwin, bug #306467
+	use x64-macos && myconf+=("--enable-only64bit")
+
+	# Don't use mpicc unless the user asked for it (bug #258832)
+	if ! use mpi; then
+		myconf+=("--without-mpicc")
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if [[ ${PV} == "9999" ]]; then
+		# Otherwise FAQ.txt won't exist:
+		emake -C docs FAQ.txt
+		mv docs/FAQ.txt . || die "Couldn't move FAQ.txt"
+	fi
+
+	dodoc FAQ.txt
+
+	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_names on shared libraries, can't turn them into bundles,
+		# as dyld won't load them any more then, bug #306467
+		local l
+		for l in "${ED}"/usr/lib/valgrind/*.so ; do
+			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "Valgrind will not work if glibc does not have debug symbols."
+	elog "To fix this you can add splitdebug to FEATURES in make.conf"
+	elog "and remerge glibc.  See:"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
+}
diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index ff86af7c1d94..4ccbda36806f 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
 
 DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="http://www.valgrind.org"
+HOMEPAGE="https://www.valgrind.org"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="mpi"
diff --git a/dev-util/ydiff/Manifest b/dev-util/ydiff/Manifest
index e021ed75406f..f56b9a635df7 100644
--- a/dev-util/ydiff/Manifest
+++ b/dev-util/ydiff/Manifest
@@ -1,3 +1,3 @@
 DIST ydiff-1.2.tar.gz 42808 BLAKE2B 927482c2ed9a96efc354178679b4ba50497289bc31107e8cdef3062a71d91268fa703620f1f4b0be03aebaf339eba5254f4b43c16403f1d7818b84b0c450defb SHA512 0eb2230b64f43e20f6dc2411296389dc99356ef626152dc7f234583f70678e64a07b764fd89635479e7ac4aa7e2490db6e76c744369eefef8ab6a5386db1a7b5
-EBUILD ydiff-1.2.ebuild 641 BLAKE2B 53cccc6a97c0772121b2f0ffd1f741947e97f6462271c6bcfb7b5234ad813dd65c2112b6b4c7a4046dcc495ba4d9cdc4ee0b100a06f9059809ebc9fc1bb26480 SHA512 19588c622d32255dc894538f4b73a4e6f51e96bb7eba42cdf74d4f58f19606225b18b9427ac10edcd71429748fe00089e23acdf2f184c961a712e2beb7bdd45e
+EBUILD ydiff-1.2.ebuild 642 BLAKE2B 02d2770a6ae847c95a31d4afb3d8445b0aaf63009258f85d6763a46d8a7fe8c272a02b824da8d9d9206b28dc8682d3b4179ae98650c4e50aa80db0927bf4965e SHA512 f4b4f0d5419970026c66d14d8ed75ca052b60619f7a745aecb5e44ac82efea259e440def65ce8faf722feacbe437c30aa020ae0c1048bd0ee64b8d7989c4e424
 MISC metadata.xml 394 BLAKE2B 7333c46ff0d147ca8dc7eafd8e5f3eae67c7217467d45431585898948671df5e836995e89414fb95a9645f69c4f1d2020168a87b952115ce3b6225d89b46aa01 SHA512 781694fc99405f67446875b9fb40a306cd5223f1f27d1fff5f0bd2fe35aee1d6a518486999d06732e89fdc5759afdf0235615170718fea80ba0d69fc95f97fe7
diff --git a/dev-util/ydiff/ydiff-1.2.ebuild b/dev-util/ydiff/ydiff-1.2.ebuild
index 6e526b75dcfc..0e95f856c768 100644
--- a/dev-util/ydiff/ydiff-1.2.ebuild
+++ b/dev-util/ydiff/ydiff-1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
author	V3n3RiX <venerix@koprulu.sector>	2021-10-26 00:10:07 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2021-10-26 00:10:07 +0100
commit	95461df035e3867364495f065e5e805bf629b2d7 (patch)
tree	867dce371a84a696e91be255d89f282975aa0480 /dev-util
parent	46eedbedafdb0040c37884982d4c775ce277fb7b (diff)