Updating remote-id in metadata.xml

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

20 files changed, 270 insertions, 144 deletions

diff --git a/net-firewall/arptables/Manifest b/net-firewall/arptables/Manifest
index a9959322be32..636d79998eca 100644
--- a/net-firewall/arptables/Manifest
+++ b/net-firewall/arptables/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX arptables-0.0.3.4-arptables_save.patch 893 SHA256 af4559f04a3bbf4f5d40237658871e3cc2f57a6a6ccfdc9d995aa3a0db358770 SHA512 eb0c76d754a5370ab5967e4fcc3544d9dd72f16692c50a399177da57600eb28d4fe9bed5f510b6f23f18db3775433b399b09c679275b93c3fbabc77d81f550b1 WHIRLPOOL 8c19705b95749de2f85b0b6a31677e764162b0ea68ef1f64173009cec642c7a6dcd90507652ab8084d58659ad8815400be55a4f5b419b3e7b0c8ca383fbdc4c7
 AUX arptables-0.0.3.4-ldflags.patch 372 SHA256 76a224ca0c93722f299e5309d708fd69a253edf496c1bfc87be6a55c6d61a55f SHA512 7620d7f16c0a2d25070f32222935db49d2a8fd675612af72b5bea18a6b0db42cf30f4a854f2f5c2f1185e1fd5f7780ddd3e2d7d4eb335ddf24a53318f490bd06 WHIRLPOOL a3fb169227cb73dcf354ef5127e2d26ea50850eb7f9fb610b914954c28a1a1fce12566ff794a30a4b1b44550c26ea1fd9e7a3aee17c41f0e586ee7c445cd1456
 AUX arptables-0.0.3.4-manpage.patch 447 SHA256 b4d9014f2c1619dfb23e7d992b94ca94ff3e7d34a1e044d978a79c0d65e39c25 SHA512 72860d0f7b33e42bdfe1470399391eb64a3d5543b6b071aab1c9c428f7e56e7a0f115d82c1f5a57f5d324a13b1d58a23adc8a656a8c4f1d4a71a5d0810b5802f WHIRLPOOL 9b4c49e63b38f9d123e74957c365023edddd93f22dae181ba379785795f24293f0a827d8df65b089536ec1b65950d87f176b009a78100aeeb4600eb55ebbf153
@@ -5,4 +8,23 @@ AUX arptables-0.0.3.4-type.patch 935 SHA256 70c48ecef90b4509859c8e200f5155a93353
 DIST arptables-v0.0.3-4.tar.gz 44335 SHA256 e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928
 EBUILD arptables-0.0.3.4-r2.ebuild 1138 SHA256 fee7f4508426b1e883bc359fffe45505ad2cf934957b7d01abe81880ab046cd1 SHA512 8a9953f8234068b8b8f0aebce602e8a8eae172b7f9d86a39d0fa12a6e66bdacd40a9e5c2d9406ba9fde9888add22a665a64a402bd2d5ac30e93ea8551152732a WHIRLPOOL 641086dff7380472f2754cec99aeceb024da9b86c6ffc1c6d8f9fdd73bd7bf40c878742e84cce9f7047fd38237a4d1ee9c128b7675594446d95ceef15eb1e9ac
 MISC ChangeLog 3523 SHA256 05c93ef906e3b5485c2e416fec98c37e2dda8cc392373c2ccdbc912b0b7a78a5 SHA512 ba6f3b72b12b341c66b4c19e36fad78eea446bf43e9d3737eca36543cfa80c75cc8ada52090a9ed64a91bdb439ad7c85f5cb19fb2cf7ef203546457dce3baa75 WHIRLPOOL 1b9ab576b1534481a8bb3fd399d70e8dd5aea6aaecdf69570366497b3f7aad40c87d2756d430acd67fd256da3fbd0bbed4601f44b171b16b2bbc96c4bb253b71
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 243 SHA256 af3b5b23fd8347df56a35fa516de41d92240dbdf98a87a4b015788bb3e5c8818 SHA512 10f28e75ef7873ffea378152e8fc7c03ed68b4b9db8484e9e2b5b8af957c7d481cf6fd0f9d4a1a4bfe8a4ce89c913ba96669444eb4302bd5959c083753d4f251 WHIRLPOOL 006dcec34e3963843984e73a8853ef007372259329ba2bd6020319849b729f436c347fb03487d05ad83f105a6bf6b82bed335396db257a5607dd212b5d35cf6b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfwqeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiD3UP/3GhTJBFB01QNAzZ/4UkfzQB
+KAEzEJTNPowOT//+rI9CQCGEk+kA0sE90IPKpm+Yd+UsxK/lf1TvNpJ6XQY1Sccu
+tMAUWJd/xBrW2cXQKPE5jgr8mNFi+NE7BR+3gjAObjCqrOBt//wkjzJCcQDUXU6a
++AdjGIEbajwL+K4U6tC/3y4x3weXZaMbVMl3llbv2AXBeq/MuSVHYnkzvcx5s6dz
+ObB0ahHIe1+vnPZ2AwN2B85CPl0BKHNe6ZgCfljuTA8dprm9lRFrFQqZblFqvpqu
+AHE5Q9KpCYCHhAmj0KC7TBrfdrLCtOI9dOYEjVnUQc3CJPIyzZdFrA+5nGKYS3HK
+CKbytVtIfQvCVH5A9FBCuO0XXXzkMJomE85qHKen4bLtXjgRvCdKfxly07jwpDP5
+cCWP4gL7Rokml2gCfraMhHIH9+BQlovdo6BH9o2KPBHBCC8fySXbVBuwxWJwFNcE
+wDciRuaYw4GQl8pDiX4m5vNkHY3XZ97RGyodedZuK7cM3zSocSkFWapfllHNjVSm
+98j37y3GPBWzrUVmnKIHk7DYxp5k2pbjux05zBnzBOv1xt0YPYLi1pZdyHoe+/tv
+/dKixx7P8uNgAhPDFD3BqUTPEqPy1SHfl++pJ1mNYzbdjCzQWBnOtQqJmGO7AIGk
+0Ph86my5x7BE1bVldpAa
+=Uqi+
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/arptables/metadata.xml b/net-firewall/arptables/metadata.xml
index 96a2d586367d..23b2d799bbe8 100644
--- a/net-firewall/arptables/metadata.xml
+++ b/net-firewall/arptables/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>base-system</herd>
+	<herd>base-system</herd>
+	<upstream>
+		<remote-id type="sourceforge">ebtables</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-firewall/dshieldpy/Manifest b/net-firewall/dshieldpy/Manifest
index cdbc8b688465..c537eaed0762 100644
--- a/net-firewall/dshieldpy/Manifest
+++ b/net-firewall/dshieldpy/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST dshieldpy-3.2.tar.gz 28754 SHA256 c7fe2bcbf250e86af30b5ddc294da0c1508b82f90dfc57c5991c1330c350db8b
 EBUILD dshieldpy-3.2-r1.ebuild 697 SHA256 24a48e536ec612e3537dbb40a86d80c95b9836f1a8cac109e16406b2b8ca1217 SHA512 37c6174aca0c39ce4f43bdb1e9f6b2218b629111f5b347304b516c1151e23d89fb3faed2528cdaff6eeb1e80a796052c9f294bbc4a881dad3934790b61d790e1 WHIRLPOOL 69e239dd8f9489959a15ed40679134e530133f7ea087c2e7fe20e09112b387f9dd0453f7d8865d190f76395a4c63e75694a944faa96734f434bef131ba74d63c
 MISC ChangeLog 1341 SHA256 73ebc9222ba40c134b2c5336913b4f954558af9927b9f2cf6e45df9df3232ae9 SHA512 4e6dd3fe0099f53c4b1dceae0efdd34b2214611c2c70caa32b13b72ddf2138478f9700dae42fcf324d33ef8de6f5f96d0a9ed6a547c5c5edb6d33a4084a33522 WHIRLPOOL f8637bc7d3e2ddad6a25abd974f0ae2ace87941397108fd3b7f81ed9d9bd331873edc98bbcb7c0bdb6d3ceab490edbbfcf65174fa6e6fe7477f2fa92a5515720
-MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb
+MISC metadata.xml 293 SHA256 ea51ab6e2dfada9ec71a48a116737f313c1b982653b6105ba6a327b46777cc7a SHA512 40b2a653b4ca27194fda1518112d3c84a0bc86a26d5918b8bc6fbfdae457665b0a5192668d9fd122e66d315e1ccf193fc3678958dd5258884838eac789faba45 WHIRLPOOL b3d6814c12f67cd5db1306a9ba9e07caf96cf84c65bfd029d03f751a9314a8d74418666fcb21f5202eb2da95418abd3dcc54213c95264f6762baa036654efb73
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJR3DXOAAoJEMbwO6tnXQ0spfwH/iVJ0eg7QxEX2IQP/2ztEYhp
-u1Xwzrqc8XrCwgMFjSETxEC6Y3v+RFnbpdpQEsI+6k4adEfj9UZ1f5gbK7XQ8Z2V
-EF5Vq1GriGgqNcIWQXp0327WPzGAYg5Y2QINpXD4gPPrrnmoH36zH0o1k516bB3j
-+Gs/IUVST7cgG9q1jdVnNxNAzYVnMkT/exZghFRcofDhw2sUVobMaIr7D+P2YEL2
-oLbUSh5xNCeiCHNsFAZGo98sI+d4GQcFJBdFSKYYz/tWM0e0yt3ajnZYzIO7pA2v
-XGRN22nCKTTEBfx+L6V6EYEl7Xv0DiPTjqcOn28x+Qi6BpLc+kRpe4YOeVnJ/u0=
-=l3Yz
+iQJ8BAEBCgBmBQJVfwqpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiFs8QALZZhF07QyyiX3PdOO2rRF8i
+8Wr/1PHZxcXzbiIbOPdPvOY640js9YKQIlqA2AvH3VysHA9FbRuS7hk6PrQyOBUF
+7Am+6FbpQxvQcrn2PDMlMkLEvxka0TrnNMdGmoIzgbM0DmJL84iXA+XttWXeb6UX
+7zDN1gnzaLuS97xaR6rWfxz60LBW/rIWlAHjfaBzDEGOJS4OfntKQ7Bxl2L/3NCl
+j+dveKIo+9YvN2HNpSjppT0LlEImJvCN2awgDtF1ucOGVbuzKbmdXswCM/0Lz+el
+LbVNVo3+gBFHubJXjCmmEQjwNrNCgVDwa8DCyvp6n2pVcDHP/5jciaVvEtdTe/j6
+ic7rncz7jpg5GaLuXkfbdewuIom7zrZV7/2kJCykqa3qNK5tUn3ihqfytE08jKuW
+OYtwsIBygUY+4vh0KtrYiTeKYxocxjvSvKU648VhMIvtdN04q/Gj4JXI/9PM4/W/
+fUq8KFirPcYX3og355vwnA19IZf2UhnfK04XiEy+TacwUExF/rPVBhnR+PBXax9d
+sCJGWH1UaUnBb4IsyEZlpHI1uTc/pEAoPVt0FBNzjHw4nxcxiJHxmlvp4qhm8sFG
+oOCgcF3t/ezo+jo/pe94Qndz8NeWZibXQXUljVxC65EkS54+pAYVZHc3+r4TjVPC
+WtWLNo8EyY6EaPpxSVMn
+=aKMW
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/dshieldpy/metadata.xml b/net-firewall/dshieldpy/metadata.xml
index d9cd2cad66c2..798fd62f4e36 100644
--- a/net-firewall/dshieldpy/metadata.xml
+++ b/net-firewall/dshieldpy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">dshieldpy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-firewall/ebtables/Manifest b/net-firewall/ebtables/Manifest
index 8217f4770b14..74b6a74756a7 100644
--- a/net-firewall/ebtables/Manifest
+++ b/net-firewall/ebtables/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX ebtables-2.0.8.1-ebt-save.diff 1089 SHA256 b4d7022a616152ca439d2b09f14fda8a3ef479b823c2da44eb0e9e22b256be90 SHA512 904cb936ca6fc39dc4fa6e287ef70df9e1dacbd9dc464f839f25213f5525d4020f819dd893b784c5f611f1185c05ffbaa49423afcd6db2ef328950408a07e6a7 WHIRLPOOL df0664bc20dcd36bf640c8c88dea1e7d17b55c686403bceb77f5416b95ce0e2fc3292755e5986822b794628fc31aff25f7dab4d70d742fc93e78bac9fcdea4b2
 AUX ebtables.confd-r1 288 SHA256 c05a6c1ba6add3881068584074681b04bfb2ad43284d7bdd67f47f3da842de58 SHA512 088308eba077fcec35299c8aaad0492024173504a361c2ba7e29dce106888a78c72818a791f3d3655aed3f6df26a3319c42e2b2c54760cdbad036d46b89b97f3 WHIRLPOOL f6353fcc69beff674227544b36c3e2289f094758b02087d57b44fd0a73d7aa47500592404125bd2570ac2fa0da74aa18138e80c292ff5b21ee1ede13fa1125c4
 AUX ebtables.initd-r1 2109 SHA256 b5436fea0bf5e282a37d92504c8102122446490e6b0be907570fb5ea7cec9274 SHA512 9d6779bd864b1a1dcc414e8a946afe30ddff0298e59c3c31f0930b3d263f9217a640e156c5cbe271be5b2a95cadd7ef3c1aee8b79186ef35b08ba8fc17ac007d WHIRLPOOL ebfe5bd2a5dc1778a5283e70773b4c657da298dd04b5b5d2f845f5a4c634cd2dcf6bd529936d8a4c8b2a4614c05d5be7175551a672bd087eeffdeec136a58b38
@@ -5,4 +8,23 @@ DIST ebtables-v2.0.10-4.tar.gz 103764 SHA256 dc6f7b484f207dc712bfca81645f45120cb
 EBUILD ebtables-2.0.10.4-r1.ebuild 1994 SHA256 bea288286037265d4c2c7ac3214f3aeef55e21923b41be4825ff56cd0ed75bc5 SHA512 8623e485e146a1b2e3abb8a1c5aa6de3fe1854b2e2f17bcdb311ab5163ea07b6abebb0b2cd370bef32f841c2879dbcb6e2b29f332e831de2545b926fdbe35998 WHIRLPOOL 7603da6ac38f4ef406293347855f2a8de44b7fcb75857c995ad131fab5633798b1742e547a2f86a9cedc10a5658cbbd9ad2b2c530a9c756095fb6708cbd6366f
 EBUILD ebtables-2.0.10.4.ebuild 1988 SHA256 c65d4806c320541d264781883591ac83a709b6e48d6be271734eded5817eab30 SHA512 34bd9e0fe6178167e2d383e2701fe4596ce22e4e15deedb26e29830af12a49a8736f2c60480d954efa2c6ebb9241e2e8e9de2a9c106f76a07a56aaa5bb35525c WHIRLPOOL 9ae167dea0186855701baf7e8e734b74bd075dc8e5470bcb39044b97b07a4be59b0938296e065be8286f959d73dec0fc4184e834b6d893fb935fe60efbf0b64f
 MISC ChangeLog 8943 SHA256 d7edb6a0880d5fcdadd33a672f24af11c9cef96b755cbe3dfaca66da2783ad74 SHA512 53e6543413542132e962f63594585e4f727bca471ba43c4a54ca093e196adf3e47ce9e6a6ad6c70df1348e2f3c5bf636c6826a87a6f23e76771a9e225cccce91 WHIRLPOOL 17140ef1391513e37b4c1e30ec665fd30d7d9a3e564d20ece083960bf7941b6f6ced424287788e1aff1a148914a0c390714630b21b9b49c551df2435a60c615e
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 243 SHA256 af3b5b23fd8347df56a35fa516de41d92240dbdf98a87a4b015788bb3e5c8818 SHA512 10f28e75ef7873ffea378152e8fc7c03ed68b4b9db8484e9e2b5b8af957c7d481cf6fd0f9d4a1a4bfe8a4ce89c913ba96669444eb4302bd5959c083753d4f251 WHIRLPOOL 006dcec34e3963843984e73a8853ef007372259329ba2bd6020319849b729f436c347fb03487d05ad83f105a6bf6b82bed335396db257a5607dd212b5d35cf6b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfwqzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmitksP/i7B/qjzIE6bBtS0Twq7Wv+d
+SdlFGSofnEpj7yVQh/Hpur9Azr4cL2ZvOJfRUuOEOx8NLupqU0ai0A22N6RLDpzq
+d/PePmsxFgYef0aQtsf0+NhXZK9w9HFILZ2BQPX3FqSPe77mzG9EbJ/NCFp1LDU8
+H0OIIAsvEBkMZTAZ29tqU8bMZ94AtoCdgO90zkD9Y58gK9ky/B2JXpD/yk/vhY24
+DFTF5YjcRGlD+iLXt97b3IqTi9k4XO/kuI4Z7nv/oKHh7GCIq2Prmel2TQv8+v6i
+bqcqJhVZYKnr7AIW0itxzO6/9y/3djvPMH0CT4wmQpbHOyCPSV2A70rR2HdOAW6k
+juuTNDued1Yk+ZeHwjWsPJqqltV+J7+qqI0bTeaDz3SJ81JOhPMSJ53HErVqkLOj
+kc/bten8YshwIZsMdG1LU9Z2H+MBWGDCH/pFlIXt9OWVX+TYisOd+4kLKd0OeKqW
+xfPn10FD/H0NU0/zexNa+x9eEUKssCf9Oo4bwU8s3ZLTi1gRh/cLJ91Jcrn6vjet
+VFlEJpab8xq1I79XT9fyV+lQAZF1HQJDuPznIfoCFWlCoheSN8+xpeA5grgKAIxo
+YJSsFOO1SZoazxb6J49xPGSV207gBWiXcrQ0pPZU88iaIJn4LgbyHZOk6o+UsRHi
+mWD8s5X7Y/14Vd5ppwsD
+=AhlN
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/ebtables/metadata.xml b/net-firewall/ebtables/metadata.xml
index 96a2d586367d..23b2d799bbe8 100644
--- a/net-firewall/ebtables/metadata.xml
+++ b/net-firewall/ebtables/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>base-system</herd>
+	<herd>base-system</herd>
+	<upstream>
+		<remote-id type="sourceforge">ebtables</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index 5fdde442b694..bcec90aaca83 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX fwbuilder-5.0.0.3568-ldflags.patch 469 SHA256 65f549a65b7b7c605c5a2872baac20ba80c90a2e01c8525fd2e88884798f80cc SHA512 3047ad8ecd868eca28a58b9c124f2c05f7bdc68c08da7017896a13cf77c9ed9d033e227d9c520973174d3551334af26319b31491a4264062be94dd04cd97f372 WHIRLPOOL 4d4dbbaf585efa308ef6b03663606cbad05773cef6073cc3097a785c8616cd873fcc9357c4e770c8269b20442b304fd30994483504b0b09ead58f4792ca72f16
 AUX fwbuilder-5.0.1.3592-gcc47.patch 321 SHA256 c15eac3235980e7bf4824abcf3a1583a7c3053fc7376e44022237e9cf64a07f1 SHA512 13800468ef7958fe811b42833b101d221a5126f13f3191c8d84c8cd7da3e02163e522bf7c87a5c739ef6ab935ab80798e947c2b81fc90168881eec502dd861a8 WHIRLPOOL 1fe6a03dc4377a78be01eb6bc173fdaa84b5e5556184bd339ac79a0230ebfe6c5c049b0e93b48633cdd5ea9126517d34b13cac49b46d5e2160899c9f0515f0e7
 AUX fwbuilder-5.0.1.3592-stdc-format-macros.patch 1684 SHA256 6bb4ac02615247a7102021126eae788e67f9242c11e0b865a27ba2efd33f278f SHA512 ec13849e07683ce6ebc0098f1eae803a232fdde692e46c591a3a7c9cf0fb22d28d9de6ff773051089ce75a7dd55cbab63063f0391f6f9960b631c21ec4ca38ef WHIRLPOOL 7871e586a5646bf021a8820435b49ddfe3e43584870b8a9edfdfdd45e41e65c6ca44510ab2d5193976685172ce5c43e05c4207d0726fa16cd0b93487c5020b57
@@ -7,4 +10,23 @@ DIST fwbuilder-5.1.0.3599.tar.gz 7182573 SHA256 452514a1ec0be1416bfca93603e6c89d
 EBUILD fwbuilder-5.0.1.3592-r1.ebuild 1272 SHA256 073c76e2eba9f4c56f1d09c7d8d278456eac78534a36025ccab76b1dbdd10f7f SHA512 bccc268d5115f9cb0d1cf55b26a062bf71d94f1b47e1ff3685265f66726c945556f29defebce37f2612415ec8d0d5fbc847b9c69f0c37a17c86a950a81c558fa WHIRLPOOL 79097574c18feb8373aed31daff9d734b32d931146b41746542ef7f7d586c716f206c07a4a2148523f7e366aac562d954934cfd20ff6fd609ef5e6c90bf25441
 EBUILD fwbuilder-5.1.0.3599.ebuild 1095 SHA256 a9a710210fbae78d45225919b9f85616a6330e7a15afce33c88820a7d3c725a8 SHA512 95d846c27d4f11f2c13658bcd95389c1e60a4b5dec93c86ea8e741e7c79443ed51135a30b1b87e56644f22bc04f287a8e305508d947aa503de84cece9a681664 WHIRLPOOL 8c5704bf7d6563350a8d45db0fbeb85a0ce3eebd11d2a3bad636c1b1696760971d560c3edea92320465af656edd9eb41b5b4689c722c66a98dd1ac9849ab8928
 MISC ChangeLog 20862 SHA256 4248e5ae2e28c214f0489e2bfcf39ef1a26fbc4fea15daea88682aad89bc5c8c SHA512 c5f9ea9c313070a938c90b831e392a4dbf7c98a740c3194046000e92f5dbc68f3f57162af9bb6da7ef21c8cf703914cf88ff1b60b135d53c7abd0bf997611a59 WHIRLPOOL eddd51338384dfca5fd75caf5e81c9f33e573cdb1ff529ca707749bb7843968730c6acce5f261e248ae2ddf6e11e181ef9ea38c62e07bed12366c938166b1623
-MISC metadata.xml 214 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5 SHA512 701b8c51f43f8660d40700929c243a2dae9f19dcbc7b8eca877e20eadc1ae2e0c84f7c7d8c3cb576055c1a49a55e9c759ef469eeda67026ce252d341937f6691 WHIRLPOOL 977119e736e0795137df14faae681f7fa07ba8297a19ef4a7d7b93de7efceaed16f7103f179a762be41b8849c33c535b55d16d2fd0ea795df0525592752e0156
+MISC metadata.xml 293 SHA256 7c92fb56a4c4778003b39bbf1345b348b26b9eefafdfc09eb8f07a02d92100ab SHA512 53f339853b8ca989c2b97fed8dac1d2ef9a813cf1ed67105ea37eae072cb806629ea3352aa93fa6046d1c96a98d5f29335f38a12c076b0068e14b440a6a34bc6 WHIRLPOOL 99aa26a3126f44d5e18e925f10ab60dfacd491ca21c32c42e3cf0f588a4f599832ba5ffeb82c80fba380dcc51d7ccbada6b01de338d0cf0fa16783ed8d68f3c7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfwq/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi7h0P/261A/ToSr1ye1sJ2OnM0TJE
+cC0p6YPAas7C+o2nf2qZxXRQg7nYMb7SIO9cxh8UWD3Ep/HYy3H0qGIodAfv4g0O
+pvwqxMrdK5haqIyH5L/63zd9KFFyiEbfRejk5j6fsy5scGU7J5fAHXNgjL96za2h
+9CefDehKvXCvkdlvvR3iT1e3NpTH91AZVBLDb+qM3noquHNs0Lia1TMihDrzevLm
+DNIWnJwHv1wVH0JtLOcG1W7CRxsGpA1H9B4rkU/1PMgyYizjw1bmbd/uvROBs4WV
+qyYPi1Eje2CrHEqH0zoTT9AHpN5dC5JtDyE6BjVIX+njkQrMwT6cI+YESQW9yWbZ
+9JTopxtf1CUMKReIVBIQgMp5lOrPfIoZg+X9ZJl31qVmPFSgMgSMWQxfVGd8VRla
+oMq9ORPtgJ5/Z1jseTEBwttLACVYmABXVFShBTOm3afVlAkcXKQ/D1uNdVL2DVV7
+vuKasGGXrd7G5iryba28ufRz9DBd3GkH3wEfvyOoy2AobxKDntc4vwIs9XUVxNg9
+GeDQIobUDoq3MEucRM9UffPP2yQETzsE5UpCx+BksXfvn1CzoCRVoLRV2EHijTD3
+/UBaiHz/e1WTFsyiG2Q9xDALrd/8MmVf8k4hm6ySYPrDwgC60XOCRwBFEiGhfG1c
+5ygcSYyVIn1Bb4Cq2BcO
+=2zqr
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/fwbuilder/metadata.xml b/net-firewall/fwbuilder/metadata.xml
index 91f4e72fb544..bfd104c96f2d 100644
--- a/net-firewall/fwbuilder/metadata.xml
+++ b/net-firewall/fwbuilder/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer>
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">fwbuilder</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index 10f249eaf705..375913f5f601 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX fwknopd.confd 434 SHA256 52db8e2ca8421050b5da395101a8ccd49852baf40d6be9aaa70d78022813415a SHA512 2a52201db31d03391018c419f9be9f10fbafda4e6ac3d8c81368ce6bc2bad1540e5fe71022ae3dbce7549a830ace5e6e600489899f8b48619b43680a2b0ca775 WHIRLPOOL 7bcd0c13252c1c04fea5e7e88d79ab3624c47ffd3457c67714018ca1f58306b72ab3e6f5a299ece2ebacdcc6d7b8f192fbb51e9687dbe5f553ed3014b2d41f88
 AUX fwknopd.init 2825 SHA256 bce868aef957617a5d8ccb334866bf0e7d4dee482b6969ce455305415c38d2df SHA512 9e264e5ba5cd9df75b0c9157c2e2f8be345fc43ae5bd43be330c56e99607884b9a291dca6dce89cb617d607ae86d6465491dd3ff286320716896cad897fb6114 WHIRLPOOL 577baa8ca3519e075ebff3a9632788b5d9a23970f2b711cefca9e03ce5ea8fd8182500cd1652f3283c6c766b71db805a36887756befa0ac87d3380164c5c5f41
@@ -7,13 +7,23 @@ AUX fwknopd.tmpfiles.conf 31 SHA256 ba9eed2ec8f4230ab2070865a829e0da290761e93a09
 DIST fwknop-2.6.6.tar.gz 2433846 SHA256 724e986b6bc47d3b6f5ba5c9232e2b411ae8ef4b2e8f7fffd16210c20d3be932 SHA512 ccd25701908a1bc653b59571013f0953ee40c967537b68cfaff48e1eea4fde11402712f70f07db308f7a37cfd49ef8ad11b1535d3012cf32e09cc677673c067f WHIRLPOOL df8025e8a2551e0485473715bc10fef31b373f38293b8f8f678aa7ec03f9fbe353a089cfbdbb783e5972b917313f4a90edfac4557e53bd962df6d8ba0e9fca2e
 EBUILD fwknop-2.6.6.ebuild 2344 SHA256 e892cd7e143c21945e73479f8c2bfc7da78e0bd06f487dc67ec6d07812f0d214 SHA512 54ef8af3bed0d463c9ca9eb452229eba851d79a76724979d6bed64dbfac3dbc14acde329543220160bc7ea22106a3a30ca7be68c5eceb965a304063c94a03d4e WHIRLPOOL a2745f43f874e45230aa0baa1a5e43da7c3f7b5223fc484ec6c399e8cc78d6222776fd6791387628d8699e90c4880099960e7e6e14ec96d3a78c2177fb305828
 MISC ChangeLog 1577 SHA256 ced83879a08acb09c22ab84bd4cba4d4a142f337a2ddeaa43d88a30ce19332df SHA512 482279dd52acaea3481eddac2d86d1ea64a597c5d1cf6d8b473531075772a926772c81630769225c96bd902eaf8c69faef8cf8e17adebafd3202695982c435e1 WHIRLPOOL 7a83bfc951fd21d4ef5919ca81d2dab0e2bd34ac41cee67181cdab39146617a46f5d8d49a55ce3780568e893de583e6a65fa7682e9d0c2d19e186e03e298f965
-MISC metadata.xml 647 SHA256 2caae38bd6cc6a99d740dab2ad1323ecfc6246e76acbf9d36dd5dc37766f70c7 SHA512 639a086617a20fd54690d2a047e99bc445986b773a791926c16d069d3ba8be4081ed24e4c3a5ea9dd0a7cb3cd0e215c6790817df7bfcdfc0db6112472612eade WHIRLPOOL a91f0045cb355289aca56e1938935da029b61491d59fa3314a13fcf224c7412a2756d55759eaa302d0d472a45e662328cbd8b58224f03859ef493e67c6441b74
+MISC metadata.xml 724 SHA256 f02c1043c6f967ceeff7f844373d974a557a372df3bc8d845ed7f919f309f3df SHA512 1aecd2aeb2186c83bef1571cea3d6211ca7b3caf01096cdd45db060ced881f0a5a19f0b870e8f68624760615680c449813c418c0d7e422e3ea2b34b7c3d6974b WHIRLPOOL d1e71e95b9b77a3fef9d308143cd5b5067e0742d9197a734d5dc605e782f1eff2fdaf764ea327c97d02c9b4178c5ea50c3b5601f1279bc8cb2d73a2794eee5ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iKYEAREIAGYFAlVDTX9fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
-OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw0lsgCgz8wy4jowUKhcknjNAaKke/OL
-gtoAn0UVu5owCvjGezeNIalUrrwCJIbk
-=f7Ah
+iQJ8BAEBCgBmBQJVfwrIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiNQQQAKWJst3FJW3uDAlVlfLNeAbd
+5Quev+RiAlf8Y6l3YFcRdT26LQ+sBGge1OhHph9qudqP52BRjPrsQjk1hkbOE2GI
+PeSMe6mGIqWgv1xuOyQ4SLgsgfdUZUpW1bDaTSGIRwXrB5f4wS6jeARcXDLpDNBg
+bv80TsQ1VqwZ4dYy/z9JQOKK/chuwWtYYa1Wemdfu+xR6NQcNJ0gv4JeRBXb65e5
+R8mSGGzt+HyAp/BeFLHeCgh/x/JHag5rqdcPyx4Kb/DC8RFs/B1EgEWWbE9+Zyn2
+v1PI5qNsDb+lIsrhHlbKcsrTbmzraP0HhfiCNiXXVBLH7EXw2QC8gT5+Rfw2oX5y
+TULH/h+lHEgRFFBtwXvTISdAUEoRCpzs/tKbKGNbUtSvjHFB8qJ3Q3qcU/QY/Tr7
+zgqKuA1dmaD5uazMRbMtKcFkUUpLkhFHF1amnOtWqGNosPL1/aBqprw98v/aiQo0
+V8TLnQaJI0iX6IjzBRXS3fLjyqT7ph4kSwt0dxrTDjj/3zRiXFOlV7dUWXFnf3ir
+709mMafCP9doa1oJP84aRdX1ZcN2kc6AgOPbExQtyfmalF9/YrpZcq+eKNpi7l6c
+NCiR+Yq8ecO+ctOmrSRKGEspUOL0U096uS70IxgNzxIOqtSekAAXJcXg/oYc85WO
+itz38F6LUMvYgQEGJWD1
+=hcZf
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/fwknop/metadata.xml b/net-firewall/fwknop/metadata.xml
index b1eafd609fc3..79031c2f7e61 100644
--- a/net-firewall/fwknop/metadata.xml
+++ b/net-firewall/fwknop/metadata.xml
@@ -14,4 +14,7 @@
 		<flag name="extras">Install example apparmor policy</flag>
 		<flag name="udp-server">Build fwknopd with UDP server mode only</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">mrash/fwknop</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index 8f86a6829c82..639aa7ac0847 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX ipsec-tools-0.8.0-sysctl.patch 485 SHA256 eb94a1f77ac9c194e51c2f64b65d9c8f70ff109fdfe77f72801449277b7312f4 SHA512 a2a96cea5c2b451665d54572e471a6c2b4fb72382dcd90bda536aaabf78cdd36d630d5c1fa56372b95066dc7dffd56480d3402fdbe2d56825a017b2cc075ac66 WHIRLPOOL 54c8f99ef2881e0fdf1e1aaf7c7908e9fac31326da9a15df160f81f4b9a8bb7a4db738ebd8c888c9a0bfae7e558c48231cb6413e1e953309a658ad12bfb9e106
 AUX ipsec-tools-def-psk.patch 907 SHA256 15da775a7da892b7e99f0a6e531bdb9f37cc9d81c004f8a439152445f960f656 SHA512 683f168fac390df602ece1608db7f65370749c291e837497fa68fe4f39ddab907d10d67d4c80d583d7f12a1ea0bf02ba98d228e7c6e9267b49a1a8a7e57e99c4 WHIRLPOOL cfe93bc7e71aa627b973b416acfcdf9f9346ef5237726a079a0da3a383f949bb780624482f1f17b93cc43fc786711c4d8d3abc173f600f05d8790639cbed911a
@@ -19,21 +19,23 @@ EBUILD ipsec-tools-0.8.0-r5.ebuild 7714 SHA256 0040584495b6677d1ffd09a81bf13ce23
 EBUILD ipsec-tools-0.8.1-r1.ebuild 7724 SHA256 a9410894408eaec51f7a63b6d346cb2e99eb89b08c2f1e8800fed6dbfcd00103 SHA512 7fcd5a3cd47ba4d842a4a3fe76bd490ffcf567d1c1483d16c6bc211dfd965cad6b3dd0825c512eb76497691b08a40dcf4c6b10947974a93d58bf9fabc2765cee WHIRLPOOL bf2b5ea151651a2d8b6a9a273b58e7b0d38679db56b5a55d2df53f2e463e3b45e4c2767802b42c647e6db67ac4d375cfd784141b3b30f99d19fe4691be4fbb12
 EBUILD ipsec-tools-0.8.2.ebuild 7755 SHA256 6a2a6981f8f4ea36c24418e627da396c7acb51bcc15d929ab143c45e70a1b1a2 SHA512 b9cc8139d86aa5c782820d451ea9560644664c43510cfb7d41e8b337d22839519335fc8d284dc47411bf43eeb35711a2d5451918fc0c2140853d93aacddab479 WHIRLPOOL 61a12480762aa8517014b36125086437ba31f1dc907dd28ca3d13f326de039c6eebb9a1102d9346dded8a7888f6c352f90bf3975db48a8d508ab1ae0e7535fe5
 MISC ChangeLog 20189 SHA256 68e78a4db511385e6e9f55369244b1f26e51e87941502f6595b6e04878638373 SHA512 3a5024f2ced63657428a4dccadbcc6f54a3b5461f82a774ccd5ff6cc744a6fcaeb756265947dbb0e82d36835069e6b4799e04eda17af962aaaa862c49a900f8e WHIRLPOOL f34559c191d125cdf9c631cf026883336e637849d8e39f4f8a4c652b74fdd521c8d06b3a7302ff4ddefeea06b515ac7b3e0b0d75de596d36b98c1f64bebf3012
-MISC metadata.xml 537 SHA256 12de55d6d62b8e91c8996422e33462b5637f9720a5096025752b93906bcbdc40 SHA512 9b26b2cd54e00527201339c3936ac717c57fe596e470d84e0dc0715f778b5797488b6cac61dea83bab61714a23a88e44dbd537bfeeb2b37d285653dcb838fab5 WHIRLPOOL a0dd0b61f957875ca3c50db5aa66470ed493be9c4f002bd165d75b41a8ca51cbcfd2567b4702bf1845b8e0a1ca54239e6ed163098d8b613d1f9f459192acc14e
+MISC metadata.xml 618 SHA256 890f0ea2e68a752a20e01a1ff84868864664f3a167379e13c3cc5fc8d60f87f4 SHA512 5a75dfbb309e497e6c6ea0cb4b2c26e529ffe0b786fe7f9e63e4a9cc6dd0162ca3bd4ceebdb6a8104cfc61c0977d6748abef188f8cb9a2a13d656530479dfbf2 WHIRLPOOL 132dbb2bff95c1f5f2a8cd639aca5298c50c3a4b6e9fe1fcbf00686db7dbeee4c79e03567cbceac3332f2263aa949ab7bd6a4f59d9d14b8584e206313dd056ed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUVe/zAAoJEC7dUkA7aK9HSGEP/30sgpvVIIw02jEf1Be5sDsK
-EtCaiHnHShsrcHpao7E4RbhqfD2ikG82MXkSe9WjAqVUAHCXy2eC5WjjTRdqUbSs
-g84OQWyKU2SQ6PD/VSKkAFOBiLNfL6427Dp7vYnEHOHeqNCON52YrQCchauKs2v/
-gD5jSWNodqlMrS8DLcGUVPbtH7tHZ2XSbNLmyxsZXGoAB3yYcVuXoLq8fNoN6LDb
-vNygun8QZXwON+LULBg8mG43/kbrQuMIdzi/Ga1ex/1aTX9HO7Voxa9Vy7tjjrut
-PdNa02Bj/Npkqw/ZTZutGyalv5O3ty4swSNbJComyfKu1HNazkzf8GYCnsIaQm4r
-AYOlh918DGp37XVynZisXMmTEN1qNGZrE0Vt26CxM2QlCQjeb3wj/tDmH3U5x3Et
-9g7s4y3j5/eNXM57pdq/5G0Gq23ZIXR0MYj9dnFH3tIWtEsq4h6HaSjhrNKm9MDX
-fIp91LlOr55o1zPbAgUw8QF0YRRSkIC6L0gNDYhC2C4YRMq0n07xAuv/dL1wS4vX
-U/P5mKlK3ORBXeIEWwAjMbhqFxfZoAE11Go+VR5ugdRkXYA9tRzToBkgmtiMTGm7
-FBjicdRLcpf1ZX+Kf0fYqnNWru6z9KbtdFXgDRZdwMStcvMrCmNjyddg/jsZHoHB
-A4bU53oSS9eCNJRcK7et
-=GF0G
+iQJ8BAEBCgBmBQJVfwrWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiARkQAKu9urzHOlGHIRuKbxk2HCku
+rhNVh5Gw7nhye/KZWx0JpRa3n3IPpsNuyLICyiXX+u0HX5jiGpitNYPRLZY0fl6J
+XY/lZ6TRQx9++cCjSoujxO8SM4D71ZFE8kBn7SyVyKyuA8xRlNRYlIY7XFmdyxld
+I28aX+a2crSmam05jACSt6aZME1DIBE89csLchskBbXkyqn0hThkHsZUDkPfCChp
+cZ26/mIxS8JrjOXlTIotuWka8MwmnF5LZ6SiEocYlt9ep9TEJEI+ZdkFGOrnytE7
+so0622Wqwp4v886KJrtprrm5ReWcqqpTXZgrAqZd7mcCopTjEanuIeV8nmucMztd
+pSPXks4T7+jRFayOZ7tDO+jj/xY0gqyAwesFkLTtrLbaNweUghs52is+xACsGgCC
+7YO5cHTN/8RNfaKZ6gd3r1xFJsEW2nzmZRpZ/aD0uo5J0HtHZJhhWXRbX+5+pAxo
+HcvUD89Y9UF9Ow7PjOVxTQ/bn2oj2KuotAFFTM1WegatKimXSPvj9JRGBiU3cm8S
+IHtqxGWYzWXWs+z7xdQigRu81P2zUtyvK1dFdq8Zsaa3NtbaSrCvGBIa2Z3y7AGg
+n01uuCOYlv1I6OxrGtRn8lutZJjLh/gKFa1QyhD6wauKSovivu9BHWGdf0P58cEY
+aqEVukXenTUcIcPSVyPi
+=1kD4
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipsec-tools/metadata.xml b/net-firewall/ipsec-tools/metadata.xml
index 6e6434cb2f5e..e71c61508b60 100644
--- a/net-firewall/ipsec-tools/metadata.xml
+++ b/net-firewall/ipsec-tools/metadata.xml
@@ -5,10 +5,13 @@
 		<email>blueness@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='hybrid'>Makes available both mode-cfg and xauth support</flag>
-		<flag name='idea'>Enable support for the IDEA algorithm</flag>
-		<flag name='nat'>Enable NAT-Traversal</flag>
-		<flag name='rc5'>Enable support for the patented RC5 algorithm</flag>
-		<flag name='stats'>Enable statistics reporting</flag>
+		<flag name="hybrid">Makes available both mode-cfg and xauth support</flag>
+		<flag name="idea">Enable support for the IDEA algorithm</flag>
+		<flag name="nat">Enable NAT-Traversal</flag>
+		<flag name="rc5">Enable support for the patented RC5 algorithm</flag>
+		<flag name="stats">Enable statistics reporting</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">ipsec-tools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index 2c34ac6f4acd..fc8a72031176 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,19 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX ipt_netflow-2.0-configure.patch 276 SHA256 cf24753f0075b8015b8832799d993fcc1671ab001033f40f7d0ee12ba469de50 SHA512 cb7b1a690a69eb68ce57d1b216324de3114c01a6bc2ca7e29fece702be62a0f903e6946426c49a8fcd08295466524eb464127655a8742507f999a318319cd3d0 WHIRLPOOL ca45617b098c4e57756b5aeacef9c638444c12cbbd3dea38de457fca9be89592e854c3b9bd70d36250dce4becee28fee94ecd321c857786dc93e92ff5316ab16
 DIST ipt-netflow-2.1.tgz 87872 SHA256 1cc1ee518ecd6c7d8d792ea79c0f69d03ce450c10fefd37f053c43aac92e9931 SHA512 0055ebb1846077f94c1fbf701af8a07a432058c8e86e31c6f420d5c00c96b45012abdcdeef3c5b1ead7d20c7efd51ac65d000b6cb931d878f528f52de0ab9c21 WHIRLPOOL e46ffe69f58293cca0fc26c2ff13ee30e68e2a60a4b198c89fdb24ebc45a4376877285358d4e72019c811d70d0a77194dbc0d46f44c8076923fc626cfe2e7488
 EBUILD ipt_netflow-2.1.ebuild 2162 SHA256 9c358fdf2a9d3f9d6654026980ae510bdea0b55995ded11f119046190ae58f5c SHA512 e907da49dbf323d8feaa408c1c3ac54873d855bb00e671dfc2729706129fb365087ba27f339f58bb018f7b80772c8ea28bbfd0bc06f1a08a79e5ed99e89bdebe WHIRLPOOL 7f0811bf57c277600d1bc8d44ca072bf0ec5ff189451cfca0f50e40dcd3e269901da6c892b50aba2e44b7ac194375895aaaa59833018f279ea1e340ebb3e94f9
 MISC ChangeLog 4882 SHA256 e29b4ebfe6ed7ce109d84f64913ec304b126d8b36764635ba8cd6f04845ca968 SHA512 56603b6a2b5c11a75ee6eedb2fe32e321522175795d78418d625d398ee2822b5791a342cd91b37c28ee7dce4ef100981c8ba1c6dd275e97bd4508de841464d17 WHIRLPOOL 756cb9df38189430c637a229e7d275a89b2ed94c6f6ceea15236c4a2bfff367e393cb5506afca85d038af9f0b5908d319b515333b3812dfca48c465242569312
-MISC metadata.xml 254 SHA256 e52c9cf66790c5d0546903589295bdbd82d8987534c9916670dedbed6b8874b1 SHA512 c83f5af17d5c3f334bae635762f6b62ef5d98c52705b67a8036b60edbdeb7d48f18e8b6b50895c421023023c95423dcfec3fcc5c6c363480ee596729b6be8021 WHIRLPOOL a95c23a3ef77afbadc01d64ac0e1e2c876a322f10454ea64e2ca729c9512fe6eb903e08c99e2a238cc5e4d63f12222c325428928908db78b4ed26dffd1712d65
+MISC metadata.xml 335 SHA256 29e6726a3e1b63fbd8e8bb24a891a52cb7ad1ac9295dcad1af1697c529bc16da SHA512 3e61f52918fd3136271520a8f6627004c34facfcaac9918dfe0cf477effc179076d002d1cc672e05f704eb758e3ea5cf62eb127704c60de7c4b58d303498db27 WHIRLPOOL f257f8fca9ceda1201923e0d87b89060dd6f4624dafd6ed1dfc6b41eb51911c860ed2b4756699c2feb69ec25472c8f7bf67b58fe1ee862f2ea2a93a2f524731d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVWgepAAoJECo/aRed9267ERUH/jFLUYTB+r0Z8KhIIFJn9bN8
-4cFLrGDUH6GOuOZERh+zPwDAwgtLivLLXTFnglraLrjJjoHHwSBsGOMdJAPPbXFi
-dTizB3uBvsO6fRnt+jrMYDI8cL0no+N9W3CqHaVvk1DiPTffb3IKdFnJhdcKtGpp
-YfprrIPSioCU5Zv6ObQoUgyGlZCMZ2PxIxD0LV1h1S0zRi1KlxezRvY1U4fFeN6j
-t22uXCngMfQjSIQqjlexaNZlriR37g3GGXRHAqf7XQO21n4YOl0nRePSoVgR4nY2
-ik1MNwBokl3MiERs89qmRf5HmkAxtZ/lD18+e8uYf6pzdweOgVzbz8pE3QlSrDs=
-=UY7k
+iQJ8BAEBCgBmBQJVfwrgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiU4YP/RGBDJe+3e7MSei0m07AMVG0
+4fTVP5eGo3kAu67yLxwVt7seO4/S3WGxnSRzDMrI10ASl58rPEMQu7hXENCnzmKn
+YzY8oc9m03MuhcVd5M9uc/ri/ZB+6+d3p6uNKijUx9nW6HDMwiZJRdP9O/ApJTTJ
+wIVu9HHZKvs6hmDY16r3oNwOKOUlu8VlzwoWTLHkYhgXuclmi7uqlh2iQy1vQIpg
+oNNz2VgFhTRvAmswbaCD/ql4onjSzkNI4rYczSyP+VIsvbtWV56DGxEQsFpKcgDT
+TYUT9XUy0TR8qHFVWZC/kMvYuzAW4htKbdD5/emkMWVmM9/FL8bUFnfkSqJ05lo8
+3y9mXKvKUW2aDX4wR9HfA9yKu/88FPyROCPNphGKm7L+9PSSGBit6CyjkD2FOHeh
+GmoVZkwDmCFpL5HmsYCEjcOzzJoXHShIT7Gri3UZSjpxQj/nO56TG5X0m3F6QWGn
+M6soQ9w96cxN4GdS/tFysqyEXX/vVtzM1J387a4w5zQYeABulBviFCbTpHLjUwVN
+F0bLLx2MTeSX+l0K9a8bYRoUHFmk9NghzPCTSDN6vmZ7EH2F5w1KRhB4Lq94dVwR
+dFvYKXcNOJaCP39TbOKVTF9ycHjcKLB0JYx51sgMCFzm6Jei8pQwlLxoS0F50MOE
+R8aTJNYxVANEwlTf5vV7
+=p9il
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipt_netflow/metadata.xml b/net-firewall/ipt_netflow/metadata.xml
index 7b47a3a9c4a9..e2cd4f38e85b 100644
--- a/net-firewall/ipt_netflow/metadata.xml
+++ b/net-firewall/ipt_netflow/metadata.xml
@@ -6,4 +6,7 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ipt-netflow</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-firewall/pglinux/Manifest b/net-firewall/pglinux/Manifest
index 978a5cafb0c0..38e27af051ef 100644
--- a/net-firewall/pglinux/Manifest
+++ b/net-firewall/pglinux/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0-pglinux-2.2.2-gentoo-init.patch 1020 SHA256 3b6e3410fcf6354b7dd15c734e26c5751dd7521ad1e78e62ef9ac604300707e3 SHA512 a26a8223f3122e048c4d109afbf4a2ce1433da7de0d4ea495db5add2acab449fe894a62d9c47cf4ea6e254bb57bc2dbd5de9c0a9661eaba0e5ceaf66601d7a04 WHIRLPOOL 25b079ac267547acad06194f97970956168743c79dd221889b607c0eab008b87d8feceff298cac6b40eee114c88d91d898945632f81c5f37eadf29669c8d67b9
 AUX 0-pglinux-2.2.2-systemd.patch 1221 SHA256 e2fdc965f65252299caa8792863f6ff67651099d7e0a2419756c90d69e332a60 SHA512 95905e9969ff48acf037f2e647061ae6562b5598d5f6d622d1530887125aed7bd7ab65a4546bf41032bfcad91dee5677ea389f396c3d1356adcf2ec1ff20cc2d WHIRLPOOL 6717d13c1468bac68dd9cd7970806404b2398ec43473d98a12762e8f266d3c29f0615e39de534d26fadb526325e503e3a31af6f06b98fd989a290c3bba337599
@@ -22,22 +22,23 @@ EBUILD pglinux-2.2.2.ebuild 2372 SHA256 7f6192b748553e8398280c962359689a258ebc28
 EBUILD pglinux-2.2.3.ebuild 2344 SHA256 37099d769307f1e9a3240c35f419a90236e22585f303018cbc0eb1e0ea56e7cd SHA512 4d0bd31d8f380e18f14e5e720afd29cc553317a19493b83dd764ed3745f746a579ca64f1ec77e1544709f3358d079b1e1bc4dc3fbca55586e093ad6030262c6a WHIRLPOOL 397ac17cda123907da811c84315beecb0ee4508d260a3fa265465b4a6c041698ebd310b286854d408fe9c9cbe51cedf5b187f93c7bd9799b91180183fae6c928
 EBUILD pglinux-2.2.4.ebuild 2344 SHA256 2071767c8fe8356cc3b69291f59d0bffcc0bfa0bdbc257f137ee108d2f634d81 SHA512 079420182f64ebc76bf40e55eac49144a7fbb21537a681401b2a71fde84ada0a95e8d3f01414e9be01ddb06be3a0778256e03dad86d8604f6f11d45d21fd4236 WHIRLPOOL 6b5bb2629fde29271a20e742625c17d4c8e2665193d1c3d6f7c3a611f97f08237a9ff30f9d194d884c2704e1499dda27f5b6f913d636e01f8ab6cf266d388852
 MISC ChangeLog 3668 SHA256 cf247c113d334dd230fd44602a780bd2b2b237edabfabce07243879539e6f46c SHA512 edf54b955f83610f16b49a4ddb0bf683f280627515ed83ec0bd33bac584fdc70ac9e46f3514d725131ddf20071d80bc3fc9f0c80996bdfa3840db7bb805ed256 WHIRLPOOL 96bdd353e8a30873c73e8dd7a58e90b0947ace53129f181ddb85d38c6e142a2ea322a3c328a6fc55f2531ac87a5bf1822b29c918731f08caccb8513c0c4a0ea6
-MISC metadata.xml 915 SHA256 0ef1b7936761cd46bb7ee814cf32008f027e70dde530864381406ab53622c038 SHA512 ae6f613e286cb8df3bdfff0657849a449ba97740155bd956894f436bb459293163f59414c76ad17e2d118a8cd929701c1e5f7ad946f63d5b13c6d6fd99c47936 WHIRLPOOL 69abacd370b80648b2cf320a107bb0804a2e6c0d6a041ae5eb0502bb5267e1db79f0b7efbeea48105ca04b19f9c401ce9e78e8e8ff6059fb90776b383bc611e7
+MISC metadata.xml 949 SHA256 95a133c94da3c38ee0af6bde0bc223be3cfcc898d93cf155711ad867f6103596 SHA512 97d2f5979e4cd5f7ed1601a0faf83eaf31c8e2b8670bb4ea49eef4bdc2a75cacccf54dddba03849b6117904771d6018010769a29d5a444ff6ca557efcc5064bb WHIRLPOOL a2ec82ed04e18d6103f78f78d0db15f66443f6f4696d606ce3ab8505ed27f7f495a1ec11570222ec2ceee9ef1738e04bf4bf44006f6505012f53bd758b396d33
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJVcKFPRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7II5EAC1N0aUWbaqPMU4w2S4tKajYa//KNK8wGa7tAMcrCN6+TZlmkXkzc1isfo9
-ajVAFIHhjgZAPR1SnYnv02V6WxS7Sz40PavE/OL+oNfj4NmdIJP5kUymzxWvKUyB
-9vy2Bf8np4RPnjnD/TisFCwNXJ4F5czDp4WkPci/8Wb9xQoJxVMEBL8u/vwUGdFo
-Npa3iwB6U+W17Y41JNqT9uOl5uXzTZQOLg+b0vDapIKkG/N1xI9rgm5ZuiQEgDNJ
-zvRLqT+ZrxpePVpU0iQ9uO3XLb4heJLFrM6oZ5tY8hIi5f5vP9X4u52UBS/+/LIE
-6r8ls7Gb3FqgyDa3vsbTcFvTn4zLvppHhd3XL99RyM2hJChkN/Uk6NYMFPDujSJD
-kWP28HbqpOYNUqVhL40MbdUo+z/uj0JSyCc0+51RL7nklliAzf5JLdqUFVKKuU6n
-WyjGM6rQcw2PLVvg3VjF3LXzrm4u2S8VwlAANsblKiGvK2oO/bHsj/bYuaAXkz1L
-P/v3tnwD7byPjqxcg0kBYLEuDlnz6tAZFxM+SXOJXUkhYdG1hdgIhYMqRxWqsi1y
-vXjy0j3MQlN7+6qVQcCqrNwl0h6P5u5Zi83eLAB7Vd8mEoybqzaAgHJSwbJazQbC
-M4VkssLcq4s2maWMWcWDOL5Iu1MNe2dRTB+FBWRCvF/vVLHUzQ==
-=06r0
+iQJ8BAEBCgBmBQJVfwrpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi3zEQAJGh+DbQ0Gu0GGjDU1tUdLK0
+nT49KJXXFWDG1FH2WvDLoh1qDLXJ0TQK9J98OJxJ0CPpzC3svMm2OulLnrAlubHO
+0F/liyzm4/Rv5NzerTiP/avWg1npwvoJDEXQojICmR0/TwwNJduaej/L8STk2W2U
+MEM/k7P2qCHGwh7XMYTFRmv5pxiRHyjRMBLmc3KnmpNeIqRVMiy4BMwFLxUMcfUm
+xknyCUIB7t6Tmo1ccax+2X/Tu3QYQxi293Okoa0oVyxgk5p1MPne+0dMk/a4HnS2
+YTAC5LxFMM0jFFlQgAy9b71ba7CUj9J3LgXHEMhxWXp8oVvlqzvVgaTpW0j3PhtD
+uSVPhqzgHkKfiRQ7yIgS41SiNJ3IOCpQX1HYtUe7EbzkbOvIMn0nRXB4VkFYu4bn
+mcX2/lc2FP99d4+xY+o0ADlTfQOn9vw13m8cLTrG03h6XKVt91L/5nsBXyZwI6/U
+9i0czMFck8EDZqW7pxSxHq9/RbiLPa4jVYQlJFIP8LN7+XmN+MfmDw2Y6yWLezlU
+ANmScRajYqi0/Onj7549r7Ltm8562zMVi0Ryw+f7dWS5h8SvA4b89b9EmD3WyilZ
+ECFTP2lN3XcFY4+PkWabtmQ+ooRDpkgpgT+lp9GSwwMkIPNMqYQEWeBsHZAZ7j0P
+0TiZZ8mvLnV3zubL2vAy
+=C+hG
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/pglinux/metadata.xml b/net-firewall/pglinux/metadata.xml
index a401247990f2..6e64606e9405 100644
--- a/net-firewall/pglinux/metadata.xml
+++ b/net-firewall/pglinux/metadata.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">

-<pkgmetadata>

-	<maintainer>

-		<email>hasufell@gentoo.org</email>

-		<name>Julian Ospald</name>

-	</maintainer>

-	<upstream>

-		<changelog>https://sourceforge.net/news/?group_id=131687</changelog>

-		<doc lang="en">https://sourceforge.net/projects/peerguardian/support</doc>

-		<bugs-to>https://sourceforge.net/tracker/?group_id=131687</bugs-to>

-	</upstream>

-	<use>

-		<flag name="cron">Install cron script</flag>

-		<flag name="logrotate">Install logrotate.d file</flag>

-	</use>

-	<longdescription lang="en">

-	PeerGuardian Linux (pgl) is a privacy oriented firewall application. It blocks

-	connections to and from hosts specified in huge blocklists (thousands or

-	millions of IP ranges). pgl is based on the Linux kernel netfilter framework

-	and iptables.

-	</longdescription>

-</pkgmetadata>

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<upstream>
+		<changelog>https://sourceforge.net/news/?group_id=131687</changelog>
+		<doc lang="en">https://sourceforge.net/projects/peerguardian/support</doc>
+		<bugs-to>https://sourceforge.net/tracker/?group_id=131687</bugs-to>
+		<remote-id type="sourceforge">peerguardian</remote-id>
+	</upstream>
+	<use>
+		<flag name="cron">Install cron script</flag>
+		<flag name="logrotate">Install logrotate.d file</flag>
+	</use>
+	<longdescription lang="en">
+	PeerGuardian Linux (pgl) is a privacy oriented firewall application. It blocks
+	connections to and from hosts specified in huge blocklists (thousands or
+	millions of IP ranges). pgl is based on the Linux kernel netfilter framework
+	and iptables.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-firewall/ufw/Manifest b/net-firewall/ufw/Manifest
index 76128558ec27..a22103e05707 100644
--- a/net-firewall/ufw/Manifest
+++ b/net-firewall/ufw/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX rsyslog/ufw.logrotate 178 SHA256 02d1a00ca68446fbe056a4c3aede319f77b3262e26092cc04ea46de8923d03f8 SHA512 d381a34b23d8656c316af69c07d49042d6c4def4cea3e51367210bce20681376fd0259a95b6b9403171c5d80732927a8880f3d401e13e6f76b505324eecb146b WHIRLPOOL 10b63f8966ad7ad0894a18216a0102fc8a102b14c8f9fb468a4a8d61ae13b1ec3176c7bb9ffb852f8aaa4ac7874584a8f8f5a2d6e98fa3fb56f5945e9bd99139
 AUX syslog-ng/syslog-ng.example 381 SHA256 70a795c1b20e2cdef38565d74b9de042c6666f860a2fd1b3bdc6f31dd451bc68 SHA512 f48d2487679fe179ea216bb4259affbf5ab4c86725b45942581ada8dac24dd0c978f755182805ff5350ab169972fcee7bb54a6d14df760d4b5f62c485af1e49e WHIRLPOOL 44874c68257b6f9a53e7fd1affc6ccf2492d9ec09a4700a17239fb3e413e2dcf2ede87eafb1e253d965c27a1c5ead36c413c8c84ec3ed55f5cf2191b927aacbe
@@ -16,21 +16,23 @@ DIST ufw-0.34_pre805.tar.gz 335875 SHA256 a78693da04720f9f7eb463447b940eed18c3e2
 EBUILD ufw-0.34_pre805-r1.ebuild 5415 SHA256 132af9edef8c466584198843c61f88d9afde0cfa6eeef3cd9a9aed5d9f29ff89 SHA512 d9458add278ea24028c6d3dec516a98a3f8f480b4ce4158465ee454a9f1a3eae8efd4f9056dfcc88e17e0591add4bf8facf9b4ae407baa72830d93961b18ef6a WHIRLPOOL bf15eefe71b17f26d744ccd5ad272b69ebc7d7b19660a34389bb26f27e0733de83b43910b9315bf8b754afbcc42955710c36b67ffc227620bb6b90b03af7facc
 EBUILD ufw-0.34_pre805-r2.ebuild 5496 SHA256 f146588751b80b503c256a84cf342b08ea05c9c2509d0e37d210e6e902a0be0d SHA512 318e8336e461da3440e402c5cba05e4e21b09fa36e3a511b925b107b406c2eb748b9f3e1702c4b005acb4b49c4b6c843b3e8c86464a92ceff8955ea3b9c652c5 WHIRLPOOL fe8dbf7d6ca70a2375d86587046f7aeda699f013041145a78481912d41471ea61febbe693a5def7fe60a037ffaf05e42ee95d36b1bdb998a2068df55e4e370fe
 MISC ChangeLog 4596 SHA256 6455b96eb0344e530635c59ed1b27be852adce2aa9ff63fb087c100b8706be3a SHA512 ca1fe76a2d6a1e02983f51cd4807360d5cf9c2a4db0ec383fe4cb256e3c0327214dcc67091eb94df6d0786bd8f7d391aa23c2a3096c954c26a1a331fac2fa184 WHIRLPOOL 656dcd650383507ac7a02cba12e67fa5e27502741a029275fb057c0af9efb7228bf2c6afc3da328ad26809c8033db3f034d241faf28dd048d26e0ec3429eb514
-MISC metadata.xml 568 SHA256 0fea99101adbd93b9a644642cf668a7cb5d6392c840b66b4c8aca504985c4033 SHA512 5ac4c205a5df4c0bf11f22d442457c5a50535ebf007fb01bb07e9480f9d854eb053bdd220519e37e0602e1d3ec0043bab7e1865bf9c2e8339b76538719285e96 WHIRLPOOL 122348f9b736392521b10685d03ce3105abec78c8a1378ed1e1b86f9bf6097b1b6be66ce172e1cc92e813c21c8722a4f44e52ee63bfd2c327c9e2c844faf1d13
+MISC metadata.xml 644 SHA256 0af9b2fe3603f8e2d57b2760450cc74c174bdb0857b565dad489bbbb2b020752 SHA512 f64806c296f7557669d5e677c19edebae726941c94e6a10465a717867fa58a9d12e6f1d5a23fd76095eb69aaa4befed1fa981b05cc2e1a53d2b33cef8ae4b424 WHIRLPOOL 747e7e3b1fd538235002acaf14354a2098e6d6e70e727dafeaa476b7dd6ca6fcd54acaa80747a23d998cedbc1d2c78e1f2598c931d3036b40d742157d1367b02
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVV2gyAAoJEL9Txpt2HY4KVCEP+gIM1RQX/VAbZZVQuXWA/M+Q
-gB+8Z/MpCwyqSJqZoc1A0Cr3kLPA6cHG0+33VP79+5hB1AqwlkReta/EHQpvx+Va
-LrjDeYsi5+YrOk3KP6vQJ5tSvVZvsG5JJCDrIMAXAj0K5tJYFzu7z5zbzW8aGgwj
-mBV3Tvz9pvbXtDTay1Huen76B/sgJ2BhrR5YoFxjuGT+6fVmEmejbNmzP3Bofr9M
-Irm6VubstF4jWHrs0xh4degehzCiBkmD5hXPke15wFm5Y8oMS15V6jG4yQxcdMcq
-/+jo8mMNU51nniOHPoOKYcJMbsSQyiaCTqC5Bawzz8WJFed8ZwRX/3dnR3yuMBwF
-1DzDVMeCE0nGQkUBfH8kMTHb8pHaTF/qckhIa/EcnNyAVCSiHmTh+rZEgu9zyif3
-ocNsTZD2V9pFM7QkLRirBrhGq1KZfnA5c/YYfYHRTPW3X4FEiuQ56AtXvit0+TY/
-j4FeA1qz9brFuUnMeSgODh7pUiWr16mxCguosHuKShkbYMOcyeypflOBkSjxvqsL
-mhtF0HYACdURqrTGioklTK4ChrA+8Gx+Wp6C7zRI21pHhVq/1tGArWQ9XGt0ILZh
-5SHPvkxcO3CQsX6Cj0/j96cSBXiSh32o7AKrUIms6Ea+/vw1sdw7MBNNoSiZDWPU
-GbORMwGvB09H8oCMUtLD
-=g0jW
+iQJ8BAEBCgBmBQJVfwr5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi+JMQAJzNQmxbuKyvLWOVtV29T5g/
+HLk6OgBEUamKBVsJn1D5ur7vMF6PhGCSScRbkuaduvVvIrqgFghG0CPrAVuRIscH
+9d6ii2cYIhgBQ3m6p86mFTK9YELyYGpv3NyCW+lBJmV+72Koj+uNCLv+V8oez7ZF
+sRdK8Y8Cpd85IFY7JEWsiklDutgHwY9/OkfrVP7pRj4+6OuB45hrzOg2O/7DFk+1
+GZIYXfexhKe0DxPUMSKHKimREuc/QZPiYGAhlPxLmV5ytfD1CJWEMJ4CBBvGZVI5
+uEUc9GNkUJW2oCRxG4Lj8LKNh4QrgmenuFOlOG507jeFSj4R1C+fVNaibX4CWDmp
+c+HSdxarrZ+9mg60tNjkBD+vZ+Ffl3S5JCJcTEYuc8hL+tU1ryP2zOHAFmUPsq7B
+BLyh6XAH/EzO1ZJ2/yvBWMOHYxedRgoYzBr+DJEigIRtuuTmO+4oCw2A47t8oqfS
+0JIGVUUcdXU14X7mqPI3liJWu4aeIm1qhRrrgvqJn17daQNbVMgju28/u94K7Hgp
+Ggqo/iGlBVQAP5nwNHXq7pa201DlYhqME069BUWk/BjtjMeW5PDikv2hl9TQrNdg
+K72OyHda2LyqTS4KKUUhS/iartT+S/hMfJbZfmNk6/yEjrkPta0WYsQucrqrLKvO
+ZzcCiS1l8RjnGg6TcrfC
+=anLb
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ufw/metadata.xml b/net-firewall/ufw/metadata.xml
index ba895f72e300..afc7f7197388 100644
--- a/net-firewall/ufw/metadata.xml
+++ b/net-firewall/ufw/metadata.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
-	<email>slawomir.nizio@sabayon.org</email>
-	<name>Sławomir Nizio</name>
-</maintainer>
-<longdescription lang="en">
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>slawomir.nizio@sabayon.org</email>
+		<name>Sławomir Nizio</name>
+	</maintainer>
+	<longdescription lang="en">
 	The Uncomplicated Firewall (ufw) is a frontend for iptables and is
 	particularly well-suited for host-based firewalls. It provides a framework
 	for managing netfilter, as well as an easy to use command-line interface for
 	manipulating the firewall.
 </longdescription>
+	<upstream>
+		<remote-id type="launchpad">ufw</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index ac677654cfdc..965c2b77ad0c 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST xtables-addons-1.37.tar.xz 423784 SHA256 2b60a3ae1c71a5b802625b595edceb14ea0be1fb5517e98a9542c5a1157fb7b6
 DIST xtables-addons-1.47.1.tar.xz 323312 SHA256 06535dbefaa7725870750048842b4b53f5a4f8d8b16d5ce61bb4cc28e0b99326 SHA512 4920c9fae1a5b026f48562590b9221d497127197806f52f2eeba269faf8203b3da2e2ab6ff01f273ecac457d19399c42b4d163c18fa405bfe15b54f46478227d WHIRLPOOL 6654fb33c96eb052b94047445682a26f141532c2db5404ec62c29d40741a34ac9138ba1a5de494d7f1b8706a5de425b1188f79fa6195a824d2642ba506f6bdc1
@@ -16,21 +16,23 @@ EBUILD xtables-addons-2.4.ebuild 5086 SHA256 662d4ab7c027f68a8adf6e432c9a2f5270a
 EBUILD xtables-addons-2.5.ebuild 5086 SHA256 b08925a71932ff7d6a727d499eb8d798ce3133d48bedefd6af30ef34afd28b08 SHA512 20545f57dd5afb59a1e03f00cb747f21c4b1008e6fef18fa2b870422dabf59ce5d113b5497dc8bea71b4ef34f125557dc287487294fcfa0e9dae834944d4c11c WHIRLPOOL beee17506e9cb1d5993d17968b56d7c88362322ef0a2d04574135583dcee98b2ba454548380efce733a2b74fc83f27e397c5a314d46efd099568e9d4bca1aa27
 EBUILD xtables-addons-2.6.ebuild 5085 SHA256 c36f9447f8f85f3bf753a9bb7372eb77e3df5456146e8fc0b71af60290f88a7b SHA512 ba7482c66b2ed248a9820dc1274f4db78ea8ef43a5681ae0492c2507dbd71eb3ae2a38e09a94a5dfe9baf78bbaca61ebb702cc43da5222af28cfb479f7ef8af3 WHIRLPOOL 544d69da7c261cbe7284590b66f50cb84f19435d6136f4daeeed69522f45a997b553ed3e80d8e46dd345013160a8680ae91f7d363d8ac169b25da3ac03e70e8e
 MISC ChangeLog 7947 SHA256 443d01ed84a028a0e9962b59f02247e0c9a1ba041253c2b365318b18cdeab7d4 SHA512 bfbe5604a165740b24b0b7060cf6e796081114471b0999aca26b3e9037e3a9ac2fcbc39f2d8b988062df26204fda6a79f71668c70b71ccf1ec3d599e5281ce5c WHIRLPOOL d952f32a66441dbe5d18871690bd49be20dc73e4d4e1ed817129a971fe7ad28b89696441602c2248b16f83adbfe588f74c8fa16b98ca633bd6a062dafb4b459d
-MISC metadata.xml 879 SHA256 f285cbfe58c7e6eb33e8abbf92a14e20826d29020931872fa15b773b7885419e SHA512 a4eb5230ac1d2f39767d694c7ae6a86c4b90c4c64d4e18183677e5086b68e05c65e5f86f5555ef9d972595a8622f5b3893badf0077ee46559fa607986442d4a9 WHIRLPOOL 9ad00e9ca70a6205cfdc30b97526ea9afda17e0b3663a0c0a2ec7564a0837d411f2deb8648c796701cd0dbfebd7a3bd2df405098e746cdd47789ccd85ca3a314
+MISC metadata.xml 974 SHA256 0becb811339695296e9cf179f86485bfc7bf35bba5adc26b867e2e71464d55e9 SHA512 737730dc3d3c34e7d1f188942d9de97bcc358feb246c89d9d1a606e0f6665bcea1c774770861b4477918bbaa410026c44d7b216a3b29826d8fdc134b4bd85996 WHIRLPOOL 673b228688936dec8aa674f7d59d9d949ed0bbc622eae883972002dab546133bd65bb088f1a82c9f971fd75a64e10bc3ddb636ad86dd1a2aca5ac0a591ef8d87
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUKyI/AAoJEJOE+m71LUu6CLQP/3NWaLE/EwbKS86di94DGFxN
-Otr7H4ZyTgxS0FbeneVw54VMXb8YDJykRjTaHXKpUOEUzES1EGmA/MLxJDiR4QNS
-H9edpPBqh6xcl8jKQJThQ6jew/jItLCrlSv7ywpxPdXoxDPagRGqw6d/HzzBk6l/
-qBpYfGgX+SBFuc63T5IzqdYSSgdBL+5TlL07g/QbFF2gIMIOHNeP6kOPOomhMUMA
-kC2zlTBd33ROJApylKMFwy4jdG7lzYFGseIbdzS1sSxWRQJBTz97rNPqiMM+1TsN
-Y2bJz6l0p3d2IJAWkqcFCc1iiSjRQrg5gjUpu82lzEt0DYZJJPDHwrINGv9nYyMq
-QDBEKsWK/cps6iu//M04QDzvdD0yzTXB6THQWxZVB+9Fd0WoaU9pqgRZv68iz+aU
-ns0YhgOZMGJS6ru8vNQtJqmFPh+MJVBUaSZ8HKiKIBlfLam+6eZBjK/RU257VCrt
-GwX9c+0BF9wJdOh3H4TGnau11cpfXQHVujaUTLY3MAQUTDTa3ie2S0QJIfbll7Nq
-NzMd/S3R+0Ix1da/BxZeWv9FcFbcH15YsmGnJ0GPLH7FTTSVW+w8eQ6EsNeB1BPg
-V2Dq9AjahQYn/YF1eaznyQUFvsh6ft8ssGcrEWUpxVt0o9kZqM8D4yqNc6heW+9G
-/XGZ4FZC0Yq3Yk04RSU+
-=JzX+
+iQJ8BAEBCgBmBQJVfwsCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiXm8QAJi5irCEGTwgjyqXnIkfd5oF
+rbAS10rGaDd7roPbY1dE5hbb2F4pdtb7rqctoqNkuNaV/iicermsNodKgMNC9qFw
+IalS/PITKi5LEGxpjE5IrY4sR2TZztmNkVvz0ZgRG5HxGXqaj/13eXJXAdUjfeQZ
+aF7TTba4YL2uYY/l5dIkfcW18WXremTH36MXL/njrbVYJAFIyMUDxX0mmHVGeLZv
+vmVmXSLKVLILPRf+R4ABpGdI4NoEJsuPG5CAXtVbrIMetroYh8VMQWNzsufOgDTI
+SvbTAXks0FCb6UwsFgJKSuLrlxSNapsXKUvhmSbr1Pwi8Lg+8Tg5RLCgS3Grt3B6
+uYdOX252iFFuIoLjbwgKm398d50whEPl13jZSbdt+5XaGGOgh/M5v2hmiKCmnxKi
+4zRDcjRd1tXOlVRQ4iOB6ZjJbh1ai3yt67TQ11JFMrZdv6JEoRjY2AzpFek6/UV5
+1TCJfQMlZ4ADNEsfhOqgAdkyIKvF+rYc0YVCXQrGNAJZK5x14GRWSUKC+4+rkWkI
+jwdWK9CCGLsp044zEyPPsm37wMpz6DXvtvYEc9WohwGkE/7iA71roL7FJOOO8gMe
+4SyO3jX+B72XmYsuFbrrMK/mTdlOmoQGm3DZMYTYKyThEVzRKnpI6AlbNT5cXicZ
+bRzxrowcGDsgHyy2VRBv
+=xZaq
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/xtables-addons/metadata.xml b/net-firewall/xtables-addons/metadata.xml
index 8fc1f4d5dad5..66ec30dcd145 100644
--- a/net-firewall/xtables-addons/metadata.xml
+++ b/net-firewall/xtables-addons/metadata.xml
@@ -1,17 +1,17 @@
 <?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>
-	<description>Co-maintainer, through proxy maintainers</description>
-</maintainer>
-<maintainer>
-	<email>blueness@gentoo.org</email>
-	<name>Anthony G. Basile</name>
-</maintainer>
-<longdescription>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>andreis.vinogradovs@gmail.com</email>
+		<name>Andreis Vinogradovs</name>
+		<description>Co-maintainer, through proxy maintainers</description>
+	</maintainer>
+	<maintainer>
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<longdescription>
 Xtables-addons is the successor to patch-o-matic(-ng). Likewise, it contains
 extensions that were not, or are not yet, accepted in the main kernel/iptables
 packages.
@@ -20,4 +20,7 @@ Xtables-addons is different from patch-o-matic in that you do not have to patch
 or recompile the kernel, sometimes recompiling iptables is also not needed. But
 please see the INSTALL file for the minimum requirements of this package.
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">xtables-addons</remote-id>
+	</upstream>
 </pkgmetadata>