Updating remote-id in metadata.xml

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

30 files changed, 352 insertions, 110 deletions

diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index fb0014ef596b..b86516f0b990 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX anope-1.8.7-ldflags-fix.patch 1715 SHA256 49c20cf2dc85d1a9b86b0876f27f5da37a26b2fbb2bd3666155d529d7129db6c SHA512 f92b8ff3d6c7d4cd9a56aa4cdcf98b9c1da93aa8a6a00e2e0a09e7a4facf937878b7abda32b698dbb19781863263e2eb21fbc8b5adfd4619898dacf34920fe23 WHIRLPOOL 1a0c0ec67ca7d722ec504d1874a366bff88675d381268e3349c1ec9a57f50de60723673ce1458809cb8d4a77daaed7858020ba4265ef25d7af844c50fd02a4a5
 AUX anope-1.8.7-libdir-gentoo.patch 2584 SHA256 e639064792827b2797f1ca21865146c880720d844f1aa3d4725484c5e2c7772c SHA512 50d80ac51e781b97b7db0ba9e8dbf20de1471c29d603ae14ba907d562de977be3242226d4e71edbec6a497856a87f41eb05bcc19e7a2854ff4dc37365c3a0089 WHIRLPOOL 398cea99a4d89949847e9ce353afd861952f73f42d7529ba843d3890871d4c5b493b0cc3cb60924bd07f946b396e4805baa0ac2d5e50a68db6054ae607041fab
@@ -10,11 +10,23 @@ AUX pid-patch.diff 450 SHA256 cd3f266cd236e6a5bb7d15b502631e8992289455f7e308d94a
 DIST anope-1.8.7.tar.gz 1586164 SHA256 804516153936b1147a79960a283229191d29e1d9162c3ec70d86d099ee04447b SHA512 3fb67f73b8f4dbdfbb9b4ac41a20e3b5c46d54cf5abb303f4a25d3a5863ef860ba5bdffc67439e5f1435675f80f86b2c283932c1a05edde2ae49612947fbd074 WHIRLPOOL 347231e1a9be8bfd9f09a895af5ede179a24c1ac56cefbfb0fb343ea060497f2985e9cc2fd368857e58ea919751fde1c10bef1f02333f989928c7504314c0f13
 EBUILD anope-1.8.7-r1.ebuild 3539 SHA256 1ac8a5735c65e59711dbb290856c1145e9f147ad4b8faa860038d34626f05257 SHA512 d852962024fe7677e51f9952357f2ffc5ccb42df3c53a97caba7394908815f2601914a59d762790e93748b4da97285d18cf7edc3d3bb0dc57e76a039c8a76597 WHIRLPOOL 376cebff2bdedd89dc13f7391a6d3959fed2f813e0ded881460ba92e5686998a48cea6a2cd153c89cd348738b224c0cf45d3f0757559c789161d1cf8ca597afe
 MISC ChangeLog 3924 SHA256 440e87d8f81a69252ca848e38b69c9d579ae2fd9179c55cb2231bcb2f4a28204 SHA512 6385df5090eeef98fe412dcdddd56d11fa954ef553cb3a309fd0b90b88c9d842d7b653eea40daff0eb3ff749669532be7339491ee677b2ed51449e1ccd61602d WHIRLPOOL 0988469734da8bb1022d03c4b44a82b5f2b9485e9808b62087997cd6e6eb33014ad3448923f5ce6900c2a35144760e8eba6ca64a0583dd0c02cc301dfa60298b
-MISC metadata.xml 322 SHA256 4240b9effe8d7796234c47e4f4af9ef4250bcfcafa9ec09e4b6a4a503de10b71 SHA512 911e1bee9f423797c7eebd37eb54ae19717f3a3f687b2f2e4bdff64a5206f74a78142b74ca8ad26480fa077ef77c12e89bad4d592c0c5bfbdf37033bcbf50374 WHIRLPOOL 2a89ca39f5d07bd0d4b2cc41c8eda302acf30096e3aff70739b2b501801eac213ba00c8aaa59b54025ae15a15af9d3efa511eb0494851c955d88b116589c7d94
+MISC metadata.xml 397 SHA256 8064eb6bbb2f15b79827d1412d2750b3ca4ea1018cf19a51c3a003c4cfc7f7ca SHA512 5cffe6151ddfffca588c751238150a19e0523e11328f25d65eed6338fb86be9595be42d483eba3384e0824ec918a38d35cfb57c8dc6d46514078b8ad8dd51cca WHIRLPOOL f91d562d2a269d8f361679266121c12712814309b5f591a129d1128654c076a7be48153f9a4da6c8ae6e669d85bdc94c3105c94b80769157df21018fc3da1124
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlEid4YACgkQsR7PQhRXYEmMngCfR3q7oQn0B1aM84urHPCk7lpn
-B8sAn0ge5OpKGyHEjv9W8kpAdDkcF8gN
-=FQem
+iQJ8BAEBCgBmBQJVfwxHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0tQP/0Pb9oDjO9C6PXCrSM8SrO6a
+1Ygmd+lzI3Z/uPr7IBZGmw7XphRPFPnc+Y/eKZiHmK5GsF2tGf4jvUDkRqEeGdKn
+Xe1LlEaEHZzv+2TXhwFrBaLsr8LSWP7YgDWR494ChkivCH+IB1qk+bbSxYJT7MgE
+Kac753UkrJj4s2zTrQFsUbmQCYe52pN7Jz0CpNTaUNDWwBZrBChYcU2sFzuY6JGy
+UgPZAMRdXCS3fZpkcGkRdtW8VIfIb5WIz2Q+861nuUR1Dp06XVlbdFSwALghTwhm
+PunAIxJNrqClsHpDkxruYL8ujKtDZcMmDFXW9dwyhY5bW/NcKcH7AADOAnFGz72I
+1lAPEYHiBFlzUCRdaD5Io4dZ6GhWnMW7pdaHNCBPOiFXjzX93SdtoP70BmJaLeT5
+gk8OsiaVLeQq0EOKAi0Z/ebYo2/8z4cVZwOp0s7WUQnhUqY/W6iNZex+LrhsEGmF
+f9GKWddlDBed7lxwSC+TfnteV1W7RAMxB03sHHBVymPYGyeA8HXWFKNxDvvBxAyx
+JoT+IbMcR3zPyv/CTxccCWRk/nWqMSYyfytUGvSnHJD5xyRQ5Fa6oZaP6cuxrNXa
+5VkwPCCAFSqL2QDufyHRxMSjqoXZVX/BcmXxlsZSHY92DfzC8oaBgQ6PDxhd2xrH
+/sGa5nNCYd3mNE/3Cm9s
+=zZGs
 -----END PGP SIGNATURE-----
diff --git a/net-irc/anope/metadata.xml b/net-irc/anope/metadata.xml
index cb97448005b3..e180509b7d60 100644
--- a/net-irc/anope/metadata.xml
+++ b/net-irc/anope/metadata.xml
@@ -7,4 +7,7 @@
 		<name>Bjarke Istrup Pedersen</name>
 	</maintainer>
 	<longdescription>Anope IRC Services</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">anope</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-irc/eiwic/Manifest b/net-irc/eiwic/Manifest
index d3bee50f8d27..167ad1481721 100644
--- a/net-irc/eiwic/Manifest
+++ b/net-irc/eiwic/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX eiwic-1.1.3-ldflags.patch 648 SHA256 2ed6b18abd4003df0b5fd698f53e7d31d3627ee6fecd6da757e30aee093c2345 SHA512 1baa5f4ef8481b7401379140a5c68faffd25ba94bfef827794209358214bf43374ef729ebfe40182f6dfae698785923f5f426546701c48be2df73aa9c91d16a6 WHIRLPOOL b82622a863edf7ff373946b366e837d3425fa7928bc3b81fccdf76127e3de1d210ccde5987b1dcdddfeb58910881514c0f6ca7f59df67be79509a875a8dd4bf2
 DIST eiwic-1.1.4.tar.gz 117593 SHA256 6a49a859e46548f8ed005ed3c6338c64cc6725a08c32e5bbd075f8eee1eec800 SHA512 f4c6ac9853df2d26803bd3acd0987f6f4445ef0020a2e02b695eb362043f985eec8440ea9875c282e4f070e89b3ce7357947b99f86461a3bddef8cb2a85f8ce1 WHIRLPOOL f5147847f2884734ffcf90f532d0dd49ed96430dd7e76d223543fde30b8779db51a31314ea699ff132b7c8f773482850babe2be375b020fb914dfa9bf4ec1774
 EBUILD eiwic-1.1.4.ebuild 1061 SHA256 e953f729551de1e634e4fcb15eea6e54a91e84ea86ba9835da29ee975dc6d33d SHA512 7e78b521132e953d5938b5cd10de762931e29d41b382e4ba15922c730a83b453b99d8b010dd8cbf6a7d812af9feee0b86925d7cf1170ed30f55519e97fbf4dfd WHIRLPOOL 6360553bc5e9fb344cd45c2569bc337949753bb22c6b6d628add9fa70dac7973dcee25444661374500ee1d7045dca630b76966028e397d5e99a0c729ffa5d1cf
 MISC ChangeLog 1488 SHA256 5a9686ccf12bedac44b9795ea77863fda92a00084c973596f643a08f6e6b36e2 SHA512 0bea7a63d2f727bcb6c7a67fc3b047d516ca0cfb75acbaabb0e65a4f9a06c6781daa5ff1d21866a130b9b95da761848a1b1e1491406da4e8b8f7f79e4ca0b51a WHIRLPOOL e2b4bf5c0ce8c71f036dad053dbd3e7a89ad135418b7de9541c5ad300b2e4c5df812b568820a984439b7c358d2896e0dcd8f4bd50435e43e795b7f8511f15c97
-MISC metadata.xml 574 SHA256 5acc504f7f8a5e78eb962ce25d3e7bd5c4bd90c0fdc1fe4b5abb7b15645b8b4a SHA512 a6fc7914beb058984fdb563b4517a30bdb6a416e717ac6bb3a48cc20381f939e059042658f4fa859e67264b5feeb3b38d14941e92678878198f9d7e8962e7b1a WHIRLPOOL 0d17a22b6f820ebc0138479783811243258416c4a418fac4f5a7411d1421fbb4e725348d538fd60a8c21ae797fb23e551dfa443140abcd0be829ba2960e8ac6d
+MISC metadata.xml 649 SHA256 04316955b3b762e7b4c8c2966b6996c4cfe9e6640452ee72df5952211c152d19 SHA512 9df02c97e7115e3fd6e0c85c78ac2c58c02cd4bf53e323e50becf8dd48b81de274a584d1d6f48da464fcacb646cc6beb0b90891dc688cc44719240a807ba9728 WHIRLPOOL ffd0dc59e39c442c2109d1803b66574db7cdc53472bd5a0eb975f1984eadaeedb6a3a83034b75baa028558d8a81ade89036e66d8d959fe270a7977303820fa8f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlQeyPcACgkQmWq1bYTyC0MvKwD/djcYbMcwktqRxT5JfYg+5w8R
-pyE8z4Mkzc1X4FbRYEwA/jxQvku2J4cW0lVTk1L6DMmsDHLv8hH6EZTLF9R5SO0+
-=KtQS
+iQJ8BAEBCgBmBQJVfwxQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi6g4P/A424w4trRhslxfZIFVvQ7XA
+Byuc77ijlzzQaorDaWILNJ60hNw99Wcw3ozOtqJzozXuWRFFXSDaYS2TUCLlMonr
+xAwc96YBlzySiOsG8sSlC1/n6cVQL2h1cSv89f+k4NMxW9DwX1LkxkB3BssKpXfF
+aH7aHt+YlefQxhrGrEcHKqMGxGgGTRW8azSk0n/Mb80COVytiY6he36MvMzjXXj/
+GgUGU7dWrpPJfhhPBo0/G7Ay+7UXNxsYSM8jSvAnANFg/kVizJ23lIclhC/j+BNS
+98OzzhceXzXdELtnMsKPAtnX41PL3DHD0IDXRZHWcnZiudBRmWLIvCiTLrOsTuuz
+iA35B23r989/5BKtcynTUXapCzjo4bBKzyAOvE6cAbFxZonjTJk8wtzrWRJPwJF+
+2bqkFYEk6jayIMQMtTWSZ6AYv32/sq0F8xXFQgVMpbQwK6sEEfWeYewfwS7pcntc
+fhhYCzJXPZTI7VF6rgqz5IvwQpvWKMdOgT/7YY81yN/+ay5l3P3ytLTbf95NN+vr
+nzDI0WAbGq5TjWPmu9PAW0G4Ol6j+GJbyMtbYi5GG/AcMase5TZwUVrvm8AVNHvf
+uksqLa6YAgCP1kjN6izXmECwecVp/iUNFJQJQ1N03e+8fzwktmRyFEaU9caRM21g
+Z9qUk5XtBnAGCO7tcdAK
+=Ez/z
 -----END PGP SIGNATURE-----
diff --git a/net-irc/eiwic/metadata.xml b/net-irc/eiwic/metadata.xml
index 1b789011accd..48d4032cb43b 100644
--- a/net-irc/eiwic/metadata.xml
+++ b/net-irc/eiwic/metadata.xml
@@ -11,5 +11,7 @@
 		the creation of own modules as easy as possible. Including "output routing",
 		TCP/IP socket interface and timer functions.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">lordi/Eiwic</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/net-irc/iip/Manifest b/net-irc/iip/Manifest
index c166bc470046..afa7bc75556f 100644
--- a/net-irc/iip/Manifest
+++ b/net-irc/iip/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX iip_open_mode.patch 487 SHA256 f771cae704ec858e957d67ebb654677e435b0cd16a9e2914fad3d5a2c71e2e62 SHA512 f82c3dd9f713bea86c6a364bb6cf5d6ed301668da6016ef17568531966e49f1b092f3c6148b1cb749650df85dce0966e53a9c1ba97174bc954099372d986788b WHIRLPOOL d643449f6b487df4e9c797edcb53f2c6a3722f2747e169bb72f4cf5178edb4ff9276916d95be54c5079ffc0ce75d0ca146fb8022e2ca825568e5a731cd7e7289
 DIST iip-1.2-dev1.tar.bz2 299053 SHA256 8f4bfce32e43a75e71c78d49eecaee9efe3f6b8782878276d590e736566a9fbf SHA512 384026ba6b0d797574fad9295ac7d042a20556fb428663f8043768e9daf2adc831cd89b81c48abc4473e68f3f0d84d7d854be1816f8a82628f397839e19a8992 WHIRLPOOL f4fb55c175ed9ff8a61bccbb31fc4f1996128e95c1156797f49e2d0e846cb08cb3517bb33dabed4b2870de92754f4af3fe39b0b173bfe98a7d6290d8043907a0
 EBUILD iip-1.2.ebuild 885 SHA256 9cec7147333f6249149e9bfd639150d384133d90f3cf5dc6759865ace55f3e34 SHA512 9582548948af79654c864374e39bd882502e90fbdaef4a9802176119fc85544ca0491579aca6a9782a8ba958f16d267b741f2f69c90e9665555fa99e05f5f991 WHIRLPOOL daf2b348cf5f373a7adf93fce0399299711a88dc57ae9dd65c8cc21d5c8ee8bba427ba27183a1a4e398bbd3b421e75563283e186427240b0a97514841bc94a68
 MISC ChangeLog 2282 SHA256 ade7d077f27fdea7d2f270bf90e3ad92293bcf7c3df390c4d2897f18932bf51b SHA512 fdb9627e2acb22bbbf9f1aa5a9224479c91049a3ab02bd7fb5ae08fd7fca840167fd8290d820743e0613bf7ce4b2ac28059ead6c19842754eb59d88b46748c23 WHIRLPOOL 2e35fe70c73e176b9ec81b5b6b8859c6ca8d873105a87f0fbf69601c478f93e59dcfbaf6ee34af0c226d078a8a8c524e10eedeb33138eb1e8b274bd01942c86c
-MISC metadata.xml 160 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 SHA512 9cf2605fc15b592515a931de7a63cf02d1d5ee27ecc3cd022f8e932791008d3ae4445088bebdb48ee0d46e17ebf475c19b15a05b07528f73c351a9846cd3920f WHIRLPOOL 6eb76aae8263e190c7a0a82968b1d7db2f4fb65bb9134b6bad1a5b2d3a513e229eebf303d9952f4933e758e42c0914550d58d5e86a3b76dbdd6df0802dec8e7a
+MISC metadata.xml 242 SHA256 0975e34f8fe05eceb593edff0853b289d3d7fb4259f6a2a112612df4da50839d SHA512 430447d68650092d6b303bd62729cdea2c51059b2f1f67d4d69b26a293758081fb45c107e25018c5c1a486b8ce1981a4d7e6813636947dce207a10bec7b07b6c WHIRLPOOL 8646741108d04106febb8622382c7e50c0302b2c52db2d74fe6544cd68b0cf789e75c82490b621a1e3ec1dfc2fa04d5768b30cbbedc71484ddcf43f495e05c54
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfwxaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiI4MP/R9+yj9H6igm2GzlSEtCx8jb
+K4MLAVcxl4WBw/604NHMgmDjsKDREtZDQBbQeLHdDnfYUO02nRWWfrRNHBNEQC2p
+Ji0oM9T5QGqE8m0QD8dTtDnMRUzLK/SGatSqLeDCN6Ixa/bnzM0sMTM/32jMgc/m
+qvCvCY8ycg+EZpqjqbI8NzjhRllobb4z7jAPkzdkLbcMS8iWPNNaSulx72fcYygn
+YKy2oq7h+q9W8y8XDl9OdNoiBqgLmPK9+aWtJvMdt4tMDNhsflqxBr3ezvbfiEFU
+4+/hlGVzUSSgOYBoYEjXP3eKDVDIDGNz42sGdYDkQC5uFCB9eqNrB09J7m/fUrCa
+hGPF9Xr04Bngr7eeJz4UoExRnb29hFCSNXuakhu5+xZkpF3c8q0GmQXUaj0kDkDO
+nowbtH62ET11rcHBBccRlwXzx6RkLdsRElCXifdavp61FTARKHUbn/NiIvf4GfII
+BMbJu+28Mzhboo17yfwuoyOPSIU5NOIcFSAbcwJrs+4mJgXG3BSWnldKb5qLpyTl
+iWlHQKhSaYUMHVBiNH5QNMQydVemZMnpwiG6HfuEwnQp7wBl5/zeJMoFays7/Brw
+4sFBAn56BJNc4lcJwF10PgKB76A8cUlRp3M1sTX+cxmmOM1hGkbBRFOxKYuzXKAs
+oKUXfmwETyjHLL4lA3a5
+=8iV8
+-----END PGP SIGNATURE-----
diff --git a/net-irc/iip/metadata.xml b/net-irc/iip/metadata.xml
index 6ef15e900f17..7e25b929ec9c 100644
--- a/net-irc/iip/metadata.xml
+++ b/net-irc/iip/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
+	<herd>net-irc</herd>
+	<upstream>
+		<remote-id type="sourceforge">invisibleip</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-irc/irssi-otr/Manifest b/net-irc/irssi-otr/Manifest
index 8f9a5e9db77b..bca941e17912 100644
--- a/net-irc/irssi-otr/Manifest
+++ b/net-irc/irssi-otr/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX irssi-otr-1.0.0-cflags.patch 555 SHA256 0f4fb9e226e8e81b87640adc087e2966dd9f023090133ee760293ebc900e3f8e SHA512 b34ad91361e96bf5dae84c8f38220131737e97f1e36e790bdb427370a236177ee50251939b917b32ba64a05613ec282dd64a0874d01285f311a3b0e12e6ce168 WHIRLPOOL 606da32a818a7c7bfc0ee71b8a499b18d4d272c5ecbeb759ce218b19a156a37705e5e7629fb49350fb0d0be47834992803d655707e345f87791b3276a6416071
 DIST irssi-otr-0.2.tar.gz 28618 SHA256 fbdf4375056cf5122e7aebd624364d1201f7c7473e1876f2c28dd009b7628c11 SHA512 03ddec87c5fea0e3ad60fafdcebd49340978f41dc8bf9fb5918d90aca61d1fa69634b2304b46b25822f00e3bd258e0953d8d9436384e5bfee036f36d512b08aa WHIRLPOOL d7ff7057feec54b7de48aa4d13710d3894eada1c0b5f80d324f8007b69e3e50f3e7f0976837bb129a7cf1837ff55d6960300677cf6c0d5e0673d57fff32115ec
@@ -9,11 +9,23 @@ EBUILD irssi-otr-0.2.ebuild 945 SHA256 dd3208b08a47d58ac0112bb746a0518d33e3d0852
 EBUILD irssi-otr-0.3-r1.ebuild 995 SHA256 d1c6fb3616cb8338fd46b5b4d1e6bdb2b48a4e463d051761cc717f368296435d SHA512 e9e2e73a695debe2a4b66cc94943d3c11d1dc69504589628ade9f5cbe7684df67f628ee78bc8020e50acaf4aea49f9d39ce3ec8603f778b92c2771a31e46b160 WHIRLPOOL 157a231f758bf71c54ca151287ab9d9497c405ecc667eacc6cabc728558b6c40bbb7bc2f8d534876b4495b94d3e87e70c23b0e331bc50ae33817bcd7eb7cf945
 EBUILD irssi-otr-1.0.0.ebuild 891 SHA256 eae5499c273d2bc9c9af91c59920374e5711477018109add833209ac8a19a9df SHA512 77f5deca08d96fbe711fcc20850160b0bec0a33669e82b0979ae1b83fb422e02309f761caedc628601efc6c042e663ff99f36756627d9327077ad9761311a594 WHIRLPOOL de69a9f693cd2ff6eb96078ccc80da6cb9f506f97d7a284387d43cb99dc56aa1e43781b883cf83330281fde0677b28128976b2788a8dcebc45effe3371302275
 MISC ChangeLog 3180 SHA256 098c420e885da4c9d40a1171abbb974372d622da774fce3b983c9c94afbccbf3 SHA512 0f59b989b12cdf4547a95a166a20a9c9f3ca6756ed0eb94e225df48081e232978c6ecad303186036df827779fb6063a068d14868206b037b3990b2ddcf5e58b5 WHIRLPOOL c14e53364e3c2afb131435142c44d8ee8b48f8845158e814eb41e092ca29de2752009944261eb193ae9bcfa8dccc04422ab6c9cb8bc8e857e129385a8fcc8fc8
-MISC metadata.xml 160 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 SHA512 9cf2605fc15b592515a931de7a63cf02d1d5ee27ecc3cd022f8e932791008d3ae4445088bebdb48ee0d46e17ebf475c19b15a05b07528f73c351a9846cd3920f WHIRLPOOL 6eb76aae8263e190c7a0a82968b1d7db2f4fb65bb9134b6bad1a5b2d3a513e229eebf303d9952f4933e758e42c0914550d58d5e86a3b76dbdd6df0802dec8e7a
+MISC metadata.xml 247 SHA256 2b0128d2323453262e34fabe2f1f4b711e13e4b2d87cf122d3036e7d49c21690 SHA512 6065cdf25428f0a34c89422329b7f7a5fafb223ee07ad095b682556ffc80abd8dd5ceb5c9bf70db38efcff95bec86798a5e74b11b945837f5848e45c646247be WHIRLPOOL 9109e1e5a327d0c6550814afa63f45c654c80e9ec526329fee44288d7fde41a9d59176364cbbe13e8b7c625d4ac6d3a8453906bd74be26573ede205aa9e7bbd7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlU9EUoACgkQCaWpQKGI+9S6+gCfQWxb22/jo2My4W7YF3nSQHCa
-ZC8An20BIyir4yG8KPMtT0nLz1ZB0ecv
-=beVi
+iQJ8BAEBCgBmBQJVfwxkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiqu4P/j6PnKrkAyCE9osfj/4xY9nt
+YdR9XWdKk4Yxn5ikN8zryBWU3qXSxA/uOu3Oq9RCb4JixzJOf/WKyaCklbHMmBZB
+E9GlX1ExbymvUa/IkwIwrQ4PRl++z/hVdZDtA7Ji0ZXkaswCT2fLqNDANVrWuTfh
+AfYdWNpGPhPbfq/iR+CAjKpvfx+jhyTDIugefHwQWR6UOxjmxpen9rwWZXdZFoLm
+pefiGsdh48t9ilpitBkMcFM+2+Gk8v4y7ogJl2/plJoNby750Z8amMSEnuyQycNg
+kawJg5cTABkXc3mMJ1eOGmwomY1V9WILPDU3y7meiBKg+LWz3MoyhswuuXapytu5
+Ej03MEZJX8dihddho5WroT3ATRnojJUr9OKvnUTYvPUH+p3miPENZ49zNg6OSNLa
+watugnNtvOHV5JygySCvp4pbXu+jZlYn8Qtib+XbMTFmFZkMXdmAtsb9A+r0YAB5
+Hgu2Fbdepj4A4dFIr0xxgn5dxH3VtI7cxlaqCxyFWYbWeRqrW3Wfm83DpihyiW6c
+AV7hmDcW+JOTFW+B9U6IlwKLyzzWBqx7eUBpAfAxaupHxKCQkrCiGPGMEI9GJqlc
+I5Lpz/odhNXV+qVSxj5SPWCv/BPzAdFbSy86SWCKHQBhZCYvV3hYEWZ4bvz/f1xU
+z++bALA+jc9oBIAN808Y
+=D2DY
 -----END PGP SIGNATURE-----
diff --git a/net-irc/irssi-otr/metadata.xml b/net-irc/irssi-otr/metadata.xml
index 6ef15e900f17..ff60bc4b5e36 100644
--- a/net-irc/irssi-otr/metadata.xml
+++ b/net-irc/irssi-otr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
+	<herd>net-irc</herd>
+	<upstream>
+		<remote-id type="github">cryptodotis/irssi-otr</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-irc/limnoria/Manifest b/net-irc/limnoria/Manifest
index 88ebffe0a17c..f1fccdb8f2f3 100644
--- a/net-irc/limnoria/Manifest
+++ b/net-irc/limnoria/Manifest
@@ -1,17 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST limnoria-20150429.tar.gz 931326 SHA256 a9ad09f3820bad5ed57cdcfa39aa78cd4c698b1ce5860cecc7a722e5b44d287d SHA512 3e6d52463270624506b733364b212c784a730104f4c6760ddd002983e42a17b1815ec6bee785ab619fe1f17f62b90fa35b3d55dac412368d85c392adacca1620 WHIRLPOOL 0cfb169d371a5595b52a404424c5a2134f3a2a03da77ec507cff60e1dbc3f92f7c88c309807c34d58a0c168ad65245e8349e364f4be9e75aa92963640c2ab52f
 EBUILD limnoria-20150429.ebuild 2746 SHA256 16d7a8701d243445fbc630cdcf38ae0cc141014579e9a2707dcae5409305ea44 SHA512 faf8df0968daf138d64d7853a1ee69e5bca97114e50599154dba9efbbb8c4d4097dc292c4dcd2cc6a0b1c06bf784bb754790f5fdc061fbcd2f17d241bf787ccb WHIRLPOOL 8812b0d15eca068dffd4a9cc36cacafdb3384c4d3a521a8dea897cea4192c3c0af3d08cb5ee40633735f1a8c4461885788d1960997677bbcc952ce1a7604f1d8
 EBUILD limnoria-99999999.ebuild 2746 SHA256 f5df56159bf2c1fc87013d8c1ca5b3b981ca38b36a20d86c69eb32c8eae326d8 SHA512 2c5744cfd4af9e7198f90ad44f92c3250fac9cdaae3bfd82872b3b8c99a3fcafbddd452d91721ecb3d87d462584d812b91a044bf778310cb8200c8ab6dcbd586 WHIRLPOOL 4971b280b92b7ad02bcbecab6ab0a2cd9e42312d7f8a2cc603a98a30c3f68418855cb8521b7750154d98474017c04f4f7915054bdf9ebe28d28bf90480ed0095
 MISC ChangeLog 1346 SHA256 ece643024fe94530b006cab6e2e97c9ea75c622c7a70dc3d026a7ba5d2277d17 SHA512 0397d67646ec4ea9fc9b4d77ff9bb1faa5450787482e9085b51e86476e34046500d86cdd12789f57f075a036f9b1c9b2f6fe60a8a9210c8a236304a328ec859d WHIRLPOOL 592f7dc100f1af3f9ba70589a009f8dff1f2ae5fbfffec5825c395fdfe033363ea758b3e3d6e0194ac4447984328b80d88a54ee9b05f0ee7bf1d09ecd8e49692
-MISC metadata.xml 477 SHA256 a6eba8192097a9d15384a11b5691ded2b0a83d57a4006a78a2af0b03d6f00423 SHA512 f8aa94af426f01f436e7ccb60bea47343216c1b45232825a278b5f7155a9cb98fbd546ba74878529ffc8a9c28f1d0e78335040cf4d101427e72060a05053c83b WHIRLPOOL 40f8a2b5011881da7a35f749cf07e52aaad830447c62ce9f15e88f54c17ec3a34a7c1c3a3c9ebe669bb54e7ba49efd0585e4bb61ab6fbd121026d49259945750
+MISC metadata.xml 558 SHA256 be8e732e1cfe6995260fdee0989b2bbf43b57bee6e5352b49a816d09c7665688 SHA512 c67a5226dcdf15ff21e9ad86ef273a42b65c15f7c3925a9e5667847e7f7f74b2ff4fd4cfe2c0e236a8d684e8f344899de003f2b79286361d08c581679ab494aa WHIRLPOOL a90f52e159721a5ea4d4b81d7412e0c47f7ef0cc8058eec8a515091d9a1e1b09bb7aa7ad26d96ebfb96241f0264fb0186a7a70111004756cc3540f7905f969c0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iKYEAREIAGYFAlVayfxfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
-OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw0MggCgtR1h+y1mZI4EwYQ8Sg+3S/y7
-IV8AoKg6X6P4jqoedPCiDVMpSBbOS0QP
-=TFe7
+iQJ8BAEBCgBmBQJVfwxsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmifXgP/3zfDQwQ1YAs24oDvmBsMbrT
+o7lR2Wz9qGJrSZBE4zallWeicgVx98eehLQkjI3PF6hsRY9vkfHRNhOtItBpKVU2
+mSSrocI29LtDCLQcwzHoDJ8gt8//Snv8wMoZauHaCY5bJcr7n5AU1FW2XqHoNIQT
+2WKu39TdkRda89NO5Fn6/tDjCb+8myiHOr+ufqEyUEW0h6+pU9SHbpFQPSCCWOhj
+89D72usPWwGoqLxlJ1Jb8BnMh43BOMP7koYoXC/0ZE3ejMze4PHa/370ZG6CgqPL
+qYTL7DJoATD/jdulOe5ZY1dU4F8/p/Cp5+LSCHIF45ZUdTWax5hGtBXcShIyI69E
+l88QKIX08bufU6iRvcvbBwai2gSBxtlMoEJaNimV78KIJpafhVsccqLUNSlfZnNy
+6h/0OM1ocf9zE0MjyyEkk69j6af8dreDII+XiOCXjg+q5jHuXEEUqn4/eC8wK37I
+Ir7635c7xM0SP1Ew8rLjZJ/XsQ95ngZELbZGA+8g2gDanpxTByncEZQAkH3FejPz
+CZu/mwQo9iW4A+ZDfhuFpYTZPIlisoNFQHgNhBJAT8S65yUf0PUcTw+wSFbvw3Jg
+gXVlsxZRyDlD7Zjq+10eWhEziVGh25362EwrMikZ3zeEerUC50J3kvfFgWXwxcNi
+l15It4p9WtOf7n5ZaSUg
+=Z5W3
 -----END PGP SIGNATURE-----
diff --git a/net-irc/limnoria/metadata.xml b/net-irc/limnoria/metadata.xml
index c9f7ad0ffbd1..f51fe1db5ad5 100644
--- a/net-irc/limnoria/metadata.xml
+++ b/net-irc/limnoria/metadata.xml
@@ -13,4 +13,7 @@
 	<use>
 		<flag name="crypt">Enables user authentication with GPG</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">ProgVal/Limnoria</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-irc/loqui/Manifest b/net-irc/loqui/Manifest
index 759f29ed8113..027567895516 100644
--- a/net-irc/loqui/Manifest
+++ b/net-irc/loqui/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST loqui-0.5.4.tar.gz 912853 SHA256 4417cc32fc2818ea0d7aaf44776d0448a44451728133a6a83d696507e9ccdbbe SHA512 01036acb81f9257b3efa146953a07b6e9b9bdee28b6afd2ce9a73c470131a18dae58c5c6fe5dd80528717219ffeccc4549db07da42f8746b37c0d31a6e15a694 WHIRLPOOL 7130d3f29f5e3bcd5d9a8acc90a0347062b9a01f796c41566168d42b0773ead06ca5e43c6cae77aa5e898b8938884a5ea60981854d84fa41ce5e800d8186bd61
 EBUILD loqui-0.5.4.ebuild 613 SHA256 c2881425bdc761ab11678ea0b2d20d53c26691729f0f957b2f85d298e7eb76b9 SHA512 448e3af63ae8c0d4fd3aeb85e9253c728aaa09ff743b4876b9c8aca123f54aae18dbf64a803380ae96bf572d04a5e5183b620e83c72fa8152f219b3bd98bb23b WHIRLPOOL 1802277537749f4c11d4057d73c0415f3225c1609d1964437dd78f220006e734fe8a6586c07ea7c5d865f5758662e4559da95d09dc2eaf12c9680437b3a2f089
 MISC ChangeLog 7111 SHA256 b2924050af8c27ecb3c1ef9c2e3bc0171e0caa41aa0ea216c8548499d9d61187 SHA512 ab56b67245ccf09a3778498457e833b1cd60adfee5a93fb22f52e38792e46ef5f294006f7f8d3e16ccfe3531395f730c9d4b58eaee79456d8adfad248fa758be WHIRLPOOL 9feb4df83cf29519bfb0b4759b06f33183d8b2f54a3b2ee9ae6a466d5e79ec993e7cc7c989942b18763c56edbf3c3949b29cab537635dc991a36f31964d34edb
-MISC metadata.xml 160 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 SHA512 9cf2605fc15b592515a931de7a63cf02d1d5ee27ecc3cd022f8e932791008d3ae4445088bebdb48ee0d46e17ebf475c19b15a05b07528f73c351a9846cd3920f WHIRLPOOL 6eb76aae8263e190c7a0a82968b1d7db2f4fb65bb9134b6bad1a5b2d3a513e229eebf303d9952f4933e758e42c0914550d58d5e86a3b76dbdd6df0802dec8e7a
+MISC metadata.xml 234 SHA256 058e8cfecd6326052a0962fa3d2f95bf63082c5ebb19ce909ce276b73852da70 SHA512 3c96b7a7e687c4b156e57c7c3f14f3c069aa6bc65ead1fbc4c804dadf71f007f59931d43deb23ffecb043fd5f15a624aeff75dc75688b0e7a3d8e4124cd479b4 WHIRLPOOL aef0d0756565de82bdd2b12d1fe30e2ead52768d2f7121416b36fa600cfb264511af3fbc6695cb9981cda66f5f69072dd92cb8fb6d693ab3d9e65e0b49236cc0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn28kACgkQcaHudmEf86qr4ACfd+OKIIbY+msHgOGPvDQTKXBI
-JGkAn2ifcVWSnTnBqt4o0wk/AN/0QPaH
-=ofE0
+iQJ8BAEBCgBmBQJVfwx3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi+cYP/0qxcR3FGPP4oXTEJvkZ5i9L
+/ko4KfS8hiB9Znj7LQ5/pKk9bG8229tCdUSzay0DGJ7Y4l3LMb/qztjohpBXk7em
+nGv1OftqqpM/zIBJP5cUrThA2wW5zdYDlOds60SFVAlYqcv0S1cJB3eTuEJSQBxp
+i3BLxHX2be/j5DHYmlvCzqD7f/D12+n/K2lGY0sQfVNF2lZXi4fTuxmfWLg4CQX3
+/2+pmJxUkfOg9hbv0ZOybzQ0oSMZwBkvSBqHU9vCLPnYAM9XNvyB/h1+7Jf+LOFB
+R6KaIsxZVo6u+//s5z2qgm2fq0vV182c169F0dAVkaLMb4s5u1sT1/pKbbNPSZCM
+X0uTQCNT/YxgY33OgPou3pF4ULb6epO6Wf1BmFfDGNWGPx8yFLCNtmJThT8Uk2m4
+s3yY0rEJO5AVn94rsXMetMcrt6dtAKeEJl3FaSTksdLQ+R5P5jggB/Nh4GxG/Ubz
+UVpr3fNNthVcnMQsTkSbFq7Y1ZWARVmas7XfjGCiFMSSe4t+QvgXKlMkjKmbcrKv
+eZLvgeR6s1g7+EKVQjxsGB2t/c4LnpnP3OBvMZBGwAGMFkBw9he/XXcEXr3XBPu9
+jKyOYeIz0G1B1vff9FOJEBoJA151ATBVFLHZDARIjx2d7Np1F+zu03IZQOKCkxmw
+rrq6myMPK456lQaRmThL
+=8jo3
 -----END PGP SIGNATURE-----
diff --git a/net-irc/loqui/metadata.xml b/net-irc/loqui/metadata.xml
index 6ef15e900f17..e3b6a0abed4d 100644
--- a/net-irc/loqui/metadata.xml
+++ b/net-irc/loqui/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
+	<herd>net-irc</herd>
+	<upstream>
+		<remote-id type="launchpad">loqui</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-irc/miau/Manifest b/net-irc/miau/Manifest
index 9b6201cb8d2c..b8f2952d0fc9 100644
--- a/net-irc/miau/Manifest
+++ b/net-irc/miau/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST miau-0.6.6.tar.bz2 188284 SHA256 5409fd19748fe0eb98b9975270233878d02718538e9c3b438fe0b74d61465804 SHA512 0f61eae1a8c1ab60aee63b9cab482097381aa23218811e228f6bede0a73e194b4c34ac9add7d85c7160d74da25c840c1d356fb6afae31c10d90d7fc01de5e170 WHIRLPOOL 52d09103743db9f33c3f49d2daf8bb6aa3f45a69343c5bb193fdb3651e3c0ee191a9284d7b83b74d719625790fac2e051a669c1aedd4fcfcd66d1d2c570ebfe7
 EBUILD miau-0.6.6.ebuild 1822 SHA256 254081035d83905ff3f61d3a031107f132257e58717184665c32f21270cae7cd SHA512 11a088c365c12227fec313cb27321341d98b63f174d5d19322d9e59976246677730faf5936ff22f339165396adadd1160f435b466c53ac728ab7c0ac7f54f600 WHIRLPOOL 71686ef0f60bbeb4914837265fb95aa946050be3dac32ab7b73b6145f325103a60894713d2bd620989637bac1f7215948a03d76a9729703b7219e341f26291d9
 MISC ChangeLog 2286 SHA256 f0ea90bdbe81e6aa78926b663486d935f8d731a629314d23b5623b985f97606e SHA512 fa9c6b7de586303deffa17b793c37f41cfe965ea4c5f1e660558a715794d231168a16c927a34b30f4cda9e67f94c33e0a8794c19b638b9825bb9545af352a2cb WHIRLPOOL b4962ac3015c06b249d230302504f9162a109981eae62997022aa2d7a815e618c7e3b21a775060b27d2e615ecfa8a3700f513b94f575fbec4ba4a095c269f65c
-MISC metadata.xml 160 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 SHA512 9cf2605fc15b592515a931de7a63cf02d1d5ee27ecc3cd022f8e932791008d3ae4445088bebdb48ee0d46e17ebf475c19b15a05b07528f73c351a9846cd3920f WHIRLPOOL 6eb76aae8263e190c7a0a82968b1d7db2f4fb65bb9134b6bad1a5b2d3a513e229eebf303d9952f4933e758e42c0914550d58d5e86a3b76dbdd6df0802dec8e7a
+MISC metadata.xml 235 SHA256 2560afcb126149a4f887d1d7b0c824c27d50e6e52dc2c85ef33b8e5599333cb3 SHA512 d82afc06aa293a68790774024f11c06c7f068f1c9c71cd09e2794d9c2b3ed15e852c599e197a7b6e578c3b69110dd36922e85bc049d99275da694366019a899d WHIRLPOOL de7b5a5ca950a87081c18ef440d2b70578489eb900d023b5e8a000b2991ec350d5cc463b4e0dc3f9ae98ecf042aa7db0260e0538418c097c8ba560c2de3d2705
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfwyBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiJYkQAKQHQ0Q2eUN181Rml6dPK/Rn
+9lgfXVyoJM9aUfSYi0PEJrxayvVmaoZWUtngY94QtfyDQnh7BTSBTcg3KKTeXH/W
+k6gZmO3M3r07yU3DZYfbCgDk1Gogm+NBhAgGeK4AZemy39iD6Fs6In8EjYdfkk4b
+jImOGXRtA3FuWLGJQAIZRVqFqXS0pon775DXxPu4f7y3pptCkLRpUC2SP0BY3XhU
+CvaIDAQltWnQuVfLLs0jWZQwLttKGbey7wE5CP7hjMXLfCF/0w8lRj7MNyNDiYdZ
+bL2Won4OOjdQb3vHzAe8cqR2/LObNh1mVHSRZd7y7YJEzSdMkcdIs8lGFIqJX/Eq
+dalCQ/ZqjNvaibg3opVerGnnbtc/rcvR/JOLL/b619OYy29ZZnZAcirXT3MxeItg
+GyM4F4QfJXsTMRaUFJQhlwj89A15h29f5yxep7b7JD1x7+yy+f3xB126bcOUTuhl
+/36051MkeCbiy0ZIrXLfNRNz3liI5gcLLo0O2diQKoGmQkFuJpS2/WpDDM5r7qj5
+86Ly/bz0clApp7KDrAhiSs1AXRpILJbuGHBsbOq3FL6qOHLVORQoSBM7GG3Eg+Se
+bkew/KraZE2Ykig7PUcGuEsBkyu5yGmGorvI1c3GJxutudnwRI/r9NjqjebHPCWB
+dAGEYbYYKwf/BLAig843
+=+H0j
+-----END PGP SIGNATURE-----
diff --git a/net-irc/miau/metadata.xml b/net-irc/miau/metadata.xml
index 6ef15e900f17..15b5f1e060e5 100644
--- a/net-irc/miau/metadata.xml
+++ b/net-irc/miau/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
+	<herd>net-irc</herd>
+	<upstream>
+		<remote-id type="sourceforge">miau</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-irc/muh/Manifest b/net-irc/muh/Manifest
index ea4df568c898..aae9f4b471c4 100644
--- a/net-irc/muh/Manifest
+++ b/net-irc/muh/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST muh-2.2a.tar.gz 130672 SHA256 d5743f18edd3dbf044a7844f32ff5dbfcda696141a7d26d182bd4394b6823680 SHA512 2e3ba080f420cf063627d4d9b1f4001c76575efb1d3e99ff9c5eee4a483d5beda6e326f0c0d60c3d848b78cac092aac51a98cabc351760ccfa38fe1549c4b4ee WHIRLPOOL dec6f1079ccebca6ee3d3265ceb75f3bfda25d1dda53e811544ff79281568d3bc758f3aca713d8520624c3340693fbacd0bc69e034c2b27eb49d406141f7870e
 EBUILD muh-2.2a.ebuild 890 SHA256 f741ee60de3223bc4a4a767f39a436ebc66ca200b90d20cc60d4e49c061f6843 SHA512 c94ce4cef397e2462fae115e636359f510c6b11615f8cca089153545b0ad8bbce752b7d5061e6e5542e1e90f30dc72dcbb5009e69ab6fe78db8d36aa7c999c50 WHIRLPOOL c0f1296111b0a45a5a0d6318bd9ebea2b9eb5cf91e3b8851dddf702799dcf06b70bc0d670475d22228f21ed1b137ad3bb6afc3353f1333690ccb085c10f5b8d9
 MISC ChangeLog 2300 SHA256 2e3d11c5333d45915b268d99fa9fdadfbab884059ea2e9a8ed8b44ba83a9616c SHA512 1cc3d01cbe44a8c76e2d17063f5ca55a7ce1f1160262d7a3b073d4d26c7fbc81767d34420bad5d23d66379ab68ea9f44ea935c665330c79f7511eadf81b9500f WHIRLPOOL 307a9655971dd178602fff91e9a027652111041e8b2e773d7715835492f72001350ff2055164cd9f74d4b8e3122c688569f95e1a16ebfe67809033e82c896af4
-MISC metadata.xml 225 SHA256 c83a1ae90d01e544d34713275c9050df0d8ca68207fb242adf78c1fd8aefb4cb SHA512 c8051db27abbf48a81007d1eebbca57223d4e4c78fa2e3e73fc286d5afa70a75066ca79682a35a7d7974dd05069cbd0c8b82c5e7cc4ee59ef28014178341dc99 WHIRLPOOL 12b96db05a609c73283c20aafb72463a4d046656131963d0d06d35d1c27573bea57a3de52929d4d7586be6da8e9251ffff4d777a7470ee4f0a70ea1c813f554e
+MISC metadata.xml 306 SHA256 a8ffbdf10e422dfab507b72617a425934d10b25c915e56dddd638bfc6cbea511 SHA512 00e4a1d3b2c20b6822790cbac68abd738edee09374ea522741bba74b1aad68dc8ba9a24f5bd995f46aecc5014eaac4e4e2ec2ccdf816eb7e6f85a735b8a05d5a WHIRLPOOL 5aad786e6438999471e44b72fc6965257b7c3fdedf8492a7d33b9f40c0161827cf3427a76c5172c2049b2851837fe728523a3c0a505b097f4d669f2444616655
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfwyNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiPVwQAJWG/mri028m1hhXYarFAq/k
+mbgJXClIgjpmexKXeW7LI0i7hqykFKYxyu2AkLTR3wW2WcpkjjKh7jiDG5pTteE3
+7Ss2hru3FWyUf0OkW/dPafN4LFQkWlrSHhWS0rtI+LH8J44WVCSjv2PuovClCFPW
+iNLYkWJkaDGxRzK/w2nsG7YHVKmEpdLooNmkEbaLk0L6W6nwkfD6XCe5b/kaSj5T
+/blxFiBfy6y0BgRcxciY7dU0Hw5rpIBSxtPd3Y3+0UplMHauvkp0DC+YvrGWfJMX
+abVwax39hHn+SBxsKTJHJrIK4NRB5cI+bGIGenD0HtsgDcpM2ALtSydV7SsjFPZJ
+WfHaqBsTB4tkh4I5+b1GTRnlSVTZvJLs392jmPTV/Ld9gIuBZ7wCKNyIPvVFmPRD
+LT1wVuI5aTtYTWhSJJma2kGF+kS13R5Qvto0awjiNS11fAppcSJkEZ5/WnDpIUzN
+wrfmMwp31iUD31rtgAwTgdr498lb2BfCJpGBDhDWXGGefFDyU0XXkJcQMvNHcERs
+g9nZD21fsIyJJOcu+/JnhgmjbXK7nUz8W8+/eKuoSyZQnJO0ohLDvTH6C0PbijNb
+Ut02iH2rjunPofeFkwjemgeOWzGRPqMOYXVNoO08uCvnnBBh7iKgM/Wp0NnUobO/
+rVUVexLQOjoXTRmIr+gQ
+=2L5s
+-----END PGP SIGNATURE-----
diff --git a/net-irc/muh/metadata.xml b/net-irc/muh/metadata.xml
index f324dbe6106c..f0844b37b1d9 100644
--- a/net-irc/muh/metadata.xml
+++ b/net-irc/muh/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
-<longdescription>
+  <herd>net-irc</herd>
+  <longdescription>
     Persistent IRC bouncer.
 </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">muh</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-irc/nebula/Manifest b/net-irc/nebula/Manifest
index 7986d83ccf6f..52f68a8fb1ab 100644
--- a/net-irc/nebula/Manifest
+++ b/net-irc/nebula/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST nebula-0.5.tar.gz 115950 SHA256 077f0ee97a578523df1d06a50586bc2dd8e5edde878db7c05f80521afa57a558 SHA512 ae97aae4e878b6a20343ac3b8be235367cbce990e2858a59220f477cd8f57b4aad28527454c6dca1f509675b4a48b5f8ace06c3f867b1e0458126f418911ef83 WHIRLPOOL b2e70a8cbfd0f8677ad7894d5bb9aa0df84e51295abddf7ecf04a69418b911a2a1491532b108937ccd58c87e843fa40be740b01c1893b546f9aa5dc44ff9900e
 EBUILD nebula-0.5.ebuild 512 SHA256 a55447b341d74dfdfe20a637bdb6a006459abdbf9da79d50963703fcc4404a1d SHA512 2f7d5fe6ad1dd8699b8736fa60563c4668035aa8c798ff676dd31fa4d7c9d1b8ac89d27e6f113f3ecc4c8e6519262d8a10a1163ac2025c48a6737dbe9fa40b9f WHIRLPOOL 448209c6e0e9af9509af12e201fd3ef60274e8b87db550e15820957bc5ff566bb5491ebcb71b7458f0fbb675012bfb1fa0a015708857a85470076de4cf010ba1
 MISC ChangeLog 1288 SHA256 d8d39d02249f4ad6f1b9aa621fc6a654955d1e90944a64e512e4f0cf69dac2bd SHA512 cfd6b99c67db24b9627dce22d24c502a59921489436ce9f44f47db6b62847878e72f13d5a31326fe438b586efc0369c52aea258c0854c9bd4f5be3fc71cd9302 WHIRLPOOL 5abb98494da23e898bf7b6f30c8d2f2f07a8232031f779a7448cb6e8083fdf41dd626babf2a9f856240eb3f4e30514031e2cd2159146ae8ecf09d08c41fcfa5c
-MISC metadata.xml 539 SHA256 6a55acc2739482fc22e7503e2e4c0a016e23409afb3508115cc3ef1011ca81be SHA512 679958374254cc8e9cbae7505d330968a7ed6f6abf5c4df4b6727197d73ce348b5a0fa83cdd766089e5d41eac259ad932ddab48db32cc9902b235131f3fe7d8c WHIRLPOOL 9837c6ab411601479542659c9006a7e61eea5095b0d2ed1159dbb4ee51562c4ea8df96f6e05a67d9c129004d056d5bc0eca53a583cd0c57f18d29a99ab8f249c
+MISC metadata.xml 621 SHA256 c96b36b31ebc29f289e97bdf8dc4f0626aea4607c60748162ba43216bab3df97 SHA512 3fcddd5b84dba0db6e08a636f0028e7f6b05cc2e0da232a63282dbd3c74b14efa5a3507681a72b6f8e9324f16724c3c9d2931b12c02a5b05119454df6bb62dc1 WHIRLPOOL b5222ed1e40d92cbe767f2c6d4bb7c3c8dc2b0b3e9bb620bba43f8384cd9640b2d29bc2318262d603d04be7451458002739af1971f9641c09e1c57a9edd01051
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfwyUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSminrgQAKt7YDabZzhV88xKWXLGNBzQ
+9eVhL5BHW6zsK7Bj6bXz73C9Lypv2sVUugq6YMA8rdaFAHJUrobcCSbGOGAgae/V
+/cUHR3AWoTpwj1/gFwDyLCMigtM4yxpf09bIRdbfL74yfKgcPeHvlr8Q8J7DUoTU
+fL5/pcfil5EeL7ECFOe/jdHqefJXnJk+orCrPTjwkitntHeIcAI4g8A0nBKw5PE6
+eznP9zoUmQujgian+uQQd5zEoD9p8/lf/HXhQLt/n1eidnXAn55sjcv8XVa9wx7r
+OmjdOIekV75mgoIGrObaZf6b/yq/gMytuom7qihobCfq8nwuJc6wQprxFCefYxnI
+NpYXrCL/YH1q9JbgJIT2na5tLyQVJJfzuEszexqYBH1z3anYiEdp3AfWKM7kQ1wR
+HKnizH6LEBSPSo/6ip7MKUQin+CQdrQ+XH312njr6OrNDY2OBj9EK2lzVG6nwuCm
+nrTdIcrY4u3I/YOicYvT3N5kOdbt3sQeCCpqHLSQQ4z+e7BZGk5pBBje4NtJtv+4
+lc2bA5vsNVcyguMNrSuiecXAI9czzJ+fZ3BxOWXRMYKj9S2aUPN+isY+e4FvgBs9
+5VvkZPw73UNF8PybTTE6cjK/BhwA6XbuSf5sbCCmQDIfsLBxvRfDH6hN7ubvsfed
+rP5EXzV9MtiqmgGoEx6R
+=N6rP
+-----END PGP SIGNATURE-----
diff --git a/net-irc/nebula/metadata.xml b/net-irc/nebula/metadata.xml
index 60d21c74f50c..9af2cb65c5fa 100644
--- a/net-irc/nebula/metadata.xml
+++ b/net-irc/nebula/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
-<longdescription>
+	<herd>net-irc</herd>
+	<longdescription>
 Nebula aims to be a graphical IRC client, aimed at the unix and compatible platforms and using the motif/openmotif or the lesstif ToolKit.
 The goals are
 - portability to various unix systems (planned are already Linux, *BSD, Solaris, Irix and AIX)
@@ -11,4 +11,7 @@ The goals are
 - clear, non intrusive GUI
 - security
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">nebula-irc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-irc/pisg/Manifest b/net-irc/pisg/Manifest
index 027b421df02b..9b924155158b 100644
--- a/net-irc/pisg/Manifest
+++ b/net-irc/pisg/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST pisg-0.73.tar.gz 236539 SHA256 979efdd489114c10360dff9c7c8fdc287c126508e65790dfd0d0aa6fdf7d7c3b SHA512 290656fc556090fa8a263eaf123bad8e12b0ac50a2c1eb4619c50faf70fd3ee8afc7a8d97dbc4ff6338dd0fa9f73f7b19c60ca996b6612def95f1c494b3ef91e WHIRLPOOL a958d4b52fb0a09ca444878d1be27da55c1c584d5702cbdad7693d502d2aa01d1103eb1dbc1ee6276674d8bc785bb42e3088abce21efb3fd89f5b7a333cc9038
 EBUILD pisg-0.73-r1.ebuild 1089 SHA256 fda169e52b11e5896308ee83ebf0e3cf263724e156ed8a99a77a62477b37bf1c SHA512 2a2772c91553b0a528e613a176a2ac385c029ec888fea75e50345ee24155f65fa14352522d54234b0c46577d4ac66deddba23d12e3df1f28be2e8b8808dc6734 WHIRLPOOL cd408f4b973c0fae2929bc28a9de01461b75f6f419c5f2eb04e9a98ad8c554fcd841072a8448f90b3f9edf9ccdbd43da589c1412210ab46c4b902f7224518942
 MISC ChangeLog 8403 SHA256 c7a58bbb00beaa5342a099eb913d3d6cff3b7f501bf3a5338edc4777ef5a6ffc SHA512 4fb5cf414481dc82784a48fcc74e5c87cfc1aeb33cee51d2ada71490e2809c4152e294b26d8968a906fea6a61c37e8121d3aab8537bc7e146f75bc4ad74584e7 WHIRLPOOL 548be2d014f30e20b553d3ee1605245c2b94bc34e66bf62dab833a650da5e289444798a3fabbc72e63943315e68c103df6f287d2a63a83bbe79be5da80e7b411
-MISC metadata.xml 160 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 SHA512 9cf2605fc15b592515a931de7a63cf02d1d5ee27ecc3cd022f8e932791008d3ae4445088bebdb48ee0d46e17ebf475c19b15a05b07528f73c351a9846cd3920f WHIRLPOOL 6eb76aae8263e190c7a0a82968b1d7db2f4fb65bb9134b6bad1a5b2d3a513e229eebf303d9952f4933e758e42c0914550d58d5e86a3b76dbdd6df0802dec8e7a
+MISC metadata.xml 235 SHA256 905599c316248aaac440de29c3aa5ba58f2ac2b62f609908cc71d6b12a087818 SHA512 3344915396be86847b2b5372650c86c57cf3746e8672062f1a98c9a88dd5168d25c6a8545336d34b9c47cca6f02ba2de19e63403536a47924cfa9d9b037f5c5c WHIRLPOOL 648e0de1739c2e37cc79e642f0091640c731987ad7c6e69c50bf2be91c2516486d4c8e3c3f8d562cb9f20ea75b6a96910ba63ddf690615e65c84afb65033fb11
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUYUExXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc/Z4QALHRgiV0EWJubcoiG4V1s8Pn
-daI5l5ypUgoSeLcQn0qBZobi9n2aE6dRT9KEZyBW7fWssgLoE9HzkBCp4pX9y1g5
-S0l69wYYRqyLrZf5ORlxucnfJFmrptL1VcluObuTI/l5eOQ6RAAudqd0SgOkNN2n
-cZ4fDTEWzHTdW0Swck855psJW+T9wkK3VV57eUxK35wrJZlFVYnW/R659DPNwEcL
-22ufSqQD/0o7Pk3egWjEI/DWVTclMushDY0+DosWQk8b6gOp9liT0FTSZiJHgVFj
-+D5NWUrMkbj7snDvb1WfTNe9+YSiMPthihQTwzENDnE7GGPSop6NV567hugvOnDj
-fpThAUoNSN0yAHcAWVU5BrRzhFCrnSDPWx4pkkUx+q9p1K4cqx8TN1rABBwsTkG4
-Q1utJgknluT6PeahvJ5ky8Y9fYw9zXs3c5oyJryiOusPNCTGDh9Ccwxzhqv9oJuN
-F3Ckst1hHqA2CxQlWzlC6YAtbIELfLGZE8SRflxTD/9+/Mr4Gs32BW4C2EkcZWop
-GF+s94mQYDF+FVFTR517MVaergtHI6+POfA10MDBsLnFDtlIOg5X0/f4zbh064Wo
-uiTrLT8ORx8skE/nqeJOjrJBoUwps/35kmWwqy4lvdUsrQ2wyS9Z1XpMwoO7NGv2
-4DOOuX0x6SxfVghR3KVZ
-=wraH
+iQJ8BAEBCgBmBQJVfwyfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiWGkP/iYp7COeQFSspFJkM7ukda6S
+V9SrcOU/OR4chvfIJykbNa8k+5+xNcBlR+XkX+hSzXSEq02WAH4sRXOoF7dolp+A
+asi4hiC32kqapmHqAUXLJS8OW5uanLd8PE1JQ4zhXLWHairq2Q5pvxqVA9rraipU
+YChwaGKzgizR7+t+rnKyZ4bM4XMOJA/5LJzsEMWlWd+P3gopRzClMLgBKSbT51yr
+ZpFXXdx+f8dTgxvhXwzNphLC2KsUwkFjiwDWBzQ21VdDzXJ1QdG7xtyDzcDgfIOR
+kBTXpUaYfd+RYh9WZnytqQnE8m8rnmnLT+WMU2P7z90QDR0wbm1/ZKe5czEBY1WL
+vY/q0LHmx7NEM+RgTe+Ubr4TTgvs7PocCXkDjtlD5VLa0t8dXwWGx0UAHvfEX4w+
+czzQudGR2kSlwUgj/KDy2fGuiX9UcD6IZxvyhT1KhEoadlTpf3rEfVJDm2sYMUKx
+DBZFM8UH9dl6HeegtmNzHjNQEzRf8TYHRbw2GRZCbmTHqs/Oo7DvODX3cn2/jm1H
+Vj7cSjlU6vz7aqUi5uqh3kH8SlHP7C1hpD7Q/DJjMdlv8eupZ7pCd31h2tjqWDKr
+NSoEEVoEm0ij12uznAxOB+6CJtyQCbkMOXWgTFJWas4ibJzN2DcHXUfBYtKDizlW
+T1GcxclgA5DnaIVtXygM
+=WkLn
 -----END PGP SIGNATURE-----
diff --git a/net-irc/pisg/metadata.xml b/net-irc/pisg/metadata.xml
index 6ef15e900f17..a41ad8725cbf 100644
--- a/net-irc/pisg/metadata.xml
+++ b/net-irc/pisg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
+	<herd>net-irc</herd>
+	<upstream>
+		<remote-id type="sourceforge">pisg</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-irc/redirbot/Manifest b/net-irc/redirbot/Manifest
index f4c8c95a9cdb..897ea693e80d 100644
--- a/net-irc/redirbot/Manifest
+++ b/net-irc/redirbot/Manifest
@@ -4,23 +4,23 @@ Hash: SHA512
 DIST redirbot-0.0.5.tar.gz 4549 SHA256 2e09db06b7c29d3fa03989a3e4177b96fdabf9c25f2a73e2928885f2e96df35d SHA512 7cbd7e8dc792527f26f20ec9953ddafd5fef8dbca457a00198c8bb3e34b660be7e0fadf25d755375e5a40acf64bf4191bf6725a077616a8bdbe120200ec198c7 WHIRLPOOL 3879f9f5411849310241aa846fa8a904862815c52986949da8afe3f979302f4e7e2c16c5bc8d20d2032927291b4bce15a59939715d7cbcb2b8ba6e36bb38ac34
 EBUILD redirbot-0.0.5.ebuild 677 SHA256 7bc7b3a3c313ca4e016b04a376727e3ce959d0e1f8483086e13e6a597c462d91 SHA512 efe39a952a0e144925d6e2a546064fdead491b7fa9f1b84675c8bef45aa218283405f4184a528a687a363ef0bd845ead458cffe0756e306cc53883ee57b4f82b WHIRLPOOL 37420d2c81ff9e02ebd7baae3c8311338a429b26d18ede9901f94a9f26e558f782dc9f214ad8a05c638028c1c86e6a90aebdeb386aa48ea0e3838d36b1ea4f0a
 MISC ChangeLog 1031 SHA256 16f4e49b2fcb003965af8e3441ae3e209a40ad994fbfa798ea642b9607ee24d8 SHA512 8221e645c2d2075f74ca40bdd808edd16e1e72bb9957434c583c7817a3bd7f37cdedaa140764fe8c1e9ddca2d6ddd25f84f406cd084e201c44cfcb1f9f2c5f8e WHIRLPOOL c0b55dcf1f10a6c31a68281705a1e2a81fdc93f5cd5b0d998967c26b3150c0f13e533bdb1e1a46214fedaac0ccd7779a27f4593ce94f76f0006e7216e3606ede
-MISC metadata.xml 286 SHA256 97b061ca3ae8621a7f57fbde23ad4d34c1411ffe0eeb73574e84121c89f05513 SHA512 9893604aa2d5be3e2a8cc49b27786b680369d1890e53961886ecc4f3e11219fbca2fc3fb36fe1e73ee8eb71ae0db27b1e55dfb9231d1e938f0e65b91dbc0f838 WHIRLPOOL de81ef36b77509e132fca10193aa3bcdd55c6891e8cc361fddd44a6f1d87a2d5d4f9d52f441c06b692dee0bd0ee8612c3bf48f2dc909a7613b813c389b53e6e6
+MISC metadata.xml 342 SHA256 617c693aa9d545e665d5dc9ad51c7a66c8b82df947c08acec8746713dbb17391 SHA512 ac40796d12972fd6153e3634c0ffca5ab2202ce9fdee55336694d7f29caa919b4a4705a510d9f4bb84bb7ae48da353aad6b9082d15697468b43ee2e84993051a WHIRLPOOL f86ba7c3e5a208b22ffd2dc1c7675c56ea5e050d5dbe31e7de4f55b4b027391a1e23ebfcb883c7e052f97a4c43c42bfc19717d3eab7c041cf1047149d54e5e5d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVcCrlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVfwynXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0s0P/0X24ZplsA9WNpmXAysjFfe4
-4N35o27CDXsWoNpjz0V5I0ZqT1JO+IXw8eJYUq8gCCygy79ZcPa3azZ0PTZHVvfi
-EFQv1f2aTrPyAU1Z++rRXEdq0OP51LwdU0RGM087/6gDtlJbSQ1lfw5wLmF4QTT5
-X7UgJ/IvFifW17LFDuH6pk7RKgyvQMz52mWdwSJf5AfgsUfQfUtTDjBeGHIdsCfQ
-671uvaT9fc6grb6OVHmfuK/W2h9gk1wAIbsRogiqGvCWEs01LiGU8FCf3vmI5VQN
-N5l/ltqC4JFDPAiv7ztNFVJdy5ngsaW0YyvdNX2jxgCL5JKbXG/IpV98KfKW+N5+
-QOO6HOtHVaFsy1dXwdLMxHTTuQLoFdhxab/c2wdGx2aKYhmiaUKZbPsU2wkU450R
-cafN2dvjI3TkMV4+LMfjizKZ8HFRIKWG9JcGRSi0BmcV/Bb6y8jm8cgOZW5MH+Mn
-ZmPmT1t3taCWbFIfRmGsyNg7ZgMF/PHKwI3ZBRbLy0osQ+FXWuj9y8CRLUbh5eKb
-8xYfmD4SOQGRw+5kiStC5DUkdzEo/P3tk3xvFscklihbBf8Rjd/SwbOgtsTNrhh7
-1dCGoX2sJLzmbrdzfHdgJPt2JvyQfmz8USvhNk91Hyt7Gq3RyflHHh+/ZZODlOnj
-5dZI1C1wuF1xf139FV0v
-=ol3w
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiQuoQAKR33Df2ZaphqQX3A8yH9KPF
++l5Cq+CJ3Ll5cH5ES1+JG+wK7spnrm51TUvzI1n3tum3EO+i180b3tICjNbr97e9
+GDg1H32tV53kB+VNEFCGa+RY8PeueogU1KGeJcXgnBYExMW9uHVCRL8ELBwcyKh6
+8CdaM8RbICKVlGpXhbZoCuOwW+PMptGwVo/pRlURbMxdpyiDao4CeoCyVSCBGG2+
+ow9YX2Zgh0FMYo40DU2n1OVZk9avQOKYDzT/Cq8wzrMFYXhfBiR9AgJInbgKaNOB
+r1eFfnD2aI2WplB1CyZME9vMtkDF/oCAH459IY6cDRdJHMZSw4vOIQ6+zIbbsvoC
+iW9VoYMRynOnVh9tFIPVM5txTmGdjd3rU5aiBn5xDYAS6EGvi7sOTeBu0lS8CZUL
+ubsLVPgAbDkJHZRmD2AZ+5b1emgWc0VnLeAUsQd1ZNq3mDmBOc4chTGXWp5DwENV
+EVFVNgN6C/4jovH3vJZ3zrf0cju5iSJWrOcsYsj5zPJ9RS1gZ0Y7Cia25eSjC3iG
+DUfyuk+5jn8WgokFVVaCtq2DyilNsjOc61QYe+MzMxWERHi+wnuUSNRR8zydJ1eA
+DMSjltqrFOZb2XJSqmlPc0DFyTPsv8vIRhqbmIitXV6JfgA/qXXYB1/hTZxz7hbo
+KjQlXmvlABDD4XMLW6Kw
+=tQf6
 -----END PGP SIGNATURE-----
diff --git a/net-irc/redirbot/metadata.xml b/net-irc/redirbot/metadata.xml
index e023952ed09e..96e82ef3a392 100644
--- a/net-irc/redirbot/metadata.xml
+++ b/net-irc/redirbot/metadata.xml
@@ -6,5 +6,6 @@
 	</longdescription>
   <upstream>
     <remote-id type="pypi">redirbot</remote-id>
+    <remote-id type="github">yaccz/redirbot</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-irc/rhapsody/Manifest b/net-irc/rhapsody/Manifest
index 83685909b4fe..d65cfaef124f 100644
--- a/net-irc/rhapsody/Manifest
+++ b/net-irc/rhapsody/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX rhapsody-0.28b-uclibc.patch 382 SHA256 89c0bddf5a60065c874ecbc95d516eeee1248b9985b9402f0e000f110534e7f7 SHA512 6bb29efcca48fbab3e53f0d71f21ae558b3aff14c1ced6188fb3f1ae4f627ffa723d70ca65c4f05fe85943224f784dcb968340f1d0ebe2677fd26e1d25a49525 WHIRLPOOL 26e801fd68b4dec202d5e44944933aad6f528c588b73f50d6b18835b063867c8eb61bab8e70db1a68ec1df9fa50a51e22cebfeac53f7607066ddb254dccab1d8
 DIST rhapsody_0.28b.tgz 110062 SHA256 606d767f9bd4c810343b1ce94492f4aaf993552edee090ec881627b29294b4dd SHA512 1ff9f29d281421b7fe3dcdccbd8b2559572cc6e7167ff9e0f1a46dcff07486115de245055b3d72107f40f40a484d9aef94c7ed21b55a7bdf80094198d69dec6d WHIRLPOOL b8b26234f045b687e68b3fd923cd1281dffcbb5fe2b5b50176d2c08f647e34612fb530cf47fef47c08b79da0ce2ae7a57e4cb4f962dff0ddf5281e849d8d6858
 EBUILD rhapsody-0.28b.ebuild 917 SHA256 669cd28b10b467443f70be0f1e260dba7fcc0f88f0566f382e597f729fe36835 SHA512 1a33e3d9fd2415718fa0ed8c86f454e23717983a907f25f6b5afdaeda2de75830f3e82177066731caab3eca5f16b390be1b3645478ed65e67e616de7a3eb00d7 WHIRLPOOL 4d73f34246a8b094fbd7bc641b685fe7bf776008635ceeb38d9c380542e6b229c754e3ec72f543ce23940ab71431f725f2ffb03048eeac5713d4b252393f6a6e
 MISC ChangeLog 1575 SHA256 b75c4fb3e24ff534c9729c688f0a912549d29ccb4816affc94ebbe8f648284a6 SHA512 909ee91beeaba12bddab870aa9345b613b1527bbab0b481e9272e5be765eaea358d2956bde86b1d622f4853da858826f1dc64a394dcd89bb23452829718ebdfc WHIRLPOOL f8baf1feffc4a0b10f7802b663b99cce1d15eb0113260526d3798f406a1ca78d5edb1aac9cd10a466aaabca30e1eeec50992288838fd0b3e2fdafb062e5187d8
-MISC metadata.xml 160 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 SHA512 9cf2605fc15b592515a931de7a63cf02d1d5ee27ecc3cd022f8e932791008d3ae4445088bebdb48ee0d46e17ebf475c19b15a05b07528f73c351a9846cd3920f WHIRLPOOL 6eb76aae8263e190c7a0a82968b1d7db2f4fb65bb9134b6bad1a5b2d3a513e229eebf303d9952f4933e758e42c0914550d58d5e86a3b76dbdd6df0802dec8e7a
+MISC metadata.xml 239 SHA256 43f48e83c40642c12996b9813a268f43b1c95cb519f536282177f45d93e2a7b3 SHA512 4bd0525d30a4c75f2d4410dfe7ddf2ab5b9fcdff89d3f03960a1ba20590e489771a1b9c2af018d198e42bb9039e1f089571e00f45fdb0f57c3e01948d42a19b1 WHIRLPOOL 53496f15cdb0554f977b5c895e8ab2466e0ee4376b2ae4229c99233de4438f4714b7eb5d55c5b4b2d9391dc1bfcd550be491cd735747127d290ee4ce52114016
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfwyuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi7o8QAKo0rQgMEO8QG0Y6zz2MZy9L
+TNOJT5ZlrQR1fWNRghGsuzU6EKXtpAdAMtDReWVhq6PdG2R9D/Yf3UyzxxqC/Vu7
+d/gOemEolP+Z0FbsWLi3/3+VUJ4xYEM0whuigJxmHBLD+a4tPoIZjCkVGmUYYloA
+EeP/BTwZxzwPdWp2cVejTpkYg5AuwR+1YtGXjPmH0SNgsT1ad1oWHt6nKmZFBJoZ
+HiF3GIHmvCIE1ALkUCwbbLvDAwVdAWpdTTc3dsxB2uQy1kkHOL0sdDUqxBDe5Qj7
+Oql5icQUH3OhDVUImETVMiqb09upV5r4UUx8ToV6JOzydpBeuZyR8gIbBUjB9GAw
+AxZO82ICDlp6La544Hln5dQjdUgjJKw94B8D2Z9XTHyA9V2B3zHcDIr74MDRw2jM
+vujw0Y+hhLPRyXlQAbX/1BZwc9WbMZRiQ+o2HUkRw3v7j3rK8fV4h0pEARlmVo4D
+SH21ecD8ahY/e9E1q3g1JRRFjb33z2zgzJ13cm0I1lMn5tQ0a3DqV5pNSKwKxEZe
+phWhdVdODr2AOfOBLBdaxeoPRDTA4I6HkZGMg6jJgZPZUB11TH09GhdO1dPfx5e2
+35bpbvpqTUEfMxP5lht/hrksMl1cM0yCBIooD9Caf2AbpPgzaAWSU4oJzdyiY85D
++2AblZ7h03mnQ6HkJ9sZ
+=YjRk
+-----END PGP SIGNATURE-----
diff --git a/net-irc/rhapsody/metadata.xml b/net-irc/rhapsody/metadata.xml
index 6ef15e900f17..832ac05e1ab0 100644
--- a/net-irc/rhapsody/metadata.xml
+++ b/net-irc/rhapsody/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
+	<herd>net-irc</herd>
+	<upstream>
+		<remote-id type="sourceforge">rhapsody</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-irc/shadowircd/Manifest b/net-irc/shadowircd/Manifest
index 30bc2276ed19..ba2810836d45 100644
--- a/net-irc/shadowircd/Manifest
+++ b/net-irc/shadowircd/Manifest
@@ -6,15 +6,23 @@ AUX shadowircd.initd 972 SHA256 0193f9cf9aacfa519fa5a0b26a858c1b8fd86ff4b24a6382
 DIST shadowircd-6.3.3.tar.gz 1980432 SHA256 a3b6189a473e837d4248b8f18b1e8454ab111c8eafeb46eda477095771636f24 SHA512 f3638bee6d49c56738cf05dd7c67d93344ed5787eb8777589390dbc38a1481e9a28895bdd4534124dcc8dbe247f3e28e299fe0bc0bb89e4d974b4aff734701d4 WHIRLPOOL 59e76beab8814f5fcfe8cc60cf2363e4ec0a8306a6503f28b234d805ae71b2c15bdefe9695ebf1d280932328f14669a295954b86c239c09b498f8b1b2bc95369
 EBUILD shadowircd-6.3.3.ebuild 2454 SHA256 a7699a18efc07104e6c9bac364b37f24b6fc492bf868a036d0d9e8fd9092ea8c SHA512 b9efa7ef18ddadebb5531f9b0bf41e07e92477d49d620766208115717bc548a57c5321fbbddb6086db219834cd7a0a87afec90fe006176f265c744a4298628be WHIRLPOOL 6df8b78070d688874ac5081e536922841b8bb7a926ecb6ad51f5b39baa74787d9895590c577fd51f5cd4470560481dee6df5667f13c7300776b4be0218e43f5e
 MISC ChangeLog 1532 SHA256 c403b7940cd51f2eb1d59f916218f66d1970c6a3668a2464232e405f88e4d2b0 SHA512 f73d6952485622dc0ddff935714225cf6f12205fccb68ee82a7de119c71b84899a9ba78f053715a7a0d8b2d2063133c4b6ed62b136c326bccacea6cfc9773bfa WHIRLPOOL 206230bc52ab7c319394504f4625cf7d7a9606d5160bee85dbb3147c2a4013c15b42cd3822d1e8f4928c24829c17926b990a8d66c4c06b0a05830d2a82346a35
-MISC metadata.xml 454 SHA256 658e92ecdf1b3acafaeb55ca6c7906471bc508fc3973f76a54feb653f0045668 SHA512 00d08117c49e2765cf2503c5722cbea8b49d7a2017633184cf57acbe3d353a55b6bc92b1294a77524e767954ae83a742aa1c3fbb06a1c29579fa3012574fcd3c WHIRLPOOL 15b2cced9920557fcfeee01df29238f4db81914e4493b4fc9d4ba04f2d61191152f243157462103442269f21174b0c05ccbbb6d69f0d5e0a50c725aa5f54db9d
+MISC metadata.xml 547 SHA256 cb31815382d5cca55342b3580980d28ec8a9d214536696777f8cf83647ddd5a9 SHA512 fa4a21d6de4d3794cbcfb72491e2633fec8d9fa784792e95382bddea2674b8bd50689201933fae80bbc01bb787df6395ed0b5326de8c3d2b00430f5646d4f9e4 WHIRLPOOL b109f6aa4fcaba8fccdda9de101f8dea9680c6e89d97b12acc3e25cc9211d25c9ce30fea6e7de897b19432f8d8259d6f3a89fb0fc4f0098679345d8863f2cb83
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCgAGBQJRDUt5AAoJEPUd7O0j6ekAGGsH/RIx7NbIQ+4ycnhk1Eifjgqe
-WxPSfph1C5PMQpmks6Sntegfgqo+TlnmSlR8hmBXG/Cd2R8OPKy7A4+DjgVmuixk
-pVRKZ3qdTLPicMcShPPbea5ht86SBqVuBk9yRKO2Xrcv7hU8IfhXEku8IEZmJSG2
-hk696iHxgpyajLFklgcN8LakfPo/lhhLqVBWnycYWMGmIGzYFz5zToWjC7MisYHr
-jrGDi/kskIKuK+VtLLlx0vEPP6fzS5YPECUZ1J0NssRonXMiq10J0xXRK4kBY945
-fBoj04+8YrNUh5Ptn5Rg+YcBNZQN236wBvkmiUgjxT6LvJh9RKLAJdHEh+dSaCk=
-=hue2
+iQJ8BAEBCgBmBQJVfwy3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi5ssQAL5sqmeOrfJbw/1yFfFe4Gcq
+LBEKF2OgKismFW+Q+ZNWctiniaQWRU1d2vBHQDF83oGWgpUSHWUUP3qDMTC5QF4t
+OXGOenJVzmih7fxd07HQe2nLcxT2+v7aGn+ppl7G1Ko+6LqmtLPtOngN5CpifCfw
+ABz7fo6rsYGlwr19IiFAs5w9OZ80tPTPm+BWkzBsr6Z5E0NesLmPfGPVny+0Ep1l
+GxXpZz7tDogiS/7SRYKDTeZPNJjoqsGUJxjfxSjr3814xpBP5lQtjVLYZA0sT3ty
+iCFhZtU5auHKR5kTL0C+NSD2/Q/8O2Cxl4DdJYDJvt0CRod89gBst1r+kWJ4VQI5
+6Mo6IxzHYhZluphv5AVKaEokj18a2dJwpdu4XC1vmFOAKh4v0vgSD1zBRg2JjWB2
+/9HSqEFZ93EzkhdiRzppeWteUMIIz7pCGn/ae8kRlxehHZIPQ5saNNHPstqBqIBa
+c6lScTVHtM3CscTGp1nXTH2I57obKNJq7DX9Vo6ZO2sPIZ5i0EfL2J25Q20CBmm4
+6gErNWz1aPoaPVcaIQoxtw240denyzQ61ntqSm0zMbWuJlZNH4VpipFELTi/MUGX
+xmnSZYDyvMBIOvO336yYQykSUqKq0NV8Zt6ww2W5NgslBOlRKVZ63vkHYVYrMPTx
+7VNJgSRsN8QXPanXgiJJ
+=ShnI
 -----END PGP SIGNATURE-----
diff --git a/net-irc/shadowircd/metadata.xml b/net-irc/shadowircd/metadata.xml
index 5de3966e73e4..764b9b8e6bb5 100644
--- a/net-irc/shadowircd/metadata.xml
+++ b/net-irc/shadowircd/metadata.xml
@@ -4,7 +4,7 @@
   <herd>net-irc</herd>
   <maintainer>
     <email>jdhore@gentoo.org</email>
-	<name>Jeff Horelick</name>
+    <name>Jeff Horelick</name>
   </maintainer>
   <maintainer>
     <email>binki@gentoo.org</email>
@@ -13,4 +13,7 @@
   <use>
     <flag name="largenet">Enable support/tweaks for large networks</flag>
   </use>
+  <upstream>
+    <remote-id type="github">shadowircd/shadowircd</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-irc/srvx/Manifest b/net-irc/srvx/Manifest
index dbfe318756d7..bfa84bfeb13b 100644
--- a/net-irc/srvx/Manifest
+++ b/net-irc/srvx/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX srvx.conf.d 282 SHA256 8d34f9ce78e5a9b3205e5e10e1f32991927a9f5c522758ad0859be6bd506c810 SHA512 32c61e2d8ee380e0780a7c39986ee16ff47ac7ae00b16b34bf8f2b5a29e6c4b09355616117e4c3a54c3d92fee5424ff6268d0187d60e63759d57a20998228a94 WHIRLPOOL 56587129a5c2b7330b3bdce65638ef65aa12ef6103d42c1626827c717fe7f3e669a3b07515364402b7c87fc8e35dc835cce05a533838bcb6fcd0ff64a3346dd3
 AUX srvx.init.d 551 SHA256 fdb2cd09e3d605aef7d330f3b8f2bf2d74f12695e67a083c34e99eca1079057e SHA512 ac9fb8c26d73be1a9693d92e71d888ad977277c53f183f9eaf35bbfe1a0094cf48058c4c24f7d77d12f7d1f302c3c4afd5efff88a04400ee598356c13b8ae329 WHIRLPOOL 77b86a07eba3877b84640f0ecc9a9431a48712bfbe6417531ef2496898d30b770cdb933ce660d7d046662c91060b380f916df8136735f8c5d2ad105d0d8ab8bb
 DIST srvx-1.3.1.tar.bz2 560658 SHA256 e11347a58505f0274a54ca8f956ad21d9e5557ecfcd86f71a58be2fbc2a81d63 SHA512 6f0c4c3af48dea5bc51f673b66a8a72b9f54c2d0c40f5b00e77da0b1b48174ca671a473cd86a3aea4d3c5cb766995d5b892cc5748c47766d53414778403beb65 WHIRLPOOL f4e2f622f3bb20aee41af5b5826c5c5585be60c0ea7c1813f18e1126fa5e5f226190d8eb4411143d78795d0676dadbb7481a5267f2a1652821881be6e7f42527
 EBUILD srvx-1.3.1.ebuild 2051 SHA256 6be61ea2a3195c4d8be8b188dae78527d36c6e4443cb85b30fea6cac4d35aba3 SHA512 2702a74e4dd1e5a01d38253b4cb8f524a8eb666c381053c4eeb6c80fe4443bb2abcbf6306479cde2cee3c06b57a35033d1b74ffb405a8cba826eecbcd5364933 WHIRLPOOL 547764b1e1c0eee3fe8c819e76aeefda1e61828b921d85635676c3a8d537cdaf8579f9baef1b87e555da714d3fdbb17d267fde40fbfda6b55f14f16cbcf48b1f
 MISC ChangeLog 2006 SHA256 a31ca7963677fcb2b9060d8a389898dcc4f57a2ba630f383de7d49ce7819a3e6 SHA512 63a1ddea93361350cb5a18f5478d44561cf17568303139f94c88c57bac1da7bc23ce66af37392dd19516ca55cf544326006d79433f9e552d571b3a716a7a106e WHIRLPOOL f52f69b1633516907d0f451550508942cb5db2d2a872b4d78c97fbb76c53148df832c0fbc7b60560bc95fddc2fcdd57212c666e4751478b4a751de4848ca7d88
-MISC metadata.xml 244 SHA256 407cd330dba0374644359de3a8881f4cc80c6dca8fbff038e0acf15415c034f7 SHA512 9cb691186d9bfaee60640b9969a4f5ccc4451fda23f68cc479c420e8b0dff74f03cf208e72bf05746d45bb16f2c1a4344c753d3700a708f905ba7606c1d38128 WHIRLPOOL 0b1a6ea82a5224ee59eccc103c6ff2fb8f7ff2dd04b003c6e72964afe1aec963919bce1a6dbf0050fc0ee4fe02357bfbc7fc47c762a12b6a3b3d7c0999b723ed
+MISC metadata.xml 322 SHA256 f92e100b0b980ba76e4c0a7560298c0d5d1426a02e9432238e1ea66df98ac826 SHA512 32f980ee41f50e5e96d6e1b91fcf317f64ebe7bd24d20af2fe3b922cb0858ea5ad42fac4c53a8202bda7c6470e5b37b602d490743c6929373552c416f593071a WHIRLPOOL 188fedcf4c6690ab69a3b80f31200c567960e942f92ddbdd43ad8c78ae659c4856f42913de0b58f78a7c827cd8e5958193e6d78180a3f98518a95d3fa35cf77b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJSzPIOAAoJEPGu1DbS6WIA+0IP/itquhooo4YnxGUZtwW2zzTd
-TgNSTfB/scZP23Yvaef2+9Vg1MIjMD971pqSDhovEDiP89LgsJhfElwFINtCB5ho
-u6IOc3oDXnY2gxpztQok20DpytvD7z1VFfY+/pFHp6ig+NEPfB4tSb0f2aWNRcas
-mV6EFULQiVWgtRNwzb6BSMq00NDu+tz4F/rdQTOqC5JeO1bH5XcFzXBYE2ypYEXW
-Ha7z1PN5Mj/edpX+chmEj785Hx55WY3P89u0Dl/HU6mA3NzpWySCuZB9G9TWiFVZ
-ZEZLnve28e7CR4ynyLohHkgDJd1LNZSEY2NzvdJbw6TFKl4UZ3ecMbpwnZa1i/Je
-Or4RI9doGN6EgiR2e31cpqafKjT9LzRi+8AB26zBMJlfNBHbuDiUINkJzHDxyppJ
-VJQWj6v8NBWYpAogFjdvZX2RFfKmOQHy+GNkbneSj/FgX6uiJ2v3WpICFg84wi33
-wI8tsTAR3NEpYl8ir4Wb8ijJKnSPr6oDlbP/oR84rKig4nRR6DMKaV7HnGdyJOnj
-klfnn0ePE7N79M4fbHY9pKyE6GeS+tooUh5TrdNXRsSQRYWonC+vdYgzyP1rBw3L
-aq20BUmjbjn+OF1BFt9ec+noZPeS3IQ0Vh9WxrSQ172I5SVVS5t8CQ9uioG1ETia
-anmnUKAEJ/80PkcBoxPL
-=MOeF
+iQJ8BAEBCgBmBQJVfwy/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmicLYP/0yxzle904lKXMB5zAR0bAFL
+wvwRjBybgmm/C54B+4VcC/FDQPc7QVJxoRg+zfbgj8ZIyxqFKJscQGB2TMZCyEHp
+dMCOuhQzgpL1QeFI4TEnlRNuRLG9Uw6Pi3yTzp2BzpTXjCMn2jv6rdNaBFhOEaar
++Rk2vNzEitD0zcyc3YeULx/zlQp9sNqTvbEAyLp2GtSyr9DQ5i8ZjhA37SXDfRRz
+5Z0R0M1QwCjuuqzXNZkBsXYTTD5cNfawM1HkN2CZRbT6l/u6+1iTcwPoAQJBLBDQ
+Bedg/jyWP7w8L3K1gcHZW4ji0MP1P78wzqu61YUE5N1rJEXlvN7uzoeGzECo7Vpn
+Gt2brk4fZRRtggna5dkklb+MplCCY4B2CtPonM9pJ3185c+wejU3AFyaVA9cKwT/
+7L5irPsW8CqM3h387Ga/Q/foHI2lYSvDjXxe1nWg2swzH6CeBm7X8uYBHMMA0b5w
+V9+SAUwAvqIzTUirru+19oGCFJknadyNF/wm3hab57EmclLUXGAlI6icO9HU/Uxm
+fYSYLm3gEYMM9NMntXoMI47Xq3mz7GAMMNwoVh+guFtML7mfLOnPODUN03nCAYwU
+v333UjLw4mAk19T6EjOSUTm6P38Jfm+j9WkI0/XQzsA42gnmeS+zhBKT4tb1884M
+XLxzK31uneYCuAc4DinG
+=rXlv
 -----END PGP SIGNATURE-----
diff --git a/net-irc/srvx/metadata.xml b/net-irc/srvx/metadata.xml
index e347144a7ed8..be2f91568548 100644
--- a/net-irc/srvx/metadata.xml
+++ b/net-irc/srvx/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
-<use>
-	<flag name='bahamut'>Choose bahamut protocol over p10 protocol</flag>
-</use>
+	<herd>net-irc</herd>
+	<use>
+		<flag name="bahamut">Choose bahamut protocol over p10 protocol</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">srvx</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-irc/ultimate/Manifest b/net-irc/ultimate/Manifest
index 0932ebac63f9..d3bdf11232f8 100644
--- a/net-irc/ultimate/Manifest
+++ b/net-irc/ultimate/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 3.0.0_rc2-config.patch 1318 SHA256 0d0cc1a26f4a98ea66dc2fbddf94e2e2b22f47b10009681e22cabd0396c88c6c SHA512 ccbcb77f0b00f3f7a98ef02d4cc92e9005a436825bc14b6ad2f0d55e4f78a421e293be2cb025bba5bde8ed56041f6f64aa5f96a89c0f79fc8d1d14576180e2e4 WHIRLPOOL 6b45437290ffabfa28f961c933f5a68dcb19b6e1b81c44068ab720f0b4aeafaa401bca8e480ae980fcf3818040010a8747ec5c4f0f03aadd2592c346be33282d
 AUX setup.h 483 SHA256 9f6e6f7045f35aa640058af5d7a11805916f25a7b71e6eef283927daf8fbb915 SHA512 f5bc9b220ee7ddd203d0a48f4da453c6e55bf53a566a800857e6b7cbad515b40b37a8e482004eeed7402d677542032022aad5976df3ee7fa3547e160dc51d9b7 WHIRLPOOL b1678377547fd4666086448c336df730263670fc784c115c871259fc205a65814cad0d82173e8214b8c439dbc3a5fbb41cdda95ca1995f29e258aab3dceba8c5
 AUX ultimate-3.0.2-config.patch.in 1390 SHA256 2e8b6c7782ec5c8af29467a704c8542691306987b1ceb699b9d27d9574f48d9d SHA512 73cbec361c5bd78481edbfdda84cd923d8c6fd39c5f952f66e52c80846184e61a5694714472956632efcbaf68470f4f2b52a9db9e55a3993e3cebddd787129b3 WHIRLPOOL 27a64ab08145e388df496715532272c0c7ae0103649b1b48c704901c828bbaa39dab31445c73518103cc4f121a59ddc597085a3abaafcae49f1a24931ddc8b57
@@ -13,4 +16,23 @@ AUX ultimateircd.rc.2 543 SHA256 739a922a6256bada943e95f4b1d9b606c2aa3fae5c221c6
 DIST Ultimate3.0.2.tar.bz2 615944 SHA256 b4564f76d074b3bafde6a7d2cdc8da177759949ed933979d801d107dc6fd8934 SHA512 ed79f7f63faaa08fc901cfe58df430a051a6e0cc15b7484851f659fe2b5f23bb4b0235d8cc131284d9b6373d2da1b5d1376908d59dd0fc73496ac2d4561170ed WHIRLPOOL 822bb5bb8e0117d3fe1776852ddcec24a5d1582af9e318010c5ecfdb183139d5f0468755b80aade5c1bbcefc94be6e87aaa191054030a6887aee8097d2f40b6a
 EBUILD ultimate-3.0.2-r2.ebuild 2568 SHA256 9aadf5d2edabb7478943d130a818febcb8ba03374ccf698031fea0cadd925881 SHA512 e5c715dee099b7b4c0387007c995f329b543af87482fc7b07b3b50087f4a11f2fb2e2f6b2133efaf83faa396cb9d1c4edcc945e0e676f21adeef25df33065753 WHIRLPOOL 296a6e21b3af4c659c0a62ce3d2eef72f99a6dcfed29264a97fe80ec20e360e625facbed35cd45613a64e6c1ec59c0f29d884a337a0a2c3d6f76d96edd98b1eb
 MISC ChangeLog 4470 SHA256 2892534f12ce72c25ae28ea9ff4f3054b195594728a41d63ce0d9679c7a03646 SHA512 e5c1fc3c892a1c9c54e43bc58f0186500f372f8bd28cadba999744867021bca37d836fc6b9829313729947ae9539af4f07f015cc4daf0b5f0ccaa98737803546 WHIRLPOOL 1a9eba910d2e0fd44ef46903b2af1f3b12376778575dc60959698d39dc08134b0f10091ea5c7b470a26419de410988115d788584ddf1f520784205eeffecf5ce
-MISC metadata.xml 267 SHA256 0af2c1af367b00b54ea1e6163b7c1f6a3138683413baa091175e7914623dd360 SHA512 694d5132ee6e471a8735f5046c03718ec41361e01b2c0cb3a668567f150a94b406bf92f1f6b25592446331c50fa66083e03b979a069296c30f39962a647f4b47 WHIRLPOOL 03c2758987c1220dd5c314ba39d140118f810a31cf43aa11329561d0fdf41cc2b03229b91562375541a8b85ed1e05a9fc4aa121bee6c0489be71a27e50184e1f
+MISC metadata.xml 349 SHA256 1aca3ff3d145b77bee8196a5e6d06ba99566818e3fa597a9148f760f309b7c21 SHA512 1b7311b6d34d756129dc4a039b9cc0686e6b5d870fa031aa2957cdfd88369956abb1923763425fab2437dcd8ea182cae516ab5f712430959f8d0b1332a20e315 WHIRLPOOL 7b8fbcc28fb43ce6d6f37d57867304a805f9accdeefcf548b74271c06dcc7d17e7a03aaecb287cfee25dc9c797cb14fb496c75c8ca7276679b1a149a0be8a2cf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfwzLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiVCgQAJGp7UzTI+eAD67zxdMTaxF7
+40/bj3hjv7Kcw6ki+Ev8U6Gsf2+WUs+HWL51yguHfenpAsyPSgTx/NocxcreDO8/
+PzA4h7BSctAMJz3fvngRbvXPWd3pXm0CaTQoGE8Rsp0obfbOk/6ro1XURfGUBK1g
+Jtno73uI67ILX1JzYDTnyfPPXX7xYCt3rH7Y+NVF5blg0PbJBulbs0D7W7K/lWmV
+8UqOlQt3G7dX3NuUWqf1B5mOExxihDaXZvKTEF9N2rs2eOY63LbpGllIZYvPMx3n
+1Szi0C4tmQN6xlgtLrKfWU7nCUbvSqMzVuwl/wcVBORht17KiO+p32KXsHZrtoXL
+qMStn/Bm+U34GYvSd3ySdXU2jzMcPw0iGqGciUQ3jIii5oBYkIJxJzBR1jyUXZMx
+ezcwqk32JJ2/0dyMyHBCSSPj/wqicKIyqOlTaPjipJKKjj3yXPQsiI91XpFF0XZo
+0Dt9t5S5uwkElsycpGoP2xXKg2pDIFBEOL8hH2X/yE1BEsKmGo/w/ewI0p00+5mS
+bfGJdosnuOxe1zN/2CtkxMylJDS63yfcdsESrDwrb7UukrG2GKMx/iSj8RADfvyP
+ZcA++XS/AP6u8VDAtckv4M3Dbf0PGDJ3GQKijoh8bKhQ9tYL3suFSTxX2NAjC7NB
+MJOleePWddDRDIN5fanj
+=yWP6
+-----END PGP SIGNATURE-----
diff --git a/net-irc/ultimate/metadata.xml b/net-irc/ultimate/metadata.xml
index efdf0277b461..580b3be35c17 100644
--- a/net-irc/ultimate/metadata.xml
+++ b/net-irc/ultimate/metadata.xml
@@ -6,4 +6,7 @@
     <email>binki@gentoo.org</email>
     <name>Nathan Phillip Brink</name>
   </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">ultimate</remote-id>
+  </upstream>
 </pkgmetadata>