Updating remote-id in metadata.xml

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

70 files changed, 858 insertions, 283 deletions

diff --git a/www-apps/agendav/Manifest b/www-apps/agendav/Manifest
index eee0ae06a775..e1d50d97fc86 100644
--- a/www-apps/agendav/Manifest
+++ b/www-apps/agendav/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX postinstall-en.txt 486 SHA256 386a02204dd9df62a07eaf3f60f1b9220e540910ee47ba6a4b80b3e9be6c0dba SHA512 e6cde6985e969a8b08f184a631f5f304b6467bfd470591785eef7e7e2568e9c1a37c5a076556f2755a5f562d3fcde341c6781d74ef7af1bee938e184c9774d33 WHIRLPOOL a1cbf1f0133bd6641f13543d6f2b4b141fbd003d52c32dcc23d961c2b0af4c51509e0fa2f5d9eae1c2979a4c101017aefe63940a9ca5ded7298cdaa546b97740
 DIST agendav-1.2.6.2.tar.gz 2586820 SHA256 af5a8a828a1204d3dc4f0457424e77d74505b98c23e1ce9a886af789541ba44c SHA512 bfae7c00ab7f8baf239310e2c04229ee76a56befc57d9ab449654bb0c28dd30aab628a2292670dc8c1ce479593bd1b6a57ba1e4f3bcffb4de27214c855ccabab WHIRLPOOL 952f1ebc2702ed3e13334951b89b7898059c0dd3b917b6c9eafde2bc4454fb6dcebcea575d20acf15cc3f1af53db88735e99aa68e20ecd1ca63390be9fa1b768
 EBUILD agendav-1.2.6.2.ebuild 2296 SHA256 c76f3b61ed80e950424edd49ba7c96578f0abe1b9a136cb4b57e7030512a9ed7 SHA512 545083356c17ab4c3460646878142994e00daf7c3594c7a718fd9cffd1371e9e274a7ba95d174f771f7c12162d2ae329aaed3f6d7d05cb22226e844318673ac5 WHIRLPOOL de481fe6dff0ee2f3d6ab3d8369d842cedeff181c56d34882c45a4f6849b25c75eabb2bc6040301b366be724a733fc27f24558d1611eaff823be840bac3e6b5c
 MISC ChangeLog 508 SHA256 195d0dabeb7a9ffb2428b7f5e28bcb8a33dfc27f87bef8dff52f1384fea1de6a SHA512 55489215a1ee7920035568d823cd9b63dc788dd9551388ffea70fb9d9c079e0f4579e79d88f47a573f0cbcad142e8dae6ff9084037e9ed1d04820cd73f74e396 WHIRLPOOL ecd0787f947d2267703befe5f77a4956d9e81c871c5529c49d0b623860d4f493beb139685d5cb3a405de0dc434f8a5cd912a6fb555e739d8f625892c4f586889
-MISC metadata.xml 234 SHA256 1decd69feb1804dfd01fda996933fd2cd426eb16851b72f40b30b73f5cca7762 SHA512 7af21366d273b8166d7d20a7061e5fb19bad4ece55e2631d28196fa8dd35c16fdac21e5dde36c2f71f215d6e21774d078da9ce27f7d398ec37e5bf7950b385ee WHIRLPOOL 22f8437821a129afd883769051cb4cfdd3a56590e45281f032044bfc5eb641f272f2a08f6d0c6d0b477078c1aeef506857d6ed78352a57e09862c2f04ef33709
+MISC metadata.xml 312 SHA256 7433b344a86b2ecad695fed9bf88026cdc4281a399e16df1e694cf98c758afb7 SHA512 4e57fc62f5b5678e6c52a6a5355b8ca627f88b0af990fe6e4a1577293638748341e54abdaf9a7e44ce2ac7a7fe27c3930e842a24e286f1921907a887a93a42e2 WHIRLPOOL f0139ec1365cb3f3bd5031303a417dd94c551085df7d2e8f76ca6c6f0d3f45f6febac944545ac04941f559c2064e2a387ad03e544637b8ad41ed3d75ab6724e8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (Darwin)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlNcsqYACgkQX3X2B8XHTok5GQCgokz/gFid9D6BFMgB6botbiur
-9eEAoJuv0TxS9geLeDQpwnJeOR4TkQUj
-=GoQL
+iQJ8BAEBCgBmBQJVfy1eXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi6hYP/1RmzOBay3kqrGMR0qwRzatv
+fOa3rjeqajEF8KUaZGVzyYIbx15KeUcCLYrRfJr/S2IWnvpwiufCnNuhp+GoAzMK
+jRezROnyrA5zuN9lRIk/TxfjuDk5/E5MOEpG8UEZzv2iBMHtAe0g7Ea574N86gwp
+EX3+uwAUvCb9Hh6VmR0FPWO1NuX9AtzJoezMYNl9dV7O//Kc6Mfy0Y3q93IyuwX6
+SP/5EHpPueYV/HN86YLFHds15OE+XQ8magEeH5ogF+Lwx5htK06QqKAUgsx5GicK
+mWwTxFOo1CcbMUPP1XpzVmycF0YZkAaPQXp4QlJwb1+4wOBHmcU3N+Vb/D//EYpf
+dL3rFPJePTivGCr5jR2QGHBl3P0ZEA0pmjesenXeIw4N2QeRwSew4zqGrPIln7LB
+WGfRDEJSCapVoKO5p2m2RGJgXj95Nvu+IgAu8LEeB4AtiPvLCUjcoFaRW2iS/Ryg
+s6iVC268xyk74tyTqJJNjxvMIy8T4kcpT0LvUapmMqgQL1fi0nr2c3XzpHhZU00r
+aiLCul7AlE5DbIvka5oEzF046gT9V/0LLhaaMOTgj7NzRIw9byFCgcK2BSZpbM6i
+jZfFVUz2/KbbmUyITLh50fF2i0W61BNQ4JlRlO+6nRrL+3XPWmhMrDHksMRKTCaX
+laWeA6v/WZbpdvsfC/Bb
+=d4qL
 -----END PGP SIGNATURE-----
diff --git a/www-apps/agendav/metadata.xml b/www-apps/agendav/metadata.xml
index 263de02a5e77..c4dd21f48526 100644
--- a/www-apps/agendav/metadata.xml
+++ b/www-apps/agendav/metadata.xml
@@ -5,4 +5,7 @@
 		<email>grobian@gentoo.org</email>
 		<name>Fabian Groffen</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">adobo/agendav</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/b2evolution/Manifest b/www-apps/b2evolution/Manifest
index bd691e1b12d8..7c6aa127aabd 100644
--- a/www-apps/b2evolution/Manifest
+++ b/www-apps/b2evolution/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX postinstall-en.txt 611 SHA256 2333fda76f492a6700bccd4b1121cec4a02f2e419141fa11b9555ff4ef25aa99 SHA512 5ec5ceeeed44446084e18fa739cff5c16eca315bc11f8c0178a6217a5e0f0695a051187bc1d77d685f14e126df4b134e7ab3fbef100ea60ab7741aa2650a9ff8 WHIRLPOOL fe9e2e05c3cb1de76af12f656a33b22819c5a1274936261bd604ec793a37084beb5d9b9f8aac9e1820ca58d63c15cbd1e93e8fc35d829145fc06e5440be60cd0
 AUX postupgrade-en.txt 214 SHA256 312ce51eb9413b0a127a63dad962a7de17a0a3c99d64abeeb282e9f6edbcb837 SHA512 18d0dbe48a1e0b290f72b0a7a7dee4c28c9c24366f9073f2938d5227c80d3b62b6ed76a8a11c59f4e641bde731a746178c4e2eaaa736660ee875917c24fb8243 WHIRLPOOL 6958b6a229d3f36ff009e7c6269bfe3deedf0937f28a60d060ffc7c475b478458749b078dca50a6a0099b5275bc4ab28580d3ba211f524777395eb3147f6c844
 DIST b2evolution-4.1.7-stable-2013-04-27.zip 6112599 SHA256 46432f779b4525bbf24e5b6738d2af504c5c4330e60878d1bed9afe1f6a3f634 SHA512 cf5f20c6dd8ddd714bc6cc3365fc815b4f9444feddea278da08ab247bf8dbaf97c70fe923d4438888e8a94e31567c6f5085850ba4566bae3ec54f45c7dde8c20 WHIRLPOOL 62e58afda602865ba199e0f4bc26cdd270816cc82ab6608ee7b9eced1f5e85a5974fda8f54b3c5928ed97ef22e5dddc984ee7e772e16705b482cd94f5fa0077b
 EBUILD b2evolution-4.1.7.ebuild 1206 SHA256 cb5fe791954af8512c93ac34e95ed6f28d181ba981d0ea125f755b365e505d15 SHA512 adb21b125da64aac943003be442aa2af65dc6809c51529fd562421dd6b337b5cb4075cddbd4d347943477ac8adc4505396231b4e56277d43121543421dfb2f77 WHIRLPOOL b4d8d97671bdee583c70ebbc4f22839935e1dc8bd59dd99e7d11681c00e9664c83a183ecb458592f9e1e5082e87904a83285f911d4714e1fc9cc84f8576e4075
 MISC ChangeLog 6656 SHA256 fae5e537e8ab4310bd652dfe24b8e681ea6ef0ceeba2d474c338ecddb268d3f3 SHA512 b9b79140285f0e6885aad9d7e556ea7a68af37c664750ad8a1cd3c68b022c44aa38bf7b1b4fb422f1122310effdfc166fe278b3bc498369dbddf646ccdd83ff6 WHIRLPOOL a5dce04e6be3fd0a1c5858bda04e05b55ce40c05c021d51dec88001c05a93045d218180906913be39a65da2a03678edb029958d24dcb2e11d43d775aae202dec
-MISC metadata.xml 162 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 SHA512 550d0f517601255e5c9b120a03f1dad37a1a75bdaadad486ddbd2380a7f0dd884970400574455d34d3ba6e800d9fd21467dfb7f89ba27a0aa8a65e7a265534e3 WHIRLPOOL d50adcb067d0290aa7dfe5aebd0e8abf4939ece7afbf284920d08f2bf04f9306f0062a78cacb7572a12735ac41545440fcf138beda81cc53774950bdde495dcb
+MISC metadata.xml 238 SHA256 2f06fd837a87ef0b088b1629e33eab8c83c081fb328417f10dfa5b3a89a551d6 SHA512 aaa50f8fe4477d5fbb9d4327a94f4bb4ee452806e7244ad424eed952d6b6017ebdee49fe84e411ec89852d6ff000877a8634110bc241e1828484e55f9a8afbe7 WHIRLPOOL 534180a83777a33cdab32ae6cfe3af287a14aa77df8d92aa578b48e48c91ed07d620a642a684f6d2a2f04d0a0d238ddf3991d57b4f5f889d0cddf146db45e921
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfy1pXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSminXUP/i+Ep8eA9GKVHIPfAcWgsgRe
+f1HsCF/QYbsh85EfsoOH2zkCUSE/xIHqfgb7jRY79zxI9Vs2DAdoRbT6ULR1sJYa
+9tE8IUldZGqITMT2P+HStRgKqZPv5yby+2O25g3LG91vkCGEu7+616BRYgMN7Kew
+17wmPg5yIxSt8z4OvOjEaKENO0vybXw5pa1yK9idm2U3w8nWo6gc8mjZqSgRebuS
+fTbGJG6QgCMGn0jAhtTFCihvai+xqO1+UjBloDkzSeKm0IaezdP0t6YiNR/ua7ew
+SHPlhhliiZXdzOHJOcGsnbPoDwJjeYQ/93Y7p+5sWsS70Ut8ZHwheBxzSrCcjZD8
+ed91dOuRfbfP+6n+2ke3YZYcyKMX6PxpkzcXau4oV/R6WeyZYsZTbU2N5NdNaGTK
+Xe1gcR2kaZmd2cWkCOJej0NdRdqbMhjSIakaPIME55WIilOTpwuve8lQ7o6CWNHq
+1oShl6vDXLb5EaTL5Am6bOPgNC8YQ7VoeF3OovrcLUDt/g1g9FGxst5nFrKsXDsi
+OG5C3xfundiveUcuC3ItZ4KlcDhb+MO3ABDceqDmRU4Km/7Ghb6Ga682L4kuUnNa
+CCfEneNrM3yxMeWoW//9JiCx6HNIaNQc5t8JnG3dcvPOkC8eOS8Eajb1FuHIcawI
+eqojhBsm4ErqW8cPKiB7
+=gYKv
+-----END PGP SIGNATURE-----
diff --git a/www-apps/b2evolution/metadata.xml b/www-apps/b2evolution/metadata.xml
index 6632069b5aff..3a17645547f8 100644
--- a/www-apps/b2evolution/metadata.xml
+++ b/www-apps/b2evolution/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>web-apps</herd>
+	<upstream>
+		<remote-id type="sourceforge">evocms</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/blohg-tumblelog/Manifest b/www-apps/blohg-tumblelog/Manifest
index a4adbb5d5d12..b72a73c22a3b 100644
--- a/www-apps/blohg-tumblelog/Manifest
+++ b/www-apps/blohg-tumblelog/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST blohg-tumblelog-0.2.tar.gz 11046 SHA256 89d8cdc4fe7c2e058f657a8986123219a65a2b8caa404bec7423e93988976b04 SHA512 c9819c503751f4b6dc5f53b2f16206912424fe51eee4c76da5331e1ee1847066f4c758e98ec6fae98b0e0dfe33d5a37ce5f4ea2ea3abba0fd276cde242489792 WHIRLPOOL 744ab5d1d81faa44d79d9785caf1fef522fbc74f8a1c697cfccb64f5d72e25931d0be55337715111a11cedf3512be940973cca7363ff127d10d6a8789bc78a6d
 EBUILD blohg-tumblelog-0.2.ebuild 925 SHA256 a06cfd471e117f9aea70b9e0b1665d47b94a13ca8b4df8b46c2a1dfb4262a2b9 SHA512 bc3ee9a87ffea948b81e13a489458d655d77165658f3b20a33c63a8cd45b971fe2b5019efdcec2365ae575ed0ceaad50d6c105a75b54a2af2859143a10781c65 WHIRLPOOL a10b2dc309108950893ae3e3c79de8b20c70d1bd279a10274cf004aa8032c7f90b68a2e6e368dcc81dd0dc2e045e5cbf629ce04a57945781273e278515420996
 EBUILD blohg-tumblelog-9999.ebuild 926 SHA256 5f1cf9e0b9fc8bccdb379a2b4b37217f34418d7171a7f15400d07941f9c6171b SHA512 c62f103d17bc110111873540572847ea93a7778ed51d719e4562ecec774edc78e66111d458958264f9c9201b9e1bccd2e6b83bf06aebd677305902da18b0cc9f WHIRLPOOL 8f22b3f238db88285b96e8bee0ed81f2a977e22a74bf74bad9cba652cf56c691cbbe1291706680fd1105b3eaf843323320347738843be5a304af989048f91f80
 MISC ChangeLog 453 SHA256 daceb53e7a05f9d165558eef187b4e05443b97471127ac616bd10d0bc5d27850 SHA512 0bf1142583620e9da33982414f3b5f833cf9efb9401c382dbe5ec00c570f8a63c6c960a48611722c5b0ba96bc6bc9d7c5c16d47c51fea317c631823cd2520e1d WHIRLPOOL 5f068697608cb684e136e5ce7c8381d28f8dc9aa351690d1601de06390afd6288a979b65735b28a14d473b1d02c4fa2c4286f3f65b0955d47672b00e46a9f4f1
-MISC metadata.xml 615 SHA256 c8bcc49f42e9cb65eeb4dbcef69625e6d825447c9829c227f08949d36ad86efe SHA512 88592ababb65ed9f6728a47853e8defd1b4ca754777e3b1d821dc3399f78c698761cbe95436ac837917316ac890eef11a2869e4d49a0bdac0fca63b1058941a3 WHIRLPOOL 2cc7500ab3957b9f01c2334701dcb37d015bdcc825361888edcc36fdb07449fe0fa3bd66d0ca882631367348ce75c8a914c6f45efaf00759ccc9ddb4a48c1975
+MISC metadata.xml 684 SHA256 503252b47bc9faae4be9280149bfcc97bd7c8149b8455ae4e9d03985f8d99885 SHA512 224f85c09f11db2c57f113d59a932fdbf091c682a72a6345343fb4627a858e0e006511d48a992280736d1178b7ae03f28f4eb7eb076a7634ead27583718b98be WHIRLPOOL 87c79fe550a847342473e2404476f21b968c42b145d3a647f0af5e38a4d16b8eb7c01e789921f6239639d0cd858e3ca563066ebae4258d9a172470c4dfb691ac
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfy1xXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiekQQAJzMWSLS+PyZGQOlCGCzIQ1f
+BH8ge6txytPX4hW4b/a65ymW3Ty56rJXv7A1/Ke7ObXGR+sIfDs7G7yaiIHmWlBL
+PkpksZJ+ekRyndiQMA8zEkGcO7bkoa+MoVJiAvhg8NUpfpiEqUzAX1espvU2HUUG
+xyOxTky1CeOd4WAA4oCysWDt3LkcHZxmIwrmYz0+5qYIqPXLBwEXCPzhNwDhQo8K
+QX4cy8/sPyJaMqbuC6u6BOtOKGuDjI6pSzMTyI4s/j3t3nZ1n7c+8x2NftwyA+Pl
+R3ek1de1WyedZjDgSj3wNwKBw+o+sTTk2q3ZNKbWuCmOla+GKOFUXBGPBuI3vasO
+gVKp/RlPS6L6sKTtN37CYGvjoe+h106qYfB44haVLvthj9wXAZCZ3mUfHP6ZG1j7
+gX2tZ6OUCirGEDmqeHu2u4UIp/mzhZJ7o31yNgm4c8qbwLB2RKtGTGKUhZonoAx+
+CoSPz/ZKfhQEz11fvJNUf81JBa1FnqMKd8I6oKfudpPk8Hy+GRbaZpt4hm+RIQFu
+HUzpgBE13xP18mXH4m7Ku2NG04uBgzBKRXBSp0czy3cR504Isn7KdTNafQklChPE
+rqAOxEU7uxG6sO+jTqUbGRFUm5ZVh+uVKzlA0ZmcRA3CIM1+vSGQ3H98waf2JPWZ
+9gbQeFu8RrcWK+TT+lgD
+=zZTj
+-----END PGP SIGNATURE-----
diff --git a/www-apps/blohg-tumblelog/metadata.xml b/www-apps/blohg-tumblelog/metadata.xml
index e37a90df3dc0..1f2cb18711c3 100644
--- a/www-apps/blohg-tumblelog/metadata.xml
+++ b/www-apps/blohg-tumblelog/metadata.xml
@@ -15,5 +15,6 @@
 		</maintainer>
 		<bugs-to>mailto:blohg@librelist.com</bugs-to>
 		<remote-id type="pypi">blohg-tumblelog</remote-id>
+		<remote-id type="github">rafaelmartins/blohg-tumblelog</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/www-apps/collectd-web/Manifest b/www-apps/collectd-web/Manifest
index f42e603aca09..2231f9d23f98 100644
--- a/www-apps/collectd-web/Manifest
+++ b/www-apps/collectd-web/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST collectd-web-0.4.0.tar.gz 771364 SHA256 08cda1ae2efe971087a7f312c9686dc8104bcb58c426925dca1a4e1be24551bd SHA512 7ce242ceab9d98c28332c66d8db727fe8f4ea357eb847f0d3f9275bac813941255bbaf0078282a4cd08750915ee81665d52ba07a94d1a3a72298b822de7a95e9 WHIRLPOOL e7772ffee202ea1701a5193a8f4554eee2fe1b1ac4dc8a65cc73c0c5024743341b5fc0e56d28106d6cb2185068abc5c5002700af6250754be8c421678c96d98e
 EBUILD collectd-web-0.4.0.ebuild 943 SHA256 4cf7eb4c59b97aebc2b901e972d7c5d9516ccfeed207405ff4562aec66a31718 SHA512 288a91f9133a8142b4cfb68716073b4303b9edbc0b12c7279ebd4840ea287ffbc4b5a941fe8e15f625870844c83b8c3da0cb056c230770aba1be2eeca89003c3 WHIRLPOOL 4853371ac2d24f65c9f7cf3c35c1043c21c45865b119089a3d7f2720ed0d7bf7251be4d58bea3ba648043185109d02c1fe281d38c02e8a0dedacb13936a43610
 MISC ChangeLog 1119 SHA256 e8d6560a50072b7742667976e97902503252d059c65e75d1723327f66876ca9e SHA512 332319b2f16af389f182c2344640f1d59c298f5452db2c56ebfd217a0bffcb85c78740aeaa2d2ec28c2f2ec42d11f436b34f9b89e83321b99baeedc56ce238cd WHIRLPOOL 5502c5d6d6ebe0e3cd2a3a1d4b145b47a41f2aa5fc0bf3cf97ab0994850b5c6d7688dba9d341d3bc5c9b76030fc701a3ba6d9f5543f8ff8edb5ee644364f41d3
-MISC metadata.xml 162 SHA256 43c8abb1bfcf55dc16e273c011f146d11197054559a26da3500c9b454ceeed40 SHA512 bb84d2a2083ba579e9b0e1d7db9997561af9eeeb41c1af4af41a6f51aedfc3e03cac9cb1a1f730ce576065925ba44de8e6de9d35c392e9d1f002f8a1e89feded WHIRLPOOL d36edc46fcf9a70b7618a861f337cfc7baab6088d13817a5d57c98a5168b23b6408d6641f167569afe9e542cb29d40988c757a86f52daaa3e8bf409730a515c3
+MISC metadata.xml 247 SHA256 cc3a606b2a4a947d02e1e40a92e800be3033c46d01800810132f1f263f3f9066 SHA512 72cad16514aac14b057f4173d416b0af61f61421d30db431e62e42b64cb768ff322686757c05e5bb14ea517dc322deff2638a91661fb68f166eb1927bc78c256 WHIRLPOOL 86c050bbc03ccb11f4eba4c0d4e01b63b4b9cff8456c7d71badbeae40a44b6f6920cec93babc3321bac8d8f842e9f4c1ef4368e7d0016bb4a5a8c81f418a758b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVfGYgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
-MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5FjEP/0J68K4ebXci+tAOYjQxQhNI
-XiE47Adi5d8IwBTgEA4e7InWjjny22nguWHJIhwc8b6vspibK0XTnSv7ueCxn5wX
-pDrcppt4GQSKjFZjefHtmEo1qpWN3CyPrAjXW1S5uPKIKBKiodoXYXSjB8hYktMQ
-tb3wrWkDMIpnGmtKKYZbE4ZGiIqvBc6X0Sw9q82s63sKESpJaxN+XCjGe93mt7k2
-jh7paikBxGwFFXWhx6+n8nTIenFA2qHCXKTXl9OJsbOfdAUTU29JmMK5A9wogYqj
-h8iqbq9JYM/pnqS043SyjKHOrwIJ+uQ3WBzf62VaRrGs5oS/XPQBBBc77FLdksNU
-2fm7RwKJmdinyDZug/WpmLtGAPnZnMBXSif183WxTPjk0QB0yV553RNtBCO/WvU4
-7LLDZkN0PshyFoZlHGV37U7KCFBdN7Lzd/D6My6oEAsVdw6Cc7ziBEnSO3q+4uL8
-LRpOzwU+ESnQi70JwRo1RJtMRSwl2ZiktGvtRwJE90PFuT9IO/EgwO6+ihyOBGW4
-1pGm4RggzA39fimqvQP8f9dylvwrB05r8eCOAYqa36z8J4TyQ863P+sV+1KoQ99N
-S++xBHcvb40VvlqIlx7hzhYVJldaO8Yror08PvbA1z9oeeVFz/NQl/ylMWFXcKvQ
-oHEwvx3MbUqjNigmOGhM
-=fGeb
+iQJ8BAEBCgBmBQJVfy15XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiCrUP/3LJXcozsofuz/QSDG+cYx6H
+XUOv/0AQeF/7Lh0J5rc3WaOJT89mMT3DmkuiI+1GYMoZkElRbvfQh441kERaz5n9
+9qjUwUmjaORg+aqCyqHFIIF7zVt2dEhTpf7dt5A9fm9L/R9lzDxRxyxBSpepBnSk
+0JAmzaB3gy/hytJwXTmiLSdW0INIu8miN2LnOGaxbZFA01Vhnm85MYtFegZrdeVQ
+vLaR0neQ7Dl/M9bAwZWKokPYCedhKN1oH9Tc8bg4mOEHB9BwyqewQ1xPjaaW2jpN
+PI8LcjGOK7jDrgxMLZtvDctLQWzklAhhIgeym+hWJuG7joriuJnfD3U7rp5ci585
+7pT3sCDi5jOOjBAp1DMDZEO4UWEEtlsNKfZBOo7o36R2A7w8lQvSXe/IznZVSKFW
+Vi858iZsgPmJerE2hsoaWqCNSEAHbYgqu90j3S7OmskFo4X1om8XNBHaUazX6PxL
+PQM+W0sF88hiwzrWV3DZYQ4kVPnApOC2x5/gXXmI1cgWLXz7Aa07UtRiUJUFBSkR
+HOle7nVo+6aJH+H0o0F7EnIZPEsWtONlKMk4eugDqGydFlGfbvr+ZkOUfO1GO36m
+UG3Xmea3WDKKaX2fP8aLV0Mu0gsMV8kZZmAoGIBU76XRcCF42UzrNO5Gg0AJGldN
+c+MWguE2fEVLK30xKnjc
+=kVur
 -----END PGP SIGNATURE-----
diff --git a/www-apps/collectd-web/metadata.xml b/www-apps/collectd-web/metadata.xml
index 794e56895482..54d3aadfce8b 100644
--- a/www-apps/collectd-web/metadata.xml
+++ b/www-apps/collectd-web/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-<herd>web-apps</herd>
+	<herd>web-apps</herd>
+	<upstream>
+		<remote-id type="github">httpdss/collectd-web</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/coppermine/Manifest b/www-apps/coppermine/Manifest
index 0f72b18f67cf..4aaf19f54826 100644
--- a/www-apps/coppermine/Manifest
+++ b/www-apps/coppermine/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX postinstall-en.txt 324 SHA256 075eb512676f2627b67fbfe4483462fe4801c50c62616f797342d8a64755c030 SHA512 a2b2804f688189ee30f7e88e361cde0d180700413dd062f1b5eb66651a88ab63d0efce2fce70c15c9ebceb562a092c25e70685314981f74fc38427e11676e804 WHIRLPOOL 74f417883b233d7958f493cbc4b6804d2d98f301c744bd6f7ee3805086725bebb5b2b5d905de9ed6187bda4c22b874b77663f27e4fce3e1655a4f9299649861e
 DIST cpg1.5.20.zip 19122378 SHA256 f5388d6fa0952f4aba8f51ae9f86c7f916c432831e02050c27d27737cececcf5 SHA512 8dd1ab52eedd8d1bd9eb95936125eaff595a66ca936857a8f21025a81a4d65194b0813b2f0b5db8d9bfab5f4ffb4442afd7c06cbae078e576bc8355c921042bf WHIRLPOOL 1c6c28a72aaa63501e3b11a794de89a5cd1b30577768e3c76f5ae97f0f56c6c743b2af1ec8a07a2fde6e745bbbf89ffe1b8b74140039e0468830bf748b1b44fe
 EBUILD coppermine-1.5.20.ebuild 1047 SHA256 75b570e0410438e07ec3421388f3e68452ea4146729de8b9d0a9c5e46d1a5955 SHA512 f46480a18e57a6a50dd5db4694e223be5bb56bc4f0810147cccc1c095be58f7209d2c3cd0e3b76ed94e69f102be4de004a599d88be8d85be6d3a6bae00bfde6e WHIRLPOOL ea3cd0b32f95dd79df05ea47de57883c47f9a0ca17495aa995258a0c0f860e41f0ce2dd8549c56545cac90e417ea5ce29ad71af7aecd7e99477a680c75dcf93e
 MISC ChangeLog 5383 SHA256 78c680238c4bc0e97cd2891a7344bfed64e05aa5a2481095d705d8bd53a4f2c3 SHA512 f7418d8a34b75e0ec07e240e96fd9238c13adb1dbbe5981e0aba1d8df08e8b189f0a6531a2984884e301ce8e0ede9a2d784194e298c1db6228ec428b20577f2f WHIRLPOOL 4afc4a271080b4842380968b4ede4d373014763aed0c76002909c471c2886034f5080a30e9a28db7f7d9d0e86188a426d3b35422daad58330882916d0646e49a
-MISC metadata.xml 162 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 SHA512 550d0f517601255e5c9b120a03f1dad37a1a75bdaadad486ddbd2380a7f0dd884970400574455d34d3ba6e800d9fd21467dfb7f89ba27a0aa8a65e7a265534e3 WHIRLPOOL d50adcb067d0290aa7dfe5aebd0e8abf4939ece7afbf284920d08f2bf04f9306f0062a78cacb7572a12735ac41545440fcf138beda81cc53774950bdde495dcb
+MISC metadata.xml 246 SHA256 a6b3f9f1195bf75538b68d79d8bc805f7c4fa5cfd44d4e84168b00369d17a118 SHA512 f2ef7c23cd4c21ca6ff8ee6dd5818836ff97e76c5790804d131d2212da6b69c13ecd670bac45682e843d5545eb6f7b54fce911cf262599d12196933a47196ef1 WHIRLPOOL ff824d3a65a7f245565f4b0c89bdbf15250f7d88faab3481af5e9d228a34f8c41f6c8cc2cb85a5ebe9229fb23739125c53775ca92b7919973b73aee041e40d95
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfy2BXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiH8kP/RSeKH+Qm4sxzEnRUlyM8+9p
+3uLnBGtZnc7G5QfjCk0AG/6EBoqxKBFauvjJ6TL9OP99n6aCabQi/tOOTmd9hr+v
+ztmyefZielqDzYvn1Jzl+sOe+sXDhOZ9T6t2hQNyzu6gzr3p7MSVSk/030FRjrif
+ZWLKadE/r4IwVMj2HW8EagLmUSUx+aNyX4h82ZF+jg5aday0N/pMUHph6IM94uN6
+dBAv+wuFR/gc6DGCxCIWr9t+7DF9jj8tX8N7HxMezWD4iEMJ8JVUnUBo1xQP7uWl
+TPW42r0ZfvYdd4Y5t3SQUY1E5+lINwbwPVML5yyH5yc6NG/2Q5nV1tuGgrBfSRDG
+E02/1XqXR8mcKOT0TXrvVOdr22bTMQ7lqw91kp+C+Mns9aBWgnzfYrZsLLNStZy5
+ZdaefpDxPyxzGHfYDZEHZHEXQOraNKHMNwEonWOsZOnpMGtZZWtIs5a6L2KsST8e
+jDae7eQtxkMfg/qMAl8dq3VdQhOSXgKUSWzHUV1v+LWWi63UvN1G7MfZGOfDvfZM
+26FW317SCD5ZIw5jwySGV6kdBeCH1GJFUFRvKXpr320xR9RvFvZ+uIaGOIf/Nv9J
+6SBEgeHyoJ4AOa4IibI/MUloq4En3qoVjOyVNNCPFzIjoZ2XNxtPBu2Za3P4h46k
+Dmiw7rJyMDjTqiRMVXqZ
+=ktMB
+-----END PGP SIGNATURE-----
diff --git a/www-apps/coppermine/metadata.xml b/www-apps/coppermine/metadata.xml
index 6632069b5aff..276a32a3c827 100644
--- a/www-apps/coppermine/metadata.xml
+++ b/www-apps/coppermine/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>web-apps</herd>
+	<upstream>
+		<remote-id type="sourceforge">eenemeenemuu.u</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/dotproject/Manifest b/www-apps/dotproject/Manifest
index ab30b3b07ea6..eba44f6667df 100644
--- a/www-apps/dotproject/Manifest
+++ b/www-apps/dotproject/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX dotproject-2.1.7-pear-date.patch 1755 SHA256 3880c324cc829c5f47bcd04c2a8e6d86ddde3c6ecbd4eb162a5aa4af50d9e7b3 SHA512 fca1ffba1bd9df2b49b1e8fd129c807bfaca1f5c847b862fe5b8b159f243e116d7e21f5445c6383d0ac0bfd6e5ed480da10c5c78c5b10f62862f759c8078446b WHIRLPOOL d20b216fb610914c0a5292a68be108234070ffcbc2b6a564d83afd78cd1ca926feeafaecc834a75e62dca6c8c44e9c82b6f358dbbe574448016aae1bfa5c1609
 AUX install-en.txt 609 SHA256 d549f68d108393e1f21f463dabbc82d28844243bf16800bbd8b73fb5d3a2ab41 SHA512 ad00eb64e70702f032f2f0c8f17daf8263659982d24b554e18c70a59e2dbbcdb14f36f3f245faf36e1ec36e3676954975d00c4f9256ddc2b7bf1899e77c961dc WHIRLPOOL fb0bb637205adce6ec47c0fed24e1ebc900dc3cccb0390d5bdb3131886ac4b91fab4da7ac894ac11d248d9c9ca80690ba7f09aab0b85edfef6b47705cf32f95a
 DIST dotproject-2.1.7.tar.gz 4528969 SHA256 1c55e2bfa50f543c4f6fb877870fa99ffe2abb3971aa8ab53c03b25a578a9a74 SHA512 887637d8b66096ca0313dd257de44f2afef587c795cb8009861698f799db4e09677f6cd7e5ee57d3655e81219e25257c379deafac77003bf7e6f82e70eef8f58 WHIRLPOOL ee158b755338e44148913765c58becca1394f1e0bd6218be7636949c64db26f9dfa0ae219d1aee77158e31d72290c68681146b44538bed79ae538bf48076a59e
 EBUILD dotproject-2.1.7-r1.ebuild 1099 SHA256 9c02f19096e0fe49f8d41962d5aaaaaebc9f2fcb00004eeb7d342badfcf9f83b SHA512 a28af2460023f4487350d395d5a8d59f27eda4864013a309a36f1d77bf3f1569ee19e4ee643111063f3f9ed256be73c85dafd59302110463f0cc4fa34a8eae30 WHIRLPOOL 5848f52f492e0e081abd797b08a96dc1b61cd9298e2b8b43e2f35fde7388f047294401fde11be35cc889635a91192e33648f15166696831456877ae1920941a4
 MISC ChangeLog 4016 SHA256 e85264adb1bbe808b1d570c46193da556407bdbfbb1a3a045b283f0f0b6abfaf SHA512 aaa5f1f471e62f53cad3a5ab9e7aaa04b1a096f6fb1e413fb8b53368dcb162e9da615ca24c84d3316679f3b1e395f790135f7812444c3df6fcf606fed47fb88a WHIRLPOOL dfbd4e9931915fd3f9e68ff4518dfd543041e465837a2e26b4f63a1a5539dcdbf17b4ce8a6ac4134123288283349ba8eae1eb08335123ed9e231b71f5176a9e1
-MISC metadata.xml 162 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 SHA512 550d0f517601255e5c9b120a03f1dad37a1a75bdaadad486ddbd2380a7f0dd884970400574455d34d3ba6e800d9fd21467dfb7f89ba27a0aa8a65e7a265534e3 WHIRLPOOL d50adcb067d0290aa7dfe5aebd0e8abf4939ece7afbf284920d08f2bf04f9306f0062a78cacb7572a12735ac41545440fcf138beda81cc53774950bdde495dcb
+MISC metadata.xml 242 SHA256 71698a290105fe8c6aab79a64ebcc4a2735a200da56c8fe5c463af2cd9025bdb SHA512 5a9660ba906428816758cbaa62e268f36487e6c101efc328607922a3fc68484b66626c3f83c8d5bcf6af46c9540ad941acaf41163a913d7cdb680498dc88e469 WHIRLPOOL 0e3acbd230898deaa8cf74d3e0c2df043939e0ebc66d7c4edddd0f64eea9f409fb74f9fdf2d8de6eb121754e17570714dbd3d61f214970cde8e117ddc20ad98e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfy2NXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmigQ0QAJepyuT2msN1bq1S276s4oiV
+slJ5pt44qSAEVqy7c91xdUEM3mu22K+68TmWFUWtmyl5IjYnx17acpCXyTxjWaPJ
+b1PYhXE7B+o11psURA0JgObnp3U3FGhGxRl+4dIJqLRnlMNDrgwm7zbpJz2EkYp7
+tZN7P6Gc+B5Z2gMFBPrkFKf4i3H6kUY06YJxSjXL2NKluIe+WVn9YveRQtE9LEWQ
+eDhsjIfRrafbT6HJEeE02dxitsCZ0Qv+zmZ3koXfpZAQ0FFeIDhsQuX0f02N5N8K
+Bk1CFXRD8vEM1dzlVf82nd9hgJuEt8bjBYgpuM9fU0yLVMd7N+V+HLiAlpiYNDZ1
+bfrSJMBCTWV3hT/c5BtafPp717JOdyW3WTrWWAdWk5yvgHvpkBeeIM6hQ0uS2ZlY
+dP1AZLqxeUWEWKiUH5+vOl7ujS9S8rL9hTFWh9bytTlJ3FzAgvHLAbIk/p3N/lcp
+Oiy7w5Hq40GAAv7GwH0jVL+r5JXfQu+YT7THv2HDExIud5qdgkHIgTA9uiRSunQf
+D0IfJoOfHwWWoX3HD1GEoOwkHYQCHa4cmHgoFCANutFhVYV5ta6CGbjSZs8Eh2l/
+bopAN77b6tZkjj5C7ccKk6buThFLSkk6GoFAwHeBYVvXPHuniAAGvvRRSd9UuQ/O
+X59Wc3u3mM0RmgiT/0RT
+=ENAr
+-----END PGP SIGNATURE-----
diff --git a/www-apps/dotproject/metadata.xml b/www-apps/dotproject/metadata.xml
index 6632069b5aff..bd5db4864e44 100644
--- a/www-apps/dotproject/metadata.xml
+++ b/www-apps/dotproject/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>web-apps</herd>
+	<upstream>
+		<remote-id type="sourceforge">dotproject</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/egroupware/Manifest b/www-apps/egroupware/Manifest
index 1b2020c4887b..32c596ff2177 100644
--- a/www-apps/egroupware/Manifest
+++ b/www-apps/egroupware/Manifest
@@ -1,7 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX postinstall-en-1.2.txt 418 SHA256 29abc4e8b6b8b5022a8ec1c6a3ff21b97d59f3eb980b89fa818ce25ada1ca454 SHA512 0d282d5eeec62edd8be732e44ca07442faecebaca5f6faeba590e20f385e4c500cb74783d3b6eee40c3b631e484b39968327b514f6b76448942bc983710f24b8 WHIRLPOOL 2767979b97607657c3b672ab7819f2cc8ef68c724fbe1097368240894f117cc8beadc9e616188918400f27e79f76e3031ad445494a5bd6ca0ab0cab3ae479b74
 DIST eGroupware-1.8.004.20120613.tar.bz2 10460480 SHA256 63cab7d7dd02c56164fd4670ade765b18d9cbdf3e0a1834025216a651c170c54 SHA512 9b4c953e830d651951e019c3bfed399f9c3e846a819757fba832e6b491626f45fa93142d351f697fc72d5b3e7f1cb2c5353e8f726d30e671b5ef67b01a543402 WHIRLPOOL 7eccfe874597bdc8ec0d3480e3d9c3d1980abb9390f6a7fa8c281603920a188d72fd19be6e6200f03fa133ca1b34353c2d1398bb7378626d9a25dea5496f5b75
 DIST eGroupware-egw-pear-1.8.004.20120613.tar.bz2 75148 SHA256 19ec4e94b24535b5d988dcffdecb922c3b2b63524abd6623f90c690cba51e2e4 SHA512 25e5cacb0e8a19290c3a708f7c77e64458ebd4332bf9a0f95f45db1d144ad0a73253049049206b990543f9194e43b509b0bd94a0179ccbbada4f4567730061d8 WHIRLPOOL 5f980eae9d09fe7a7c7813e7736bc0ae1e3ac88d9ddb54c86b3e44316106f0dacf6b0996e924085301f21d38ef22e64cd1046b7176854d7b2ab045c941c531b8
 DIST eGroupware-gallery-1.8.004.20120613.tar.bz2 10508030 SHA256 a49e1309a3ad8bc1de319fcb93ee8f3696b64ad14ebb44fc5a3efaf77ac437fa SHA512 03eaa49c0dfc309e1d17757a84f45f692ef55cd762f4f049ddd9c22b8ff9a70eb30411607a439a0ea09ec81b545858f657a429bfa81157fc222f44503068fab3 WHIRLPOOL 034d1a9eb673b2a497985327126179d123975a3a73142a8b8024226cd462d5556f5a57999e49e5a459569030afecbf28eb463a781ada34215bee2431e1b639f9
 EBUILD egroupware-1.8.004.20120613.ebuild 2720 SHA256 f6329e4df87b2c123a4e0f3b3ece245494acc8aa0b71fdc11729bfbcdb0bab25 SHA512 660d797084d394edee4d571c022f8ab318a0dd4a31025a07e0dd78d400fca13a8dce2475897bbf6226ebe29a31a4d8a5925ee42baba2a142d93f2703a0e3f6f1 WHIRLPOOL a24a3fa8c05358cdb6836aedde9b8a8b1cb08e2c86738bbc5bfb71fb4a513570e46b7298c1d2aaaf0538bef8f72413bad893a746a1f19f31f233ddb39501b2b4
 MISC ChangeLog 15957 SHA256 c9e344e84bec88b29036dc1a3d877a0a74ad87e5d852635e9a90b98fd3d76588 SHA512 a9429744ae697280b5c89945fdd37023b95e0ce78eddbeb3f732b6e586bf4a61a487f93b6b260b3f5a27e4dfc50b28ef6877816c737aa6301c7b4512eb112b4d WHIRLPOOL 5e47114540ef7d10a3401ee46379ecfe943d923086edf75d8c1071791c8a951bec1a9f731703bc6220dea8fb6bfc76f7802ad6c12bc6fd05fb7b294e3ff23059
-MISC metadata.xml 306 SHA256 1534b1e117628e72a7b953f362c0c57be264e7f22ed62ec71e9f8ad72dfefd57 SHA512 afb70c8ae8fa5b6a7981f42565b8c4f64ea9d2ca7544dfdd0ef60e0f52748272e98b857e9e0ad45aca5c90d5fedafc471810ec2935dd022552d812b517beaaac WHIRLPOOL db9a07f1d1710dd1fddab576b5159c00ee68dcc8d755bd8b5f24a65d493e945e7307ed0eb82d5344322583f72fbef40701dc11eeec2faab26ade8c337e688a47
+MISC metadata.xml 386 SHA256 54ceccb73ab3d3e3a3de907429a85f194a9e22dc130461a4d01f736b492a83d1 SHA512 5f079d983d8deb54550fd6a408eaf0e4cc537ce0aa2397048b32736d060815fe6668fa36437fff25ddc88f6f72cad23f106051297cd14bb4861c659287a4b76b WHIRLPOOL a70d806052e217d5a4046b334820e1540a16e3fb66234e59a849f59659f92cc846835b49133673efacb0bc6bcaf444765c3b1bae339339d619c30ddd4176455b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfy2ZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiZsEQAJboG7ra3bASrlcfJ2A9XrBG
+ZOBnpBXenBFI+I6WQIfM4WWhzWYb65TKJKsW+MaL4Fmaeo1dwJahBACJXqMAUgCa
+FB8yEqWBmWlyaM7DtMC+BiQD6BcglHJnnxppr/qdJSqtAkWJoIsOkDM51hfzm6wV
+Y9Ixpsde9TEHbMmFzpNV8ZcdrlqoF0b1NXVjQl1/u1kf7dVW51LiTsCQI38rdrc9
+bOm1kXB95mq+ffJ5+wyraJNV7yBqdIL+9kvcFWH4RiluXFQPNCqMfgk2q997qRwm
+55iVRHhQTp6RZM6t1jWn50aOUoTyukX0tTTbvdk+LHV7WF8obApdzj94GvSErtGo
+VIZOUsSfyyfinBS5BLcZthzhond3ccqOgJkvjgG08nsnnMwgyYt83YUVoWP5KlRd
+vZz3wErME5ty00HufpZAdKhUetuxgr8fLiu5HK3jrG8oNgjj0GJcK5HEufLhymD6
+hW4Q3eNuKYC+ZzHCqfT0nSA5zPp27IM7ORb3SaezAyqJXU5CM20wL32O5zAmTRM2
+KH0DBEXOt/p04jk/jrLX6o3jCchxt9lnNrhQqich03BraThx/6LcZl1RQKf6StsW
+yBV47L8x+lyWVWDYYWiCAQpqkSzeBbsdySgqQpIakiahdxfP95CwPZaG6T3KDIXH
+Y1XsWK3SDXgZeMZbY0hj
+=T0Fr
+-----END PGP SIGNATURE-----
diff --git a/www-apps/egroupware/metadata.xml b/www-apps/egroupware/metadata.xml
index f9532cd63b27..93bdf0b618bc 100644
--- a/www-apps/egroupware/metadata.xml
+++ b/www-apps/egroupware/metadata.xml
@@ -3,7 +3,10 @@
 <pkgmetadata>
 	<herd>web-apps</herd>
 	<use>
-		<flag name='jpgraph'>Add <pkg>dev-php/jpgraph</pkg> support</flag>
-		<flag name='gallery'>Install gallery2 port for eGW</flag>
+		<flag name="jpgraph">Add <pkg>dev-php/jpgraph</pkg> support</flag>
+		<flag name="gallery">Install gallery2 port for eGW</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">egroupware</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/eyeos/Manifest b/www-apps/eyeos/Manifest
index ed54c341a715..30dc724ee01b 100644
--- a/www-apps/eyeos/Manifest
+++ b/www-apps/eyeos/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST eyeos-2.5.tar.gz 27820727 SHA256 d7ae68977e8cfd2f012f0541e840a6cc51a7a768b5ab6cc6938cc70fdc400f98
 EBUILD eyeos-2.5.ebuild 1418 SHA256 96fd5632d6ad2101d489a10e990437f3871e436c2e205336eb7a43eccf848f12 SHA512 5dcfba63505c54e9f24ac8cfa1fc56234cefb812db5dfb790101cb01eb2115e95781094af3a8e04cba17b672856c085a25469f236005c870e985625dd21c061c WHIRLPOOL da036397f8486f24605a18ef2077badb1662b6d6b3e31350ff74a75e218c5d9840facebafe592a03c284e845f86fa57304ada34a8b255be4a606557cca7f54f7
 MISC ChangeLog 2345 SHA256 b644321fd1622128d5344d1a103392ea0400d4ccc101a14bd1da51853211cae5 SHA512 6ebde943a25944335c4646d6e3a211bb05d52fc93f4ac209e4c3837ca73cab989eeb681a979952a50d9532f3507143a6639c3cc118eee5d486cb4bd50e7f4617 WHIRLPOOL 5a7753e5193d96d9b384167bfef25cff7227022dd24ba20a6e9e02a78c265ad085c525ba0c38ea649c2d3e30ea5125438a86e1d65ce00d8af947938bd3dbd99c
-MISC metadata.xml 535 SHA256 5b4699f9f6e7bd80b7559d5b60a385ff18b9b59ef9377ab4fe3d6f4a11be1baa SHA512 c2e8b10740da76536691fc3495d5d6d4392089ec57c44e525db8a72c72c0ae6854278eaf6ec1d9a8d376cadce7ce45a15a2f9f9a61f79c8f221ccf45a1e9b8b8 WHIRLPOOL ee377bb57bc4c0d71c9c0d1d516a15cfa3a328e8c7cd859f00f648193d7b52592632267b8fb980d5b4a7e497b01b552bf1bdd57eb88ba39b8167711f9afc3916
+MISC metadata.xml 610 SHA256 cd16ca5444c7cb5b4053c7233b920f3bdb8ab6047f4fc36091c2af6a5465b5d1 SHA512 cf68ba3371df43806395c243e5b050bbb1e9e0dfac46505deed3e843282e86b46355f97d0b8290c6c19e9cc0b5a18a7da4b1e431ad4647ca8a5970efd0c309cb WHIRLPOOL e24e660e3a5bec5c7e430cfc1b80db47d9c9711117895fca7353ed1f4c18b4eb704c2dce5bce47f4cedc811def7f311e4815c3de4c35953b492288a971f402a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAk/1ykgACgkQFYEBGcdFJfLK+QEAgEmK6N/CPookCMjvnXdJ0+sl
-rZzfY50IRAGgo8lcD80A/RK1VVMGcVYcv/ctmsD62oi2ku5XT4E0Q6EIaqjmE+rn
-=l+sM
+iQJ8BAEBCgBmBQJVfy2jXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmivpgP/3i+v/GMqJ4rTAgd/hc/X4q0
+rqSihohrWw94K2m9rPXbrHrACgFwiriB2uoMi8Rm7inOL3eKLg9AHW6CCl9HgHq9
+ebBlbVtxuLfta/OaGVUGCPKvlPIUD/l6DCyR9bqVYHyYihpUGxgRemXQoFLBtBUF
+qcRo6grTHye8lgbPTMGH5O2cWlISTzHhHvglhlZ2Qti2a6/iGnbqPTe+msQQj9a/
+txeWlyM8f7IdpBfCpJDjjUNNHAUixtUPSoIoLwqqFKuuPqXm3gWd/cekYivdUWzY
+D6kbowxRfqXQCbgVbx9IOYhCqwppjT9u94tmENFMBUmkB8USlSFTYv0blxzlWSzt
+nAt/RQgLYnDYqIBwATpqpvKbA2ncQ+y+YmLpCc5B5Oizn/IkgbcE4xbcnWAxWJ2R
+t6ZiV8Ef+4TZLdojnyCeZzE2jLnKRuGtKyjxmN6i1wO4AriTP77oEyw7idFP09Bu
+sCHskQr4upCeswkS2ZkYUs2j880JULTpigPEFnzX31fhue0TaN4iVU6a1bnelLuI
+8rgVAN6LWV4reZvke/R33l3skevVPGLoyq3DPatpuBuFbEuGClG+o1QSTYklaXkV
+SwO8Zxkcn8fRbZKSW/qQbVUN5pne7yaIZ9FiVtCB6bMDizOlcAtdZt3NLmE/A5+g
+tHjFHhmZ61uYKpW+bgt5
+=SzQK
 -----END PGP SIGNATURE-----
diff --git a/www-apps/eyeos/metadata.xml b/www-apps/eyeos/metadata.xml
index 43ba70efda31..03b74a95ece4 100644
--- a/www-apps/eyeos/metadata.xml
+++ b/www-apps/eyeos/metadata.xml
@@ -6,4 +6,7 @@
 		<name>Bernard Cafarelli</name>
 	</maintainer>
 	<longdescription>eyeOS is an open source web desktop following the cloud computing concept, written in mainly PHP and XML. It acts as a platform for web applications written using the eyeOS Toolkit. It includes a Desktop environment with more than 60 applications and sys utils</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">eyeos</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/gallery/Manifest b/www-apps/gallery/Manifest
index 7b70546dc1cc..7b2bc4aeadca 100644
--- a/www-apps/gallery/Manifest
+++ b/www-apps/gallery/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX postinstall-en.txt 774 SHA256 c6cd4bee00dc77a57065622ee28c18c879fe57947e887b82b8ffd659a23c0055 SHA512 97119be40e3a261a7756283754c94f022a441a98746f19851e33e48f218b8c042792264d96b2ccb7f300a5c86a52a6fd0ffeafb95f2a5aa797db3450fb53b0de WHIRLPOOL 02a75b2268a25da3c226f6eccf7f92277747b1796d5c35a778c09bfa7c1dffb82444bf36d26d9da7aa9a35b1faaf83ef63f4a91306037c7bf458e03f6c92dbef
 AUX postinstall-en2.txt 912 SHA256 ae1b0727e11518abf12616cd11cb82e6648a026769d9e4854ba6afb6d972c30b SHA512 fc66ccea1ef358b75ef0710a9a6b32e3b363d6588d70b69987041f46f5d04013d36113b3fca426f6a38d4d94e0ccfba637e56f91e41f62c492a8ad1fda64e408 WHIRLPOOL 8dfb2193c1ff6c500581950eb77afc1a41a1a5f1476fb0bb9a9180ea994119e20a5de1a1f7c9e1f5b89618ee130e4429ed1d02cb28acf7525dcd9155f5bec4fa
@@ -9,21 +9,23 @@ DIST gallery-3.0.9.zip 2065722 SHA256 62d86c3a7252b25a17eead54a2b918bfdaac19d43f
 EBUILD gallery-2.3.2.ebuild 1825 SHA256 68dc64cb25f9480956d302dac7ee09b782c9e2fdb07eccaa7b63dda23edc329d SHA512 ec0614a5e17750855ee8d5bce4144c0d7ce7ecf20bfa4c92ff3314a00b413b7a9dcb479dc73fc43b9b6853d7cdbe890e31d7a1df60b3cf491b13654c68cde5ef WHIRLPOOL c3a4f7114aedf280564fe782dfc8200b5009c72b681e1d6d5bbbd33dcdb7905c57e484ed57e8416328c10da988a4aa6e3a172b6c90a596e1d6c67f9a93684511
 EBUILD gallery-3.0.9.ebuild 2367 SHA256 0d96236038e0288222e1817cb9142c8b605f325f63ebc96f33cbe79c3b2f4f0d SHA512 3533e4d357ab4be19279f9baea4d8216e8ce1b192fbd73db7fb2c3d0adc88202d49b36d5c0c2723dcc4e04a22de813c0df9e8a59aa6cad47fb8ab7ca4b9a769f WHIRLPOOL 89f573bef9968788ff58e18d8683cdfcd92efc0a75920d7290ab24b689ff1fb1b675341165d4b28750e08fdb20a00314c838a35f06086d9d04ec60afc2ec1cae
 MISC ChangeLog 31502 SHA256 a131629751996c1dfb7c1731ae0b3ccbd60437aeec29176971117e4b8471b460 SHA512 c14b8cd976eef9db30987bccef60e9bdfec43d7fd7dd898d02e317b42f86b9f58f39cf1157881b4deb8fef2d237dbefb47a19af94820ac495fef6c5d554a0145 WHIRLPOOL d277435325513fb2674b63627f258c1172bb767f196fab069ccbdae5010ca49eb7c8363f3025cc3aca9fa54b8c696c5d6f237cc70c6322eb8c3f8515c01a4ecb
-MISC metadata.xml 1165 SHA256 f32e82e7df3be23f1e8baab6a3877b4b86b002bfdc06bcb0581b3d73dbcfa9d9 SHA512 18f6533f8578a2105c3b34b67183bc32cbb42963c8493ffbd681fbb413276fbaf97dc8b6e5b09f41c7af481a858650c60b7ce58faf760b90442e39894800bfd5 WHIRLPOOL fe7b94fc6a832f5fed60d0e16cd08cfc2235ac366fdb9b66e50ac6496f0a42d2a9a5490a2d571886915352870602c35ae2c3994e98f12153c1d00fb32cb30747
+MISC metadata.xml 1242 SHA256 b761e69b114064ca238e6d087133a05d37e48ee9273018095ce1bb363c54dafd SHA512 98df18e2d0ebb6594ffe89c041b0fc34e87e6764ebf31cdd648d84152cc01367aa8be34f31e3a23e0945d5ac0094e16d4d8d13927e3167e883654061abe66b97 WHIRLPOOL 55fb7f599b8a2922ea45916535e47135f32004062d2c7cfa6abbba8aba1e244ae56c8676e6ae8b13064ad5030f7ebd1075cc56d4029f3ab1ed4702564d6162e4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJTTTw8AAoJEJOE+m71LUu6tH4P/3D4TG6pCIa9V3aIOI4A1cdZ
-/Id5P47pU5xE/XmkUCDcZ1uSID+4JZC2zGm+OrFW5tns9nPsKcJhKf/iICIXZxhr
-cRrllWU07yWXizzhlHcwK906FU6lsm3c4NFqUUc6d+J8HfUSGq6wUJJMnsSauLf+
-ELMvORbtwKpjQkf3Fv/twFXulllzbJ79iVWWiCh405FivDgCUqfXcVOsTOju5Eib
-RFGtx890j1YIf0fdEvc69DP/jBznDIe73wG69vCRbKove7+Hs/b22SlcOaNZJxCP
-56e47G3tVseIGgdmJ0XbJWBnogX23Swvn/iuxVKGevt9QOkmC9R8//1tenH2xjLf
-/AWHeyda067HpXO6ZjZtcIx216Uo3Kox2Dddu8DYeUOxoeziE0k62lWbjR+hY38I
-b9r3ut6u+p0MeVStIpjIJPgYoHLmOcT9uZQPXN+/zlSsvP5yXWhNaPq9eT30XOJJ
-Fh6Zt5l+k4isCq+f1S27bf9B9RYEKghme5YOGZ15/u07ZPjxH1D+3t8FrVSZy1EU
-27Zy2MTtL/+qTkksgi5ZLsyHAL9CHprgAUCR11erJ2fSu5M9XZY66ejB6NEtleyz
-DshD9WQf1ga6bckeC7ADYBbqpSlOttaFdsJysYSVwWkjORQchSjExX92vlTSm+H2
-07Alg2b0J7x9fhvG7/6F
-=sEcM
+iQJ8BAEBCgBmBQJVfy2yXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmizd0P/3iCpGqzbKI+AX9JOi0CwHBg
+vW3o5ps4Sxy9aVBYLbRCEY6R8dLcumaAgJLxCskEguirtTulj1ntD9Wi+mmj/Mpt
+AkVRvS7fOtqRZ5RWU0+ay7dIO2xBCl2kHuaT3nLf1Rmy8ImotbZfyu5oKjJzbrGj
+F5DY2SBgznX1lUPvfaA/2aI9hYhzMWf9c6uVCa4rU54fqimyzagvdp+MV5/ruocR
+J60R5kXeGublIIPHbkM1aldsG5Z7TQD5m0Iy4+W1KhgUPzLZtz362C78hA3X2dQy
+IxvDzwp4ibkki0jkALOTXiHtHUnrpXs8jW8Wrndcn8yq5b4wYm/8wB8Ed9WDrwKZ
+6LQYSqJc7P007+zaR9rSp+lJziGWZ5bI+SZIvm6CawZqP9jOvHJdh/RktTP+j6Id
+7oJlBf70TVYsuER/VI0NgYdWaeetN76aOnLJ8uEZcu4M6UABcdi7A/ko1XP2nD4d
+kcR3dwYtvTCemJpvAGXCJMFJKZdsVYfJQhwCJJW8abRHmfpaHNV2Kw+c23wAMJGv
+4WAQMfZ2z/6aWYywFq+gpXouVeCSTP72Luy9tS44iqJzJxacbc3t4QeqFXfymX7S
+ZWzPjjpZBU7OqnsDsXyY+R2hTqR60YAXuDMiyJ25rWCqA1ntiw9mIxtkyD2YhMoM
+GdHnw9M4u6N71RCzjSDv
+=KDgP
 -----END PGP SIGNATURE-----
diff --git a/www-apps/gallery/metadata.xml b/www-apps/gallery/metadata.xml
index 302c3136c6e4..479dd79246b9 100644
--- a/www-apps/gallery/metadata.xml
+++ b/www-apps/gallery/metadata.xml
@@ -7,10 +7,10 @@
 		<name>Anthony G. Basile</name>
 	</maintainer>
 	<use>
-		<flag name='netpbm'>Add <pkg>media-libs/netpbm</pkg> support</flag>
-		<flag name='unzip'>Add <pkg>app-arch/unzip</pkg> support for the archive
+		<flag name="netpbm">Add <pkg>media-libs/netpbm</pkg> support</flag>
+		<flag name="unzip">Add <pkg>app-arch/unzip</pkg> support for the archive
 			upload module</flag>
-		<flag name='zip'>Add <pkg>app-arch/zip</pkg> for the zip download
+		<flag name="zip">Add <pkg>app-arch/zip</pkg> for the zip download
 			module</flag>
 	</use>
 	<longdescription>
@@ -23,4 +23,7 @@
 	privacy.  It's great for communities - give accounts to your friends and
 	family and let them upload and manage their own photos on your website!
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">gallery</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/gnopaste/Manifest b/www-apps/gnopaste/Manifest
index 61a01ef81100..17163de0ed49 100644
--- a/www-apps/gnopaste/Manifest
+++ b/www-apps/gnopaste/Manifest
@@ -1,5 +1,27 @@
-AUX postinstall-en-0.5.5.txt 164 RMD160 ae44634b9dcc839028c0dc0f1bc5f8a481a9b9dd SHA1 d1f300c0e8e4d7d6a34f970d8546ccb8f94cd999 SHA256 9175d92b3ac639ae0a1c9698aa2b6e455f75a56eaff4c3978c139ac9776fec4e
-DIST gnopaste-0.5.5.tgz 162271 RMD160 0c5722d1d3ee17ef4fc841429970da3640f7e67d SHA1 513aa1440d52527b4bad77086c72e7ef5fafc687 SHA256 e11fc5eb0898f84c1f0b74956d09dd57b747bfd71334c8ac2774d0207308a1a0
-EBUILD gnopaste-0.5.5.ebuild 857 RMD160 433acaa540c4ba3708e17e7cf4f7c413abdc6288 SHA1 36224772f82f9dbe0f670df74596f3835a13bfd4 SHA256 76cd318b836be8ecb7643b0c1bb098c6f9cbc09d28927f1f1886b4972527fd6a
-MISC ChangeLog 1372 RMD160 ec58924b61568f8f666b3642c3cf173969f1e8a8 SHA1 c7278c06c507ac9cc88d4a6b323180d08e19007b SHA256 5c4f545faffc82a2b459edf3a6aa8aca00034f82a1f29ebf4d4c281bb0ddde41
-MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX postinstall-en-0.5.5.txt 164 SHA256 9175d92b3ac639ae0a1c9698aa2b6e455f75a56eaff4c3978c139ac9776fec4e SHA512 88f210c452dc6c6be71f923246995bfd94120bb802330b14af09e3d8f2e4d68e24794ff8e790089d96694a6da4bf1fad4154d284f3748ef54e5f168cbb7fb39f WHIRLPOOL 8413ff8c6fc42826e381879054920844a4f2a09286b926ccb29f990884c601707a769c8188e7b7ecc6945fa05fd2cea6bf5281fa73cdde4b2b7dcce74279e89c
+DIST gnopaste-0.5.5.tgz 162271 SHA256 e11fc5eb0898f84c1f0b74956d09dd57b747bfd71334c8ac2774d0207308a1a0
+EBUILD gnopaste-0.5.5.ebuild 857 SHA256 76cd318b836be8ecb7643b0c1bb098c6f9cbc09d28927f1f1886b4972527fd6a SHA512 a1afa157bcdec4b4773534e5cfa29db595326e20ec444584e6e18da2eaf6172ded2960ac1e0e81a11e2260cea3164cdd5b44d70cbe90b218df6b8819fba730ab WHIRLPOOL 025b1a90fb7ce993c6cbaee06256f7da78859d49878df513690ae230ea2b5f8a8000c9f1be3d1601a6d7e8d455160d492f5a667a0db379dc72643703644f2aa5
+MISC ChangeLog 1372 SHA256 5c4f545faffc82a2b459edf3a6aa8aca00034f82a1f29ebf4d4c281bb0ddde41 SHA512 515f11825329d0c366f1defbf03308b13e73aa225203b6fb83c7bf40c0d6b337f04bbb2d888afd6d6566752637e1708263bdf7897e0e2a0f20055b4c6aad31be WHIRLPOOL e014642e5630a0e7ad225998fa269571eabe2df6d8c104be1b2799b6f5e097ee49d23d814c3d025555b219153f0da3dd34172dd52d73ac523a12ebf87ba228f6
+MISC metadata.xml 240 SHA256 18a06f69e169fed4a5e5e85cc1e46c026f3bc94455c577473085ba41790799ee SHA512 45db6730fd0beb9d1d1b19b573969442bd1a3fa7acb375f87a543c4383f9937af6ba0837fbf4decdd86bab9748444743ab4815f0ac4b34c99d1d918e2c6446a1 WHIRLPOOL ccf9faad2ab4d3d9dc145f6356e3b9dad91b4bdd09e1e66cb66744ca3521e23a8c63471652df9971074448ee15f9f4c36437ba5eba7be69ac9e14c82d334a4a2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfy27XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiFkoP/iO+Zqgp3RVLI8PxlNY3JNRs
+REWoLcYiuhIRB1DeuEL+jT0ZJ8bJY4phT6FrY+PSdHrA7AU6yY1CCyvkOJtvQsKi
+hhtWbBIyLyl3OWWeQC4+6BprCiLP8zzPhUh8Go5CgwFjW6pkZf9y72opN6LtKJSJ
+MozS0Bv2a2w+G7/inF2WIBLgjO96GRbksqkVgaxPBp+95Iv39ZjTgZnyVDLDjTuS
+4ZXU4uCaOWXprqb3yRf0bQsqldoG2tqkdEi2aWJIwi49aqLL3vTwIJo2a1Fkm1kC
+hdu2fWc0PTh1zTgisFhbxr5HZTJuzCm3huEAFdhBQr1wz36EcUALX2JKNRZnIjr7
+Ee4linJ5adbiZwprg43NIEz1329WEGzCwSi/HKreZH/IGe0di4K/HIWfEDFd8g1X
+eWuJ5u/KsFIYBXJKAaPkCX8P3HgcX/+DTuVEle0lVqY3JzItVkDW1aQbwEHRbh/I
+cnaGJVj978gzCX55MQL5Q4aHctN4s1knAOiWb6y78V5i5rccnhzocjCXB22kN2nn
+z/0goa/Tn+Io/xQoxAYe1rWybsJO9R02j6nijF9cy7rss/nCZTxu/xIhz4+At0RV
+BUa/T+TtEhTlAMG3u3umPe+ac1+pjd8I+KA+/Wn30NbtQ8smrDukFsd+ctguHyNl
+fLM2VXHyB9uDTVRHKYhl
+=qa2Z
+-----END PGP SIGNATURE-----
diff --git a/www-apps/gnopaste/metadata.xml b/www-apps/gnopaste/metadata.xml
index 6632069b5aff..5f4a90172f2d 100644
--- a/www-apps/gnopaste/metadata.xml
+++ b/www-apps/gnopaste/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>web-apps</herd>
+	<upstream>
+		<remote-id type="sourceforge">gnopaste</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/groupoffice/Manifest b/www-apps/groupoffice/Manifest
index fad9211caa9e..9ee80700b4d6 100644
--- a/www-apps/groupoffice/Manifest
+++ b/www-apps/groupoffice/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX postinstall2-en.txt 707 SHA256 8f3f1efcf2d9cca8c63254175cff3566fd4d733b8e630c4d141f28240901309f SHA512 a4b3fc6f576a80d80f86786bad1b13cc879dbe13c79c26e4141aeb160487ce2989e404f867a2e4e0dfdae8caa186f9e752baf962dcea902a090e500b9306d413 WHIRLPOOL 4adecb72d36913dad66a3458383c8737a751eeddb391fd9f3a1583734778a9b5e5b86c1ee14caf4d2041f82925ada5b2d75e826d623de97db1fbb9765b18e659
 DIST groupoffice-com-3.7.52.tar.gz 12259892 SHA256 af07123e16e9ebeafa4aeeaa7ae3c6dd45bc333ae1588a6c540c5973bb8f64d6 SHA512 f989392398d2756baf5222b0fb29add094385ea217f3065059c5eac71a82a594f820997968c07f842675d827bfcc12e3151488f57d52d4a706702f5db282d5fb WHIRLPOOL 87f5aa0a353ee7ed1ffb9576c48652885ccfa71f143310b30ad88190459ea5d777368b5c642a42f01c25516f8be8aa52f82b8a55d5749bea675cbd9819c778d8
@@ -13,11 +13,23 @@ EBUILD groupoffice-4.0.47.ebuild 1322 SHA256 78f40bcf0227402f0359f4688891e701d78
 EBUILD groupoffice-4.0.97.ebuild 1317 SHA256 078b4a556363039185927c0cb503321cc4c7079180a203ff9bf7024f34408801 SHA512 553de3e5e67512e2c284fe3db76f0fc264f179b8e95b85991a14f600d6c598a3a6d1652fd80af7141e8dab29bd5f538f56ab03f47859f1cfde2d5cf7ed0e528e WHIRLPOOL 2fcf253f004047db5efd4e9b95ef86dfcf0e84dbd9eaa06beffb0652f07c7083ef3d76890aec5d41fcc1d5a326b8c793001c239f4d9502ef5bbb59ba6612382b
 EBUILD groupoffice-4.1.7.ebuild 1318 SHA256 aa46629113efbaa8d6796a83d5d3bb6ad3064089d71fe3795fa3267096decb3a SHA512 99dedfde3bec38464cba610f5120b32424155e5f45d0fd29f142740f5cf5c40d5b744e223ff128d2691c9828472bb5a677c43146bbdf98317ff3416707d83911 WHIRLPOOL 55f8dde69a75758e04548568bff8911adad82e2aac2a631a40c54999ed5612ec79811f82e89227165d00125ee78617f5ebdf926057838d2bff809798b0e54e2c
 MISC ChangeLog 7686 SHA256 52ac001c65e657addfb136c5b6e08e7f0044b04ad12d4564dff725954ba4239e SHA512 8d23ac141d4f51d1ab525b259b3739419ac234b19b46557ca0ad4df8fb05e50f31c0833ed842af369b0010653fc50b6c37ff2e4ceab5f441a05130985584f3d7 WHIRLPOOL a3a254953e2a5ac295a2254541249030882dc62dccfcbc48df3a747780e91570dab7cb9e89ad737dc8a0fb8bf23eb599586afdbceb671c979d2d6d818d857692
-MISC metadata.xml 161 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 SHA512 da8733f12ac4bebcfa485138fd9880683c1196efc0312a588ffce412ed14c1dd831e005129b6598d027af44d381fceb844453a433d0c982348e21f2d9c49f52e WHIRLPOOL 2b56ebef4f0870596c32c35c96e6dfbc911f6a3d8fe0e8c463df76dfa73dde112948c814b9a9ee996b7d71a85e4a723033ee3b92f4cde0f31d0770404d7dba61
+MISC metadata.xml 244 SHA256 bb8574bee17086ccc7cb9c9c95ac9fe097cb24983e920c69553e38c24298f7a8 SHA512 3a700d9eb2e10d519895e20370829c374b4f2b0aff595cbdddca332a78b1f13a97972b3c931f8a8ddf0df3fdb195c19828788bb6f6b5ecf86f59dc3b0ed55e0f WHIRLPOOL a5631b599631f8ba27c3d5601895ec97c91ddaf764c9c03d69be573e1c2a6327d7acbd007be3978423511b219249da1fd80339acf0ddd68263aede60ad824510
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlMVFcMACgkQCaWpQKGI+9SSJQCfWL7DxuKF5bpUQt7vDXDvRQ/e
-PlwAnRLfhtSG8ULoCsKXxPrh6HWz6h8W
-=9KVO
+iQJ8BAEBCgBmBQJVfy3GXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiDVwQALyhKFNGCLjAenmtixgId7B/
+H8NGhXDI9mA8KrQUPSNJBo2qjOthjPjtssSb1pVvzC6xL8xu1fzewlD6/4R/xNaU
+zAngjCobPDX5ZC2UTQ97A1lTDyrzNLUB8agNrg7GMnhpGPadQuGj+Bxn+v44mEqO
+baipoSH3KbS1l0RIsynFdmJ0QoLs4RE1iYG/qPAOEgLNgFtradO4RASdbvemjmRK
+pdhRzgLEOPfjjuSxAH5i2WKIVmC0g/pPFHyO218GEfiQMOH3Pg0nvzInA83ZSmgs
+B49tdxiA8cf8eAW1mVMPF185sI6SqheQeoiEhp/1SBtz/MWUNWf9ZEIZh69hpmAb
+8hByVGNN5zupvM7PkRPmmp/O2wYpxpP6MVUHxeEHGR/9S/VmprGg5JIbUKzzLEJO
+2R79hoj15KTsBXyvfFhlfJtmOr3ngZKY4oHhJ2OARmaw2YRVLzL4DO1t5A29gW57
+Mm0M4p/TrtS8TiA5ujVY/V+oGVlWaWxnW+OtRIuskqd6IUdAHtlOaqLNiFQFO3nB
+HVNVPWu2/2nDmvCc4kudnWY8ZWgWznGcYHKyOgKysd9d8yCGo2obN2GbS5tnJhjm
+LxBDO4f1Ik2cKYQJLUmH7BP4jy5M1SiQGkIyj3lWx/mZuGE4W5gUX9OlQdkgnoKR
+2CWHHW8S96eVP9jFYkxU
+=f75L
 -----END PGP SIGNATURE-----
diff --git a/www-apps/groupoffice/metadata.xml b/www-apps/groupoffice/metadata.xml
index 95c06f0095bb..fa669a99b3e4 100644
--- a/www-apps/groupoffice/metadata.xml
+++ b/www-apps/groupoffice/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>web-apps</herd>
+	<herd>web-apps</herd>
+	<upstream>
+		<remote-id type="sourceforge">group-office</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/guacamole/Manifest b/www-apps/guacamole/Manifest
index 8973d65d1cb7..d5d02923071a 100644
--- a/www-apps/guacamole/Manifest
+++ b/www-apps/guacamole/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST guacamole-auth-jdbc-0.9.7.tar.gz 2997194 SHA256 f112c0ab83e4253f3a914716c5a7e61c4d7dc64d724e7c11bb4b695f386474a5 SHA512 0bfa920fed4b5baabc6f5541d9a5badc0a88c51e95675f00889d9d6f7a2069b07f0bee4ed628b82a4c243dd0a8fb1646a5ba6f822ca5704b1f60b49f3a2fd698 WHIRLPOOL 013ad62f68050b8c431565fa375e6c3c50e2cd1b962b6409c3b79f8652f021f71139de6facf3cd4195b34067ad01fba33bc980bbe4d50d8cc3d7f984555396c9
 DIST guacamole-auth-ldap-0.8.0.tar.gz 382872 SHA256 745e7541ab5db9decb463a7358e17c13cab5843d8458e0bf04f5a8eda8f19064 SHA512 2e775de3757b0e161fd7c6ac19982763bbafec42fef3418cb469cf3cb6bf1783b01486fe28e5a250af7b67107a5c3c73e2ad2b10a4e49b3ca187e76e2b578776 WHIRLPOOL df9a926df2f2a095a816234b6499640149e81acb4b6610d94ff8588e28ae9eaace8c0ca1808d1522aa55531674c53cbc6b5f55f606d7af73918610c9eb095ecf
@@ -23,21 +23,23 @@ EBUILD guacamole-0.9.2.ebuild 4982 SHA256 30794d0001e95f8ef35a4b1c9da228bb2e4ad1
 EBUILD guacamole-0.9.3.ebuild 4982 SHA256 63e174074054f9934851995b81fde3fe63ab9cf07c04b52cf84b12acc28b0a1a SHA512 d62890076a9320ef903ab5e16ffd52723218d58ff486fc6b872c8c4f5cf75b7a4f7aebf1265e62f2920f002eca8d8f6d882c23bf4a45f27d3af10f6c3db93af2 WHIRLPOOL 2d1abb6d154cb9357607df0bcd332e84ba590e411827ed0f980f9b8a96ca6c2ec8b58f7ac91d57ce3c531852caeb6c5e3ee66c632ae90280b7c23023bd037bf8
 EBUILD guacamole-0.9.7.ebuild 8047 SHA256 fcfd30a161bffbcd2238c8d13601bf6516db728eb39a095a115a892889088073 SHA512 6358c59dbe73856502535041234a26c7c805999e17735e8cd7427a562e2c8b5df7a56fd9381aac4cde7fc7091978e484fc0c46296d5b1bdeba0a17ba79506184 WHIRLPOOL 49774ebc70727a32104fa767b747c9373619e3781b2d534cd79c4cedf0da9097231719b51c39d7d59aef840c67bd044796cc3e26401b4112ef4363c04cc16c79
 MISC ChangeLog 2225 SHA256 fdb380880b18798a5ecfef1743912011a568c73dd2e04303ac464f23dc818f12 SHA512 b1f64a26a9ff45fb053f0a6c1867d596eb1b19ffbaee28e8f99bc943e3a6005f0ac014d6a5d36c5c3350393e3e6deeea53791ee3af429e999739fbd7955384ab WHIRLPOOL fa72c6c16bdffa1fc41dab20f8fd03e814b2ae623b2bd77953f2e13663bf7e326fdb786e7f5ab4014f0f27ce9913160ae84f429de53227d16197032cb3f7e20d
-MISC metadata.xml 761 SHA256 019391c0af11e5f1b983cca7de077ef397a464d75d014b885b76af014eb20e21 SHA512 e55ec1755e33e8604abe89a80144a5490fcb7a4033b61dd2788a2aad3b08c19fc1e2853494933c9a30c0a299d61a6493e59b53d339725d5ee8aff9ae3c822086 WHIRLPOOL 7b71ba2197c2e5aab4bee9bc5987299eecb2371c74a33904c6268cc695614bab44e971d710a18c8f5b691820a907e35c2bc47930455eade39423bbf74acbc978
+MISC metadata.xml 843 SHA256 f4f2feddb9e8ed06df7e4a53793d0da93b8b6b87bb6be89fc70a5861f6317397 SHA512 1cdb29f3d836adb21f699b9f180da58b95f3798a08dbe1a4a55f941e24cc93d37d32dd469b232527a7a605117b37ba054a56651db269fce89a6b19132df9d389 WHIRLPOOL 66d367503f166350d4f03b90995d02d07c58ec78acbaf2231c1080bd456d5ccd4c88a4317abdb08e8e13b4e78a50a6f8d009bb81ee0c3ef6678d0cd82bea0003
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVe/d5AAoJEIug43o+kWudsgUP/jOXVE31bR9/KfLnrRKAuwgg
-M+gu2s2t/LznUuUWF3XfZjS1grSOaX3RGu1g7R3mWuayyyxehTe5EmXaseBkCztV
-BevIV3Y6AmmZbWXIrkLHRQiRZ3yldJ4251IT24XGZQ1Hqo2+uRoFns2kohGGpKUE
-p3tMIwCjtMV1Ns4KfDy3ssoTh6QnIdSz3kAKso0DPxz8bfJ1cq/C63qhvlqI0yYc
-zfo5IMtdqsKJNRBIktYum+MausFZk3/nF4cFvnUoP6Skn1HGkfpYLTuJ5KbkWxwi
-4G+V5OCACfdMo//1NdeJYHBjHoReVpbqCsH/sQ4NqUuIPcMiNJ9doSpuvedMu5LP
-RF4QP9O7oJPNM3lcsSTyRrVekmQyJ63BMLepcFqXDjueHEU8uC1oh0imTMuidSLv
-CiakuQkhsOGCKLahonK6yr8sZ2ipOw8rzFMG9b1rhn6y01LUurNilJvXN+8Ve3IO
-EYM2if4fc0HFoeo10yUA0umd7Je/M3Ze+seazYn31qaiq9oRNb4ZRiT7K6JCDJqN
-hKTUBYUu8YH2QSiPPpKI9poH3dv2XLDILCImUQSK50RJdeugWWLcpbim/oM3nI0M
-+ZSloloJyhq8OYKzSNttFQRh77vBgXcm5Gg8D/ZQmEEJ1vMzu/XP1vmlqgAaaNUE
-SWcFKgKCovk1Shrvs1LI
-=qYFU
+iQJ8BAEBCgBmBQJVfy3PXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi834P/3MF6eemBd4pIjCbfgpCJacM
+ZP74zH9JLKQG2VP4niHRlWNRCSZ2cxYCOnpBtFe0f8dqYVhQe30ZDvYU2sLzDkJt
+kSFhZLbRcWULokg+hQepFMN04p+Za2egnyJJNM5rbHXPyQ3IDUwzQ42U2il+lpCn
+pE+Q22WYoIz0qSuQCwbkqdGiDA6BAL+CjfLEnMZF+CXw+GKLLWJBs1w233wGhwUo
+rGKYayxgeIXdqZPvw+n3GCxzptKF48ZOjTIVkAQJPmXUqVdJ+TrYpwfMsijecTSE
+OCoOL96ksNZJm20WRpnmFHKXhjnMOTc5yG6oUPArXmgsgwJLQRqSlLkxwLSsiynX
+D0nERPwgZQ3f+FvZneaFLLyl7HG503BL7CMH44whB28Y2TvBUDwcye0rJY6lWH/H
+fhpjI3dJldhPEL2x/0gRNdhbeHp6RMwRPibJIMyNFTVQaBqtNa7rRIDqSm9x+HHo
+NchHSsviqj4aFW5aIeBa38aslUiODqjlicoiCDP/tVMCBaIQWlSwir/lQRuw5R7s
+b9ocZQfRZ77z9r/1X+gD6f4KYpiG599wtxkxl7uksZ9tLHIYT+YajhuIsPo2M+0b
+GLpC67ymhhm/nVMKj76/zY20Kdr6tfh4pxcHKZvXGyhdGHrMLOJ/oQ/BRaQWNVft
+vlwmpuxwCo2gFcrX6OMV
+=EvqA
 -----END PGP SIGNATURE-----
diff --git a/www-apps/guacamole/metadata.xml b/www-apps/guacamole/metadata.xml
index 89d8438c2eb7..e69c10773c1a 100644
--- a/www-apps/guacamole/metadata.xml
+++ b/www-apps/guacamole/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer>
-	<email>nativemad@gentoo.org</email>
-	<name>Andreas Schuerch</name>
-    </maintainer>
-    <longdescription>
+  <maintainer>
+    <email>nativemad@gentoo.org</email>
+    <name>Andreas Schuerch</name>
+  </maintainer>
+  <longdescription>
 	Guacamole is an HTML5 web application that provides access to desktop
 	environments using remote desktop protocols such as VNC or RDP. 
 	A centralized server acts as a tunnel and proxy, allowing access to 
@@ -13,7 +13,10 @@
 	the client requires nothing more than a web browser supporting 
 	HTML5 and AJAX.
     </longdescription>
-    <use>
-	<flag name="noauth">enable support for leaving out any authentication on the webinterface</flag>
-    </use>
+  <use>
+    <flag name="noauth">enable support for leaving out any authentication on the webinterface</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">guacamole</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/www-apps/horizon/Manifest b/www-apps/horizon/Manifest
index 88d8c1964e29..81ea323efdd3 100644
--- a/www-apps/horizon/Manifest
+++ b/www-apps/horizon/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST horizon-2014.1.3.tar.gz 3339100 SHA256 bc220a7cbaeec30681aa55d7eed91fa67505ce31cc1fc904f401ee5e07133997 SHA512 41c6fb097791ab39cde104e5532a0b05011db937421f9162696c0444d776b1beea3755c20e1531108cabf8713b1f43c2d8e76dc2e49ffc552fa0a2fdcb92ed3c WHIRLPOOL c6501d893295ef2202e75bb6a4958ac68862cda97ca49037617960f49344d212e39ab9e37e213d8f51f521baba586425f0d996cf53b4465a05517f40e069efa4
 EBUILD horizon-2014.1.3.ebuild 2779 SHA256 75cccf29cf58187179b4259174a0e3b25336d1f95a4ace086c8fbb09e8451256 SHA512 baf0ea6f0f81bf232e1e4e9078e6f7d12abddad5bd86340e8aaf166e23e5a510752e7cba1dd4157d4fdd33af34bd1bbe8040dbd1e88fb9951b1ad7f77e5eb5fa WHIRLPOOL 9d5efb07fda55ad9da1df0528a2cb9840ce1323fe4a48bfb07ad72e3313524375fdb0151c3d29ba97de6db5207099be2c99b0b2c23cd842c5993bf174ae80a81
 EBUILD horizon-2014.1.9999.ebuild 2790 SHA256 feeb355020c37df68109fc05f2063372ed47e9e0ab74479584fc2a2edc27c2b4 SHA512 4153a8f1378c2a6c4a3e21facfe16f0ad58e8e88183db84846da70f9de3b46ace5bb6dcb8f375d9aef5ef1a4c2650c48801d7251c1283ffed81f0a5bad2b2ddc WHIRLPOOL e5228eef3905325b06c29968c74877973aec38007ee2b6c9969fa713244a48e07475288c1815051b34c495be577da3f3a9c1aa2e1716a092c00a80e39d4bd2b2
 EBUILD horizon-9999.ebuild 2666 SHA256 835516d1e2a6ba85da172f0e3d7fea3f57e8db853b708bec2618276142d24f6b SHA512 c46dd4bd9cd573dc5126048226ef7838877924b944b86cba8974e1a42769d5c93e97ddf6e510b6eadfb36c740613eed3f1a59fcab3014d0f33957d9bbb2fd1cb WHIRLPOOL 8acbe579d7452bc05c55cfb26c29bc049d66fba53ba6b55eabbb3156854d2e1f03d9a639a01dc31afda7ffaffbe66bdc89e4b0e7650d682e853e3736c8c9196f
 MISC ChangeLog 6388 SHA256 3acc45cd7376cb82b25dc020c97d5f61972e8b1d6c5bae454d214f4f65e0a09e SHA512 bd4dcab2a2859d68bd67e87c4962e48b262f03721ef4626a48615ff9bfb2b851dae8a94509762fed5c4d1839082c596c8fd8ff73f2d8a0387c8517a4052672aa WHIRLPOOL 7526d5cdc979a9caa0d16fc7228e46a21b005f173bc8e5311b975a79fb504256f14517478a75f8ca5af576bbca4d6802af2722ff0c980052bfc1ae10ec6b826e
-MISC metadata.xml 502 SHA256 8a64a12fb6d42791ddde4f06dbeb1e32359e41fafb25b69b16d773eabf18ad57 SHA512 35da4f1a5a38b64361e5003731e9a0bfc81498c3e43b9b9e5b152d6fad2d8157a3632b737a9987bcec726d1057c52b05ee73e4fc280d9353f4649fe20c0b5915 WHIRLPOOL 028f50558b926a576c36fa0da5dfce8cae2a948f0adb4cd71df2f17e806565caaa0698dc262a484012e8c5d9d8cc6d0f4ef77983ea6d79b6b8b3e03ec80b7ea1
+MISC metadata.xml 580 SHA256 b0ee138272a63ddb3c151666338bc4550dec44a88990276d015711ad3d8e869f SHA512 787feb485ea8fd9c7d968a180d4be625631aae75d87925a8d9b5d4ffac265421a2622827bcb1c897089f14017bae358b7a987f5c22ca9d6f71cbb72da92c867b WHIRLPOOL 05bfaa8ab6c21fad67145c943e2c67397642395f71f0a135a301a960106c019b16c7ec1f9a76b7978a029e9756ec72a33b15402efdb9f736b70251e5179b3e88
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUOb6lAAoJECRx6z5ArFrDbz4P/0S5n3voaoeaqD1Tl0CqY89Y
-Pwsy+0x8k5DMagiuXrIR81oEZMwF6sWncVfOw2dElXm07CPgEJ+B9SChtcoWH/yO
-su6oioRuDIP5yVWe8STxSlSlSoOCtKOASegjtOnW8xKJdKlFf0cTqj4dYHCMgaE7
-/r/LY/5b+Jd7zlyQWfQjFg56Ha6p+SUf+4hjfDU+ZnlDIiOvCyPUS+1BLTewvS2S
-sMVj9L2HKhDtLz7EoCaHtfAWXy0W1jKFZda94x6vnFync9XPMoo2UET8eypeTkIR
-6QyxmYT8zZeMFHrfj7kw5sQUEjoIhrv0JiBxEOjLHH6rurZw/O3AUmvO/KePKyZA
-yMWgy8UByFcOPG3gwJJvYnBsNu5Pbbx18mnm2Z1iy1n2LQqyp23VkMPoQYCYPgWS
-hEd+XIhNj2HBNidg2dDcQQ54php9QnUSlUPW1yHr6betjpnr30GzSpxilONZxXuh
-8fbmabhVWwnwP8ndAuh6sSMCWvS58uwxQR2q9aF1sbFAKWF71IbQjI2BPOokGkRM
-xoj4d/cBbqk2RQZT2vFFktFzSZdcpSjT9NwgVAcsx6e5tJFmVLAEcFbexAWP2eFQ
-uNq+IXAIf7+ElXuMlUjimUxHM0IXxWbL48/fDz0Fu1saZuWsH/7IBRohyd5mAP+K
-J8G5GvlmSKx4pW1u3xFN
-=Iyeu
+iQJ8BAEBCgBmBQJVfy3YXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiXGYP/i4m9rQSbLZ0L/OmUxnx3EZu
+zxpcEAG0SX5Db1CRnXSlPIroEXFsNcVIVEAkZRy8G4Umim58zXqJAFBWAF8yWabB
+PV0is5ezum2pD8ePs/Rh+ZNvgyOwyA/x32ONYSLkbGgzK4i7ZbNVlK54G+WPpsB7
+WhFWUwyaJZ2a/nDLgSQyDd3g0t9zWZwEM7IPuYAhKRSPCKpQaKIdhat6Tida4xki
+z8G+pQk03hXd5+mHku+FLNv0ujsdytSHZJWJnMswOlG2zn8jm4C+Px4DSmoddfC3
+pvg7f0kLmVVSh5oCXSy9QCsBBB+ED+r7eb+EX+idsPJHHFFx5fuWggrfCgBKojI3
+TyqD4ds/96tNxNgQbmic4Emd3tjF+SKk76qxA7QRvvN1cb4sePhE+6nqedyZhMYT
+ovwEgOvdwOEiZSryS+8MjPC/W4UbhmsNQe3KBJEvv++vknXTsR/MUomgnSn3OnME
+5SmPbmip5h1infSWkDB8rG1/KVR7OV/oP+Q+dD3168CyonEO6FGAA+3jJZu6FDJU
+QCnFsYllCHpVFJQ5I+knqr9VHrejP3Sx0gNjTjsIRrWRbeyvThLHJgl1pmNyLAzN
+szkec/MGqd+6hdD57bl3U+aw3d2ixEeNDnvFwssfnuYGVN0qlOu/Wl0SmcPnNR7u
+V0lNl1wRraVLl244uDKW
+=HbPH
 -----END PGP SIGNATURE-----
diff --git a/www-apps/horizon/metadata.xml b/www-apps/horizon/metadata.xml
index 91ba85280b41..55d8c795a551 100644
--- a/www-apps/horizon/metadata.xml
+++ b/www-apps/horizon/metadata.xml
@@ -11,5 +11,7 @@
 	Dashboard along with an extensible framework for building new dashboards
 	from reusable components.
   </longdescription>
+  <upstream>
+    <remote-id type="launchpad">horizon</remote-id>
+  </upstream>
 </pkgmetadata>
-
diff --git a/www-apps/jekyll-coffeescript/Manifest b/www-apps/jekyll-coffeescript/Manifest
index eff6a1b38682..7c8fc565ea03 100644
--- a/www-apps/jekyll-coffeescript/Manifest
+++ b/www-apps/jekyll-coffeescript/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST jekyll-coffeescript-1.0.1.tar.gz 5206 SHA256 3d158308aabe670c1f58dc55dc8ce5eb7ff80cc83684e152c12816517303660a SHA512 88c73c2393dff2b9dc8aac2329f6e669f98c66c5d1b7ee2a4dc2236608197a3bfdc07bd4a67832c94f4059e4c82212b2b14c4f37b48957e4b40c9d2449c7c482 WHIRLPOOL 0a474eeac58c9e5fbb49aff067bfb26c26d8588b4e05aa03a656a4a72024e29cd09838c34d425fbc279ed2583818de409ab153a297b7bfd6a00e03fa844dd1f3
 EBUILD jekyll-coffeescript-1.0.1.ebuild 944 SHA256 08b536b31f093a8151410dd7b48897f7170d4d499de07b38b9470b46a5175169 SHA512 ed83e9fca145be5754ee5f59fad2d78ca7048559f11ea71a7812cd2901ee13656264f5a2b51ca25515c47b4f1f03fb9ca6bcf6833c0376d228d83f17574ce861 WHIRLPOOL 9711ab1a14ecde09718a4586a77fdcb652aad1c0f4bb44194e6577d036b757829e1b869d8c6274f5ba3b12b4759e33fd9425bc9ca6a9a32b0dbee76b074faa6d
 MISC ChangeLog 702 SHA256 6d56a28a5f746ec60eaea115236778775628fcd7b844acf6c051bfd276d1f8d1 SHA512 56cca0d65cf3f50d530dad62881e81880643d9bf5720e6cf64283bf402dba103b001f7284e6d130c9a669678d24ace56e79aa6d78cb51551890ff6f5b5e52f4c WHIRLPOOL c5aeb1b5565c76fdd910989fe21cbcaf9ad4e74cfbce7b011fde3eda67abb4734deb4472e049ae4f49b18258c33c6eaef938db3bfbea81c01b5299bbadc01221
-MISC metadata.xml 231 SHA256 9c04e1ed256c8293b1120d9b56de16e3ee5ff6cdb3967d517d46c5974c23d67a SHA512 0aaf70d152f2b3a4b333fccde6f5c9fbb6cac1a9ecf3e2b2ddb57a1c260b3f0e7bdd215edad17f959b2a3324929bf446164341531783431c3435d1b956d09d83 WHIRLPOOL d631165d8a2dd82731e34fed2e3c09437b8c0d383da28c3e0a5f704196afc1810a7efee388e6b558493e82fa61cc799ab3b93eb1b7b17464dd380efdcba60d06
+MISC metadata.xml 322 SHA256 bcc6e7becf891a821103bd4ef9c7c3c271caf53eda9c2be8235613051ae48c55 SHA512 6bd5326d20300109dbc5f5d43f5ff022e4a15651879e90e7ca1499d90d5ee63251938d202f03420e689e03383788601fffaec338448ffccd6f216dcfeb356a5f WHIRLPOOL baecede72c5d34da6421e364c700e4eaf1fb51980bb29457dd0c1b0b6c0f5dd547e1835038c1e6b55b37f5cd5ff7395b7af2e03cab240acabee10d0d2fc50af0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ7BAEBCgBmBQJVfy3lXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmituwP9A4i/E/p4s3kdFofhcEBUeYc
+Uie+/JbDIlPs++xtiwl21B5rF6HfGOBCYrwCiccLU1sXBQp6AfuSSr+Xn6IlZvya
+aYnxRHfdoYuKuhppvWg7vYXT9H+mD3up/Lif3LONngOKCHXDsj4E4Jts7PK+Tngg
+lOPR1tJ0Or13zBtDYI5ub0M1AJ2wqRl2c6DzO3UThXcrg5FT6f9byLc2ByTqsw4o
+KgnZYjsh/CvdtU5/3Bk+lRFFSPAut0QWmGeZbX0fdKNKmAUgWKjU4GENvRu+4vvk
+fbTplKGB/KXu1uR90AiHoEVUKqkFr2wIbHhWaaD7MI8J6P1nahsG4YLPOEYWsaGu
+S7cr5yzb8UdxnuweVMqPCozKmuy0hsa8vqSa1s8K0nZcrX9aHJ08Rl3j5R3XERyp
+MPB3iuq/LjRYSWnhZNp+eSpmzqmYXHxBSLNrpTsM1T7MZUPrNgxt4GTDEaFf8MWi
+0srJg/q2j/XWF4NtcCstJ2+BpvcPp38E68gmuwNXJ4bJnxTpELVQSm19e0S2XAim
+vyWvwW/nGtivZ5Q5GS7RBflUbbqzP3WrnYuU3VEbgMBQb9EcuW1xjGz1MQ6q+I/M
+P0idXwhb62wKBllsGZCJ4cGRPMLNV9TuQPnTLA1Osc8/cslN+x/VaWsh82MULIJj
+xlggnPRyN0IvGDsmnWY=
+=1aIO
+-----END PGP SIGNATURE-----
diff --git a/www-apps/jekyll-coffeescript/metadata.xml b/www-apps/jekyll-coffeescript/metadata.xml
index bfcb6974f1c4..bd119c5459f3 100644
--- a/www-apps/jekyll-coffeescript/metadata.xml
+++ b/www-apps/jekyll-coffeescript/metadata.xml
@@ -5,4 +5,7 @@
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">jekyll/jekyll-coffeescript</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/jekyll-gist/Manifest b/www-apps/jekyll-gist/Manifest
index f436949a74ce..c130a3d6064a 100644
--- a/www-apps/jekyll-gist/Manifest
+++ b/www-apps/jekyll-gist/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST jekyll-gist-1.2.1.tar.gz 4273 SHA256 9535b520de3a9725c28035647f938ee9eda67778150419ed67fa5672faf0a16a SHA512 ab5e83bd3b1ec38815fe375dfe78c83532518ce1ef47ec9c207dcc21f04c0c8f760327f1a3bfbb3890e33d6f477455e89f2243fa59c2d91be58ded33c3ca5968 WHIRLPOOL aa7ba5cf12e4a7f2e824cca0c3b420a600334fa43151a8fb78285c1dfa5fabc15587a72c25b270bcea06ef6dec386be63757b3265d783202dd21aed4c55b82c2
 EBUILD jekyll-gist-1.2.1.ebuild 740 SHA256 f6a3978b127b29a97d88f3bc168c1278a6ad583319785c79150248879e70a306 SHA512 5e7185743be9ed900787cf0385c3b346ff2dc51a97096298400e60449ca0e1251d0483b39b17d4ee371b31972cbb1c7e8ebc22a1c0c634f136407e0922c90ab0 WHIRLPOOL 50d651b36dad2c3bd8b8b72ba04663e9ea11e6771c4d7923929c868e8e3f4c4bc943e707abd2f42fae70cdec0d1e5760902e522208377922a131b46232dcdfd9
 MISC ChangeLog 686 SHA256 7c25ed1dc33361e0bf4204346005fe93cb8a17e3f93dbdac4e679f958b754983 SHA512 12acbe3e09563b365ad8171ea2a793e90ccbd1b669339d41b4beb2acf2ae5e17d063677972ffe9b8fe7a0c277e0694e5973ec275eec4028f3eabca896261dbda WHIRLPOOL e4c4cad1a8e832a76a7f7e33d624d867c434ae7fac695383aa598556fae3fe6ea806a0ecf8fa27d0e515f421e961f9a40f0aff393ce630b34fb1663b94678077
-MISC metadata.xml 231 SHA256 9c04e1ed256c8293b1120d9b56de16e3ee5ff6cdb3967d517d46c5974c23d67a SHA512 0aaf70d152f2b3a4b333fccde6f5c9fbb6cac1a9ecf3e2b2ddb57a1c260b3f0e7bdd215edad17f959b2a3324929bf446164341531783431c3435d1b956d09d83 WHIRLPOOL d631165d8a2dd82731e34fed2e3c09437b8c0d383da28c3e0a5f704196afc1810a7efee388e6b558493e82fa61cc799ab3b93eb1b7b17464dd380efdcba60d06
+MISC metadata.xml 314 SHA256 0dbeb676e93fe301f67f129312da89e5c0602cac5d4b2cf1cd7fafacb70b0a57 SHA512 eef6300325d929f4193651626d2edae511c04143faec5d0fbbf87e894fef0fa9d70e07d89c38b62f1138347d16809f81a21de63e74ee8876bf39b5aedd6d5228 WHIRLPOOL 5f9fc1ef9943470649bc76b6ca8d1dd4394a634c9d7aed4371f178e006ba5c57311af785eaac572adc3716d8b4e6a596b210b40c250fd617e09d38eb9948099d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfy3rXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiMvsP/jrIJWodMvAXGr6HVkutQtQc
++FaD3+7iTBJEpapWJ9BszmFBN3+ZbVhLaS9dtMtJLE4s8ZkRMUkWmPJWz/zcsoCJ
+HtdfJuUu/4GTNmlRW96pd3puN67vZr3qA/bM8cit6+oHSdwt59BMSz881XxGtR7d
+B21Va5zigqAh26SykHYy5bq/Do3N4dU5VpDEXUDPB6CvFs0pU9Y+czbfvoVevjU+
+jIa48wIaN80nrdMhdzU9eK2UVjR95Kilkns0A8lKyxfcqtpPCtHC5y+yzXzLIvby
+tJ5aGbEzUGknp74wl/niKb5NPC6XNw61NUMU2o5b07GB7YyAYx+YNDD+r0n2jbJM
+hvViCmfjwDH+28CjVL1m6gdEE9wwVIKQc59NNcYfSeCGtZhZW+zFF0tS9byKpkcE
+ARLXRZlYS0wElihwgUWdnR1WHPM3w/O8V0nDXZLXIxV6eKM7a2+DNP/vYOVZ1acA
+3QT4RbkkE0hYZShPSvuC0JuCOuLyh+4duX+KKQcAIZuyh8dsuqjwl0gb2iOm0B7f
+juNHVbIaBCfxH6pdYPKN+LgkX/1TYhcOH3x3Wry1XYRdw+Ubvw9WJmP2WrbQwP+C
+RcShynA6H0IYasTBOnU2SRq20CshddjXHOY8gopwPe6FAxWa4JdLmgql8oH0u37G
+dDSGqmiy3mJjxYzXQ4w0
+=LP7M
+-----END PGP SIGNATURE-----
diff --git a/www-apps/jekyll-gist/metadata.xml b/www-apps/jekyll-gist/metadata.xml
index bfcb6974f1c4..8fbf833f2885 100644
--- a/www-apps/jekyll-gist/metadata.xml
+++ b/www-apps/jekyll-gist/metadata.xml
@@ -5,4 +5,7 @@
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">jekyll/jekyll-gist</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/jekyll-paginate/Manifest b/www-apps/jekyll-paginate/Manifest
index 2c048001a4d2..e393a32b8e1f 100644
--- a/www-apps/jekyll-paginate/Manifest
+++ b/www-apps/jekyll-paginate/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST jekyll-paginate-1.1.0.tar.gz 7604 SHA256 5a231d5239649a1463f1a18378f4bb333743b1e2cea2497d1a34df850d9b64ba SHA512 aecd54ede67adfabd474aee08dd18cc403dc21f6e4630de001db32ea07808e7a025258c5e8721f381586de4b7037a6093f8fc77c45d077f1fb69bc7531f2bc57 WHIRLPOOL b7b09347ea31c5ca4fceaf398920e3641fcb940a98ae2c99d7da13e972508c5d8ed32c840ba417be6f84266f66ca7414e4440f550b368c6bd94e0a1f34e2f8d2
 EBUILD jekyll-paginate-1.1.0.ebuild 1021 SHA256 82d27959f9b415c2c32e0ee65846fe675982d4433d91a2da1dadd234e9d973f8 SHA512 2622ee599d7bd17e39fc802a98c2638bf92c792f6f6e9287c66b255e45736ff3c4114018715717896883b15b0c8b16d33d64a10bfdc241745f2ba46a63be75ab WHIRLPOOL 580760723b330db7b2a01350bc576d529a7e684d7edb7391b1157491d518ff1c427bae4ddf8af74b521099b67d0bda2ed57103198f1a97e4c47694ea8a307626
 MISC ChangeLog 719 SHA256 4e21559b62c4209a0e4719eb112782b1d8525bc3485acfe3e27118813b672a9c SHA512 1fdd896f85e2d094a3694fe0e556526ad4522e9db218a1eebff00f094cf48c18b9fa2b62fa001ecd9800d8e2a101ec996f8f67d95d2652f51cc285dfa18e16a3 WHIRLPOOL 1db3d8eee143fbd64e407495cc6825924f27e890ad8ab3cca403b83cfff637d89f57e554b36a62f00f422398c1a220134a5da03180b10bc85211c68ed74d8a04
-MISC metadata.xml 231 SHA256 9c04e1ed256c8293b1120d9b56de16e3ee5ff6cdb3967d517d46c5974c23d67a SHA512 0aaf70d152f2b3a4b333fccde6f5c9fbb6cac1a9ecf3e2b2ddb57a1c260b3f0e7bdd215edad17f959b2a3324929bf446164341531783431c3435d1b956d09d83 WHIRLPOOL d631165d8a2dd82731e34fed2e3c09437b8c0d383da28c3e0a5f704196afc1810a7efee388e6b558493e82fa61cc799ab3b93eb1b7b17464dd380efdcba60d06
+MISC metadata.xml 318 SHA256 62e2ba00951e205c75da7383486fa83e19238dacffcbd6d76524e7d776a6b4aa SHA512 65a616089617f1b3f4fac167031143be32b643eaf4d8f4455cfdb2d70bd597b2f97d3b5fc3c9a2ef9a0eec6fbd4d05bdd68ca1a19bc3aea6f9240b88061c86e9 WHIRLPOOL 52d3ffe51d2cd519b4bf47b2353fd2abf7032c84ff782dbb39a96ba5aabb2e7ab4299f28bf728ce0fde87c5bb8d9f42e3123d116a319399aa21838aac48a0f97
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfy3zXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmisvoP/RsAo/FUWLo4ELUTZdu3inYq
+VAUVcoc/lOUwSlG1Ly3OteRwGZOKUIy8K5LxU4ZoUgfIdN9IwOkQxVUbWtJoCFxK
+Bv29zlnMoRAEcIoBR1D3P7htDJ8QxyLJ59/bat35unvZN8GXP37ndBlpNrB4hExq
+DxwkuwTu2IR6QtTlNmTb6T6qUd/PSoUu/fgveW400+3qQUc5FLkJzQtUim4lEB1M
+u9Dc7cVCN0yFgy76TWcT4q+aPMd7xnraJNWgtPF/u/v4sKHDzlGa9jFVbbKuFPWc
+Wdq8Tbxz4J1cw/MaVee8Fp4g28FOKpJbNSW/dhr34mV37Jpev8Ka61DIjGpYAUNI
+NjA+amTQ3FxlrngfoSCsyF/77NbPnjVpzEE7pcDcmGLtKzEP6bRzgLYH+L4npo16
+ttJkVApdlRekOpS+x/KrVzTb20/Bexk686MrCOFW/vn5oh9Zgxjc0pLrK74DAf4E
+v4QQGSeO88jdpst5738n2tEn/m0FXAtq/cW45xTyZR8EWjIV2p+FWGwPGAk/BCSU
+6UI0CBFmp25BZG2/U23ThbPDZRvYQ+24Ghs8I3ZGNEjFJzm8aRFENQtOYiPEi/NU
+1ZpGtOvQmQdkqHrbv30vOQ56VOQN5zXbt8cft/WE3e/q2NL48EqqbzjJU7Vh7wnW
+fK00FcKRgjOnkU9jiIvP
+=Ug8r
+-----END PGP SIGNATURE-----
diff --git a/www-apps/jekyll-paginate/metadata.xml b/www-apps/jekyll-paginate/metadata.xml
index bfcb6974f1c4..d4d9a3671426 100644
--- a/www-apps/jekyll-paginate/metadata.xml
+++ b/www-apps/jekyll-paginate/metadata.xml
@@ -5,4 +5,7 @@
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">jekyll/jekyll-paginate</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/jekyll-sass-converter/Manifest b/www-apps/jekyll-sass-converter/Manifest
index 7a7c5cbf001a..bca4b2b00fa8 100644
--- a/www-apps/jekyll-sass-converter/Manifest
+++ b/www-apps/jekyll-sass-converter/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST jekyll-sass-converter-1.3.0.tar.gz 7272 SHA256 a036da688c95ada34749435396dbae81909a43714d41737c9a59d6bc2cbadf21 SHA512 5382224d0d20a3772ff280710a0fa1d3cf2d2946cad54031da51467f1d1ea880f60266c12a4575c6015d0b455bbefd665b719b67dd721f35c610c6a73ecefd24 WHIRLPOOL 7add5b8279ac6b0bce9caf89476c1f0746426cb34007655158f24d5ba1718475cb59d33cbcc33880a2cf4227d1917845acada2c0427a453195e0a8fc3c3400ef
 EBUILD jekyll-sass-converter-1.3.0.ebuild 919 SHA256 7973edf93ad1bf600351c9514ee1dc2c3361746fa1300683746820e423d2b37e SHA512 43a61db409eac3873743e460111d6f97df414719d9b19b6132d61fb976238d3d1f8030d4744e5a834b5fe326c39f6e7b7f754457ffe14af2b096f8d7059426ee WHIRLPOOL 2bffc1e320b8b9b4535870c0bf050c2b393f8292c2ea190cd331090c61f23a9dd4225965966fd1da329f7f9d9299ae2e7b82795c0d3052165bb5ca2eb7717451
 MISC ChangeLog 918 SHA256 da1aea250e1ba130458001377f3104440ef3801f47813ea92f54a0b1fbe4e6dd SHA512 edca024739e57f7d2d27df46c5a6e67f17beab2c9e0f8948fea3dc1c2b0e52b7ee343ffb3b4bd94cb1d07aaefb84ffa18bd4d875784febfff55d7c28823db0da WHIRLPOOL 7279afee361f1a9204650f389c1064395b6c3ac9f68eedb6171ee3980a692ceb8bd768b97bb782f59cd3257b52e92a232c0209065a013859a675ea13b9f1f4c0
-MISC metadata.xml 231 SHA256 9c04e1ed256c8293b1120d9b56de16e3ee5ff6cdb3967d517d46c5974c23d67a SHA512 0aaf70d152f2b3a4b333fccde6f5c9fbb6cac1a9ecf3e2b2ddb57a1c260b3f0e7bdd215edad17f959b2a3324929bf446164341531783431c3435d1b956d09d83 WHIRLPOOL d631165d8a2dd82731e34fed2e3c09437b8c0d383da28c3e0a5f704196afc1810a7efee388e6b558493e82fa61cc799ab3b93eb1b7b17464dd380efdcba60d06
+MISC metadata.xml 324 SHA256 dfc9d8b37f2ec210f77eb596775f26bd4f5338e5963dd1f7758aac0fe396f1be SHA512 913fb4578e8f71544a144c1681d172436463e506b5e46376ebaba2b3ba762992367129e21956b43c313d5cad1800dcab7a9dfb041fcbc8046199b2a93b03cc24 WHIRLPOOL 5254767ac39404661f13fe748cf780a2e264f19b20d246cab3e4d5a41218ed3fec72992353105deea6ab83969e7f37ee3ab92036cb11e5f589edec69d7be76f2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfy38XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi5VoP/iv7YfUuVV4p8xtC/8wGWc3C
+W5+PT1WYQhtrtjkDCTZT2ziOrGRmdhid2uDue700LZy80ne0gIJKfvnRNxdcN11N
+gn9bYIuxmEBQtEoazHxqpWJX1ihIJ2Lo9muIlSzCCI+a8WB6WY8yScnWzE2cE3ln
+y2oKfNfDGcIDnHBbzX4EwCXP6itV1X8c6ZxlMnYQ7ExcOO1qvn5nzw8CyUjPHoYt
+i+VifooZxuv8FpfNqnKUyZnHQXAc0E3k3y8EXNwXeCM5A8MKHHoZwLmAEqAHHUx7
+SEkPtMf4eMzbi7TPq1R5V5Inr5aLx/4G47QbGXcRP/BNFYbfXax9Jm2R7m9e1/0n
+336h0t5eYYBxrPPXd1SGt0bKwxk9H2KI5izziygzuTHFQ74JDfJQGvc9wxeM1ExR
+h0CeDwxSXafeeinraSvluMik0vSomO3VezZh4bzr0Zb/kBF5BwgG1CzuDrL/4iCW
+29siImIHe1ftgxY3ZG3J9luF4tOSYb4bWLVFkN+4whWVHyd3PnQfMosQj5p0E8pF
+OK6+he0v8NURQ+5oh3wRpZQpxyLoTgLPKhdSnyEulPGdYU75q43RX3sYALI3KlDc
+nM6OCr+X1inUDipIm3Y6ksJTve4mfh0CIQP9Q0OHbcyEUSaXU4QK3nOYSqbUvPoz
+l/kzSbikQSTg+sbY9qSh
+=Jwd4
+-----END PGP SIGNATURE-----
diff --git a/www-apps/jekyll-sass-converter/metadata.xml b/www-apps/jekyll-sass-converter/metadata.xml
index bfcb6974f1c4..85f5da910996 100644
--- a/www-apps/jekyll-sass-converter/metadata.xml
+++ b/www-apps/jekyll-sass-converter/metadata.xml
@@ -5,4 +5,7 @@
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">jekyll/jekyll-sass-converter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/jekyll-sitemap/Manifest b/www-apps/jekyll-sitemap/Manifest
index d40efcadfa22..ef36da27b66d 100644
--- a/www-apps/jekyll-sitemap/Manifest
+++ b/www-apps/jekyll-sitemap/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST jekyll-sitemap-0.8.1.tar.gz 62835 SHA256 f3d0e31d5818f2ce7a39d27eb99229cec7c9e706229878ec248b6c284776802a SHA512 2c0f3ce740deaa66018e6bfd80a5d293feeb70128926d2b6626e837b2d6becf01151f4a13cbf264279b4bd8b2972019a9facdaf5ce4fc54d3dbec1a1c304439b WHIRLPOOL 001720e21a87c07139d5c0d7c029c1858ef5e8f97dc24bd9880f60cd8ca980ac85dd0e7a0f32a1a0aeb3a2d6e3fc36561c93fbb3eb79c5dd8807307ec3324e7c
 EBUILD jekyll-sitemap-0.8.1.ebuild 709 SHA256 8a7fb0df685c48a76d7e98fbed7b2948eef44e1e0433e8fce4cdf818e462b7ea SHA512 65bbe8874a3fa0ef2332e1213756e90f1ddd80c4f41a9242ce011d124d06ef41d3d261620e72b44dbb7e954e0260d60ca5f143e5ddb5644c8c258aa7bbc2aa88 WHIRLPOOL c728c0e7c1412511764fc0e7ff1e56bbcea83bc93223c503baeae3aa7f71ae65c0cad0904770c7f78d1b3c1687595db9160c996643f5b9763ea9b54ab2396b91
 MISC ChangeLog 1581 SHA256 be5757f50af49bbd7b725ae34fd62fb5ceeede57dbaa2aac413f71b322ca3a80 SHA512 7e0c40f83d7b477237c3464a7373514b022391bb50c38415b43ff120cfe8619c4634709d17214b91251fadd2ddcde382cd1ee68b347a1e3bced9efbc58f75060 WHIRLPOOL 3e45ec08d27d71eb5674c9e45e57cf591f60e10e021442ca64bc46ebbee24cace49f9897120219c7c95b7db7995fb1eb778645f1bcf45500a5f1cc24e8a10707
-MISC metadata.xml 231 SHA256 9c04e1ed256c8293b1120d9b56de16e3ee5ff6cdb3967d517d46c5974c23d67a SHA512 0aaf70d152f2b3a4b333fccde6f5c9fbb6cac1a9ecf3e2b2ddb57a1c260b3f0e7bdd215edad17f959b2a3324929bf446164341531783431c3435d1b956d09d83 WHIRLPOOL d631165d8a2dd82731e34fed2e3c09437b8c0d383da28c3e0a5f704196afc1810a7efee388e6b558493e82fa61cc799ab3b93eb1b7b17464dd380efdcba60d06
+MISC metadata.xml 317 SHA256 b00530f9c4b84e9f804090c3aff55d7525c3d16e411ad6b8840cfba1fab4c712 SHA512 c7f36895bbde4afa20b8a76049d54bde7fb2ba6c39437e62278a1f78001295cfc752259a371505c4c324455a187726ea10645f161f945e817baa74544b1c5840 WHIRLPOOL 903ac2a1b005ec9da4ac649c8d19819c19a6acc46c256caf610d386c55ace3a9e2e34f68b94f1220eb2623d01a91e26b8ca4b4a1d93ac24a1723162488fc1cbb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfy4FXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmipRgP/RgQBqDB3BY6TAZvxz7dVpGq
+9Ik9afU1omhE2KLSZxQvAdyPKMfnNR9dAadOBpEyvj9xhFGU+hdI/FWzFJwR6pIh
+DyYjcyldo1t1LDX/Ruj1EezglCyO73+pPnkDCNQauRmlMR3SzJaatpUBXtkheN86
+zaNyIYL0FYesyYi3MELKeJmF4raYsQfYvDc5mw7Wly9qFTnQ54XhSnEx4Nf2jc1B
+bwQvmxjJOJwyy1k4WsjYUlhp607J6iUdn74geA9hVq9E4JgnJT7Npzg0MMnpBiPq
+rILH9GEMUB75f3M91bxoujU70YHKIwLa1AykKpWE1VnYgz6abaBMB2QLigfb4Of9
+B3WJDWS9qtgsy6SZZkbVIt5KpP/x08lI01cH+oYcLAQGORkBlPQLH0PVbAZIfrNA
+OqWHok/KU+n1Q0YWjInBRsykvhhe5JqwL6wJLDGyDQwhKOv5PCRG5FP7w1ukmFsj
+0cb9ai/lMMEBYAbaCL0J2yrzn8OOyjV59wmDzKYhFsRCzLQ3yoRyhI5inHbVV/dO
+UNJjASz0ITWeVVCyHrUMZ+DQT/A8tLsr2rrwg0zKjSn6MzgK9KMCYUm9+aAiXrM5
+wi2AFCvUDvq6DAe+K+iUMVaVMoPwEncijTzKJUSugc6IjL9St+sUpk1Wyl6iaA55
+sxFK0D/siOqZJuO29V8o
+=/qLq
+-----END PGP SIGNATURE-----
diff --git a/www-apps/jekyll-sitemap/metadata.xml b/www-apps/jekyll-sitemap/metadata.xml
index bfcb6974f1c4..6f4e60144a48 100644
--- a/www-apps/jekyll-sitemap/metadata.xml
+++ b/www-apps/jekyll-sitemap/metadata.xml
@@ -5,4 +5,7 @@
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">jekyll/jekyll-sitemap</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/jekyll-watch/Manifest b/www-apps/jekyll-watch/Manifest
index 45aebc845221..d5ceca009b55 100644
--- a/www-apps/jekyll-watch/Manifest
+++ b/www-apps/jekyll-watch/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST jekyll-watch-1.2.1.tar.gz 13660 SHA256 7641a8f4eb5a281ae0ff6f5553882b40ad95bd663136bc802036a3f3110e97fd SHA512 69fabe7ef01f2bbcf81e0ba0ce4e62d6999ff1a1da1b8dc254e364dc61af2bf6989f1f1ac8da6b2da7991e1972813b7c509fb0cb23558f16536b8f68fa57f62c WHIRLPOOL 2c082ce9bd703e639170f6b4ee781c3ebe8dad8e59f1cb0fdc690fb4136b4432368a53095f7455728fed4e6b44b0ae1d467dd26cc0acf8a7713b582fc3703c25
 EBUILD jekyll-watch-1.2.1.ebuild 928 SHA256 10c4e8fe5093158e63b07d28b9870c60f5afe1beebd20e87f5e3885b70716d04 SHA512 50f0aec84b2d4bc25841cdd2e4f3e364fb2cbc6deef6aa59e08ab105c7155e4695aadf4791c06e074b4c3d3a9c407339853cd23f5415023271071e1a7d65052d WHIRLPOOL 4e264a23ac9d1601d8591ec798145db67df0593281eb1c4c54425e7d4ea5d6e42dd2ca23e5f02810860aca225052c6d9ad2d19a5aed0692ee064046a43df1605
 MISC ChangeLog 1207 SHA256 b5e3b98e7352f722e9c5d510e7444dac0f5a8a306ff4adad086cc5bec223d93e SHA512 c4225b127030760ab5155b5b9ac84d791e1caec43e3685b6aa2a9e041384ee87956dc406d3a16fc9d91a48df68616a6889ca1927e05e932bf5159d228dd777a1 WHIRLPOOL 1d039bfe128ad230222921726ed6b8b45076544d8cd17fbeaad8caa42af170124e834a326930b4ab43bb949379b89d60085251b283cbcf35c44549ae60f77aa4
-MISC metadata.xml 231 SHA256 9c04e1ed256c8293b1120d9b56de16e3ee5ff6cdb3967d517d46c5974c23d67a SHA512 0aaf70d152f2b3a4b333fccde6f5c9fbb6cac1a9ecf3e2b2ddb57a1c260b3f0e7bdd215edad17f959b2a3324929bf446164341531783431c3435d1b956d09d83 WHIRLPOOL d631165d8a2dd82731e34fed2e3c09437b8c0d383da28c3e0a5f704196afc1810a7efee388e6b558493e82fa61cc799ab3b93eb1b7b17464dd380efdcba60d06
+MISC metadata.xml 315 SHA256 246daf814456517ec2e126cf09337f7baa97022bcc7279b8c00614670576e2af SHA512 460ba2e0bf23fe6637e3b8c6a1bf715064aaddc8fb9ac11b4ed93777a6f4c6d6ab8d0e35275709af76caeb6658f2542f1ee448b358edcdf532d9a3ae3bc4f059 WHIRLPOOL e4677ac79d69f5de4d304d5f71deb2007ea5fca5f576ff5e3b775af6704b7d191eb71b4e82a463843d448cf0320d1c3bf037609e113906386a34326ebef4b3df
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfy4OXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiT8wP/3mJK/eoiMv4PxVgciTuGutv
+04Cze+xxiIP+D8Si3y1VYyFlXyMkkGR5ylaHiXyRbBqQAoAu4Qd7shCDGnD2AEaK
+6xQetYoj2QTpBUkswoMyp7/siiV3osj25R9rvgYhstc0NRUx07nn23+WnvKPX9bt
+OuUm5mcoC9MsdZXiVWFoVZbHAJOrdwTHPY/2rKVYvRTT8RhhmsH9xQHVFtuzig+V
+VD2n8j2llV041j3eYVFP0pnwJdh5yg4xiWrvhRGWAl8AQKg9Ntg4WP6H99AgNTxz
+EjGIvHofYq60eJvC0T/Si7ixvs+69QVyO2H5Od1a2HzxXcyHSPlE2tvlv6sd04dZ
+mNkQ/Oqq14szNRpaseJV8wcKCdo2IgTheW5kQ9n3JTvVt3gRCqdUOUeCm/yDgBol
+2nF6RaKFz2ztrQXO14DFAJdLTJJ+zXGmwrXLRqnNS/KiQka9lfti6ULkMMWVIOlJ
+OEm4YET2uUkDPDw8oA3U8C7krpS/5E63guH+6SquV6IsNnLt9kD/7wDwnJrz6/Q4
+RPmY1wwWsmdRA5a2O9jKr2Rr1zko0eKoT5sbNyj3R+nz7YhZQuNpDI0JotWSXTHf
+U1AQXJEw4Y8EM6REdnH+bCs4/5NkxCCAmFc9nJefLn6xflJ17p+zT6zJGWAfr67r
+rBCpmYk8KDDwHwkPq2QP
+=OmNU
+-----END PGP SIGNATURE-----
diff --git a/www-apps/jekyll-watch/metadata.xml b/www-apps/jekyll-watch/metadata.xml
index bfcb6974f1c4..1bf922dc3165 100644
--- a/www-apps/jekyll-watch/metadata.xml
+++ b/www-apps/jekyll-watch/metadata.xml
@@ -5,4 +5,7 @@
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">jekyll/jekyll-watch</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/jekyll/Manifest b/www-apps/jekyll/Manifest
index 0d9f92a3a27b..1a6147f58354 100644
--- a/www-apps/jekyll/Manifest
+++ b/www-apps/jekyll/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST jekyll-2.5.3.tar.gz 757248 SHA256 51316d48c3b12a6753a66655e1c7676f2c1014f0b50ccff6bf53002d5934b93d SHA512 28dc09ec9e758fbd2637df9e2adbd139af77799ace6af32d1ae4834ac9fb08e1a10f286a274a5faa589a37451fac5e8187cd219950be36c0e9b8bbdcbfd31285 WHIRLPOOL f8c1a43be364893b811e8a23e4aacf032d17e0dce01d8a253a2ed05f008141cc99181cd5c8922307d296804b961880ba29a839b3c263856d040160f80ac81771
 EBUILD jekyll-2.5.3.ebuild 1597 SHA256 79231b917db7292ece0c1f9c8b6511d96d79181e19fe566d1e685ae729d8be47 SHA512 75aa77b867ae5eba57a68d7142ce34de6d78ab5539ec6a602188dde1c17036272644ffb448e06647edf054d2de3b8f82bd5a5a4b1d38a95b70785750982eaea8 WHIRLPOOL 8b25a9a25c21bc15dc7452d65f46a0189d56845e111c1f8e0798bdd9d9ca41d8fdd086f388a7daf82180c0171de43fac8ff86c6bd786d0207b8ac718bd2b8afe
 MISC ChangeLog 1955 SHA256 46b47940e60635ae8033ffed1a0a53b988cf3af2ce8116bda6a138a214ef0e9f SHA512 df6e836f110a4a82a6d4539751d07124b321389e818286949db4d16f865ccb706cdd21232a9a27f29864a122a4f3bbd608d0cb3d0ed7ae279c411347c43be2d3 WHIRLPOOL 73bae10204a1566bf3c14726512727715d33ba323ae9e77c201213339e83afea10382a9b02e851cf8c3e6c9c374a7e7fc6d1ffc3a2735fcd34c84a862238f581
-MISC metadata.xml 231 SHA256 9c04e1ed256c8293b1120d9b56de16e3ee5ff6cdb3967d517d46c5974c23d67a SHA512 0aaf70d152f2b3a4b333fccde6f5c9fbb6cac1a9ecf3e2b2ddb57a1c260b3f0e7bdd215edad17f959b2a3324929bf446164341531783431c3435d1b956d09d83 WHIRLPOOL d631165d8a2dd82731e34fed2e3c09437b8c0d383da28c3e0a5f704196afc1810a7efee388e6b558493e82fa61cc799ab3b93eb1b7b17464dd380efdcba60d06
+MISC metadata.xml 309 SHA256 fc951b48d9b953bc5cc66a7ba2a9e7c6e1ce962809fe572ba3551755cd49f823 SHA512 e83ac093f36c220a7a78ab052751edd220a2d623721f53200117dd713509d04212e23354868063db191095a6f1ecef161ab5863f1f76b6b0be11c950f42c8b5c WHIRLPOOL 8fb10dd9b88e4eeee0576f9ea6f9142130a7322299d922031124e8c07191389ce3364c0422e73558c3a4302eb82812294bfceda54b1238083fc7839ed1af142e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfy3fXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmibsoQAI5uuCojiqCqdel5ZNC8FAyc
+lKHEDc8lUll4V9LFem4rlLKf1tRj+/MI2EP8k0LUNWyOd3HbWt+6l2Gmuw+Nx27J
+EMFQw3J3OU25hDwsFb1Ww6xgf6f5xVgJC0ewNYTqqsQwwdVaG0bDaoXSRdByzdT2
+g2LkJ7f6qR/OIJgpdyvquK2foFuXtN4q0ouub0SSv2015KI28I9WTzRnSp6devke
+SH+Hk7o7ODktGCgIfEVS+gETz0iYfnCiYPdHNPiTwKhNKXeo521DKbIWX3LJlxgO
+eI0fEGXsGCwG2j5rwywijrOWYyBKxUmgoX6i51pO+ahMzC8320ZpMN3ja90usDSE
+0H29s7UYEDFxffVuv+vqAxWJvDZlGzDp7VL+w4VyRQtu1tEgxyeVTWqN66bTODXK
+QM/p8lV7IwSqSG11iGVm5VxlIMyRHp6u7Rlu63hJU+7hapzbS5+hmsC99zwD1Jbj
+bWR6kDFmaFd5nbz5QwBT/qyV3uU9CpTguFTz6Kt+gfcg1PSbAT5tUDokubFVrrVj
+yFddl5rc7/pYEluuuY3UXmFkoDNEfDD5SK6vTTwtucdpQYu4DYnKXjrO0PGaKIx4
+O0ArgD20QGWvfXLjhv1n5Z9trJx+lEdwHHW/dbQ+KLjw59nXe+GMnVzH6J6nfZG9
+XxGU5Y+vAGSxhaPo+gYd
+=URBs
+-----END PGP SIGNATURE-----
diff --git a/www-apps/jekyll/metadata.xml b/www-apps/jekyll/metadata.xml
index bfcb6974f1c4..159cb86f6181 100644
--- a/www-apps/jekyll/metadata.xml
+++ b/www-apps/jekyll/metadata.xml
@@ -5,4 +5,7 @@
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">jekyll/jekyll</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/joomla/Manifest b/www-apps/joomla/Manifest
index 28d2f17443a1..275a05641a0d 100644
--- a/www-apps/joomla/Manifest
+++ b/www-apps/joomla/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX postinstall-en.txt 916 SHA256 b8cde9b18beeab31eaf713c3a07bcd6a831bffa233019b1524948aa7773f0c5d SHA512 d53b2d2b2d9cb1cb83bf452f71d7098e5c6a460bdfa914e7d9bf57090544931eeeae249cf0e738a73c351f06854f7e3490e1c5d84271be43e45bec91a32c732a WHIRLPOOL 05c96f5ada3b8a05671f1e8a04af503fe83bedf09fe84374e92d186e30352168ef5e9aac608c73bca92c0b29160fa25bf7453b3482dfc0b022cf9b140e0a6167
 AUX postinstall-sv.txt 764 SHA256 46bf71e91721e3a0d269680c059642dd694a4f8d6184503545d7c4a46f9414e3 SHA512 4a7110fd497d5330fd289743942a9339bd7b7ffa0812578c4552ae539774576ca7ce6df8bc8ed45ca6bb4d61d7183c1094d6a2480988497e131f3687274b3e0b WHIRLPOOL 86a91ca55da9f777ed98a2435a9b1f909b54e258a2a74781466ba0d3e4ffae142af9c3f0746cdde18d5c360252f840529a59dbb71749295130ee63007e45d4e6
@@ -10,21 +10,23 @@ EBUILD joomla-3.3.3.ebuild 1704 SHA256 cc7536148608d221c288eb7b57133591edbc2f5bc
 EBUILD joomla-3.3.6.ebuild 1674 SHA256 aec6d057001edbb85d621bbc50c4fdd0c87c7caa1b4647461a12d79b9fe6f979 SHA512 a8ca1e44a5eb532353c356edb993e93ea8817ec5c6b2ec15a6a16e3b4824132ac0f3b658c92cdfce00741fc6f3a334d05bdc8dd54edf1d71f5b1fa99d3669984 WHIRLPOOL 4562d5c63b033863e53fe27fc6cc8a2d2f0580d9f0e3c007b93cb27ee8f0090b3d31d67fdb9adf859eeb9151de0a9e19b99e8f65f3196545e301480e24c88bf3
 EBUILD joomla-3.4.0_alpha.ebuild 1705 SHA256 1889d1148aeaebbecbd081b8a9231d56c22f4663eb423f00b346685f0f9a3668 SHA512 bcfa969840abe492621dc2bc3ec2edc90cbc832aa96aefe602dc774c4a3727f04b789474318669825e19fd3ab4b7eeea7155eec8f93c2a2f408c16d1e092546a WHIRLPOOL 012783c9639fbeaebed38ae58cead6a39f8fcc46c0b0d6a1deab4f4012be0e726ee6d168c6dfcff703c5e0998642502e651d917bcdfaddbb95724cfec3032409
 MISC ChangeLog 10004 SHA256 0ad5c3989b84a82ed101687729d6cdb63b0bc82256aef84e9c8dd4118004977b SHA512 ed69a8f392a932ab2fb24c1dcccedc2a3064ef0ad01551cff2d08cd248870dfac559e395bb544efcacf6fa41a4867e4f2bdf96755043b36e228ccda0947138a7 WHIRLPOOL 3728414046db38ca3a8bca26ca4d9fadee7da34ed8a4c54c14300e64199bab1a09eb16964875edf24c308379c398962d4d4538bacb8981c4bb8c2ef4315511ca
-MISC metadata.xml 882 SHA256 167dc6106f1de91ad416e1c87344773cc240b4341b835685fc4dd38a8147e389 SHA512 40a0edace084fbac45108047e131afc1485030b2942a154ce3e6de8ebb4b17415754fedbdebc47d1c517141236909e5b555065342992ac9845e2cc7d4a1d32d2 WHIRLPOOL c7376dc336b50b1b464f38bdecd49e4141ff736c9b25ce4b4ac3d8bf851ad36f9e1015df7c3f677a92c7e056256bdc2cc80b273a6bab3b1ffcc3d7e2263bf26e
+MISC metadata.xml 941 SHA256 b99e6f62d474bf21d252b3e6675f70b6ef55ed5558b913f719053300a2229e9b SHA512 30b993426fa3901a842549627a1f0e84d42dfc05319ce44348d8b3aba30d88b29e3c540f392cb558db41a1ae6a5fe41d5fc467acae0204b6437d152335e1122e WHIRLPOOL d199b0a7971a69fecec63a8634758c1e24d75513179431b69facd7d3ec2436b282185356172544535db6b53fb6f658c5a6f5cac7c556e41fb133ef76da2b6c2e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUixYhAAoJEJIMDbyqvv1VcQQP/06hQALxF4L+4YgWFE5BuxiQ
-L7xRuNX2WTRHH/vNGM0bU2qzMPYT/27FbBIM876sV/NGz/0Do7ZDMgP0k5gBJfzI
-XccrDXHoVSpHo8ZrS5oQwN9JNfbuZABLp13/RH6MyIB3JGErZV4vhjmJEwA7fjAj
-xH9gykNsxXN/ZwI6/seurPmmNvNZyHRUEQgA4hrYDLFUsfZQDHM9EtyNqS3WsgIU
-h/DJqvEMjwHDQjk/k0XGuJVI2UKOGJ/kS+lNWFN3R3MofXCgdR1G+/03YgNseZfu
-9fV9Lco8cmp3GAX1pkTP62eUBZe7kA+4CwmcJbTQz0cANP/RjBklzTcByE+EpYFN
-NsebZvV6gu4Zgwo+anwOo4wjQSmAQr7nPJCXuxMsd0Hkl4Aun6xB6U/hq0PlCpWJ
-FtorzL0c4BEzcOqgUexFsIEBf4H8U9sxYewbATd5gRnATi2kTelotpg6VkSEp72s
-1bsg6KOnXFENHy0du1b421Q/v962HY+GB/L5VSmR3NO85ro2pkd2cP3A4vwTyO48
-uAEhtsFzwornx6NTcBbwDY7OU64oO11oUOdInBgLy7XphijQ0UHfq9dFnJSZgwDU
-TJrbc0huAUFf6DJ+Yb4iqxMgsvXz/pWwt4bpifeqeGQAZURZ07FtXObKRVMGuaDD
-kQvhCPhJtgOruweSKW24
-=lAVQ
+iQJ8BAEBCgBmBQJVfy4cXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiRyEP/3VofmjTSlQWQENJ3B4pScYf
+X70N83wqUFo//X/t0mCu4uySsPC03dY8OVepddDgx8OhSrKzAuOG2AKtXUhP+jJJ
+9llU4PCZr6vh2xu8CVdQVtJbTeofCu9KjS02b/QbcX/n9HZ+2bhS9BDOeksm3sZo
+tfa+QEiTTVOEpxDiILmNdrqILlJWf+YqB0LTpu9kPd+DP6dCjt8sxRIsUbgDsHzS
+Q2XtUL7cpjjP6RZyhQZwKVaTuI7m1nG1az6FXflnd+8hAoeYLJk8fZb31A3CSEc1
+IzOEX30JaL6tiRE1vsWSNhvnR8C5bRlWWGkDkdDZa5E4Rtw/RCYuv5xio3431Sfj
+Q2DtaSVqrPPgqOzVJSb1a0eSUYoTMuzHqO2gb9EuYBv3klSGfSj/miYMgfR8FuUs
+OqjnjtUJ02FEbVqVGSicWtmPz/HyVcUdbQJVHEvvsspDf9Fu1J62Lw213ZUw07tb
+l29XgElCEI4t8mcntP2WKWdMMhzFCDQTaDJTUockU1p/xypB0QHYRM7L4Y86vO9y
+rRwsScYFuxoY4f61yCTakvhg19AK66sh7cJgbAv8js/z1Lrsql5LDEqL+hNuwISk
+nKOsRdOj1+v/VubaV2HgaKIa8Dc/n0kMKoGGGNwKAjy4vDi33TESRHwC+evik3n6
+YBbtD+COibGFAVl0eW+y
+=JqSI
 -----END PGP SIGNATURE-----
diff --git a/www-apps/joomla/metadata.xml b/www-apps/joomla/metadata.xml
index 7858364832b8..d0b641761e7e 100644
--- a/www-apps/joomla/metadata.xml
+++ b/www-apps/joomla/metadata.xml
@@ -22,5 +22,6 @@
   </longdescription>
   <upstream>
     <doc lang="en">http://docs.joomla.org</doc>
+    <remote-id type="github">joomla/joomla-cms</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/www-apps/lxr/Manifest b/www-apps/lxr/Manifest
index 8b1096730c79..714c0bc05fb3 100644
--- a/www-apps/lxr/Manifest
+++ b/www-apps/lxr/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX lxr-0.9.8-initdb-mysql.patch 484 SHA256 2ebeaaa9c10f2953b159fe99206a7eabf618cdc350e27d8ed52d56a4bc8d9241 SHA512 616a819fdd899bbac114dcebe42864f16e7b17e81f07be915ae36c9dfac4d621e960d5901a253d6e13d4e16440eb84702784b66ba1922a0cba72afea1f896da4 WHIRLPOOL bf6360342dc499178979f85d0dcbbb852a4d08a8d06e50f602ffacee49eea0f35dfa50350151d2db9730d2d976d02862ecb4e408042b1dac2146a62619375faa
 AUX postinstall-en.txt 1351 SHA256 1c5ccbde33bf200f727c53a87f67499328f140b64e8821e50065c872fe8b72f2 SHA512 4730fcc56b8a775d5922883906f9db8ead7a0f3beb8a46ceeb451f8ba273e823fbe328b227da72f39a9dfa926cd93b77c5d27c0d1ba2730afec0c570b1da0006 WHIRLPOOL 10b571d9605cd9b927ecfcc0383ae080b9604f6b1e59ce89deaa5331568a4b58380fb67d7b8391d967acc82e457701bf5e43706186d3e94fa8b2211895eb3e0a
@@ -7,23 +7,23 @@ AUX reconfig 357 SHA256 395a8d5013e87e13e6701c8b1bbc889978cc92186ebe3569e2b1bee9
 DIST lxr-0.9.8.tgz 104246 SHA256 2caff9447cc2ef1f82d96ce5a2fc4a0358f2d12de52d73a91f29ae5119db4bf5 SHA512 2ee9965448edc63a35a3c9d51b2e22c142e5e0aed8e487a590ad3e8a9f840f94fbe38736fe139fb02941ab4e5c891821460b0f32b56a52bf295988c6ef432318 WHIRLPOOL e25bc692b08666402e8ef09b9f464811b7d49bbe7ca2597d35e3d9f3dbe2b4bb285ae52e748b86b11327f92a491863ede9030ba914f6f8e3a2251ea3f1b8859c
 EBUILD lxr-0.9.8-r1.ebuild 2185 SHA256 0cd709822300b72647baa14c824e47e764fe53b5d4c730a33cbb6df197aacd3f SHA512 c3c5414326386b3b1e26f5ffafa9f49a343f1cf7f2ff1b4c77e693a011c92310ec2fe44738fb8b5c8443a403258044b169acd60f955244031b7ef621c4d527d1 WHIRLPOOL 09ecf9fda3ae6260d41d50fce39ea512a95fae60cef058d812de61126cf708e5a654a8718b2a2dbce9177ce8e21205277e9485b4a44d11f79182060c36c78a48
 MISC ChangeLog 4430 SHA256 47049a2a339a6a3c89a6d7b7638bf122eafefa14bcc05cdb067cac07e60ad615 SHA512 eee027a241ed1634f874110d35dc9abb073d187dbb4c15ee1f234d81a3e47a618f811f017fbd7c1692358b1fbb4e4e6a7228c7f20f95e92821240e7c2683130b WHIRLPOOL f4e9a835548fb04a3b5ad19beadadc51c7ab5a41a8c182a0095e3cfcb7136fd935a062c6b2956de9d1cc0f8009b8afddfb5b1125ff86d2a9ad769a01eed18e9e
-MISC metadata.xml 161 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 SHA512 da8733f12ac4bebcfa485138fd9880683c1196efc0312a588ffce412ed14c1dd831e005129b6598d027af44d381fceb844453a433d0c982348e21f2d9c49f52e WHIRLPOOL 2b56ebef4f0870596c32c35c96e6dfbc911f6a3d8fe0e8c463df76dfa73dde112948c814b9a9ee996b7d71a85e4a723033ee3b92f4cde0f31d0770404d7dba61
+MISC metadata.xml 235 SHA256 d2fa4a0bc014e1c984337729c1fc0765c5f2cf4321b112aee1f6957d70a11ca5 SHA512 27a64fa84880f4efa9c574c469f672997016c8115bd0a42f84ed17c32a383e04d714fe9adfb8e062f215d2d01cf00d6c0eea7841fb711f32896bc9cf38df3297 WHIRLPOOL e3030e5dd21c3642e1b1c16a70920bdf2a9a73e485f2064f9fae7857398e771d0f6008f1442c357d16ef1707d1afdfd9943da596233c54dbf81987aa7c6b2bac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUX+YiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOckpMP/3VE8YrBPN/w4u/a8F6gVGyo
-esa/txPpUbpWy0DM660fiT2XJUdC8xQIgLj4s0C+dennw7JVRS1KdZnj8LLyZVij
-7rYc3ph283sY4acRk1zIerIlfwONUOJduEB8DUXcfvNNTsV7eVfejSGyOnDliveV
-Qsbrn8MvFzxdlIMZyFQ8TMz0TxQqV1faYVsDc2W5ewpEvHgmqTlkHkTdnGGWgYXv
-PcW9kimhGh1wAZ1wR3miqPhp/805PDM8JJ21LOTTRQVpr4Tn4QhiZ92Z3VGIgP7W
-2dJiqaq8zxFbmPGSgwch7lg3DEVPwTzf2Y3mT5GMXe/tSt9PfP3JBVZK1h7nxpFE
-NEc4gV8Ak5V3l2EfCyBgzXwnY4fCaRoegHX6oRRqfACTZ9GQ0nh68926yuPXKoca
-vPKkftAEuVN5f4g7ht1irDutNnCzq/FfLFJrP1KoFNxfWHdRUNhzi7cWSd6Zzyw2
-fDLihnhNvjKi/T7mGrJcOXTNVqKdDgJk2/CYRJeQYcsIiJ85TcGBBlSKfpWgfiDV
-Br4JuvexxMiPtwSPFkBlkpU5/2R9eGp/qkOV9IcAxbggrs0NS4zMSF6FGsJco10h
-CsHZC8g9/CwPJypFEx34DlYbAs2bZI0EAdzYc5iL7BHXRRaLGMnkF0uW7chonIfb
-ak0dnvCA2rVyDTYi1jcT
-=YP6w
+iQJ8BAEBCgBmBQJVfy4oXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmifY8QALvVmR6umhi4vJpJ9rwOr0qz
+OyivLUmfXu/7kTSUx94H5TlFxbV2utuzuA0+cJeNjU9E8srthWLikck+vo3jsa8R
+qaXF/0LclDwfnCHByi6ToXbcJ9RAB3c8d/lKjxAH4qqygM68+9A46f7yfxPNOBcd
+Imd10xE1Jn1LLDJ0ACcKJsSO8HgRzJzJSmXcBcdx8QM4+9g/EF0YaWVpS9FZhu2t
+LOjKwoE5p99F/vMIOKzrFRaXzlBbfvDCTPMv46kjsX30JNGW6o8+M1cb8HkNldi8
+h3Oq0bvaZ/R7BxibJC4H6b7i6XpNgh6P5PCkki63tEVt6HPM0ZWvfEOJ348OnOAT
+ce+a3AOD1Yq+j/jL8JJhKG29JXfSMdsAmiXpAatrTOb1lDe0YTxeE66pBhO90cjk
+0f/VhsdNmqYN8Qsiwd2txpoynr+YcuChw6lsA+vhGk/FlQBGZHObgBTCUssm6BtV
+P9zJEBo7hMwAj+iGqe/jkfUXMoOfpFY0S36l2iMdSZul1v33KhwB2pd/wyMBhr5k
+JkTrDUTlD6iAFTAVj0cYwHi9FBpPBn44SfIqk7qOBsa7rJciZUU4h5VJe8zqEAED
+l1barElTXDPrvYies82F1FjbodQ01DvoHtloLB3olt989r78wHbsLpZ1miO/vAb5
+3Vu9DnJzv9wJ7SuP81Q7
+=aV42
 -----END PGP SIGNATURE-----
diff --git a/www-apps/lxr/metadata.xml b/www-apps/lxr/metadata.xml
index 95c06f0095bb..d50c1bef73f7 100644
--- a/www-apps/lxr/metadata.xml
+++ b/www-apps/lxr/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>web-apps</herd>
+	<herd>web-apps</herd>
+	<upstream>
+		<remote-id type="sourceforge">lxr</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/mantisbt/Manifest b/www-apps/mantisbt/Manifest
index 936332ea0aa1..48a87a891765 100644
--- a/www-apps/mantisbt/Manifest
+++ b/www-apps/mantisbt/Manifest
@@ -1,18 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX mantisbt-1.2.15-cve20134460.patch 1398 SHA256 633112f3d2320366ace360edd6d9a36df2c50e5d50104a038d72806553d9b3af SHA512 af8d78d397c462c975949e5e0d4458adc54157edf9888d2170a15f506134e45bd31cf0cb7acb8ce42fdc7f0ce6a8df321d25b377d876011c2890b88700aa9d3c WHIRLPOOL f2220945f0af91b904c72f5c39e07af26b852892d654968aa0e8b0cbe4f88d99490ee4459cf47e4b5187d85acb9b23019e9b825d36cf0d5e81c2eee443f47485
 AUX postinstall-en-1.0.0.txt 640 SHA256 af60f6f6be915164f420f5e9ae04fa18d8bf85e73a9a59668ba4a6b7ba41900d SHA512 1fe0672455a2745dda366ccd30068ff6edf715f20ce591fc8cf152c07cd9d3f47f0057aea2bbc1c18130b8a707cfcd74321fbf96d4aab6dd9d6deb32180213a5 WHIRLPOOL 77f81529fbf364fb9366c4fdb25705ea046cb86092a0fe575a6eb6381ec2d22b6cb4c1e134770d43cee8280e303e1ddc274bbd4c2b9364758f83b3f2cfb6ad4a
 DIST mantisbt-1.2.15.tar.gz 3577359 SHA256 bf40f59a1e139a4674b311dd755d272972aab06df842875cd5ce819eef6c6eec SHA512 738e11b46ab44f63b415a090494869460e95af1b690cf0a9bfb5e064b545eb9110a169b175eeed906cd32d81b7cc573fcfaae2cef8d9829a40e9c646a5e08ebe WHIRLPOOL e6c56eee501bdeff35df43ef32938c664e9b4ebfd8c16ed8a9d6ce179e2cea3094cc85799366c50264c36b33595b1afed61c1621600ccfbed4494d1677c91a48
 EBUILD mantisbt-1.2.15-r1.ebuild 997 SHA256 1c49c7cd9f62630472b0860b437bea50f68bc3edfb910114c96622b760f5402a SHA512 95d6051f2a12578a8f285cd233fa261ddeb8055151fc735b80226b102716a1dec643c2b7df05950aa5361a500aa5d9090b2bf1af3b886edabc86fd333c49efef WHIRLPOOL 75a9f26410047bb0b4f65d16efd817eec9627ca892ec542aa5a447d7c0dbcd5d4cbad37d329690f8c884edc98098251ec55ca0b2aa288e853cbdae270836ebf0
 MISC ChangeLog 19607 SHA256 14016314f1843065ce9bd828757c11c4615aa6436b14ff86317911371930a50d SHA512 714b1c7e2a0252bba759e52b42fc81e3793bdd9b5699718f720f3c778f987efd594b9bf7e63bdafde9b010f73b3415655539ba7b5fc7986a3340416513cfe29f WHIRLPOOL 79d14af55982ee2b4ec336b7c6f857dfcd8afd79c328d930d9f9cbb9ad1377de76efe43f3c2bdd63425f96b5c4f3d00af0fd1f0d3ab64555d74fcbc6d28c74f3
-MISC metadata.xml 351 SHA256 b840e4c4263c7f2502b4f7316adbec8c4fc10f58c96a5f140e304806525b0ab0 SHA512 7e1d88df4f29903c9115083eff8d2ae005ea102a493fe68e8051c315b5654fdce877877677d73bb0d96397fbc593e02903ec61decc52abb724694f2875439fba WHIRLPOOL 5395f48708c122cbf3576b0e9cd749d9c06c2ebeabea2d4489948bc53b94e5c1800ee128d9f1782e2dad9198788eb7cba0b520a06f16c93d63fc4875ab9ce2be
+MISC metadata.xml 417 SHA256 1a59ed151724c9c0df435bd9d7f3390003c1c6565cf2ec8856aa8bffdd36c09d SHA512 650df1291707cc2555a458145e939bc3afcc4cb1433f8dad8abf3ab52bd2a5006dd1f9737da9a2f3da5f2d36fbd32971ca7215327df8a7e2562aabe427d85a20 WHIRLPOOL 23c041c6b350e874d3069a64f257f85e0d4efde05eee238eb2a060f62491f1813b4fea4581ad317396c4657d599fb4e5a72c7707f12351abca160117850151c6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlK8hYQACgkQG9wOWsQutdZLxQP/cI8ukLMlc7/CUv7JLfPGyaKk
-xpStrpJgZ4xaFqu8oE/TtEL90mi/ppgJ2qEBbY2Q42Ik4zIPQxrhWk7G8aOdyWm4
-pTWMV+TGRhlG6NIGk+gWAKdhRx8VWs0vq4vovgSqpXOlESpqJbxN+jKwo3pgMZYs
-9BiPqQxkzagCq1fl/7A=
-=T+8j
+iQJ8BAEBCgBmBQJVfy4yXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmilOAP/3pSqLd8w4FrqAn6BsDwrGAO
+SmiBy13gBbFm8oaeswxiOIKdBMBbtsJhTZcee33puDjEhO9Mk6tgyDjgGFSoInIL
+NPzNgJB7fJB917rbBKghAOnuPOf1qAjNp6PUw/KqBUB6LvCuu+2PP0gN5Tc1kykU
+3PYrqVEe3ywnd0bN931VFvqK9/BaMNq6zWNqaWuiWXOirLngGbsO2j/3iVVu//LO
+TouDTDibKMfPmarprbgiPFF8zfolOqf2Fo6fj0OCSFwo+ombOVOyb9A/nJ9XbGmJ
+4IPqNa9PVKgeKO58dDltzKGUjRDR6xnFhTSRhEVrZPuF3WINjR7xIxB5EOT3RcjB
+5bAa/KXOmKNnntzVCBhc6LUiGnLXIqxvnAtonAgdgIvQMzgO8e4MtYPnKshSVVSy
+jWbz4rwZHd+2La0ltzrsW3opzCFI+3WWLrM8vDdv3EyVyD1A8IxMTn7O/mWfRy+z
+fkwxS522wfU8cyPhZD0Rwk1eQGA6R7jEkUqe0X4V2zbIVKFj1ZF8fvSIvUZfZLxI
+OyeR5uhWWm0TwE/sV1k9eI7aAqc5FgBTfZnFy8G83IM9YgY5BU2j1MXECC339OUK
+lU7phYuucw0CrjCxubjMeaZAPdV2XXpMBDftEHXA8qAaXa/1irzyiy3wNSblp5lj
+J/38LaApq6JyTXP4ED++
+=C4OW
 -----END PGP SIGNATURE-----
diff --git a/www-apps/mantisbt/metadata.xml b/www-apps/mantisbt/metadata.xml
index fc8bbc73da02..e5a305eb81c7 100644
--- a/www-apps/mantisbt/metadata.xml
+++ b/www-apps/mantisbt/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
-<maintainer>
-	<email>pva@gentoo.org</email>
-	<name>Peter Volkov</name>
-</maintainer>
- <upstream>
-<maintainer>
-	<email>d@hx.id.au</email>
-	<name>David Hicks</name>
-</maintainer>
- </upstream>
+	<herd>web-apps</herd>
+	<maintainer>
+		<email>pva@gentoo.org</email>
+		<name>Peter Volkov</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>d@hx.id.au</email>
+			<name>David Hicks</name>
+		</maintainer>
+		<remote-id type="sourceforge">mantisbt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/mythweb/Manifest b/www-apps/mythweb/Manifest
index 2ee008675ee8..2fd81b109fa2 100644
--- a/www-apps/mythweb/Manifest
+++ b/www-apps/mythweb/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.25-postinstall-en.txt 329 SHA256 cbcf8a938bcf6029dae9b17864aeb0e144324409dc6bcd3bd613154296b9687a SHA512 2fc1df9f9876d2f9247f881a8e27bf38eff22c1caa1307deb241dacb80a4d5f6ff64798f8b4634ba302c412daeb137dabc3a6385febbbb2c0d16f52879c4178c WHIRLPOOL 4b3f15646350e2fb1677e93a98521cc9854d78c916b3c2b98cb34bcd9a54cb6f3ef19008579193793d0259b1eaa53c205b287135e513afe7c051ea8dd1520941
 AUX mythweb.conf.nginx 1085 SHA256 f97cb07647b282be6d8fe3e41bbb07f942fd0d121bbbe5dc63ccf3b34004d296 SHA512 06f9202821abcc4737cbab912e4f2610433e59a430cdfd1582b086b27a85a0d2ac42296bf4f6eac582c507fd768b89f1b21510406a7f007c79dfda596fcd3a60 WHIRLPOOL b99dd45082e02be3e4d3559ff6c0eee078a5cbf4c9870701a0c7aae84806b918b36e6d7a2633ace10f4a8d36172afa0bf63abaf755e0c53da3882fba824544fb
@@ -11,11 +11,23 @@ EBUILD mythweb-0.26.0.ebuild 1978 SHA256 4b5db90abc1d72f322c3e8250fd1494fdc20be8
 EBUILD mythweb-0.27.1.ebuild 2006 SHA256 d4aa3522b15cda625a7d2cff985667495bfc524be2caa25fe5bf4ee9f8226b72 SHA512 5686821f33d426ecbcb7d5ba0455fd1b83f90b62bb15fdc17f945ddfeefa2861c497cbd4f7e9d6bfd2ebd7f05831910211e334555e74aeea54a3b7b2ec52cd73 WHIRLPOOL 102e8949fec7f72420be1b8472e634f6a09f1523f4ba8ce1f4262a75c8ad2712eb250a40353fec343b8a3730cc412c361f6e950c8ae0ac975a71c7100d4749dc
 EBUILD mythweb-0.27.ebuild 2004 SHA256 fbf12bb6dcca5560db85130e58aa5608184208676958873675492334084fa6bb SHA512 105b4d1cf7bb2533bd46e706f3f307b968cbe4fab7162a913b47218ef0fcf834a70ae7d44768c0f71097fb0a9d7b6def448b89d1ac7d94805bde972399709071 WHIRLPOOL b54d12684b5236ad00996d1209658462d96013ae4ca958ac7ddb5f821fad3ebd10f24ae751c259b7cacd10c327ed35ff62d87a8bb8264732cfb3b9f2a72487a4
 MISC ChangeLog 18961 SHA256 4b9dce56a6227accb608342ad466e61d8dd09d669c73ef480de595bc29c52e42 SHA512 4ee2674a28fe526a8aa2751c7339d3276e1ab438c7d2e908a9e2e5d921977e61b7bbf75fdea558153902aa1a78aed6073c9bc0667cf2c9bd81081bb1c5365e7c WHIRLPOOL 27b173bda75e770a6d5cef25a5bba92553071d3864a7b64fcb448b0d6c1bd2bae21b178d6afce4563cbac22b2476e4030b1725a60bf39c6db588d16842459877
-MISC metadata.xml 297 SHA256 6e536848a73a470669002bc5e4cae7d4f9e4930eea9dbf301d23a19e55996daa SHA512 58c33a220cdef181e5dfbb7a668e16b4d2d02e6babc698bf44577e0c31804739b4c525ae43c567f8a8257d90c60406a768457b2cc860d4d5eb81d158372fb6fc WHIRLPOOL f2526f6015664597e5336903421a3a7337f1686f7cd2946523266c9300f5ab4febbaf58ee177d41bad19faa3cd5eaf37ba4899c256a7940b72a68c828c50f866
+MISC metadata.xml 376 SHA256 8a2043e9fc0b898920c5b242027eec82b3af71000331b4beb9d2b8498dbf36bf SHA512 6e15d9f9f7d87f307228c37fa2df143437ffde576c81a2acf6b129b562304fcc550a9dddb05ff271b7a98c254236a8b077548238571e9eb03c41430285d4c5a0 WHIRLPOOL d7d93a8eb47b2b94ad7701319057b5bf2a119031be51ab2ae5ea493ec05c4cfff9f2575b532f5e99b3aaebe0b7ac9949bf0d7b6895d0db058231f47d0c6cb511
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn0pAACgkQcaHudmEf86qpyACeOyrk8WCiwgfh4XbNqf2P/e2B
-lrcAn0karvsW555xg28lO7v405W9cLND
-=hMP9
+iQJ8BAEBCgBmBQJVfy4+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiMQEP/1XT1a8CxRQ0H58Cp+Azv6UN
+QYvAPsqvJD2km5qO1J82Wyj+v+jZud/yuqTLxD0TYAhDqrk5RB9u2IbRBVrBLtDa
+2RpxbIbr9N76FYSnIfhWJ4EXUvw0ukLHYzlkPuqQ9dyY4s4k6Wsv0IifQpGZVR2D
+hBHHu4I9t6mw5xa3uJFI/+TcZFXDh6z6mTKRdI1QgQr/nawxna18Na4i8dVj6d2N
+nf7QticW45Qo0tn7XEGLSLDBhJD76cJePX0Izj0dVnpnNuHFb2T3iKh9N+Kd2XIb
+IqeM2PRZ+gUpCmYLuK6/Kr44XcjDHlIFBhlU79DN79EyrEv0zBw2YYneCloG+Dfi
+dACjdVtmehdvX6SB/uSO8FAoCLBI//hS6n1PiT5MgaeJRRUFuHBb/haNuXq8TtXM
+t3kEEWGZ2+YvGWQ1qGsNnjNS2XJTYOb886MDaKz3iBoZweubm1fWnwhc9TcJ50Eu
+jGF7Yey6JhdRUSGemyGi5QhHRFtaZ0p88Cc1OcE646aB/WCkn2ygY/bbjATwhQ9G
+qoB75PONcfdKnoLyI+k59FKL+Lq1PTKEzEqo8FA42dXgo5CtwDK0BhpdQePwX82n
++sst0cGIr9g0f4fhfld8np0npJW7xuxNOSm9Dmp1z9KaDCX6k5Kdec5kof/z5Qvl
+h02JUgNtd5dERixU85Rb
+=nhYM
 -----END PGP SIGNATURE-----
diff --git a/www-apps/mythweb/metadata.xml b/www-apps/mythweb/metadata.xml
index 6455289023b5..bbe97fab0a78 100644
--- a/www-apps/mythweb/metadata.xml
+++ b/www-apps/mythweb/metadata.xml
@@ -7,4 +7,7 @@
 		<email>cardoe@gentoo.org</email>
 		<description>Do not CC me on bugs</description>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">MythTV/mythweb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/nanoblogger/Manifest b/www-apps/nanoblogger/Manifest
index befee1ecd924..09d3e2b7f1d1 100644
--- a/www-apps/nanoblogger/Manifest
+++ b/www-apps/nanoblogger/Manifest
@@ -1,23 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX nb.bashcomp 1389 RMD160 ad1c0c5202993fd39a1c69d95dbd0e9d6e029cad SHA1 8f4a5a0d78f753e0cc534d505990a6a0ea963ac3 SHA256 d3ecc7bdcaaf3404e342a97bd580494e8904a985f73a7be9cac796cc9f885490
-DIST nanoblogger-3.2.3.tar.gz 54672 RMD160 d4ff29e44ffe69fd7cd8b690daab2980ba093617 SHA1 9f2f05a5ebf21817b55f76dd0d5310225322d972 SHA256 9b1d51060e9f0f8db7119546c8dbb915c0dd214ed970844705d8738616c9029b
-DIST nanoblogger-3.3.tar.gz 82302 RMD160 2d960a128aac1676c308e37de5cce07aacef6674 SHA1 4600a9fe50f4572755499a389715fc7b5eb6d474 SHA256 b49b25ee18c42dc9cf47fdd456e5dd19033456c64104a0ccba34e318e5daf1a0
-DIST nanoblogger-3.5-rc1.tar.gz 131833 RMD160 c0429375fd5399eb9e9b49f9dd43783a4d0bbcdc SHA1 870d7e54d3f495bcda8465c2fdac60338dee00fa SHA256 78f51b852238adc1cf1287f4a95d56c954fb3dced1a48eb46a0302579428bb26
-EBUILD nanoblogger-3.2.3.ebuild 2100 RMD160 611ceae047df1ae2a6a38ac75739a95b97d98f95 SHA1 c6bebbb2a9cdc36bba394b630823a485d23a4824 SHA256 3d59e8f01d4884585cab59c76014a344557b46121e1943529b615be4c5b64d44
-EBUILD nanoblogger-3.3.ebuild 2317 RMD160 e3a5179bcca0733e908957a315e95af652101da8 SHA1 f54f287691b16f3bb27cb6f183499031b2e0b009 SHA256 018c365d2dad67533d1872fe05ede6bffb2c4a8b10166bdb21135301a226c25b
-EBUILD nanoblogger-3.5_rc1.ebuild 2342 RMD160 afc8a0a4de1d16df47982293b2413ba60d3f5939 SHA1 457c1897ba814f629e573dbee2d70b2da523466f SHA256 87c536ab80e3611407fa31d928c27091ba113a30d1588ce7528e7b3e6d22a66f
-MISC ChangeLog 4379 RMD160 123baa00469633d5f33ed577d9b2acd9eab58d59 SHA1 a40eea0f3642580a896996a9895e31d5063b16ec SHA256 45dcff8f57e2b81ca4695058cf89e98b3fe95e4b16e0fd352661f116ced78b5a
-MISC metadata.xml 989 RMD160 dfe1087bed6bcafbe0e502fbb0cd6dcff4fd1d18 SHA1 34103b11cca6deb77e76390aa880e8ddde8fbf27 SHA256 565954ce27ac18909cf7388d41370f1bd06b02adfc883f28e05bfbe8ddaf4a65
+AUX nb.bashcomp 1389 SHA256 d3ecc7bdcaaf3404e342a97bd580494e8904a985f73a7be9cac796cc9f885490 SHA512 cf43ad6f5bc779014b877abdca666fc576336b0888e17f153ef43ee0980bdec56d336eb6c0ad224bb51f291ea8d1d2dbeca6e510018771b0c1639ecc51f2c235 WHIRLPOOL bc4dd49f094d426c4d1100cab4ecd8ea46c02a21626754f3601b514299546a79b68238a36c9f6e9c463ae44e73cb6a980ae48a37f3402645ffb91bb055563ca5
+DIST nanoblogger-3.2.3.tar.gz 54672 SHA256 9b1d51060e9f0f8db7119546c8dbb915c0dd214ed970844705d8738616c9029b
+DIST nanoblogger-3.3.tar.gz 82302 SHA256 b49b25ee18c42dc9cf47fdd456e5dd19033456c64104a0ccba34e318e5daf1a0
+DIST nanoblogger-3.5-rc1.tar.gz 131833 SHA256 78f51b852238adc1cf1287f4a95d56c954fb3dced1a48eb46a0302579428bb26
+EBUILD nanoblogger-3.2.3.ebuild 2100 SHA256 3d59e8f01d4884585cab59c76014a344557b46121e1943529b615be4c5b64d44 SHA512 a8c503210673e04f14524dbf9e7340629d24513a6b3d716cfc76f5f7e8a494223588a54c4b3a23aa038061cc9bb1d8a4a61fd06e752aecda01d9ff3f3406d29c WHIRLPOOL 506560724795c9954f6286f20ee3faba6c23f73bbcab307efb5ae007af06467afddf268b9fe9d3eb6ab4997e3b3e217f41e61439d3a159309c6548f1825f0c10
+EBUILD nanoblogger-3.3.ebuild 2317 SHA256 018c365d2dad67533d1872fe05ede6bffb2c4a8b10166bdb21135301a226c25b SHA512 8856b454d1f7190ca00866217a476bc87bcf4fdb49ec578d35d52462432ffd824449e04b0e8df8c336dbed0ae09836c607aa39279a8574f3b50afa73fb711135 WHIRLPOOL dbd788cc0487f93a64e368477b541bb7e9f7031c3d7fdc4468deaaf113c7e9a48e334a1f68136142f66139109ea784dae44cf1be048c3e2fd8f190391f918630
+EBUILD nanoblogger-3.5_rc1.ebuild 2342 SHA256 87c536ab80e3611407fa31d928c27091ba113a30d1588ce7528e7b3e6d22a66f SHA512 ed324cdac642891c8138328806c713500859c58a3b2440de87926dfe28f058a14fed880c90eebda9cc045e8747607ff58587a26a4c8fc1edf1379258c9826f32 WHIRLPOOL f08ec3eb4f2051fe345597f14b3c991e8d292c75678a48af9b1411be0ff0a8a949f9d6f1ede67b29d75bcaeeb7de29b0bfaf383b2c46d7e1c6d4e8bd47254382
+MISC ChangeLog 4379 SHA256 45dcff8f57e2b81ca4695058cf89e98b3fe95e4b16e0fd352661f116ced78b5a SHA512 19022709b4b647e446b17ab328178fc50b1b0e192abab9f77a16528182445f7365cfa76ab95f0c8b212b1baa4c66ce96bc7fc5a95aac7614882f9ff205310092 WHIRLPOOL a9308daebea2dc31581c25c205cfdba4d938d8f416cc6a08fb5e99ced0aafff649038f020c688e6b0babff51b1412056d4ca84bc412dbcaaf4aa702c27dcbb0c
+MISC metadata.xml 1070 SHA256 24015543a0282277dc61d42a97af438c28a56dbe116cdcd11a66c512f776ea12 SHA512 b98dffd0ff9d5bcbc8075788ab8447ea0ea403226a8005c4ec639a0b018f34c29500a4186eae8615f538ad11bc22be02438b335105049f3e4aee5b4fd2a8998f WHIRLPOOL 22b771f295ab86828b0e6c6cc5baeb935627391fbec6fddc641ff976cf5a0c0617246e69e5f86802361ccdb32bf349a63642132dc110761ac29861470c67b543
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCgAGBQJOi1cNAAoJEEqz6FtPBkyjYXkH/iSfbEndCtwTASPNNtfP7RRS
-IGXYSFUZHecdjKyszWeEvx/KOOieIHCWqhBWuGCKqQO4+MOMLmtkCYtqNqHge97E
-rMpAkUuIOU8HSoWe7wP0PZxXzwZgo5BbWb7nzWP4NAhT7MHkTE0/SCX1br+Aoj8x
-H4oG8izpH9DahihMM7mdfIm5LAuoD44kUrUXnFjcHWqAmOfl2xI0jQRaKhq276bP
-T7DkDtalQXu15nd8n7EsS2/ER3EGMGiJSuTQkV0kquI0+1KCOFFrYJjVTqkJ5HIA
-+NvSsajrKhVwcw/JKHo1Gv4y0xbcai01yeyAdKamyWB3reQs/tBTHsx/VTVt4AE=
-=ahWn
+iQJ8BAEBCgBmBQJVfy5VXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiFYMQAK8szPs+2EMnLjiqzn0ZQ8FV
+D9FRWgGXsG9jg1H476Ru1m57mF0OeExWGVUuGtp7U3nOAGYqoFZqr6Gt7QtBR/DQ
+7UE1zTR++irxkfa5HeMJ2BgODaB2I0J738Z1ip2BxNFoR+oehxjUiA3zGWRcA5IC
++64QtX/RPtH98owTI+elTQTP18FBqUFOwc2zZeC9DyPZKXQJsbw1yU37IyxmLt2E
+lGVIlR/TGJdI5FhzhKAJ3xq9uPPHaMp7rLEhSlMM96AtaduxK75rrN6m6Q3I9rzS
+W4C8riOE5vfTbfQCVHEocvkBcQdBMoBSD0zU+ULuOTPEltfz5AmgrbIqgRCuYUhk
+A2XT8xmSDoBRb/UhHPp131jqePDbhev9So7zJbI4sDAALSnRN+zbc+ENAC9cc6fL
+yGbJdbBEZkC833PWIFkdSXOlLnO//X9jKe6jg9VQCRPeqHSPbB1SQyBqH14ss49T
+t3P2J6EGzerzKRSj9AXYfaDejo3TvrO0pvfcXXzQUDX2ipjUVMwZyzxVZnbXgGRh
+cWGoLirniHyXrSq4Kj3vHCWGQCM6RM2gEOc9PBXu1ZIGZz8lO82yV0KbwG8aZJRe
+gZq5mLIVRBRN1Jk5vGdXgN7HZ+sPIX11r6Zx3nvFbYt5WP24bQ+cgZV7giRGwMRm
+lD4B1nRh9WLg7+/1CHmW
+=4Vto
 -----END PGP SIGNATURE-----
diff --git a/www-apps/nanoblogger/metadata.xml b/www-apps/nanoblogger/metadata.xml
index ed93a115aa58..194b9f320e11 100644
--- a/www-apps/nanoblogger/metadata.xml
+++ b/www-apps/nanoblogger/metadata.xml
@@ -14,4 +14,7 @@ for relative and absolute links, per-weblog configuration, simple cache system
 for faster content generation, auto-detection of weblog by current directory, no
 database dependencies (uses flat-file), and mutliplatform portability.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">nanoblogger</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/openwebstats/Manifest b/www-apps/openwebstats/Manifest
index ea167a8d25c4..19c40821de60 100644
--- a/www-apps/openwebstats/Manifest
+++ b/www-apps/openwebstats/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX config.php 2106 SHA256 b71574e683824d9db53070d2037bd4c539e46d83029ae40c1adbabd92f438b4d SHA512 c4db28cffb2dd83bf54f483d57468cd0602680d8b40f471fb063a37a4a4ca3968157ef9aa0209c26d97a86855a1863c0908779bab0e54f6fe3b747cc38a887b2 WHIRLPOOL 73e4e8eb6b111302180cf6bcf86976e1bb38dbca550a93ce759f388280929879bba8cc1662e9b8aab70c60e262325dc1e72353d1bbaa00e23ab359f27c49e2b9
 AUX postinstall-en.txt 1245 SHA256 afe18f8bb893f91a5d523fdfcf359eaec0471521a5cfd077aaa8233a3c693c6e SHA512 b814a821aa70c1dbaa736976a7dc19c9589efa3f50cbb2686ce9059c339304bd224d7849265a64725805ee86463e948a15c24e2c807cef05a6f625bb463bc78a WHIRLPOOL f426687000fef51cd1716e08909ad6c18b05e5a1f17a64ef8512a35c6babf58301ff67516e7775c121a055bc3908a2a96089a4d81875b04e6724967a45b9fdbc
 DIST openwebstats-1.1.tar.gz 163477 SHA256 6378591300c68921fc2d5cd38ec9aaf4b00a4d34f97d3eafad2d22097030d926
 EBUILD openwebstats-1.1.ebuild 1002 SHA256 1bd2da12f8209512ef8b84714120788a4d46bd880faec4b7bbd334cb9e39e904 SHA512 6f044e1667a425918f82ee6714bc36cb71771484d8d141ed49d1517cc2776c29761b8d3199318c73dba50bfb817cb2e7934ffb50aacaef70c846d4021075bcab WHIRLPOOL 850d7e8b92a617612b6a011350b913eae7785a21b0d68e15f4e205a5c7a3cd8d29afa921c7aceb90b664b87f5436fc59c2ca0bc77c23a71c98c979c66cbff176
 MISC ChangeLog 1212 SHA256 6001ff626610aa04dbced8d25d5a990541a715b5aa0ab6e5c3aa00118ffaa2ee SHA512 b36f051fb955ae25bb0865a4508452ef6d86a4e582c3541351d6a4cc58b09c4a83417cd5ddbe1c7a3c67cefdea316b89a350c9a270c848b454cbdf74d1bcedd0 WHIRLPOOL c669a68f901234704c354ed698e62eac464108790f20ed345b49bd417b04ee9d7d953f809f633a9d31ead3f48ec6ec4b3719f876cb51b03507b8406f3db54be5
-MISC metadata.xml 161 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 SHA512 da8733f12ac4bebcfa485138fd9880683c1196efc0312a588ffce412ed14c1dd831e005129b6598d027af44d381fceb844453a433d0c982348e21f2d9c49f52e WHIRLPOOL 2b56ebef4f0870596c32c35c96e6dfbc911f6a3d8fe0e8c463df76dfa73dde112948c814b9a9ee996b7d71a85e4a723033ee3b92f4cde0f31d0770404d7dba61
+MISC metadata.xml 244 SHA256 e748664f28f6e582b1c1e84a1098e559935a6f5f78a07d96ddaa7feb5738b762 SHA512 891c6df3b8c4f29143d5ca6ea40a6bd44f95da7223cfdfabc2c14065ff57a36dcc9976445a7ea0f4f2371509b9a36b2128401f8f00630b63e70bd90cf963aa3b WHIRLPOOL e66eb329ecd7e2f274f240e88d3e315bd974885074ec85e81637c8d1093484190f6b20fa1583138ba83555393669acbde33c8b27bc750fbd73aa2dd28c6c1689
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn0qMACgkQcaHudmEf86qPzwCdHPZtM9xvY79+ouxA68LHyCsP
-hGsAnA280NaB3CgV9apTDnbo7Ll063IC
-=E6OF
+iQJ8BAEBCgBmBQJVfy5jXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmib20P/1QYcmy5L2Leyi2YZ/3sdJak
+waZ8Wi9yepBAd9gy7V48QQN4WOeA7buLeTlrRIoMlKQpB8BeDzP9EsMt1K6uXBYP
+sYFVrD/1Reh5a1HHiN3TOkrKiuTU5DH1U4B6O+rW08qKlCx0EJ8bRn6O2n4EVs0S
++3GJh0p7YiZnq26V+7eBtOChVqkYOH9GZtDv6vfIGdRUCdTm0hXXT2k8L2f+EtjK
+Zz1b0vYJ2xDpgtPrCfrNjtDu0x81ECbIjRv4SoQbtHwp3l7vvAQIjXn/L1UvsTK+
+dk3oRG+xpq8GRvUBzk3+JZJg+Bdjb5Iy8mA8dpycsqfEvjNxQMpT28b3n51ZlOqV
+yr85xggEcfgL6Aw2FJZpLIVAEgcFGRANXn4yuIuFTema4V/2uF7qIyikyMEEZO2/
+qTYt+7ly+AXT7IuV/I3gAkq5B07RB78OK6cw0MYi2nMUSKJ/5FtbipmuqfhOEx2o
+evhCU6W7h/XcZH/94/n9A4j+6sPOJY7+RZdPcXIMjlddtELCMb/jSUbMH6sHZpnJ
+tKu0aCSk4MiDqA7S8MDcsI4Q7HB2QCyN75cN1R7drfCpfHnZeGqcO/XEV9DqHEyU
+J92xWVbw3xEyMR9SsLHKVnU0T8V8TuTFqTkqE8ZqGZBEqTpbaowQeUS6KezKvZ+Z
+BTt6sUE3C1x6IXnG+l25
+=eRB/
 -----END PGP SIGNATURE-----
diff --git a/www-apps/openwebstats/metadata.xml b/www-apps/openwebstats/metadata.xml
index 95c06f0095bb..dc9438ea01a5 100644
--- a/www-apps/openwebstats/metadata.xml
+++ b/www-apps/openwebstats/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>web-apps</herd>
+	<herd>web-apps</herd>
+	<upstream>
+		<remote-id type="sourceforge">openwebstats</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/phpmp/Manifest b/www-apps/phpmp/Manifest
index 8894df82e1fe..f2005faf7566 100644
--- a/www-apps/phpmp/Manifest
+++ b/www-apps/phpmp/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX postinstall-en.txt 33 SHA256 c5c688eb7c8da48d82cc9fd5e062e7f02880b58f7d293b4af97c23d5884974da SHA512 2fed8859caf849a060c11bd07d029fce8f44794b42dce9bf7bc00437561bec47ce8a031258d78582bd742fb9b4912d13ba8b518e88d6a11cd01c8e67a3f86aa4 WHIRLPOOL 4d7e2754698cae369bf300894c64f86fe2af5a7f7e87e92590ecb843e42cb09e9aec3b098a911124554ef433ccff082b1edb11d95ddb2ae70762b44857523072
 DIST phpMp-0.11.0.tar.gz 20886 SHA256 7f2a168632839f2c476275a1cff41ea3295b9ebbe85e4e3cc691609258ab0103
 EBUILD phpmp-0.11.0-r1.ebuild 913 SHA256 cfe97e98c48bd319d085880bd3924dd5d5872113100744fb391aa3d4c9550e0c SHA512 eb607880567ddf86f8788153cdcf93c42f04863b2f0329a61c04cd6fa34d980fe464e68eba8ddeb4e4448df01804dc14ba96a7b43401327f1d2a440018115773 WHIRLPOOL b49393bbed18e7733a3c7fb6fc841db8110f1c477a75f08508fcdace124b89f14c5109d906fbc5d7ed7176903185cda5bc82deca454b2ce872ba936e4a9068c5
 EBUILD phpmp-0.11.0.ebuild 911 SHA256 f44560b4bd925586517a419f83ff69038427d20cb6ff13f78c09b69074e338f3 SHA512 f9571c7d846147687e6e04022b1cce367b68c7967cf8e1b28dc6c49da3b91201c92340261464c849bd951883ac9c6bc0eeef7a5d6f9783dae9438b090031ec01 WHIRLPOOL 1fa67a1767f87eb197b554fc43066c3c48fdf6bbf3561c64de5e06bfec3dc7ef16d8bbb6e3c54e4a10f74572a3ceff131598f2dc5dec08d6ca3c9de8eb676697
 MISC ChangeLog 4463 SHA256 ce6139ea664fb51930902c5b58e05a3aad3c5ca6bc41fc0b133f7c84372dc041 SHA512 9e57723c37323b42ca09708e51f852a62b3e70b0e4e10f47b057c12f4e66cd225adabe2fb91353fa6a44eddf1402e677970ae2e4f081916e7ce536d23626b657 WHIRLPOOL 174e755e6cf65eef61f2bb9a1369d47e8cc89533fdc640b93096255f4b3da9ce634f77967d319f5a838438f20d3773cdbd261a4d8fa55efc797f56764c081b8b
-MISC metadata.xml 182 SHA256 9ce6753b72b54984257022c46dab69ae15abb20f62d2a0e57a15ce47a5a0492d SHA512 899a6bf6697e9f95555afb483e243ea5f96fbb14bd17eb621bd663494e5b9b0724bc341202cdbc56d2d751862e244cfe44730fa9e7ffc469692c213d1114ed94 WHIRLPOOL 0bac55a6ed17ce7c1b397087db2dbcb1b25a960043c22fc2db4f27ba9d68f07c95f2bc37d89a3d2edc3ed17c9c9269e2ac0b2d63df25679ae1072a57f4500e61
+MISC metadata.xml 259 SHA256 cafc5efe0e57b5b269413672cd3bcb99527f6db6d370bc473f31895ae4219435 SHA512 02475bfadfae2216ec644a0933702ed2ac562c52f30caa958f992afab84b50dfeb84198883edfd3b4bf726df405a68679f66bc8bb2862a18a847a7695c2e71a7 WHIRLPOOL 23f794fae5207fec7836589976bda390a22fd21b966c1a9fe6fc619eb80c3194525552ffcc365a5d0f6327b2980af6aa23873808f1c37f7e223d8118f07aba7e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfy56XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiBCIQALF9kPKoS7NeQyDZFr1gfE6X
+tFcHyDMV8w1fR0rTNGGR6CsfMdIUQa2UQ93bcQYRQPayQS/ignmIG4Y+vRKJ6/dO
+iNJ/u45ZryiZXj8BicUO8VTSlFbhpJQNOwd2dSgIESx5zmwaFRMTP5qleIx/Scd5
+n8cZb4pmngeN5nsIYwoJiVHm69W40GzIG3HZN6DoJQ+MO3AgCFrTwRQS5y6ECTpw
+D88K+fahGuRwjrpbAGQKnpoj5tEDFc7jgtP62lEsni4K6EnuPiVAuXrKemEVNEql
+2GrXKYio0lBNZwqY6BE6Im9VBYPTOEXD7iqN74jOvzlUOJviL+5DFv6/T/RUPd9C
+dVYBvpZlH+x78oV5l+Y0LvdlwMgf1qhgXkH+wbYMm1xVR98w1Pt5kj0H6TTVcrLL
+kWOeWbOaG3o4YT/CuIQRzQqyGuwnRUl9J4WmD3IA6S5vVAHp76WkwEk//CKVd/kK
+hT84/hsc+EQDa59xiB9q/nGN0nm+fOHJevzJyp57hww3cAta4FSVv5KiAifzqzWf
+KjeqskiMo21vfJRp1QxWzw748/zyaj1FT3SNhRDaBGkOOhzdkneNKytt0xmJUs2S
+3iF3fpoN3i0Y6d0RTSIgxGaFx2/c5Um7zBgktXOivJaxuhu7C5q01P6OEcv1q/yG
+k/Pg+FmP3SQs5yHjhvVN
+=bXlk
+-----END PGP SIGNATURE-----
diff --git a/www-apps/phpmp/metadata.xml b/www-apps/phpmp/metadata.xml
index 03c577947dd7..f78e909e6c96 100644
--- a/www-apps/phpmp/metadata.xml
+++ b/www-apps/phpmp/metadata.xml
@@ -3,4 +3,7 @@
 <pkgmetadata>
 	<herd>sound</herd>
 	<herd>web-apps</herd>
+	<upstream>
+		<remote-id type="sourceforge">musicpd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/phprojekt/Manifest b/www-apps/phprojekt/Manifest
index a6c6f631e737..6df961ab8384 100644
--- a/www-apps/phprojekt/Manifest
+++ b/www-apps/phprojekt/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX postinstall-6-en.txt 235 SHA256 c6edc429bf4b8ef5839629e78a623172da9ea14683b17fcc6bcd843ee1f84167 SHA512 986193b1a03fdff4d62c3b79c28e4b9f6e9f71f994280e6ba5d0dfb84e212aa38ca5573f0b9bdd1b0d61664b963034ce4aa7798f442663a4ea13e71fc8bb04a1 WHIRLPOOL 88bcc5a0a1d9bd723c84c9f4c3e9b0e45ce017c73ca5aee00d57eb8c4cd53d81e5ea37e47a531fab0603fd737e3c3b32cfa4cb4c0add6dd120e36a41077175c6
 AUX postinstall-en.txt 612 SHA256 3002b2984a9e3e511a7f5c855fcdc5a876ce43d82dd398051b0f0d56e0bed60d SHA512 70e9ec4c52bc9d10efce357a925deb1ece612349a58f73271d40b6295792e7c29a5439805f44f47427b684e3ec379fb3feafa850f269785337ca10ef1b5fc954 WHIRLPOOL 94eddb4e0fa027171fa83ef715337da96f7ccb48f24abab1731b58d3a8bdf779e0962b896eadf64fbea248ec2d96bd39b363f7099f261c2d5fd0e66aff879128
 DIST phprojekt-6.1.2.tar.gz 34786513 SHA256 1192c00e09e3552e1f43d80239371de8239b24e6c5bc6a2d13d2f791e47f3048 SHA512 f37453458db85ede353d7bdae79504d3cc4b65e80db7b8ff72db8a0e5ed9770579ea106c2b180d69c79dcadda95fd89049d81fb310c281ec796662c83131e081 WHIRLPOOL a611f1a63c6b7cba8f4c73c226891e84372ccc2ed3feb624470f496f89ea8475f1bf793b1164209e43a37abc36679f0ce4d59471112945f8e43158e69f870495
 EBUILD phprojekt-6.1.2.ebuild 1136 SHA256 ddf10dbe9ee3cd0f06d46dd2072e357195edcdc1ef52478ce2e3165bff96b006 SHA512 a9cd1d3f5c7d09dee16f0795af1ec6c3b47bd39c23c4ab581464f2427ba3f8f7671f1b61dd3dc803d0ff4d4011c077ce314bbe6041e02f94002cd13202135e3e WHIRLPOOL 9c9dc35d1c28429f910dc5f8d63548061e50bcc37b2f32fb0f3622e92ecb41902f9d5e2b34c0a94fa9e5512763c626e07228003f448148b503062bbfa9f864bb
 MISC ChangeLog 5973 SHA256 9b56e36a39d53cdd818b1a2aeb461d7f658e1e80fd6478f132acb411988653d5 SHA512 c250876c8c541e05c96e204e8068fa24013875ea6b44cd49bfc132e9898c0f562978287efc8e8c0778178a73beda91d63be2db84b6d20a44a5015645b52245e9 WHIRLPOOL 146f2c4d91253b5e9a31112ca5e39f9ffffb10dbb36628308f96aa60e09f2b2a5b1b30d4809f71fa088f37ec45c3575eee2a9a5149ad9b491ab1c9826c27db15
-MISC metadata.xml 161 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 SHA512 da8733f12ac4bebcfa485138fd9880683c1196efc0312a588ffce412ed14c1dd831e005129b6598d027af44d381fceb844453a433d0c982348e21f2d9c49f52e WHIRLPOOL 2b56ebef4f0870596c32c35c96e6dfbc911f6a3d8fe0e8c463df76dfa73dde112948c814b9a9ee996b7d71a85e4a723033ee3b92f4cde0f31d0770404d7dba61
+MISC metadata.xml 246 SHA256 f27fb2427b70dca8a023f8c30cd03211576a6714e0da9d3ed80bc46155f6bfc1 SHA512 12c58bf7b6f0ce628b2a723a72ef3bde3c07c2b029e053041007f6a32d4cc8ecd142f853c25dae8cdd3769d6b5d308693335875f63719215ab9e9b7188180082 WHIRLPOOL 1e6105634b3f38f0065607df797c66f97ef2eb59f7ab292fae4753938e90ea05f1353958f0447698885925413c548b6cdc49d2048e3b965dca0923a73679b0b2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlDXFrcACgkQfNMcoUhJ7Gwh2ACfb9CpZmara7tAhNGuO2Pdu1aL
-+IUAn16feDbkMSMR/Rw/uGMyg+NjP8lc
-=ykTf
+iQJ8BAEBCgBmBQJVfy6GXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi9iEP/Ra1ls/2TsgqTz/DFC9t4NKs
+X9mHrhgrefJzsg4zUALi1Fub95onTRofy6NTsggjOFDz2KfC2RBE5ClP9cLVwVCA
+EYNMB7YlXnJLNdcbDFzYnEnGnqAiPlKPPa1BWXBDnRMYk3qDLVF2PmPwx4yiFzBw
+XNDLRxyAO+lw/Xem0HDV5Fy3Evridmzsl6hlGOMo0LN4tdkwJhxchfJbGV43G8xm
+XftE1TFCnNYgVSji1RYR7zVa2TaB3HHAfPRRVBwjfk/BuJftaTYTDODZbGfhxb5E
+LBC6UK3OQBZB7+jxG8bVN8cgqad6124q/zBuQIfPR3kBC4EQBf9PwKpFggBQLdOj
+6s1oQTNZBmIg8GV86Jw6oCFQmRVkBVsLK/j5bQQqY96cCjsC4/JJsBGMUkR54qpP
+eARUE6mE3HeRCKQed/cNX9fgRrIyjruEBZsLpgkZORh5HNio+kwzC5UTu6JeNVHq
+S7d4v8n5M+R7pJkkeaE9aa/ATkt2DUpq6ioM3JFEHOEk6vP8YQzwOyDuH04aqFey
+m9k6+iCW3qkM7zGIyH7Vwumh7F6E1q2YEytjSSSLDjZd2XKIJBW4kNgUNelo7+w2
+wl1Zhu29eMh9eUFUsWGMpceUIGkgeu6Ro6WsO9GbDqENL6BjYjx11ZW8miogQ7hm
+b9orVBIC4IsSmTebgUxm
+=GK7g
 -----END PGP SIGNATURE-----
diff --git a/www-apps/phprojekt/metadata.xml b/www-apps/phprojekt/metadata.xml
index 95c06f0095bb..44cdf35091f9 100644
--- a/www-apps/phprojekt/metadata.xml
+++ b/www-apps/phprojekt/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>web-apps</herd>
+	<herd>web-apps</herd>
+	<upstream>
+		<remote-id type="github">Mayflower/PHProjekt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/phpsysinfo/Manifest b/www-apps/phpsysinfo/Manifest
index 3ff37a3664a3..cb1079baf1fa 100644
--- a/www-apps/phpsysinfo/Manifest
+++ b/www-apps/phpsysinfo/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST phpsysinfo-3.0.19.tar.gz 495301 SHA256 1387ff95cff8686ea95f99c2dc6fd6b9fcd655fd5832b8b75b8ad3595e07b888 SHA512 03b8d56436f5f6284b3d404287bdacc23ce31f8029eed819fc8e06f22b39bcb95bbb09b65c1c1d60d563471edb7960debc276ee59c093c9ea05371c5a0b775a3 WHIRLPOOL 62faef18570b104acb54a57afec7bb44b631e18c92f82d80f196a2ab3b86807667e22178dee6025bba52afbbeb48998a32bcf50d3ef75b08f82e4644ac06135c
 DIST phpsysinfo-3.0.20.tar.gz 499573 SHA256 029889ba102848dfa33be2472e9f06472eff1b4c05017c9e9cb48a022c900660 SHA512 81853f94cc0b4ef8d0e394179b82b51f69dd3c9f0d9dbeb5c702d2824984a03e0caaa92682d6177c57181fcaaf55b1708e3c0a578cc4eddeb00b4530ba866d11 WHIRLPOOL c8872685ccafc0a6f7c208fffa280dc24d497085bd79d3b5a8a44e9fef8b2113b167bddbcd550d85b4adf081717e112988cc5bed70379e5c7f21ffeba2ba47a5
@@ -24,11 +24,23 @@ EBUILD phpsysinfo-3.1.9.ebuild 904 SHA256 53bbd71b70c12596a507e88dbd00742d68d19a
 EBUILD phpsysinfo-3.2.0.ebuild 904 SHA256 3a551e5a198295d2320c2acff54f498d45c7968e0c0d721100b19cf5ac783a2f SHA512 ac78f3ae2dc6ea5f03d49b644014c5286836608eedb070fe72f3499e113dab5f42829f20f0cff4a20841579388c7f5a4485bf0645a9c77be5d20d7f2342eff46 WHIRLPOOL ecfb602236e193e2cf1820df2bae2a305e87c5d03d3ec6433d307647072f1e0572f723d49df63413a5082dc3fdff964040a53787d4496473298bc89c355765a4
 EBUILD phpsysinfo-3.2.2.ebuild 903 SHA256 fdcb1bfaa3865923344e877c3fc8ccf0b153745bef13b2df14b892b60bb1464f SHA512 df4bcaa00527ac0f5335e0dc1c20e072d193cfe80b9a277ff00feba1a02156ac7c8bdbe0a3c16f10274e7358779373b752f9c9538d806cebb5e585c2c7ac64e6 WHIRLPOOL ea0113d5a526b3fd49581e6ee013034e66782a61a59730165bc44b80eb9f571d2e2a47b5a4f5d58fbdfa46a4f2b02e26ce3081cdc75bb095c80e281580d92314
 MISC ChangeLog 16322 SHA256 62901c4d0f5d01ee6a79924ceb197e15a61876a48340761324409d0c891c101c SHA512 e73a434069d899694ed6d52d133c5ab355228e1539d75df6e6dbad497234df202c71a1d9ab9f9b746bc95b45f19ce1663100c5face9c5dfb179f96801bb6383d WHIRLPOOL 695205b9bc15fec9a9a0cdfd17bd5538a5df1a9a3f49b5220d3535d28f11a75a1bbe7d68a74cee8770dd32a2ca394068f94aba5aac435743821fed4622a4d78f
-MISC metadata.xml 161 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 SHA512 da8733f12ac4bebcfa485138fd9880683c1196efc0312a588ffce412ed14c1dd831e005129b6598d027af44d381fceb844453a433d0c982348e21f2d9c49f52e WHIRLPOOL 2b56ebef4f0870596c32c35c96e6dfbc911f6a3d8fe0e8c463df76dfa73dde112948c814b9a9ee996b7d71a85e4a723033ee3b92f4cde0f31d0770404d7dba61
+MISC metadata.xml 243 SHA256 9eb09735f663eb025215f35f73eeb3c8ac17c2155c330e4e77b8a882c08c4ed5 SHA512 8648e4cd24ff4ddcd3f44f8b8bf9ffaf819111ace0e4e4a39511202df2331e72569c685bbe2c2a6cb3312fd0a83fcbb1fb7988ca78088b67ba6563958f2e50dd WHIRLPOOL 363589ad8bd1df5f510585f1c551d1b2db797608d1ebb3bfa0220caf507c35e909d9149b496ff556e4fdb54a9d01e13f89dfd4e923a8253a95ae71aa1f6d22a6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVt+E0ACgkQCaWpQKGI+9SA1QCcC2eI7OK1U590Elx0G/NyVSy6
-EAYAn1qphBQAVapPL2SMidigbGKgZW2b
-=cvyl
+iQJ8BAEBCgBmBQJVfy6WXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiFWsP/imvjTvr7TXA0ArxKa0HvFGB
+V6xFmOEpgfZz2SSOJEQH5i7NNi6q057wOxikvOILMeWrllSZJQg+WeBpyw4vS/D5
+D156r+0GdLImDhVOzyLsrVQ3hUwP/xptSSKXqEAbAvSzLgckSobIcNv+ISr/Jpsa
+KGq6zvMzuHqjFQlYn0qQfBAKw89MWJ/VfYT9b/2GMZh5YOChD8Q2hKiY/RB1kumx
+HNNmIV+fxQwrC53GpIAwQBU3ZP/Dw0SG0jg7/NhlCxKsDB2bxiQqDd7S3jp5maMk
+GlwqHWANkr/9Zqhm5W0fZGTUIykegQlstiCXHlzdZ3gYREPBXr9J2LFQHNKY1CC2
+5vCcgxvjVE9zuOFKOXIGGMWZruzlNBVx6Kd+uX5pypCeStgabcvmj+AZhtPaMSVY
+D0EY1/686p6d1k7lWZhJ3+d4+8R83w3umckO3vUfAeqa25hkNIZ4ltEkxT1q2rhG
+ziSvdPF29XqDx8g9LJo7/Fi+1NwsC77WZekGIDTkez5gaKuXg0dK7OpPpWTqfsST
+6eq2i5qPElup2OdmUvgsuROBgdFZfranG+Yu62uFf5HLNHaKgCk9oxdgXi5G9j10
+HeO2TkliW5Td5xQR8tMOdCSLv53rV2tUrJPZOua+Yb9i8165gynv+G5ONpESaR6E
+gGRh32eAZ9zob6RP8pNN
+=t3Hg
 -----END PGP SIGNATURE-----
diff --git a/www-apps/phpsysinfo/metadata.xml b/www-apps/phpsysinfo/metadata.xml
index 95c06f0095bb..768048d28c6b 100644
--- a/www-apps/phpsysinfo/metadata.xml
+++ b/www-apps/phpsysinfo/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>web-apps</herd>
+	<herd>web-apps</herd>
+	<upstream>
+		<remote-id type="github">rk4an/phpsysinfo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/phpwebsite/Manifest b/www-apps/phpwebsite/Manifest
index 743739a4c76a..3d5edac1e67e 100644
--- a/www-apps/phpwebsite/Manifest
+++ b/www-apps/phpwebsite/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX postinstall-en.txt 4642 SHA256 aa928a0658820728c93f14cca446644745e0cc7408091a1971c7d06bd7616d9f SHA512 18698195eabc6f0b032c679f6f8bb4e6f5c09c1063155feb98ea366ac204e3577b7fbc5a0b49a1f6d5b00f0354c0e5b2bab52f99e4996f81e1511657e7529aa0 WHIRLPOOL 4a148e211ecd6d8a59e1ae76f38806d779ebb54a3633cf7aeb9a78102f9344a3eb4be3c2353c2116d39c2248a84cdd056409269f055b2c46221c7807aeba9b0b
 DIST phpwebsite-0.10.2-full.tar.gz 3338377 SHA256 1b91045e6e8d40dbfaac2b0016dac378885f98588e68e752fec76d1991c71696
@@ -8,11 +8,23 @@ DIST phpws_patch_20060419.2.tgz 1560 SHA256 7df6518405f13da4b7ffd87cf5ec3d11d6df
 EBUILD phpwebsite-0.10.2.ebuild 1452 SHA256 5e791804b6a8946d878eeaa0e5619dceaa1c6d73c0e3e922fcc4b0526fde07f5 SHA512 80ff15eee2c0e22e4750f7a86ca3142541937a1ab499b834f47a196f24c8f36f722bc7bd0e3fa002d9f9054273041243881478a47aaf535f27514b7a70445ee1 WHIRLPOOL 5997fbe6ddf1a41409464709dd64b2e9aa00da448957a01841e5ad0dd89d3172dfcd248108f8fe1aa632072f729b851bd34f62b8181b9dd1b3a68e964126030e
 EBUILD phpwebsite-1.7.2.ebuild 1191 SHA256 34c6b2009ad45a51284310f014150c100b6195b0fe8c3dfc611e84c767684fa6 SHA512 385684a9c44542d4d41b08d452549c8c3bbff15fbdcda5c569ef1b548b3d5fb750c3b507bd5a58b6ef1fef447903ae5a576c6e0e9fa52e33da04650a631261c4 WHIRLPOOL f28e5dc17fccde9d05ecc7f61c2dab1c27d1ce79d18a1bcd37e826b68796cd65826e881e2e3ed536e31e02f5909883f6c86e87a4d4021bcb22e8513580538db9
 MISC ChangeLog 11371 SHA256 d255464b6e05c645c60f3f534dfcc52eb2f91e1d9fd0aa17915b3761bb585b32 SHA512 24765cbdbb29e39a3d858e1c96271ea4fcf79e2ec4095a4a37f64767f275e476445e929acb1271655fb7359cee757eb1b81bee4c2596a568240299fc23e30998 WHIRLPOOL 62623e28773adfa86a1281f88e7136cedf43cd0deabb3414a99dcad742ec6b5fe2529db888c085c5dc3a21878874506f3536501fbcab4b839acc095b3abaf457
-MISC metadata.xml 360 SHA256 2fdc9214955965b1ec1c662b4d09a92986097d678645599f86e0ed3213093da9 SHA512 3c547285972c13aacb9df0eb34c4a72459af7e7472922b5a5e85f82ad5d902cf87dbac308eb235acaeba5c7471e0fcc09c3d585f95b3823f70599b9f5b5ecb0a WHIRLPOOL e5b2f45a9482c9f8f61559fd574b0c4f57deb0b64f4cc87b8c9dad037eaf08bcb59a0958936f434050a361e13c068da1919f08704be0f9a3ccae36c0256b86f3
+MISC metadata.xml 442 SHA256 67a270092fa1defa955b3a356ae1e1fa562d2df9e1651229c0fc4914fd8fc17d SHA512 3bf34193d79c97bcafdaa49b4b512b5b39bcc3bcb14bc23e247006174044f357618722caa8f040b925a35bae7ea26c8f827cecb7b7a7add3f663be81fdb51c3c WHIRLPOOL c56cc40d3d03c3fcd7b977d08d58af13c9754ced66065b3ec66466634f3e206ddd532e61ea6639a56fc5fefd0a00f7568167468bf22c55fc1d0c5d5739d7cf72
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlAzsa8ACgkQknrdDGLu8JBkVQD7Bh3FBqfkDLBNSLJW6tZ6PlH0
-mi0gTDmAxgrD3Brf6pQA/37RDnwEiM39lCFTQxkUaD3uqMLMR6FwzN/oJciBFKAo
-=lFh9
+iQJ8BAEBCgBmBQJVfy6mXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiCSYP/iJ2r3GLXYwqxsfEa6J6PC06
+o8p+X7iqNz9AK6etKDbvixsibgIL2CrMv68hLbZPGpFey/vI7gbNUNDd1IrNAgEn
+4VOjZW/03LDwZ4M7ubv00oqs+fzzpAI7zV184N4flEMzS6QU9q5cFc3rSm4pMZdl
+dx9p01s66mTq5jf57elvKDoVKEX/UEomAYiR6RgpUUF8fQY9IXXMyl4cctKZykbt
+E7uOQOMQC5QRT8rFqIGgZ7QfkfPAxDQ3rsK+5YUl81KfoIj0hDbbQdcrhYdg3Tdt
+sRUVgZ+hwulknls6bdQLPcnbizBS+lf5HrWEmj4rgWEq0x7NuBn3eEfxC/7fWtQ9
+LHSBQcRlOzxm61jT1YQhM7mBwHCLOyrBLyA7QUo7Jrw2XeBkoEm8+OfqTyt93z3K
+oU/3BcNw6tD11wKu43iRbUrvugEdCJbd/WcB+NruEHa1EYC1NZe9wfvnw8yRKgxh
+0AoYUri4f5ru0CIl9nUDu9yV/XLA5WQzJTiQeJyF1gzl/ShDcBFwhDGjh/7dfh4h
+ngpbtgNYRJnxFQ98u7/Yehz3vXVMEDtGb8j/sUUS4XQSWxV1yNWiTVVdl42R0ogm
+ueydIg/BqwDmQGrjPDceUAGC62H80B/qsmXrFZlThtdXbKb0j6R/JU1zITIVOrEV
+MUmxYnJrZd9CQMpDcmRp
+=f2oF
 -----END PGP SIGNATURE-----
diff --git a/www-apps/phpwebsite/metadata.xml b/www-apps/phpwebsite/metadata.xml
index d9d7e18e1eab..f04a5186b05c 100644
--- a/www-apps/phpwebsite/metadata.xml
+++ b/www-apps/phpwebsite/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
-<longdescription>phpWebSite provides a complete web site content management system. Web-based administration allows for easy maintenance of interactive, community-driven web sites.</longdescription>
+	<herd>web-apps</herd>
+	<longdescription>phpWebSite provides a complete web site content management system. Web-based administration allows for easy maintenance of interactive, community-driven web sites.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">phpwebsite</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/postfixadmin/Manifest b/www-apps/postfixadmin/Manifest
index c97e8c669923..c5c47466e9a7 100644
--- a/www-apps/postfixadmin/Manifest
+++ b/www-apps/postfixadmin/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX postinstall-en-2.2.0.txt 1695 SHA256 42474dc5f921af2f6512c281a6ae3adbc7f58e00932e200f3aa81cc7b20b7063 SHA512 5eac78b06adacb79a0dcd12561cfb61bd27f94234af1bc4c6236229b52460959c14bad8c2cadb651f82ca7a4698a393dbaa28ab50db90e28230443be180af97d WHIRLPOOL 8226478e9bdd1e24e2bdf8c2e6bc79f32eb485a34deee25714eca5039e378ab3e2947fab17263b6b68709847c3aaeea11efffa892cab69f15c9ba3e070a0059c
 AUX postinstall-en-2.3.txt 1827 SHA256 ffaaa33b2a3b67d82fe8914c1c1e9b58328d6ef119b8e32326ce10ff8b478357 SHA512 59e304d63830227b1619ed1299e9b61f5b6e534cb03da4d3a0e35a0fe727ccf2d994a034bd12d515bba4f8a6a8ca513cf2131c031fa63f85906639aca159993a WHIRLPOOL 8604fa62ae9534537accede40c77d3c7910d5a24c0ad2bccbf5669e87d8c6af3016f7628629a9dca8aa1abd7601ccb34ae6eaac4eb0101ffaa2147d0a8f8f1cf
 DIST postfixadmin-2.3.7.tar.gz 1600662 SHA256 761074e711ab618deda425dc013133b9d5968e0859bb883f10164061fd87006e SHA512 2d217874832bb3e70b200d7ddadcfdc81f0e9d3119bb54070fd645e055e4fd69b8fd9470b88af630a38c4053f4dd132425448b0dbe6525966aa5a4a2d8a1e7d0 WHIRLPOOL 7726aa7157834efcde5ac81f62c92db53b8931e868824cd48e43c541921d18908484291a6c5711a40609ad5e8dded954e8edffbdf0b5673d7cd49d647644bf50
 EBUILD postfixadmin-2.3.7.ebuild 2878 SHA256 279fd00391dcfcfa36b6ea6548f7bee833ca1c9c2d9b92573080307cac173f55 SHA512 81e81e5d888675437e81502ffa412ad02e44d7d29a848d02e589c371e3a7447dc6e311290f9f08ea847c365bdaa6c08d6311be975134476e909244e32a9410d5 WHIRLPOOL 6edb33d5759177efacb754694bc7272957e4ee629bca43baf4b1a813b4ff134d02c83afdad8006943156158b3d7fed1503dfc4c7e7865d18e4600464cf6aa76b
 MISC ChangeLog 7093 SHA256 508c765b3d45a5a600361a345fa7e865294fec10f66c41a1aba5ea77e5bb8621 SHA512 dbb867f4b97f98fc3534fa0090dd460bc62516d932137e42d61389552e52290ff9c95308c39883ef63ab24fb622f1a4eb1d64bb5164087837084cc1c89d13d6d WHIRLPOOL 3a236c25c306afde25a0700a08f4397987161e3ef265644b677648413f0a6317711963e0cefb30a3ae4be4678260ffdeabe84f74d7ad3228af5ee4b58cb11a8f
-MISC metadata.xml 252 SHA256 25a15d16c35c9219cd8958d776cbf508f77b08cd2bf0c4baa4d9444ddd203724 SHA512 99a5acd30481124a31a1b0e73fe9a08649221b4b4483bc3e094fafbdc4939bfe7ba309ecbec8af4f8d87a5dd6419d8e8418806585eabe4bdece3965b12ded6e5 WHIRLPOOL 5f3e6764391b7d4ea359d08d3518ae4e05282adf225ce281cef7ed2273aae3cd83b8811f7a8a2e22c86ae69b941b40b9b8b52dea22d2b7e8f4a36883165e95e5
+MISC metadata.xml 334 SHA256 c5378762247f36ecee2c438dff39663196690418d40a5d1d25f55b1f99cb2ca9 SHA512 6972242c3545776cf208d518f7815dd1d4a7373ada348eaad32544890414c1b017b431720c4f3063c211f0b3a10463c70b233b729ba6b45904ef62a69d06fbeb WHIRLPOOL 0f78d6811ef8bc3766869afa23c7bda0c65cb60630fa2c8184597268c4f64bbd5832920ef2729aa53dfde933b9c158e290d14ae863eaaaf280a37e10a9e1cd8f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVIuRiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
-MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d55SEQALty/7g5fSfpM/dOMP6VOw84
-7YXWKTriVcyoG2lmSkioxfs8u1TBA8+cuIZEk7UnD98KvHPWcn3SvaSMOcycUHVa
-oPyIA98Hzr+0t1ecKq7Fr87NW3inT3cU22rCbPNHwfj//IEZNWLPcD13YscDflEP
-CWIRxzKcxsAK7C2mvS4QamI3Wom4EaLjl6/U4mRuiKIOQXQfYmtTPCG9QoH4X1kN
-WLQ5mEvG0hpHpQVQYKlcOQfhhAJZHAHQ3UXQnVfYR3FZAgNttNNYZK8ckjAol46P
-QehC5lLIJtkvTE25C+UUIQUsv2jRyEjAtLQ7eubNFVKMmenXjmXuhXYdeCaS5I+i
-SlTLTNDbj7/cCm3Ikn0nwERsNST+l8y+FE9RYPH08wPRzA8Wx55FST+JqOSLnoNB
-77r4fvgb55AWwAHRqS4P7AwlLsGlpX2acxYgU37+8HfMW/dqWbHzKUu7KenfXs6S
-dXX+AStJgy7B5wEWx/BVW+B3iLVj2THdBl5GOpYUrhQEn9TpcUF9FNUSDKlnRBmY
-lg25qhDCHJeNXRlC/BsJzvxbx2vTnwo7I8MrxAU1dIyr0vNtTXgDI5c7QJoiI/Cl
-FTWjf+UWPxKPevnomAGu2zAi+KRiiYeIy9arT8/MMNJsBXtqHKIx1a/e1TaC5NDX
-SvvD3e0aZ1BbslfBitca
-=Kz0E
+iQJ8BAEBCgBmBQJVfy65XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmit58P/2VKsBzwmhNzTWQGNtyMe4Lw
+WmrWU5eEKTqiDsO5P0aPsmbrQ3BDI58nOAtlTZJ39eAbaasl2tMDCSB3R8gkJyfZ
+SSTpls/fUY4Ja2pj57yXEF+9MH+6rLaeKLKBon0d0GAD3KZR6RMq6A0ce7xOYu7A
+ZKg9A+gNlBt26Rb5Nt0GsiqUvjAi1imjx1ZHrN193ADVMpfpAfpr4VgBpCTE3SHh
+zzzhDZ8a2lIllJxdjoKOPJzeIY3s3SlAvaeWyYPBzLtDp9D3s4Z3fIjqGHcS0k1W
+XNDJgubrPVYaQjJqRvHMuX6HKGtzJqR2uZ3gB8QouDV2jyODK0M4m4ItqoQQa9Ru
+ndJ8jslgkat3d2sOfm6UDqA9b1xFAvX/UzhEB0CbQxZ2E+BRpLk4P0FY0fjG1Jh+
+VU01KofAWQYS5ZVs5V6MMDrFxPpDervlgt4PIhQQx/hT1pcC9m/jWLe5GBA/GDCM
+Qcil9RDSeQZsbOjnY83r8umLTbPc2xDe87Jynoue1O7IbIvOdFRAV87ZELEGuaJm
+0ehEhwQ6rkQ86Gvumx0k0VqmzHg8BbVfV05Y3h1cadb1q/64rGZB8eCDrtEPV78d
+drGDbYCcm0o2pgOHxfrOdNRSPbulQxj0Gs4nv48hf210Gfzh8lLuuhXE1+amQBfA
+hrzbNZ6gzaBotacReqo/
+=0+/c
 -----END PGP SIGNATURE-----
diff --git a/www-apps/postfixadmin/metadata.xml b/www-apps/postfixadmin/metadata.xml
index 084ec066876a..6266de700fd8 100644
--- a/www-apps/postfixadmin/metadata.xml
+++ b/www-apps/postfixadmin/metadata.xml
@@ -3,6 +3,9 @@
 <pkgmetadata>
 	<herd>web-apps</herd>
 	<use>
-		<flag name='vacation'>Install vacation.pl script and dependencies</flag>
+		<flag name="vacation">Install vacation.pl script and dependencies</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">postfixadmin</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/pyblosxom/Manifest b/www-apps/pyblosxom/Manifest
index 436749b4fa43..507e80cbff65 100644
--- a/www-apps/pyblosxom/Manifest
+++ b/www-apps/pyblosxom/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX config-hook.sh 468 SHA256 28c4f5a9b09ffa50ee0664ea688440d86d20a1d981b9007147ced84d1bf97f9e SHA512 7896ab199c7ce8a209df0bb74085b32ec1569751cdc51673182e1a99ca8f1031394c544920be181d843d968002679d6da2958d00d8b8e333dbccb93383a02148 WHIRLPOOL 9a56710dd0eb404b06b2434e5c9d19fd731be88e225e5f2ed071a93f411f05d5f37cf14898c634d01c85a74b4a27ace7ee7dd8454a3d1d1afd61307050ddc218
 AUX postinstall-en.txt 326 SHA256 9c2a12527f8d2729f77f9eaccb4d297fa988c36e20cefa6de2002909a89851ae SHA512 2252f10f12d0422d1933e1f4fe2080861f08b775cc3b47c8fc168f34d5dc76d4314ccc805c77e69c5fc90dcd43f8c48e67aea93f39b11f74c7eb501d430a5eb4 WHIRLPOOL 55cd56d855fe192b62f7e07079848e6a0ab3414d0a91ed2c4dcfc0457ced30d94a6d69cd2181e147b2b3303ebea661d1aa80f4b0bcd2892ab6fb6010d6b543f6
@@ -8,11 +8,23 @@ AUX pyblosxom-1.4.2-gentoo.patch 571 SHA256 79574de1e9d7008d4b8ab909c5889ee1b21b
 DIST pyblosxom-1.4.3.tar.gz 110908 SHA256 35af992168c773099c92a2572ce64b0ad765aa578af495845e92a346602fa8fd
 EBUILD pyblosxom-1.4.3.ebuild 1403 SHA256 0ba7657b6f0063756faa61c101e70e48bfdedf4ec494eb294bdcfa5629b96428 SHA512 27721caaad4d6659596446858ba5049d6b3be4fce0a4f70820bbe1700d02ec9593aede69709214b1ad4e05387392c51a4f24fe90a2140806e5b88ce21190b38f WHIRLPOOL fcfcf4449cd23313160c9db50c64c09cc287c40d03ac2749f082f205b3ec88fd7af1a418dbcd360471aa36c56b2ae6bc6ff1f659281a2c4abb290f0f67b8652a
 MISC ChangeLog 2699 SHA256 f30f0322c836c3f307cbfdcd5df77822c324a714963c6ea14ed84bdee3262bae SHA512 4e5718a9fc69e6c4298e9ee5e6e44e831de03803de8a32f7d3eaab747235fe70c4dc495caa4828a9645695e70509b1a64640d712975fa577e399eee51ef1765f WHIRLPOOL fad9d58df7287a5e270ee37004fcd0af1885b04ff1d8b316e3b4b534b80053ad5b6034c89655886dcc3d9d02bcbe94936209b52adf4a5be6af06250c0cc864da
-MISC metadata.xml 161 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 SHA512 da8733f12ac4bebcfa485138fd9880683c1196efc0312a588ffce412ed14c1dd831e005129b6598d027af44d381fceb844453a433d0c982348e21f2d9c49f52e WHIRLPOOL 2b56ebef4f0870596c32c35c96e6dfbc911f6a3d8fe0e8c463df76dfa73dde112948c814b9a9ee996b7d71a85e4a723033ee3b92f4cde0f31d0770404d7dba61
+MISC metadata.xml 241 SHA256 e9728086e57515caebfcdf63a1c490dbb36ac79f58989f5205844ada3e55f6a6 SHA512 b982c0d86fa7665afeda85e947e8decfe0339c940210f0deb5168afd4208bbd81f40ffd323fd6e56b78aead22491c1eca6abadfe1f4860f8a51e37ea212a5769 WHIRLPOOL 8c66918befed649cfc56257de7f6ac5f52ec04158436d8565b91453058134b52855f04c2e557a90f579ebc2f14bf5f800f8c7241e59fd8e8eafeed3101a1a54c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn0r0ACgkQcaHudmEf86qTSgCeLruApxLC1ghbEx7rR5xy/79V
-1noAn21QaEfEd5KK6lzvRUIOjz9e7jAJ
-=j1q7
+iQJ8BAEBCgBmBQJVfy7DXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmizJQQAJ0AINAgRlma89FOx5LZ+StY
+i8XgfVpPNhN1dQTfvyJCcbfMlxuNWtMN0WD77dS6RjOHYevBYXANwYdFBHDJcGrM
+KYxUsK0eFw1U8uIvkJNLA91vcQWRb2WgAc6QKIQWUGi+CokLROmIwZz0wGrTkHua
+oZpJX+jVPkNsBizYkFVk08t9A8rAjkhUgI7nNjhNA1a8sQxdzN8kH3ynaAhg0RG9
+PE0f7b/bqXAVVqSvOTo83zIV7Mn9NFhWMLAWPkJ3nbrOOop3mJ4FO+6OQp73wuGs
+My1YKq4I+AerDFIJ4gyAvuhxRes1SNfTTLQ2LrcxCfhhgTSKfiIkIynfE7N4tp2P
+W13FhZ67fvt+xxeDufwyb12QhBid4/Ah2cjiAzxvyHNi00DZTfhqshsCfeG5m7d+
+RlDW6/90VFSZXsejpnJ75dw+MG84w7L9yqwwejchBIl0G1qlcmjmZ00znP/Jhc5T
+QVdr5/0piszSRocjrihG0I19K2IwbEWIDNlDSjVYmodz+cIq4LzZQ2FzhfoYz/gG
+N6lsYc6QsU7I/rbb3a1Ox1A3zkoS/PrvCjYqNRLLsKrdbE+as78kfQpobVf8HvC/
+ZB28zXKJ2an7qNk2VOhEuUdvKHA/6n4cghofzCAHT1CQ9WpIyIsYvpEKP6Si+9kj
+TUzjv3XmyxHZDaPYKt7H
+=y+jO
 -----END PGP SIGNATURE-----
diff --git a/www-apps/pyblosxom/metadata.xml b/www-apps/pyblosxom/metadata.xml
index 95c06f0095bb..11cefb5a384c 100644
--- a/www-apps/pyblosxom/metadata.xml
+++ b/www-apps/pyblosxom/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>web-apps</herd>
+	<herd>web-apps</herd>
+	<upstream>
+		<remote-id type="sourceforge">pyblosxom</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/sitebar/Manifest b/www-apps/sitebar/Manifest
index 2a9fd9c4aa78..645002bba5ad 100644
--- a/www-apps/sitebar/Manifest
+++ b/www-apps/sitebar/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX inc_writer.inc.php.diff 329 SHA256 ba4730c408946a453f02d59c6bb913b84bc84afcc41bf93443d67f05d0d985b0 SHA512 128a6afcca78fbbe9ceb242a956fc77edc958247e2981b486e3a6a57754f9c4dcdaa6c9ecd589d3ac22e1defc4e25911471f5cda1903c9e85ecd66fc8f304d96 WHIRLPOOL 6e15d01a4f99cbd4431ff839c6396659bcafa9fd85480d6aee88967d3c59eb0c84bc4ed07e3382ab089dcb80cef3a67d36145bd1490e0b3ba902f8b61ee69edf
 AUX postinstall-en.txt 93 SHA256 281af23fe8b57b34c44c47bb1d25a5c6ab1e6926386e4cab12ff615bba772831 SHA512 15d3c1a7acc7882c8971c6ada33a48605b63045902dd43d0bd30902c62360f30918686f73c2620a09e849559dcb6a0e6426327678cc76671518b0f07afab414f WHIRLPOOL 0644f325a6f7db8d384e408433b4aa7a6b21cf7b64582d7c04138cdf7d948b6c5f09f5821d0a3361170fb8a100186ce653ed7505ae09f94069a2a4784850d309
@@ -12,11 +12,23 @@ DIST SiteBarPluginXBELSync_3.3.7_1.1.zip 16487 SHA256 6f7c588bd910e7fa8983cc5a6e
 EBUILD sitebar-3.3.9-r1.ebuild 876 SHA256 f2b95836f8011985d976d3f6cce118da6a72b24eb0ebf8c5a1fa70baef269658 SHA512 56ce7aa62d8529b059ffa2592d6a82540dd5cf84b6120cf51ccbdc044060f8ee181578cc904ed9061bc5f75a39be3b9679df2e914c385ba0462402c0741f928e WHIRLPOOL f2d7d28a28ca31905c80183bfb0905058522201c15330f949bc95ce4c2f37199a7b10094f6655040fb8deae04a8456ea1f675712fa6790cdbcb99bb7d6abbf6e
 EBUILD sitebar-3.3.9-r2.ebuild 1403 SHA256 90392c4e851ed04dc2a496f4f8198c1c2275d8f309e845b0215b8401b64d1e07 SHA512 fe9be4ad2758bf35984839c9cc0e1599f18d63120bba68d6f37d1ca88dc23f49152055fbf9e12db6b29435dd342337f5e98284211d4706f9997ea30667b6078a WHIRLPOOL e9252ef095b2c77e970c8e049590dc480b923006131bc009c303879cd836347851308550aef594629167b2208beb89b997aa685eead456cf24ed70abc15de108
 MISC ChangeLog 3971 SHA256 7e607b1f8cd4f8feefea8415e13a7c31aaecec7b9e640d5c51e81b5d05b4779f SHA512 abed82ad716326b299e3ccab74f39f733c979f399d3ec35d1599690c096cf705d0a0d1c4ef2996dd00879aca9313aff17a13250ecf35e0bdd3e9dfd74799cc6e WHIRLPOOL e1449831bfd222208a5862d26e3f4d2a37b0e44bd05f1ae49cb6a18151e9a73ed84f8042152239ff936144830db7081f1848c20a515bff3f66c2d3cf878fcd03
-MISC metadata.xml 228 SHA256 bc17920baa2319abeb67867c06542c503b84b166e5d2e566140f67b6a13a2033 SHA512 4ed6cf439d016262eacaea4cfb7f64789ff2ff03110868b70114077e7e8d227b4ccf26beb3f94519ff44c4552e6458fbfd7c4f5f360668f15f9c4777310cf9b6 WHIRLPOOL a72936f208de4739a9bbf62f181f18a51eeeb4124783228ddfec8eb2fe7f9d49dc029be2c01975f54032761345b82606a561b3c8d68931fb6c02c0f3ff1e9bd4
+MISC metadata.xml 309 SHA256 e0ace52b49235cbefee7045cdbfb93a85900ff6110c6257336fc5e97d9f2dde1 SHA512 63908b5b257550937c70440360eb79373c935bd394813b0da50cf06bb5dd18faac9ecc5569a7e298b44f8d51d7c025a02d4eeceb2cf5ab798ab583a3d2308e02 WHIRLPOOL 404f4840c4090cbc10e4bf2b392cb7588deceb656beeab0207e87aa9e2de7f569dd41eb158b46b8ea7a46668fb581188bce9d455d93437a61506089e2fed761b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlB+H0YACgkQuUQtlDBCeQKwuQCeO15YhxuBR470uYd8hKSwBMdt
-KN4AoIVj/kxHZCTIDSEgwaDiVbf7bAjw
-=aWBq
+iQJ8BAEBCgBmBQJVfy7tXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiNpcP/3aK4/GCWS6J2LsqKMuZwbmR
+LmSfi1RDLWu8lRC9wUbWDsmhoGfbMNddRwG+8Rt+Id3AX8I45GzmWcC3HBZQUXO+
+k77kKvAIV3HVU1djzIJaoOMBNvi/w+otZgWJi0AY7/X/LLQ/MVdW6A2MqgapxzAZ
+aqm+E66X+oJcWS2UrGH0MAuITlEviI502rs7XcsBHqr2RzmA4Mr4Sz4WNfSk4Ar7
+W5UDJM5espGbs5ju2t+eCaqi3fL8EWesSh28RHupwL2arBXNwvFi45IDImVT9mRL
+t/+UCUxBG+KlBMpKN6aF/rjOzAdUYOQgtEiVdinXvVbVitMYscV5j3Q5+zZagjhA
+XMRJL80ENf+pFahppDKI6rCVzNAUtuZvuA3axm/dVGG7isMJU3t+Q7DPUFtUoWwn
+DT4J/7L4D6PXYJIPfsL5r5pYiQZVdHoUHUSDvI1Pl077zG9n7Njdo3YJ+XRurwfr
+AkSuOwAuzoXrXslt0NmhCMGfK7nfYvYb/8B8jBzGPGGolvu0JoSN+Gme1iHbpm7b
+l6aU4XmoTl9oUAM+HEfz6TALB4aw2D+vOlDXng3L0dbSQqXGOtRUe7mD0bxDAy2Y
+jiHw01nEN+QzlMBPM+/3WpFBdQaCYQXYj+yAme73gtob7SqNnapYcyaF6cb0BUrf
+F/EPd8CG3Ac4zbtwtTkx
+=qnC+
 -----END PGP SIGNATURE-----
diff --git a/www-apps/sitebar/metadata.xml b/www-apps/sitebar/metadata.xml
index 0a675a9d4540..2d3672bfffd8 100644
--- a/www-apps/sitebar/metadata.xml
+++ b/www-apps/sitebar/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>web-apps</herd>
-<use>
-	<flag name="plugins">Install optional plugins</flag>
-</use>
+	<herd>web-apps</herd>
+	<use>
+		<flag name="plugins">Install optional plugins</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">sitebar</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/sugarcrm/Manifest b/www-apps/sugarcrm/Manifest
index 399200146478..0507dbcd7e55 100644
--- a/www-apps/sugarcrm/Manifest
+++ b/www-apps/sugarcrm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX postinstall-en.txt 240 SHA256 8ca0520434fde44cf6c78f88fc37062f34cad1d8add4b4f75c36436fdfa02b8b SHA512 3368dbfd0bbda16a27a974cbb23ea0e54bce2b3a72cb312392a9617d4a2da8cbb318bace2a8e3f5de6d4f7fa0cc95831077ac728ab3de8453a0f13e4aaa5f424 WHIRLPOOL 5f8883e1d90051f6305fc9fef008c75d6a2ab6a2e63f694fc2f2b744014b93569bd5291afd3ebf047c4b459d2680c3a608e6b5468bf751d64a4d7e2489761c4a
 DIST SugarCE-6.5.10.zip 21240061 SHA256 1abf786c0bbff683fe68dfdc59f7993df1de130c23fb786a9e8bad48d6bd1333 SHA512 f65c4230c25cd8b6c6f8dc0d9ec195fd7853589c4e83ea8d474401fc8a3fee625948208de01b8fb2f24ef6c79626092a0e171f8326c5c63b290c93162a534a18 WHIRLPOOL 7da16164fdb4e8e078ad67df7ae3763930c14de2da408498aac8d6930f1912874028282e34f5059881c578b73c2013f99eb6251a5afe6f32331bce0bce5a070a
@@ -7,11 +7,23 @@ DIST SugarCE-6.5.9.zip 21183945 SHA256 fa469eeadad26a5ce235aefbc97876aac08dc34c4
 EBUILD sugarcrm-6.5.10.ebuild 1765 SHA256 d798ac391a45b8a4f5e1aaec54e07c5d408ae31a42403f0a2880e929a1e78914 SHA512 9461c6dc8bdb83c27d35f2cec83719b84174064587fc9b25a86071c0737cf3a54bdcbb17b6d993c42a781c06399cc26494664f3971a8d39bbd4efb1c5a260b93 WHIRLPOOL c17183a9e50fb066d3062548afb5224df69f564b8009ec40dc861285d1a78a091b5188469a42a69503cc316e4448f3f9c7721266458f12a67acb3bf69c1a2d48
 EBUILD sugarcrm-6.5.9.ebuild 1696 SHA256 c550162040791934f4a316e6be4071d661591d52630539de539e36a0e866fc1d SHA512 103d5830dd0d7c77b63a5c6d281c46be79d26ce8c994799ea432020c358e3cc8aef8693459f6baa461efda6f71cb34ff7e7a2d143482c5e9f4af32d19f36ac24 WHIRLPOOL 7d8d91f24ac78c31cd074b60217a0b6cdc4175c258c311d6a5498037f5b4d8c8371aafe0bbdd308c2873d3ac9ab06d0344866e5c3a08a3fed007f8e587c9a39d
 MISC ChangeLog 1408 SHA256 191afa2f08682fe679f4c8c4a972ac7e8008c7c4a03becd0da476acff3fd382d SHA512 5f84fe6405aafb5436a0fd856316656a9e7ca34656340f79b81f249eb02a8a2c04725d2ebaa72c7ef57377a6a817abc0cd3392d1b32cf756c50aeb808b8a61fe WHIRLPOOL dc3df3a09c5e1007e47020e0d7c530a518601e7f157b9ddd8bb868a8929face10b9b27ddc85ee05995584a8ae3823a28fe79836f0993ddb14fe3459dbd14489a
-MISC metadata.xml 455 SHA256 7de40f3bc54a3fa38b49af05c806be7918b73b9bcb705ae8e1eddf2e301dff66 SHA512 f0326e3b07b2a27c956aadb13bd8d2cdbeb0432198e85afff643d513314e8c126b8262e666736c21961f1cc7b8816e9f9f7114e12ff2eb2d0d204bc3a9f65058 WHIRLPOOL d66187734c4c418865d4a3afdb8f4f84b6d35bc801a2f96e055be44638223a108ff6d75ab9d485997b24be310644ef2054bd42d7bb4213c86459df6c95697a5b
+MISC metadata.xml 545 SHA256 0d43655edbff32713c54f12c5f271efd23675da36b994c1b6dfea1dfe1e7b15e SHA512 931c986ef82c6a5bde9a3a119364d26aaaded494ee87b195aa95c9ef77b86fd70bec9c679e011df0c3d515a65d2cbfcbade2292131d90e8a5688f691d5b84ee2 WHIRLPOOL 3cbbbfcbf1399d23086964480eb34f47b95c1c0a94288e791c21b4cbdefda3de4a1bb7deb7da7c82f233532e27498baceb8a5bf3bb39f137c9786fbba8955509
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn0tYACgkQcaHudmEf86oqKQCfU7WE2F+yf0DT63VEoqe34xQD
-7qsAn2j1T0g/pbcnUsD5tBRHHZYZAVK4
-=KXVH
+iQJ8BAEBCgBmBQJVfy71XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiWmoP/2PahF9iA5sJtLP4WmqElZm2
+/QkoGkfiAboF7Q5qSLsLW0qKk018IhTdDwB0v2B05md9DI+bRjMg//1pnsgY5MPj
+AADXnppQKgoaYLBF1k3MrzVeAOJKZ5pio2pVdeWcpkU75ZEXFkN0yG+o4oKJkVIA
+RVWtVRkzeAkH4GlU3a0s0rmRgJoYfAWD023IYwlCSvFeSzAEltfvMyMz6Lc6H4re
+XoZO0A4Vn/t2iw7QlPJdjVsczTQIAf2Y7EElTQJzFiPhV+ZN2W53Adj3I0eVFQeS
++uifLPr1MsCfYVv/VPwLazlqoVhydq/CuKKfMfbL7YZIHNVKGchIqjpIV6qyAZWG
+DGTktYShxKc0TVDOzqYt8o17MuV1x4i7pBY2OCznpbbWYZmVB4L9DmJ5YSh8xv0/
+nbJ6SjY8z43atf/dsxi3QkB5U2ivugI6GzZi0hXViKQDgyy7lH32EbVm4UzPWqoF
+e5rrK01dNdV7ufXcCKRpaxl0dSFfJ5Xo8l3TBnAyMsUI5as+hKYDJLz8Yyb7A7wi
+qNfbNaxH+4HL2lAdcQkxWonN6y3Ch76YHOw1vBxzkVnXDZHZMEHu1QeMfnke3cMO
+AXBboK4HWzM8Ez76Ur92e/C+Uxncv3ZwpEWC5u8sfM5bLgxsvvvfL4QS8OKE661u
+fpVl/Rs8Dfjt7hc7zgZ4
+=GVCr
 -----END PGP SIGNATURE-----
diff --git a/www-apps/sugarcrm/metadata.xml b/www-apps/sugarcrm/metadata.xml
index 688f366ec350..4ec56314c581 100644
--- a/www-apps/sugarcrm/metadata.xml
+++ b/www-apps/sugarcrm/metadata.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
-	<email>andreis.vinogradovs@gmail.com</email>
-	<name>Andreis Vinogradovs</name>
-</maintainer>
-<maintainer>
-	<email>maksbotan@gentoo.org</email>
-	<name>Maxim Koltsov</name>
-</maintainer>
-<use>
-	<flag name='json'>Add JSON (JavaScript Object Notation) support</flag>
-</use>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>andreis.vinogradovs@gmail.com</email>
+		<name>Andreis Vinogradovs</name>
+	</maintainer>
+	<maintainer>
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<use>
+		<flag name="json">Add JSON (JavaScript Object Notation) support</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">sugarcrm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/wiliki/Manifest b/www-apps/wiliki/Manifest
index b324c9bcdc60..814185f117b7 100644
--- a/www-apps/wiliki/Manifest
+++ b/www-apps/wiliki/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX wiliki-0.6.1-cgi-gentoo.patch 812 SHA256 2e0f8e5d8a381524ad4e4e1793a2edbe9a925b0f9387fd2c3f8262f3c0165551 SHA512 46f1972f046d07a4bc0f5ce17d57bf6211588128f3b8e0387d13fa3c6d75ea72f8b514955960332de6d4befbd00174965f113ab50fc3cb38202b3c356b052673 WHIRLPOOL ce2e850d10c6bb3228ce7ef819ebc77ec623ac3dcee9c32d69e4d7018292f1a5c5950a2bcd0c2e82e381196962b69b29891b05444e103cb02f3751c76914de4a
 AUX wiliki-po-gentoo.patch 426 SHA256 67f584a529abb63d17810ea5833638ea4d543f50dafae212657174006acbc968 SHA512 0d4eaedff0debe4e964bb4a0a8cdf348b8a4996e4ef403f4e66c8ea57e4b3080c8c33bfb293fe117e86ab3057039da365fdd44349bca26b0319f65a50e6d7cd5 WHIRLPOOL 8f6cc05ea9dc528297346f63f54a7c9c086ec69389f29d11476c02e0dec08b9a463cbe75505010e1f1f03d8b3dc53ac7e524e89b2b0435ab6fd8f389886271d3
 DIST WiLiKi-0.6.1.tgz 123954 SHA256 060b612c09d132932c56be7beadb61abb4bf7d6f25743ba016639e5e40c9254d
 EBUILD wiliki-0.6.1.ebuild 1544 SHA256 4efa968687e589e0a5761e5ea6a55d7ddb297387d78815e8cc16a06eb874d9cc SHA512 8fcc4e19e19cd5d9942e28f85050903eae54f83b33e42eea09686135c2ecd1f6b2508dd310ce129f3c74ea45370fc8ce38d3fde384d78f37e467a8c165f7e0aa WHIRLPOOL f6ffd58ea8d1735569d9a915ba876e8a4570c00690c6a9b779d291a495584e7ea730fa4733bcbd34c66585c0f8c98218cff6aff90575b808083a3c37f7c4d232
 MISC ChangeLog 550 SHA256 34bd1697bd09184712042fc23d1034678a3f70f951f8479f2c1293c33962941e SHA512 845452519602d7cf5af8058e9dca47cb52b7b66ada29868282fb1682a8c6c9002304dad0343a8825a15c8eebcb69302847dd61c5ac9ed5e803b88d7d37e72ee0 WHIRLPOOL 64730a9a5234e1edc91f822b04411cc3afeaabe7aa744f6034e62c3d9253c7e251ee03df8b97c29da8cf0049e1df3dafb3fcd9c6f0b58719f9b2fdcfa0d1a9a7
-MISC metadata.xml 521 SHA256 062c6a2d27bd99378b63a8b2de213928898043b3d2c7559e676b490aca55577c SHA512 e390637b306fe3d8addfdd900dcce47893aa7c9fd7cd1d2c153a19b414207e75b594c7d7a2e43ee2534ce1de470c0eb78535fdcd9a098004ac2056c155d01075 WHIRLPOOL 0447dd347d9463e8fdee03a1abbd033c122eece0e94fdd6e3f7d0406f2eaa3c60099f47e9c46adcf411f4e6b1832a5476eebeb63a967f00159882882ba636f42
+MISC metadata.xml 597 SHA256 4a1dca2b1127be81465fda2c3f8c19a7b3e6364d41d1c5bd04b4a2b26bb78afb SHA512 c2276a227766d63ef9a60b1f60dd32a2f2179747aeb1eeeb91e57e66ce57f5affc2d62e53faeeb69db861a5461768e855f6721d8a918ca83f1fc2678b7e8795e WHIRLPOOL 29a85558f0aa1a4cadd312d9a0df04cd55b941692f32ce8082781de89a9ead3c19f5ace7deaa60b8020c0dff8543df8493ac0d56eb31645e21ceaf9638d0cc41
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn0v0ACgkQcaHudmEf86qBcwCdHs2r/KAIIH71GF0DGRsgtqNV
-C7cAn1e9qUDQn4/uxKB4QU3wOHNyKJyO
-=AiiB
+iQJ8BAEBCgBmBQJVfy79XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiT08QAKyKTOg7MUl6aNaFmjCTvyQl
+rmmBMmmVfSP8EJBeizy2bD/2UyaSqys9gMCgq2s61Y/Ab7rtedOOqZCMpibL0C7E
+g5/o8RRFATZHaKjMco/PXiFn9cCVmO1+8jN/GkSpt3TOF5fuvf5yo8Rndzd0KGiP
+enOsY7iOEqz7ZwG6eaIFKp72jKMSoPEHU7R0BuUhMu/hLCXw5gzVGUmHQXcs6aUC
+TNlgACxB1qwGF3LwxloFG9XRucxb/TCnO2lwKm1905j49oqf9LCxyTAuqCJVxFZG
+276eZET6CqU4zQKFP7GYwtdjUpJ22H8gqs0cEjbXRP071lxwr3xQhr0n3lRXdSDp
+uxn7RjuPXIFUc/iJyeqWkiuEjif2bIDfNYIQAfRM0W/l/P/Gd4P7mqWYY2PzoAOw
+awJn4R07WUowfJan3Ysu1hRZTxmOrEtNverJpklM3b8QspCIZyd2M2AhIYVq3Ldr
+BgVDM2mphxDTz+alnCWel63WNY3CQ7W455/MQ/JZlpi522YAVDv9aOWlgaHtWbpo
+xXnXJhStHdW/RnHDDS5JX1eCmMqxOGYv6DslN3+99uUxj1++52KJHXUNSQ/pY8kC
+6gYPHczG9owo626TG0B1P3AZvOceidbNAChqBVhYq96BmXxeE5Bb7Uk8VFUwpfCN
+YEwVBm9iCXv8jGmm3Kad
+=mUTm
 -----END PGP SIGNATURE-----
diff --git a/www-apps/wiliki/metadata.xml b/www-apps/wiliki/metadata.xml
index 74704914c0f5..81aa0dcdd197 100644
--- a/www-apps/wiliki/metadata.xml
+++ b/www-apps/wiliki/metadata.xml
@@ -12,4 +12,7 @@
 
 	http://practical-scheme.net/wiliki/
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">wiliki</remote-id>
+	</upstream>
 </pkgmetadata>