Updating remote-id in metadata.xml

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

30 files changed, 341 insertions, 180 deletions

diff --git a/sci-electronics/Stage/Manifest b/sci-electronics/Stage/Manifest
index b0b3e5e6ce64..05c82c06382f 100644
--- a/sci-electronics/Stage/Manifest
+++ b/sci-electronics/Stage/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST Stage-4.1.1.tar.gz 1014322 SHA256 0f115024db427a72c92c85d0987ca10b8dbc55fd756ae7f51e0277c389039498 SHA512 db39135ab2b93925dd0bfbec19d8c2820e3d6ba7caf3cf5f4b617fbdfa76b720ad99f21fde0a08559ab905d819325f5391b29deb7b6af7bb72f522ac15eb5bf2 WHIRLPOOL 7305f903ac7fea4798d11abe64774b401659ace0b5ea840b339c6433bf68da5712abbeeee0f031e668da3f00c2529c15f0a854b38cea2f6780d854658c611e8b
 EBUILD Stage-4.1.1.ebuild 804 SHA256 aed7baf7fe62850587ad7da64e7526f640afe3e6851cb650365390d1983e92b6 SHA512 39abb9dad516dcdc4fe1f3fa8933e211c5b65a3d7dfd4f8a3b02c6155883db729f9e066796028c75eb00e1d777ccab59040286b045f5b8ecf2b17dd634d02fbe WHIRLPOOL f3e07dd0bd90743bee4632717d8ab2620c11155e702fd2b3bf3e8286ad43c9fc34d5d59e4752d4389c7ac98f8e00269ee3146167682aade52ddb24eaa23b1479
 EBUILD Stage-9999.ebuild 803 SHA256 8b175bddbe168c06518fd656b34eaf43b1e70ef20faa968fc43dab17ca353a2c SHA512 f220d9d207fe3b47df51452480fe8d47076b49a99e4f9467583d53629a6205ed1db5d59f8303620cbfe24a0f95a6a2c392060b628e3d6f876436db25ee22bfb2 WHIRLPOOL b766408c7112b55b0f4f7afa0b2b3da07e49f5bcff875eb6b39fdff8d86b9bb21b7bc94d354585744a1427842d074d798b354afb96be9baa5a23a2c7f7c942c1
 MISC ChangeLog 412 SHA256 62ac4a401c8b3ab0cb5092edee5e5ad3bd2f0ce237f6fc99bfad5256e14c83f3 SHA512 de06ca82e796507d3c351676edc1c6fa81af62fdbdff9665547a0c1689e1d75b1fee969869b75ef99ccc314524999de8a28de9801fd2f4859db8b9701d725c55 WHIRLPOOL 32e50a8b66aa4b1019248a73da572a91611e5134350c9d220fcf3a28ec1a2d779f19f98688f701a89093b5add1cd0215f3a0cd7914f0318cd99475d325eed7ec
-MISC metadata.xml 229 SHA256 efa9eeb46bc35b87652cf3e48e5170c1771e26d46915689a6a5eb9fc8a3c0ed2 SHA512 0059c0bc3ad622c6ed5c7fca0a6b20aaa4e2247ae1eef4be23a70bb182ac830cf157ab5b6358841d66a4eba8c8f0455c80383eb4b9686d2fe3f6b56c575b7a6f WHIRLPOOL 085226ff4068e04964352c2573e3638f3cc3b574a9e4a35e995248eb251606d7124c3456d57206e8518a5406f3e9051e20d50a021478fbbef23e62a9f13aec2c
+MISC metadata.xml 309 SHA256 0e1d8a14da3cc4b264825dea8afac13ddbc35bb79a4a850d8dce0e393a695820 SHA512 c9c2d22b22394abdf362f0a9d2bfef575a82c6d6971646da0f43a5f3140f89344c0312d5992538e9dc68d1916f286a7e2635f2328290fd246ca0c736e0bda2c3 WHIRLPOOL b221faa30464de4be730d2fca2d16520a0c8598dfe9a9d0024d1c9f76e94605bb5e7e83fbc5c9150b6e6935a6d88836b082a30831871a53ad65def3f82a334d5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUs7GYACgkQvFcC4BYPU0rz/ACgxqr1qEU9TXmwAHgRAg1yFXBu
-4VYAn0KXaozVr3DBc31MmZgZyem0Sz/z
-=1rFS
+iQJ8BAEBCgBmBQJVfxzdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmimS0P/1MpDzWiYv4dZtSKRhYIq1LG
+1DPpZy+GH2fH2hkizzf5PNGQ5omdu8UsVsbSsj2b0NIg0TcXBi4sBYPq1MFlRzKV
+VBbQslsdIgBUV4WvalAJbI4hmJC32tAaiSzoM+129C6okTlebDHhZ61ygChygYOc
+6gVOyZpOfnGQ1plUmMZR8dX5cDkGO0Bqc8Lg9iKSkXKLX2/AYS5TBfBeUwm+ggO6
+dunxtNItzIwvMqj5SxIaZKXQV6SubNLkrUJKMc8/0hTtKvm6pK/IRfXAUA6O8T6V
+eiqAbTK1l+SpL2q0D/SArctl5tTwYCkw2Ix8xZ7hFoWtKWRBURG6FSZKDX6VOiRq
+0gKdCuMNIpKwSe9pidm8ma4bolgzVo2XGo+wyRnlccnkPGtijdy1k49MG0wn+YHt
+crK2bJW+hGenOd9EoeSG8iFlxiepY31Bm89ikzHQ2EKD/cvSoQtJU3miyZmtsN6w
+zsnk2VMHF/Bi9n8ybLwPzI/BKir5kFppqttMLtUdtrWbPq+fmXAfY03hV4ICoJz3
+LG1d8dZUc/Kf7k0ppPo36+AiiLoAxYBKR3Pg2WSaNinCue5NFrxd7+riaV2A5UZ2
+wzXaQooTyfNaoH+xJVHQg6nWfvUNfL0QSB71FllbhXxE0UKE1YRzXjerAlgtPkFA
+N7uGw6XGS/dl8KM/9Q0x
+=OuCe
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/Stage/metadata.xml b/sci-electronics/Stage/metadata.xml
index e7dd05f66879..464271f6d8f2 100644
--- a/sci-electronics/Stage/metadata.xml
+++ b/sci-electronics/Stage/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>aballier@gentoo.org</email>
-<name>Alexis Ballier</name>
-</maintainer>
+	<maintainer>
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rtv/Stage</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-electronics/drawtiming/Manifest b/sci-electronics/drawtiming/Manifest
index c4db967fff4b..0cadc1f53d00 100644
--- a/sci-electronics/drawtiming/Manifest
+++ b/sci-electronics/drawtiming/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX drawtiming-0.7.1-gcc43.patch 279 SHA256 79289e7588957f210c554646d7f666ef17792510e26ce1c403381302864e31b5 SHA512 73306c65e8e3ce4227626734952e107f0b518b1e7af3ca77efe00fa9afe813567a631b401569173a643927143807b9ff5add1996f25b82922d5a174b00543c1a WHIRLPOOL c5a5599aa17c866f917c8b9d4384afa72beaec7f9a840ab902b8bf5cb66b88ba4858ddb28b68707e9358a421b2033ddef14cbfc0ee580e2a4a1cca9d218f5b85
 AUX drawtiming-0.7.1-ldflags.patch 1290 SHA256 a4265ba35dc8732ce014032a3f62b7ef15e2a0406412991c0e4da3b636f419e3 SHA512 cc77a8fed890e7d9a1713667c818437a8cfafc96d3efa328df77b1bf660e3536460da4e899e158c4515c4ecec07319cad05a4ecac5f3e13b0eb004c11d042076 WHIRLPOOL f7469f9fbcf14df749de349183fcc9aa4dec3bc1f470f5d4413a9f757eb30e3205d9ec4ca665da0bbd249359b96c2c674ab34b22a5b47cd942671a1a98c31bc8
@@ -7,11 +7,23 @@ DIST drawtiming-0.7.1.tar.gz 123714 SHA256 ae35a369f71f03b219d23f56329ced73100f7
 EBUILD drawtiming-0.7.1-r1.ebuild 819 SHA256 419a6ea1afaee86349dfb32164d2e976a9f6f0a1db5d2c18dbcd7fa15bb65c0d SHA512 6c2c6381facff57d9738e629b325a6440629dc4e921e06afc6017b233b1763dacf72aca2c017b19c6f570531b2a287a531639c469ecc42f54dcb2112685ab390 WHIRLPOOL bcc82b268885f13b17ea44bc953140b737993b28b0d270fd7032d7ae3670cbc42396164677f33becc7ce2a32f5b09fa3668647105cd512e51ef885789317263f
 EBUILD drawtiming-0.7.1.ebuild 839 SHA256 a439b21445bf8df4a6a20cba610d857bb25f7fbcba7009583d4ade105eba05a8 SHA512 15a3e21c56746f64be60f651f9bac52815abd5a8bfacf22f5e493f8fbc90c466e413534650c71a253c112d50e8888f672885edc0aafa919f031c00683e3a34c9 WHIRLPOOL 53b1ec5e2ec71f93e08594f57894c47bb5276c3403aee14a26d1975a29e4bf166287e35db927026a89585eeb7fec980b91e2e629589b4afa5401cee5b24b3212
 MISC ChangeLog 907 SHA256 0e6dfb0f7405a388637ccacea2f13d88a925cc01c97dc81607caecb099ad6557 SHA512 3c8cf7ff3769197082b7039e9fe58c5f5f35d691fa7c8ba22193fdb273dfa6308ced2388358a92dc069754509a5c57eb37db5173da7c8cada50db14f74aefff8 WHIRLPOOL 396991cae284cd47a398e72f5a254ffba9adb61a24e53d4d10f4064abe456eac9da82561383ce9cdd777187b7fcc97033adacf4037b2a157dd65f04adabda3a1
-MISC metadata.xml 618 SHA256 745f1c8ff7228ea83a97eb8f5d420cbb5d74c9fc860d8256ba7f576d49ac6390 SHA512 262f3b4e1b71c7ed2716838f86b23c295a1a6e12c3f235a35e3a9dbf4d3a785c7bfc92bb88bd2d419bd9eb1837dd25c4e150b26a65548be3032cb87af184e95b WHIRLPOOL 84ec26178fba7310b8b0d58d44e6c96a5481a2e744918bd218ad9b251536d7821bd04fbb09b82c8c20a9a03e49dafeffe6ea1ca67ffd116aba5d10c299f6592e
+MISC metadata.xml 698 SHA256 890eed2935aade8871b483319bada258beaa3844e3cec27f220bde660e6cf99a SHA512 c24e6963b5541b7b6c017b6ad40392c3ea96952720d4c9b05d61751e3ea14a067107807c030e8d997d3ed69cf40e8c64bea24450925899ee89e8142643b7c720 WHIRLPOOL 7978ba4100f1b16f852a8262abe4536ba7641a0980732876379f4db60b703f1654a8237cd8637b89355a0288770fc6988bc54ad0929312fc892b100293c37e10
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUHJkMACgkQQe4uqXYgU9XJZACgltn/GLAh5ZxU3V53JYH+qTDG
-gZIAn3KBUiB0W3xgCkRjtvataIxAxpSe
-=e6aq
+iQJ8BAEBCgBmBQJVfxxjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmie34P/2cGI8iFzJe6pqOlyuCIR04L
+Ym4WpjoMNXxWavfnH2H++MClEs11Nl/LMHY0z/MO/fVJuGcJFLbU5HABVeqVZ9Fz
+dSev1IbeOGF/p01aOYcF9JeQUfiBVriFkd2AjunDmrfdfkA90vBubvT0ViYEfWor
+TVClRc7qL+APubLTwG7eGQ0oOwV0wTuTQ3+y/nBvsJwODPb98piXxHxDiK2FpM48
+o+rBGTQQWK+atLG3xMsC7VyU908dihFzR6a3oTw30K9UnQpgHV5MW+cLGZUS6SRf
+TTUBc7FS5Qs627Ibf+zCAObRFwRtyEdx61RqK4xdVrQ7UYr2FdL3bq8usPJFmBuS
+ZOibYW6XXhY2ndJvffEpFAXArL71jAdujJnFsQ86RoPfraHiF1asUc0FOlqHHGKv
+RAOx+6TZHeH2MHm/7sTFh2QKK0FSsvO8cF4tOJHSw6lbXi9c+qQ7OZTeg/vQWNdB
+kuWW28JRnBq0SLRXN/u4cqZqnmhCbe0+SXcr7cu8IDK3jTzoRK9wbLCufK7d8aFn
+FqRJkVQCg5PWlJqEh831qleKnNGDFD+xTSSE2wdWrVeUjWb+YN/vmIW8V9W6pt/J
+r1EC8T2zm6mYGaxXdytGdqT5NaWwKYhyeyJYcrBDQ/DWXvcSXB9VfZHZo9y+UjQG
++u8mHhobarp2g/xeiK1e
+=DWUU
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/drawtiming/metadata.xml b/sci-electronics/drawtiming/metadata.xml
index 5c5bb14a4214..1c604f7d6c24 100644
--- a/sci-electronics/drawtiming/metadata.xml
+++ b/sci-electronics/drawtiming/metadata.xml
@@ -10,4 +10,7 @@
 	Engineering discipline is used, including arrows indicating causal
 	relationships between signal transitions. 
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">drawtiming</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-electronics/fritzing/Manifest b/sci-electronics/fritzing/Manifest
index 10f01db321fb..e54de71d1390 100644
--- a/sci-electronics/fritzing/Manifest
+++ b/sci-electronics/fritzing/Manifest
@@ -1,27 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST fritzing-0.8.7b.source.tar.bz2 20007914 SHA256 7d74418863a9e3b3a4eed171b8023ddea426125f08dc83ed4c55a05d39948eb4 SHA512 f45b2d4c62227ae7bf10a481775542ce5eba1ed3d9ea45e16b60517113e2af2762a8cf1155240c7242dc79886b693319e335891fa633aa41e4699ab916a7f9e9 WHIRLPOOL 385979f6edbcb5816e5c5e0872cf74e1bdd54885af4779fdbfd29e60ed8b3349265375a74968c3bae2827e5b28897b05f3f7f36a48f8f709cc0e85a2987ded16
 DIST fritzing-0.9.2b.tar.gz 10913985 SHA256 6e9dbb94a4ca5e23effc2056f471c78913b9efa4c154ced94de8f72bfe29735f SHA512 a8b6d99c4e08f86d7a7cc6574053e8b1af565a3919cb2fc406e67972052b3fa3ded002be43e4fd0345189e4e1f3cecb3851cd14711efd83ccbcbef4cbd135c58 WHIRLPOOL 70a3e310ee8f1e53e63ca7a56b9f93808e5576b8ce0995cca470a787840e5cebad7e2b357148773610971dc2db777d581a9e62bbf94fedfbd104960bab9436f6
 EBUILD fritzing-0.8.7b.ebuild 1515 SHA256 7827c0814e89ab455f7f409403e0e0c666965369a2d5f6435a12933adc622913 SHA512 3483505ea0d4bc82ebdfa772365c10677485f92618f37c32563c009967a2acad6b0ec503874fb3956ca0fe0764ffd029f813d6d4ac49fd65cd139d1328a78d9f WHIRLPOOL 084fe3fa8e844ffe112256b53b5cd7d82c1e9ea23b678a7d150328a03d83bce59d2358bd8078345f8e0255a3bdd0fde28a443aec90ffbd77256de60e1c22502f
 EBUILD fritzing-0.9.2b.ebuild 1653 SHA256 97a1d03c8f8a2979fe592cc67e0a4a10e3372b0567b0ff0b58635c32816de940 SHA512 171a72c48c6cc91ac9058e86626584b4e5200e76b73bd9c152e30abe7e85e5c8c75e371287809e1ce9ce847953eccfad70a38070738ca909b2c6e5eb422dcecd WHIRLPOOL 9c1a5b1f9f5df4525c15e5bff35c12abf29f563554e75598868584bcf6d8c7f6f0392804124460bf6188e0cd4a3c506aa81100b22167aea945659227f615e4c0
 MISC ChangeLog 2714 SHA256 9b8c9fab259b48392822d564d3399575a28292e94143633b5132b7d771dfb385 SHA512 0ea09f897ce83bfcd177415e3453a2fc197829fbb93a0e8c41633f984e792663f078260411dba9fb495a4bc98ea58939c8da3d178adbbb25a7f9aea54c433f53 WHIRLPOOL 61b8e127e462fdc9d8a98357d7bb268980fa56bf234ba8eaf72c2e9471f40dd18fcf3c0c66887d85655f76a5054b7dd994cd6b4185fc91ff3956cf1e808c0305
-MISC metadata.xml 372 SHA256 4af48a3f178d4a0ae2bd255a45283ef917d9f2013b61bdc16e48e87eaf1ff27e SHA512 34301d89c3f9c614242089373fb0c136998aef081d5227878bc96787380d1c854ac57bbf2ee3b0cfc00199405d8c2d5979b73f5cefc4ea471671dc53f7d8a40b WHIRLPOOL 58c0ec26261253615851d0724af58ddab0ed9768a043908b46f88d9744fce063efe230f33e7ac2d04944a03719c0067bc905d9409e2592ed5e56c37901784f2d
+MISC metadata.xml 458 SHA256 88b38a592e35195ebcc0deb21ca34558d95803675dbb3723c1ce94d1fa52f692 SHA512 38297c2a500b08a532b2139bef1d1854a2084dcfb50c3d97e68484ce337f4a931d2a05a4c87384acebbdb9f656d458e3e29d4feb46a70996b062bd54ade98653 WHIRLPOOL 398b9def251edb26c64e017a9726fcba32abd8137322c15599a643f3e7798d76c7c1836b7cbe4419ca42602764222cdac01f712bf1d5b29d5e00fbe0ae730525
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJVN9xrRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7JapEADAY9xtUj1P1L89wztZ1cjou6Syuqi5sYPW191APlrpRMFd34NZE49NrCIR
-RzXyKi2s/BXlr1rw5vjLYgpRIO8IioJu9OSQ5iE29v5cMoBhn78kV+Nfd5McX/wv
-s+dsQfX+GKLXa3VYb+ab2w9TyfgIbNrw63NZhMmo7BBT1mEkOVke0GH/BxcfJhoP
-ZfmsBlTCMyiVvPigJUugD06VQ/aDO2O33hhm6Q8p2VsOvXjW4Q+zbVk/6yR7TYYE
-v7ySHPs5wS1phOjm0vCSHNrdxZOUM0JqeoVFFbQy8wAoo0iulJxpydxsRq6yvjNn
-uSlqaj8CCyT0pDiuO5dvXPH0WMxYFzQes7FPEdOTfuPJvMv9IeXRMQFOAHAh68OY
-iKdRFtZoxVEhwE8OsDpS7XKtihac8WdfsU17ZOpJ0NYenHJEUQFBhskLs/TizOcb
-Kcwz2/yG4bQBdiLXrONx9Gk1uKMEkHv3TOiVjZPedL9k+9h8EoYg8SgK0MKHReLd
-6GVGbuV7vArKjbspOD8wK0obNZAuHKOdGQ051IPHrb/S0kh6DhmYpwtduPCmcOvb
-2loV+E8Xz3U7MVmlW23RGduDvRkxkU1ajmK4gf3zDgyEuXAmujgOSKkEnsy/9cob
-rwICo2GGTGJS7Bidae0RGwIRspuQWrUWpNW5C5aqvFPajejjqQ==
-=DuLq
+iQJ8BAEBCgBmBQJVfxxsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiGS8P/2pMbMvVPjErDFY7kdVgBjvC
+G5ktQxedn0bGkOiAN/n6sVJ+FBgqYKBN682OEdrYWjW6VLmChM7Zn919LZsSsiRn
+hyN4MXJ9Bf9WB56rscy96ycCk/D4WWaDqGlSdmL7Cjcw1bSsN3fEjEPTFW6aqnnQ
+O51G6rtwnjdw65DVY4muKrAudCF4/ySU2+3wjntSQ82IO0UmBe1p4Ez/cWIDrQbI
+GUZRN9tDlsqZtEno3HDE4KQ7Dm9npMqsaG3ANZcdJuWnQBC16Hv3zdwNL+7kRJg9
+S3S5OuFMhqWAOVZl6HQwi8BrVkNAqr6W8jQaU1bwI/uYCb87PwP9fsJQ+WySC4zy
+HXuR+chEsa18n2ZRytxFSlayP0KFt6h4KL3YL+UA7U7ukfI1sCxipY6w9BywZE1y
+hCwVDB+BVvP7WMUKDFpOVcfvbioiuRMVwKBk91P8qMjpeSrBhgu24V0scbiSZXRW
+sKP7u1/HE8HLseGTxY4EYs7zLofCHdxU44lxyk5AA6+jqmk4HaswN5zQK7QHr0BD
+thnMJQaha2rtMLY3RXBV8z82A9y0CPW1GmZo+9yS0G04kBFUPMpj7ebupw9zSiTv
+3aZTZA+jmKEbyIff4yA3Kg6q879Z8L4d1AXLmtLzKxOk5iBG6rv8bn2Bd+6BDA84
+7pY/mdkANW/jzgCOHmCv
+=am1J
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/fritzing/metadata.xml b/sci-electronics/fritzing/metadata.xml
index e27dea3929db..922de4e32044 100644
--- a/sci-electronics/fritzing/metadata.xml
+++ b/sci-electronics/fritzing/metadata.xml
@@ -10,4 +10,7 @@
 		<name>Manuel Rüger</name>
 		<description>CC him on bugs.</description>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">fritzing/fritzing-app</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-electronics/gerbv/Manifest b/sci-electronics/gerbv/Manifest
index 9475ccdeffe5..96b93c6a08d4 100644
--- a/sci-electronics/gerbv/Manifest
+++ b/sci-electronics/gerbv/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST gerbv-2.6.0.tar.gz 2346299 SHA256 5c55425c3493bc8407949be8b4e572434a6b378f5727cc0dcef97dc2e7574dd0 SHA512 a2d7601b44c8ed16a89d18713f451c0298bee65e2ea76b87e3d9d573af63d3b57758cb7cfcfb2177a22aecc7d9fdaaca3d369ea051446651af4dc542065a4377 WHIRLPOOL 07fd10e35d7f384bfdf8d16c9e1a42bdf3010dcd45c2cb3cb359f7c0478b0739c784900e8448c117841511e7d6fed2fe5bd69051fd61e2c64750f83e931909c4
 EBUILD gerbv-2.6.0.ebuild 1178 SHA256 10fc42e878937e858ee4b52a785335c86851c808e8cbcc5362dc5a53c24aba90 SHA512 4f253a6e1e415d1471086aaac95c85faa2f74bae1eba3f537781a3db579ee1e80c14ba224bb0b4f333d524b018a0d575df5a34b8e93fc3bf22845f2e9b973adb WHIRLPOOL 95948dc0f839b324e05242b12317bcb142055f8923065f6ea022fa886227d3ea2058bb732f75f5046564f119bc832ec6bb4cb48419863f40fc720a68d4680a0e
 MISC ChangeLog 7176 SHA256 559922e6362d437e60f00eb86db26df12315798f813d2ff35f8172068ce4f736 SHA512 f8ed747fefb836f2aa38cd70db447eed882099e3f5ec588420a612703b31bc6f01b8446a6a3330323ee84ef1b838d9be58a75df9d2516fdfb1c9e2b687520cb8 WHIRLPOOL ca0107601db8350030006844da7b2396bfd8a0bc2e8f08f822a76a6c4764d52de3707e3f411a939a256121ed323c5206bed0034b6d0e4bb898e8aec4e0fdf57f
-MISC metadata.xml 628 SHA256 a26bcabd9641a9252ca00a81660428d367f930620d81d910ea0ce9546d0a0b5a SHA512 ae0f938a368c511ad81bc74df504bd32717061223ec9f84771d5dcb1115b31b057bc82e65c3b9e76f7a294ad3398a39ee870cce7df2cacfde053d5c3fdf4cd9b WHIRLPOOL 05af90e714d1f5798a26996880e142c1a6dcaf29389241753b0da4e7528e4ce06363a97b3cbb0d60e4c1a772df375021136f0dad0f9cacd0fe748afb8ea2babd
+MISC metadata.xml 702 SHA256 34eae6f5573a0c76fc06e69d331ba53a7f88818948e3af417d94198e760c7ad3 SHA512 ed8c302dec76a1d5d9e65d9df8243dba81b7b85d733f9e14351c585730c169a783b21178aca63ac20ebd56dcf190f910a0c5bcf6ed0461d897b3726f353e45c9 WHIRLPOOL 7c590ef366fef54e2fb269dbd2d41a8647da5df9dfc5de681317bf3f36c44da0e13db40b15c71d632c541f0193cb6ffd5bc70b2d7db9476cd05aae6843541d77
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUHIsgACgkQQe4uqXYgU9VtJACg4KFUco++aDzsPNdlEwQ4KR0Q
-eyoAn25pcssG9pSS5rspuALO9sgO8hEN
-=KBYW
+iQJ8BAEBCgBmBQJVfxx2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmitKwQAJdevHtibuGC0jQ4YNhjHPJB
+6mRF7PtJbk3xmWukyiGAEfKkbO1qLdMzr9FO/S2T4ZN6gsVP9qYJ+KHCf4J0Iz3c
+zQijbQ2V26ieBvb1aotUFOdYrFMQs5jyrvq4aNk0KKGRLjVEq2D1444GNQK3qAcB
+6sYGs2YZ4hjuzutWP6DZaeu+u9JIaIGKVhN3rLyIbYEYBtP6gjbE573X4MucLLNU
+qzyJSclBwhT13YKqjBg2rLSgDvD7HwkMzIBL8m6VJwslPWr76KG/eBMuNPAOTux2
+F16RPuTv/U65O7FeC7xZmKVfSwvpgav9iQr8xsGgBwS9x/JlkfHVthBNG43vNwyU
+UiU9hjydwh6F5JwB6yBF2n+PFG8JwoPZVKayyCBvse7y4XpFRD/MZY5JZq0hwSw7
+Tq8W37Z2V337TCcKSdN4F128xRLaeoV9xZHQbqfg9/glB3LcYpLd+4BcDZajfEjh
+PaKrvhBfmPgoNz/U/dAjjYk8mHmC+/3ktxhiEJ0btUaJycXUjUq0/srRvVoIGzZu
+3hoxZZGdYSXz8ltm7WHcPMjPZ69pi9gl3mkiIENSq1wmuaZ5P8bt9D1pMbdVI36U
+AX7UH2KrXEBL/dqX/pFnTahLxAFkXb0AsBjZdiGG8LiLaxe3R0hd+xHV6ensOUDZ
+Zm/hxIefzTPTj9wycwtS
+=2Enm
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/gerbv/metadata.xml b/sci-electronics/gerbv/metadata.xml
index cfa53cbcf0dd..655a535046fe 100644
--- a/sci-electronics/gerbv/metadata.xml
+++ b/sci-electronics/gerbv/metadata.xml
@@ -10,7 +10,9 @@
 		parsing/editing/exporting/rendering into other programs.
 	</longdescription>
 	<use>
-		<flag name='unit-mm'>Set default unit for coordinates in status bar to mm</flag>
+		<flag name="unit-mm">Set default unit for coordinates in status bar to mm</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">gerbv</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/sci-electronics/gspeakers/Manifest b/sci-electronics/gspeakers/Manifest
index ca2ef9024f5e..241e52e7a129 100644
--- a/sci-electronics/gspeakers/Manifest
+++ b/sci-electronics/gspeakers/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gspeakers-0.11-gcc43.patch 1224 SHA256 9db7df395329c5aa056c561026c3de5b188d3b73ffe4bb69c92e69367e9b7677 SHA512 13ac2ccd0bac188a7b9ac6cabe937ce8bc5ae5b48052f4db15902a7a2a21fd826353709955c8c8c3cc0aba952ab7c5a34b99c9b4080115160707bfc97b29ba78 WHIRLPOOL 2ad38137f89c13381967b9c92f1698e3904d626594789f498e31a1cb8e59c29538241d26d429fbf1b4d966dfef035942c8157edbf60721b4e86e11a6473f4f2d
 AUX gspeakers-0.11-glib-single-include.patch 3393 SHA256 573996d595077937dc3ade1e9187108e375a6f1f79b880925ebfe28c31e384e7 SHA512 dfa91f565088c3e6a3af0abf454184dff48cc0598e22a0c9b5828373e573755b3c0c7a25dc2b909539f543e5392cc402f5b3677a1ce126e783b3bf32353ac100 WHIRLPOOL 16f0f6416bb50d9d306bd211167bf7c219278ea94490bc4da4cc926d7c4e97871a1d83d5cdd712efabc65830a96cf01fde98b943ccfcba971d47698d5be58e06
 DIST gspeakers-0.11.tar.gz 546406 SHA256 fe5941f9e17b57d47581b56afb47c35957bc1c1e254a2675a2ad913a9625dc3f SHA512 5a0c6374b5f18d089a1903c5718ba21b9932e4c6a99456e13d4f144eef243a623aca241590e941fa50300a642876b6be8684bcf036db724182c2ee925072bd20 WHIRLPOOL 9418d010b14b760b95c1a51729358c2f30ba7d8f7f5860136195cc7d687310d07ec93ce19525a042d44230e41b1b857895e975c48a4631ccab6de2d63b10d7b1
 EBUILD gspeakers-0.11-r1.ebuild 919 SHA256 e08b90cd7498cb29eb3e1f9214e72a88dae4b8dda9b3140eca8e28e33ac576e7 SHA512 22759179bed13e05da5c7d615838c8c8204533cb44444ef993275ea4a5fc11ca1a1947b4e829c08078d82b8e280b4eca92c23e03a9687cc95769e2c0e5f522a3 WHIRLPOOL 80fb9f8ad2a05e4fb7a63a0ceaa4a9899718a7e496d5c5e53588cbc6ca897eb6a3fd37f632a64324f88fe3233a35253691d4425a0996f01e32009a8e741a77f8
 MISC ChangeLog 2784 SHA256 f400282e4bba1610c1d07bea3e05c6e9a2e03d4f97a97070f8b9c7349e0edc8d SHA512 fb8ea2cec8868062c12f3d9b23b97b59a218e8dbe3d1fc1086cb6c2dbd9ba833be69145b58f20d8c3956b3e5c215cc7a151c51d9ea04bf521c9f995e2aaeb0d1 WHIRLPOOL b6e8a7d37f5fc2218457dd68a3bdc6b74de765b423435f47481ebf404e5021666cee47879d74c5f90d6a3a0a0f0bef50d574fe3fc7597622fcc442b11c216a4d
-MISC metadata.xml 289 SHA256 783e0d235c0475abc008deb95f81532cfe93a5172476eb34141b87dd08596e99 SHA512 eded84a6052d96b7e819a6dc180a774710b751dd77ca2ed7a6eff89cd51884a45cfd0627712f735faa9f252918f5c724b9acf5f2e24eea50ffb9812b0d6da282 WHIRLPOOL a34abc661e33329c2f38987cd03a0ef5fd6b35a128c635b92bdf72d4b602080a1cb61a2dd386d24b0a7611b2fa6248a4cb290b3333aefee9b3243ed7f2a378ca
+MISC metadata.xml 372 SHA256 e837bbd59d554cfb506fe54ed5c68da68e2224f39ed07f0316f434a7d473d053 SHA512 9cd608f89897221e066f7b992d03230074f41beeb358cbf831e86843f569e1c57d52cfc82a10005a13ce6c2431c66e31c4aea9ffef9d1972b78360e2ce27574e WHIRLPOOL 686421b99b60f9c2138367aa3ccfddce13d189b407ba467d0e7bf4e492866f48c259d4e9df9df75173b41523e00c8703c3746b6435e63e506540a3395de1e6f6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlCDzjMACgkQCaWpQKGI+9T13QCfcyb8Gaz/QIm2bRwMCoe0A8xY
-+DkAnRoChELarvyUbryp6tngOKyOQm+B
-=CgLP
+iQJ8BAEBCgBmBQJVfxyAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiwBYP/0XaKOeaItCqS0Nyn8TTdlt0
+HTN5g+4wJ07owOX9gD0/ozz4rePJY/nifGX54gVXWSjFVK+olZ+U0ION+KLe+SJH
+GSqgfIv2LuWo1LC7vCz72A0jkOmMavXatxp2/DXce91uoCpcvNfp+rk1RNkFTcic
+ml3+MpuupHw5/WYHoR/Z/OtnrrlkU7d3IBEodpO9Hv2vD9usy/iBsATP6tLqVWK+
+FXb82REqFLd4Vr2ghnfPNYZE0NCHWJ63VLv51ogjn1DPKuuWl6mv/ljVAH+iua08
+VbEG5ImACRgJ6IvT/pFqtOQ5ksAjS48MXNuzOBiyLvjkLvVpb3BLhdsxy4xD/2t2
+71KD2h6WvOIDlJf9Y6MdyBnuAWA9nIXSdix2ouPt3zstQ3fcf99NZUsUDTta7lvi
+ZOj1O2ky66nI5ZdLnz2/tJ/WShwxNYkRgvYSeciWtHSGxR722iZ7ibOeC2VG0OSj
+1TjsMUtcuTxt1d1PWZP1ds7cI5B+HlnsRR3ZrkYmNLx4vQ5ZxFmfqrcpXUW9OXus
+CCxU1yHkEJ3P/Mbgh03LJI2i6Ru/XBda9ZXur3bVmTJw1eVmBYZyfORBuhGrE2wO
+6H1l+vBsk9aDGsV8rdVw2zm5330Y8ZzRJaEmdDrr+CQTvuUscKQ+reywMeET9X8X
+9YSKfoMYbDPgW4pn4m/m
+=qEf4
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/gspeakers/metadata.xml b/sci-electronics/gspeakers/metadata.xml
index abec71a47109..ddaf5bd1f300 100644
--- a/sci-electronics/gspeakers/metadata.xml
+++ b/sci-electronics/gspeakers/metadata.xml
@@ -5,4 +5,7 @@
   <longdescription>
     GSpeakers is a GTK based loudspeaker and crossovernetwork design program.
   </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">gspeakers</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-electronics/gspiceui/Manifest b/sci-electronics/gspiceui/Manifest
index 6ec77d195344..6b3c0f09ae68 100644
--- a/sci-electronics/gspiceui/Manifest
+++ b/sci-electronics/gspiceui/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gspiceui-0.9.99-examples.patch 2795 SHA256 dcccdf788e3c23284ae402fb5e8af30933928be3c04609942a2a699edd83f31b SHA512 907ac8dcab3601919a8ca4b291ab4ae62b60bdac1baab93bca30548762fa2c931aa03bf40773ab5305a116b631619ab729c483b9f67bc669dfb1400e47b768e3 WHIRLPOOL 5b8bf879a307de535c876b49da12b1905ef90ea722a2eb458b194ccd99dcdb78b20cd6a95e5b3b050983afa6ce4f8ab9c5589941f1e1de2a5c161c674a5b8522
 AUX gspiceui-0.9.99-flags.patch 987 SHA256 f3fbd320b4b47b017cbf136954c9df7dfeee11355f039b6d07c8dbddd9239eca SHA512 c73208fbbb8a9e0f823e170d2f144dce834fa52e50880f61fad0b444ff8e907008c83287aab153773961ae90e39d7495ffa17c3af4753396aecf03a239491dc0 WHIRLPOOL bab072b3faa0a7c4a6277a8d3f4fea40d7b282e1d0122b1e2e35173fb1795dbc382fe8c59e6a47b0d336ea2644fefff62f3f5da932b0115238324c2c36e88964
@@ -10,11 +10,23 @@ EBUILD gspiceui-0.9.99-r1.ebuild 1923 SHA256 0f03e35bdd973e6bbe1a677b7129fc34471
 EBUILD gspiceui-0.9.99.ebuild 1834 SHA256 c54fa6e69d42c58d7bbedff1349ecfcb125f26d8b839c9178e5b982d294cfb0b SHA512 fde518a4e957e745ebfbf893c2fa73316c80f6c134fe68e50c82fd010193ff4fa5d8594ea89096b78faec7f93ea08a25a57bb1b9e826654a305e3ea80477e64c WHIRLPOOL 9e9bfc5804435fb7dd091685b4c527288cf4f7d1a523d51608673790db0c0bc2ca7ce0807f3014a37783b679b4ddf00889a05e2d0c6a427cd33ad45d690daecb
 EBUILD gspiceui-1.0.0.ebuild 1803 SHA256 ba4bc4f62158de36211e5c94fe4e6f74b890a97759e01296b338149cfbf11da8 SHA512 819e4cfd61ec0c77b9fa3ebf31e607bbbb6c68d8bb23d13d0b4dcfaf64f132d6b655034378cf035d0b16e34de9c08c2ca5f2a188f4b06f5e58c43944a36f5fd2 WHIRLPOOL 7377f46b4d5bf443905996cf422bcc2b22268c1490a5bde45ae6c504d491ecba3bdf0268a92cf0518ccb2af317bf82c67e1da2f2a003d0bae9aea3dfa56665e3
 MISC ChangeLog 1641 SHA256 31b73ab49cd70ec619b111a34c4194cda5fc499cd706f77b24364f875ead8508 SHA512 49fca117eacbeed28b11b142204ca1015007affd65bc95a48aeeef444e5a6cd7a55ba2297caf1963e60b0f1a79b300a5031132194440425f7470fa2b19c46d4d WHIRLPOOL 6ebdeeec95294f062007e82d4367763a49e7430b7fb7cfaa524a93ce91e8b92f7365fd6474cfcd024d855eab9a46dbab21a55f6b430c04c31aab81c97f06995c
-MISC metadata.xml 362 SHA256 21c3188019f814f61a1705b42597ceb79fc49809127b63029b2172068e814c54 SHA512 4c5f749932c1d8d256b9a0291cebbf607a29e0da4bbf7a081b0d5abbadb9cf5cb6f9c46e3c6b1937b25f30bea355ceccea646e70193c4bf153ec4db4dce8b2f4 WHIRLPOOL f1246d58df7297da76e83f71224d45b67fa9e310c45373375e4468d651f33bfb6580ec202c65f6ffa2d04432effd433242b8f2b5f751a2b0e4c53094a87affcd
+MISC metadata.xml 454 SHA256 918f8ad2d8b5aaddbab505c2689db3f38b473c42a82585ab407b7e82201ad10c SHA512 13e72dbb56da77895f8cd60bcf3d50bfdfd0d61713ecfe3fb36738d6bb1b5c00cda926754fe19530f559cb32d371911308dce7d7edfd7f4dfe3a2171a7129c9d WHIRLPOOL e21b1ba36f5e519634dcd16bde0f447fa23c8ee1145e131eed19479c886ea89d9d30aebcc45f43795b4b16e15cd9c3506a08fe32325dfcfce0dd1f8ef14cd5e7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlHBMEoACgkQ1ycZbhPLE2DYiACdEDSsp2vj5zSrSlN4Rr/SbW9/
-YbIAmwQl+DRghpNbMONqYMmu5G8t1RT4
-=kAhg
+iQJ8BAEBCgBmBQJVfxyIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmineAP/2UTcvTqueR1Vz22XS3UOLDv
+LVxSuugnQJnFzHwm3bDQbYtLzWGie67x1lgVzYr3/2W14Wne+aew/sVUoyYFVIg4
+LuPvTeimprCUnNTXkTr4MwNjEzHCgCVbsZLZRjEjmT+qS1lOOxu+MSSOSZ09uEED
+TL84QDxkoCPF+apiZ9U4Wqz1/TvU3FXGMo9ZitaLB2qfIwQrECOhu8t+eMmt4jVQ
+3+AQkIYutboFQRmzTLvnJCWf6DeI+g8mOqCKGFPewQneNxibAvFXEagPFRmAnwej
+IQuBMSJJuGvX3CCq6CPfHWXaZydj14XOEZnAw5Ru6p8AjaVfpTvkPJIRYjzqcO4e
+UsoydksOFnhB9+0UlhGCIp0vAWGrnGdp+raNMxEc1YH1KgBUoaIcC/3g4oAzlUBE
+xJ0BlReSVckMvpU9tgcwWgq31cjPUXWf9O7+TI2thQDzzIGe8TRK+Hkw98gF+I+Y
+KnZV2iLKO68hO9hqOUPC0r2RRxydVB643cuN+MmtZw92D990ojBHsoxLA5DCfxh9
+lex6WTZ3PYMrOMsd7jEViUdPGWGqNz4m+nwOnHCDJYc5SPGfMlNojhq069g+3+uA
+F0inL3dIZx8qpL9qvFKH5u+UkmFVKJKPy6zQx94x2JesoLU06+jiCp3ZjKkDMbAZ
+yBMrbQ6ojpPu2DZzYNo9
+=HiJJ
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/gspiceui/metadata.xml b/sci-electronics/gspiceui/metadata.xml
index d6015b2f24b7..8af905c02f4a 100644
--- a/sci-electronics/gspiceui/metadata.xml
+++ b/sci-electronics/gspiceui/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-electronics</herd>
-<use>
-  <flag name='schematics'>Use <pkg>sci-electronics/geda</pkg> for schematics editing</flag>
-  <flag name='waveform'>Use <pkg>sci-electronics/gwave</pkg> for waveform display</flag>
-</use>
+  <herd>sci-electronics</herd>
+  <use>
+    <flag name="schematics">Use <pkg>sci-electronics/geda</pkg> for schematics editing</flag>
+    <flag name="waveform">Use <pkg>sci-electronics/gwave</pkg> for waveform display</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">gspiceui</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-electronics/gtkwave/Manifest b/sci-electronics/gtkwave/Manifest
index 19feb4744343..987bc26046cb 100644
--- a/sci-electronics/gtkwave/Manifest
+++ b/sci-electronics/gtkwave/Manifest
@@ -13,23 +13,23 @@ EBUILD gtkwave-3.3.47.ebuild 1720 SHA256 c61c2274ae2bda7b09860229e8652b612b25289
 EBUILD gtkwave-3.3.59.ebuild 1677 SHA256 c4f49c1f09b177daec2db68ec334f45c4e48371d7578003225da1005be00d3e6 SHA512 0b00afbc6a09135de8ee5e87123d5db28a5de98d1cc8cc9c46752b0f7a272462be061c518761aefd5460ac075f8f96f4a486272d115a9d3c7ead69b7ff0068ee WHIRLPOOL ac927348ad2d3d0cea677ad43ccec0797e1bf2e5c31ef03951622030da7851e74b0ce4c5abda1e46abc179098d76b58d71ba23b8f72fb3227ae3ba3761276900
 EBUILD gtkwave-3.3.64.ebuild 1677 SHA256 390c5eaf4826c3f60325f95c01ecdfbeb8c02798a8e3fd132ffdacdfa0202f8b SHA512 7ec18f23d945017599ad04d12c934f446ff63a7023df0b0948733235527e53054f94803c814912e72058999526a0e5bb3a185ad8d24ff9bfda3a9c3fa88c1375 WHIRLPOOL 20b424c202229188552f7d4c5b7971ea3afca7c874f8a0e29a2726119384f45ce61834a8f0e84cf73750151e58bbe2eacb5e39bed19bcd4063d973b94748a92f
 MISC ChangeLog 13671 SHA256 459664994221a2e14edc705aa41a273e6b56ec6d5b27731cf1d0a10d3a369be7 SHA512 5f0056ff253a55807cf4247b93c2b634178c1b7cc178cecbe7aeaf6cbadaa3d3a90794bd3b9d54c0d3077d63144bd771bbee1a09d5f0e8819e09aee42e4436aa WHIRLPOOL 49a7406107cb59f4a2953854afaa332453e7a581945b3b1b1020dd6715b8668045b87331953a3e598b5a5c8e00fe19127a023873194bca1a3714f20c66536531
-MISC metadata.xml 726 SHA256 fbc159f773efa68f0c3b1d43470dd26926bb5e60ffb830e1526c1dbb3ca7f26f SHA512 86a9706789b57f5a727cb3811b746b7cadeccde315ee23846877395d41a4bf3d43ee50dc58a712aa03986ca207ba7d8161dd48adc4de47a97d7120c36691364e WHIRLPOOL 3ee9f62108fba0b54333ceed1bfb50f04cb4845912bdf133cd11fccb0ad11d3ff2930c0d3d57711c55ab67f999a878944e6ff19b8a70c7337bc462914c940902
+MISC metadata.xml 807 SHA256 187cc1f1929ff73d461cd89bb2ede938679cf1da2c8958a2ee00035f5eb73021 SHA512 5f98f40742a694b14aa37aba9786dd05597e49e56eccfc73ba22175f3f296a00026415f623048eddd10a7f6daee8e319feab98b420eda671abd26d700c9d1bba WHIRLPOOL 2471e9b49d7223a7d996703a75fc55997b4902b9b93edeebd62d5b1a4a28c28e17170417885f7afb51c0f9c18a6c0f3a338cd1d6124d430899dca51eaf71a5cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVDDx9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirJhYQAJaSGXGHF25VhpGyrByeomyW
-wAVzKDvK5Z3WBaXA5Lk2A/U+CXGxYA7nfy+AOBGc4GhQof/gynCD1VHG+RITGWEc
-U28zfZ/aLyxGFg3ce2bl5mAAIUMRjKo5WxrduPKgMiRwqnOqdmc0P27/fH7pEzq5
-u4rFcnR5fjuvFwKifeihJiX3jahQGrfPWhXOmaiP9lkZ8gJ0cbFvJR5YEsr4AdCL
-P/O5s5GFFw/RI95gmDkNczU4kpQsQJ7qMgTcWlLwWTsKq6m44u3XPTC996G0JmCY
-mu2LX+JU4LNhXKZAMeT7SQI1Kbs8OOGjJmukjqrzautswPEtrHQzkH2EjTh1jBZN
-5XPVYl8MV+JNIDjPxCmIwpr4UrScsT8ThLhlSEjAOuEwkT+Wsho4nrAd8Ly6eYq1
-Sl5KCGKQGH5nj1hApZbG7tQs03WvIDUvpFyW8PO+Kmq3P5mAEGsuhdr/DOo900WL
-BQF/PnLDQiKnfNxN6RkakdSfamW3VEGewWlLn0HHbGmSn2OjLNoetPEkS2CRR9RX
-p6Z66xkRBuZWimeBKXSws7Nx/taum/7plVsvP2dbCJO/QXqSnuJNmHzBj/GwCz6n
-5PQE7D+51GgKFY97lJnqnc1z68wFDNLDDp7Wy/uhsIzr8GYaE/aUaQ8yUaRPgxHi
-i5QcYNururB0wxfP1NAH
-=JlEu
+iQJ8BAEBCgBmBQJVfxyUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmibg4QAIzBgwCv9oTIgAtdMxxhDSgF
+tb0+DslXzw7pdC5rCZAit19QvsuPtOfBt/0PfYNrXfhTLYEL02gcnOHW9DWcTizv
+CxhnM9DnFSRxNM/Dgbe4dCkdIIDwVD8UAC9BP6YRR5jRChF2Km4v/8VrqlDnVFlM
+QU0JebEc5CZEHM5/s6JVmXffsvQ9M12STQy9YKgAkkuYEiTs7tNrMkIkXPamxilC
+SheUG8pVRa5ZrAKN+/2YhfrtHV+jBDU824Vv0i51i29rki7ZL6zhtyhdho7c73k8
+BwqDS2JFoyiKnZ3RlpkICBNdegR4a5DEIkTkMglzH9B8skVrKW3f6mF6KVQqjWh5
+55K9BxwJNKbY2l6y0Ij9WNN1GX7f+jogzKMSpwv4VtdyL+qMcVjLJGrSwYrCPfUV
+Mwvgzx6eIsBUiatjjMCicO53y0Dfk4Arrli48Cooow+HwoDWH5H7XTLWVVw94Sgu
+q/IqlrRopSvQxW7pHZAO9OzD+65hmHYFkjmXxLkABTmlvfY1wKwQVWtCI5XMpP6v
+Jsmpg1B08SwRRRGOACn5GeN6L+iBu+0anJEENF322lShH1DuHhyvwm7S+LxXRB8/
+hK8wyIWCGQerse7QwqlSTUXYj6R9wlu8Y9ZdchpgaeiCa6l+MqwKR4BVx83jlugh
+A0iOoaZSBroFtEso4d1k
+=1U4V
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/gtkwave/metadata.xml b/sci-electronics/gtkwave/metadata.xml
index 5c7d448d389d..8167c590aa91 100644
--- a/sci-electronics/gtkwave/metadata.xml
+++ b/sci-electronics/gtkwave/metadata.xml
@@ -13,4 +13,7 @@
     <flag name="judy">Enables Judy array support.</flag>
     <flag name="packed">Enables '#pragma pack' for data arrays (saves memory, costs time).</flag>
   </use>
+  <upstream>
+    <remote-id type="sourceforge">gtkwave</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-electronics/gwave/Manifest b/sci-electronics/gwave/Manifest
index 5bad5adf4c86..090ae2bbe232 100644
--- a/sci-electronics/gwave/Manifest
+++ b/sci-electronics/gwave/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gwave-20090213-as-needed.patch 2257 SHA256 02a9606cd1182b1a86ed1793299105cd76bef10284ebdf1c6f74d0364918b469 SHA512 299c92352456b50af69a3b5606b9c97d36975ad597cc0c7871db60249652b6472a85d0d971dfe91e987a52877520951645fd68b13818e126960fd23e5f4d8f88 WHIRLPOOL 3f204f4d332ef041ba57ddabd02fa075884136d083b4e18a65745da92d594001d1a2bbb8aca40fbdb39274debab4d19f8c598a42287746104d2d53db6bf26d1c
 DIST gwave2-20090213.tar.gz 403957 SHA256 464c7bc6f2bb84413959584b4ed08b3391361fd7524fc93f7fd1c1cde370ea7f SHA512 9b39ed2923901af18253abe8e3ae1a6f71a660e31181dce31b0d784eb1dd0800a31ff48158b2c68555fcd268029e20295e87626e8e1d4cebc236b3863fe25e8c WHIRLPOOL dd6dff26731063d23bea70129145e3551593b242f26145e77e2c61734a5e946fd01f951f007cd90093e77aebf969af149da750aab93692697e25e750fb10b247
 EBUILD gwave-20090213-r1.ebuild 1343 SHA256 d917c7d8e5c5c696b5a9bdf83e9229dbe376de80752239979307b4be6f57271a SHA512 0cb65c0ea45c78a00ba7708f1f623f9242444c44e9e576cf7296063af0bbb43b20b9e6b8ec1a6e42e3bb395b77c17b3a04ce4a3cde554da87f07c558e5c887b6 WHIRLPOOL 9d2d79456e6f43fca2ac6f96cb9f2d6b909083f32cf43994df6bc7bdb49fdf896931cd5b9499e71bc52b95b7f3fb7b9dbf674fabc91c7001230fd6f0bc60e595
 MISC ChangeLog 5737 SHA256 3e0875bef0b2a83dbd02986d1fd7955ba65b3e4061181e9e30122ca2fe409ec9 SHA512 ef5ade014c7f5fa1a0c1c73fb8aff169dd77d54e7e0a38840e088a6f6cac362bab1048505e6fbabd56cd586df2be3a6beae50339d62921a1b791708aba223a5b WHIRLPOOL 3ef00cf05242b80d2ad5173e5819240a302ec3dcb2c5891ad3a738bdbfc07f2462e0e28ee8e8edd4c2941635128daa3fc57329242813a80d3c9caaa535bd143f
-MISC metadata.xml 545 SHA256 8780bd44288620adc70b182e7750865f957233b073a3979413d69fa799c55f22 SHA512 9fe3361a074de2786066a6711fd7c3fe2640186e5b8c20820d46a34a5b975322a84f2c78d12aeef81badc672a66cb9ec6c8a9fa396a4464e346b13e6e71d7400 WHIRLPOOL f7c9165a36df39ea56664d68fd0957d3e7c58672c1008ca0625ce67e6dcd3b48c24fa47a277ebb10a1ebed4b03ab0c7c7b722ae371fcf5fd5a1a6b5616c8bd5c
+MISC metadata.xml 624 SHA256 ce1ff7a5eac72242880e9a8f94710574c35cb93d9fbc079b74a34628c5dc86a4 SHA512 b05c60c4582629f882eda05fb7257bc7616bd8df43f638e214cf77b9103c7335fcdaaca869b5f8b48b1c3a539ccaf38347b3ab27fe4058095bd319f4b2cc7f72 WHIRLPOOL 394ff5a9430ba5a9116470308df0b3f3d3e74fdc082c7f6865956fe45c3a191fbfb48a408d0ede7328eaab90e4ac2123fd216c3835e9257a4052552e3157adae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVdBVqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBQzNDRjc2M0FCQkE3NkQ4QUE3NEY2NDNB
-RjRDOENGNkI2QzQwNTcwAAoJEK9MjPa2xAVwPksQAMCUsPonaERUZ4wMhSObGn3J
-EP9UQTXHv5+pnUvkHGjo1wS+stqVb3fZzGUPldh3Ib4wZeUNJPP5Hos1ZMK4EvgM
-9WYlqWaBoJwDwsberiyoIklSEMD5LUi7B75nXXMbZc2uu/VXxq0rV1lq8AXkRWLx
-ibOLPh03NCd/J4FUunKAYH7SQr6XyGTAUAR/lnmEGyPh8ihPZ7o3BDMJL3lsuCXT
-S+ddggtMu2Q4HDVvDWU5n+zTZWoGEn35G7R5JzMdy2nVjjiI7T9VeVytFtMevmCf
-N3+VmY7NtL+fgAuUSRwgW3y5qYf4Ptg6MD5Gb9a3hzOsinJ9yxvkpidBXQ7nzNZj
-YtSYU49jBxK7pWvAGvBHiP/3FkUGbW/xry1RIxby4Saso1nylz+AXkiScr9odYy8
-gfYlXgS9/1oEpBYE+fIM9ZkwsaKcLhlZ1F17+A28TK2e4jtgRDiMVd8NzJdZgmfj
-QRP/AZ3I3ELNtS1N8CJc6ccE9R/qfptw/eZdT9i+z9R0ZLF/2un1zl7zCbeN1B+A
-+tukmquAwQ55DNhnYNtVvRZ4azpBTiS3JOtIsqGmzFugo7QbXtcsFGbqB2NqFUcr
-if3mZPI0uXF8xgfBvTSP6MHnLVTIyjNXIRiSEjMwJAv9xHh63K6gJ71UfogObXUx
-H32KJoj/Pt//aqWwyoRG
-=gSZN
+iQJ8BAEBCgBmBQJVfxyeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmihvEP/0nRXWzwJLbwIXvfT/KzpCAT
+/KDRgzOCgOYG1wSp/zx7qxvycF+K+MgzzS8uAp/tKNd0RPTAkl+d9xsQQZokIKak
+1jS8PlSicExg+FLUZQHOVev42wOrIEcwbMwp6M+IFGH0vcBe8v+lFUyq5WQcgf5L
+9y2WuueuRpUoMFaphCPHLFSBoulQd5rfVzoCPcoB7kR+Y7CqaQjWHyPyglqTn90Y
+2pSmhGcl7LmVt/2L8uWhiG69XLjX8bMawD/N2HNaYZeDEJUxA1tBACn4HfyF5GQw
+4+9Le4Fv6eWiLiXecawLitqR9OX2wFZSCFu1Ujd2j0WW39hjx5g5LhiYg6qxvIoQ
+eXk2wvAT6iHB93xEcnCPaJeBco3//Ux+v9PGl5VajtH8TBBHjKO0V9hKxYmsUd6b
+s/sVMRmAmnAfJ/oBIRUIdctvFeiiPiZPKGn2xWrwRRTRXX9u6H/EuwXimjWaXQUG
+Sdg16pE1RQ3Pe3h8HycmdwNnKguoWnWjlmxm9rqS0JKPDfMa+pjlaQX/Dm0yCeIA
+XJYdZqcvppknqYNqWZMVmMdoZAGboFj7GL9c1uFVKtGnUsc5/HirjcLZ3NKt/NZU
+u5KjY0s3+7HMpme14cNYP9bX+jgsdId3ltYfwfVT0HvT+WEbM3X/2WADrRMJFG7c
+8k8nDVQvGb4pZPqBVMV2
+=lhZY
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/gwave/metadata.xml b/sci-electronics/gwave/metadata.xml
index d07e3a772eef..abb9bb11811b 100644
--- a/sci-electronics/gwave/metadata.xml
+++ b/sci-electronics/gwave/metadata.xml
@@ -9,4 +9,7 @@
   can also read a generic tabular ASCII format suitable for use with GnuCap or
   homegrown tools.
   </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">gwave</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-electronics/linsmith/Manifest b/sci-electronics/linsmith/Manifest
index 5923bca7d20e..5989c4805a63 100644
--- a/sci-electronics/linsmith/Manifest
+++ b/sci-electronics/linsmith/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX linsmith-datafiles.patch 757 SHA256 b39d2ece3aac52e0bfe35010c436771aa9fa623f2508f290d36e40853fe979ce SHA512 af6f38420a4adc8386c70c4837aee74ff5cf2994bc0edf230198cb41cd53dbee69aa08c497dccb5e20f6a89282b2f690995d7cd5f86b93c8ac0f6488f0c0d266 WHIRLPOOL 2a7e5c989231a8b5ee1679ccbfd07e4588078c9f8e71c558e876007186495177c90851691a8825d055bbc73db229511f4580b666760315d7c59d06aee0fb91b7
 DIST linsmith-0.99.28.tar.gz 1132315 SHA256 22196edb6e4c72a45a3d0a794a0bb140ab5932a5e59a40e2e9ee143b53c4235d SHA512 0e8811b64703884dc44e0d8c6a6eeefbb3ba65d8af7573a87e1985e9061d3d947f5e35631dbca2444a9ef2600b523358d6b65089ae746312f9e3397a9dd99118 WHIRLPOOL 41416593eb0eb8913bbd1b9d4cc104830f18eb0835b5c262e8725f3a45162a012167d396205dfc362b9908ed35a7643540dc4fe055772c8806d7c02743746dcb
 EBUILD linsmith-0.99.28.ebuild 1573 SHA256 103161a5572df04e93221f3d159de73bd6c2e15d7f59d06addaf68ed3be7253b SHA512 a77e889a8fef96564da060d010216aa6ed3a54567347fd3b6279c710258978205aae9344d009c992e1d7c0e1de6efc32a479f57894becc21cc0363668a336e26 WHIRLPOOL 10e31a17b92ab20190f313228ebd9cb32156f03940741dab52814d44ff36602dde73a999706502c045a1943964e56a6eb15e8c33d713dae8ebd3de918f94e09c
 MISC ChangeLog 5653 SHA256 bf75cbf96d4c8487ecae6c1741b573096877352a602d9379aeea5e84f0e1c54f SHA512 0e4f0f4f849d8c5f5f7654770b8ab7cccb8fb676e0fc0d06adec7440e21b7806bfda647f299fb16c5f093d224760cb1dca76ba2e0e50029be67e995590a9efff WHIRLPOOL 55ea98bdc2523c3ec53549bd803676425f465f4eb83dc3b3f445e174b57f3070b0a7e665edd441edc9f5339adbd0d125d146eec1119b5eb8948fe5fdf833beb3
-MISC metadata.xml 267 SHA256 c918c613adc026eb4dca07629c17bd002ac7ccdf12f371d1ec7db45297a835a4 SHA512 6881027ecc9c147f29e1763060807c97fed7da6cd8409e2cfe73f2631c0fb11c938b1479beab74b517e63c30a7eb041f417b790af051e7a2ef996518cf9bb451 WHIRLPOOL 53279734f9aa1c3a6b65fc2e12f6e29e3ebfce555642a1e5283d42026ae930bd94d766578294b55627d7fb36723a43aa428b202f044cc982f76e56f027a9b68b
+MISC metadata.xml 354 SHA256 26bbc3cf212b2d1214a03853cc9b5f2e6c1bee3bb6b256b44877e02076daa3a0 SHA512 17447ed87c28c7b257fe0ac3032e5b952e71abe23eefe8dab9dc7d43618945974b10088997cf087840671b95702cba3649040635eb7516c0bb23840e7a9585b0 WHIRLPOOL c600e9462dd405895840819e7e2436f373d99cac6de209d0e9d53ff8d88565e01555729a8d3362cae7009ca77c533c99d25079b853d90319bad9ac463d254279
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlShB9oACgkQQe4uqXYgU9VyIQCgo6ZoL9visE+F2F1SxO5E+S8m
-2CMAn2fJcFTXyWbXpxqKDGgK+KpHOyfZ
-=h5sj
+iQJ8BAEBCgBmBQJVfxymXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiHUkP/2G/Em+AnBc7pB5ZPZA5lytw
+BifPXGSXHZbq3PcDKX86sJL604LnxAE2wlVzZX3bEFS/8wVdSbxZ1TWSbC9YmZPF
+AfKZiFGqzqxC29uF+D8gi/u+N9cBT9GvVDC07iSnxgHSEbyDvukbEOOHy273NbLz
+LiTVfabgUy/GVAi5WZdvbetNQeeY3O7QyluFR/wV+qMSGaL/zO7ERsyfRxP0IrLQ
+QUxzmf2AIZWINJHNUZEzlABfL2fPXwb8q8D1fNUSAS+rGNUAXIXFVN1qpiQ+kQDs
++OlCGWRgwbB6wUjMGrgIdE2M8OtR23uAV7oqvnF2OlC4giUykbpn+MO11rVwxwD4
+XJh03mK4BKwQ+Lgq7XqyHot85Et7aMQPORcLc/SfLcpz21NwCzM7Dwi4GunGaS6b
+EYEGFklDDvGfOfJv/Gho2ETZXqzJP/dW3uFHnl4bijg+fUmmZCPFq1CQ5O+DRgIF
+kwX9HSAL5CThHnyg9x1UT0A5YOvWzFW7xEwAyT6ecifWRJiWstJgZnN/NXo89YB1
+OpEvjI/WRvGxdhVWOd7BfY+PnvqFxwq0wonDA+6uYyD1F6tng9uC+k1J5sCplwJp
+lpzlZjnrOALD4SMlow1EbCowpbDGEUj591IfJeuJaqfNbq1FXHln/rOZcolGqNQY
+w4Tfrrt9VU3t04MpdBSn
+=UYqD
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/linsmith/metadata.xml b/sci-electronics/linsmith/metadata.xml
index 99e9ad009e8e..5604ed5d092d 100644
--- a/sci-electronics/linsmith/metadata.xml
+++ b/sci-electronics/linsmith/metadata.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-electronics</herd>
-<maintainer>
+  <herd>sci-electronics</herd>
+  <maintainer>
     <email>tomjbe@gentoo.org</email>
     <name>Thomas Beierlein</name>
-</maintainer>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">linsmith</remote-id>
+  </upstream>
 </pkgmetadata>
-
diff --git a/sci-electronics/ngspice/Manifest b/sci-electronics/ngspice/Manifest
index ed45f7fe673b..23138581e2af 100644
--- a/sci-electronics/ngspice/Manifest
+++ b/sci-electronics/ngspice/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX ngspice-23-flags.patch 1661 SHA256 624a669bc8ad76b51a97ccb3a18de0d4286cc6ceffbbc1f6cc3b0d4a3d8efad1 SHA512 af4606612685f760cd3fa3b49d8c0f1c7d8266a04520fed52c34ed74c56cc929ef8c3f7eabc6983629100714042dead9248aa3f6602200c16fd2b5e53409bfc8 WHIRLPOOL bed637406cec961ee8761ed2d9d7038b02455d88f4804c072fbc29d4107a6e9ac06fac4e44174f026846e9bbbb8d5e9589c917b23fcce98400fe332d3f8c599a
 DIST ngspice-26-manual.pdf 2141771 SHA256 30b4fde001d012b0350aae3ba64892fb2f315d04f6761b95abd79f4b7c4cd85d SHA512 1c160aeef61d8091a6d788677bcf7ea682393cc886d5d535f87bb800cdae4f095cbf1e833babadea481956b904b4bdb688cc18b80d9d6a29cab33a54275abab1 WHIRLPOOL 7e9be918599599da3bd6fc754afdc453e1cc6171cabe2afe05da2be24433b4c1ee46728c29995dc62d04d08f966a441a853aa231b37b55e7bcfd587832dcb5b1
 DIST ngspice-26.tar.gz 6925987 SHA256 51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108 SHA512 eb6a81df90de803c9f7544e8d0de7cc413aac169f69d1dec5cc6d2e667b66d42aede7f14c75bcdd10288be0c2ac07863fd4028b9fe59f2f515d680c2ffa41cab WHIRLPOOL cb356ee817fa00ab4a195c8380445adddf6426b5b08ca7c9af1bd96e6f43f3643bc6e4d2d9a7e4a3f3a79f43aa40b0da08721c2e42365c79b5f2e6bad6aef669
 EBUILD ngspice-26.ebuild 2688 SHA256 59bf8cbfdf14509dd52e05fdf9c6d02746dcf73d1c7d1e6ce5a5e72efd76d753 SHA512 86a4f3dc93f4eebb131fbe0df78134e67878022034b3bbf62f40657d531950eaba6bda286deb1d08cb4eb1047ccb8b54c7266def48af4a5ac7ea3cb6e88a62af WHIRLPOOL 47d099ddf517531b7cd00289f5fd1dda07be43f3c1c00faf094e830d22458687371ac0bbe37aeb4c93220deafc0479d07f548470fc253b66b99bfd96f3f9418f
 MISC ChangeLog 6267 SHA256 c8a466d99f4b50d92084d76a0a75ceee3d92b5c49e1097e1a4563368f736e24c SHA512 1899bc3d0b7e7c7938b500d6a915ff1769210fcb54cf0390f8ae45556f63adf8c6bfc87955cd3052ab7318d883e47db90391a68c3ada41d3e24963b6529f510f WHIRLPOOL 2ea7fa6fc2a2664d72dc329e00d01aa3289e212f0a0e82bd5d967bac9a972857d9a4b0e70ece6c2b9f1362271398a4b58102d3f919654346f6bc8288086334ef
-MISC metadata.xml 359 SHA256 08c94251c175bc7c4f708eb5582f8c02e8c62f41971b148287f6f95859ee3666 SHA512 282e8b320c2b618026591a6360cc35e759fa94a55b53e54ca4ad19b38ebe944aa9835ff30a0d8990d8cc94f3b38373709288821b4cacbdaa038b407d6c052568 WHIRLPOOL aaab64a4ce66565d9a0c96b79a0c2ef1b21f5a401ef5a27e0d1d035a15b34294b2b6ce3b6f4430871d77301f7d2aa10cefec5f2a8c979289c1d9c6e8ac157a32
+MISC metadata.xml 436 SHA256 50d43a4482c91a258b03f85e9c7fadcde22d9e9d4fd0cfaa0b96c75e0316e26d SHA512 65f3e489bbd7f9c5fabdc791637ca136529747ff29abc3630269102ef3951e5c5fdebe5a151337de6c8ff9ac36d86c2a57a63baadd93296dc511e40226320e84 WHIRLPOOL 900d0dbd05944d785dc766a14bc9acbbe894ba7e1c719b833700fde7b370d6d582846a2dd477ce58ea1f6d4465acc68c0ff0f8b2f271e5f5fcc27542b20cc1ec
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxyxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmisFgP/jlvnSJqLQRsg9I83NnRlTkp
+q6B/HCFDpkOzkbUE0stdRyjYTgTlPgChrWdUHzwfYUeAvqOjWArBKJS0JdwSas62
+dwf6shDZWf8zm71Q4jffV1hrx8Wf3RThGwyx97Gro/iW6Kpsj8nfqJyb+jogqjGD
+k9QKNbF8Kzu50XflVLDXu0ueSamUX58B+UEGMPAFkoqDs9pU5U+V7KcvNh0+YGuB
+eaEHzgivZpKi3q7AjrB5n5KNIG2MjxWbUXjvLXrqC22+KdB19Q1h1BU6FmB5sF3P
+3lxuyUzD841Q7/lfYrqPjoFI7Pfo76BWaSGeMI0xce1IS9GNDdQFwvcWQOeHRKVv
+RxWOXuXKb2tc6wntmLTK4iNri3StWzcHbNJNcoMK3tmlCmmjMRGJcCQfy2kjX+sh
+nOWnKCYMKDxc3qUIGR2m1M9oKSXlw4rOaP5DcUnm9KJ0BVELhUNPbaF2cZ+DZ9dx
+7LkJlQIcqxrVip2YhPNVNXYlXV3kqLv3GCCAUtTq6QBK/Cs8Lt+LAW2GJusxCfMP
+BOG4ee7M1dbd6KKqjgfelIyKnTidxUHw2ItafShwc4Zlm/1b6j3IA08Ct2W+MXip
+dilU/1ISX/362husRZe6ur2Do87iCPyHVCvQLHWuRbq1qd9V7/ExXVD1Eox2azqh
+hWgIUMTuCLFwbNdgYbdu
+=yrtn
+-----END PGP SIGNATURE-----
diff --git a/sci-electronics/ngspice/metadata.xml b/sci-electronics/ngspice/metadata.xml
index 9725005c2320..627c13b51b87 100644
--- a/sci-electronics/ngspice/metadata.xml
+++ b/sci-electronics/ngspice/metadata.xml
@@ -6,4 +6,7 @@
   Ngspice is a mixed-level/mixed-signal circuit simulator. Its code is based on
   three open source software packages: Spice3f5, Cider1b1 and Xspice.
   </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">ngspice</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-electronics/oregano/Manifest b/sci-electronics/oregano/Manifest
index f73106eb03fa..7c221658f520 100644
--- a/sci-electronics/oregano/Manifest
+++ b/sci-electronics/oregano/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX oregano-0.69.1-desktop_file_update.patch 962 SHA256 7cbe2a11d5f9a62b6a488cd0069c639b6d51f58ad136b20e2ad23b403ba52c92 SHA512 0e15a3f6ef43bca0101195bec9484cfcd54c4b1d067fc0e89eac1a97f1b25f00de7b3e9143e060c911a4d1cae8f2cf6683dfad89f60f4e867e2834d76c2a2031 WHIRLPOOL 8acb0fdaa9cc4fdd2ab84ad3debea4e9cb077afa64df41468da0ab2179eb5a58df3471fba7459d8c3703c781ffe1a392a4c0a256c1143e00ba2cad9d9ebbba31
 AUX oregano-0.69.1-fix-libm.patch 366 SHA256 78f5cd760d27a5d057694431937eb10080076915b19ed88cc291ba2ee1435064 SHA512 647499541abcdb04b4a0e3ddbc14efde217d6f4661c3e838d08cdee318cf252dc753cba436729ba513b3ad13406bebd923792f071739960be7ba3fe55147064a WHIRLPOOL b2754cbb8d83d9b79e9cc2c26365f21928743398bd50fbe0ca0154f95ebd50484910f0b1525e31e2e9a08d77cf80b511026f657ed7aaeaf6c2d2b0e1a49c4606
@@ -13,21 +13,23 @@ DIST oregano_0.69.1.orig.tar.gz 673785 SHA256 ec96f6d113c642aa423d4abf9d667802bc
 EBUILD oregano-0.69.1-r1.ebuild 1693 SHA256 e76785cb8c6b4b5d8662fdcaf29e9259202877b3ae5ea773280f7807983d62b5 SHA512 76f19b20131756a602031443fb1f7f7305f95066d608dbf97cd2e5de8fbcf5d93471575fcba2257f3d0107f2da7bcdcf8327c3bfac5379546e34ebf9b4cb7a5f WHIRLPOOL 85cd99255fe5eda03b4a685ec854a5941557ce7af7222ae89e4663775df12eae14a10ad6af19f760afdb9b52406df763a3248bb46a903142dab16e7cf2bd37ec
 EBUILD oregano-0.82.ebuild 1930 SHA256 e87d0e97a4e0a80f203a80f5f8a2c68a3889ac8e83857f908b127ec8ee858f4c SHA512 f68b4b52448dcdfc2729a604197df41f27d92a837f204f02ecc3aa8d7f5f330ba40ad5ae65769ea4622287887d9f99c2c33d50ebda74d0a1b72fd5cce7ec1caa WHIRLPOOL 8bc9298c58867f25be35d097e35578e37cb781c5e4b49a0b384ee070096a8f5a684742ca89f197219795dbb9bee7777e5ac7a0da4f99bfe259a402ab6d17af25
 MISC ChangeLog 10241 SHA256 04683ec9689e5ce08a34fd62e4248fb5ed293980147729b83b114080cf207a0a SHA512 46933b7b82f2ad400c9b826a5de188b6ddab0744458acf6a57d3f18561736a0a41431e08b2026d7a72a92a1ff087c0c61a0ee36b3fc2b19d26815a1381f4a667 WHIRLPOOL 944deae12aaffa0c59ed1b174321ff78dc213be33f827d02f4e1bf0b52c9e81c27c98324c8584bc01212a03a82a87350bf2a194a3a77796b5fe35b3349b9d033
-MISC metadata.xml 396 SHA256 f4b0c09bb67ede05a065279a794b16ff245252fc8faf07c28d928294347f0c87 SHA512 4293dd068b32cbc0850ee53a8d806e1c3226611243e1a3d5326e371d26c0720490f2718f9356dff8abc1f3d4635d152710116f6a392e477c18af0c9512e67119 WHIRLPOOL ea41e175b3c4ddde0cf267470e276d9cf5861c0de08012505de5345690d4d1fabbd3aa403056d45fd0bd3137caa8e7747e9382a632569cfb7b055e3999b5dd47
+MISC metadata.xml 480 SHA256 b7fd6ffb5e1131da9bc635a0d1bbf0912ce2411e30d9b69ff12e6a7dbe6fc491 SHA512 c078fbf2faf2648884de1ef9f83c683a3a4e106f182adf88c2844188907cd71609fd00ec8b4b5f7510a0bf0a6584e32888c9eefa16fd35c85ed6be25351f1b8a WHIRLPOOL acfffd15dfe03e0788b650709370fdf12e8df3f7398371340226b292ccf2894dbc40d52a8bd3c74cc5488c3d1c5fb46309510a583e41fb3de3afe0f2ec2ce5c3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUtEOaAAoJEJIMDbyqvv1Vf2sQAKor6rNFjgQTquqRm9LHwJPC
-o33Z3jlaDBXN3dnCIJgD32ajPSfXSvM33aegVowicTtnprMVygDyc272vnxO+gih
-+P8YI4ruZ3907Y9uzvrTyiksVZ0JPQZ2FdVpInO00iexz4KjMZx6OfxiHzOLrs2P
-ATKK55la//8mVb+gdcSIJ6y8OjtWjkaedRDG58gldIyxB/ogOwkEukdjmF6LxmX7
-dZvxxsFdO7JgnXWrdyPWzTAXLH/wJwC3gdnTZ0zStdKiWF3fyuQtKiuBM65tfgZq
-nm+vwzM5CGxlZsmVI1u/ut9ykxjSxvfLOe4b2oxz43BNtxVGMywe2Yi0p8Sjxx09
-HsT8Fgz6S7KYccMkM+86WBuXUJ4vz4ZWqT4qXYzBCrEu2n7zJiSljHnhNbcvycW2
-OPJ3G2DLvMx3Q9a4yt55FNHFmnSoRd8Js4LtmzNEZ/NEdAE0JsQ/e/aK0pPSAi0a
-gBn2MirGQv+NaXExEwc/fLJkJ2Qf0FNvJiAGsETD4B4qiy6rHwlUHM4RDGENUch3
-3G174r0tbGysdz2TW46+ohc/zCA/bpmQ3pjklRLRCxSfpyVvXNgjpzRSl5LQPCKn
-dfzsb48q+81gfAMvIZJQDJOgNuaXDICtPyrXhuRukmqMCYnhFlFGagjAs/Uci8bf
-reVQphcoj0TNfR3zuM/X
-=gaPF
+iQJ8BAEBCgBmBQJVfxy7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0HsQAJTBr5nqZPreAEydGBpnrKIP
+wKzJBY7sSWj8wIh6Z+oTsEb6QM2YxXFdNl2P5H5rZf/weNCGLktfC1rphrGIughw
+eSEPgLG0hgPjgwCgg6f2mULCpg7YMJifQahwS7wupqcLGP7HIXe110hWS5v99Erl
+p0vzyjnvwGmTG96ptEQdECaJ0OqkgCyS2s/Aa1DLBaq6xqNqwteOEBFa4r2P33ah
+H4/IOmnCyoqO/q4C9JzzjmViVTP2t/+7R6h7VM5SLQnnp8f5Vv8P8DmKZeTN1TYN
+x9BYKzhA2N0En2rGVT02weVS9oIlMZlpULKrp/Agmv7Kwr1FuKDeDoHt79qjLqfL
+SCuNkFIDgqu2BpsmonNRH45g8vqGlxgqdo6Z0l+9ADJVKJA91rhFJhfC/y4Lvy4G
+C8uXYvRcC/H5BlKvleKE5kKEPdFPmur84BTIc8N7HgnSl76DrVEEgYjs0V/CK4mp
+MpnWxVy+5zOjbDfyyMW7c5Sos4YmEyjDKoAsfF5Wht9ienrjfx1zSVHiHLNu5J3/
+VEmcxDgT9lGQg9ucyIr7yAuVpa+2DNzIH132GcJRYDF/Fl3UbHmXdey6m770f3VI
+NQzfo7rAQ4dmvZsUBJOGMlwEBZnMe2PFWqhHhSLb8+IlbDqKYMITupiAd8fOxc0A
+SBv9Yde6H4LP0JXdn4nU
+=0QcA
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/oregano/metadata.xml b/sci-electronics/oregano/metadata.xml
index b26144a019f0..caeaccf04b35 100644
--- a/sci-electronics/oregano/metadata.xml
+++ b/sci-electronics/oregano/metadata.xml
@@ -7,4 +7,7 @@
 		circuits. The actual simulation is performed by Berkeley Spice, or GNUcap or
 		the new generation ngspice.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">marc-lorber/oregano</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-electronics/osqoop/Manifest b/sci-electronics/osqoop/Manifest
index 2bb3857ddf6a..b41b31cd2857 100644
--- a/sci-electronics/osqoop/Manifest
+++ b/sci-electronics/osqoop/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST osqoop-1.1.1.tar.gz 419778 SHA256 44f136965b41dcc067770685fb7920cec0c161518dc0d383f61694395d568bc1
 EBUILD osqoop-1.1.1.ebuild 1009 SHA256 7f5a7ef18c5ab485eb00aa056881921a030c81dccf8d2113bba3b35b10f29168 SHA512 87b2856349fce93278142bd995231771fafb45981c99474ee09cd47a3207658d5c9b0d519f979c5c9a7e1dc649824b25c95939ebaedde7bfff430ec194d6cfb4 WHIRLPOOL 3d690eb9e117ccba60ec94746744c8ed87efc1faf784982746c76a8ad1b8f2416523c2184d907ba434e943dcddd39fedb9bbf27b70563cee38c36f8d61989561
 MISC ChangeLog 598 SHA256 f5e6f0d98de631566d91a7e9b6289e9c1a862c34fb6f1205118bd11452ca3395 SHA512 9103a8460470190ecde5ab3bc1dc1f5287d30eb0b609bfa29accf3a408a2962d8320f03b5392343f5a69cfce7e82758ef7ea47b3b8a059c0842a6508e9626671 WHIRLPOOL 37d85ceaa562d6ea5cf721f229291c2aa3b9c9a300697b0212cbf33cf89e65290961027643c7e66445fc460ff586cc27d697a7b2834f52b97a285abfd99bfafa
-MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
+MISC metadata.xml 303 SHA256 d926c29c7b448b0f9d48dedc2c9ad4c59668b2ef2076f4b11393f8faf35cdc57 SHA512 8485e7d39cf71cf88131b8c867dd1d14f5db7f3f39b9a793395e7d9edd4189927db98f6b6c538c46a042c1a537690ca7663c9d74e3f76858206de48aafc96e62 WHIRLPOOL ab756008190db08cda7cc069b5491ba8dddc8e6bf7d146df1b05a427a43a794341a2ac19fd67e4e45fbd284424cff891b73f119635888a8afd605329f5b37e91
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJRMokHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88sncQAKFnE6XdWZUUcjgh2Ewfu/Nb
-0BfM2oDn7AcWp7X3/+jjlXTooJerKhOLotlk8remXm4t2Z3+fDEoM1cT+OZhhvf7
-/8zxDQyWfQg3GZOkX4kFODygdZRD+6DwlmGfwz+JqkLguE+Vnc99tJgU9qystomX
-ZTBGxxNhPyLqr7GfMxlhnNRGoK6s7SOgxz0WrLEquCkxPCOxYo83pYTYlj6AmB/t
-q1V52Ec7h+Uj2e42VsJCB/SGoDWRBhSPHw5I9XK8PHQlycYv5s9gULekNROSzNCl
-idi6ZZejkEw7WJVmd+k3s6GVVwQ+Jt5uTxLdm2p7b4BSMQWL8wZLzJ77Y9mEKNYP
-pe/aXa23QV4FwAp1AXj0vpJ0L7QUJVeg/eoAZaxgqYDLXngj/qWh4FhW6c/uQzNM
-GXNZh7HitOBi8+UVkdCD8oduu2M90V6xd+qP18c2U1HUvQiVxk/kEk65GHe5iIhv
-xBCNa+qyBki73n9PVJDXJkUUXNJlWFfuXPGwan2O3FurCqw9QlSG0qjvPI4LNJY9
-aW5s0ZDnCtFQ0MEQCwHpERA8CBW7TWSkHgkZrAwjJwH5rdbPA/XmOLs+Ts19AGBf
-snvqUoToKi8l3DJVC3vPhH9XuQ6A6Lxw55obb0HXg301B2eNIPZZlA65slhmqp9Y
-vcgXtbgTXX7g2P4u/pj4
-=/mg8
+iQJ8BAEBCgBmBQJVfxzDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiDFQP/jYG0hVrfqcxLbH2EIUIwekK
+KbgDfa3Ot2GITDeOFWyyHv5trHl6jLv69eP488Jdo7zXTkBx0tMpU5iXoE8/bpnR
+PXVNHD5ZmXXFhYVMWtDk+hQPhW1hEMYh3kQWQwCUrQa7ARYvtH+4zGM8qqsJO/GB
+8h1cKH2AZld5LEeypu62nGQ7+oHb+kDTfYS6L0Fa0/0jpLBdJCwQjckVYLiqdU7E
+LqzwzXYid6KnU2M6ZYK0zl49mYlF2msOJKb82TqPurymsnzLTG9YtQ1t1hWOGf/u
+hyciCi3RNffBpCb144Ni1aXqsu1lFkwoTbFZ0NGS1aDr807dcD/SZeFOGUW2ltHe
+WCpSDz1UVJ/RoTRfddhFQfY9AmnoIKOgWt793RPpTrDyLD9oA1Eoq0RpO8CZmoln
+vxnfchIQNCzhjeLTH4q7seAN9F75sP8xhKztTrLNrmiqRlIZEvD+BT34B8AhimRB
+Vmo7SP6CYeK3GCcwqA5vwKd/aBmyVrpcXe9xvRllRqgaYOXVnUW0mgCOjs4sB0h1
+4x0cnWbDs+nKnAexIaZCM5qjYO6ipwdmaC4l3GDJIUV9G4RbHyB+tm0+FFrDGmF/
+tKjqcwreUYax3YPQ8pXzY+FSdaE5ZpZTgSIIpkGJO/ZStxQknhyjdliAdQc7no1q
+dQqfLZzQKdefVHGTj2Ce
+=KSTp
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/osqoop/metadata.xml b/sci-electronics/osqoop/metadata.xml
index 59acc2cc580e..30ddc705c81d 100644
--- a/sci-electronics/osqoop/metadata.xml
+++ b/sci-electronics/osqoop/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitorious">osqoop</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/sci-electronics/pcb/Manifest b/sci-electronics/pcb/Manifest
index 9f18e43f7a90..52471f4cbe36 100644
--- a/sci-electronics/pcb/Manifest
+++ b/sci-electronics/pcb/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX pcb-20110918-fix-config.diff 466 SHA256 1e782db2b39d32acc4e909d41006a7df732dab834d161325c71131c18e089d1f SHA512 9bfb0cd28e3c87eba91ee2a226a75128e4a0df37f79ebb10e4f34880d1f32d3cee17fc9f3ba6f553b6ed018a521efcecc583e75d82e8549d91cbab2a1280aa0c WHIRLPOOL 7b3a20fe8a8d0067951cc61b60616b2a2a5e5dd962d5759ec706aa4a12c52f1067cf4f9ddbdddf9dc6739ed188d9b36b1d79c245faebda4eef7ac2e1e2831aca
 DIST pcb-20140316.tar.gz 4210077 SHA256 82c4f39438ee4e278196a3b67ef021145dcfbb00519508ccf51aa7832121c950 SHA512 5b9a2704b4d3c95f03afad0fe8fb5414b2aa9d680e40bf77ad9b46a9d4e14ba740858092794a9ff6788f31ac19063b126d8ceed6316c0d9eaaaa574e6678c071 WHIRLPOOL befd3c0116427f631ddf6c2dd49039589302908bbfcef5e524b66f625034dba87327bad500a2dba90aa1f44c2a922cfdf2a71a85e0ec8efeae5a1c4b080124be
 EBUILD pcb-20140316.ebuild 4235 SHA256 7075460d5c684efe37f2a914b9d63cc230f53b53d64280d83acccaed2f1d8ad3 SHA512 73629cf4fb684ee3bc19bbe14b81612bdf9667b3a59c17e90b40c56fb8f61f5c1e800bcbcccc11a2a675fb39454465bcb4a49f33cd04ef49241562bcd1b9118c WHIRLPOOL a6f162b0c9141f24f7aeee6ef2c1807016580d883562fd33cf8fce125763f1d26815b35ad4b8c190256511bae1270862b03c707255f171b2a9e50d92a6707797
 MISC ChangeLog 11776 SHA256 8a7fb9328006b92a055119be57efb08b466c69c1438753b51059925c40ca75c2 SHA512 94700f1b410736c2eb9031700d02eeb27785a8727f4e1db3ea6f72f2908aeb84762445393f4f981a7653fabf5ece5afb2b311f577064ac562ff387c7c15494c1 WHIRLPOOL 2688ad485d32be9c5bcdce1cea68a9ce38c5ab3e6d6eb11b64119d341c477c89bc26b5aeae6cb94eccde586dd19e67f932c1465cedb8d5f4d55087cedf7152f4
-MISC metadata.xml 856 SHA256 d84cb88624d6f7c6ee0c9cf9fa3142df9c185eb5de260fcc74017b7a5a32cb81 SHA512 23039acd115416aa46d4f8178005d21e33fae67c44d646e8a61ecd220e0855054de8efc99ff9d4a02d0f3db31ab3f4571745115e56c7004a2a80417b598f694d WHIRLPOOL 1fea537cc77d6a56b9909bac531250f681448207239cf13080a03128ceee7aa3c1c7bef72ef6dfdcb4aee006a08644d509248ce073d00e476a1b8d9c0f257974
+MISC metadata.xml 929 SHA256 f75c5dc06b46fdc966cb2695d0d33b2f461a2102e1f2034c2f0a4552bd3dcde1 SHA512 4836e910f8bd951da01ef44ba528d596ecd7b510c71cc44c7878a607823ece91d149c9b3abd0229527bf84816c3068f1b5d65fb7982573a35eb4a379ebee0380 WHIRLPOOL 3c1e4219927a59982dbca07e6360c27b02ddd48869d88b417be1609316d41266b98aeaa22d2a1ae5003de9dad602961e408b88e0770d3882e066bd7c6cc930a5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUHI10ACgkQQe4uqXYgU9VZ0wCeMMvMEzqGvvMh3FmsU0aY7rbD
-m5oAoM8GCnR8HZI5eXXIfeKaSAC9Kqfz
-=4m3t
+iQJ8BAEBCgBmBQJVfxzPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiWYIP/2KRn8xzqG8TvT5x5bfsQgkH
+oCtSevH6kjUXIPtavZ8pT3S3bdDnKcFayR8Ouo48PV3KiIneElidChriT5r5qGrA
+CjOjFXKmvlSiwlHfrqmuFBdLQ0DKqXCFI74QkY/QY6FHVPbjVkXL+FVn+Xojr9LG
+I6vbLRatB/pq88boTxZmCVwgDuIXgMu1K8TiOJf/zv0YznWEyv/0VqslYF26uV2z
+kKc2hykAjzhQdEAIy4fImkRX8VzcvA8IHuwwxY4xZCeBjMIqjAFFU268e4i9bGZw
++EEh6x1KPVrXPF0oFZHX8ih50li/qGO1JLjSIPvnbBGURaHPw1jaQY+WKvpf7zfZ
+KFLPB2mIjUMtOkboRihRLl+uIl7NedhdPdbdOgXgl+yrth6D0HYLgDGsBsLXShjw
+my+oJXYxuw3vBbEVJX8mdGgicQDe2u2U8GpwQghLTvuMPVd5wHeq1AAT7Cyj3rq3
+9T0PmZBs3c8N/BWrFAx0P2oKFFckPA0NjspCQU26ByJ7y77CJH+obKv00O0zqFYB
+nfo/7gRvLZgJwNpXas5/9Kj+3NcnW7qi0iY2+NsQKNr5NIj2gi7Tzk2ICEOhlau7
+faolIDg14JjUF+g2fqdED8Xvqb3/DXL+fjjHhibAXglqh9BzTXm46fwDuPpVJS01
+jRvJvu0FkwBfyhWPoq5X
+=Vfxw
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/pcb/metadata.xml b/sci-electronics/pcb/metadata.xml
index 9213198f33b1..80fcc7c9fb1e 100644
--- a/sci-electronics/pcb/metadata.xml
+++ b/sci-electronics/pcb/metadata.xml
@@ -7,14 +7,17 @@
 		Electronic Design Automation or on its own.  
 	</longdescription>
 	<use>
-		<flag name='gif'>GIF graphics export</flag>
-		<flag name='jpeg'>JPEG graphics export</flag>
-		<flag name='nelma'>NELMA file export</flag>
-		<flag name='png'>PNG graphics export</flag>
-		<flag name='gcode'>gcode file export</flag>
-		<flag name='tk'>Build tcl/tk graphical QFP footprint generator</flag>
-		<flag name='xrender'>Translucent PCB display for Motif/Lesstif GUI</flag>
-		<flag name='m4lib-png'>Enable creating png previews for the m4 library</flag>
-		<flag name='toporouter'>Build toporouter</flag>
+		<flag name="gif">GIF graphics export</flag>
+		<flag name="jpeg">JPEG graphics export</flag>
+		<flag name="nelma">NELMA file export</flag>
+		<flag name="png">PNG graphics export</flag>
+		<flag name="gcode">gcode file export</flag>
+		<flag name="tk">Build tcl/tk graphical QFP footprint generator</flag>
+		<flag name="xrender">Translucent PCB display for Motif/Lesstif GUI</flag>
+		<flag name="m4lib-png">Enable creating png previews for the m4 library</flag>
+		<flag name="toporouter">Build toporouter</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">pcb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-electronics/qucs/Manifest b/sci-electronics/qucs/Manifest
index 62d7c098de4a..8ed5b6df6d8a 100644
--- a/sci-electronics/qucs/Manifest
+++ b/sci-electronics/qucs/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST qucs-0.0.17.130503.tar.gz 10380925 SHA256 28dff7da734d9910b362a0f3e4594aefb9986bde3f37e15aff2b9068e41ad774 SHA512 93ed20b34a5fa0c8dac7711d6797d373e5da90e727822b96c268f8fb284928bbde397274db2c638a5190d5916ca2bf55e849de95f327e0c55b3877b8897bb765 WHIRLPOOL ea590687cb44318473179c63704305720c0c5f3cc4c9816d798617ef745e5ee1dae3b4494e351bcdcc924eba25601c97e7cdfe8a2704c5c5b353dee6ac87a38c
 EBUILD qucs-0.0.17.130503.ebuild 885 SHA256 3080274e3362683263401220798805383812d85f200474334f92f00cb1607d29 SHA512 5f7f8d7efdc3a07b4fb6db6ef56d49e985e4eb155dc9e5e575bbec109acc8eefc2ef179f338372e0c9be57a383ca1bb23629360edd574b0d76206041709a9da0 WHIRLPOOL 24b1b9adedd5310a6003d1c5b2d76917a8ff66dd4e63533e663c579560282592e3c2fd308db63ef4d3802a1f6eec4b5d2b542afe9228c2af239d90566772652f
 MISC ChangeLog 633 SHA256 be3cb603d83848e33874072bffb5fc6da5170b4e5c80b2c651b30f851b7c4a97 SHA512 53a685ffedac16e4f8dec2e1c459f10069491fe25adfc14a870b99ea373ec17d61288a917ee515cda7127f8c55508bb92769a0e764b1b6f187076a03611599d6 WHIRLPOOL f8ca0dfcf512c78b82c44096a176ba8cf0649547467b25fb5e812a49ea94c58360a817dc7990d4cdd730c0256727ca9ddfe1995115206a159a1a3839f65e41a7
-MISC metadata.xml 263 SHA256 d14b737871ea79f06d5e665a93aa676534e21fa6f640d4fb9d77510af4120c9e SHA512 04f48597e9c261af714c628677a536f630aa5133b8310289d3aaedc50dce124b1db6ef8fc4d8a06f014aea8f6fc4c9590e4f26c55336b4dbc9560bfb25fb63b5 WHIRLPOOL 0e4e74d46355562513c58d6f8d16d63c733bc8536a32f7f7e90aad1d81e90e47363b2b58be15b045aa0fa0a919f05f56073a15dd23a9c807d93478a8ccb50547
+MISC metadata.xml 337 SHA256 b2bba31dc89bfb5d20a0306d049c8c4e9235472eb041e6e4014303001fdd1ff3 SHA512 ea7d1a0bf5dbe6a8cc2d94243a1428fd0c7fe2c2c0856b1887cb37c311c98fcd3bc7e4fa082633e140459a2b78dd3d0aad93c7adc4604c57dd9f1cf8e4759205 WHIRLPOOL d51c2a2081de6751e5ccd7454725d96d25bccc539a068770d71b35276788a95d718beea535ba0b29dcf37b98819b25e8b1bc8c8281cec0d5b24384395aa673e5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJR7pOTAAoJEMbwO6tnXQ0sNsIIALYD7qQVt/AXe3unJ6FKnGm9
-mzm0W+QzFcxA3c2qKeo90Im3KasDSEhYCK1cLBG8tyEEPiFn6TJxY4g97CGzddrx
-3Ds1kICwBEtJTI0Tek41gURwUdDV4Dp5B84BslP7lERIvPv7jn7ro6L82uZvx+qR
-wYPSHjZd1M//bK6UZzruvHKXExK5iQ4mqaQnNUGRfKylVrwWZAK9nvkxaNKY1puK
-xBWUAcBhJQyHOQLj/sTKmobupTqBSx7DJYrWtL+Xx7VQ2J3i4RdnanDHFsRQRit5
-VBTeox4ocTrsPP9wrjV5Y1aNN5DoulfO2B4WcCIPFVE2IPN8cjrPYKU4MwSkS4I=
-=C/up
+iQJ8BAEBCgBmBQJVfxzWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiZ0AQAJEuWrfpF5qXj9lqCEmhH+He
+yvNS2kgZoE1vrtYIHtyFkNenWodbyFekNjANLU8cs4nZcJp4lo04eNWEZjsj5QpM
+7PkhrJD7AWju3J3jp45/sctpdWPqOFUfq2165ild0sdrmKGZUScb+2HjrG7guzEl
+yFt5VIykAeKbGPmos7X7KIWwe3hImFXK8j17D3EKfXRzJdCfH+QaOhiRU/tUzVFX
+3rKI3K2BhjIKuV63fD4bwaVDAvoCKivTXP9qMMXzk9DeobPJkdLu1ZRrL8SbZZqC
+axrgnH2R/SZsrjK/y28OYlHxmmPLjtXXAIQWCBxNoGdkQQNzRspmeU8HppB6Ms2M
+svSLzCMYDjuZWU74Lj0Hj/NJtSNNAGsHvz1RJFfswOAOKxCdD8iw+1rIvxGmbBxl
+di/dG26Id7uqCDJr2hPPK/mNDrZXkv2yJFlcn9wvQLDLbNUb0dMw65V1MAczttgw
+StDirxQAqM6lD3gppPQax0rISSVar1IrBZOZF3uCpEG5/2Xof1bUc3Z7N96dx3RH
+ya2Sok9kznt6GDAz/HQ2ki3ZfrzPifU8cz7hF9YdJ0zszbSxmG4BCFvXM3RL0oau
+Ghr0DRHHYOA3oGZJTqwMgEuORRfZ6D5muOH53MjJCVgLpZeak7uaOvPq+UG2gi+b
+T9t2sc5MqSMJz4oIwjQi
+=Aegv
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/qucs/metadata.xml b/sci-electronics/qucs/metadata.xml
index 44777e050b6c..cf8c179db29c 100644
--- a/sci-electronics/qucs/metadata.xml
+++ b/sci-electronics/qucs/metadata.xml
@@ -6,4 +6,7 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">qucs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-electronics/xoscope/Manifest b/sci-electronics/xoscope/Manifest
index 1b9b672a1b07..c6118431bad7 100644
--- a/sci-electronics/xoscope/Manifest
+++ b/sci-electronics/xoscope/Manifest
@@ -8,21 +8,23 @@ AUX xoscope-2.0-remove_bundled_gtkdatabox.patch 6577 SHA256 2aa2284506ade1b21abe
 DIST xoscope-2.0.tgz 334875 SHA256 a8a3027971dd1bd902861ea8f099ea003a19b6e86f87ae97a4811aeef1deb403 SHA512 8a7506dd40133c1bfaf101102f84a5d81712b4cc28d75002f14d5c5b2e08162813dfb68a3e15e1056545d225d563c66ac8a5a81deede3c93a5bb943b81c8fc70 WHIRLPOOL 4afd660cb05a9a70ce49a5553c4f08d5877f32a85adcf86ada1014d7d90c358817cdb6da7f4b2d08edfb406375848434f679ea976c15ad16bf3ca2b8691a944c
 EBUILD xoscope-2.0.ebuild 913 SHA256 6ac66e54a170ef8adabadd89ef2364b21a12084f0d6926f2e9c942afa6b3f65a SHA512 004d85e30150c51c86a0f6e589e6a909266791d735076becbf7d6a9c5f49f683a49a5a294fa97ca60b0ddf92e33f9fd9dc02da727f20aa9e02f84d8b22cea399 WHIRLPOOL 1bfa7ece16009bb3f3bbed93cb296cd66758dec7007de6d92e94f87607e45ae2bc35bae08317304de1593c3260aa65744d92430f53c9c7b8e4d2daf64916917a
 MISC ChangeLog 990 SHA256 79dc1557eb415d349dd362819e7596bc34f88d10ff4a52cf6812b2ccb723bb3f SHA512 1b1bc2fc4c1e2da54cb9a461cdeaafa332d10c626b67be8775a3325fcce1d5fac77c9657a058f42fe638da0764903cfec576c593c1fde986a4a2b4dd6eb1fbb9 WHIRLPOOL 7994c658bffb7d20d6b30b69c0ff086a130533bd58152ffa7ee1f294b61b15a6a665a839c360a720afe3d232e34d1dacb0e889ef33fc1f3b94dac2267678f609
-MISC metadata.xml 259 SHA256 6e15b80958fd3d20f05e98a7a787b1f8272a569032726c484ebb4ccc13310fec SHA512 b2a561e3395181aae960a01fee067d8ef9b03a1b35d14a2bfc03b1bdd89ba8d0eaffb65800a075e1f15680511d7e84f77fa2dba0b39b4872dcdd40edf410ade1 WHIRLPOOL 034e43927e18196115c0dc1fbdd09b044b5e6f4ebabde6d34b1492033ee9b1d2e892ffa903504f5e8d1f25ca5f342542b81bfb100a3c7f2a370243158d67cc78
+MISC metadata.xml 336 SHA256 73f57d355236146ff66175281f5c394c8f20fbfa7896be2e95993ad62d360411 SHA512 be798569ec2d46c224bd2af8bdbd7da9ce246f7976410b1918e575c0fa9f7c90e739d5dc99a5035ae32c6856cbe7ce9fc921c42eed62c5959f3104d51b7bf8b8 WHIRLPOOL 0a72120e1ab9473f4ca94be420670a4300e9c19001ad41efaac96cc81bf4045d008bae3c5d264f75fa8844dcf294a1dc63af9f7fc84b31a767e6a7ab889d651b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCgAGBQJRzqq8AAoJELp701BxlEWfwgkQAJeO+VC7UlOwA8fO+1MyWPKV
-S4tSNqOjUmWd1hlDKTUO4XPx5vk2xjtcWsicVaCawGYUT2pWWCMM0VD51FQ/eS3B
-yV3o7A/2vcrfk5seJNWx3uk4y1qo+5JCIbjMqszlLgUdSB5Ue2qNFnmVsBzmMmLz
-KB5ejkqCvCX8rHKCjoVWoIHVy76ULS6N9ao3kO0srCYaej/HTEmDZsBMFNO0YFrh
-xjqhEuMk4nBXVQt1FRtH1iI8DXIu99uIZgbrpkW79y0/1uYkpMTydIu2Ayjd8TSS
-/JRiZBFs9d5MpkA0vP8fH9L9p9HXTjssQ+3QRvXSK0m9Ai0k1g1Hkh6ENGYlqrhg
-ZHWm4FobFV4d+nNxipqQtiwQZ0WKbajcGHI0dryurSBR1TxGJGMLxJQv8iWctyxP
-w2/ibmOxdMYK5ybE++nNNP1sP03F0U3s/SMO10cFaO3x7vVY/FGjsfC+ahxd41bZ
-BlWe5o0US2wORGXUJ4WyIxEGsNT82hWaNd4zpXvzwpkWw20AGzohBtgtB4vD/k9o
-yeUyxsGJqDcnv7cZIt5FP2lzZze7xkiHvXYXeKKa8XChrgbCVWSYvjj4bInOFL8Q
-0rzL4jLDlfoR8xAj/P6chxCLFtDQlKHqzeLKcpsDngDsRej7mcmaXf3LVutrr5xO
-7/NY7+P4LOpPGn3QWYgN
-=1W0N
+iQJ8BAEBCgBmBQJVfxzlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiwq0QAJY2SjCDhIsVq7pl+HwFwZ1l
+yoroE8jxHejC0vQLo9HxyXBHJ5M03q7oqgCD5MILbO+3glomCs5WtXBp9E7UcOF2
+JfQOO4YFyxSxHFfFlORU9tAgk4eB06N1AUfsL/tG6mzobK/VuqqDrJ6R8iqqsPsX
+oKpxjQRmP6N4+zScd9jF4ZUEB/Yn02ls7WwjKyUR/L9sKh2/2dOZSxo9tG6QUvy/
+WdE3hdfL1XZR/DW50eL4MEgF/11ARFWtOLUePioPXtY3gdsU/nR9CNNoadptKjZt
+DX2uBItp2fwRQ3ouzgaimvPiotIQTd6FUlJZLam8ha4TP/9zF6aiiWVnm5uX4XHl
+5qgio9LOP8v5RAF+VKFwaYi9w3moJqtnVR1uQCGazZZQsl/qX/HUo4yLuyVQfwqp
+JNMvC+h1TbD3gesilZ2420MCMn2uiEO30iY6IjUV48lHD4xlOK2X98bX+YVEauT3
+R8icJBN63FhaSsnlGh0UT7OYx/njln6eZU47rXX/i7JdreJ+Y6oiNxjK5eiZeKBx
+rjqzJHgvcrc4FTeJLVSxpdaHcRE3uVa5yHOZI1D7IJtbginty4lTC9fX11UGpdVr
+Mi2VLumxLM1WKTucPOtcs2kkDvtW9y/nyIWq8x3UPcvPcNXzCL58ORQYeozJsjPK
+gsumkAmwhBJO9eJrdJqK
+=I3iq
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/xoscope/metadata.xml b/sci-electronics/xoscope/metadata.xml
index 39a02bbf0f98..87e1ee6b49ae 100644
--- a/sci-electronics/xoscope/metadata.xml
+++ b/sci-electronics/xoscope/metadata.xml
@@ -6,4 +6,7 @@
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">xoscope</remote-id>
+	</upstream>
 </pkgmetadata>