Updating remote-id in metadata.xml

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

18 files changed, 229 insertions, 115 deletions

diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index b993381f8325..329b319819f4 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX cherokee-1.2.103-linux3.patch 1663 SHA256 045f8298d1856bababfbc5e47398da1edff0a3ad00a05d6ee21ee65757688141 SHA512 7edf790a6b19cbb9049aa9394355adc61c116a69156b7390177a349ea0d8e2df93050897ea7683e854996ef225a10c6109bcadb3be241064ac111e45d9f00df1 WHIRLPOOL 5dedd16384e9e99870fbef1e9fafef33992cdfeff5b8834d7e1f2055878918bcdd65f347764bc09882c9446fd76bf4b690bc72711565d493313478d6b88c57f1
 AUX cherokee-1.2.99-gentoo.patch 1763 SHA256 66b3e85370082feb20205ed484a858a79656e0adb793fea5be796632fc327201 SHA512 2f2b1aa03cd7656ceb90f9a94d24704b4a411b3ab99e084444d1f60ce0270bad650b597b1edbdcb4fb0dda750215f42c3f5de3e9f6253825f3742dfbe871be4b WHIRLPOOL e8d03dc5c15e22cc94bae1f6082ee0aabb4990239bb6db9da3dda78565379720af5e61f2f60715505538a9c974e24fb84a2738d8ed593777d4621fcfdc2bfe62
@@ -13,23 +13,23 @@ DIST cherokee-ctk-master.zip 415092 SHA256 dede313f1d396f1deaf78d9fd9a1270820d2e
 EBUILD cherokee-1.2.103-r2.ebuild 5128 SHA256 2dca334776cb1c269ff7053689d87e7d57dc1b9a2cf4b8ea189189456ff130d8 SHA512 2bb21304dd8beebeac6710831e797b9c7ef04651de067eba060c4027a487118979920b49031e01a8f9c2a09500392292d5f62ea207e3d773d04f0c8277965468 WHIRLPOOL 0ef3132cfa6a276d81b475c800487b1e69829ca6925a3d826503bba671ca0d073e7178d092b2d5cdba12357a6c8e85eb33544bf043ccebb8123b75d0b2734e79
 EBUILD cherokee-1.2.104.ebuild 4926 SHA256 f7164d3c34e9e044e7be39bd377971ce6a0d4a9b3f3924f996d087e162bbc30e SHA512 703cac8b8ab0686bd1cb637c7402c8447be40038f63cb20f35c602438569ca316013a89b4aa8bed2f23278f6189eba59b449a9d96f98ae95480177fbf08bce6c WHIRLPOOL ec8c540e92d81bb2dc314573b9f4265efb0faf885b4f02672335a99f0e4cd3f5afe63ec8f1d7d2ab8bb6fa52faae1b9033d133b5f3f6819124abfe2a10969fa9
 MISC ChangeLog 24470 SHA256 1d0e85adc44395807d12a5df8b7e1e9a1cab94f5ced95b4da58cb00e4715bd60 SHA512 32cb25f65763164d989aba7ba7681882c0e48e791e43b7d44b8a51311c27eb029013283ec189b850fa7f288dfabbaf4f6348402b806c82c5fe95fbc02459314e WHIRLPOOL 9aa61f26750f165cc122787e95beb215381f3eae40fe2391ddba16838f5be6079db2c24dc57ea310091c75408c01d4674b7d205478f63e55a6fac7e6c25b7363
-MISC metadata.xml 367 SHA256 7cc17149aa0856f996082ea11766be22ff8b4a62d4e88cd01e95164901ea071c SHA512 54b0e3e8d37305446f3dd6710c40d2165f8496a3b469278fe4013e92ee5289936831a7e958cc5a7244acfeaebd943edaa26b922187ebbc82f23d4969143de66b WHIRLPOOL cb8c59c5735caad07171511c05d2d726f92b679f76bbf0a6d6a1f94df9e47794f70b83fe2316e3ff7fd51ccbbd21695505ddbadd64df8b2ddbb093f2900886ed
+MISC metadata.xml 454 SHA256 f1dc9228f2beca5d677ac5c7e62c3565fe0502c878150d44e99fa4c4955b848a SHA512 41db92bc789658e611c142c284d14e5d2fe8ae258a7f89844ce0bedab0587524c3674256b870a5c7487cf474edbeee8907e603db20931f74269f86adef3821b7 WHIRLPOOL ab098449073cb152e6940d7f94e96b2ae0bcf0f45328aeb9a3d605660ac911b38bff8e4016aafb86f8f2a265c5647be9cc33f8f4db68df057ef1f6d38dc5a3ec
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJXPmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZObdMQANn6Fe7fHpk8I+UCIKaPSZB1
-rCcZkJO8p5FiGCLm7AFCPMZySPlsuqfxsRlafSXXj1jhnUyl916X5V1ovygK8ur9
-GjiIgDS7BvuuKF02uMnserVYkHeuVLgE1RErtSXJ25y9cSeM9Lj20AB/SuBwrORV
-A7HtyXbkvracDiAtVmMTOupeBJq7fOk44luLQxPKUVyB5xRQwJZmX8s5CaDd8ktb
-8h3cGd3ODjJSBG2tYYNl5jF/ymPoGGyCeIXe4fpf6GVUaFeD2sGvBROCt/kSEN+R
-CXdguvhh0Ti2aRwdtiY96+jjBnthHb5GVGps9uyZblOvGNLxF5CAw+SjovBA9EqJ
-FtraHMHkVrw30HHQ6EQ7BmIvSdvcyS1Nb0vMWiayO0TDbCKe/RDnRBmV3YJnUxFL
-pebK9dNDlOqYyNdSAAxfBq9PycqlMPHYs8f6GfmYrq3cv2s5RcGHnda6AviV+kid
-koS/OQigNoacLm9fwMx84DzikoPyS6842l2T+mGJI7t3vms6OuaIwVE7PPFglmYJ
-2Z+NZuXhLtNdviQZo4xcIRq7mcAabDzbE/630pBhETKC5ftJvIKIJyOWyHOPxPB4
-NQdBtHGERRCCK7tcCLupHlI9TtVOc67EGVcREJDiVMZIl1Dbq7BxazFJRdiB/+xR
-TjfV3f608qQDjqx8yWbH
-=Yk31
+iQJ8BAEBCgBmBQJVfy/zXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmizYQP/1BovrK2WBCTinPnf5erTw1k
+/CRrvdbMbDUQCXFVk/Ik2MCisRIQYHGYyiKsEkrDosOjPO4uv7mJcuQ0lqAoS6Ir
+MiGsauGmVFaa/CtfPPH8FShecqPM1I3dzAqVGib1sYctoP+1RPvXUY4XyfWYxN/C
+VtBOBoIPHxce2WHcXPm5+KIdoMchc2XBwFj7abgUFbAZm6KrDd+aQQT7/jjlajO0
+W1Ah543uYFo5szfJcQ6FC8MxPZ9HA9McdlP/I57zXuqBo7sEL9TrY+cu+JP+Jqot
+ExM6GCqtEFNG2vQb0RUlw96ORMty/BUlddqndSzVXcTGl9Loocwcsz+nSrnX6gnZ
+DIKad7b5/R6/JPbgdfmTdMVpAViqwQWgPTNRZFWtD2PVZCAh0NBlZ6JJRO6sWsCD
+cAFYOvPyZMGeprFCSQUFf0ZwQblOn64VOwlvkkj3hzqWtozcFmoeslRPHaRoNu4n
+AbBWJeUAx/RfGaSkh46yAhGsrHeoMwxihnWahfBGLQqemWlBtvyIxBF70yKnDbu9
+WJknfIbyK7LpOR0egsuH02BR7Ev77pVPGctK/Lx6FiR8PvoOfhgdEa6hrUBEe/z0
+usxBa4GOsrSo91XNn+CcCoKB83bijg3CxmBbsRj5JLu0jV66C2q5sMA8fDz9gUmY
+7kHVT1ggg2a3ZIfPmVE4
+=jUXu
 -----END PGP SIGNATURE-----
diff --git a/www-servers/cherokee/metadata.xml b/www-servers/cherokee/metadata.xml
index 75a8c3d56484..322df7139a03 100644
--- a/www-servers/cherokee/metadata.xml
+++ b/www-servers/cherokee/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>blueness@gentoo.org</email>
-	<name>Anthony G. Basile</name>
-</maintainer>
-<use>
-	  <flag name='admin'>Install web based cherokee conf tool</flag>
-	  <flag name='rrdtool'>Enable rrdtool support</flag>
-</use>
+	<maintainer>
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<use>
+		<flag name="admin">Install web based cherokee conf tool</flag>
+		<flag name="rrdtool">Enable rrdtool support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">cherokee/webserver</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-servers/gorg/Manifest b/www-servers/gorg/Manifest
index 8b5484b3e446..351da486474f 100644
--- a/www-servers/gorg/Manifest
+++ b/www-servers/gorg/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gorg-0.6.4-ruby19-date.patch 1010 SHA256 820a263c3c9081a48bbcf768cab1a076038c41f680cb0115aca46d6a357b775c SHA512 ea68f6f7ea028fa9f74d99784d98a1619f4f5e3c454dd6582dc110d4cb3b9383adb652cf14731dbb9dd113455c30f6c6b5a7afa74ba6fc0c00de0d597a0a5173 WHIRLPOOL 04a81d72ab0f2cdf1b99e857317543a3a274791302974fb5b8dbffc840fc48a0bdd1e3cf3e6bd8d989adf986c92278fde0724c00ac2a4d1bbfa688d1957f77c5
 AUX gorg-0.6.4-ruby19.patch 6507 SHA256 da04a3da7112a06e9555d99153625455049392ec4b820a04c2aaebfd031284b9 SHA512 38f20628a828f343765e10bbae75c71d6d4b31249dcaead9545eb9a580372a43cb1f0482cad3a494263572ede157cb317328657ad30da4a0832ee6fb7e286104 WHIRLPOOL 708e48bed484566642270083d06bc94b91accf25113b5601d3c8622fd9ea7e6deff454f81ffa31429b701b61c1e33adedf99f11b079a9c79fe8b59eb8ea8ddc1
@@ -10,11 +10,23 @@ EBUILD gorg-0.7.0.ebuild 1476 SHA256 3bbbfeb00e771f6e93e035de2d3b8e8ca164a7712de
 EBUILD gorg-0.7.1.ebuild 1479 SHA256 a3297473a62c68816a8f7be8349b2ed56e695c7312357130ca7b3eac9efcb50e SHA512 c4679e9944f033a5daeaada87f6f68f7d30c9bf8c03e25a6148956b41e6fe7f1e7f3486d168b55ac494dd86b4f21c0121bef7499db5b31aac1ae4fa893d94de7 WHIRLPOOL e33d897bea53888f9d671c6d603bb4f3daa0afabf657e55be396a60cff492d2fc249403c3e5c83b606c0820a20ed96f3896eec61b0c487aa61ef2175ad5bf81d
 EBUILD gorg-0.7.2.ebuild 1487 SHA256 36ad524350b0b7986bee2eb2997cd4247af4b1b32926cc26428f1b9af25007bc SHA512 1562179cb0d861b91801ae22f3d135a9ec60cd862695747814a4339c403f2376a89d3b65330d20704d5b6fc924266e39c2b220ae30d72999002bf3760b759f69 WHIRLPOOL a79de65726e7807c28a6d85514bfc1b37bb3c82f99f2fa91e870073bfacbaf7670d4ec83110e2cd72fed2db062aae53862f792f956d06f8521f934e177d993e6
 MISC ChangeLog 6843 SHA256 775de98830a99073f0cf5246df5724d1fbb32f7aa63ca0a8a75671cf1240cc3f SHA512 f398b03184bdbba354927d2fb4157336acc1ac63e9898e4c84743896222c946751de61c6ce40338bbfec9db1c6f42e0e6233796adc1cc2f26169f41957134165 WHIRLPOOL f50f195ec97a936489eebd2251f3a37eaeff91b0a37a642a81babd08f6c3d7947eea285cd16946cb37925be96df2a040d200ed7d16245a111868b874dfb777cf
-MISC metadata.xml 775 SHA256 4cf0c5683eef3896cebe3968c710489216d02b2b081a1c374f1ce51291095c8b SHA512 e562d2a2eef3997892011e466aaf9c5b83801f5c18cf77beab89a9616ae4e048e8868400d3b5f854599b279434e3ff3c9681bb02fca2eedc13c90b12ad1cef57 WHIRLPOOL c4e932789ce946071eab402d5e77747edb931217b9de2b592712883af828cc7e5e48a5d365e73dec90899eb628cc9e649ba11bd66bcd82505c751f916c8f7105
+MISC metadata.xml 814 SHA256 37fe58dbf8f0843de537db78ba878ca50b7bdab7568d98877c4749842f7395c5 SHA512 ac5251f2ba36f517387df7fb7c4566ff8f454e13aa97e63e2b1b475b131e5417f298f7cc7018d39f029192daa1f499eda658366b674be6d66c12779c6c4ba79b WHIRLPOOL edee03a666e9c2dcc5710d33c3343b94cd190f2efc76618ee84dc479bc1ea825ec74c165d6e46e4b704486a32d88e325b57cabd3c3f08f94f8efcc29953eac92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlP3Z6wACgkQiIP6VqMIqNc4YAD/b16SRikwpr7DSPLHBVmUn7Rc
-MNeeXfbHsQ33UqjpX2QA/1585Gf08f9LLMmHqpkzaP1/BLPWoSXBEBm6CIVrhUky
-=wj2x
+iQJ8BAEBCgBmBQJVfzAAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiegAP/2TwnnJCYA44bnaxWgp2fOkX
+4sAbEe5hjRRh+P8rNvFwauxTGkuxVJqmtxQculJVZF11Dz3lscZ2XaRxTFRgN1CO
+z4r103WWc7YMU+NkDeJpM0s5B0mbHnhLPdlFHcqMRrTn7UUe/Xk5OtzCIQcJKQOU
+Bk07gh7Uzp6IJXvdgEzmsJPO+rDsTwNjEDj1fzJJVop5144XKPGYd1gE28IksH1c
++Pwu5AmkigMUWCXngt1+1r8ELCHiG/3tcyCFqqSzqrqvyHR+ZR25upS4aIzJArpE
+gDx4xm0JJaX6jIEec/zkw9JDUtfJmJ+tPvatPhECrsM6jKBL0ZgRtI7GvcJQIb1t
+//AiI+N9MGqOmJVz18NB+cYTN77zy/UutB9D5A210S66bYsPaPdffEQ0UwfYIR4e
+5Y028U+1N1H9YeUe436vli3KmRdHt5+xs2nltfl0wiAMgEAOkb7MonPC5xcwiEpd
+IV6JgFRZ3YSsg81Vr56sQ2YvdREZqPDiSdI6Pckvqf8ZIip/mVfuhUHJvefv+zre
+bv1/xzcMrihjofp97f2piLmvmzE3RHjVu8Z/J+Q/XKw3tzVSzJzJSGdVTrmgd+Te
+42Hb8fjeMeTepWTeCfolY04Zau1HUWnFnxHnwW3a+/QcLU4Ri5/DM/Ye6kyAI3AU
+/jTIecIOsbrwWObgbQ6g
+=PAo/
 -----END PGP SIGNATURE-----
diff --git a/www-servers/gorg/metadata.xml b/www-servers/gorg/metadata.xml
index 8873e51a9c3a..66ac178f3bfc 100644
--- a/www-servers/gorg/metadata.xml
+++ b/www-servers/gorg/metadata.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-    <maintainer>
-        <email>graaff@gentoo.org</email>
-        <name>Hans de Graaff</name>
-    </maintainer>
-    <maintainer>
-        <email>robbat2@gentoo.org</email>
-        <name>Robin H. Johnson</name>
-    </maintainer>
+	<maintainer>
+		<email>graaff@gentoo.org</email>
+		<name>Hans de Graaff</name>
+	</maintainer>
+	<maintainer>
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
 	<longdescription lang="en">
 		Gorg serves as a back-end XSLT processor for an XML-based web site.
 		Gorg was developed with http://www.gentoo.org in mind and it allows you
@@ -17,5 +17,7 @@
 		a cgi or a fastcgi script with apache, or even use its own stand-alone
 		web server. Its name is short for Gentoo.org.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">gentoo/gorg</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/www-servers/mongoose/Manifest b/www-servers/mongoose/Manifest
index 87677a3a28fe..8938d3f3e9ea 100644
--- a/www-servers/mongoose/Manifest
+++ b/www-servers/mongoose/Manifest
@@ -4,23 +4,23 @@ Hash: SHA512
 DIST mongoose-5.3.zip 124529 SHA256 9807751a888c7c32008d3ecf3c90d7ddff1469139b07a14e27e2f54874250bd7 SHA512 eb2f5de1bfb7e2314b64a695f579145644ff84c68b886fdd7f1adab40308a468438416799359788d36cc735b06cbb89b402938ed07ac3d4e40fa02c0a859fcd9 WHIRLPOOL 5cf2183d372d8a8117e7411d98242332a04e97f7d39d0186f74fa7925e1e22a9caf83a35eb08772809cc6c280d7270826edca2c13d12cddfce930bf6e2a10c3f
 EBUILD mongoose-5.3.ebuild 1267 SHA256 2ffe4cb35aba8df036e408d7165bebd942658bf5f85fe26fc26ee7c0cbe6a760 SHA512 58cc1e8cb9fbda50606058eeeb516a7e110bf2b9579c29f510ace42a5d168e3a6325807be4a5c0670285448502863d4e6d961f402cfcbe4167d26812ea0a59b3 WHIRLPOOL 86dfc9acbe6c323321ece5cfc6b1eeee32c0649152987bdd2339ccb8d414eb0c8d390958e7f39c010b8d3517856133430f2789d4c8db3ac23fa8db4356a81202
 MISC ChangeLog 490 SHA256 a150d728d910bc4a8388ebe831ba9e9381cebc3892b9a6e6de7249c5031bb522 SHA512 b565501c08e37f2de15c1f98e1d6e9f2c387021de5777259dfee7d03de2e32c96b8dc442e1ee44be8a2b844e73bd65b82248ca51ff5f8b05e100976726cd786c WHIRLPOOL e55b8397fa7ae9ef77932a0d96734ad61dabe0c0dd25d0a02b8e6bd10d3da03b2876bb0595773b632dea5dbee86c1053c5068094510bc94bb53801aafba5b485
-MISC metadata.xml 208 SHA256 67f4cd233dc8d6d341b8da89aef2654cae64f7e3b62fbcdd3a35e6e30e898e36 SHA512 5213f6c100db04c6bbbf73b4e52042caf1744aa805af76053f5ecaf5f921ffdd35c41507b492da65c6071f1699472db6c9334dcd5bb7da752dca8efe7e1c7aa4 WHIRLPOOL a43dc0ecd7f37ba8cf4d510a1195338816b6193e5c5517c8e005662a06d7fb62c725a3c2981474a872cba628c268de1bea0fb67a31ae1842a252c0fdc723eb4d
+MISC metadata.xml 293 SHA256 f43036896e00abd0b47ffae64a74ae62fa63dc355b47d6d22501cd7d3ef28c7f SHA512 a7afdbbb863a08daf7a966bfa4e7a22c3fffa27ec38e54b4b3fc53485354d0918f2110aa486111f6b0bdef1a4983ab5d1bb0365614727fb755515c92b15910f0 WHIRLPOOL 366e59b9f09b5050c0833a4eefaca9fcedca65a535728d93dce4e836166c2a47b7a4bc27544d563fb363e4445f2079b4aeb2411b708738bf96521ec285fb0d6f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVDE71XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir1W8P/jK9Q9zzIjuNU37YGF5/72n9
-0zzOBOg3jWjUJaxhhPQ3xUua2i7VXATXstKqPjawo7S9URkaoKBD6ug5KMG0Lvsg
-d1AhjTqDBWYEjSZrEvCV6rpCxTBjhfwTifs/8DpHCon7SO5wV4GLYmG8TEmrm5zx
-8VOc6FIiUZCJZxjZdIOeGwgeXsOWTJM/8IxsoXMCAIjqNNK3E78sYiyK4uQcR/E/
-qBmcn9U4cMS1nvAow2O1MIS7LylEPpzvcZd6CfcAtusnSAezPiPCrc8Dot6qM3Oj
-g8sk3IapqJj7OF25iaLGdK8PLslcUvuqRYurnjimejh/tCjaGvaa+SxCtNMAt1hF
-asz9WOWouyNbxtm+ZSm7vcNscmxd3oVOaqqCIQo9fRExv+vDZCn0heNOnFjXsEzP
-IIMaynDbO3IdCXStxF+pA3pCq+LcFUfBc8QW3/1aNhtueRqWyoubxVC0Lt/wjdcv
-dIFrbaAkMTVP1kbSHe9ONCzvfSqFSZm1Bndvs7pwpopOISPHNe6KciBUrCe+InEG
-+Z6aISeUSUFf0oEekylnwlp71yX8inA6bhar/6SWV0e/P+NeR1x4VnTN+DEQhpMc
-uqbLP4WGGIHV88MZBrLv35eMTgT+SAvGiSl1nrn5qMf+4KGdE9jdLQ5WwvDWHid8
-9ch2DFT9pnCmPXHuPAMT
-=BV/2
+iQJ8BAEBCgBmBQJVfzAMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmijZgQAI2p7EB3PIdUJornOMQP3WAu
+NF5ASNdtxTuzZcBnMBYayvBXyPUymAmRe6GsLrESPou4FtPQngkiPJDu+nmwd0M9
+Ic0TqeqFAt9X3gUFPnwsb5jk2z0DUyuAWv0+/U5xzrScQGHAbos+tH9u0K+WobPL
+4gZTX5vwyaVy1akkhErEP35W2gVmDzn464WNzXgEl6AQ45mBnLnLoEZcQTAOp4qH
+1zKL9s1fiCdr52kJYsnI1nTUQAubpbi/8rRhPZ5YipruDqBUXmSqx+hD7gbKpY7N
+yXy6ejUyxZtS9QNHI6j8wNsBet2NqKGzS2BsFDG3oGlilbvrOfW6OUgVoehoao8X
+IPqPVXif4V/qZRpEHXuy5fDEzVLYItm4GRdmK463Fg6jmBdWgqVxjqTKIc+8/8lU
+PSb/AJQQvxw31NWMx9LUk403z2Z3T+HlQy6HuWKu5rbNbpgO0QpFgpstviL8jY5/
+2kTt5VnTYeD7Wa/zwla+S4hSRL6ndpYguYvWM83ciYeuwVV75zjEDL1mUi5hPcZL
+VKvaodZvSLY5D7P37eRhU1/tBoFXc6Lfjh75GmDgu+NspXrdB6UdOmzbPfLi3UMg
+XakD/s3gEZtTXC4GNVeRoXTi9R3hgUw90A+Zwz/XNrf8yFXtGxqjx+EDfUybHNy7
+CG1uK104Qxgj+HJPzdNV
+=tokM
 -----END PGP SIGNATURE-----
diff --git a/www-servers/mongoose/metadata.xml b/www-servers/mongoose/metadata.xml
index 059d713e41ed..252b6ee7ade2 100644
--- a/www-servers/mongoose/metadata.xml
+++ b/www-servers/mongoose/metadata.xml
@@ -4,4 +4,7 @@
   <maintainer>
     <email>zmedico@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">cesanta/mongoose</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 843bd02a461d..ca6bc391ee1c 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX AJP-nginx-1.7.9+.patch 5674 SHA256 b4e01204056ed43d03c06e7955564ecd7f9b581cc238e93a14a64fc898cc3a66 SHA512 8b7cae860c6637b4cffa9c60cc624d8d22702030183d261efef77fc3ec964fb4c23360f4c9868a41a3de4584aed3e2e288c3dd173e0a4a727bba3da00e3979a5 WHIRLPOOL 4da8d0865319d2673ee032fec3ef9e8f0c6161bbc77a2cab959af50bf5aea35812ac80d66f19202b2deac56d4d47d84ce06b356495a1de60c8343eef5c9d252c
 AUX check_1.7.2+.patch 6822 SHA256 e90d8d25d35c2315e3008c60954c4e57aed48d1eb9cab91466356d4967bc46ae SHA512 2857b3e2ae058601e7a1af9b6e7f41e01d4c47ec442df89c3dc407cf9fb6867ab126081547cf9336ccdc40a2a15ea8ab3ed024376d9fbb628432fa3057064440 WHIRLPOOL a96e88f5ff0e3a22745b662c79ed6c15e42ebe121e74f294f17f767e18f77dbecc6c6c105ea13c47d2a298a504115bbd1c9bed4189de2677485fd0eda5108ec8
 AUX lua-nginx-1.7.6.patch 1362 SHA256 02e8eca7895831ef34690286338509f652d4376ef0d7b93bcf2e794e2e20de48 SHA512 ebe40dbc7ad6983d91243e30bda5b87e2b947ff5c94db2287ee75c281cc95f567f3140abd6099cbfd2f0454e1eb71423e464ff8c4931148379812512aaa168d5 WHIRLPOOL 5e07e50bddaaeb4213104ff89b95a1a07096daeed910edb8e729783daa650b591ca963c79b1a88007f216c51c8b44fc6e52a70877aa3d1beeff36682e327e293
@@ -41,4 +44,23 @@ DIST ngx_rtmp-1.1.7.tar.gz 519735 SHA256 7922b0e3d5f3d9c4b275e4908cfb8f5fb1bfb3a
 EBUILD nginx-1.7.12.ebuild 25499 SHA256 fe021a4a80eb4ca2315d555a3001f14380de12af71368df6d36f24baaa0adf0e SHA512 a5fdadbcad6750d77065f0ba1acde306a9b93b0594870418a861dd0ad3ca6fa14aa4b1ee4b4215a2fabff57a1d8af58be129efb78ee703b9be8c7448445ad556 WHIRLPOOL d67cd5ae0afe8b26384af329ac532e462b9c038b92f1692a074513d45644e3c0d7a08ba3a3c660142c4e7c7827842503ec7d425bb044e42416d9e58a5c265ea5
 EBUILD nginx-1.7.6.ebuild 25418 SHA256 d1a41371b2418bf252247c1fe48400d06919f3f546c454fb9883a2dd0723f01a SHA512 a856de131d390a25a4407805ba2c5f54dd2f636d35d7ce830c18dc82c4a1eaaba9d458f6f41840964129f33da57221f4c90fd5a2525971a08e65433f5c5782f4 WHIRLPOOL 275c77adefb2975ed6d5cced0633058e81bd183d8432faa979fccbf7a32327b99172b263a15d83f5aef5dc260b1c69a40cdebca118ab1b6bb17b0db4139e1d60
 MISC ChangeLog 68838 SHA256 4e31d292351e0fe5ee07939dbcb7a92768611b961b7367831ecc6639e4e88394 SHA512 c8d3d63d5962021154df89779a2c928cf7a95a5e554a5f8dcbf2e656f8526ccada84f05cbaf158dd7858eb4099f9d2ae4521ef9f7eb60ed261acc21dc9c42934 WHIRLPOOL 989e64d9a6960661f8b8bc7fd77104eb7a2c05c5216d6e9c9ce31fadb5cd7af0a53a8b7d68104a39671202c0fd33d87bbb5a4da1a750680bc8169b661bf07e75
-MISC metadata.xml 1163 SHA256 fc62172e93d4857665e5e450d6304b613e4f41fb8a31bc3989219c6118064408 SHA512 e38044c19c5edd0580d5c93f1312b780dd2a253e1d811a8c04e24de1f29d1155c706d564fd5c0a7467ae2410edc2178cd7036e030906afa1d5974071ec46598e WHIRLPOOL 7244c3ec582db576a50a3ebee170e359c6b9f159294bc6ac276500cc5908ee044e326793a409e8e22ffa56a220341d144dc3852cdabd38fca1e30f60856c01fa
+MISC metadata.xml 1231 SHA256 569ccd1ce92bfbee51c4d16f8ef2fbfd47e60d341bf1e3e5d82a291dc18decd4 SHA512 5ba8ec759168ac547cd14e25d57d9325c635eac1f6e1ac3532642052a05f209c3da5f84c634f87443430f3d833ee076d476b5136f3f98553792e2c6470742693 WHIRLPOOL aede6b4ccd7b9a4450af43671f1bbb9e71c3d19c8b57c556fe272c4d60d6987e4dd9b5d6ba1acb3e59df4e945ca3e48aa4c5e31c33cde1d2400ebc3d50dda325
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfzAYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmia30QAK8nAMG7ZDjZeYGGg81cWsQd
++ezh/6OOp/tqhHhG5Ul6GBHRlEG6LYZeVD1Ayi8TQvvK5Pvj1/pFFS/zbCeXEk/h
+1qxvMIamVd5KYIuvoan9C8amfsuwvFGuimTb+lp1l6oV6ZV+lHFGf40bMwsDS0tH
++42/684ajJ3ENMbmiCzBGRoSLBpCPvUQlE6j6aMSifXAr2oCh3oKRWlbPdJ1HlwU
+UAGFibZq7p3TrLgOK0xg8HnLZEJmCMqGXAsRSTPwGZX9PEsHYL082eZKdN0lNAxP
+GTiftB+MpzTZzn/ShMGbbfWo+OVJ+8bFAYFVg7J2W4EjcYOQD2eyNGNd/obMKNNk
++M9lE38hLoKUSgCzre19Cf8WbYQtBGZ+AyhwOYngVEbqkRjUeJTHqzzDmrLzERM8
+UdU+l4MeHk1T/ubeWGIpfqzcnZqslqGvDA+rjrRLrSyrmt4B/BimLsuEzF3pKpbK
+jVWJqCkiu8KS6LXD7+sVJlX9M4c44B5oYbi5DLDtk5UIGBz5wPbshSOm8CQzcsXP
+mYMVak4b+/zLedS4u9k3QAMKTzhi6dBY28VWZKpBtSlz9r0XO2KW2OxIceg3nFLW
+hRpFt7T9DcWBzNTjSjXqWd0qObtMIRycIutet8ykL16S/ndA/0gks/vTir7JaMSw
+23OKdFdKnijo5ajacqL3
+=RA44
+-----END PGP SIGNATURE-----
diff --git a/www-servers/nginx/metadata.xml b/www-servers/nginx/metadata.xml
index 5e9ac6b07269..d39145448ee8 100644
--- a/www-servers/nginx/metadata.xml
+++ b/www-servers/nginx/metadata.xml
@@ -23,5 +23,6 @@
   </use>
   <upstream>
     <changelog>http://nginx.org/en/CHANGES</changelog>
+    <remote-id type="github">yaoweibin/nginx_ajp_module</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/www-servers/ocsigenserver/Manifest b/www-servers/ocsigenserver/Manifest
index f352e60daf57..bb05cf3f7a88 100644
--- a/www-servers/ocsigenserver/Manifest
+++ b/www-servers/ocsigenserver/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX ocsigenserver.confd 432 SHA256 f128306075b9a1cc062e7b49e79806affc0b11c68f791729c861e1eff9c7bcea SHA512 d460460eef1371ef8df6e236dbb6fb46969c720ece6278983504db1cf6307b114d30353df75d172a78c041090969b30807696b34490b7ae674e5fa6acca05395 WHIRLPOOL fe5564620a04cb5b53e33865e0b71295abd99690806d9c2ee3cdad8a4aefb803e7a5fb92391f30fca8def248cdc91453b7bc06146bbb96f2ca27db454d41a548
 AUX ocsigenserver.initd 882 SHA256 7e8d232d06adce963795bf7bc58f715b5870c72a4a003d43074fee938869fd3c SHA512 89aff58a2427bb1f557796dcd30aebc88d87c604feaf9b8b9d68acb623b49cc0391889cdd468a4b443533d0fe49cd6cf5303cd38ba056e0465f913036d022c7d WHIRLPOOL 4cd19514b4565d9e701a0ff5047ee3e14df834a3064ceb2fac7dd9cf12aa87333ea808499a004dff0e81e117a29d6dbe72f5d0d4b26be6af60c3e6e9e833b1f7
@@ -11,11 +11,23 @@ EBUILD ocsigenserver-2.2.0.ebuild 1961 SHA256 2b51548133e1e15621bdf4ec01ead70a5e
 EBUILD ocsigenserver-2.3.0.ebuild 1909 SHA256 47449c7dc2e94869c25800f3f150753f03fb5457951672f3fb48afdeb0b066ef SHA512 8d2c769a160db132b4981e5aaac8ece53001ef7c719521ec6c260e9dbfb1f5b964858c96374436846232a6e5c100c1007ebca7d809ef37c01aaea19364a36fe2 WHIRLPOOL 72c45d2c304e3aa560160fc27f2e329e1de6b5587c9f32a62dee241f5bb91182dec3130ba60c720733bda5c7f20bcfe85316fd42111f2c6dfc0b702cc15d758e
 EBUILD ocsigenserver-2.5.ebuild 1997 SHA256 d75460c3ea89e7f2c1abdedef36824e86f7988515f23e558197d48bd8f2f5974 SHA512 95e139d2d0fadbe056a948abff0cd3c1e987774e4b410907749b3b0244a04c3ce04c467b338c6f7423c262b47ce81a8ba39af073a0b75d3ca2d2c428701c595d WHIRLPOOL ee997a912ad6d7810d5ce73d07e1b6f10fd6d07a0f16528845d0b024461f32a08d469afc7a45a683c9d6e2058459239de03f7d9f971dabe7bed2e5583112198d
 MISC ChangeLog 1760 SHA256 55a8bd8c330c9d7ce9832933fd4680ffad177a325299e3d9af15a3a96fa345f7 SHA512 0c60cc4ed085ca5d61fa1c1d17a09caeb5e00395954b1b6dc97da6b35e3a4ca654a223c3d4691c196aa510b654f522913330b85b200a6fe53a50f393f50aafdb WHIRLPOOL d4da23d4b1fbed9a7630f184bca1dbd0feb517fedf10070dd3ab357b730e3ad20d285589fd28890b0e4d3b07e66fd1e85500b9eaa64a8bfee3914c0c436b65c8
-MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
+MISC metadata.xml 242 SHA256 8ddcb2df52a0c680260c6121bfa4705e7c4f7355022359730f01272fef1bec2a SHA512 b782c7c3ad06bdab455982f32ae8226e92bcdb434d7a7bd65cc13c1fac1036a4a37a00ba5ca8c4a2b15767b023cdeb68ef6773cbba36f487f6c3664edc0a0a48 WHIRLPOOL 4c09451ce37971639c4b0e10b8faa5b266c83d15a8b74e909f555f2a1d1ed5efcec6e1b2748c732ac70302424209bba51a2abe5c96abe086343f38ce1c04a9f4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlR8PRIACgkQvFcC4BYPU0pAQQCgk1RTxTNS3zDGoSJZszd+QwzD
-ScoAn3/PmeCme6v50Z0chpfMUF6IAtOB
-=kmvr
+iQJ8BAEBCgBmBQJVfzAhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmijEIQAIYtNMPVtJyoWITXnaVVoUqz
+0S15KwJD4msBrwml+DXb8aNyERKRGk7aeSh6FjGhtZ1rbaih37xttcKMRX0A9ieP
+5axsEsA+tXQzb7PcIyl4nBf3NXB3n4zljRYHEduT8ezMUIUvmQNs+KSjIq/7/Mza
+6t2TWIcZ1vNNFoJgeWRSKqnGseNA/TUFwIJMKT/OvcfwipTciWxdWucUkL7IyDyM
+3IPBkL3+h3FOA3w0bIYwM/Lr2ID9XxrKLelfMIDkPxKf37UNMsooMZg55cV+KlcC
+A8F7GJ7O7kjQaOJiPPUJMIJdC5i/YhtsPRCVVjp4seCPF/lc9mgyJXuxly6obAem
+p339wzvwkpK6jk1ET4tKc7DLXtWNGOvBXA0J2RKDbiL9SImMi7r1I8xj5A6G/TqN
+Nf3bkSsHFPiOEUO+QLx8EZL/AwAvKPjNxMq3JJc97UCkWAJEUlLSUBR+sqaNedgB
++BZ5FKQmWcKON4cR/BMXFNvV+bhx2XocUqHVW3iLeJHZwZ3Elh1SJzY1WW7y4XZ5
+UhAe3/7Rt8NaF2/195lP+P5Q0gf0+Jx/FwkvJiOXVW6aiMF0j2HLozxxcgGZEnb1
+0Dw0ElPumx51hMLl0ygTqvZDs1DAQf9QuorEtvhbIuR7z1+DSEmpJJZqjF1IFrnE
+gCacIB1A0tsG4On92FLE
+=3y58
 -----END PGP SIGNATURE-----
diff --git a/www-servers/ocsigenserver/metadata.xml b/www-servers/ocsigenserver/metadata.xml
index 2193d772e351..6c2941a2a9ed 100644
--- a/www-servers/ocsigenserver/metadata.xml
+++ b/www-servers/ocsigenserver/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>ml</herd>
+	<herd>ml</herd>
+	<upstream>
+		<remote-id type="github">ocsigen/ocsigenserver</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-servers/pshs/Manifest b/www-servers/pshs/Manifest
index 776d418aced5..c80cfecd6fe0 100644
--- a/www-servers/pshs/Manifest
+++ b/www-servers/pshs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST pshs-0.2.1.tar.bz2 73754 SHA256 3219a824a508ba4305e83900368e460c248bf23765ae6f126b980cdc939138af SHA512 5684f6dea087b2a91265437eefd59baf9ee3052adc120a5d1cbc9fe06c471fcc484320359bd0dd0b68806916a1135e11f9a51dd87b1ffebf64602e6e938fe553 WHIRLPOOL 73891f2527116c0e85dae7a126963726f71b422d3d14e4932e3dfeb4cc34b1e6572e2d7eb33aade498debb851080e297607b0f757b5e3b62475a137ce51b32b1
 DIST pshs-0.2.3.tar.bz2 79531 SHA256 ccacf43f0067cd8d8ebea736d45d6b7af774a8d01ca49967f605cf5fe07d7e13 SHA512 883d620fc470534ec15ed309b8f7b5b86c8fbed38a4bd0df2ddfc17259cbde2334dbb56826e77606b1245b24f1f986d25375f189e924affd168f3ca9cb8b910d WHIRLPOOL 5437826800dd711165a33f2b169760443f9697ffe069d2c25ca204c8ebd30495187e30f7edc670e91438685713fdda285de7079d788c27cd7539348fbd050d97
@@ -15,23 +15,23 @@ EBUILD pshs-0.2.6.ebuild 1046 SHA256 841b0a61890d1b993f43faf08c6396db12bae09324d
 EBUILD pshs-0.2.ebuild 849 SHA256 02d84651de00afc308bc08eb2331618f634d0408ae87c6269489884b62c2eee0 SHA512 bc01267250cd52c953cc9e08754de6c472f4c882a9961f22522627f5a287fb10276ea7134beb63647584d2e252bf9a9c48e6b1818d0189d86166ac1219c67cde WHIRLPOOL 3cf900e3be58b5436553093f037bbd48fcd4f2f5a5281a77e9f16077cdddd2ec6d2fbef46c1b5f7d121b1896bdc621754dda5211fa744356f731027b6917f694
 EBUILD pshs-9999.ebuild 1193 SHA256 f32f0dbd390ad793891e5ef5d87fb15bdfe24e0a1b43d055955f0933fbf51e1a SHA512 e1b6adf30f527e07cb3a1cfc6d8137df2635e15c6ea30ac78e5813b7f4cdfd88845343abf564a6f957c95387c8f46a3d5de732e288c6939174ec64073e1dbcae WHIRLPOOL 62d72c8aa8f210dca57230576ff959775aab2f9d715d0103b9fc121853c673b6e0a9c8773f3a0a90ac1b775bcef58a61d0dc070eaaa653f73dc72427b512e9d7
 MISC ChangeLog 2590 SHA256 b944e691e00a71a58e3760813f390f602eb982123b90298f663f5e37382a3c12 SHA512 f6771af959a0e3e6db8b0ea1767fb8901b8fbcbc017cbb265471a63a1ebfae243b8fef7275179c155e5afa8cb6a77fc471129614ec6d00cdcfe2df42aed0ade9 WHIRLPOOL d313b471974902e8ed0eaa67b1242ac45880ad53b65af494d3717ba558f8f9dda176dabaed26c99a5953a7801d34b532aa4b0df7c6a1f52f1d436b1b32c4aff8
-MISC metadata.xml 750 SHA256 973150d59ee6541ef12fdf862d957e39a70472289403879f851e89edcefd7e6f SHA512 2b1688ad2a82a54d45c0e3339178322e4ab335f3c6d24c09b1a1257d01d911aaabd671b435e1059e8d497887b81d6393f83e5b1bee5a5283f59a66b0f05231fe WHIRLPOOL d3fc00a2e70479f648707e9b56ec04a76e041381d360a872b27c89a82b5a46fcab0e661accc1c184702c8c2025ac6f531c31173ce63f83c04b35dd3edb3d306a
+MISC metadata.xml 804 SHA256 2e20019cc6e55fbfee7f98e2e0b9e2b1a5c7903fda944a86459593bafdb5ef68 SHA512 704cf31f41a2079d26a1403f6bf64c8ffd95a26b0be26d4533dae022fbc0e09a7c1cbc4f96a8f85067fccf90a84e1952cb3387c8bffdd407c3748bef35f4de5d WHIRLPOOL 3530a078791532f663751eb351ce2993948a0304f99e3f37d2e3843a673f20f34f629d70cb4a22ef5594480486078997421f6fd4416aa809a3116c8cddaab7c7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUuWIyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZODsQP/j4kiUzQipOu0oQXzTVnxGPx
-y0Y8OwH1p8/cVNHw/zmYlWAyoc+mZythf3xB04QGU3rZu2MNNuIiYe/PbmRmKR3x
-nsvWvsB9Hl/9Yl9rtcU5vXWRduTgLLRFxkyZk9svGbLERnEyCgJux/WRHn2/DosL
-qVrLBL8GhdZWGFPFwB+i0vJEUQ2/A3rwSmMEV6r9rD6gzYIkvDzKN5mI9EUfNNxe
-fVeuG+UoVms7jgum8m4kfhFiDdRcTwQyIjrX2QflP856Sq+pFJolJN+v6hEw4MIY
-w/yqvsI0YKLc4+GhMYtiuq9+5ghast+1Zm5sDTdbEfievYTtaaklk8yzPw0oq1WB
-WdOPZRtC4OIg2qOL5/Tngq1h8JBO0QslOVizlvTkzDS5s+obYLmgHotNNreu+2Oc
-7JOtv2nXHBAGt4OS1xE+/SFcW0RRp7HJS2Kzi1SmmQzlaLR/M8xdlmnnTwYnRg5Z
-36U5Kif7jlFQ5L/r5W9W+G7qzVWzTxBSKEZyajxBOUdq0dpXWaGtbxaegyaRqJGr
-jB77qFtogg9AfnIKPuiNmd2lxKz+OlZtTQECxo/FZ/47hwPlaXpP0X8Kcb7CERj7
-k3k4G9B4JHUsapsGwFJUg7mULZB9v662mMPZJy8lQnFkx/60mZSgmpMc4Vlwj2Zs
-XNTPEqtuTp9Qqy2le9T5
-=mL8T
+iQJ8BAEBCgBmBQJVfzAsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiMn4P/R/EgplUq+RVNKzz9k9AVsZu
+ZqgU3LKr/QJt5cvlI3IUC4IHgZGbBCxOCgoIXdw495oKxg9MpfJPFRzlgRMgn8yj
+TBFz3QY2buYKME8vXh9MA9DFNofFDzr1A1iPJdMDiLzgAEh3JX9qQ5ftcdugue++
+dZw45W1dKJ2APw/vBp6JZfr8SiNM8iaVPo0ooQ9E8TWSY8SY433YhPBtUGxzMIXI
+HSvaMaSC5Pr/Lrs8/12b179RZijI2skdFg2KtfUJQerZypyeDPEdY4QkKYDy/Gr8
+5Qvh8QOwb7YFNZs8gYCzJ/z4h/O5uU+FicA5u1c8B9zGwecx1glk2Eb6jCJaOmmB
+e8IR8CJgPcSZEkk3UWaGJFi0lMwrMPhb77jUgltyLfKE/iM1I6rL/gyDKKVPD9lG
+19nb1h0v9e3eY+NnQ0E+11Z3H4pZK7ZFwUhZyIfI33y3Zx1wSHF/zX2Gf7vlMU6s
+5o+MjuGS5NbAB4VgWgn1yV2gbEbty/eSteP6bgSxVYIZjWzSHOGDouX5C6tKhjMX
+9rmcyCiNlGFI9ZBWa1FEcRiEaQ1QULkJkR4gu8xqQaDlMOxNEDdtoHrhxDLmES3Y
+mzNDqfh5FmZn2vXiqHw1AjAMGa2y58pZIWK675qN+5B0QEVcIWFNx+Gxc4bonCNc
+YHWF562NIFMi4WHipehN
+=1Ir5
 -----END PGP SIGNATURE-----
diff --git a/www-servers/pshs/metadata.xml b/www-servers/pshs/metadata.xml
index 4cf7dbed58a0..408f94d73e14 100644
--- a/www-servers/pshs/metadata.xml
+++ b/www-servers/pshs/metadata.xml
@@ -6,11 +6,11 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<use>
-		<flag name='magic'>Enable automatic detection of Content-Type
+		<flag name="magic">Enable automatic detection of Content-Type
 			using libmagic (<pkg>sys-apps/file</pkg>)</flag>
-		<flag name='netlink'>Use libnetlink (<pkg>sys-apps/iproute2</pkg>) to
+		<flag name="netlink">Use libnetlink (<pkg>sys-apps/iproute2</pkg>) to
 			get network interface addresses</flag>
-		<flag name='qrcode'>Enable generating QRCodes for server URL</flag>
+		<flag name="qrcode">Enable generating QRCodes for server URL</flag>
 	</use>
 	<upstream>
 		<maintainer status="active">
@@ -18,5 +18,6 @@
 			<name>Michał Górny</name>
 		</maintainer>
 		<bugs-to>https://bitbucket.org/mgorny/pshs/issues/</bugs-to>
+		<remote-id type="bitbucket">mgorny/pshs</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/www-servers/skunkweb/Manifest b/www-servers/skunkweb/Manifest
index 42b9c1b753d8..2f515a50fcce 100644
--- a/www-servers/skunkweb/Manifest
+++ b/www-servers/skunkweb/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 100_mod_skunkweb.conf 1727 SHA256 9aac3364aba8cd5ec04d92fe193aff709ed2e879944494679acabbac6f938641 SHA512 de6fbb5c2b801c5ac46785df386ac576b94e9e913bb7d4fa3e68551557f62621b25e220af094774ca34f27ebeaf086247180a71493a35f477182607b4f518546 WHIRLPOOL 32181cb6c7f65f6fc8d2509b34fff382c9ae70a96d5931681c6777365f4272f069642dd23a2c780b98d01e8ea766eef9cf6418ff894e627cd9df6be1e91e0e61
 AUX skunkweb-cron-cache_cleaner 108 SHA256 02927df2a6c76daeb39f1fc71e59c31a5c4862badd087fcc5047935006791189 SHA512 c85499f2734dd24aa8040c479a944c0613cf6698213c4e75e5719864f16fc18ff6d7ea99c16d5e2f4f093a6635b7c15b84ebca028f630a6a6bdf61c6e7676d96 WHIRLPOOL 0df203c60bd98a5d5e070841c9ea3e5ef307064f008eb125288338ecc2a2a62cda6591270aa91fcde2a721d09493e2314e1f19837e01034ee4ca08a090534e89
@@ -7,21 +7,23 @@ AUX skunkweb-init 518 SHA256 3c8077ad2429c0ed083fe8157b7ea19e421c67b433de81b6e9f
 DIST skunkweb-3.4.4.tar.gz 1411045 SHA256 a7f0bc47788cdb01882d53f433599fc1837013f45b7d13ea67d60a81f8c6f1e0
 EBUILD skunkweb-3.4.4.ebuild 1920 SHA256 cf65b59e46bcc51e5dec41efe291eb0f18ee5c9b185fd3f786bc60631fff96b3 SHA512 77d2ceaaea6df008ef0ddbe333e1d6a48e380b119aec85be8dd4f10a3120ea71f9bde2aff771cda87a8c23c4684c62e926b51ecce00fde7a9b84ba6c6013f01c WHIRLPOOL 17c9783a4d814f908ffcc6eb579e1dc486becb7190bdcda155306adae9cf19926787daac2ff0dd67562cdcd04e190fcb5e2096753d4aee8b0aa34a78c9d34e29
 MISC ChangeLog 5506 SHA256 dd686a82cd62d9c4189f0f61752267ee5b9dc9df624b1f31134f3774a7176438 SHA512 888a62b3293c31f7359b848ee3688e254bab82feb3038f0128452cb782997eff6f66241b4e70a8ab07334cfa27e47fd962803df3b04058ef17f2975a239f86c8 WHIRLPOOL c3792debc50ef11c6a787a578999f6a051f0c08e6a6c4644326991b3b6fa3fa7a69bfb8ada02820076b8580b86f9f266de123712ece34f1491a599e77050c917
-MISC metadata.xml 463 SHA256 4c8b297a5759edbee85a8413299a342c85f748a64bc22419595e5f2c03ed8aa9 SHA512 8bf8e31156aae0c5ca3072bd866040b8a041740331cdbcb91cacc03db6d33db3b9d824525aa1e4a9d6baf462c4a78b586f9d1353791fa43e6ec84abb9721964d WHIRLPOOL 0cb12fb6956e65534187ae39b81cd155b07f771a7dbd36d7065578fa08b10ec3770a8bb89e8847bb582ab760b477f8ba8679c72d08e1db9459a9ba1174482520
+MISC metadata.xml 541 SHA256 0abcb62538b3eb3feb3e078f85bb88ab9774d753fefd07f0fdc3afa3ddf2180a SHA512 b64ebbf5da34b6ab57a6434c16fbc163214e97a5c535021c997098ddf9bf4870a7274f56d0c1ab65049b110a1b969428a3c99441c51c7378984295db2e843a72 WHIRLPOOL dc654c579324a47c06f6f5b72eebb86d4f182cd8d83e5f89c5478e51d9e4975047dc206a63068f7988063c440917c9a4d432b198531462802d0ddb83fbdb47be
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJSzOuGAAoJEPGu1DbS6WIAjNEP/1Me/SBdmODj7xELRy6xIjnC
-Kdbf0LByQKXO9e2GsOhjc5PC2ZMJCAp0nC5cAiMVJy1Xmb7J3d6761sjuQy3ER/s
-rPoSSC+owvslMen7kbrngFsZ+MTuh7By5T8hsWPSA1mQNsGSX1+lygaH2NDDM89M
-k+D+9eCsh/IadbjR3rpwZ0/Zgs7FeWXh02vS4BZbk8/SJc2pU5i22MQ60CY4y0ZN
-SQ26KMoqo/vPdTfLyhAAnj904fAF1obljsNnXotwkAmQw1NNpW4A2lzB+4HLdUT1
-qNC+hM7pxUUquvSSTLp3YV2gpyj1OYdOT3IHtSXjVW+b6Xq9bXVY8sjYePdF6rRL
-s0JUMgPOmAobUX0moVsI96ZHQ8dwRf6APmG5s8mADijP60X8Ze7V2tJtNvQaSFkQ
-YhO0fcZLQTEgD0HfpYacefmcIOXnyFWFNbShNBiBxBnzc/Ri6rx2uWsp5vrDDuxr
-7mwMIKz+B4aXWfdLaDxSEgQnqIEhIg1kp7AFV/UPcXRmSVeF3QiVF+L5PBHq4k24
-thBByxDTa5WVDCl13zMHqDH4X33NXclkc/azP0A9x9md1xzufGjz1lHPIq2qx3zp
-xfqIheiLp9PV8KJeA9ZpROCgeR8FS/mbdQrK61w9vlRlC+nyv7830DxA/a0JeLsE
-1XnFkmNp5aj3dETRM5op
-=VWBE
+iQJ8BAEBCgBmBQJVfzA4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmicUgQAL7giRukpoMcdKZYO/FwJmce
+YjVaoYgvfoShk9vEE8nMjG3Xn92jyoVN2b2F+Hj9GEHploOFNPR5E/sQxTLYYIdD
+wgH0srFAoL1UmR4tD+DXTnGpEb9qLfaH9xCYUBEUcKoqTEm48wzCWPLXa1uh56th
+rpN9+qNA3Wxj6pjsi9onHTR0dxiv2C2Oq3HlySDZi4WMcROYQIZaJDCPAWqR9xjQ
+6fAmdvo3B1idr1HS7Pv1OfvD7F47Kbwtis6+JXMmpeIRJW5LUeGMGeP5WZ9SbDt2
+FrhHxuRMSRMyhrnB4iphCEcu7whvTdSO0li1FUCQciH+vrAaf3OANLBTBB7GoSIq
+A7to+LofsDyu9sbCI5/789CeNffNQyJ50pm6aIjaiPsk3O0cXomU8/jS4ktg2oL1
+37kWfxLgUmUoADCoq4U9fSzzhEH25vuN9lObqnKIgU86Q6RT/o7xaAEJjBp6byPw
+RCJf3JpUeQkjKVDnDbYzbmbW4kaHJ25g8Tf0ybpp+mMsG7f401fE7ujKffvJJK8q
+OBRQ+WnR7W6DrF8fBSSmLnibpszRdDZuwrnXsdAino10dlm7coHaGjeJTrwCe6SJ
+Lx+7MRSjAUmzuyOBTfTnhwjp1PqRYCACUL0nsxp69uMLH0pnlW+1cPcd0l+DorwC
+Y6M4unTJS2xDSwLtG/P4
+=kdh9
 -----END PGP SIGNATURE-----
diff --git a/www-servers/skunkweb/metadata.xml b/www-servers/skunkweb/metadata.xml
index b96eb54789f9..52dd0985bf7a 100644
--- a/www-servers/skunkweb/metadata.xml
+++ b/www-servers/skunkweb/metadata.xml
@@ -8,4 +8,7 @@
 		or can be deployed with apache and mod-python. Includes server-side form
 		management libraries (docs in cvs).
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">skunkweb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-servers/thin/Manifest b/www-servers/thin/Manifest
index 2cb7e6e95b37..0b35547c8e39 100644
--- a/www-servers/thin/Manifest
+++ b/www-servers/thin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX thin.confd 772 SHA256 0c6d12deb82208da1acb5ee1f55ed9a5df159ea0f31db9a99b416ca3956a1772 SHA512 f7c1a9fdafb34b9587c10ed058e4b3094042b55c08715230f22a23e3bc5b383a80970848c0d1b2936b33f29fb6c460d834b38e6bfec59b36d2cfe8c3115840cd WHIRLPOOL b7ebe2b567545331f0969f8dd2e4afaac89b1216a351d8c38c73fab8aaa875a4c478a781ea0455a7c8de0d7bfd67042210927cea4bd375936c0e7a659c4e666d
 AUX thin.confd-1 1106 SHA256 8da66b4cd3c51b7d811c9505bf306fa90ccc400569d4b77086a456f19edf7547 SHA512 7fa42fcafdc1a25eecdafd96b2fbf8555fa4f757a111fdb1927d92f19c320c915d3212cdb3edaf526b74e76cbcc246c417ec194ae1e1fc1b85c82eb62a1d5c76 WHIRLPOOL 1420d82903804c0106b633a0e0bf157b0c9e4d0f0ff2ca2f51072ca0263f1ade848d9030b4a9c872783e481e263c4bc46cc29d4085d60de9954c33271dd4649d
 AUX thin.confd-2 1251 SHA256 36ade83707fa363434485e83ede77379fb55300f7e00a3b4bbc8f11cf1249c18 SHA512 b3e02dd2c13871068f47241a73ac4d9f0a98932fc263303913a48dbd5d4b95148dcdb7ebced7ac5f2d853e33c1a9214467375b72b3fbee0bc0354f97f96f6891 WHIRLPOOL 15bb001460aa34c03c1ebde665f0c17d50c491d9ee6ffba4d5462cd67ca3699ee4b0443ec2bbe730e736aa8d3cd9987a893d5c9a54ad11bcb9e18cba41eca83a
@@ -9,4 +12,23 @@ DIST thin-1.6.3.tar.gz 180296 SHA256 67ad0865c75c09b454bdabfaf7943275282f4aa059a
 EBUILD thin-1.6.3-r1.ebuild 2504 SHA256 0f8993a0a42b61420b3c60772ce7f9980e69ae13911b14b576503b8c2c5a03b6 SHA512 5650ab0c00a1ff5238bda54901447c4fff54b5162849323fcf62a8ec90590cc75965c46fb2466e4463f065e4b375121834ffbbca00a19b35443704374e67d6ff WHIRLPOOL e5bea7a3b4d6244ee3b9d319213bd9b2e4cf1d86e1a8b277634cbb8e8596814bc0189d58de921626d99261095f2b0e872a2db6b3952e4f554a66c9b5386cbb6d
 EBUILD thin-1.6.3.ebuild 2500 SHA256 802b7c00079ca09b758cb2e77162f15d87b62fc66ffbb1e93df98fd2629c9e10 SHA512 7ee6d485a5d52a2c6ce1405ccbbd01e16a6fbe3526f7311fe2c9de0098b2a073ca6443b0ebf5dce06ec94b46faeac194c015db6b4121a3d38f6387fef024cfbe WHIRLPOOL 374a33dd2b2e02e95b137af34e7f2fbcccbe3da7a891e4604db3f55538ffd5b3a37bae7b2950a786aaa280b78b9ac194577c39b19efd7bdda911ecede261aaa1
 MISC ChangeLog 5333 SHA256 46893ee18b5b3de7389e6e5aa95e802addb97011a4f12c26a37189b15ffcbba7 SHA512 5b7022bfeb4cbadda1aff9da08e3f6947a3a4ee8dacbce8e0ce2d0fc3cf6c65ee35134693d3bf093dc0002e3061f43b0ec9fee73dfc9c6b46b58ee03874d4441 WHIRLPOOL 777fb8f419b94294ccdc40449d8da0eb86304e7269629d3a9ba0f977b4cffa2981dfa88183164b7b3ca169da7de2f1e6c06a9d6be6a5f112d5449dbf0f02ba9e
-MISC metadata.xml 429 SHA256 f96f9c85284589d524a5b3f2ae0ffc9f370d729da95dc0c3e7beb6f32c7eb3cc SHA512 6f2c32a40d0e8ebf04e181459fc32e575a625d4f8c2858af607421b959f1c5d8069fc56a7c42a0e556ee7ca64c30b8524c6a69f4749c74fee5d67bccdf2a312c WHIRLPOOL e13401713e98316419b6557bd6f3d50162d6e1c2856c2397463f1b295f904c14255e4ed270e16c3e3a845c15841b97c9df4c2df404c074c8716d8d363638e1a4
+MISC metadata.xml 512 SHA256 4f26741775f2b734e28eb339c6c575018b57117ffc124cd72aa70b3c8ea790f1 SHA512 18b249b8732bd7ebc8fc47258eab31247413337dc94edd98d23d84c827f0b413b0f310ae6f41a9145325327c578aaf8bcba1e28881737f46520efcde309cb35f WHIRLPOOL 5e7bceef7d461396abc3805ab3042701c0399db55fc4f4e01b1f1c4c0c5720670af2a76d62768cbc8427f58adb40facc366a8f7936eea18c94f559cbd03276af
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfzBIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi4kcP/iF78F+HUTmEOjtYLQrOJW2Z
+1p3edECcRg++V2kjpDrZjVuM/TJFanH9n7t4hLmSpPzULAygp+MM1aoOPupwObaL
+p6zCA5JJTSa84w9b3V816IL1gUiMEYKZjHKU/Ka3YGTsuSF33c5iOtUYjk1ODHxe
+y3sxpZqd4ZWOJmXe4xKQ1JnkjjSH4a7nuiP76Fz6E3f+AY9s0gFGUPs7puIEyQ8b
+6IbQ6mPT7Xm+n1s9dRxsdTwqtPeIFuu3qDXcv9tpgXi3wbivOGyICdU/MHG2GL77
+AEMyoMpY57R26NcZ/n8c4wFzbuMw0Mq4hrPdY8dQsaYHB85pmFiNqeEcXrOPq5ks
+jAYc1pVzpdG0FSXEt5AX7Sz2BrphrG0+0cVzPXRWDj98shn1RHoNoi8Qez4qTpHc
+qC3qYBOXX+gHd9ae6EJKvs5q0pXJ53Wn4eilJ4oTsJVjv5ZCX01h39NNFJUcVxxT
+ZmAAYa6ToH9EzvBfwXMLBaZlZGs381gI/yiIHYqV1dPWWjn+tN51mjNbXVfSqBCv
+MmwrQ2vtimz3SDD2jWkdpxanUgTocCwDtB1ZvZ590q4O9ko2LrvkiihHif6sf741
+8Bl9S2sFpOR9smY20gBkMeQFVYvLhUWNVGvAeUH3yRBGWSh99Y1r2HHfoawSBKrr
+7ntqArQ58kTGUNHPgjsz
+=bMX1
+-----END PGP SIGNATURE-----
diff --git a/www-servers/thin/metadata.xml b/www-servers/thin/metadata.xml
index 57b876d84ca9..468426a55f69 100644
--- a/www-servers/thin/metadata.xml
+++ b/www-servers/thin/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
-<longdescription>
+	<herd>ruby</herd>
+	<longdescription>
 Thin is a very simple web server written in Ruby. It's single-threaded, which
 means it can only serve one request at a time. This simplicity affords increased
 speed and decreased memory usage for singled-threaded framework like Rails.
 </longdescription>
+	<upstream>
+		<remote-id type="github">macournoyer/thin</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 43bfba2eec53..bfd92b0ae824 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 1.1.2-threaded-php.patch 1098 SHA256 e5f03fcdf2ebf7d2867b21e640f2c44f23da169108b2ea964e96fea44152d49b SHA512 d213c827710b75c1e4e1a1ad657515a7d2cacf02fa1f2f309d5cf986b3650ea20529077e2d2df5a22ed6edf60e43e755378ec6ea556c43c844cf534552239d75 WHIRLPOOL 1b0e42b83aa45a3bb17edaf4f9d7b260bc9dae8d7e8f06a38c97045361e64ddd9e774a1df1244e521c7973b27d27d40cbca4d8d2b16d0f9765ca2daa00cc3be8
 AUX 1.2.3-pyerl.patch 1015 SHA256 1da74cb8d108f46c4faa39548f73de2f74849dde81d1012b71c7c91ab939596b SHA512 b298feccb2604b9459a15699d786c26be9d830f88a4a00beca69fba3ff0d5d78cc239e6dcce51da32121c8bb4d72af41a6e57e5594a3005cfceb4feebbffaed2 WHIRLPOOL 60ff1374e1f13c9ffaa65996a24d87d86d64d7f4edb9d1378d0b7287bfeb285d5123da4532c6e0fb022ff78d80a6b5eba9d6bb8c36536145d4a11cbdecee23f6
 AUX 42_mod_uwsgi-r1.conf 248 SHA256 40ef0a3916eba8f1a87828911571e9d8bf838f38f050d67df1662aca11ba6c91 SHA512 84babaa9aa5cc1a52235f1b4febe3d9dd1a90e7e28c54499d78219727a222e2c2f4db001d898e0fdc46718ea582ce3fc98d0fbbf94b1730f4a139555225b4538 WHIRLPOOL d96ef19fce89fbb36e1bc7701b2fb7424945f5da9d7eee071de74c9975463da9ba5be0a1a855e75c39705317ce0eef5116e7733d74091bfd984d3c1f189edea3
@@ -16,4 +19,23 @@ DIST uwsgi-2.0.9.tar.gz 779244 SHA256 fe0489bca0a8b95653908be2297e35699fb9e992f7
 EBUILD uwsgi-2.0.10-r1.ebuild 11803 SHA256 1994308c54f420702e69ffc7830753d7d3df947e8aaefdbd9b65e5a5a4261edf SHA512 bf0c0bf461bb174e4ec8d2dbb463992ddb7df1531af20fa106134c906bc9bc25fc0d481478aa82b4e1fab7e309b2b4106a794b60c0953104a062322a4e335e8e WHIRLPOOL c4f4e1b45ca348ced1050029b21299402524d3ced93ccfd903d7d141f9b0dd6d3faae44155d9bfc55da3c7bb4ad9754062a646d9f904a4f8984269f555d0f446
 EBUILD uwsgi-2.0.9.ebuild 11780 SHA256 30fc2b3504147592d09c0fcc7e4e8227a660df82039d067f1acc1406f9a20b80 SHA512 bf657343bc7b864e8aa4e4d6b7a58d9851532ab6d1c0d8589758d497953dedd79fab096984775bdad8c46a8b857cb51e5a94bb45f0c902bbda4da3c4707800d5 WHIRLPOOL b9e2bf79afa44d417fb47170cdb8d9a19455951c5c64b7ccffe5e76be493592d3be78fe4b793c920008b16e97b74ab2406ef48651d5dbc1b241f91551e82a5ae
 MISC ChangeLog 14019 SHA256 188ea990b4b532a90c701196d177359aa98671d372fc277f61658fdedc8304c4 SHA512 b1dfec60f27d00d5075a54039a0aef45516e6249c235b1ca9f876b90db5afa58a1e6706d1af59df7cfe1f675135d848e9b8f817c2f37e3b7835728881ece1bc6 WHIRLPOOL 8b6f60174a45af0658a70995c851cac3c369960e1415874a67da84b792e7b8cd3d2db642bfa1c939a197d23892b889ec9527fb15968a0733b9534b24825442fb
-MISC metadata.xml 1359 SHA256 23d7514e5e6a22ee8fdc6613846e0d5f39ef8630f909b2f2fe9bd392268656c5 SHA512 8ec3483edf72e1a3d677bf91c8cadc87034bfa878fb1858d2d771a651356874d244524dedd4a383178d5a5aff2a366c0fb534b3e42dd326f698a1fa0d86ccc5a WHIRLPOOL 12f8a060db6898ad113316dbeeb37e45456bc843de2233db76903bade075397d2f0e8add70f6a3d6a4c058e18128ea5305881c0af18ce1acfbc52fdecff8b910
+MISC metadata.xml 1435 SHA256 64ef16f210a4231a216a57e6c42de3d9159754a8c5e0890ae8ab731aa00a99d5 SHA512 15a379b7df452d93d686c3d1c2fa0a58f94c7b06ebb1214a68cd6dedfe793c51a1eb16bad7ec141fdcd9e2c174b8d63e28be37e2405889d2d964f69f086de957 WHIRLPOOL 042d8658d011170b37eb6d7278ab312029b69251e35baf8a81ba1611141a14ff56fcb621ed1f392d53ddb98547bfb3982282be2a92b51dacff38c782e5a1e3bc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfzBSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiwNAP/3IOFmHrcYjRmooT9YmrRQPp
+YABabOGqQ7EsS6Ag1ozaN+kou/YbMZHYnsrOkY0vhdcl8jAM3Kk9JtMdQKSp7lDv
+IEEfzUIw6DncxcZdKKJNnQrDNBoZSdv8HEFvD/8C2ZHUWxDqK/ylan0RCF2rX67V
+TpKE3+Ja5plaXkSqzUCYAb3jAI0x96NI4XdhgaglGijYQJIZYyx3w0CJ3RW61fhY
+/P32yK2v5jzq+nELfkA1yKW6G30cfT8myl9nyUsMey/2JD4fqMEtsHSticFl47IF
+cvRZc072Gefv4NOqCVMzAb/3J+WiCl2/ZJAsY0wte8miAMz40hivyPAo1comcNeN
+3kfPoPkEZ7tp00vPY0VGkUb+sIRyBCu+uvKjDV8NOyCW9H9vihZxlSbTw1F/q4BH
+0qXDvxOzJomhILxP2UKGTdukQno2v9a4x9xLwewJHmn46qmAgw0mwdT24PbLi4vK
+l6OzP4VIhQoSgi96gX0mlxU48HdPatsgWrSRllk58j7dkn7xGaiy19S+ouPZfieT
+mMqtx7RG4oAFlfOuU0/4Odz/v28R+CXiopHlMWV4GxmF+jxxBg8Ms3Dr9itfurfh
+WixIJjzGdUfsX0yzjv3nlS4hFY9o1+eiy4WsR3nvQuCwWGaPajQrzPkL5jHH5zE6
+n5rpNkeH5pCmIdgMz9FE
+=8XXW
+-----END PGP SIGNATURE-----
diff --git a/www-servers/uwsgi/metadata.xml b/www-servers/uwsgi/metadata.xml
index f569120b5ba2..2113cc7d6bef 100644
--- a/www-servers/uwsgi/metadata.xml
+++ b/www-servers/uwsgi/metadata.xml
@@ -6,14 +6,17 @@
 		<email>ultrabug@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='embedded'>Embed plugins instead of building them as real plugins. When disabling this USE flag make sure you specify all used plugins in your uWSGI configuration. Note: Language plugins will always be built as real plugins.</flag>
-		<flag name='jemalloc'>Use <pkg>dev-libs/jemalloc</pkg> instead of libc's malloc</flag>
-		<flag name='json'>Support json as a configuration file format.</flag>
-		<flag name='python_asyncio'>Use the EXPERIMENTAL asyncio (tulip) for python3.4 async request dispatching and as LoopEngine (see http://uwsgi-docs.readthedocs.org/en/latest/asyncio.html).</flag>
-		<flag name='python_gevent'>Use <pkg>dev-python/gevent</pkg> for async request dispatching and as LoopEngine (see http://projects.unbit.it/uwsgi/wiki/Gevent).</flag>
-		<flag name='routing'>Enable routing support</flag>
-		<flag name='yaml'>Support yaml as a configuration file format.</flag>
-		<flag name='yajl'>Use <pkg>dev-libs/yajl</pkg> instead of <pkg>dev-libs/jansson</pkg> for parsing JSON configuration files (if USe=json is set)</flag>
-		<flag name='zeromq'>Enable logging and deployment via ZeroMQ.</flag>
+		<flag name="embedded">Embed plugins instead of building them as real plugins. When disabling this USE flag make sure you specify all used plugins in your uWSGI configuration. Note: Language plugins will always be built as real plugins.</flag>
+		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> instead of libc's malloc</flag>
+		<flag name="json">Support json as a configuration file format.</flag>
+		<flag name="python_asyncio">Use the EXPERIMENTAL asyncio (tulip) for python3.4 async request dispatching and as LoopEngine (see http://uwsgi-docs.readthedocs.org/en/latest/asyncio.html).</flag>
+		<flag name="python_gevent">Use <pkg>dev-python/gevent</pkg> for async request dispatching and as LoopEngine (see http://projects.unbit.it/uwsgi/wiki/Gevent).</flag>
+		<flag name="routing">Enable routing support</flag>
+		<flag name="yaml">Support yaml as a configuration file format.</flag>
+		<flag name="yajl">Use <pkg>dev-libs/yajl</pkg> instead of <pkg>dev-libs/jansson</pkg> for parsing JSON configuration files (if USe=json is set)</flag>
+		<flag name="zeromq">Enable logging and deployment via ZeroMQ.</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">unbit/uwsgi</remote-id>
+	</upstream>
 </pkgmetadata>