21 files changed, 125 insertions, 112 deletions
diff --git a/net-analyzer/arpwatch/ChangeLog b/net-analyzer/arpwatch/ChangeLog
index d28554803b24..7ce70d96c2d9 100644
--- a/net-analyzer/arpwatch/ChangeLog
+++ b/net-analyzer/arpwatch/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/arpwatch
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/ChangeLog,v 1.63 2012/06/12 02:22:06 zmedico Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/ChangeLog,v 1.64 2013/02/16 12:45:16 pacho Exp $
+
+  16 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+  Cleanup due bug #96436
 
   12 Jun 2012; Zac Medico <zmedico@gentoo.org> arpwatch-2.1.15-r5.ebuild,
   arpwatch-2.1.15-r6.ebuild:
@@ -255,4 +258,3 @@
   08 Jan 2003; Martin Holzer <mholzer@gentoo.org> arpwatch-2.1.11.ebuild files/arpwatch-2.1.11-gentoo.diff files/arpwatch.init files/digest-arpwatch-2.1.11 ChangeLog :
 
   Added initial version. Submitted by asen@warlock.ru in #13483. 
-
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index f0005c1d37d4..edceac4f6daf 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX arpwatch.confd 270 RMD160 040c4ade1f157b38fdb66d8e8cc08e3b6484ef18 SHA1 3b590f1851cbd5d684b6e836757367446fddfaf4 SHA256 bf36f7b717291733787bd00ac22d49dafc251cd50fcc27266d56d51364fd62fa
-AUX arpwatch.initd 1106 RMD160 a9db01d5b2157742d6f9d48c157718e158017cb4 SHA1 8cafd84754f8e32a7fcec4180e79e3b62d4964ec SHA256 c336b18759d188ef6c77e2177fdfbf4ed5c488f04fc2357c556ff406d2eeea1d
-DIST arpwatch-2.1a15.tar.gz 202729 RMD160 a27ee53275dcec3cafb85eb3df2451d42ec32b0c SHA1 9dffaec0f132e5bb7aedfc840c5c67068bfbce69 SHA256 c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898
-DIST arpwatch-patchset-0.4.tbz2 16350 RMD160 9e9ae77ef38591af72687fa7014b4c56fc4c4d2c SHA1 009eaa110fc93b40aa91c838b57b71a071210692 SHA256 f49deed64301078a00881fa9c27bb3a4116b9096cfe880f5a0bcc9913b439a18
-DIST arpwatch-patchset-0.5.tbz2 127740 RMD160 71ff570d0b9a66f8fde46f5b751f0f71f79b3f81 SHA1 4f148a189580389ab809695dfdc603b44b1f0141 SHA256 aa69513ba36cdb9f41862f5f9c47e47d60786d01d302a1e8177f9e1f8aae71d3
-EBUILD arpwatch-2.1.15-r5.ebuild 1780 RMD160 4565c6aecabc30547a94a8e2b1711476f4033728 SHA1 2a0324298843e07f30a8788232e69ff518a05189 SHA256 c5562fa14ec4d2b954b28637d1769be37a4ac608933caf4f9563c3b98411bea9
-EBUILD arpwatch-2.1.15-r6.ebuild 1818 RMD160 4d4b1260e55ffbc9164d5902e21a959e39486518 SHA1 c468f99775b6550ff86c1a9073ffd3ae8fa8580c SHA256 5884cf7dfe041103c3aa310f77f969d3d3ea5171d705c7ca0829c1f40032a3c3
-MISC ChangeLog 9308 RMD160 ac78692e923330f4a36f5fa0bfeceb313e02d852 SHA1 02559bad9a76a827d0bcd506014fdd2055b60c56 SHA256 5261e8d8d86e537df109f3da001176c99fe3dce5a203331f623f030df982e8b5
-MISC metadata.xml 710 RMD160 886aee2e0f5caa3d1c48daf0af7bef106c11a87b SHA1 577dd460a6f15f5ad111b93ce181b449da1f7ae5 SHA256 60196eb6cbbcb6926cba32eadc9350cd4c536f7b2a62936d9100aab2355e0814
+AUX arpwatch.confd 270 SHA256 bf36f7b717291733787bd00ac22d49dafc251cd50fcc27266d56d51364fd62fa SHA512 901375c1031c776f159cc526662e727be41dd9630037a492b718c9cc48d2fb580b22bcdf90a84a02049924e67fb84a2668e3519a7ab24e6c8ad07d20cc5adf41 WHIRLPOOL d6f691d769f2320870061667b241e8504207e1e326ab9c6cdede575f2e34696fc3f722a8038044c500855ff361c7f64aa3a64e3086b2c03665d41cabc1c32c35
+AUX arpwatch.initd 1106 SHA256 c336b18759d188ef6c77e2177fdfbf4ed5c488f04fc2357c556ff406d2eeea1d SHA512 d07475f3a245c6a381cddfd0ca03c3d8cf7075c99150aab3ade3e131726ea1f60973d75ba9d86313f305f77af26057d162caca333baa81133e597cbd40b3d7e3 WHIRLPOOL 53c399f50dd55980d8617f6cabd304d28e2e49d03aceace4a0c13c177d11d347f6f7c87d0b116ab58c37854ea1b2a35e6297f65549b5d1f2b82bd28cdf997649
+DIST arpwatch-2.1a15.tar.gz 202729 SHA256 c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898
+DIST arpwatch-patchset-0.4.tbz2 16350 SHA256 f49deed64301078a00881fa9c27bb3a4116b9096cfe880f5a0bcc9913b439a18
+DIST arpwatch-patchset-0.5.tbz2 127740 SHA256 aa69513ba36cdb9f41862f5f9c47e47d60786d01d302a1e8177f9e1f8aae71d3
+EBUILD arpwatch-2.1.15-r5.ebuild 1780 SHA256 c5562fa14ec4d2b954b28637d1769be37a4ac608933caf4f9563c3b98411bea9 SHA512 f313274e1e7f431779aa87e0fb9161ff041ee0c035f0e06eef344ef2146c9ee2c9bf1e01d6c8c562529de04f2d3992d76c8ed64ca25b43161a4b5a20cb17eb05 WHIRLPOOL 9d4c8f2deb4d73409ce8f56955108f750d6c16b75dce0deb8f1a43d7984e90b81817a99ac4663594a5a4b42a4bda1937bafb0ab0575c0fd593bc57e2ebb8726e
+EBUILD arpwatch-2.1.15-r6.ebuild 1818 SHA256 5884cf7dfe041103c3aa310f77f969d3d3ea5171d705c7ca0829c1f40032a3c3 SHA512 3a05a07c57f21a336e6f9b4e48770656bed4e24c9f1a5c7d8c2df884b333c44089f14e4028905d429053fd9208af897e9bc9ba673ed4493dd62ee16598cc398d WHIRLPOOL f1596833c64186bf789699f8ed3ad2bda1c8afb930d9e2655ceb105d7fa97ef6d2284e385d0e0da1559a38de7ee1ec24134c9d4e05cf8f6e4e26d8fe03acf569
+MISC ChangeLog 9391 SHA256 5635852bfca548259447c6d6a88f2150e848a6d618326dfd9905372865b00b3d SHA512 9498f98b0457b24a4f8236bd5441de4c1effa900121c3dfe69aa71b4117351b59f44ed31ac1c36e7fd108799f54f5f2844a5536ee59af365d3b3ea644c59506c WHIRLPOOL 931f097460a4fdb7a74266c53e2d99cc12896b47d6b2401c5eb022cba7314324503e7d5bf09e3cd619969377a9fe94b7fb749ad341639bcb663ff32cac8c7426
+MISC metadata.xml 621 SHA256 7eb7c51e4a14edc2c6f0715e525e00c7945691aa6a5493d2f0656753d661d0e0 SHA512 045176203bf0e40f3cca410d9d8e834b73b4ab26058b509e36a32d5356e4d6e83c4e3e4d7ef92badffc03bf56e07881e7eae1ae5a233992862d72924970c0ba5 WHIRLPOOL c064ac87901b4586b8adb698b61a2467b7c1546050eb7458a24aab369b9b2a34716b55bf2bb454183342781e746841740bd9461b152961ff110212f66f644782
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/Wp9UACgkQ/ejvha5XGaNiuwCfWREYZgiCd9yNSP7jud8LHNvp
-ylYAnAqjHlY2IfZNWjeMzC23iJHtLt76
-=OdpH
+iEYEAREIAAYFAlEff14ACgkQCaWpQKGI+9QJzgCeN9XDPtiReI6XHCG0wlAVCtmE
+5wYAn2d0nW5EM5TL6c4Eddg0x5UcZlH6
+=9KdM
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/arpwatch/metadata.xml b/net-analyzer/arpwatch/metadata.xml
index 491bce7b2309..4fc697499bf6 100644
--- a/net-analyzer/arpwatch/metadata.xml
+++ b/net-analyzer/arpwatch/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-	<maintainer>
-		<email>pva@gentoo.org</email>
-		<name>Peter Volkov</name>
-	</maintainer>
 	<longdescription lang="en">
 		The arpwatch package contains arpwatch and arpsnmp. Arpwatch and arpsnmp
 		are both network monitoring tools. Both utilities monitor Ethernet or
diff --git a/net-analyzer/cacti-spine/ChangeLog b/net-analyzer/cacti-spine/ChangeLog
index 59acad4fe4ec..f2fc035434a4 100644
--- a/net-analyzer/cacti-spine/ChangeLog
+++ b/net-analyzer/cacti-spine/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/cacti-spine
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/ChangeLog,v 1.35 2012/05/21 19:10:55 xarthisius Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/ChangeLog,v 1.36 2013/02/16 12:45:44 pacho Exp $
+
+  16 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+  Cleanup due bug #96436
 
   21 May 2012; Kacper Kowalik <xarthisius@gentoo.org> cacti-spine-0.8.7g.ebuild,
   cacti-spine-0.8.7h.ebuild, cacti-spine-0.8.7i.ebuild:
@@ -140,4 +143,3 @@
   08 Jan 2008; <pva@gentoo.org> +metadata.xml, +cacti-spine-0.8.7a.ebuild:
   Initial import. Thank you Nathan Sullivan <nathan AT nightsys.net> for
   notification and ebuild, bug #204852.
-
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 8b2759eab887..200839a5016e 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,29 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST cacti-spine-0.8.7g.tar.gz 592801 RMD160 5945f909f4a01d106ec06edce82efde704588c8d SHA1 6f08f2f7734527a08afa5fc071dfaa5b1dbb0a57 SHA256 2735fbc1fc38d31651009d0a8d6ea121b29403d6020b13ba245ab4f3e0f6d561
-DIST cacti-spine-0.8.7h.tar.gz 623334 RMD160 8dc1708029cb778c9f7765ce4186dfe4091df03e SHA1 9970f6abe6799dd64d20988e1b9bd3cb8955e440 SHA256 62f6451445cafc591c78c6bb530f96a8382183e9f5ee4e6bf7f5f3d770030a7c
-DIST cacti-spine-0.8.7i.tar.gz 623811 RMD160 b293f254fd357747342cc3a9eb6e350e8e946e2b SHA1 932f5f6775ca7b4b8d341192da6326847386971b SHA256 94596d8f083666e5c9be12cc364418e31654b8ff29b6837b305009adcad91c6b
-DIST unified_issues.patch 11583 RMD160 53e035a878974a956280b09c25e9744ed09d3a7a SHA1 40400fee9bed6db1b40327019694d244010f3d0a SHA256 5bfc4fe3eeedbab4d32620b6e141b0b6cfe674e76a938c19e13fb1b70e80fa0b
-EBUILD cacti-spine-0.8.7g.ebuild 1730 RMD160 076e4725d1e7d90fdd330071038f18d7a69a1612 SHA1 47df941cebf8309a13bb438fe1f9fe44aef3dc77 SHA256 bfe06684c10dd2f28a8fe74cec57c368faa70a22b983c105cc49b49e6b8a1374
-EBUILD cacti-spine-0.8.7h.ebuild 1587 RMD160 5cf1f5722b3989cbe8b687cfb2a4cde8f67dd835 SHA1 4c302062a0927cfabcad72d1db896615deb7d9e0 SHA256 41ebe9950a815b491e5b004a16c05029e6feeae5bda18048291b96a4231e79dc
-EBUILD cacti-spine-0.8.7i.ebuild 1587 RMD160 bfcd6286c98c8f5dac245edce1886f4cc3ed7a68 SHA1 6bd50b175e2e29946fd24eb82d3fb9897f21437e SHA256 ff55190257c2cd1a42f430f447a6c6d6b840adad1243c2ea4414f36ee46f4984
-MISC ChangeLog 4899 RMD160 e4a81d630b1c1df0d3379dc5caba88d9265f0079 SHA1 1b610061a92d322164ad884d68a7612f6e99332e SHA256 3a9cc42297e30fdb89ebf146a9d9320d710e18b49ffe092b04b82830576603c3
-MISC metadata.xml 795 RMD160 6496692432dfda95180e8d7506af90ebd79b2172 SHA1 2e929eeb09763b10b746c6b0384acd4197051c85 SHA256 a1ee2fa5779e21ff428e18a563360a7d81e383345d867cfa27046614fc18e466
+DIST cacti-spine-0.8.7g.tar.gz 592801 SHA256 2735fbc1fc38d31651009d0a8d6ea121b29403d6020b13ba245ab4f3e0f6d561
+DIST cacti-spine-0.8.7h.tar.gz 623334 SHA256 62f6451445cafc591c78c6bb530f96a8382183e9f5ee4e6bf7f5f3d770030a7c
+DIST cacti-spine-0.8.7i.tar.gz 623811 SHA256 94596d8f083666e5c9be12cc364418e31654b8ff29b6837b305009adcad91c6b
+DIST unified_issues.patch 11583 SHA256 5bfc4fe3eeedbab4d32620b6e141b0b6cfe674e76a938c19e13fb1b70e80fa0b
+EBUILD cacti-spine-0.8.7g.ebuild 1730 SHA256 bfe06684c10dd2f28a8fe74cec57c368faa70a22b983c105cc49b49e6b8a1374 SHA512 8d1e8273725ad9135ca111ea5e4014d4f1bd463bea29d727748ddf4a907d313584779907609f2f39176ee692c4e353a6961778176475b9cc98758f4845470da4 WHIRLPOOL 67a0c7505eb0d8f691ab244123dfe35db975e0b53f7a698daba577becbbf1af8ae9d71040700f97b24c811b35f5ae9b5f6b8b02c3d06395a31bf24f580a9c7fe
+EBUILD cacti-spine-0.8.7h.ebuild 1587 SHA256 41ebe9950a815b491e5b004a16c05029e6feeae5bda18048291b96a4231e79dc SHA512 f6d54c0fe0e8f897c28e522a44e7f5b4bdbec3a8b46b56695a73d56c5c2b6e1ed8ff98177b283859bb8aef45733badb4d5450adabc0bfc5591dbdea20739b302 WHIRLPOOL ef81f2b6d9ceb4a7291a56d961bb86ef31e01e4f9097202e6b4acc3d8ac47e850b86577246888c5688c2b8cad1fb2184be0323890090d83c70c7d724074b85ac
+EBUILD cacti-spine-0.8.7i.ebuild 1587 SHA256 ff55190257c2cd1a42f430f447a6c6d6b840adad1243c2ea4414f36ee46f4984 SHA512 653cbc4baca7e8b5704584eeaa5d3ec45f620b9eefd50a6dbd9f0550956a999bf6ca56df7472c332ee812bed968d9eb09c9ed35c3243d1cbfb6be48d712220cf WHIRLPOOL 20decdee4404bf0ae2ea30729dc4fc29ffb446c41afef5c81f81ae94eb5697a8e3b0a22b65f6986f63151f59fd82c677b03ee2458df431abe4b114faae4f30fe
+MISC ChangeLog 4979 SHA256 7e1006f7f65161875ba8169848b239cc9e67317acb81bd74c12aa03e76a5a1f9 SHA512 b4cb1494e143d26dcbcfb3a51ff3754a8db986830c970540e505caf91cb1cf90187f5bc1ccb52cd27785e23f405c20af06a4ba7208079f95dd61d6c1c8fd4379 WHIRLPOOL 991f83bfc43d671d3fc19359cc56c326dbe1cb95f5b281f9ac4a0444c476827af0fc922cd50d73f7686688ef8a4c20e6a1e500f592ffc07c146826ff06b020cd
+MISC metadata.xml 706 SHA256 f7dd16a29263c7d960912d7eb966f34c2fe7f63777faa53104e61d435c413a0e SHA512 70cbcf12b8e5873bb651f70cc164e163d8dd0625df0a341fc17e93f887103d0f301dcc9ab8cbafd5fe1feb9323a6712a8ca06351a8796767efd356a4f3d67aca WHIRLPOOL f1fcd75ef0d604dd79910ad210351f6b3a968f595c5aadf24261e7ee386295c8357abb1dbd216d195ce96cb310433813dce34cb41eb8575e0bd61c8ed6b1f529
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPupNAAAoJEF0huFKJUZL5lrAP/31DlKz+MWpGV4v322PM2e+m
-jWfEUDwF5twqtEls6Yo5XpuBzwf/3jUycppSMcU7udng335LVFxHR2YAZBRB12UA
-B6AGpBkNoo/PhmiWpjVo2k5dA2jOpi1o+H3mntkLtgunRg3n3t5o8LKL4JzRLEAA
-4zBYATxdWgq43XZ5hgnpjiHXX3GKembDYiIjuojELf27XEYDb3rVqfy8bJrGq40E
-nwzmU0hcW82hG7LjBkcdwzH49k8LkAEdsK3W5VaTapoYfe30v44h0E7oIFVj4wAH
-P6q291CHLvupUSFYBqZDByB99/Xc3SnEDgz1Jsmw50laqaJj+AiuDnj+Kpz+MOqE
-nm96AnI4cKjC4+vKwjqpboEb+UFEp53MBeL797uhFSH1nIpydDEmNX7jiOeaFwOq
-TTUEbHXD9NxQZV9vXfEll6TLY78SDDj+EKEueuq/1u0GZq277MFqAPuxs5PBd79r
-GgkYilnIRrKv270znPWhAwePDZey9SRNK0/2LGCMZ7a11kmYSJN0wfkjJw0/8UPI
-pFik416/fATCduMUyvdXrdZoaal/1VPd9cwoOtDKLRXnbl7ZsDE7sViGQengMTTQ
-+zzDjsG/4wEkudO6/i91j7UR8p25UU7fM8WyNGIyQRVoonwXY00JSoc/Ljh6JZVq
-IOkld+4JGyERYsdTKkbL
-=nI/i
+iEYEAREIAAYFAlEff3kACgkQCaWpQKGI+9R4QACfUa3QL7ZJRrZNzOkceVuiX0xq
+6IkAnRixXN5qUI4E3I0H4Oidc9Kg+UR9
+=CT1w
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/cacti-spine/metadata.xml b/net-analyzer/cacti-spine/metadata.xml
index 171452470699..f63f41b4d8ff 100644
--- a/net-analyzer/cacti-spine/metadata.xml
+++ b/net-analyzer/cacti-spine/metadata.xml
@@ -6,10 +6,6 @@
 		<email>ramereth@gentoo.org</email>
 		<name>Lance Albertson</name>
 	</maintainer>
-	<maintainer>
-		<email>pva@gentoo.org</email>
-		<name>Peter Volkov</name>
-	</maintainer>
 	<longdescription lang="en">
 		Spine (formerly known as Cactid) is a poller for Cacti that primarily
 		strives to be as fast as possible. For this reason it is written in
diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 3ff98b8d8678..7a79af3d6ce2 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/cacti
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.188 2012/01/01 15:12:25 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.189 2013/02/16 12:46:12 pacho Exp $
+
+  16 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+  Cleanup due bug #96436
 
   01 Jan 2012; Raúl Porcel <armin76@gentoo.org> cacti-0.8.7i.ebuild:
   alpha/sparc/x86 stable wrt #394595
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 6b799b40ca3a..70ae5695d4df 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX postinstall-en.txt 2249 RMD160 2703588d7971022699b58b2e5a113ab970124f4d SHA1 8c34cadfe75d1bca0eaaae66a5981f0ab575ea3f SHA256 7879329884e33f84108d5fbed732941c9fd8a53b56db499bfc0bd282bd61b10d
-DIST cacti-0.8.7g.tar.gz 2236916 RMD160 4972f1fe2787925da6a1f0f71990ff4f5e74df7f SHA1 a5a710653e158b1bc950de0a1e2c60ee364bf782 SHA256 d09b3bf54f51bd42b2db0a62521cf6e408716978f75d6509ec56027c49c44585
-DIST cacti-0.8.7h.tar.gz 2249323 RMD160 923492a3f36e5d320570ebfad9b4136acf7b9eb7 SHA1 4311cff2ec8883c013efd0225c73d145bcc1cf00 SHA256 2e3dc330b5b3ee374b2e553650d032441c25831b39ddcf123ef102492f20603c
-DIST cacti-0.8.7i.tar.gz 2250128 RMD160 6163b5fccb850db4d7083419ef5b9116dc4018a2 SHA1 a3fd64b8ced45be95b9cf6154a31038d575baa02 SHA256 89846762b8f4586532ff247ec7331958f5e4a8c3c599ff8aceb53815fbf9d1cb
-DIST data_source_deactivate.patch 510 RMD160 92c634ba94e0e268a6cbfe299de62e4205ddba17 SHA1 27bb624280ad74cbede70da8984fb28b342b5c2b SHA256 52155c5ca38a8df1adcc8a5b4d0bc1b4befa7ede4c56d10dba64cbde2c54042e
-DIST graph_list_view.patch 7636 RMD160 24df29f9e1c6bff6b7dfc6617770eccfa0ec60ba SHA1 80dbfc9fdb206845726102cee529b221592b91d3 SHA256 e43b2cf3c53029880ac16a9b86036d5136ab2de116bfba868fac2abd2ed14778
-DIST html_output.patch 7317 RMD160 2f4e418ae9dd0fea0471fbdb5f899d6308599554 SHA1 f4c98092fbdf894f667be419dd114da47a6abf67 SHA256 276811704d6f4353542461c04a2561721bcc784326feefff460fae45c3849278
-DIST ldap_group_authenication.patch 591 RMD160 8d1a72bf0a0e27d95acd70ec3bdea678b2b356c0 SHA1 7fdedb203493ea139f2590ccd38840e108705ef4 SHA256 413a781c5aaa4c6ce8eb152f1ecbeb87c4efa5623c5b839c9c5103b6db6e0989
-DIST ping.patch 1033 RMD160 32946f8a0fa169fd711a2ff1c292e5022e772211 SHA1 23e5844a311bd5549d71bf784366d7e4969a4f41 SHA256 63c56b55aaf41a5e10908bb8ecffb47f74e11254d7e46223d8d04a9df48eda5e
-DIST poller_interval.patch 5852 RMD160 06a6edbb80c4c05ec00cf17340a68252e8b26b27 SHA1 2764aad8ab9335c105e5aa8e3fb9f80b9a2bcb9d SHA256 64a6748573395956565c9886cc999a92655ad7f5ba62c53b3299d047912d3aaf
-DIST script_server_command_line_parse.patch 3038 RMD160 b87ecd44d0d31ceead87e67447990407d84fbeb5 SHA1 72b35e1b7388062301ed8c8bed99b98dec62bd22 SHA256 40c8ad2dcc6664360ee9941849d7fff1c136e1d942f7ba2a2ea602da20a39e56
-EBUILD cacti-0.8.7g.ebuild 2115 RMD160 da2268f75bbfc9a6ad1fd68be5aa26af0047be7e SHA1 daaa1fee7695ccde4923e0cc9c9ea1a6a39ca208 SHA256 1b221d71f9497008d4c7de9d56102e1ab223abd3ca6457beae3aafc615bbb54a
-EBUILD cacti-0.8.7h.ebuild 1964 RMD160 5c0dc7f641cd2365fce2e4b55218ff44a2ab3c4c SHA1 fb7f090f6d92071f081f1f4a6e79bf768ec3e404 SHA256 af5365fbc6b0bc2da49885abe0ba64c810ce87d6d691d030e05bc3b59c49b378
-EBUILD cacti-0.8.7i.ebuild 1963 RMD160 b94d0875ec3f0857676f5a3cf40efae9c88a27a6 SHA1 6508fb7732dd49b673d4558af286cf1864655e39 SHA256 5c962312f6102a9ab2b5bacdce09226a42fca1513ebeecbc26ba6cf0cd16aafb
-MISC ChangeLog 26824 RMD160 6e7c510168866686b301a8584c46cdd0f695ecb8 SHA1 ca0ea7ffd1836278a1fcc4114090f8691ce34ee0 SHA256 0bda9f8fb626076c31d5d3a617a1f19de722bb0330dd558e42388ac859d48614
-MISC metadata.xml 803 RMD160 b497804bac33062b7f13330acef0ef28bea19f65 SHA1 031e32c4f5ffe0fc67943674530e880d02f5f2a0 SHA256 db81b920eb3683d9e4fc323bb2399156dfc4a8a0f5d4874505e0c1891dd17819
+AUX postinstall-en.txt 2249 SHA256 7879329884e33f84108d5fbed732941c9fd8a53b56db499bfc0bd282bd61b10d SHA512 8df52b187b301b42382746f9dea43993f7963edf018bc80e94305a743ea5fbb024d670917c0200f4782c0a3bd47abfb879c755ad415581616ae5c6413cf00623 WHIRLPOOL 0739ae29e564e81b4a08a74685efe93ec5248048dd47555befb1e805a9dc3d1606adc9126b5959ccab39f7e30d2ed4d956d78b84efedd54545a1d998986477a2
+DIST cacti-0.8.7g.tar.gz 2236916 SHA256 d09b3bf54f51bd42b2db0a62521cf6e408716978f75d6509ec56027c49c44585
+DIST cacti-0.8.7h.tar.gz 2249323 SHA256 2e3dc330b5b3ee374b2e553650d032441c25831b39ddcf123ef102492f20603c
+DIST cacti-0.8.7i.tar.gz 2250128 SHA256 89846762b8f4586532ff247ec7331958f5e4a8c3c599ff8aceb53815fbf9d1cb
+DIST data_source_deactivate.patch 510 SHA256 52155c5ca38a8df1adcc8a5b4d0bc1b4befa7ede4c56d10dba64cbde2c54042e
+DIST graph_list_view.patch 7636 SHA256 e43b2cf3c53029880ac16a9b86036d5136ab2de116bfba868fac2abd2ed14778
+DIST html_output.patch 7317 SHA256 276811704d6f4353542461c04a2561721bcc784326feefff460fae45c3849278
+DIST ldap_group_authenication.patch 591 SHA256 413a781c5aaa4c6ce8eb152f1ecbeb87c4efa5623c5b839c9c5103b6db6e0989
+DIST ping.patch 1033 SHA256 63c56b55aaf41a5e10908bb8ecffb47f74e11254d7e46223d8d04a9df48eda5e
+DIST poller_interval.patch 5852 SHA256 64a6748573395956565c9886cc999a92655ad7f5ba62c53b3299d047912d3aaf
+DIST script_server_command_line_parse.patch 3038 SHA256 40c8ad2dcc6664360ee9941849d7fff1c136e1d942f7ba2a2ea602da20a39e56
+EBUILD cacti-0.8.7g.ebuild 2115 SHA256 1b221d71f9497008d4c7de9d56102e1ab223abd3ca6457beae3aafc615bbb54a SHA512 2d353ec4b42b5362bb164be81785c4802d3c1127c06afcdaba376670c8cfc3e402041ce6dcd6300ffdbcba2abaf26714edfbbc2dacd2bb0c42f23be32f176ad1 WHIRLPOOL 6fa67e9b980dcdcf4498384af5cbafc88436533307c325e63adcf4d5a3e18bbcd99879d0bd876c52fcf5250b90691054a3a590d6469f2b6cf8ad413ea8f1e1fa
+EBUILD cacti-0.8.7h.ebuild 1964 SHA256 af5365fbc6b0bc2da49885abe0ba64c810ce87d6d691d030e05bc3b59c49b378 SHA512 9aac3b785ac30b7c75db58dbb0922697558bb4ae1ad76eb7eaa18c0a200d161b5811874edda85d1a4b6697d1d16f4c43f1d49e256426689c2ed43405e9609e1e WHIRLPOOL cda4599b5a9832469fd42617943865cdbda2f1add01d4e1f997df038789d2d7a58d458fa3580040fd7f50eb0668d9fa910a36dd7887908de938d7e2823acb7e0
+EBUILD cacti-0.8.7i.ebuild 1963 SHA256 5c962312f6102a9ab2b5bacdce09226a42fca1513ebeecbc26ba6cf0cd16aafb SHA512 e013eb4d983a7ccf570406efd89fa1afc2c7d58ca5a72f5a0029e4b33e759516a1ceb388ba18ff025c7df5da75f596143bcd0ca979efbabc211699f8590e7d79 WHIRLPOOL 234ea1f4217fd3a05786e347002c68211f19289e4d1149ea183c960fe9bf43d20fa6fae7b1d2a11307cb231452a04d3aa84b1b05473d7e8845967d2ee50bccb2
+MISC ChangeLog 26908 SHA256 452775590655c666b6ad487be256a3e67193499904656b67bce54fdd0c12e5f4 SHA512 9ea6ee09521e81c3cd17945d42dfa10a3ea333dafe6380c23fabd7bde6ed0c97061ceee783aebad5114c4d91356b5d058fdb186f42e6980292ba0a33d1f6ef68 WHIRLPOOL 078771d77f59db03a007d452d9a93f51b0423262aaf9d7f68666a3cf8a7dfb8995a22b4af49e105916e6c0e270293375b891efbfad7435539a1d5a67cadef751
+MISC metadata.xml 714 SHA256 87c3b48a554466e6e0a75944751f2e73326aef52d13d16110aaf6df770aca530 SHA512 6476909d8b29f1a56d7c7e26e8bc4edef5c46aee49ab18175f8727812764d1f1ae89781d09cf8de1ea42edc3f022432e6d52d42b75109e95c07998d7250bb40d WHIRLPOOL 6ce5f9fc982b7da218ea2dba530a5971f3acab63a996828c145bcd3c9ba049183ddd249325728fe6613148438e02dc5eafee18659bd6c977c740b35d82fcb6f8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk8Ad+AACgkQuQc30/atMkBH5QCgwGKuYVyf8eFKJS+aqYl2ESz6
-ymUAniHF3P/4x3bRavQZUXOS7Jq0Br6p
-=mrN4
+iEYEAREIAAYFAlEff5YACgkQCaWpQKGI+9RgLgCeNOWOGWD8Xdxg/x3IfxHhBL5O
+V1wAn20RK6SbNm9WKTiF6CGvBZB7QU85
+=XRgn
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/cacti/metadata.xml b/net-analyzer/cacti/metadata.xml
index 2ade181ccd0b..dc5780747aad 100644
--- a/net-analyzer/cacti/metadata.xml
+++ b/net-analyzer/cacti/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>netmon</herd>
-	<maintainer>
-		<email>pva@gentoo.org</email>
-		<name>Peter Volkov</name>
-	</maintainer>
 	<longdescription lang="en">
 		Cacti is a complete network graphing solution designed to harness the
 		power of RRDTool's data storage and graphing functionality. Cacti
diff --git a/net-analyzer/ndsad/ChangeLog b/net-analyzer/ndsad/ChangeLog
index bb84ec3a3b27..e5d6bd52f409 100644
--- a/net-analyzer/ndsad/ChangeLog
+++ b/net-analyzer/ndsad/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/ndsad
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndsad/ChangeLog,v 1.8 2008/09/16 07:57:28 pva Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndsad/ChangeLog,v 1.9 2013/02/16 12:46:38 pacho Exp $
+
+  16 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+  Cleanup due bug #96436
 
   16 Sep 2008; Peter Volkov <pva@gentoo.org> ndsad-1.33.ebuild:
   Some cleanups, avoid calling autotols directly, bug #226415, thank Diego
@@ -33,4 +36,3 @@
   09 Jan 2006; Peter Volkov <pva@gentoo.org> +files/ndsad.conf.d,
   +files/ndsad.init, +metadata.xml, +ndsad-1.33.ebuild:
   Initial bump.
-
diff --git a/net-analyzer/ndsad/Manifest b/net-analyzer/ndsad/Manifest
index 064595490348..92e839301f9d 100644
--- a/net-analyzer/ndsad/Manifest
+++ b/net-analyzer/ndsad/Manifest
@@ -1,6 +1,16 @@
-AUX ndsad.conf.d 395 RMD160 6986726fe367c21714c9b6b9d35d7f190e4e848e SHA1 17b6884de5092665d91829754bb3831a724a2a40 SHA256 4b22019e83bf0b42eca1c11a007de51afd48d4c96005838892af34a3a8fde8c2
-AUX ndsad.init 785 RMD160 e21a3d244baba0da43d791bc380ab768fa60ccf9 SHA1 169ae7e75c0ae3dced4e69bd5666b4f6a2c5d4ac SHA256 39fd3be9f571b89612651c89dd115a83ebd8f21152193a70dd1d0d97055233ed
-DIST ndsad-1.33.tgz 214614 RMD160 a968b431fb99a0947ee969a44809afce61c695a2 SHA1 9f5dfcec0d3b0f4bde17613300635544d58a7308 SHA256 a46403ff15c03b45b479832f5e6d861ec4d6474ef953f7965ae0239c90b9026b
-EBUILD ndsad-1.33.ebuild 1376 RMD160 ca2a7167e946d14be83e78bdbe4b3a0ffe970a66 SHA1 8521868022d5a3ddd1b82770f3139343fff98f54 SHA256 2306fa9125033caabd04115fa6b105516952a8329dd989721aecfe5899e4b74d
-MISC ChangeLog 1400 RMD160 05335871e1ad164f5f1fb1d720042fa1b73b35ef SHA1 b62e91e8b6d07ca77b24948589e33f0f4031db06 SHA256 66a7d22fac31cec41bb8581d6bf18cc160111d48eaff56fd6ac9ab80eb719148
-MISC metadata.xml 1164 RMD160 ef3a4721e205065ab859882c1b3a3ec86f144186 SHA1 d3151b44f9ff457f1eb6ea79207e90f4c61ba712 SHA256 c42da6a9caece07e1a2d2436ad8990d70778829cbe192a86a810e2d8b065baf9
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX ndsad.conf.d 395 SHA256 4b22019e83bf0b42eca1c11a007de51afd48d4c96005838892af34a3a8fde8c2 SHA512 bb66e6cfc9e25101b572827429a05e7889c3b92d459e6ece3b3668bdd650eb1460cf2d145757a42170cb83bb2a7d3076e64a67351a850005d6b3cb28a0b8f056 WHIRLPOOL 72cfff2a2d20bcb3e3d288256961deae01381fbb0b4e57872cbd8e460beba1280e5e279834e8ac3cf02c287e64fbd66924975732390bdcef8f1b7cc822dcd976
+AUX ndsad.init 785 SHA256 39fd3be9f571b89612651c89dd115a83ebd8f21152193a70dd1d0d97055233ed SHA512 c0486e6baea0cd42221becf033734c08f4916da48e6c9eb4f5c9310b64e42952f2c67e97935c7ae3e6c56c75f9a5d550717d1e024d46196ac3eafa009c694ce6 WHIRLPOOL 9bf456897da4a3d925355b92c4112cfbd4831fd5203c7459f1b07002317671e0e5d075d9deb1b3890cc0fe01b1295ae252f070c32627b6a8719e031780a5cc3f
+DIST ndsad-1.33.tgz 214614 SHA256 a46403ff15c03b45b479832f5e6d861ec4d6474ef953f7965ae0239c90b9026b
+EBUILD ndsad-1.33.ebuild 1376 SHA256 2306fa9125033caabd04115fa6b105516952a8329dd989721aecfe5899e4b74d SHA512 2284e3c3891f0913c126328ec0630897f291f47b2fa3acd358d0fc0d4e76319f432be1b90f7714628f33274cde8dc6bbbf56bacf3e8bd026de5378ac504ae52e WHIRLPOOL 6617c693b5e1b333df90b2e37d77194a805c3a32af343ba7ea9ce02312c9003fe69382aa8f8231ab420f39d11fa23cb0cc29ad1adc877e96409ef59bfab8f7e9
+MISC ChangeLog 1487 SHA256 cd2b3c43a0a71988a06a0da2c38d8004e2404cc15678ea8ce04147897b1b8ffb SHA512 cfd29d64df54af7b3dfeab672c65d6a46dc9fe5c1b44826c66a0d1159c5d9ac1353b82319c7a289d5dfd82782eb500f93c333a6b6bc94ef176a91af979d1ac96 WHIRLPOOL 71603e90b703311a1a1b0d647ec1775f99087baf4e59c00de579beccfb62f1b4fa9acdec7cf321ac4ff6157754a2da1d01b01f7cc376a1b92a23f548fa97bea7
+MISC metadata.xml 1075 SHA256 79fcf034f9abb1f2a2723cadd5686c0bcdf3a95dc8d8dae893d84305b083f462 SHA512 cd363eff7cc0939294c91b00fabcbbbedd9376701a27d3ced317053cbe4eefc4f0e191b285c755a6120d5e282154ea776065a4b754dfbffe07696d687e768231 WHIRLPOOL 698882e8974b740db9ff73aca19dddc20f3e7f3aeb473c7f98c35c835e142a579dcbdd0c27fdf244acdecfa82b462716f4b2c17a0c500af3a78830dd097378d5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEff7AACgkQCaWpQKGI+9SKigCeNyTMlIfZELv0h1jIManxM4Zg
+K9oAn2r0UEd+Bbl2vjEXjt9QOvLsj6jV
+=lDUu
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/ndsad/metadata.xml b/net-analyzer/ndsad/metadata.xml
index 52163f809e71..4e7b273cfbe0 100644
--- a/net-analyzer/ndsad/metadata.xml
+++ b/net-analyzer/ndsad/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-	<maintainer>
-		<email>pva@gentoo.org</email>
-		<name>Peter Volkov</name>
-	</maintainer>
 	<longdescription lang="en">
 		The NetUP ndsad (NetUp Data Stream Accounting Daemon) utility captures
 		IP-traffic from network interfaces and export NetFlow v.5. Data is
diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog
index d634631c738e..3ea2e47eb344 100644
--- a/net-analyzer/sarg/ChangeLog
+++ b/net-analyzer/sarg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/sarg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.78 2013/01/21 14:04:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.79 2013/02/16 12:47:02 pacho Exp $
+
+  16 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+  Cleanup due bug #96436
 
   21 Jan 2013; Agostino Sarubbo <ago@gentoo.org> sarg-2.3.3-r1.ebuild:
   Stable for ppc, wrt bug #452836
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index 002dd82db059..0980ae1d4377 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST sarg-2.3.2.tar.gz 1180411 SHA256 b117f417da577e73e8d6b44d8f63c99ceb8cd34b72bc0c4a5af889bfacb5c8a5 SHA512 d20a18b4e5856385685a11e45fcb04a6d56618a08330496117cd010cc27cf722e98b069bd5ee54661363e0e70f0c86578e68ea82f1a8bcab3536352141d94227 WHIRLPOOL ad357233f6719c62b04a3cc757834ac18a619ed32bc008457390595d0d56785dccd01064683f96614d74752d8bba9b072d193460984699a970e36a8740e23381
 DIST sarg-2.3.3.tar.gz 1281405 SHA256 7747c468ccd72bd2aa1f826dffe5e2f68fe1e3b64748e5916c3918c67e46dcab SHA512 7d1d3f19c4cd948536b12de92d39cdc42c57ef247239b16b276b3f0604256f50d45ae41a20b0b655bae1653e3e5c7fb8cb32ed6fc8eed4a4a71e847a7e578e5f WHIRLPOOL d2c10082fc802a259cf923f693215134033d9bf6f77914b9ca660cc926877c2e6c672ee506f50764ec801ff42c35ab27a163c4effc4ed031dabf43e849930c34
 DIST sarg-2.3.4.tar.gz 1282009 SHA256 9448de524bd91dbf0eaa8ebd393bc34c716dfb98e4595c8f0166062b8fac9f76 SHA512 279b6bfa87502973d82d25369098a8875d76440ddf845d99160865ecbd99a9ab63dbcb8a7ca94d0cf9807f46ce5dfbcec321592294c3d2763b4038b658280011 WHIRLPOOL 97edeb5a1bb3aaca355df2c2760b62bd01f6b43a47a5886ad84fa5c4e5f99126b9e2a8220bd3821b46df065376c3527bbe82c03b126d30744a89401b5f4be69a
 EBUILD sarg-2.3.2.ebuild 1785 SHA256 2748e3a7c69691b62a718fce04d7dfcaf85cdff8e4d12431442c3c562131e13a SHA512 5d2bcf365b620fc55c77e230d4f285bd187d53d426bda4e7d4b0c239a74361cad57692b22a7a97bf8d60c773e3d798f29a8087bdfa3d36fba3ca7997738ed077 WHIRLPOOL 55a8c2cb881093d45b98e32b7674cd91c9415ca94de428fe37617887d0c441ae13081acabc7e27c36209a5ad167d651d779cf998c40fdf8d2cc0431e78c36660
 EBUILD sarg-2.3.3-r1.ebuild 1800 SHA256 59a8418a3624dec5d556c74b57897d68e4046267ea3a12c00eea961dbdc7a9fb SHA512 d2067def66b63a16376e5d4a0886ee5ed00b6c6ebd8c9e6cf42ec4e658eba0de1b8c57b208cd55ba620b6c16a1f057293f7b91909bcec00ea04c29111b60f252 WHIRLPOOL 444c5e595bcada9bd698e1c494dde3903cdc33ce7e3ffcfd7b04d4e592e502fe436b91aea97027f7d660bac3e02f55ed8603ffb1d7192d680a8fca4f4aa88c4b
 EBUILD sarg-2.3.4.ebuild 1931 SHA256 607483612d6b692c6b63a5eca7e1048607f6b93b25ed59f9349f98ec799df80c SHA512 3f0f94e26f70538b3dd3b869dd7f87eb8392fa5fe39914ea0477781330c372ea767b7c27aff70241570b412139f97ef90e69ef7d42708f0ea51234dfd18c355b WHIRLPOOL 7bb14a8e0e8e1cd1865173e5b83c3d3e3c46670530a87e53a7b3110b311cc0b4188b27253f85dd46f3797af79df229bdda074bba9d28ad9d46be0fb5121f8418
-MISC ChangeLog 10924 SHA256 a70c877cd6f6b71a95b8a0f783b658733baf0b0bdd5966f9766384da012f5173 SHA512 534985316ff19be1ff0af51e9ab4702cba7c4aa01d48a237a2efb020468721c32defb5cd6447e3f5b176c6cda71a4bb19e1f1062a9fb1252174d42d1979b06df WHIRLPOOL afbc9d75c4347bb4126cd1a505e550337769f00ab6926dcd6ade1a8c224c6b0ff2496b1430095747eb17417d6f3007852c960aece5a011fa012d99c14d93011b
-MISC metadata.xml 733 SHA256 1d45fa666282238215976831a1eb64cbaf1834b0c013fcf912c2eea9f8e3d6f5 SHA512 fd45a6a8da7726f52c9342da3b4eccb747adce9df5b931bbfae2035c84655cf7ecff54e571b96bb6f96c81af9c01edc3ff34bf0bb52712b043f5cab10d959f28 WHIRLPOOL 0a557ed47e6c7bb8ccc13a145322e5aa3459c31c7142de3ff25e3c1fdd58aaaa2e702bbd71758ccb853662d764c5c8ec3470bf8ec32a5f01555be45c3d74daf9
+MISC ChangeLog 11012 SHA256 4db104d64343b8f5f9be64ee5c6a4e4bdb7e6b52c33f15872bb2a16bf915340a SHA512 b326b71bd4dea9641a8d2c4d448eadb2cbfa49d37c803ac6b0a0e662237ad2664443d8957ca6df70aa8423553b8722391a7df66f8fbe608c7f74fc6c3a1127ae WHIRLPOOL c2b2ed777b87937241c88c7f4c5ef67a2c2ce05e6d4af15ffed9665cc442c53bac24074a68d1f6d4127bed9128c35409208e6cf04bad898b3ad76733800b4d98
+MISC metadata.xml 644 SHA256 bc0d7ece98611468509045bafb0563f5601a7db8eb5abafd6fc78c78ae57e63a SHA512 eb27d3ce8d94c7223814391a1e26aee69df8aa290a66cfbef0d61865419d6ac88c8d99d16d74f9ef5ce3261ac1f507304679ecb31edf44ef6495f03df86d29f4 WHIRLPOOL 7fc840f9056f1f9d2cdf1f2c2720c4ca718d31be16005a9ad05944eda06101af905d9e690e637c7859566000b13a15160c29c1f6885dc2d2706afbaff9a5f43b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEff8cACgkQCaWpQKGI+9RUdgCgglsDpZmdvtfOLfbmPdjDG3qV
+IesAnAgvmVpEjZKtVAKE+V/XK8u8mSkz
+=EcYY
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/sarg/metadata.xml b/net-analyzer/sarg/metadata.xml
index 426edc634023..ddbd690aac33 100644
--- a/net-analyzer/sarg/metadata.xml
+++ b/net-analyzer/sarg/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
- <maintainer>
-  <email>pva@gentoo.org</email>
-  <name>Peter Volkov</name>
- </maintainer>
  <longdescription>Sarg - Squid Analysis Report Generator is a tool that allow
  you to view "where" your users are going to on the Internet. Sarg provides many
  informations about Squid users activities: times, bytes, sites, etc...
diff --git a/net-analyzer/smokeping/ChangeLog b/net-analyzer/smokeping/ChangeLog
index 42c1e6d2305d..bedd12a6302c 100644
--- a/net-analyzer/smokeping/ChangeLog
+++ b/net-analyzer/smokeping/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/smokeping
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.43 2012/10/29 08:08:19 patrick Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.44 2013/02/16 12:47:33 pacho Exp $
+
+  16 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+  Cleanup due bug #96436
 
   29 Oct 2012; Patrick Lauer <patrick@gentoo.org> metadata.xml,
   smokeping-2.6.8.ebuild:
diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index f0846e718eb0..631380a1f991 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 79_smokeping.conf 351 SHA256 fa4c48387598f8c6e60b7642e4284bb64196dcd233cea9f18ff37009b212ff77 SHA512 d53abdf29e8f6bad67a654b17088c3f8dee7908ff82b0b911599e2ac6a11be84b8fa2c30b1f0b6142803ff9a5058f586946eafa112dfd26ca4f8f8664d19cfc6 WHIRLPOOL 907eff72a390aa36c7be80fb39f2204238ec8daa13f07d9b189401374cf4cc2cdf6df2842f8d0e9096bcd87670190b673d1bfa05adcca5ad0266b99d1bd79586
 AUX config.dist 2962 SHA256 031f0cb72de57812ed34f463d71e90d05fb7b0e2b8df79d5e6ec42e67dfeca7e SHA512 b9fbaf1f1d5fedf0c3ec2ced02a1cc457a24e28d1b405d61b8a97c97d9e8cee03da9fafb2526dac3c288451f6a20e4b568ed099351c88089081d8af0da47fd11 WHIRLPOOL ac4d45d87843cae5f6fbcae3b3c39b021dc35da00ad91ae69ccfec8a650baca0e6654a34e74cb6362e4e50d9fa9d482aed30ef7a6b82c3fbaf7e6889b26e4065
 AUX smokeping.init.2 1546 SHA256 f98a2e8747daa94678f5263aa3ad8e86636264acc7aa3ee558d1742ac8751747 SHA512 1aba6e08d531ca4de9df37af073b2d4f3ad01197ae02596108b9591e19ff474a1bdd6d1d980f760ffe3a924809d3188d0b2df01e776b3c9c43a8cd23d3a3a688 WHIRLPOOL 19fc271e949ab149937feb8a5d80ae264555896ae62145d35cecca48fc52596b711a4a7acc28535d400a7383d2d05d41221f8399fab6e9b86283fa5345beba52
@@ -8,5 +11,12 @@ DIST smokeping-2.6.8.tar.gz 423516 SHA256 15fd99487d01649a552d2954bc1c6b0442967a
 EBUILD smokeping-2.4.2-r3.ebuild 5290 SHA256 9f369cd388add216d9ed48047124b32a1b89929e58ce38f69eb1edbb6a41f019 SHA512 532302caadea8b65964f721d6d7399c38575b2de0962f1e323ee172be2f04caa68fa824202eb5d9e3cf7a7d9d8a4c04f1858a5465a0c421fb1a237b051dab2e9 WHIRLPOOL 3084b04f82daa2350043abd9fb755ccac4953ff9c035c815fd6b3c70e6ab9a5150d1124653177b9145a41615367012c4ec754febed3558033b69cf61b0072939
 EBUILD smokeping-2.4.2-r4.ebuild 5624 SHA256 0e50d0cced542402fa1b27982c57d80be7265129db2738768be7a736c0e2a457 SHA512 3d7c282de8bb85d74d3226c4e36f283facf3f396783bedecb4d83692a621171077d5767748bea5c9b10e6fdbc2b146bf0f92091839100c84ab7e5672be82886c WHIRLPOOL 72c594b90cbf8803f8421f1bee15aa34075458342e28778806471b8d8922acd1d85afb8491cf9f1a8ff6166611bf45d591f48bfd8963eb35ca909d377daaf1a6
 EBUILD smokeping-2.6.8.ebuild 5090 SHA256 99b196404f77994fde42ec62725cb5ff4bfd489a66fe8e494843993c5d011708 SHA512 ccd2246bc30273f1a24b2288d3d31e519b7d445eb1f658fb9fdbbe3e4cdc75b0c08215fa80eac4746efa496f60ed26e5157f8481208a523058f3a0d5660a5896 WHIRLPOOL 2a93444ec826225f8c07acb253a24a69bb619004b7b94c4a8a677588ac8af36f5b46cde2ea4605b0c0b46912693cbe2f866c92bcae7f350a143f969c68b9f8b9
-MISC ChangeLog 6913 SHA256 30ce86733d60196c852999afac58935afb464cf80ef0ef6c41064d7891340e15 SHA512 2e71b79c3e3dfa512967c9fbec84af85eda15b6280d73d2579b12af86d7263ef3b69f0d9e90f0bc1d6e5e11e323335110541368d8040207d6e2601ed04bad99f WHIRLPOOL 16cecf88a6820a855dfced1218c5ca89fbb331db44fe2ca4698959cff5e3df2bf07819ce2d9a047060872ea8637703a5dcb2a758cfda3c564474075331191b20
-MISC metadata.xml 672 SHA256 c05f6d114d3c0e34b58aaa69560f7609d11b598354106a2de11ccee034fae348 SHA512 6a8f577f0a6c2c08effa38650cab2c7801599e063c2384b71e82d409ebb74e0f00eacbbf67de8077fa1d65527942a990fcaf95b61769b53ec1f0d8769b11f2b5 WHIRLPOOL 5def40e279a0fe29a870eaf320701703765ed570a31d14cd2ccfc61ed4c8ea778a404a66edd54e5bc3c75ba6e10f3042009bd3972e39cc3e58633a53acbee5c8
+MISC ChangeLog 6997 SHA256 02c2a821521faa0fc876de754915617b49f3d7f2edbdcf2e1049c84b9158778c SHA512 31302cd5d76109f26664298641ef4c1dd902cb040caa3b21908db4fa0f84db369b7a95fef0a6ecc9468fd477f9308a0d877566f623b2df7494a924513739ca3a WHIRLPOOL 209368f7a64746bc9a91ae9ec78fb21fad6fde9441ae9c76f82125aabe0abeac0e82c16e3c9eaa7956a3d60bfad150386463df7721a745aa8d01b1b78c67a9e9
+MISC metadata.xml 659 SHA256 b93062f989a674a87850ba57373942fc9dbe90708c2e496f549a7dbd144d24e7 SHA512 9d2567f77fdf5b36f94ada088b6187b347d9bbe587c3534eb5d5c51b4b3f6733b57e28b280be5a994992a11a039d286d915d0712823d23db73f011d8b79d78e1 WHIRLPOOL 96997d680b11408f26d96b68390be66bf27a965e9bc6120bdb00d37b08b8f39a5e4e8eb2bda9cf163f8c3bb7f3862f71eb26fdfc71b16cba92e10f0a982700b0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEff+YACgkQCaWpQKGI+9TOXwCfVWsccsTxbeeQHvjqD/xAjPaW
+lxIAnjlHMzd2Ntw7BTlSRxt5L2Y6Edh0
+=qpEv
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/smokeping/metadata.xml b/net-analyzer/smokeping/metadata.xml
index da9a7137a8f0..a4c0198ef0d7 100644
--- a/net-analyzer/smokeping/metadata.xml
+++ b/net-analyzer/smokeping/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-	<email>pva@gentoo.org</email>
-	<name>Peter Volkov</name>
+	<email>maintainer-needed@gentoo.org</email>
 </maintainer>
 <use>
 	<flag name='speedy'>Use <pkg>dev-perl/SpeedyCGI</pkg> instead of perl to
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 9a8fe38dd99e..9c1084ef0785 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.446 2013/02/11 15:31:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.447 2013/02/16 12:48:10 pacho Exp $
+
+  16 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+  Cleanup due bug #96436
 
   11 Feb 2013; Jeroen Roovers <jer@gentoo.org> -wireshark-1.6.12.ebuild,
   -wireshark-1.8.4.ebuild, metadata.xml:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index a0d6942326f5..23bd3b58072e 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -10,12 +10,12 @@ EBUILD wireshark-1.6.13-r1.ebuild 5295 SHA256 063ea6ae0a34d71f3c64b2d4e7edeabd99
 EBUILD wireshark-1.6.13.ebuild 6409 SHA256 2084d4b6fbe051f2954e0e70f43e8b69bc4415f7843511d0778a982ab08185c5 SHA512 06e5ed612d116caa105a9c0713cf8cc9af2f7c81bdc07d2cddf5dfcab4d0f0bd15ba86c8902d251369448e8998091d413e24a22a9fe813aeb1fe571a85bcf29f WHIRLPOOL aa1752218035641aacc74fa0ef553908ed13a219c29268d7eb37833b3dd0bb2e26d845056b45901826427d8b8a4a31c9b00b4b68d2be43bfaafeee89e1833eaa
 EBUILD wireshark-1.8.5-r1.ebuild 5682 SHA256 0152c2ad5950d5baf2f5ad0beebb4bb93b7202b787a8b1170d386803b05c9a13 SHA512 b6a447760f4a67f187fbf95b80904eb57937dfca49037c72c945971cd1f7c491cd9aa46e8040dd75018f6375638b02265ba22d8f1661bb896ba95b2ed85f6166 WHIRLPOOL 4342e097f6c2f559be7edbd7ae284b7d494c974b8b97c7af701bd62e9d6cc4d4acc270e047e1a0a93f6e5a953211cf4fff932e84d72f55c9ef133857d43671a8
 EBUILD wireshark-1.8.5.ebuild 6796 SHA256 f6b50852f4c03692aa88a9d98f3f7edc8131d7cb8f490e483b50358180472630 SHA512 b389b70836ad0e3539e9f1e7eca73362e9ebc87a078422def834559818b0145defca90539284c98657ef704d73b94da14253c90c95f4e6f96c408826a8e2537a WHIRLPOOL 61054a9accda9ac0661bdee3d35c2e7281fcf5c867f1d0f3c789acb86188153507e13a91b3e442f58da69cf5ea9eb548f7c314803ffb3d21eb4c4bd6945c1f77
-MISC ChangeLog 64788 SHA256 8ecd1eec91495804fb3c8c83f57f2933947327b9536bb0247e7fdc51ecf47ee7 SHA512 5fd109ced06bfe7ad63699b4f2cd8f1ec82a01186eb5efd1a1977e08bb5a516cc65801040659d98161b4cf766a30492aa0fde6a7f39e94cac9c0bae48934c78c WHIRLPOOL 23cffbc5c497ffac58c1e024bd657f42ad541ce905e3540a64b21a027f04904bb844ce6bc3a87d26d0bc0de61bad5d3d4a8cf1c487a4c8b8c6868f33d9bb625e
-MISC metadata.xml 2503 SHA256 e06bf2d547135e925f88a0cd75d8da59e58fadf842ef528de548832b54109aca SHA512 c56724344486f4e3ca63cd28ee19f5267a0aa66ce41b1b179e64499ebe86132523dfc2d35ed6caf606487fd01ebc812745faa47f62c0c3ea752d35d7cc86cf76 WHIRLPOOL 18d0a4a303d89272d89280dc5cf0f399e5d413f0d7f000f66ed85742c5ed8705a5655aa60a69e487ae3fcbb363d02696ab491f5bafe2e7bb069af732541419eb
+MISC ChangeLog 64876 SHA256 7954accc17d973fc9e21576d3b369c7f64f78d7a69fe9043e7ae0a7649d2e0b6 SHA512 5532b937b3822f36bb49fc0205c3f366f99d4fe5ad0c3f20dc7e3a13dd7c45fff2c723fecc3c237f66cd9f951d58ba0b6e6f67d0176d8d2f3fe35cb55a8b686b WHIRLPOOL c1a53349e1ac2f7d57b1659094b773bb0a47326c0074c5609456e732e9ec3c1958c5458cb7d727bfe4ee5c699c3248ff14db12609f9df6c1498085fff5ae4866
+MISC metadata.xml 2418 SHA256 dd08d4e30f9d896a88e2b0c1fbe7d990e8c73a39d7ec8b884185c06f1108af17 SHA512 4a9fdaac45bf03108db7801ff31facae98605af040e0630001e0add32abcf9eace9f05053fed82bba5eb08a1ad3446c1d74d8d56f67157d71050a3b0924a84a1 WHIRLPOOL 786ff710de3d1c348de4993c07bc4912c1d62f56db353febcb69e295fbb5eb7e6fed9f17e99cfa497d6c50b8686565e806ebbd759dca5519173a0a9b7f891f93
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEZDtsACgkQVWmRsqeSphMMJQCfVl/Ts3tvwMhLu5x4IeOipRPQ
-BWAAn2dqmL/xR9HURhSA6L6rIGgOgpWx
-=mYS5
+iEYEAREIAAYFAlEfgAsACgkQCaWpQKGI+9TkFwCdEVW0J7oVioZng0PFrevFsESv
+vaQAn3tUoFryuh1w1nAZwk9J0B/6byYJ
+=+Na6
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 054c43372ca0..0b06c6a920f5 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -3,10 +3,6 @@
 <pkgmetadata>
 <herd>netmon</herd>
 <maintainer>
-	<email>pva@gentoo.org</email>
-	<name>Peter Volkov</name>
-</maintainer>
-<maintainer>
 	<email>zerochaos@gentoo.org</email>
 	<name>Rick Farina</name>
 	<description>Excessive wireshark user and enthusiast</description>