Version bump and cleanup, #376471

Package-Manager: portage-2.1.10.7/cvs/Linux x86_64

2 files changed, 7 insertions, 32 deletions

diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 6c9113c5edb3..e9c04ac2f21f 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,25 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 99_nagios3.conf 377 RMD160 79f66fc0ae78fb856bd38ba479dbc8af4c2cf989 SHA1 cc2b21a6dec8c15641100284c66d95c2996da687 SHA256 0bfa88db78ab036d177c68da20a8fd2f567ba8c9f54c14cfb8e1fc121641051b
 AUX conf.d 409 RMD160 8b08c01284fc590a2291164589da42515d1a0586 SHA1 dd7bf46facd6a3069794ad9623cddd854198520e SHA256 a5122b19248c375b7b7c80bb5568fcaf334de316c611a85795960c2b9f6a6d5a
 AUX lighttpd_nagios3-r1.conf 482 RMD160 ec8c04a951f9cab2f9561fd224c4771fcb328158 SHA1 2e6a0d8d1290db425435f2613e48efa92d201455 SHA256 0cbe138afb954ee434dd3ea3146fc0677533085c2f2f8fa7faebe0bb3a64e172
+AUX nagios 1459 RMD160 838d61d75ea5ed0cbbe47a283d517d0dd1c77246 SHA1 fe765bad1bff9c58099076dfeb976079986bd55e SHA256 3281e938efd5bb6967334bf99dd99ee726f1320c6048c5f335c94bda2992cc8d
+AUX nagios-3.3.1-htmlmakefile.patch 683 RMD160 f331469c6059be05cd19f804396c2555f909cc2a SHA1 39c9ca86582244d2449d58b8c6b71e6015b2f4be SHA256 e17cba4707ad0864a9a78e4550d45b5aeaa2229d8336af980802f92d61616e67
 AUX nagios3 1441 RMD160 b0b9361c9e4515904ebf1b41ac0be557f59e7a96 SHA1 5351b5d19c0ba51555fc3d7436290006a3acc59d SHA256 e92406af772d1dfc352a476af5cc6c57483f3796d663f1f63c52b44738284644
 AUX statuswml-bug275288.patch 1401 RMD160 6bb19daa7bf792aac16fc20e77a7b51d5a9f4b4e SHA1 4ecace0ae0bf9e533cd9effd5d442c0b052e5e4f SHA256 8cf1db6ab5b172280ae31e0966c4e9e65af1b944346ee4936273cdb0c3f35bbf
-DIST nagios-3.2.0.tar.gz 3170967 RMD160 2177e5ebc7ca5ccee7ba404728e896d10063b278 SHA1 070aa3cfa9665190048d386f471cd4d377480f99 SHA256 7cbf35ba0319f24fa085982c038437c4515003b27863c4897dc86b197a50a5e7
-DIST nagios-3.2.1.tar.gz 3215350 RMD160 d28f39dff690119e95f5c338fa42e94d93379316 SHA1 1b04abcf9636be2588f9cc90c6b22d7d08e6a2e2 SHA256 8e9a0600dd574977b506613ef81537dccceb2d8f734db049b291e8e21859d9d1
 DIST nagios-3.2.3.tar.gz 3249447 RMD160 3c09034069416c5f4dd5071e34516b1154c276b2 SHA1 fcb2c016c1b803bac71442d0ee8375b737906421 SHA256 7ec850a4d1d8d8ee36b06419ac912695e29962641c757cf21301b1befcb23434
-EBUILD nagios-core-3.2.0.ebuild 6058 RMD160 b15301c7eb89cc8d1a19fa9ae7d5f226ea1fbb3a SHA1 b5abb0e6e0fbaff99a11a202ad65573ecabfef76 SHA256 e9e4d2846ec831b689c157367d5209284760322f8b88e89dbf7f230c78833078
-EBUILD nagios-core-3.2.1.ebuild 6056 RMD160 75a12fda9399b4875479f9db24aa3d563bdbdcab SHA1 171f5aa40b2fc02bbcd8ce367909aedacd04e2c4 SHA256 534b3d2ffda93806c5c00c45ee4607c9fbae8cc5447bad6de3f976c4fdac3e0e
+DIST nagios-3.3.1.tar.gz 1714630 RMD160 38d427f9d137ba75b84f3bfe2a98b72a768f6158 SHA1 7b2523de0dacb51b5162dd53fc4c909397800125 SHA256 c4e39cd31a8a9ee814df848fd933b8611465f749b48432672aef4ae5849d9652
 EBUILD nagios-core-3.2.3.ebuild 6066 RMD160 637ba0da5efaca274bda88e8f49280cce92fc1d4 SHA1 1cf2d08d4897765cdcf1b8467726176092f7aaf1 SHA256 bbe106d2364238c4b6f8e6180217388ff04e77cb788414548870f7e0816578ed
-MISC ChangeLog 28966 RMD160 8a0ce53ab244d3150818d7e1b09e81827a090eee SHA1 ab5a23202d50abb400f3a27a984c49f3191d7d39 SHA256 3ee8176ef8842e45f2654e1fc35d6fecf380f7041137fc83ea59e1b861bbb97c
+EBUILD nagios-core-3.3.1.ebuild 6185 RMD160 2381dc6373e3dcbe8c3c8e77e6a06c500302bbf3 SHA1 279d50a8207c428176ae28c1d47327d186fddd95 SHA256 f79f08d962a0f4a7de217a8af31ed389c78721cfe9743e9a056a9dcf56394b50
+MISC ChangeLog 29235 RMD160 d35e23d716d1b23fe2613f07f50bc517fab3c059 SHA1 a9264ab4bdc2783650dcf2d5f5e4b72c5d012fce SHA256 c6a8f0b7e432b986df7ee400dec861a140d3241efbbdbe1d6f7938965deecf87
 MISC metadata.xml 1103 RMD160 126745b1627d4be7d8a3868e3670cb332df3d838 SHA1 3f5215646412a2aefde093d14561dd540d7abf01 SHA256 f2b241a3f4277286838954546eca184d08973197ce00e2f6a6ae2698f1eade81
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQECAAYFAk4tmLAACgkQIiMqcbOVdxQJCgP/dn2HlDhODHt2DkVqQkCvEy/z
-XhwjYjtj1WX9nFKIkaVtwiYO/EkZW0xm6nfPOKbq3AFd/p/hcDsCTRTO/eu5xVAj
-dBs3niZkpqOvov1ytkss/guXijSAJ+fZZcjOVlQAd4/kOjJrJXym0VhEi3WIiKjn
-C3ND3ODMuVAHVwoeEAM=
-=h44h
------END PGP SIGNATURE-----
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index 0d7e60f44ef4..94904df6b8f2 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,17 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-EBUILD nagios-3.2.0.ebuild 1812 RMD160 5c81354867f6394d1cbebeeaea3de6239d715d73 SHA1 3c890f60f0e8682a68391bf6f752e35cc57c3297 SHA256 72c1c15d68a3d607f8f0ab5ca679d44924c7525e282d92ca52243eb2d9ac90df
-EBUILD nagios-3.2.1.ebuild 1810 RMD160 a1e590aa56ce412928d5523f134d2d324126131c SHA1 02763ed6ab21618d6b9f3ed2c90fe083b44fb48a SHA256 d2ab9988d30866d95bdb60e489b8e84ec2d85661e8394525851f446b06e6d7fb
 EBUILD nagios-3.2.3.ebuild 1820 RMD160 4b7abf2ece6bfba88fc397a502dec6fde363ab4c SHA1 2c760700da6856b07677a3251b20125c3875f061 SHA256 d4f52dff3913cdf1ea59551907601952e89e2e765f931b6f1538f5f53984c10b
-MISC ChangeLog 13602 RMD160 950a9610a30183d0512a0d3936450534f0677602 SHA1 df8c32b65cf8d6ac7b6b54369e0b52f18a5ef046 SHA256 68a4b929c84a107b994eed065a16afd75932d2b5145d38fec30cfc5aebe474b8
+EBUILD nagios-3.3.1.ebuild 1816 RMD160 e7e8af4ceda0bae31aef3ce443279eaf1afe8c53 SHA1 38a23844fe76eaa967e75b1b09eb54781cb073b5 SHA256 a8a0e5c9c4e92a3a2f3e463be5a1624829429d8243798db6ddea3d38e5ebe06c
+MISC ChangeLog 13792 RMD160 0156325a07c7e10ce2611ef28474fee72ff5cd47 SHA1 5986fa28dd19d1ffeed73833567abb71b76e9cd8 SHA256 7b1f7fa90c954cec52848e094d835aa25cf287b3160dc1466f7c6c5a74246deb
 MISC metadata.xml 963 RMD160 34a65fa482244335865f889d4ff500d6eaff4652 SHA1 b63ecd87d1a48ec89bb8d1b571af2990e5c4a46d SHA256 1caad75fb2c860e761a2ef082cae698e6d34499b68af04c6bc214ca019bdab3d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQECAAYFAk4tmVwACgkQIiMqcbOVdxTSJQP/S8kVqIgLuw/2sZv96jMF5hrd
-xadrhlnf0rUggF1MDKaU13AUcQJRYIYRZ7vr7jqwpLltE9/yJV7mV75GD50RshiD
-SfalDUalhJYJItH6BQ0PY+ZbL+lbm/hLOKiZYEaxiwUGFtqGO9Xtu45zp9s2e0dz
-gGgYBuu8pEvGHCl+SDg=
-=L6hT
------END PGP SIGNATURE-----