gentoo auto-resync : 14:10:2022 - 07:43:49

16 files changed, 76 insertions, 57 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 793df97a4899..baf962dc19c9 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index a680b26533e5..8494abf07301 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,3 +1,4 @@
 DIST byacc-20220128.tgz 896513 BLAKE2B a5dd491702274ed84fdddc8b2d2d240d8ddcc9350db82eee067978297ceda012ab99d7c8f53102f8190ce6e6bb3feb8d9beb62969ddf222b4ba967041b746c00 SHA512 e8ae4c56f5be4cc0ef1d281c43f02c6296fdc40f630269f2a61af511f270ae059ad185b9718190b8133018f7b74b7ca6f84ced5d63a359960b52ea2a3ef562ea
-EBUILD byacc-20220128.ebuild 727 BLAKE2B 1b1fbbb42c7bf997a68eee9c5cf4fc380e9ca3862d78f51be377a17aebdeb400c732fe6748a9e9cf29380b1d9e12a75b3191e50dc8f66f10d499adfeb80d1eeb SHA512 c2cfbfe878a06d2db90cf83e5cbfcb46f73b2a495ca0cfc500c26647b7e08801c9631dee3041e94b20607bf33c580af36bf944c2f62cc28e635311489611a15a
+DIST byacc-20220128.tgz.asc 729 BLAKE2B 7e43d182d06419fdfc925f078535163cf1bba49c7ec05788e2268adc34fbca8ce368516cbd46605bfe2c700950e3c9a202ed120f8a9ff507599a1a2acf6998dd SHA512 84140b9aa4aaada776c580be7adb265bf281decd1d24661b1368e0ffdaf52257751931e61ad0bcc59977e966c32125f751f889d5bfa806b7e0bdeaf96dd629e3
+EBUILD byacc-20220128-r1.ebuild 857 BLAKE2B 23568cb5640c370af78fa38d50661e7ca86f10e98271414f958aec50923a50d4b094e26c6d9417172d74923e86618f3d5d17ad2289b5851ca5d7b8b81f54631c SHA512 5cf4477919d18b5e1146ebe85f2b7333b4956cbc7dbd03a485e44be80734d868975633d11310d251f56cf0cd7ddc7513e397986616830d77944874e430e91fd0
 MISC metadata.xml 424 BLAKE2B f7c1172e12c784d254658b3743db6fec9d6ef008891fe84114c71c1d0edf24a37f00ad61a1705716bbaf6c912b763756995185f2cffd95c831b8ca57abec6d68 SHA512 8bbdcf35f0499db09f1d55d038d93f8c3aa516e0baa74ec078c7a3032d4885110530be47cdd309de1a44b8c92e6dca3f4353d3ff1d3da04b052d492c91549067
diff --git a/dev-util/byacc/byacc-20220128.ebuild b/dev-util/byacc/byacc-20220128-r1.ebuild
index cfea2d0919d7..891cbd09f9b3 100644
--- a/dev-util/byacc/byacc-20220128.ebuild
+++ b/dev-util/byacc/byacc-20220128-r1.ebuild
@@ -1,18 +1,22 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
 
 DESCRIPTION="The best variant of the Yacc parser generator"
 HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
-SRC_URI="ftp://ftp.invisible-island.net/byacc/${P}.tgz"
-# Seems to be unreliable (unstable tarballs): bug #820167.
-#SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
+SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
+
 DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
 
 src_configure() {
diff --git a/dev-util/cproto/Manifest b/dev-util/cproto/Manifest
index 27c59b5d8afc..532843a05ad6 100644
--- a/dev-util/cproto/Manifest
+++ b/dev-util/cproto/Manifest
@@ -1,3 +1,4 @@
 DIST cproto-4.7t.tgz 181095 BLAKE2B 60e8fc26acab8a7475d08c413b85bfc68b1fec877845f6302f741665eb3f779faf313d5463ec08f6a41a04737a9c280d3f8d5247bed819a21ea30a3c2d11f197 SHA512 ad5abddeec7e92ec85ac5d19f025a1d3362ed0a082e3a00fbc64545e3ef6e34fbd9cfff36be01276836d1d834c481927d12f747b0904dbc644d43f2e879bd82f
-EBUILD cproto-4.7t.ebuild 422 BLAKE2B 699c94d1629d4e627e0ed1ef5f87f805f558f46cfc93f83ddeab3122949cd4f574e448f1df4299a3ad104fd1c6865ee9face7bd5f9259ed9741c2c382176ad6d SHA512 3d014e139c204a450b8eb39de27d829177c0e6b91f1dc6b562bae70daea6875624c1a65d013ad705993f53f7d28c3c156d1a10f02aa2235dad22a9b160bf4785
+DIST cproto-4.7t.tgz.asc 729 BLAKE2B 9b668a41374d273263d535fb4dba5038a72f3ee3d0f44a2bc5f6fa85a426f1c2209dea4655639b772f6d5d036af1131dec476c1e2e9dbb808a18a734ff538ede SHA512 d3874a04159a092322097c254a2a855db55409eaa7d529eaee973a4763bf71c525f8b40e9d5fbdf5028108713a8e891f45b26e31bd5c879d3d4e5249c8dcae3f
+EBUILD cproto-4.7t-r1.ebuild 676 BLAKE2B f95778bdb6886633ad6da30650bb804484f54794f20b27717a4c6f69b93b32b5eac1a78f0f0ec27c1155faa6c3725cc15d198d47d421ecab39e0890a4ffa7612 SHA512 03e19ae46769f46aad33932a456ec8871d61e7a16d5ff3bfb773a3ae211d46f2660dc1f94695a691a0144a02dc77a716256628a2e10f285803a24e6498725e68
 MISC metadata.xml 336 BLAKE2B 45d3b05d925b08b4b9ba679e197b059295c82cfe43bdae1e99739c0f6887c0639845a78d889327f736aaec542fcab50c415f8711b64db58affee810088eefb0b SHA512 7284fa1ca3610bbbf0ac1ed50a23c1b09155ce124eb8d70dce99bac08bafc56f2396aa06e085ffc559ddc0153e94d1e9e6c7c6e5e01a2ee8d392ef1af0a279e6
diff --git a/dev-util/cproto/cproto-4.7t-r1.ebuild b/dev-util/cproto/cproto-4.7t-r1.ebuild
new file mode 100644
index 000000000000..770330e2dde8
--- /dev/null
+++ b/dev-util/cproto/cproto-4.7t-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
+
+DESCRIPTION="Generate C function prototypes from C source code"
+HOMEPAGE="https://invisible-island.net/cproto/"
+SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="
+	sys-devel/flex
+	virtual/yacc
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
diff --git a/dev-util/cproto/cproto-4.7t.ebuild b/dev-util/cproto/cproto-4.7t.ebuild
deleted file mode 100644
index b2f55586ea3e..000000000000
--- a/dev-util/cproto/cproto-4.7t.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Generate C function prototypes from C source code"
-HOMEPAGE="https://invisible-island.net/cproto/"
-SRC_URI="ftp://ftp.invisible-island.net/cproto/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="sys-devel/flex
-	virtual/yacc"
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 72a21950dd02..1d8a08900ccd 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,7 +1,8 @@
 DIST dialog-1.3-20220414.tgz 566701 BLAKE2B d3fba0e896d51048876cd1c393d1f2183e47c5307d218dea0bf8c9cbaaed198bfc39e40e1f52b12c978dda10fa61be75d2527c293da652d2f83b80a2237d9d2f SHA512 53b7bc64bb6406c5828f2d023e7db457eee970ade2077bc64860ef12f06c254b4a13706eee068ffe44055ec6b0576ecfe33153438660a5a54f78ea1be00091ee
 DIST dialog-1.3-20220526.tgz 567657 BLAKE2B 1b46c0310e54f26cf5efcd8c84d9b8ef3d7ba7b58292c0967559e4bf281a0312185d3f9dea090e01a95a096ee1781bcdcbab11552175c8d6154ac9268654b6d8 SHA512 619d52b8123264bf586f5325443c3b85863166119c6fbaa91571a57454d761f01a53ebeb2203ea725c83dc88f2abf886c64c6eac5b56c126e4f3939eb1d24d62
 DIST dialog-1.3-20220728.tgz 568086 BLAKE2B 086d946f2a8d298f1d26a193b5e99c00991a7f25fb032efef77109b20deaf08d54562673132bfa458d0c28360b2271e7ec50611ebe00e0c1584f178c0d8d7254 SHA512 dddceaf00bfec4b53f2cf67e51d4c54841d9db337536657c21bc8f324a0eb9c6d621f00e09bfb741bd263f171dde38cfea87568f86daf04a9e88575a0ed61218
+DIST dialog-1.3-20220728.tgz.asc 729 BLAKE2B c317713cae1abe26471c005f033a8ebb406a2a741d67865f90c8a356e204b468fda1349247dbe42e84d434434d202938b55321a22ad0e048eedca93f59a7b547 SHA512 fe0e3559c1c6cbd6ac24cd5da96cde4e4780c6a804f1ed3c96c1ee93dc8f434336cb5cf27c9ac420338c8491dfa9beead48761f07152b2cae9f2d2f7d482eb8b
 EBUILD dialog-1.3.20220414.ebuild 1290 BLAKE2B 690ab3410effd792a305509ea6e87005f2982a04d13bb5354fae2b9952d0f2e49cb37805f1ce318c7430a28a5fc56b3d7a776461ff761fb05b347902426ee141 SHA512 816bd5d804ac91ab2b1297116cf9a5a8d180dd6c6dddbe9542016fb54fcb7a17f63e39b35ac6811a4f5fd88874fc2718380cc6b6076e6212358f0026712a2f4a
 EBUILD dialog-1.3.20220526.ebuild 1298 BLAKE2B b572d1d099d9ecf5d425dbf8a7b9a10b2f708fc264954c91623a8b0ab4f2bd015ab8118d621b8651208f34e1f01df62e6aa2ef9ef85690d65d6048b58d55df69 SHA512 96f582e1c3ea2296c9f5ab984db020c1745965bd48811920a8f3eb4e45079b5b271737836005cb1bc41dbaa1264ea1d735aa381dff58658f88bf94adb7850f3d
-EBUILD dialog-1.3.20220728.ebuild 1298 BLAKE2B 27aaed922d5bba6d53475aa9c52309e0dcbe98b4fe255579f58d592cc451dd2fce771737811c9eaed574609ac87993803b403938a8e714672dd08d4a2e016ab8 SHA512 d52e80acf62a7e2f0078620af5c516d82d8a46434337af09bee0e2d6105560889e27f12440172edb7c3fa71cdf2f66fc86601160379ef9583451fef1790f5a71
+EBUILD dialog-1.3.20220728.ebuild 1537 BLAKE2B e265bddb8cef47d557e76b085bf43a632135fd8cea9f01ecff1530e987e17b3fc5563ed3cd75b47a1840e26b14a407d7116a545e815b1e828cbd3b817a303715 SHA512 32ef04a8c1e4a86aa734e5103ffcaab1164c7e81710ab80ae49535955c4a4365b182b0a80d8f43332a0366165f12ffad3debedfdd3a80d58173a21acd31e50c0
 MISC metadata.xml 530 BLAKE2B 018162b342a7a0462f5087ead1bfaf931a299a2934220afe0d1f2736951b66d05b9985dcae0b3a9039ccbf2df21f3a20271e5718a4f8cc8391daf23f16c0b1cb SHA512 e49c5b6feeabf720469a5d34e7c40b26cec9800eea1cdd54c103407d653b45c22de4fe341d1264d516fa00d8706c6a969ded915f2df24f463b0a8d40072afd40
diff --git a/dev-util/dialog/dialog-1.3.20220728.ebuild b/dev-util/dialog/dialog-1.3.20220728.ebuild
index 8e2f0156722a..6004b7fe674f 100644
--- a/dev-util/dialog/dialog-1.3.20220728.ebuild
+++ b/dev-util/dialog/dialog-1.3.20220728.ebuild
@@ -4,22 +4,30 @@
 EAPI=8
 
 MY_P=${PN}-$(ver_rs 2 -)
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
 
 DESCRIPTION="Tool to display dialog boxes from a shell"
 HOMEPAGE="https://invisible-island.net/dialog/"
 SRC_URI="https://invisible-island.net/archives/dialog/${MY_P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/dialog/${MY_P}.tgz.asc )"
 S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples minimal nls unicode"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode(+)?]"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-BDEPEND="!minimal? ( sys-devel/libtool )
-	virtual/pkgconfig"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+	"
+BDEPEND="
+	virtual/pkgconfig
+	!minimal? ( sys-devel/libtool )
+	verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
+"
 
 src_prepare() {
 	default
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 448f30bd01ee..fbf6ebb42a31 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -6,4 +6,4 @@ EBUILD pkgcheck-0.10.14.ebuild 2197 BLAKE2B 3264c08a19b574db9f9808dd1f81838b83fb
 EBUILD pkgcheck-0.10.15.ebuild 2205 BLAKE2B 7713a52128cbf038209461aac056bffb666f4ee75cbff1d04b9fa1d98d6de38459273a2cac4eca9883b410dd4da8cea69c6e6d41089eda0cbfd5ba993a8c0378 SHA512 4a6ac693f2dab601f503ea175c807dec0039c87b77fa2753cde0578948e62b2dce13bc9853d0cb93ec4d1219ed2e6f676db684f83326e24fe8630525c0d50038
 EBUILD pkgcheck-0.10.16.ebuild 2205 BLAKE2B 6d7fb1512f29d14f6d87137c49ac7b7395d732b23b2e70df51f9e2caca8ac49999a9dcf4cb0def6922572543aa898ebf44d6ed50f2bac530e2eef6a6f458464a SHA512 c709720d97857d95533b9f913b3c5183d9b6384d23f7b2f77c4e6ec340e8559da1bba71cc2de2741b2a9861f5fe1980ec869f279f550c659433a3081e659bbc5
 EBUILD pkgcheck-9999.ebuild 2264 BLAKE2B 1040f9ec9cc5b36662518827219056f3c3d0f5fd1644cc572ed7746bc6ae6f57dd8d5afbe8fcc4da6e669a43a82df6add14a756d4c527ef493fe2c8e93b6fe82 SHA512 38c1942f3361a9e63f147f4051e3df9b93507351b2717c4a8aac42a570cc1a107ec543a5c48271767109220f57b41ef1c57124a3e2cb419669bf4df4173fa168
-MISC metadata.xml 486 BLAKE2B 3fbd43c40601e7edccf11e4335b82d90bd42c9144436529dd6a0c2ffaccbf5febf018c55a336d07c2a86271b43e8da4dafa228a6d2afa7dfd8215eeda5e415e8 SHA512 98c0803dd08976c0f1be543c052a49647d3ec3dbb02667053fee22baec3a05723350cc02d3c0090ff128ba795ed4802b8b73161148f2b790519bbcb881b31105
+MISC metadata.xml 431 BLAKE2B d7d5cd3611d661ef181be38b7087169cd7a73351e54a5e5630915666a81e62761f6b797e255fb7e3172d0135e1a076045ec3727ed6bc9f6d741b5dc63090307c SHA512 8635c9e2b28a5477209d5c3d3a4daf8bbe7a876d1d43bcd0cad30d28155e2cb98c9ca3880418f58bd9ff536e210ae379c3477f2ccdfa3cae409b2b978eb14c64
diff --git a/dev-util/pkgcheck/metadata.xml b/dev-util/pkgcheck/metadata.xml
index c9ba26ab8907..8d75f65262e8 100644
--- a/dev-util/pkgcheck/metadata.xml
+++ b/dev-util/pkgcheck/metadata.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>arthurzam@gentoo.org</email>
-		<name>Arthur Zamarin</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
+	<maintainer type="project">
+		<email>pkgcore@gentoo.org</email>
+		<name>Pkgcore</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="gentoo">proj/pkgcore/pkgcheck</remote-id>
 		<remote-id type="github">pkgcore/pkgcheck</remote-id>
 		<remote-id type="pypi">pkgcheck</remote-id>
 	</upstream>
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index 87bb43690e79..7714d33ecde6 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -5,5 +5,5 @@ DIST pkgdev-0.2.2-docs.tar.xz 5496 BLAKE2B 46df2c14370dbe1312e43e08388aa9a3f13e9
 DIST pkgdev-0.2.2.tar.gz 66977 BLAKE2B 50b7c06339438ada28ffc9e8e8ba0c472342cbe447790ec7df7506979a1865ebdcd317071833b05091e3749f78857867729e905c1a971bf04e44137337106abe SHA512 f154c7442c40fb1ef5fe9917079db4ddf5bfda4b4d7ca964b9a11fad2a273e79971455142e99905e2293babf73b45d26974480faf0c5c1b25057afc6d658bdc2
 EBUILD pkgdev-0.2.1-r3.ebuild 2441 BLAKE2B 99cdd71ce398fc02d96ae8cdae0cced060e3854aaa802dd3fa118166f60726d26181ee8a76c191c8b8c8daa4e2028600e92e5f257ff7d93b5626aa59e8897261 SHA512 632fbc60b508672044e7981f9fcb9e9b9df64a187bb371fc2f7e579f5a7e1f21ccb03794288e1808b395b5e6b949fa4824240f85add9210453cb39ae529d5bb8
 EBUILD pkgdev-0.2.2.ebuild 2398 BLAKE2B d226f59a1674e3726c7b4cfb162470243e5435c5d23711381e359ac7687f55faaa7fd0d5913a23a07e8372ac2e7034ec8d29ab1c001fd7a0f36b2e9689597010 SHA512 dc3026258c5f3f9bf84cfa05a9322bc797bc49c90b22c0adeef4c0604a6af3e39c2034e772c6637024c287525842fe98835bc18f280f67fadac336a9fc312bac
-EBUILD pkgdev-9999.ebuild 1633 BLAKE2B 3f13b2a4108d5005cdf614ecb8b394c4014f4a4e18d0ef77f0d792d2d3608e66186b345abf4fc5b77240af1168f9a3b5e08fa6389f6f6f9f7588fd10abfe3bc5 SHA512 348e552b87ed615fbc73c8dbda0259804715c76fd0f8b509ec0302b52bda60a4fd5d4f6bda4f1f16fbe5ea016f19b8bb3d457d4f80de62004cc9d7954a93b989
-MISC metadata.xml 606 BLAKE2B 9c87b0b058df2a15ad455e54499d6a52e31e5c8f51187d36a42a775f1fa03745c69c99179a21f8c44f64562f78ddade051a2a4568b7984600fc529f35e36811a SHA512 5c7151cd72132faf4d47837a58812aefb919edca3fb613a6751de265994bff327515a07d80dfe175069bde7097581f10cb453dde1545383e300735dfcac09bec
+EBUILD pkgdev-9999.ebuild 1690 BLAKE2B ff55c939c65b5461f98cea4a18225f3107b41929821aa1d1c738ca61370520d44cff73bf0ca03ec796629f13a0de070ca503f77f03c2edf329a2bfe2490089c8 SHA512 8a1a0e0b03155ebbf3e517c0c257e029e8494aeca9ef03740d83cd51f751d525ec0d32ecbb575990ef7ddcc82d74e38d5852930157bddd7d95f59bf5fae0cb01
+MISC metadata.xml 449 BLAKE2B f440d395e5453394e7bcc857ccd07b6735bce1b68b3e4ce9d33068c28c5794f6ba65d7394ed6f585dcd3e58ccd3f49ecee4d001ff4e40893db721b5ac869f7ae SHA512 a07c315d071af0ad53ee79f9db3cfd1a8acbdbabfad960cf64025eea1a3759f1ef7d5dcf71bf07b17cbfb6f912513edf118c28d3c24de06223a7a3420cc4438d
diff --git a/dev-util/pkgdev/metadata.xml b/dev-util/pkgdev/metadata.xml
index 84522b26edf2..f4ef74297fd8 100644
--- a/dev-util/pkgdev/metadata.xml
+++ b/dev-util/pkgdev/metadata.xml
@@ -1,20 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>arthurzam@gentoo.org</email>
-		<name>Arthur Zamarin</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>sam@gentoo.org</email>
-		<name>Sam James</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
+	<maintainer type="project">
+		<email>pkgcore@gentoo.org</email>
+		<name>Pkgcore</name>
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
+		<remote-id type="gentoo">proj/pkgcore/pkgdev</remote-id>
 		<remote-id type="github">pkgcore/pkgdev</remote-id>
 		<remote-id type="pypi">pkgdev</remote-id>
 	</upstream>
diff --git a/dev-util/pkgdev/pkgdev-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index 7fdd98f7203c..736ac5eb9f9c 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -10,7 +10,8 @@ inherit distutils-r1
 if [[ ${PV} == *9999 ]] ; then
 	PKGDEV_DOCS_PREBUILT=0
 
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgdev.git
+		https://github.com/pkgcore/pkgdev.git"
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
@@ -34,9 +35,9 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
 	RDEPEND="
-		>=dev-python/snakeoil-0.9.12[${PYTHON_USEDEP}]
-		>=dev-util/pkgcheck-0.10.15[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.14[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.10.1[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.10.16[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.16[${PYTHON_USEDEP}]
 	"
 fi
 
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 6988677730ce..70d3f6b745d0 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,4 +1,4 @@
 DIST umockdev-0.17.13.tar.xz 489728 BLAKE2B 0bb4d912aa924c91ff1f4e2cd5ca4ddf81eea1db55ddf9e4cd9a7e9683ed92a268063601a38f7f0a6fb669b301fa9ace94c413e5958ad5587db0097acb2f066c SHA512 77863ad67be0995869b35d12dc43a809d2e67e95f727312ffd9f585c5bb1598c4d31f4909fcff5035dfccdbde8c36819daa633cae53c57ea2d9c3ede3587ec4d
-EBUILD umockdev-0.17.13.ebuild 1137 BLAKE2B da0ae2f908518e68e78df3b629f10b8997995434909919ff289076339190347c56c99f40c212eb61e7ca9f80f6da60a85576c4afa5b68e645ef1f042ed91c2a0 SHA512 d5dfbff1e21d09e51553904ebf432382f64105424203e0f82a793278af75a5d74b887d8acc8a6bda3839716a060ab9ba72e6202beb93161e615d3cb90d372cd8
-EBUILD umockdev-9999.ebuild 1257 BLAKE2B 758117375c6e89af59a15b67b83f9cdd69b06b4b5bcf53b2517cfce543b6adc125b22fbfa5bda7762618024f18adadb5f89e716b454f78d6fc5d986465ed58be SHA512 21d2afba94086dbbd4fc048b02f35f36320316bc5597ed73b146cfeeef6da73133e73916b28725da365f904a330847443eb4f9baaba5ab765b56e7a830735b36
+EBUILD umockdev-0.17.13.ebuild 1250 BLAKE2B 2ecd27e301fa8e28e8c03db4f6c7644a0490404a9773fd6d6ca3d25d98e4ba46f7f77e2e8ed916c53e6cefa1a6b82be1a8fc895bffa8ba092ebccfc01791d01b SHA512 5bb160f21af26aafae9845c40bb6e7d9e4a222d6e7d12ed35dc483be18c44a4099b5a706a2f6d23e906c0733ef9ec561968426e470c09023af79128e416b5dda
+EBUILD umockdev-9999.ebuild 1257 BLAKE2B 19d58ec0f691fea74bcc95630ece7d34296b2e7472121f64933ed052d967054bfec118ccb6d42db36dd334410653572b1beded3143f32fba1194d00316113863 SHA512 4709d411f6792a51077caa75c638dec6ea764d9c59bc75f4d7442ada8455e74f9add0e584a4740c1fde979109de1b41a05b4a070d4219b4665f5979821190822
 MISC metadata.xml 389 BLAKE2B 83313795741d7a5ece22e39de4d8b138c484a7f298f64d7e87bf44a9c04b6733c80f407ca15eb2b4bd71205eaa51b6b814227f4df730ba77e3b54a27735e7484 SHA512 6aff7de0eb974f8ddc4a7190b06b8e3ad406a410f618935cb0b757fa2bc22b6a33ecf33510ae9fc2d4a03f676905faa5561d030fb5e5065f8dc3e7320820cda1
diff --git a/dev-util/umockdev/umockdev-0.17.13.ebuild b/dev-util/umockdev/umockdev-0.17.13.ebuild
index 828c98c13e9e..5e679a5c7ee1 100644
--- a/dev-util/umockdev/umockdev-0.17.13.ebuild
+++ b/dev-util/umockdev/umockdev-0.17.13.ebuild
@@ -6,13 +6,19 @@ PYTHON_COMPAT=( python3_{8..11} )
 
 inherit meson-multilib python-any-r1 vala
 
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/martinpitt/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+fi
+
 DESCRIPTION="Mock hardware devices for creating unit tests"
 HOMEPAGE="https://github.com/martinpitt/umockdev/"
-SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/umockdev/umockdev-9999.ebuild b/dev-util/umockdev/umockdev-9999.ebuild
index bc20bf311552..8015f3762895 100644
--- a/dev-util/umockdev/umockdev-9999.ebuild
+++ b/dev-util/umockdev/umockdev-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit meson-multilib python-any-r1 vala