gentoo auto-resync : 17:03:2023 - 00:25:50

20 files changed, 17 insertions, 226 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ea36e37862df..30a86b0d35f0 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 4a2d81081f26..672847104b56 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -4,6 +4,6 @@ AUX buildmaster.target 138 BLAKE2B 7570fc327d2e002803f7d6691740f5885e6b54d3df252
 AUX buildmaster_at.service 375 BLAKE2B 1a4d829389298713bf66885a5bcd28202eec32b6356b43b9e0861b00052e3702593a2e2a4764246dd62e52805ba2f2e62a86d0ae8ec4cbed3df42400dc562f74 SHA512 c37f1c461a4c7ee741a839772a5feabf10103542e159c6ae4eddfa37a146732dfc23f91d867d69c3718a21714516a3847485ae4e6580c93a5aa94daec40dd093
 AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f37bf270ab807eb97702d23cc504c0a933453addeef4abd3ddb13e9441cd330dd4cff9dc9962bdabbed8f0fa6d892c SHA512 d533b95c5b180cda5aa73966c590b7828598d5b6bcd77147a88238941adaa4c3c78e5f17d771598f622212856b16ce4582ab915a4cb57f0dd633eb2ad6b4c10d
 DIST buildbot-3.6.1.tar.gz 2458176 BLAKE2B 4587ed222e2fae424f3c4f275e67e72bf25b0ce88231a29f931582d82fbe93a846f85b14bdc64740939466ccdc3f15dab3774244aa5c0a293250b52b542014ea SHA512 62a993d1acd8bc5cc916f009909b4b099d9f64007fe790dc219104f248bb21e0ab8f1771c354ef61e6d8ba497451cdef5e7a7de17a87cfd1e941b3b49fbf2206
-EBUILD buildbot-3.6.1.ebuild 6641 BLAKE2B 61880c15a73f3d73f9927fab64e6a640b5ba1f4e4b5a695fe382e453085bab08198647fa07063ff2ef8861f981898a5127fb3e5349669b283cda94f4e1233b65 SHA512 196cf6b08e5e94f731e00a7150904ca08464a179ec02a449d73821ceb00103fa088ae9b50105309e22a37f08b10231fefcd6d720413bdbc3cbf66502ccab35bc
+EBUILD buildbot-3.6.1.ebuild 6524 BLAKE2B 8aab06461c6dfb8ff8513f177979238e2d4ed33b26fdd4957a25fe747c4e9075b5114fcc9d9b109e7c7d207c1b54efbfc521531ddffa01e1f29af9149f40d626 SHA512 7f55ec7b4546c3691f29d006f13ce71282e30eb365d66fbd48a4747436c9c2feb669629e9219b1e2441d7d478e62c3ee95f6469a4a38696d5dbe947ee6fc1bf1
 EBUILD buildbot-9999.ebuild 6520 BLAKE2B cb9d2efef3dcabe808118582703e1729cb0d4092682244cc43015b077694754bb9274268e8e8804d69cc9e81f3d7f990426307cb08ea72e94e1104049527726f SHA512 72f9866a34b923653b6db636259a5ae748610881c68bddf1a03d99ff5efeff10180c18cf2b2ff7fbce00287cc3418a65c9f6678eb1d4d44d15e6393c29bc0f54
 MISC metadata.xml 1360 BLAKE2B 4f54443c55c18288e1cd887528e94c5c258441cbde1579222f141ccba69b241b7163ee5c65056b9ba89794c543342394cd656b5f6d9f8356af47c4681d60bf4f SHA512 3ba99aead69ebc879d9e8a42ed41f250cfea97bdb21147dcefba40b759f87e682f0f416ab6b915afdd4dbe2c4e41ce99aeee23ea8afa349a131f6f450ef7ea95
diff --git a/dev-util/buildbot/buildbot-3.6.1.ebuild b/dev-util/buildbot/buildbot-3.6.1.ebuild
index d49b87168065..366ea2652c62 100644
--- a/dev-util/buildbot/buildbot-3.6.1.ebuild
+++ b/dev-util/buildbot/buildbot-3.6.1.ebuild
@@ -6,17 +6,12 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_10 )
-inherit readme.gentoo-r1 systemd distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
+inherit readme.gentoo-r1 systemd distutils-r1 pypi
 
 DESCRIPTION="BuildBot build automation system"
 HOMEPAGE="https://buildbot.net/
 	https://github.com/buildbot/buildbot
 	https://pypi.org/project/buildbot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/codespell/Manifest b/dev-util/codespell/Manifest
index 1dd3e81409cc..1d8da89e28bb 100644
--- a/dev-util/codespell/Manifest
+++ b/dev-util/codespell/Manifest
@@ -1,5 +1,5 @@
 DIST codespell-2.2.1.tar.gz 211593 BLAKE2B aba431119fd1f16ee51076cd4496ef3f3e80e56a124bbbd4ebbec5dcee5b7e49788db37bcdefd15946d12680596b33ab20ae845fd9a3a3a61ee8c3eed187fe2f SHA512 6c1ce9ed134ba4602cc91c1851a023911ff09ce7d4b1e8a33e655bf821a5b82ae8f0e75defef43e9a8537a6ffc7f0ad7e59af7b200a1294dfe3aff1651869e41
 DIST codespell-2.2.2.tar.gz 213652 BLAKE2B 2084f6041c6cf9888b661a1b7b8a73696b1dc6309b8d19adbb0dbdc091d87b487464b12c9800cfec893ed5d6ea71f214d0a4262099617b5fe7e60d8ca448973d SHA512 48be00aa32e55a66814193014e97fcb27ff323ea2db0622f68cd2d3ab31ab8be61f60a09ed91fe3425cbd63b2592bcc44ee9b58fe79e2d498bc27a83a4e93ddd
 EBUILD codespell-2.2.1.ebuild 943 BLAKE2B 67e1945c86d05b667f8958d02fd3ddaab45eafe29bf5024df46c0d77cae4c13bbf5ece2bba5c06bfb664cf3a92b3a4c90f1574602f91b5c787f99e05439a9613 SHA512 40f53c35ef809e492f5d1017a86eb63ce49906ad9279ec0a1c1e29d678a260655607673c637e30664748438d5c1f774928019ab628a1b42ebfd0ec31d521b4fb
-EBUILD codespell-2.2.2.ebuild 855 BLAKE2B ada96af52e9349c24742365f5dc945b2bb280bd17be6b35cc9cadfb99b4265b70719368843367b26dd9d5b457a8444e61d3b312987e2fc54d97b8043c16e1e7a SHA512 c31a5128f0ff2d596c17e4803f91decf801e3202c1188e39d4c45c9a2b5cd15af82e0ff04a17594d23973e6e4b2fe7a9e1bd8270e9c9ed60b7f7283aa205019e
+EBUILD codespell-2.2.2.ebuild 810 BLAKE2B f7cdb88c1512133c756aa997ccb516b270056a4f696f8b550d53dab5270ca4e07eaeee6ea833a1929beb8cb35404a3efaffc28b4055bca87c829606d8bf38f86 SHA512 f4d4066f052c03a8aaa7bb5fb9cc410149c4cb3fb57e6f73359a8bc2e85771563078693d0cdcd5a7749f58e07a66432b28d38e9b6f19aede5ccbace0122e42d6
 MISC metadata.xml 774 BLAKE2B fe1de89542c86da21ef70e12bee327af41f09f4af419da14074f01c3d0d995ee51deb13748330d13b61a4e3e1ac392e581656973ece8df5290b21d3c4f1fec81 SHA512 e95c51eeb9da39aa2cc7ad6e5f584050407bd232fd77a9f25b339a2c25262f51194278b47d4e05e55a0c3fcc6daaa41bc0babb242aba83e0b87912400179afa6
diff --git a/dev-util/codespell/codespell-2.2.2.ebuild b/dev-util/codespell/codespell-2.2.2.ebuild
index 129411c8a54f..5a6e5808a9e5 100644
--- a/dev-util/codespell/codespell-2.2.2.ebuild
+++ b/dev-util/codespell/codespell-2.2.2.ebuild
@@ -6,11 +6,10 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Check text files for common misspellings"
 HOMEPAGE="https://pypi.org/project/codespell https://github.com/codespell-project/codespell"
-SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
 
 # Code licensed under GPL-2, dictionary licensed under CC-BY-SA-3.0
 LICENSE="GPL-2 CC-BY-SA-3.0"
diff --git a/dev-util/cram/Manifest b/dev-util/cram/Manifest
index 7b7caece6327..54243c9a1a5a 100644
--- a/dev-util/cram/Manifest
+++ b/dev-util/cram/Manifest
@@ -1,3 +1,3 @@
 DIST cram-0.7.tar.gz 33527 BLAKE2B 4c89f98a550bef0c7d92e4b15c466690c1be7d829257b6469340d5c40415466b755989ce1b4ad4ce479587c91d64467dfb42f468c5817e9a09163c111da11e58 SHA512 9fa57e504abac8fd15bf5ff4a74405cb7acd10fd4c797adee87052a4f1c4e975bbc0f4219afd9485358b2c2939b48b3ffe538ae2abc6eea71e0ba8b458d50103
-EBUILD cram-0.7-r2.ebuild 555 BLAKE2B 7d3c4e49452b0b2bd0979efff2df2da3a7f7206df12152915b13d43242f567e546311a04cdadf36a09c180e0d62952cb4b43317437850ed5def5ed5513070932 SHA512 41c176ea6c0cf40e6096d8cdacf27e5338a2853383216e93e24828836270645581ded5c94aaec8ddb2cde0ca558c358296e6176c1ade83f5b14a36cf4a24577a
+EBUILD cram-0.7-r2.ebuild 508 BLAKE2B 33828d70cff48194ac012e60b0775b7decc0c2f979dbe243dc24a87d195b79a087c085f0a213f402621eb59c9c7de068d7bdc71191c2b7b5bdbd71a273778aa2 SHA512 96c65489984f84b6b1240d17c7acfcaa11dc3312cbdfd63530ede26040b508932ff131a86e5cbb92fff9dfaad094c67ce222289c53d05698814010c184de9287
 MISC metadata.xml 599 BLAKE2B ca01dfd4f46ef9d885eb2b98a4df59e5372f4f0acd859b27d8906f03ab2f025e367b9ef306fb4685c9001c120a9fd32026d88bd07acd8975846f52956b361e2f SHA512 f46da675a684cfcdfb9426fa3e69a0a80a29269de96e10966514ef5b226c19c1d7f6639bd935a3bce0881307e34dcc0c4c8ec7a81806ad55993695a145cda7be
diff --git a/dev-util/cram/cram-0.7-r2.ebuild b/dev-util/cram/cram-0.7-r2.ebuild
index 3ec0814418f0..bb74a99d6315 100644
--- a/dev-util/cram/cram-0.7-r2.ebuild
+++ b/dev-util/cram/cram-0.7-r2.ebuild
@@ -6,11 +6,10 @@ EAPI=8
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Functional testing framework for command line applications"
 HOMEPAGE="https://bitheap.org/cram/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/gertty/Manifest b/dev-util/gertty/Manifest
index 75f90ae60920..0bf53b13d496 100644
--- a/dev-util/gertty/Manifest
+++ b/dev-util/gertty/Manifest
@@ -1,4 +1,4 @@
 DIST gertty-1.6.0.tar.gz 122570 BLAKE2B 8c3628f9b0b56aaff30f183a1ab0d852b8ee487927833f41b8aa61f94f8d14eaf3a8d515d5edcb3fa7dd18ca36f42a977d12790c52d6c629a720b4f29252b030 SHA512 0fe5224f5b4b06910bba0d19453ea0f273f6ea0688b9aa092e11f929b71801581f6d7cead1d64c00912ee3363b98d4b36e903fa992a7ce36f190a4f3c09375d2
-EBUILD gertty-1.6.0-r1.ebuild 1156 BLAKE2B c9b9a5e2a1d5c5f1272a6713b5b90752f7a82165f70a22575f3f2930bc91492e7c699f5986f7099eadb436d315116e833d1ada3e5c91991f4b2e9ef4b5ceba45 SHA512 57a9dab007a176f721791df2344e3095b7e464d73d7dda5103d6bc1a5dc7551a9f3eff51eb153001963b242def0c9c803476fd3cd6b7152287660b14280a5b0d
-EBUILD gertty-9999.ebuild 1164 BLAKE2B 273514e87f6cedec7710a7d7eff9b9180e1ed047918da1a9744973953c3ed8d615bea98cf7db45b8aa955ff4c5899a8907c524e211aac5ce39be0af85bf422b2 SHA512 58853811a7f582ac1c7c285338cecf416f9f783d3b1c6372cab0309b14b8d7c997909100d47bc7af5342539de6bc5961551a37a8e6e011a080943bfeba55c9c4
+EBUILD gertty-1.6.0-r1.ebuild 1117 BLAKE2B 9ac4f2dc15ae88d0f84f97b0c037754c4e9453bc2409a9b618c874815864d586c24ef51070782cc78498a8748e48d0d111e46ad34ee991d513117fb2512f124b SHA512 627893076610d349a92c12cbaea8ad03f5141e57d24a2d28b3c3f833eb6f4da778f697dfb110a79b73202bacacd9853023283024d56d8983e4bd87341e3e2a75
+EBUILD gertty-9999.ebuild 1119 BLAKE2B 6dd75d00b0f07ca77f640d6621e455015e576b256483873ef8391c7b6c61a205323b53957bff4291a225a033048ae743eef468d287727a14755d52939d4db1f5 SHA512 d2be42e38e9a14bd264dd83611edbd887bfcea126e2c4fb1b3fee2ba75504802235beb43d0f09fc7543264e692a3007056e329c68b8a8d45a182e367788fdb71
 MISC metadata.xml 380 BLAKE2B ad29f16ddaf80c092a0ade8008f0234b4c2d61b0676e3eb8ffff7055f0da28a3065de464c912b6345a94e0c189452f7826f70a924ca198a4eed8caa0c0b1dbc9 SHA512 30c0a68fffbedf4900a00bab11299c45dd65994b7e77bfa83ab7dd75f2bc0056b63e63ff2632d30b8c7bffbd4427c8a9b59ebaad3c854e1d4bdac48ffe6b330e
diff --git a/dev-util/gertty/gertty-1.6.0-r1.ebuild b/dev-util/gertty/gertty-1.6.0-r1.ebuild
index 7f35fa91bcd9..d9c838068ec6 100644
--- a/dev-util/gertty/gertty-1.6.0-r1.ebuild
+++ b/dev-util/gertty/gertty-1.6.0-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_REPO_URI="https://opendev.org/ttygroup/gertty"
 	EGIT_BRANCH="master"
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	inherit pypi
 	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 fi
 
diff --git a/dev-util/gertty/gertty-9999.ebuild b/dev-util/gertty/gertty-9999.ebuild
index 79d11f1d663b..99f28ea8c61b 100644
--- a/dev-util/gertty/gertty-9999.ebuild
+++ b/dev-util/gertty/gertty-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=(  python3_9 python3_10 )
+PYTHON_COMPAT=( python3_{9..10} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_REPO_URI="https://opendev.org/ttygroup/gertty"
 	EGIT_BRANCH="master"
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	inherit pypi
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index dae95075ca47..fd35e7b0c580 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,3 +1,3 @@
 DIST howdoi-2.0.19.tar.gz 27109 BLAKE2B 32c7ebf177a5a51f9df924440c5767e1a47125e24b821b51b28cfec45a747f7c04265b93aa0a68a85d2f65582617f866483aa77e8c1168903ef9dfdc860535f5 SHA512 e3e074f7b122513486bda0a0f68d31d51a2da2f17efe5c6ae2b5c49f44dd0f80a735d67a33e3d47eea51d83968da19bc294fc74a30f7e30457058ad9919e105a
-EBUILD howdoi-2.0.19.ebuild 709 BLAKE2B e7134248d256dda6ba792af8e7c270df25cd39f3ab7c24e33a401c4fde1d1b11df7080a3d940a99b3ee16b2f7394a7c85e63342438c32f3976dca726ffbd224e SHA512 fc0503209978a433e74c2de4b4308ad07fc200d9c0c1dc5638ddeecfda22e9ff7afbe76bf882ffcc4395f3d6c9f1e822bf184e262c01ed66aa8e3f4b2004bbf7
+EBUILD howdoi-2.0.19.ebuild 662 BLAKE2B e6118ab2595d7ab41730ef7e1bc8e7469fee49462f61f0797fbc465df73bd0016776eafb1099cc4efa47eb04af480c6ef53b224859cecb793b88efc43e0adce2 SHA512 f14f28eee02a0fbb4e08af82c52668d3a60f203b41436bb27ba85c777e5337b50d463e9c67524a5ee379ae1f71d6f7e45c374e8187a960d80ce0ae070a70a9a5
 MISC metadata.xml 400 BLAKE2B 2d9c3340fc0121d15e83c1d3f587cf6833bd8fcaa4514c750691391e1190017be1f47cee156c8c4fb84200c54584218c0be84b0a6b3f9779b8ac59d94173ca77 SHA512 5a9f1dfc535a1f92e70776f91383f9c02381d7776de5456f2394fb0540805e0b4cbd39498bedf0544a8e4f70f5d560611de8ed0ff3607d6ddbc4d82624ecf3b0
diff --git a/dev-util/howdoi/howdoi-2.0.19.ebuild b/dev-util/howdoi/howdoi-2.0.19.ebuild
index 45e1db1e6be4..9abefcceba8c 100644
--- a/dev-util/howdoi/howdoi-2.0.19.ebuild
+++ b/dev-util/howdoi/howdoi-2.0.19.ebuild
@@ -5,11 +5,10 @@ EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS="manual"
 PYTHON_COMPAT=( python3_10 )
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 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"
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index d89e45dd487f..11dc5a71c726 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,7 +1,4 @@
 AUX 50pkgcheck-gentoo.el 125 BLAKE2B db546b7f4e1517fb4f3bc46eff6a3294c8d677be031ecb33987daa84c355c3628ab7f24bbab90afb24b0bcec6c0ebebb56339374fa35a345481aa9808bd538be SHA512 31bad085867ebecedf0c9c3ed1223e7512238892d69b5224e850d744c5965bf7a2d7cb90978d9cce6da8dc554dba36803d604b8c6ac2b7cc9f2718ef7d6fc644
-AUX pkgcheck-0.10.19-fix-pkgcore-0.12.18.patch 2435 BLAKE2B 3e41b3ca1666aa8f88473bb3586312d77dfe2dee6748355346ef774dd8ddea4680abc329c653679eb97e634d86e63ef7c0b1593c9aa7ff4160ebf1e5d072519e SHA512 33607bcf237a542d043255f7a9f7f421f87d1a9e782a3f9a23cefaa91ea0fdfe815f50ff44125cd4e7c54aae36a6503998b9eb3c8c49e3626b46a1845ea39120
-AUX pkgcheck-0.10.19-fix-setup.patch 733 BLAKE2B 39033cf4509d7a46f0a638109cf1b7b8cb8b978f6b50ab4a331ee0b73745d3706b22f8e331990a2daf7138a9d0a37f42dcccb03285ea705ef96e2ae4d3a79f6d SHA512 6f1e2644989d2843fa9358e3bb440306fa4b6f52bece07dd2bec36b2597b41c03d54784d3ea505539ab5463030703d4b76d62ea476fb31d0f5719a6af662affa
-AUX pkgcheck-0.10.20-fix-replay-bin.patch 4506 BLAKE2B 68262310538abb220ef3f3109f65656e11716160895491f00f438bd686fe6a904238b1dd29cd92db7bbbb83f2a0282e455e843b7cc8f17c9f4c47a42f8dc4a82 SHA512 42a45d64f4bcd31b510124e8091bb3aae93c906bdb90ea2332405a5b17baee43edffc45563774fbdb2a7efae795065b67f81aeef1c5b9bde7df0bdcdeab3aa48
 AUX pkgcheck-0.10.21-fix-scm.patch 1470 BLAKE2B 2ca07fd6f5736df1bc8ce374842bc5d8090e7e705bf0c98630ab94e9c12ca2f0cd0be6b9bd57d59e67f2b25f971865ff3583d66f2815762e68943083636656f7 SHA512 360091ce895ded5abec23cfe7b9d268d22ae59a237c2f9f85e5463488d94dd8fa86eb8e7b148d0d92066d69854d263dd08645620bc43aedabdd8a283adbbd8d2
 DIST pkgcheck-0.10.22.tar.gz 566826 BLAKE2B 714eb92bd43b4c3f2319aecb343fe6580f754ba50ed6fa986faaedcba71d34f2834ca85d17c961d327c90081dc305febccfbe08dbc13a706d972e289271214e3 SHA512 45532faa169d42f3d5a94a17e83089d4789e7c3e26226f2e5441ba8816cd3610a9025cc392bb32d6d78f202354ab11117fbd07ec2550d7e3255c02c6cb96d98e
 DIST pkgcheck-0.10.23.tar.gz 568903 BLAKE2B 8b00dc93d0c3f597f7397d2e7b3686d11b12da715d6e8071f1b02a8085061cbb2d7cb24bde6a73ef6e5d1459637cb78e536ce80a162f188a42739a434c62c397 SHA512 3bcdb91bf73cde60fd9fc2f5e470c5ccdfd7b3564e83192201b0fa1dc38265e1e0c7f7052039accbb62c55d816a6e89317d7d388c0cc3da3b4836475cb82bd03
diff --git a/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-pkgcore-0.12.18.patch b/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-pkgcore-0.12.18.patch
deleted file mode 100644
index c2c452c42c7f..000000000000
--- a/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-pkgcore-0.12.18.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -8,8 +8,8 @@ requires = [
- 	"lxml",
- 	"pathspec",
- 	"tree-sitter>=0.19.0",
--	"snakeoil~=0.10.3",
--	"pkgcore~=0.12.17",
-+	"snakeoil~=0.10.4",
-+	"pkgcore~=0.12.18",
- ]
- build-backend = "setuptools.build_meta"
- 
-@@ -40,8 +40,8 @@ dependencies = [
- 	"lxml",
- 	"pathspec",
- 	"tree-sitter>=0.19.0",
--	"snakeoil~=0.10.3",
--	"pkgcore~=0.12.17",
-+	"snakeoil~=0.10.4",
-+	"pkgcore~=0.12.18",
- ]
- 
- [project.optional-dependencies]
-@@ -53,7 +53,7 @@ test = [
- doc = [
- 	"sphinx",
- 	"tomli; python_version < '3.11'",
--	"snakeoil~=0.10.3",
-+	"snakeoil~=0.10.4",
- ]
- network = [
- 	"requests",
---- a/src/pkgcheck/checks/metadata.py
-+++ b/src/pkgcheck/checks/metadata.py
-@@ -210,11 +210,10 @@ class IuseCheck(Check):
-     def __init__(self, *args, use_addon):
-         super().__init__(*args)
-         self.iuse_handler = use_addon
--        self.valid_use = atom_mod.valid_use_flag.match
-         self.bad_defaults = tuple(['-'] + [f'+{x}_' for x in self.use_expand_groups])
- 
-     def feed(self, pkg):
--        if invalid := sorted(x for x in pkg.iuse_stripped if not self.valid_use(x)):
-+        if invalid := sorted(x for x in pkg.iuse_stripped if not pkg.eapi.is_valid_use_flag(x)):
-             yield InvalidUseFlags(invalid, pkg=pkg)
- 
-         if pkg.eapi.options.iuse_defaults and (bad_defaults := sorted(
---- a/testdata/data/repos/standalone/SourcingCheck/InvalidEapi/expected.json
-+++ b/testdata/data/repos/standalone/SourcingCheck/InvalidEapi/expected.json
-@@ -1,2 +1,2 @@
- {"__class__": "InvalidEapi", "category": "SourcingCheck", "package": "InvalidEapi", "version": "0", "attr": "eapi", "msg": "EAPI '9999' is not supported"}
--{"__class__": "InvalidEapi", "category": "SourcingCheck", "package": "InvalidEapi", "version": "1", "attr": "eapi", "msg": "invalid EAPI: 'invalid!'"}
-+{"__class__": "InvalidEapi", "category": "SourcingCheck", "package": "InvalidEapi", "version": "1", "attr": "eapi", "msg": "invalid EAPI 'invalid!'"}
---- a/tests/checks/test_metadata.py
-+++ b/tests/checks/test_metadata.py
-@@ -430,7 +430,7 @@ class TestSourcingCheck(misc.ReportTestCase, misc.Tmpdir):
-                 """))
-             r = self.assertReport(check, self.repo)
-             assert isinstance(r, metadata.InvalidEapi)
--            assert f"invalid EAPI: '{eapi}'" in str(r)
-+            assert f"invalid EAPI '{eapi}'" in str(r)
- 
-     def test_sourcing_error(self):
-         check = self.mk_check()
diff --git a/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-setup.patch b/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-setup.patch
deleted file mode 100644
index 8366e435a1e9..000000000000
--- a/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-setup.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/pkgcore/pkgcheck/commit/b4c34a95f4c66db9c658f6dd75d9193c6e55dab4
-
---- a/setup.py
-+++ b/setup.py
-@@ -36,12 +36,12 @@ class build_treesitter(Command, SubCommand):
-         pass
-
-     def get_source_files(self):
--        cwd = Path(__file__).parent / "tree-sitter-bash/src"
-+        src = "tree-sitter-bash/src/"
-         return [
--            str(cwd / "GNUmakefile"),
--            str(cwd / "tree_sitter/parser.h"),
--            str(cwd / "parser.c"),
--            str(cwd / "scanner.cc"),
-+            src + "GNUmakefile",
-+            src + "tree_sitter/parser.h",
-+            src + "parser.c",
-+            src + "scanner.cc",
-         ]
-
-     library_path = Path(__file__).parent / "src/pkgcheck/bash/lang.so"
diff --git a/dev-util/pkgcheck/files/pkgcheck-0.10.20-fix-replay-bin.patch b/dev-util/pkgcheck/files/pkgcheck-0.10.20-fix-replay-bin.patch
deleted file mode 100644
index e20c0b3f53f5..000000000000
--- a/dev-util/pkgcheck/files/pkgcheck-0.10.20-fix-replay-bin.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-test_pkgcheck_replay: fix test_replay_pipe_stdin from sdist
-
-Bug: https://bugs.gentoo.org/888896
-Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
---- a/tests/scripts/test_pkgcheck_replay.py
-+++ b/tests/scripts/test_pkgcheck_replay.py
-@@ -1,20 +1,18 @@
--import os
--import subprocess
- import tempfile
- from functools import partial
- from unittest.mock import patch
-
- import pytest
-+from snakeoil.formatters import PlainTextFormatter
-+
- from pkgcheck import __title__ as project
- from pkgcheck.checks.profiles import ProfileWarning
- from pkgcheck.reporters import JsonStream
- from pkgcheck.scripts import run
--from snakeoil.formatters import PlainTextFormatter
-
-
- class TestPkgcheckReplay:
--
--    script = partial(run, project)
-+    script = staticmethod(partial(run, project))
-
-     @pytest.fixture(autouse=True)
-     def _setup(self, testconfig):
-@@ -33,11 +31,11 @@ class TestPkgcheckReplay:
-
-     def test_replay(self, capsys):
-         result = ProfileWarning("profile warning: foo")
--        with tempfile.NamedTemporaryFile() as f:
--            out = PlainTextFormatter(f)
-+        with tempfile.NamedTemporaryFile() as file:
-+            out = PlainTextFormatter(file)
-             with JsonStream(out) as reporter:
-                 reporter.report(result)
--            with patch("sys.argv", self.args + ["-R", "StrReporter", f.name]):
-+            with patch("sys.argv", self.args + ["-R", "StrReporter", file.name]):
-                 with pytest.raises(SystemExit) as excinfo:
-                     self.script()
-                 out, err = capsys.readouterr()
-@@ -47,13 +45,13 @@ class TestPkgcheckReplay:
-
-     def test_corrupted_resuts(self, capsys):
-         result = ProfileWarning("profile warning: foo")
--        with tempfile.NamedTemporaryFile() as f:
--            out = PlainTextFormatter(f)
-+        with tempfile.NamedTemporaryFile() as file:
-+            out = PlainTextFormatter(file)
-             with JsonStream(out) as reporter:
-                 reporter.report(result)
--            f.write(b"corrupted")
--            f.seek(0)
--            with patch("sys.argv", self.args + ["-R", "StrReporter", f.name]):
-+            file.write(b"corrupted")
-+            file.seek(0)
-+            with patch("sys.argv", self.args + ["-R", "StrReporter", file.name]):
-                 with pytest.raises(SystemExit) as excinfo:
-                     self.script()
-                 out, err = capsys.readouterr()
-@@ -61,26 +59,28 @@ class TestPkgcheckReplay:
-                 assert excinfo.value.code == 2
-
-     def test_invalid_file(self, capsys):
--        with tempfile.NamedTemporaryFile(mode="wt") as f:
--            f.write("invalid file")
--            f.seek(0)
--            with patch("sys.argv", self.args + ["-R", "StrReporter", f.name]):
-+        with tempfile.NamedTemporaryFile(mode="wt") as file:
-+            file.write("invalid file")
-+            file.seek(0)
-+            with patch("sys.argv", self.args + ["-R", "StrReporter", file.name]):
-                 with pytest.raises(SystemExit) as excinfo:
-                     self.script()
-                 out, err = capsys.readouterr()
-                 assert err.strip() == "pkgcheck replay: error: invalid or unsupported replay file"
-                 assert excinfo.value.code == 2
-
--    def test_replay_pipe_stdin(self):
--        script = pytest.REPO_ROOT / "bin/pkgcheck"
--        result = ProfileWarning("profile warning: foo")
--        with tempfile.NamedTemporaryFile() as f:
--            out = PlainTextFormatter(f)
-+    def test_replay_pipe_stdin(self, capsys):
-+        with tempfile.NamedTemporaryFile() as file:
-+            out = PlainTextFormatter(file)
-             with JsonStream(out) as reporter:
--                reporter.report(result)
--            f.seek(0)
--            p = subprocess.run(
--                [script, "replay", "-R", "StrReporter", "-"], stdin=f, stdout=subprocess.PIPE
--            )
--            assert p.stdout.decode() == "profile warning: foo\n"
--            assert p.returncode == 0
-+                reporter.report(ProfileWarning("profile warning: foo"))
-+            file.seek(0)
-+
-+            with open(file.name) as stdin, patch("sys.stdin", stdin), patch(
-+                "sys.argv", [*self.args, "-R", "StrReporter", "-"]
-+            ), pytest.raises(SystemExit) as excinfo:
-+                self.script()
-+            out, err = capsys.readouterr()
-+            assert not err
-+            assert out == "profile warning: foo\n"
-+            assert excinfo.value.code == 0
diff --git a/dev-util/yamllint/Manifest b/dev-util/yamllint/Manifest
index 43c47aadad05..01e50464a4f2 100644
--- a/dev-util/yamllint/Manifest
+++ b/dev-util/yamllint/Manifest
@@ -1,5 +1,5 @@
 DIST yamllint-1.28.0.tar.gz 121934 BLAKE2B 6c93b7f45cab49159f6a36aa24ac303455432734fcb90f75cf80551eb2c5a78c9695e76f968aa7e22ad976accd0257567d85d7ac24474695dbe3e4dcf7f6eea3 SHA512 9d811616f5a2c8c9574ef74afd2548c415881386932e4ee9b29311c3ef32150ed868943bcef19b31226d9a31f0be384e0ee3b3ec86cebf0d7c4216696a6b0161
 DIST yamllint-1.29.0.tar.gz 123149 BLAKE2B ffb19628eb4ae5bf41e8ad1eb1295ed4c6d2c7f08cc819884e1e52552ae37542d5822ce76ef531072a955435a99b512c0c75f32c70e60124c51bde9b76eaff53 SHA512 25c8b1db12c1955878a368433634277a75c2fbde14b041022f591ff7d71b975b509e24b6755c98fa086d3a3a5adf1560ef62f86f9f9e4798d6ca5a0fb50e9e52
 EBUILD yamllint-1.28.0.ebuild 611 BLAKE2B d22e69c43e168609b1732c2850ec26070d287c21341df0e73467fc1c4904c6b7b82abd865546061bc670053f9b0f93d958845cebacfeff9c0846b0851bc1ce67 SHA512 4cb5b7690d22e37eb716b85d6ea63756abd805c48af75b9ff45a73b1e6160f43aa0c3f7d0da7540149b06916173cd1156c752afbc90ce090bc3fb70b4d257d58
-EBUILD yamllint-1.29.0.ebuild 613 BLAKE2B a070b158681dd67c1be1ce65c1f40ef45b0778570754340b5330bc9616d6989a7b21d263608cee5d72355426daa799fb944a6c70102d138bb4eb6be8f172f2b3 SHA512 10435c46c041f56e9c8a0e1e18e27fc9700f795c8f58547d36325f3e6579ae79daf54c00a5f50fb7ac287179c2ff021c1663c449181d2aa42938638678f83392
+EBUILD yamllint-1.29.0.ebuild 566 BLAKE2B 27ba01e8c902fc1401029e189f4c88263e5555ccec8d566671760dba99dec794f5363a97e04afa2c80368254f53986799f987fa1c21848aa72ff45b67c30a245 SHA512 bf5fcf395251def3e031a597fdacefb8d2eaedbadd2434d2212c909e979790881f3aa55c9a6aa9c7803621e49d3ab3f7977f3241a4bc3125196b77046847e871
 MISC metadata.xml 401 BLAKE2B a521c886cfd44743e875bcb3a5901f555bf13829b1697a4673c99d728559959460a150b717b6568a3fdcf82c73a8425997bafae1f5f8afaa30a0d43862e7a730 SHA512 52b259b62b147104c3150477c41b37697ad55ac5ce074be70568d001c15c1da099a1f2877a193164ccb9871d7fb6275bef12aba110cf83d5f04c4dfb30e156c9
diff --git a/dev-util/yamllint/yamllint-1.29.0.ebuild b/dev-util/yamllint/yamllint-1.29.0.ebuild
index 0b74d2dbdfed..49b3567c1eda 100644
--- a/dev-util/yamllint/yamllint-1.29.0.ebuild
+++ b/dev-util/yamllint/yamllint-1.29.0.ebuild
@@ -6,11 +6,10 @@ EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A linter for YAML files"
 HOMEPAGE="https://pypi.org/project/yamllint/ https://github.com/adrienverge/yamllint/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-util/ydiff/Manifest b/dev-util/ydiff/Manifest
index dea777dd0e9a..7b4a4e80da42 100644
--- a/dev-util/ydiff/Manifest
+++ b/dev-util/ydiff/Manifest
@@ -1,4 +1,4 @@
 DIST ydiff-1.2.tar.gz 42808 BLAKE2B 927482c2ed9a96efc354178679b4ba50497289bc31107e8cdef3062a71d91268fa703620f1f4b0be03aebaf339eba5254f4b43c16403f1d7818b84b0c450defb SHA512 0eb2230b64f43e20f6dc2411296389dc99356ef626152dc7f234583f70678e64a07b764fd89635479e7ac4aa7e2490db6e76c744369eefef8ab6a5386db1a7b5
-EBUILD ydiff-1.2-r1.ebuild 648 BLAKE2B 56287486ba6c73970b18a56f62402025ff37b87ae23134f6b8cea633551ff092f43f2455f1e9dce1ad4722804ff117af3cb6509b505c8110f1a675e3cf2f72e8 SHA512 55dea2b4699c6c566c197b2a8c910943007bababe39f84f446586f4e0f7929ca191504efa5d2e73ad98906e182a1d270404dea2501778b557ea10ce039639178
+EBUILD ydiff-1.2-r1.ebuild 601 BLAKE2B 4bcd02119312d9ace79730623e189c7d06fd58624791a4c2f344cb74f01533c290b4bce693019e8cb94d69b7cf103aabcab8e4a432495a04fa67eb7e982db269 SHA512 1970cfffd08e0618615596f0bcf25cbc6c0e487e0263d4928713e268463187c4cd26500135a65bdd2fdcbf8bd748c8e314ab8f59d174061fe4e99093b683be33
 EBUILD ydiff-1.2.ebuild 642 BLAKE2B 461635fc87413caff56750c87bfb828d036249013690ed8d584cc5c4555055196d5c7044c856894792f573e524bd35b64190f5543063f0d37d3e720ba56ab34c SHA512 eea9f0471582ed3020195d4079ce9c090f61a6a5b13ffb62f094453a058b131a924a152deba4b941995a21cbdaf7a75f15ae1205f1751583a4d26707ea87354f
 MISC metadata.xml 394 BLAKE2B 7333c46ff0d147ca8dc7eafd8e5f3eae67c7217467d45431585898948671df5e836995e89414fb95a9645f69c4f1d2020168a87b952115ce3b6225d89b46aa01 SHA512 781694fc99405f67446875b9fb40a306cd5223f1f27d1fff5f0bd2fe35aee1d6a518486999d06732e89fdc5759afdf0235615170718fea80ba0d69fc95f97fe7
diff --git a/dev-util/ydiff/ydiff-1.2-r1.ebuild b/dev-util/ydiff/ydiff-1.2-r1.ebuild
index 59b8c20d5230..6b0c9d651200 100644
--- a/dev-util/ydiff/ydiff-1.2-r1.ebuild
+++ b/dev-util/ydiff/ydiff-1.2-r1.ebuild
@@ -6,11 +6,10 @@ EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Colored, side-by-side diff terminal viewer (ex. cdiff)"
 HOMEPAGE="https://github.com/ymattw/ydiff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"