13 files changed, 53 insertions, 38 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index e2ca3b75c377..1acc9706dcb0 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 8732821a3e58..3dd32b7d0d28 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST gedit-plugins-42.1.tar.xz 946368 BLAKE2B 6ee8c42d5d5214cdb9095bce71623f9486c973ade69aad91eed4ae13a1ad5ab59bcc43d30078bdb9db46527160f8bc6b183a56c255d10f8027c4ff2e603fffa6 SHA512 2e36919f7b7232e4471e2c1277c33e2f79ff513b76574cf765e451064979587c170ae003c9517d33f3b9cfce916cb7f25f9e3d0a4f6a6b203086fcfff9f265aa
 EBUILD gedit-plugins-42.1.ebuild 2704 BLAKE2B 996f031b83848d81288aaaf91a02db69e0241946234284e2b579e67e31d733c1d31adec4fe18c7cf889461a62aea62edf0aac32ed2d6ea6e36f5d0a7143b10d6 SHA512 5f14b805ddee568ff88e03f710a280ae42d1088c2432a0d63284c75d372aeabcb8101f3b859d2657cd63086eb420b2c4b8c41153503b86de9c4fbac4d0a11b45
-MISC metadata.xml 481 BLAKE2B 5fbf2df78aa40fce971741bb7d04de00cdc7a6371c2652ae0ae4bf253ee469c4bbb5e5a7c2b88226f95bb8865930dd19e9adedb191fd5a173ce915890ce40b32 SHA512 3b4b858659d1597e6c1ee574143de4864be8b75d4a6399d47bff85c4b18ec35472523bfeaa0815189a9008764405ee3b2fa53e73fcdc3edc8eda00a5f943f762
+MISC metadata.xml 596 BLAKE2B cf545e591c160fc584c5c2b1e3f5fa6a47922a958f981daa5c85f3f6c8f7eaed2a520d6265241998dfe211098f70c75a0fdfff033e55e892e5775b678ea9ef5b SHA512 0a3b9e748bc2d22ea16a694f8ebd6196d05e6652f552523bfe6fa60f1c69ab50110692cda7a59239c8f6946c06d3139a4225f1744e0dd40ccbdef3e8b396f692
diff --git a/app-editors/gedit-plugins/metadata.xml b/app-editors/gedit-plugins/metadata.xml
index eb35a3df50f2..2695ac239950 100644
--- a/app-editors/gedit-plugins/metadata.xml
+++ b/app-editors/gedit-plugins/metadata.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="charmap">Insert special characters just by clicking on
-		them</flag>
-	<flag name="git">Shows document changes related to git's HEAD</flag>
-	<flag name="terminal">Embed a terminal in the bottom pane</flag>
-</use>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="charmap">Insert special characters just by clicking on them</flag>
+    <flag name="git">Shows document changes related to git's HEAD</flag>
+    <flag name="terminal">Embed a terminal in the bottom pane</flag>
+  </use>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/gedit-plugins</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 7176e1332255..018e60536d50 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,3 +1,3 @@
 DIST gedit-42.2.tar.xz 6917596 BLAKE2B fd7b0a1c113e944b1b3f0c2bb55a061e76e7ee71ebbfe8d64c6d5b0c7e47b8dd54519bde1b7b095a1cab27a169427eecdf35d06422c1a984f51dab82e19c7cb0 SHA512 d50f021f33764e0cdd3ac51650db0e37dacb5b6edeadddfd8136e8120e83eb740db66ada25ae43eac810896714859d6f8876640a8976ddfd6e7e602c278dcc99
 EBUILD gedit-42.2.ebuild 1882 BLAKE2B fd260e8df390c8bfc7fa296a3a90260df9de3d9b3594449ee485867eabf382bea8f2c8331800f1227bedea8f22c16d4c2c4d4eb8e70cf8e5975f3c4725f477ed SHA512 cf12494d027f6f150520ffb5d3966a2c801204d89071de3dfab4ab5c4eebb0d8300c11db80ee064df4538a0331c324a7f2041d3d89c7eadd699ac8be012c26d5
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 346 BLAKE2B 59226b3220bd9b1770fad0f5acf3b1888a57a3496f9e0a6eb0eb09c12b7a5aa461961753dd8a5a6f01db1cdb97af5b28d6a8d1d632b60f499f86e0864e29264f SHA512 3e1d83ad67b85a681b85f8fece9d6c2c3eab2f2f726447230dc1f2399a21cba211d97e11d8c06d0d1b1803fafe67be4b32c04b39c5f8586a421c525624f6697d
diff --git a/app-editors/gedit/metadata.xml b/app-editors/gedit/metadata.xml
index 7b343b06be8a..25826770e3dd 100644
--- a/app-editors/gedit/metadata.xml
+++ b/app-editors/gedit/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>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/gedit</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-editors/ghex/Manifest b/app-editors/ghex/Manifest
index bd871d76e6b4..9d2f6fc04885 100644
--- a/app-editors/ghex/Manifest
+++ b/app-editors/ghex/Manifest
@@ -3,4 +3,4 @@ DIST ghex-43.0.tar.xz 1020716 BLAKE2B e4b6590f9af11d6fbec31266ef9959b827937697ee
 EBUILD ghex-42.3.ebuild 1141 BLAKE2B 4115c3ce3a4d786dbc56b9d25f529306c6d9e1495dd8d8fa5544c494b2ef5c83c24935ec1de544bc0937320f80470eeb02624a7a091dc09c811ad39fdae8ed30 SHA512 ddcd5e958f36b07a77a08a57a0f63be8755047427881b1e306c28a7b2a0e92bc36cf31a32e9b88d0f070b13034f93e9e6042545fbd9d7b089a09fa3026da5ea4
 EBUILD ghex-43.0.ebuild 1292 BLAKE2B d0d628849dd93185e7802174726c92211f999142fb2ee8359a9d22edaf522326de806e95d00b830a4b369afc3f80b1c647a3fa39f127590560e75ab812e13538 SHA512 ae01eb04a1458d233add7e73d9f9cd021b49ed5d96dcfddddf860610d0003a7cb8b9ca2a56828bac3d65f0fc847aee6add97b50f4862564eedcb64db553ac46c
 EBUILD ghex-9999.ebuild 1292 BLAKE2B d0d628849dd93185e7802174726c92211f999142fb2ee8359a9d22edaf522326de806e95d00b830a4b369afc3f80b1c647a3fa39f127590560e75ab812e13538 SHA512 ae01eb04a1458d233add7e73d9f9cd021b49ed5d96dcfddddf860610d0003a7cb8b9ca2a56828bac3d65f0fc847aee6add97b50f4862564eedcb64db553ac46c
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 345 BLAKE2B 4c2385371bb42d47643f2a9d48ee5ed675267f812467fa03f69151bcdbeb996602be0a3995f976b61e0c018c8d69e3dcd37392f5927bbe24942f11c23794bac4 SHA512 c3f3cc3f436137299082ccdcaa57221d1b3f490b34febfcd6ca586769b0a8c76ce11cc5b8be823c8c88b942effc0b68d9c078ba3a28594c41419830dff04fcad
diff --git a/app-editors/ghex/metadata.xml b/app-editors/ghex/metadata.xml
index 7b343b06be8a..ffc72ffa12d6 100644
--- a/app-editors/ghex/metadata.xml
+++ b/app-editors/ghex/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>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/ghex</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-editors/gnome-latex/Manifest b/app-editors/gnome-latex/Manifest
index c3b658656882..ecb51f26e6df 100644
--- a/app-editors/gnome-latex/Manifest
+++ b/app-editors/gnome-latex/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-latex-3.40.0.tar.xz 1050088 BLAKE2B bd8764450ee122599fd96a7e889291805fc09d854d77aa4e7d3b01709cda8bf0c38327d05de6117a19f325ca6a61ab42e014d27b941ed8e40f0bfd963dd65680 SHA512 822d86eac81994593e71428f1c893ce7d6970bb8e98349c8ad9cc6a113e3fdb49209f1bc7f19fb8d5a22da98d7650a822c8f8ab1f5aa096e6ea0cbaf74dfafca
 EBUILD gnome-latex-3.40.0.ebuild 1128 BLAKE2B 03a5c6c42afc5037644a514bd015406f373e4f134b55535d6f4d8c3ff2b421571a278d50097ab8700bd371f90a528c9b9d24a564fce33b549d4fa14f723ca653 SHA512 c1726566142ad8529b445a3fb7894587e578471d461ebd296795422d0c49349b9293e1f7fc90555077d0b276d49cfaf94b046d7e97faa7a498bd254f15d533d1
-MISC metadata.xml 465 BLAKE2B a26c9cc411d697492d945046338c0f37c5a41dc750cb28237cb527db1d55716323f9c6520ffc4d86e838e05b9aabe42101985362fb130d6941082ea3e3af297e SHA512 e01b512e26c05fad079c5cec65df8ed58cadb60b230c87a89de128caad648d243b46c1dc6eea64c21c2e0e319edcbde3a952dece428035db04176c8e144706a7
+MISC metadata.xml 575 BLAKE2B 73604444b6c40826ddad63c484b35ed2bb7c3edf6ab59e40994881769051c96b2ebb211d47d2f67b562c48e15ca589863f6cad9984accaf40567bc8f697b15e6 SHA512 6a6bbbcd0f1e3119f624828a3f008d12377c835f4235fe6fe232f326dc8d3bcc960406d1c33ababd00b0a941f9c7160c3f6a7b106a9f70ccb505b0eb0349e5b6
diff --git a/app-editors/gnome-latex/metadata.xml b/app-editors/gnome-latex/metadata.xml
index 6c684e071d5f..eb53c84a44e7 100644
--- a/app-editors/gnome-latex/metadata.xml
+++ b/app-editors/gnome-latex/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="latexmk">Install <pkg>dev-tex/latexmk</pkg> (used by default
-		for the build tools)</flag>
-	<flag name="rubber">Install <pkg>dev-tex/rubber</pkg> (can be used for the
-		build tools)</flag>
-</use>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="latexmk">Install <pkg>dev-tex/latexmk</pkg> (used by default for the build tools)</flag>
+    <flag name="rubber">Install <pkg>dev-tex/rubber</pkg> (can be used for the build tools)</flag>
+  </use>
+  <upstream>
+    <remote-id type="gnome-gitlab">swilmet/gnome-latex</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-editors/gnome-text-editor/Manifest b/app-editors/gnome-text-editor/Manifest
index 187c4692ee28..64d18b38c1e7 100644
--- a/app-editors/gnome-text-editor/Manifest
+++ b/app-editors/gnome-text-editor/Manifest
@@ -2,4 +2,4 @@ DIST gnome-text-editor-42.2.tar.xz 1168504 BLAKE2B 0bbd02fab92c3ac2df2a38352561d
 DIST gnome-text-editor-43.1.tar.xz 601588 BLAKE2B 0e3b7231327898b554360cfa45c3ba9f8ff005f61b6f68f6ea431d1c9e459b429af4da794b06ce6f4618de06c96a191477f1cadd61cfa6ae9e1ae350b75658a1 SHA512 aab2fcf5d0ad705833802bec3ccacce175c16dc717b521e0b220ddf5420760ec76a90db9b4f4ee0722c2b19a40304e1c379f06f2983e4597df233ade67a0f725
 EBUILD gnome-text-editor-42.2.ebuild 1034 BLAKE2B 529a22dedf22189af0f29a43f858cf45a85407ebe0a2e3381d0822c482c3106ed306f9d566615fce747114f002d1b7ef723a22e3858a5cb8fb26b9dd21e47447 SHA512 a42fe9bc4648c8f32beb360c20531ca0df19055231467214280b50390cb22463f4b2683d12d67a22400544753fa801840ac38c45a732914ac5c845d8b60384a8
 EBUILD gnome-text-editor-43.1.ebuild 1017 BLAKE2B 0a70bdb76dfe9dc0cf5105b96cd1e370b28d353b32c2dca6213aaa0b748e9ab17ec991ee46506c56b1ae3b100f2dce1e9b19d1c68c815d200a25020e86587f63 SHA512 b1970bfe3ba30187bc041f042166bfa488151cd2c9a980a0675e31bf1374f120569bf66e874be4ca0cf824aa66b45ebbe964b879df6d3332eff5b1a86b4a67f0
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 358 BLAKE2B 908c67ba226a7e65b72a1cbaea99350f05fe9f904644c99b9c4e1e0c81f795c1420a0ca9cba1d56f59fb1b841151ffcf7d088add9f36a0e88314f7f52da94fcf SHA512 5862fb965119f76e19ed997e53e651778458604f1f9b69a1ee04db8eac52bdb6352da84ecb92555b31d3b8c62aa544c57c6040ed358af3beddd35fe356744d85
diff --git a/app-editors/gnome-text-editor/metadata.xml b/app-editors/gnome-text-editor/metadata.xml
index 7b343b06be8a..b96389a37794 100644
--- a/app-editors/gnome-text-editor/metadata.xml
+++ b/app-editors/gnome-text-editor/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>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/gnome-text-editor</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest
index 2f417e7f88d9..48ca746b6ab2 100644
--- a/app-editors/qemacs/Manifest
+++ b/app-editors/qemacs/Manifest
@@ -3,4 +3,4 @@ AUX qemacs-0.4.1_pre20170225-manpage.patch 372 BLAKE2B 68e2d415700e576c570678803
 AUX qemacs-0.4.1_pre20170225-nostrip.patch 1771 BLAKE2B af8ad554ea5dbdcd8e7a3df32a4ff5402e84f56642a74f228b0c5be8166895b82b90e291f043a5e18a757b6e6de69ed50af3950c719f2b40be1e3d1e031c2031 SHA512 9ad3c3cd4a7744894718099ff8df2648e11385c6926a137f3f04ed33ef449d658cfb873476276bc52de7a7cee5ed2a2319893d8f47e7a2413d00d61378123656
 DIST qemacs-0.4.1_pre20170225.tar.xz 1147408 BLAKE2B 369f3c5ff1b1f7b22bbd1f70f0c150e425a5b68828e62db427e4b41c58c8ee9ae0449a83693e9354d88fc482691d7a5f3661360ef602aeaba963776c4725b894 SHA512 a17c8901c917f91401e16b4f857735957ab0d3533d9dcc7a0decf768f453b68023f45e1241225a84d35ba793beb69754e0f2caa857165f8223882d5041d56c99
 EBUILD qemacs-0.4.1_pre20170225.ebuild 1523 BLAKE2B 2cb0eb2d3aa9061f6e4e71e04797e4cf12dad9ec0ea58fd1d43aa13a8f6af6b6a1cc913b5a97fa67e0c72e034ab680cfc316e2616d214233456335663d29c4b7 SHA512 a6b57e99ab0421357863d8d58ce0a8e9cfa49ac24b4ea6ab3b039680a5051bb8cd9078034f819bfc007aaf98ecc0808c2203e1ba1bcfa630007334a35b88d1b6
-MISC metadata.xml 1938 BLAKE2B c5293f8a3aeaf7f3ff131dc4067ffea4d4bf10708cff068dee871bb95254f9d5d60d97752e5c8180870a69f404de1a44004cb0174dd11d71a1adfda23cd6fe7c SHA512 24ad0431bc56a92856391904c28053b48da8b63db03d7ed1b643b4ea5b7f9c344dda47f340352c311bf5987a841f6fce514d3a02f4c0f745b6e51198ddadb4ac
+MISC metadata.xml 2016 BLAKE2B 9e154f975526e4a36555d752924cdd7610c01a7f643351bd6cdbadf027c2e62f7bbd3296b74a9693331aa3092afd7edf8977460d4420c7b9772fa0d6f168e683 SHA512 8445c0dfc407c03f87799917d1f422bf50cbd39956b679131461f903aea439b80474f9f4677e82d2d50759d88cf7460b32ef6e246098186e393cd5e3dbbdc7f7
diff --git a/app-editors/qemacs/metadata.xml b/app-editors/qemacs/metadata.xml
index fd4cdb06be09..579725de06cb 100644
--- a/app-editors/qemacs/metadata.xml
+++ b/app-editors/qemacs/metadata.xml
@@ -35,4 +35,7 @@
    * Small! Full version is about 150KB. Smaller custom versions can be built
      by removing modules.
 </longdescription>
+<upstream>
+  <remote-id type="savannah-nongnu">qemacs</remote-id>
+</upstream>
 </pkgmetadata>