7 files changed, 27 insertions, 18 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index acbc29bdc1d4..b1acb3a6b4c6 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 5b14d168766d..8a790567c1d7 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -26,4 +26,4 @@ EBUILD autoconf-2.69-r7.ebuild 1780 BLAKE2B 470eb76b486789c7f4b8d6b3402036b38cea
 EBUILD autoconf-2.71-r1.ebuild 2224 BLAKE2B 2196cf8224eaaa5ee2c6449c36d9690be996249a45fb65df8a0971404b6c56c07669f5388cdbe3bde4b35a2b711605e1fe6ec5b829e131eecdac9ce03d9de71b SHA512 f6ca241fa5c34c98d259b0c4d545cfebf0a3f934a40390eec6f81a0e8aca8998ea7ecf9a10fba1619f6279eaeb4e8f9e670d17ea7f1b978554a33f683e71a02b
 EBUILD autoconf-2.71-r4.ebuild 2401 BLAKE2B 06c1f0bd14ec8955942623c4bf903c579489091c6a4e755ea8ecd6be986f8545d96b5ed21abe0db83252060c9c453ce9e86b0e8405e81ddcdbca6a5951413863 SHA512 625fa2a93478cf93d01c5e93a0d7ddd60ddeffd9e3519569201b9f49504a3f996996489b18d477cceb1694072440e0bf034ebb7d7a257e446e0d342bbdbc2439
 EBUILD autoconf-9999.ebuild 1417 BLAKE2B 3e12f2c9b86fdca9fa2853149e42b92e2d23e4787153ca21031be8ded48cb23ad394b9e3a89cd93e56942ed2838d36021d4d4c7a8c3dbc46c3f8ed9279b7402b SHA512 eda5fb951fea1daa331ee1ebb6a76636a3bbe06db0780c87162ce3354fa5265c040fbe237d0c05e267c97b38d7e491331b770441babe6ab6fcf1c89e471246d8
-MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
+MISC metadata.xml 343 BLAKE2B e5fd0138606384a4d646b618c096693858ddc94d09e0bb4dd3ecc6ef064a1edf9586f62a5cc753f680d73b2a6c72ed00739b21e54d490dd8edc97aa32dd05309 SHA512 6b06b7e7a5e47a4de92b2032ba3af669916818038802309e4db26917aa536387d2227feb33c29976179fb3cbb10d4b2f975d1055308e6db81a734baf1e8c1e5e
diff --git a/sys-devel/autoconf/metadata.xml b/sys-devel/autoconf/metadata.xml
index 73dda144f9ac..4ff4a48125bc 100644
--- a/sys-devel/autoconf/metadata.xml
+++ b/sys-devel/autoconf/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">autoconf</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index ed3ea4942d15..ac64618dd816 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -6,4 +6,4 @@ AUX autogen-5.18.16-rpath.patch 2990 BLAKE2B 8374f788feee898f35f6baae40d0a42a042
 DIST autogen-5.18.16-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h 11231 BLAKE2B 4f38f6ae84cf5cc4ba47d8a7da3b38b06f58e30ac8b70f2b10936cbb7a775179b67f22ca8e636588515c4ace7410f98835218e3222d4a793378cdafc4aa84d0f SHA512 b8ff80fd764a3f21040b0054e71a443e3d9ec18dd631843f2de999aa54776964b36366b35fd158dbbe5f2ece146fab12c6ff5008e18c52188b718c89972f867b
 DIST autogen-5.18.16.tar.xz 1046276 BLAKE2B 23f9e0948f24ada715fb2bcbbfecba768cf51d169ea3ff4724a97b18f598d2d7fb2ffa7e23919ec8dcc0e352f9d3280f3740dab279a0af1412919cf10c6cb0bf SHA512 5f12c982dbe27873f5649a96049bf019ff183c90cc0c8a9196556b0ca02e72940cd422f6d6601f68cc7d8763b1124f2765c3b1a6335fc92ba07f84b03d2a53a1
 EBUILD autogen-5.18.16-r1.ebuild 2179 BLAKE2B ff3c00f51e6987aadf1913a70161457438ddc7990bc88f01d13ad3a79ecb3f7b1af905a490b0e25016fa981670aa57522afecc975af000a7093e301c6ede5c6a SHA512 e02e57585d3b46675c01018aa00652a4632a7b80cbe24d2b1f94664f4a7bafcb53adaacd0a60cc38e36033139edcb9392d9974a7749bb3865f18a108b21d9f8f
-MISC metadata.xml 370 BLAKE2B 942f7f6c3c4a466667398a42eca7f4dd53f3333ec577c4b64cb35529b3dc35029f57cb395dde2e5ee4c54f97db6e1bba56d0e3bbf3971258d8d39ce7d57995d7 SHA512 4dc996362fde89d1692027f1a6e9d3fc1f4b38b57c9a3938c931d2173205be7065c442d7a6ec27a49306a39183f0927d2e8714c2a8fd01b4f655918466c8fff9
+MISC metadata.xml 465 BLAKE2B d749ac3e74b39a006006e3f8d09ca2e8dd392f05385ffaf4d4d4cc95af4571c48e6ff6383e5f582ed6158d3536c9d9447c8f9587a8dc8ad9bce3ea3d5f8b2b5a SHA512 da4398891bf5ddd30545e5ca15b1591da5126d0ae22d00a5d5851864351c43465e6eac9010a9e35a029eb3009727fcd3264cb4fa87fd1f6545639f90b9cf2a47
diff --git a/sys-devel/autogen/metadata.xml b/sys-devel/autogen/metadata.xml
index ab5727db0a55..8f3ef98f5bc0 100644
--- a/sys-devel/autogen/metadata.xml
+++ b/sys-devel/autogen/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
- <email>toolchain@gentoo.org</email>
- <name>Gentoo Toolchain Project</name>
-</maintainer>
-<use>
- <flag name="libopts">install the libopts tarball (a few packages want this for developing)</flag>
-</use>
+  <maintainer type="project">
+    <email>toolchain@gentoo.org</email>
+    <name>Gentoo Toolchain Project</name>
+  </maintainer>
+  <use>
+    <flag name="libopts">install the libopts tarball (a few packages want this for developing)</flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah">autogen</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index a081bc12a7cf..16aa565337ce 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -4,4 +4,4 @@ DIST m4-1.4.19-test-198-sysval-r1.patch.gz 6292 BLAKE2B 62f52c8bb75e7b8f11e48790
 DIST m4-1.4.19.tar.xz 1654908 BLAKE2B 08694485a49c542761fa9a7db4d7609f4dfb08a5c6b785b57f2e14cf1f696c2a1c788bb5eb934e8159a632b63ff071dfe42511d0109d7b1828f46d33c8bf416a SHA512 47f595845c89709727bda0b3fc78e3188ef78ec818965b395532e7041cabe9e49677ee4aca3d042930095a7f8df81de3da1026b23b6897be471f6cf13ddd512b
 DIST m4-1.4.19.tar.xz.sig 488 BLAKE2B 99e89b1ed0bf158d29a652392fb122e23227e895c75a8c63057ebe33f11b433ab205ae99a991578a89df8c3e723fc00669d8cdb290fbc86eaa6c704b112e4370 SHA512 d6ac9c6a54c57e9b53fb3e34a60d49df2f46a6e494da0a0c9ae8246b984e68a853b5d8c42677c1a0485c3f36b0bce10a481d3775c0edc1dbdfb27b43545bc31e
 EBUILD m4-1.4.19.ebuild 2640 BLAKE2B ae589e2bb491aff271a9bb7b6fe6ad937de4bb3e079f215a987bb719ff6db7dac2c42e1d439c524876f991dfa4c41fc93cd08ce984942dabae6a20f9b7ac9eda SHA512 2e715bd882e41244821f4b04ab6675ff3b0ac20f1c604c1c4a86e17fb7640be42781a6d5f6a8f260d304cf1cc694c04a40522daadebd56043d7c7f901dbade46
-MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
+MISC metadata.xml 337 BLAKE2B dfc1567438a22dc64fbcd7c88e0840408e11b95e718134a839e1a9b526d6b618a40887c55097c8a36fd1757f9affe6acf07bd761efd59e372b95dd52110146b9 SHA512 066643eb5bc9f637200a19197c3c4825f3e032c568c0bb440b21c0b337a3ef30f69a1a1a4b38929b19ef22f9fd25d0f86079a11b33f7d1832165d216d269538d
diff --git a/sys-devel/m4/metadata.xml b/sys-devel/m4/metadata.xml
index 73dda144f9ac..dce0ffc83fe5 100644
--- a/sys-devel/m4/metadata.xml
+++ b/sys-devel/m4/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">m4</remote-id>
+  </upstream>
 </pkgmetadata>