gentoo resync : 24.06.2021

19 files changed, 105 insertions, 43 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 2235ad33a9ab..1a7d908f8d41 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index d17f2b279ed1..770b02e17c4f 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -2,6 +2,6 @@ DIST bear-2.4.4.tar.gz 50347 BLAKE2B 73fa332cf97413e55c588f8830806a26c6905299af9
 DIST bear-3.0.11.tar.gz 118678 BLAKE2B 209d904a84363a87e566798dcd65ffed96cdbf3d2e753af8dc2706adb995d2999bc112eabb88db28791cbb245c373eb330cf9c20d3d886bb2caeb5c01150e65d SHA512 6d362aede911a8ad35be30638a698579582ca5de770a7c3199bb205046f08f355387099261b8d857188d526ab62024f78e3d06a225734c5f9acca03e5dfea1ec
 DIST bear-3.0.12.tar.gz 118937 BLAKE2B 4ed41693a92583091b8510dd1ade55a3e5c897825205e59d9e9810aa63e5f17c5049b3b3de509665143083d44aeb6d85c63d944041bb36c6b1d842d0308d88f0 SHA512 e45e842793e9f5f2cd6b13a9795c2b6753c2fffd516e4af9f0362644c9d0952a2b0e505a4a9d53e9a1a4aa063d7368c6466367a78fececb70582ec7c4e8d7f10
 EBUILD bear-2.4.4.ebuild 1638 BLAKE2B 26435a94e41a295c629ca64a62f726a1ec58be5e85bcfbc312a2f6cd75d3232aae1e6854ad3415e99dfc369ce0e4a1ed0ff9e1b413332d24102015a2d1592d24 SHA512 c7d5cd603d219d8a1f764c728fdfb476b79b500b3db6c5513bb91397f88d4b5f46d4b16903834b93fff38f1fad243bca7c0c10d8893f2ce6238ac24847402e94
-EBUILD bear-3.0.11-r1.ebuild 2092 BLAKE2B 78d02fa040a3b65d218fee784dbd321257fd6380c7b48e133f6121b8f616771b29aa2fecb7c44074f688d11aff506a63fd93259d4ef6d774bcf0e04bc8ddabd0 SHA512 9d842751d1452f3fe79e9e76aa776e6b4395200b1028ff0d0c2050a7092fec98afc4a2bbc1d461d4b6c36e372a0942e1998f7c82bb8d97e48f9be74cdeaa4175
-EBUILD bear-3.0.12.ebuild 2092 BLAKE2B 78d02fa040a3b65d218fee784dbd321257fd6380c7b48e133f6121b8f616771b29aa2fecb7c44074f688d11aff506a63fd93259d4ef6d774bcf0e04bc8ddabd0 SHA512 9d842751d1452f3fe79e9e76aa776e6b4395200b1028ff0d0c2050a7092fec98afc4a2bbc1d461d4b6c36e372a0942e1998f7c82bb8d97e48f9be74cdeaa4175
+EBUILD bear-3.0.11-r2.ebuild 2094 BLAKE2B e32af6d46e56f141f388bb3bda434260384cb546348f3ef71a68ba74f7b0eed62bf42038446c4953f37d1bbb7b859a864623798ffd737ba0466c5b6f6ab7c8d4 SHA512 9bcbf26ce6285b39caa96dd1dc50dcfa0b0c8aea30949127ea9a97b7be197c0dcaea77b04b745ab6b31878bad988e613431d5593aa9342a5c5cb24c827210fe3
+EBUILD bear-3.0.12-r1.ebuild 2094 BLAKE2B e32af6d46e56f141f388bb3bda434260384cb546348f3ef71a68ba74f7b0eed62bf42038446c4953f37d1bbb7b859a864623798ffd737ba0466c5b6f6ab7c8d4 SHA512 9bcbf26ce6285b39caa96dd1dc50dcfa0b0c8aea30949127ea9a97b7be197c0dcaea77b04b745ab6b31878bad988e613431d5593aa9342a5c5cb24c827210fe3
 MISC metadata.xml 914 BLAKE2B 791cac2c9a3850bc49848ec8f6ff889a21802ddce6937783afccdda45045b3861f0c79e44028ea6df18f046c5fc1b6ad89ac1a940afc9e4d6607507a12933382 SHA512 a7b29ce47f3c9d91f2ba5d1abf5975d64a9229619737b75d38d54b3bde860a47a859e6de7a959ad67cba21b2a0ced8a9fbaf508c02cace63c4090afbac2005ba
diff --git a/dev-util/bear/bear-3.0.11-r1.ebuild b/dev-util/bear/bear-3.0.11-r2.ebuild
index 9f97558920d0..97791cb96b0b 100644
--- a/dev-util/bear/bear-3.0.11-r1.ebuild
+++ b/dev-util/bear/bear-3.0.11-r2.ebuild
@@ -19,7 +19,7 @@ IUSE="test"
 RDEPEND="
 	>=dev-cpp/nlohmann_json-3.7:=
 	>=dev-db/sqlite-3.14:=
-	>=dev-libs/libfmt-6.2
+	>=dev-libs/libfmt-6.2:=
 	dev-libs/protobuf:=
 	>=dev-libs/spdlog-1.5
 	>=net-libs/grpc-1.26:=
diff --git a/dev-util/bear/bear-3.0.12.ebuild b/dev-util/bear/bear-3.0.12-r1.ebuild
index 9f97558920d0..97791cb96b0b 100644
--- a/dev-util/bear/bear-3.0.12.ebuild
+++ b/dev-util/bear/bear-3.0.12-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="test"
 RDEPEND="
 	>=dev-cpp/nlohmann_json-3.7:=
 	>=dev-db/sqlite-3.14:=
-	>=dev-libs/libfmt-6.2
+	>=dev-libs/libfmt-6.2:=
 	dev-libs/protobuf:=
 	>=dev-libs/spdlog-1.5
 	>=net-libs/grpc-1.26:=
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 2935a794707c..750002951d35 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -2,6 +2,6 @@ DIST byacc-20210109.tgz 873282 BLAKE2B 3f856bfba00b692ecc5fd297582ff594873914552
 DIST byacc-20210520.tgz 878173 BLAKE2B feecf3708eb6269c046043bff7f3ca40f4d4240e1849283e970dcf1c2f665e8c43f46ca4913a332987b7c9883fea68947953c28bf3f8fc983ffe6b7a4d804c17 SHA512 0b119efbe8748f9b5959926c36ac006174d99deb7a9c84ce97b7b80a01d197dd4d1004788dfed87bc492410a354b06f01b848b8da20ce0f64466c527c091bf48
 DIST byacc-20210619.tgz 880118 BLAKE2B 29a8f586c191c46fcec8d2a4203332621a9f03875aea81d7ba21a4e4676843320213e765709f22a385cf4328060496c154d036d4d757dd925ae81857f0977fc1 SHA512 878c7b5ab17bcfb0acb29ab06066630ee42cae7e768c7386308ec1f58e61744b5b6baaf7e9416cef32f9be406af65eb8f791ccf6e192caaf3f34954e6bcc1642
 EBUILD byacc-20210109.ebuild 597 BLAKE2B d2369392975f705756da06a683bf456d3bc80737db5c54b4dc21ef1d52fae6fa8dd3128f1c8c25538c94f7beb22b8143186590c829a0dd81536c9c7edc5e1892 SHA512 8892e8d83199332d811e4ddb2e5abf92cbbcd4fe57815628650007f1e188ff851346badd284e8e5b334ffc6b2f506450e3db806c428cbb400829482a917afafa
-EBUILD byacc-20210520.ebuild 599 BLAKE2B 1a09519c8610b070e7520584d7cbadc7f44d4715447ad6e476d99607b6b1d3303ce29411ec2e7c7d499c8bcb23098c9a235d21c1b1f41e8810d759e5c123c03e SHA512 6de29daef5b00a9a5b7772f850a10f454f047efa133c16ad70144ca8ee58c600be33db4f0aaab14cbde63330c2fce83ca2b68695e8740ed45de62ad70c075342
+EBUILD byacc-20210520.ebuild 598 BLAKE2B 7b583a2ffa4b17d792892134145877668c2f993489bcd2f78bd215886b92a26176ceebca92897591d4ab9f0e0ec802af7ff9a1a509fee5f2d751807588314098 SHA512 9f6183702e89f4ff4196e77b9bf1fa42ee83375fbab42e1b0be8fda23163469433da4077e3ac9fb89ffd980ccafab6c086004f6f691199deb81df0f7e19b3924
 EBUILD byacc-20210619.ebuild 604 BLAKE2B 6f4b3612b5638cd6962ecb8eca298c0f92740750f45db9d53e45f9988d0d5c3e52b4031a02557adf4e7b1fe40e643e0f33206fc8397d9acb3076950ad11554ae SHA512 1062db25ea711b5ec17f4320a0e6826847bce4cc22c5416b298d66b82fc5dcc002bdf0ae125614bcfb77c153d13fcd7dcf72f67db32692fcd2af25c16186cfde
 MISC metadata.xml 355 BLAKE2B 10160435379a759071cde21a0195dbeaac5783119695a9d9b092090158c429d01280d2442d351e5dd8a6368ff11566f153e02abc07d81c19ace1838f1943a09a SHA512 b0b39011f45894df952d34cd75ee087fd42a77aeb5a0e60e4201fb404781d77c4a5a82d2492712ad0ac2a2daad029a19c1284f7fc8f624c2ed47fd0b55d680dd
diff --git a/dev-util/byacc/byacc-20210520.ebuild b/dev-util/byacc/byacc-20210520.ebuild
index 7719eaf8ab3c..1cb441fafb3b 100644
--- a/dev-util/byacc/byacc-20210520.ebuild
+++ b/dev-util/byacc/byacc-20210520.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
 
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index bb9bf30b5b8d..a9b29d16cf95 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -18,11 +18,11 @@ AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b54345
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
 DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
 DIST cmake-3.19.7.tar.gz 9271358 BLAKE2B 379b89c0d6bcfe81a397257cb3f95e4b4a8987566258f6d5b312e8ffd455fd07f09ed570c47111f9a519d76f43014b680e8242cddef13810ba87f9b9ec7e2e2f SHA512 6af1fe3ea41906324d4c29f5f982281d92145d086f4a47fa2220b93483bc65d59b1e23f5b51d82305c630690be7c552827bb795560674b03620763e0917bf14a
-DIST cmake-3.20.3.tar.gz 9440009 BLAKE2B 25098305b2fb9d719ffd3a25936207d98901651a6d9c6fe0757d4da3619274021025d7ce9f78b3813826c8b52347f12321db905083839d3882a2ba85a294561c SHA512 ed2b8b04c759c4f7c5c363be33bf08e6677c710c1f937050a378ab5539136b919531e1c927b117b3d8d68d4bb613de8d92a3d4d50f3ab3bc98355febca779a1b
 DIST cmake-3.20.4.tar.gz 9440363 BLAKE2B b04cf6e41878b8626b13516ecbe9d27f0fe801437342217389b739f1549743be10620e06aa521de4ab7b1dcb8f0a8208bf8b3805cca54ac782c320d938c8d9b0 SHA512 f53902a917b8d7b949af305afed3b32fcf981c5c647a77ee7a3bcae1bb5620381a1eacdac4b86bd7e5ea0a7806ec5fbd9a4f4853553f78db4d41d7dd2867c99f
+DIST cmake-3.20.5.tar.gz 9441947 BLAKE2B f073d7c3968c714be315f5014076c785790ed47e9a746f2d16bc59769fb6862009f67c2e118038c6c9d8390b709f2b4ed4a4dfc41a93996fedd9d7d77111b84a SHA512 4ad7f194353be291e76d86d95928633daea653a0bd8d35369ac6ee2bb3f811c3a1aabe6a2bd51c6d5b07af2c6edc7e38d8b347ded32ab1ddcf331dbfce40c008
 EBUILD cmake-3.13.5.ebuild 6239 BLAKE2B 5e3b289af5d341e73fbdfe6162330e9e39dac40276991f08df670fcff6e40438995b608704e535545c4538cedb7ed789c2cc2ae0b38a1fd0f3a2e9627c95a494 SHA512 e75ea6defa00993410ed865329b450f38f9ad418c59bfe345880bae25d2f19e4463a407d744527d3f5c6c59fe8cf732cad5ac6274901cfcf3809d29573be7ad1
 EBUILD cmake-3.18.5.ebuild 6070 BLAKE2B 24ab19a092db23bbcbf3d8f1a87e21cc8f17575e8eff885efa81c3fb0161204f8f821bda04ac819fbad5f73936db8b2bff38b688252a9bcab30a7df002adfc71 SHA512 59b479102626d771fbf66f1dccc011e33ca5e3d77bc37f291c6e28fbdf998b7b5853da56875345807714b85a1e95c7b41fe2f5e98f6486191b1c80d6962697c8
 EBUILD cmake-3.19.7.ebuild 6990 BLAKE2B f382eff3d258673c34e7642ec088f708281a6a65bed568b2094344fbd966eca22128dd93e382a88da16132291bd0f7c644362eaee0b34545c4d3df8ef512c832 SHA512 27af2c67d4a06e0cc3f0d86f003738a8def88a274dc3eda6da32de0b5f015a8e13f315ae93efbcec07cd9b95fc9f046786336f2a1b9ac9f5478610a440cb9964
-EBUILD cmake-3.20.3.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f
 EBUILD cmake-3.20.4.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f
+EBUILD cmake-3.20.5.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.20.3.ebuild b/dev-util/cmake/cmake-3.20.5.ebuild
index b1cc1455ac6c..b1cc1455ac6c 100644
--- a/dev-util/cmake/cmake-3.20.3.ebuild
+++ b/dev-util/cmake/cmake-3.20.5.ebuild
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 179a2e12a137..a134b3d91964 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,3 +1,3 @@
 DIST diffoscope-177.tar.gz 1590984 BLAKE2B 94daf9528c8fd0ad6ed89bdbee7b21352bf33dcef2ae7e526ea3b1036d92b6fecefcb0da46b7eedf7af1c8bd7995e73b8f0a5104c02f4db534f7bcc465c803aa SHA512 674a5cc364927437a79420b0965eb6958bd09df58a1238ea4d953bb2bc0fbdde75e42817370dd3cdab0bcc59551e1cff70db72298087af551d5dfaee57995811
-EBUILD diffoscope-177.ebuild 2583 BLAKE2B d1e590de5e1a9dcc0091863a74c983fa1bcad740fdf685c41c1f7f348c4f7fe614741365119eb1f2ebf60728c8ae108b22fd9a31e70aa0b35102ff1c222c63c3 SHA512 ea98891d82ffbc6ec9b1d3e992b5b1306cf23c300d85f8df56d265a1868d2f67c8f38b2db31e49e470fd852e501f5db9718dd9b1690ad582d88e5a8b1c0e0122
+EBUILD diffoscope-177.ebuild 3323 BLAKE2B acb100745327084b7476a4bc7f3df3d056974106f3c4b8c3ff1ec85e0e204df3ff43b892e8206424bc908b149130b7a6e40f828e885539f59c941d9a2f3bb907 SHA512 34a3dea18d4534232cea448f8565b4aae038f57bbfcf1b29bffd634dc12c5c15b1fd6b2a66959f57d7087984dd8dcab48b8f52cc5c54796a6fe606979db8e7cb
 MISC metadata.xml 2137 BLAKE2B 70393ec4166e001aaeeb4c10958693ff090b04e7e5bf7eb760746dc4920e0554724f61e1a073f008660789438bec33378796ebc117c1cedcac5116b0b1d32142 SHA512 a1f5648c7593f16db4df87b750360034647704b1809ed52d585d49b5769ee8e190ff853941d2739da7c5f514ef02442b3b3ebf55fb21541e7bc551c720a305d0
diff --git a/dev-util/diffoscope/diffoscope-177.ebuild b/dev-util/diffoscope/diffoscope-177.ebuild
index 9ae8834c67c7..6b1e9ecce520 100644
--- a/dev-util/diffoscope/diffoscope-177.ebuild
+++ b/dev-util/diffoscope/diffoscope-177.ebuild
@@ -19,9 +19,20 @@ KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
 find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm
 mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar tcpdump xz zip zstd"
+ssh tar test tcpdump xz zip zstd"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RESTRICT="!test? ( test )"
+
+# pull in optional tools for tests:
+# img2txt: bug #797688
+# docx2txt: bug #797688
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		app-text/docx2txt
+		media-libs/libcaca
+	)
+"
 RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
 	dev-python/libarchive-c[${PYTHON_USEDEP}]
 	dev-python/distro[${PYTHON_USEDEP}]
@@ -84,6 +95,19 @@ python_test() {
 
 		# 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/howdoi/Manifest b/dev-util/howdoi/Manifest
index bc7e2a6b7b1e..c25f4256ede7 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,3 +1,5 @@
 DIST howdoi-2.0.15.tar.gz 27545 BLAKE2B 204d7e3ddab07e24ccc08964c3880477743970502423887a2360079606c832b93d1e8fbcec237b77533c2e21d4a35af08b9418d5ce62f8b2ceca70ee844c21ff SHA512 e0b3faf1cde78d35a23e11070b3d73db7468bfe79ec8f71b2370681d3dea1bcf1a313594fd1e4f21aa62035460e5c31509ff683fea3e0e35e9412b173ad874bb
+DIST howdoi-2.0.16.tar.gz 28483 BLAKE2B 466ddc6b6f5a2bfbbf781dddf89d272b609d530b080a06dd33528727010dd6f42b823996bfb3fcbb4afea95fc667f61d30b1cf17a8c5fb1a4c66836be57e1110 SHA512 606346514670d891df91c6d3bd83cae599b2ed2d7d1908b8b805435579ea75c6e25f171bc31af1af7519ac142459b73cae7ffe93d747effb2fb0cee00aa59b1b
 EBUILD howdoi-2.0.15.ebuild 684 BLAKE2B 9f7cb5189659a41a8f1cc416557a676bdf309253390f801a43653bab3edfde6cd0f9b40452cca0943b9904fcf1951a0ea97ab31d984cbefd722c913f39d40bf8 SHA512 b3660bb4744592976f51a12f814d3c8c1d92581f20a5997a3cc582f8b5f053877fa59b9e64fd43a33dbeb9c662b6e8a84cf0ede02e12113f53290e5b14066036
+EBUILD howdoi-2.0.16.ebuild 686 BLAKE2B 7a92b6d345261177bd4d0139370a3c353d72f8181fa8bb85ba32430c52cacbbb05627e40661bb83f116796419927c96dcbb4905776400150d0e034ff0af66cb4 SHA512 7f5fed60db5035831ebcc5a5be3e178e9c0fffeba0bf2be1360c61d0c6795527a0ea4cb19fcdcde02d51f4312856352a8d2795ff5fe77d0977c147eb7b7a1cfc
 MISC metadata.xml 367 BLAKE2B cad999effcfe4ba7eb7fcce4efa22b7cc1bc501c01f28c647c8d94fd560645b96d25bc89703bd43c8f5a969606f9842e14f955bc7ace46fcff0333469843e62b SHA512 eacaf9118ec14ec50c3f22d0abf5deafb42ebbcb3bfbdb87f01c6908983b36c6c837b13f903c0cdd7be3137d9c999f66d7983157a7ec33685d08d608096f0e27
diff --git a/dev-util/howdoi/howdoi-2.0.16.ebuild b/dev-util/howdoi/howdoi-2.0.16.ebuild
new file mode 100644
index 000000000000..a0b3cd960b87
--- /dev/null
+++ b/dev-util/howdoi/howdoi-2.0.16.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS="manual"
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="A code search tool"
+HOMEPAGE="https://pypi.org/project/howdoi/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/cachelib[${PYTHON_USEDEP}]
+	dev-python/keep[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/pyquery-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index 57c9755c8618..75d59d239d04 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -262,5 +262,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST winreg-0.7.0.crate 21225 BLAKE2B 5841db683dc0aa8b92de8ec43100403b029c8d3e544adcaab030d998e5af4644ea176ac0bcd97141d137450a7bd761a5291405202c445a326da7d4f240686230 SHA512 a0b7a2d239e30cea89a863b879831bc32b5f2988ef3f0586ddadda48827cafc82d3602d2f8df3c47dc1e80537149a1ca1dc1506f9fbf960d9ba081dff1bac731
 DIST xattr-0.2.2.crate 11750 BLAKE2B a5fc393d16935411a89e152e7afe9622f5b78cc207c1f3980c65f26adbe177efaa6c93e0c6ecac4ee0687609a932c957efb11678c9176d44010eebee651fc84c SHA512 a89d34313c35ab02d6ea25675c99f9c9650dee40a76223d62941edda43b3d2db83ed223bada129625b3cf8487c293646ce9980afc6dba8888fa078d5aa035cab
 DIST zip-0.5.12.crate 43857 BLAKE2B 9b1b0dcd5f04300efd3c7e480eb0d14e7c36f2819a187c9b435da99f61c4ee93ca469fa4810a1bd52624138e51ac276a68e9d05df75bea5bbfe89d845f1c2662 SHA512 8ead1f24eb7c8c7624c80f8fdc17d85c397686b2cb45174bdc8cfab44417738e1d1a49ae3f776dc0fbb698b20b7de71e94afe1526f8814061289f229891d95f0
-EBUILD maturin-0.10.6.ebuild 5497 BLAKE2B 35dbe45c91658cf329585e737318aae80d69b3ef1b604e2baf8f98a399018c3d7d073c273ab48f1c02aca4d3c4e3ef267488fd36a99874da3cd8143e7c6f2c81 SHA512 d27b335b61d893c89f8e6a0a851503fc8fe19c2d559a3f5b93eada1d475adcb2b996f8147f522e9a95996681f85869d9408be769af251b64622e5dbfc4ad0a85
+EBUILD maturin-0.10.6.ebuild 5504 BLAKE2B 7d0a8021900294b36c10575624bc87f7f1ecc9b25b8048bec94aeaa4fa75834f68ad8106325da8d3d431b88e71278ebec9b966b0727dd0607941d90a839b6e0d SHA512 3634ff3687b1397214cfbb1a89a65dcba9dbb50837c91158e7b2601ae3e08ee1e0723cd7b0fada0826a6d07fd1ffd74147ac7a83c25edccee4d928079d78391a
 MISC metadata.xml 352 BLAKE2B cad9bf3c006716d6da86816331364ec341c26b178e332c130a9d7b462953bc5cebc6a60c8aebd9ea2a646df0d930f044d51ea103ca4c6db3108dac334250d50e SHA512 db5a72b5ca9e76a008c4a5dcf81d420fe816cc82dceca2aebf810b0de5660279a92169b233f00997895bcc325257fb55c489ee107675c635ae8636f249775c68
diff --git a/dev-util/maturin/maturin-0.10.6.ebuild b/dev-util/maturin/maturin-0.10.6.ebuild
index e95ca0bfe67c..fa5aa9ad9a15 100644
--- a/dev-util/maturin/maturin-0.10.6.ebuild
+++ b/dev-util/maturin/maturin-0.10.6.ebuild
@@ -280,7 +280,7 @@ SRC_URI="https://github.com/PyO3/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.t
 	$(cargo_crate_uris ${CRATES})
 	test? ( $(cargo_crate_uris ${CRATES_TEST}) )"
 
-LICENSE="Apache-2.0 MIT"
+LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index 33e3a0723e64..5b2d8bc0cd84 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -1,5 +1,3 @@
-DIST opencl-headers-2020.06.16.tar.gz 54769 BLAKE2B 8b8bf4e1948a38e12cbaba8a5df22757136655c72059af3c1e4526db529e272198fb84d805a79b275bf8432eec6a0f102f062f203e5d43b29bb482d109d05b08 SHA512 702c64648cd5d220aaeea1fc7f8a552f3ec75d1a867e1e9db7295452b288f22c2794e7b9a9bce7f01362b1fc2466940eef45aa7e88dd0e5a4570450a79c66391
 DIST opencl-headers-2021.04.29.tar.gz 59775 BLAKE2B 9e1728ce33066430711de911f4b2713abca5a0a57b8e52cb662aabe37657c703ab39dbbd990332847ae3d9f31f4855708c17832b801f8ca6a6f12ab12b139711 SHA512 370d02044c61f2394e9a8a9772b30b996074e3b51461387a570aaf1c29488844fe9090d873b2679eb4a472135bac7a9ba5590daf9d79c006de17f709afcb74e1
-EBUILD opencl-headers-2020.06.16.ebuild 607 BLAKE2B dc2f65912fb55daeda19f5bf83b09713304eb2e6d9fcaed827e4298e7492436f467b3348dc053e8317364597e44534cee464b057a81e2ffb125fe1a02caaf05f SHA512 27dc174b9cea161c162a2b1511f4f252c1f39fee0c9ad254afcc486d7104ad64034a430981e05490ba1b91672b06767be7682b2b9449af1ea9f17f319ff63080
-EBUILD opencl-headers-2021.04.29.ebuild 504 BLAKE2B 82a02684abaa01bd65a9f2a66a196cd10834af0983b36e3eaa400e2b16281a184c1cf09162859b3657ad02ffcdf1780f083cb981ca9f3ddc8051c87a28b8dfb5 SHA512 f3537bdf4727f05029afdfca3d6f5801a9a118c354d90392a9932f5ece48467f339d35083861d100db220e591c7550b6174b2a3f3126a7a47e72e1095ffecdcd
+EBUILD opencl-headers-2021.04.29.ebuild 502 BLAKE2B ed8d78b56b10d92d13591261fed0edc8257bc572b3dd42f136df1b5f6b91a03f5d26bbff8ba0015f01732228752693bfc3b5217c16d59647b073dd5c2a1f6f8f SHA512 f6a9733f71dc0dc3c20bc2fe0c9e4782f8c8a60ca6feb13a546836d5022b4221f33ecdecdb3902ccd34c147435e226758cf6b23a28c0d1bd4d86b8fadba2a426
 MISC metadata.xml 1054 BLAKE2B 30fb473e3841df882a700e175f5abef4d5ed0c198c60efdcce36622bb8a1dedf69c1b1a9f745f35b0f2be64fcf13f4c5ca2cd5503dadbf7021a74469f10438fa SHA512 85d2d58484a5def1de36b0922a796658cfcd104c2d25ca6e9916287768955b5a9dc6fce5d00f93211e9ad2b0a743abb07637a78131b6da3bcdfd880c86b7139c
diff --git a/dev-util/opencl-headers/opencl-headers-2020.06.16.ebuild b/dev-util/opencl-headers/opencl-headers-2020.06.16.ebuild
deleted file mode 100644
index cffb61d415a4..000000000000
--- a/dev-util/opencl-headers/opencl-headers-2020.06.16.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="OpenCL-Headers"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Unified C language headers for the OpenCL API"
-HOMEPAGE="https://github.com/KhronosGroup/OpenCL-Headers"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# To avoid file collisions in /usr/include/CL/
-DEPEND="!app-eselect/eselect-opencl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/include
-	doins -r "${S}"/CL
-}
diff --git a/dev-util/opencl-headers/opencl-headers-2021.04.29.ebuild b/dev-util/opencl-headers/opencl-headers-2021.04.29.ebuild
index 0808709a2f73..ae147f1297a5 100644
--- a/dev-util/opencl-headers/opencl-headers-2021.04.29.ebuild
+++ b/dev-util/opencl-headers/opencl-headers-2021.04.29.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-util/rpmdevtools/Manifest b/dev-util/rpmdevtools/Manifest
index d3defb5dc57c..979201a0fd06 100644
--- a/dev-util/rpmdevtools/Manifest
+++ b/dev-util/rpmdevtools/Manifest
@@ -1,3 +1,5 @@
 DIST rpmdevtools-9.2.tar.xz 95528 BLAKE2B 2485b4a1f27bc07b2c865804829fe2692383d54ce976d32919ee717b52b32aec93c1e50382e8e74cdbb630fda1655d68c840057e61428a45ab40ac31bc5b4ae1 SHA512 fbfe1123421775eb892776362f39144ce0e7c6519bdf23c7d9eb746c867d998d6a0ecce376ceaffec82e786040e41f2494dbec3170af1fa74a204447a4965fff
+DIST rpmdevtools-9.3.tar.xz 96292 BLAKE2B 40a9c53396c1186b1317971b5edca51e3b29e8d35c703434f8da05d07f101c9af266b306efa472a24254af2bfd0daeedc42fcc811f80c195209db2078e380965 SHA512 87dc8fe2885db2760a7520bc2486655f64e778bce0b6b3c2904ba9f3689e13f5b8d186b6fcebd60f24e958333aae66d06c0690fe2db633c2f508068dd4215f9f
 EBUILD rpmdevtools-9.2.ebuild 897 BLAKE2B 13398a95629c2284ebe6de2993da43b7eeb985d42ea43dff9045dc6e76ee341ea3504a6f961d595086b779f6e5e53185b50de321719e837b267f070ce361b701 SHA512 69260c4a3b6623880f14855a4a2e62d1a46c5f3759ac1a17a9be9e27ae2d1aabb7301d4d6c69c2010143fac1020969b5d171df7af5d96ff8ccd30a8bfb0fa92b
+EBUILD rpmdevtools-9.3.ebuild 902 BLAKE2B bcb31ed62713cfc0097882bbf3b7dd994ab715d8476a9db3776d4b26183d3d90e9929b818fab43b7db20fd6abe96af5365179e0934c04595913c6c99873f2e21 SHA512 9a397208d03cc21be0e970e6c24e43eef39f99ece3d2fbe0c7de9bb358d1b67ac30c775c4b44949b6a1b4265351ef5b6cfaf3d0c27c942287adb706f59836ceb
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/dev-util/rpmdevtools/rpmdevtools-9.3.ebuild b/dev-util/rpmdevtools/rpmdevtools-9.3.ebuild
new file mode 100644
index 000000000000..81d2411641d3
--- /dev/null
+++ b/dev-util/rpmdevtools/rpmdevtools-9.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+inherit python-single-r1
+
+DESCRIPTION="Collection of rpm packaging related utilities"
+HOMEPAGE="https://pagure.io/rpmdevtools"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="emacs"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
+	dev-lang/perl:*
+	$(python_gen_cond_dep 'dev-python/progressbar2[${PYTHON_USEDEP}]')
+	$(python_gen_cond_dep 'dev-python/requests_download[${PYTHON_USEDEP}]')
+"
+RDEPEND="${DEPEND}
+	net-misc/curl
+	emacs? ( app-emacs/rpm-spec-mode )
+"
+BDEPEND="sys-apps/help2man"
+
+src_prepare() {
+	default
+	python_fix_shebang rpmdev-{bumpspec,checksig,rmdevelrpms.py,sort,spectool,vercmp}
+}