stable x86, bug 330539

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 22 insertions, 6 deletions

diff --git a/net-analyzer/pnp4nagios/ChangeLog b/net-analyzer/pnp4nagios/ChangeLog
index cfa86fd3b872..9bfef0cfc31b 100644
--- a/net-analyzer/pnp4nagios/ChangeLog
+++ b/net-analyzer/pnp4nagios/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/pnp4nagios
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/ChangeLog,v 1.22 2010/10/13 20:00:17 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/ChangeLog,v 1.23 2010/10/14 14:46:19 fauli Exp $
+
+  14 Oct 2010; Christian Faulhammer <fauli@gentoo.org>
+  pnp4nagios-0.6.5-r1.ebuild:
+  stable x86, bug 330539
 
 *pnp4nagios-0.6.5-r1 (13 Oct 2010)
 
diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest
index 9c2444652cfd..861877bd4279 100644
--- a/net-analyzer/pnp4nagios/Manifest
+++ b/net-analyzer/pnp4nagios/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 98_pnp4nagios.conf 1025 RMD160 13ada7bbf3ad9b14bccf0d9cd0f0f0a72e4ea807 SHA1 6e080ddf657bccb1beeceb7a80222f5c06c41eb6 SHA256 d4860e09c66e1d20e342a4ab997988ae825e6f4561a9631fd6c608f1c5420a5f
 AUX npcd 766 RMD160 af98e0bc7eae1f348a7d1f6b0f92911f29645b3a SHA1 079b67f8d1ca1bb091dc8fc80d399f1850846b97 SHA256 2a335ee60d3fd872645367c7687905c427f8cc9941b9a5b7939df2d7e029d7d1
 AUX pnp4nagios-0.6.5-makefile.patch 365 RMD160 b094f4224eb15c0f1d2a6f2237a41448ca5d1043 SHA1 17c7a709a8edf48c7ac73eb9e8fc2bf4ea85aace SHA256 1dcc7da65477c87e3f2c6b38c9f8d711438f91419411c9cccd56fd63d1a52750
@@ -7,7 +10,14 @@ DIST pnp4nagios-0.6.4.tar.gz 1093669 RMD160 bc72bd4bc6055f1d1e1cc1598565430fc96b
 DIST pnp4nagios-0.6.5.tar.gz 1868229 RMD160 c4ec91994e4aeb9d1b53f756d95e1b138366a9bf SHA1 4aedba9e4074758d2f3956ff890f01e328d9f597 SHA256 f7718b4c642a7f8566209e2560e0020450e312141607f7cf3b87aaf48a01f0db
 EBUILD pnp4nagios-0.4.12.ebuild 1412 RMD160 00c35968f2e6013a72f3848ab949ef85d1b3347e SHA1 acfecb2e83a786a8423b8cdfb3ba002a758e77b4 SHA256 eb1e13cd938b5a98eabe4d3897c1474e50389feda7818035c6a1ac00328c9821
 EBUILD pnp4nagios-0.6.4.ebuild 1412 RMD160 cea30de05b24bb17696b908fe944009bcb1855ad SHA1 063c498ae01a091fbcada439b94cef47d8a2b5db SHA256 765600240a4efcc7924c9a2efd00bac80023544c27ed96913409092cbf521eb8
-EBUILD pnp4nagios-0.6.5-r1.ebuild 1575 RMD160 6c3ca362e4a674dbc4f011184a37023cc50ad54c SHA1 d8125aef7b0f5798a4893d1d75dd656c80dbacb5 SHA256 01ff8e774133ceb9beb32d2fe3700271a6eef49e4cf293fa1d1fc6dfb0df447b
+EBUILD pnp4nagios-0.6.5-r1.ebuild 1570 RMD160 aa9a597f3b06b93390aac5d9229d85008fc7adde SHA1 866d9d47db87f199e53d7117ac8bc4318185a9f2 SHA256 e65a78827575d6db3344e4864f52031acff3024eb8cb0617bd5f78d637866c0a
 EBUILD pnp4nagios-0.6.5.ebuild 1414 RMD160 40f3cee6adc8e820debb21a1dc20a717e4a4a217 SHA1 24de3f63b5ff5aebf8a1722489524ad5e5fcd1a1 SHA256 1c102e069782c2147a2794e7856f4192c7500214937db87f9f2536a906bbf6cc
-MISC ChangeLog 3825 RMD160 bee35e119f074c90885f3162d00683279fa9be6a SHA1 24f716bcc7649021bd4451d9d8f4f8be1e86628b SHA256 8cc351c40cfa7b2dbcf007bf48f77b503443fe8a048bc8a88d4b45f3b6d8f5a6
+MISC ChangeLog 3932 RMD160 971b23e09b84e2a4b2e2938fd0117b0c0109a5bf SHA1 2fcd48b2189c7e4938220b3a01a180d8c0aead0c SHA256 115987b13768630942501964ba138ca10fbbcc0ed562f6012b4dfa55d3600a1e
 MISC metadata.xml 260 RMD160 ac6f569eb1667b364a6d503a3f273505ff0ee274 SHA1 07ea89243966d135d235f7e464a480ab0e698d6b SHA256 eafa2ff6e208c288e02395e29355263b6c969ae23f19ec118835c14f2fcee05f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAky3GDsACgkQNQqtfCuFneNzzwCcC+be5Es9Dn+ShBUKRRYRk5+b
+sF4Ani7NEeNr7Txabg+L4DJVwOO6oGkm
+=8e73
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.5-r1.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.5-r1.ebuild
index e7113e816ba3..f75a75fc309b 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.5-r1.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.6.5-r1.ebuild,v 1.1 2010/10/13 20:00:17 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.6.5-r1.ebuild,v 1.2 2010/10/14 14:46:19 fauli Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="dev-lang/php[json,simplexml,zlib,xml,filter]
 	|| ( <dev-lang/php-5.3[pcre,reflection,spl] >=dev-lang/php-5.3 )
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 09b6b824f25c..b52778242318 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -7,9 +7,11 @@ AUX wireshark-1.2.8-zlib-1.2.5-capture.patch 779 RMD160 7440a7d8a04a1b43057fc7c1
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
 DIST wireshark-1.2.10.tar.gz 19455912 RMD160 73cd4ecf1b7a6b2b05871b6ab925d24a5fef9912 SHA1 24d0be340a3506db893a21d1d996a65c33619b05 SHA256 4848a48f535f5137c93d47ce33d3ce73d2b0718b3f1f36e5cd4155728800be33
 DIST wireshark-1.2.11.tar.gz 19466681 RMD160 34d7c2095dd280193d0c36eca3fc5f0f1b2f714c SHA1 f2a1c558df42845788b71488f5a973e71682bbce SHA256 f1369416c94d6b2cf6a132be138e85cddca2e94b765f79737de5775b2f279608
+DIST wireshark-1.2.12.tar.gz 19494312 RMD160 e8af01607c182f500ef189be97632e4fc3695e82 SHA1 3cf873315360d566f4c18775046912c58d9f41fe SHA256 67cbf1ad4586facea61180979cedbec422b688d5971e53c125e91836fb94f1b5
 DIST wireshark-1.4.0rc2.tar.bz2 20419902 RMD160 cb20ccd71f5c8bf0abb4edd662306f82932efab7 SHA1 592580662e0c868999d6643a24fc3b9841e05321 SHA256 16fd00e1e120c7f57a8c5c8532f26d77a14ca254c2cb2c4816ec9a0499744f79
 EBUILD wireshark-1.2.10.ebuild 4572 RMD160 60602a61323267599cabf35f47c63afcbaeadb60 SHA1 edb6b819daef123f3969cefc386deb2b99cd8c93 SHA256 7afe0e09e81849e352925b405c74212046e95fad2f67906ea4776a7706859c44
 EBUILD wireshark-1.2.11.ebuild 4577 RMD160 28cded1066d9d7d8f6d5c9d053eedfbd2784a6c4 SHA1 78988feb19c35bf489b8f12f95cf2abac013734e SHA256 525b4028f7b9aa50d904a8b657fbf68d2f02222250e95ee551343ff65343577e
+EBUILD wireshark-1.2.12.ebuild 4577 RMD160 6dda4c30747ea7efb0bade00f73fdfd03ebb60a6 SHA1 00ee6e25dd791e7787b72216b0a63094646f32d5 SHA256 bcaf0108c2421dd1c8c1118df9a32eced57bc5277b1d64009203c2e5520473b8
 EBUILD wireshark-1.4.0_rc2.ebuild 5718 RMD160 a483a5a9358833a22c2fa4f70ee50c8d24711788 SHA1 d2ace392ce7d62b358c3be3e441c018ad27ebb19 SHA256 f3511919b978115a8cd41f276d23ed01f9b063bef2074ec3a68107d7358cac04
-MISC ChangeLog 36114 RMD160 cbe5ae8041a68de936e53051d957a0bba6d72d76 SHA1 0e53e98af9722a92f57c59c813300448f0dc81bd SHA256 6d5b5952249a3a412414cf999ae26faec54dd9a79fe32c23a78fe6eee33c015a
+MISC ChangeLog 36296 RMD160 6fb0df0ab2023db3bbe8801394f7e496bb090b76 SHA1 86d61e50a0100f27027cdc1375d5e6c8d03b7b2f SHA256 c5649dd7f083d6c2eda7af7d2c2510e5bdfae3c468577adf955a33c632375c83
 MISC metadata.xml 2242 RMD160 66dbbb758acc194df17217183b60a56f61fced38 SHA1 4498ea4c0f0f04213fd1cba2fd3de44565058f7d SHA256 2dfaef45c385c37c7ae8af96f5d8c58d9bff8f6186d55be8f2d034ebd0c60869