Stable for x86, wrt bug #515278

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
RepoMan-Options: --include-arches="x86"
Manifest-Sign-Key: 0x7194459F

3 files changed, 22 insertions, 19 deletions

diff --git a/net-analyzer/nfdump/ChangeLog b/net-analyzer/nfdump/ChangeLog
index a5be4bddedbe..432afbaaa446 100644
--- a/net-analyzer/nfdump/ChangeLog
+++ b/net-analyzer/nfdump/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/nfdump
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.38 2014/07/04 19:32:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.39 2014/07/05 10:51:40 ago Exp $
+
+  05 Jul 2014; Agostino Sarubbo <ago@gentoo.org> nfdump-1.6.12.ebuild:
+  Stable for x86, wrt bug #515278
 
   04 Jul 2014; Agostino Sarubbo <ago@gentoo.org> nfdump-1.6.12.ebuild:
   Stable for amd64, wrt bug #515278
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 30d61b7569fc..11951c475d04 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -7,24 +7,24 @@ DIST nfdump-1.6.10p1.tar.gz 579429 SHA256 0633b71762534ad5a4352a01c3e3ab00f6ee75
 DIST nfdump-1.6.12.tar.gz 733604 SHA256 4b597c3c948b2ac1a4b0b11ffbdc5c8bab8835f14718ad0f7896daeaf7b89204 SHA512 4ff61c14746f34f47588545e58e4e2fa679cc107192cb81d4ece1b7e18ad9ae1d3ce7663b90a302a64a3cc72cdd55718a446c5323ac100ed5fc3601931d866ad WHIRLPOOL 7acbc624868802e73f1d67f0984bdbfd67e9c3d14679fde360be7fefbeeac18d884930802abb156b2a283796f690588c4a46bc12a3287f791b9c6e87f04b02ed
 DIST nfdump-1.6.9.tar.gz 686587 SHA256 734943ab872d3642575add5db64ef5755f85a0a9600b120d5ee09bea4ef98dbc SHA512 07cf0bbcd001b38cc6791774d3797944256ba51513f1d97a18532248a13ad1dd0892bd75c6665aab769e1afaf99cb9e83372b79f0e814dd1e6156000eb720aa6 WHIRLPOOL b70b24dbdb4aa774d6cfcdef9c27835be14da5f06db3367e8f297f4dd702fe80c49888305cfdbe61953cb212f13e9f02de8735bcaa3ea5e63441be7074fcbc5c
 EBUILD nfdump-1.6.10_p1.ebuild 1464 SHA256 0d33d341da535a650a974354810462724d42924e988499f4aafc079a131b4e54 SHA512 ef0ba1bbe167091b440d142841d6be7a4cada9235fc9d8f996f0d27bef48193e2450dfa680fc84fc1dd806697e8ed1bb13d5f34d95af5cc415ad1119efd440cb WHIRLPOOL f7d401f7da74bd4f572cee04d1e52dcafc6638ed673bed6ed9374b44b513ef3350008879b734428a732395eb92dcb9ba9e5a893f224ffb01945ce00acd4ef995
-EBUILD nfdump-1.6.12.ebuild 1648 SHA256 255c3a992f7c9388851530bfef0e8031bf095cabf7470e73782267ae27b3157e SHA512 0e675f78d82cc90b1d895351dbd0b0ad8b22ba108cf9b7a6813b0b4961d3f9ac2818177d44a628cb19d5039d7dac5822fa868af882fdcaf5d951c187176bc737 WHIRLPOOL eb67a5dd8c9a35a2885561e7f3a40d21174cea501438fca1e5937d52807c142ffa6f69547217ce56cb970833dcbfbbb6fa55d5b26dbd7986ad9b667f0316b50e
+EBUILD nfdump-1.6.12.ebuild 1647 SHA256 e0d519e0a498d43a0f64d9a93bedbfe6c0c6b78c34a5ab536e46704e8536d749 SHA512 b929cc8e13a6cc7f63494f8220c3027806f3e74b1d2f88b3fc12cfae2e55a384bf4c571d65c01189a7d4d3f6497a2b3a8d86b7ed9adce2713b33f9e29a45b567 WHIRLPOOL f391ab0488d1e93f03075fd48a65e0350c42723908df4ce1a3976d466730e53cdec5cd0d24bde34eba2a1c4fc5000645e3f83b0c52770c8c2381041757b94835
 EBUILD nfdump-1.6.9.ebuild 1458 SHA256 4d58754575d1eb34ec567058dcb665d988ef1054849368fc56e83b2debce3d1a SHA512 41387a440b7ec857938e9287f3008d0fde8be1dfeaaf76013d7a3ae747ed4f21665bd9da83da83d53fad86f9f04c5c860409876cbf58be189721299000be4864 WHIRLPOOL 5379dbf3f654d5afdfd3b868d39803aeae0f65444bbfbde9dcf528c6d91afd24fd30ef1165ce7a70a64a67fd5a6cbd55f310034fea08f81f94b97d3161012b8f
-MISC ChangeLog 5484 SHA256 6a4a36b24684f88ea2148b5102003faed6738151ebd5e5d47736b416700869e8 SHA512 d3fe321365d4061dc2092c581b8607fb95dd40d6cece3ae523965ef187c9ecfb15e08108d35d4d0b3df644eb027a57f638f8d98053839de6e93da6ec3087b9a2 WHIRLPOOL 48c9c05b0d083780f7feefd354333879f2b20e8a446e0cae258461dab67c6618b40a0f882df313bb5c761da4185e945f5a7523621e38f2d3bc4d13e3de47a635
+MISC ChangeLog 5590 SHA256 14947aa4ef900dee9e6f1d70c8a83a3bfc19f0f33313650947c43bee6906493a SHA512 7a9e42e0d61d94fd32866f4d2523e9079c7961ab52aca2e742e1338bdca6a524f1ce251fd22041c25a966516e8e6514e682fa6a16aa4df2972870795b8263ad8 WHIRLPOOL 49e06dd6838ed37e72ce08489981d63de3d07dc354a612420692ce2cc5c691e2d59a5f6fc50af48697f9a423d3852077b497036d636540e4f85c571df0dbb218
 MISC metadata.xml 731 SHA256 3bb173957579a6070cd6eb51731f2f196314e0d4b83e989425ad3af4f4d4b027 SHA512 a85786a81254c27b0823055a15c8c8d12722aaca35329f9072da15da0d48eb0f528f37a25241f1095b7fb2aec16f67a4be3f06cfba6e78b5860da34fb044329f WHIRLPOOL ce811c0eac09ae59766d098362b129ec880044bbba6f540cc560c882f4bab1c147fe1b2ba48f6a0b38a437a2de704eb8b0164587817aefad2adc46362ca2766e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTtwFJAAoJELp701BxlEWftFEP/18iXNo6/BZR0i07MTEWR6lL
-xeR8w9ukYMIxrnnNSpF4VJV9B+Q/Y8VY61xzcz1PcLLKyZJIRSJD0BG3GxZBbacK
-FB+hbvZMbcvMsbbG9ckClDSeJRsF/7zIFb6mMVxQYXA5gYcaB5Mj2wOeN90So3fj
-zHh7fqaGeW+6DvED4kD6sINplG+qOMnZAjTXHO/0Glo3N25lp+uP0RiftV+hHd20
-Tup+af74mDz8J3xERV7z7dD0btfWpV5U2q0MbGICDdaZIqfWoEeh6nK4cP7IvkPR
-6gVEwDUoN1aM1bt0ohZeIRFThKyYc+uhS9nMtKyz1AjmDUcoZGNWSBsIyIFTY8Mh
-9rF62bAUaW06+adhSBxoAgRZC/D2Av98lBwjYGi8ubPpNAkPfa1fPT2C0gN00Glp
-c8GXywDQwPzPFB+1MqXGVWePtDEAg3QxM0hmSokGxbWX1diPTOfOoMjIQuB8MUhc
-Ozg5Jltz6tE8T7fK6CDcg9mBn9Vao+tKrHMzLo9m2ISt3erLwxu3sTWndWC0wMNX
-92gUQqn9Vqio8E9QH/8WMO/sjEnV645xI8B+fvBfk4b9/d0cUaHydDWiGLl6gosc
-8c66dHvDI+/wHUvhMO7FvHRBg/NVbHWVBLJsR4YoS4KjGfwWU4BQfgxZ1JakTMw1
-+RtnLKwL3f5IJU0FoTaH
-=xG+f
+iQIcBAEBCAAGBQJTt9i9AAoJELp701BxlEWf57oP/R6I1wBfyYYAQTRftzme2BzC
+fv3cZXWGcfk0YaNGVR5Aq7kUFEruMTEvNyUvZufswT/L1v/dRvPpcSdzr+VYgjPe
+X/iLGEnPYjamKMdmaSsBZ6fTklQdV7OiAZ9gne+wVqOknqMeNaL0+PH+CudlkhtM
+Su0yvSvwoYDam8Rb+QxK2Wh2i/2sAq+KFefu0GRMKSiQc/dljG/EwM7+zfQz1wRN
+BganxORl1pHnvyNXgDyHHsOkvDpLMStNIzaLpWP4DWzAEPLpGvuUxTOaUc3feD1X
+foqp69gzDoojvccjcV2i4NYy6JSoNuAH5OIGFF6OTeRryUDo+eP5K5zcnbeXW6pI
+/YLDpBdjCTeJy9E+2lr7Oue1plkduppjfaxmIycDVMz/Ej2X10+vTtJ+TbjfC2EN
+dNGNssKJvulNX0iMtf318I8YLBajiXy3w6XCn4tEsfo4+TtwHO613+G/uFqw9BMC
+96A6z9LbrIbspm8XY7QLBo9bdEVME4P3IoWVdXzJEzRQ2xxhRKsmRYGk31/r0cDP
+zEwg+v5J7p6cLK0DQFUF3kNsPOmuy12kEvPBpDKIz6EgnB3D8x3J3g7pvd9NtCul
+yhCsacX++19yWQg04hm7VBS9WYFG4KUoIBxlSfXSr5nEXLzcsV9GSeu8uB0jtCh/
+tq3f1tspJpi87R1iS9VL
+=vbix
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nfdump/nfdump-1.6.12.ebuild b/net-analyzer/nfdump/nfdump-1.6.12.ebuild
index 21228626de4a..18e7f342ea75 100644
--- a/net-analyzer/nfdump/nfdump-1.6.12.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.6.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild,v 1.3 2014/07/04 19:32:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild,v 1.4 2014/07/05 10:51:40 ago Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow"
 
 CDEPEND="