Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

7 files changed, 7 insertions, 7 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 8e29e4c6284e..182c077230bd 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index 6aab899394f3..3d7a3b1c689f 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -5,5 +5,5 @@ DIST tcpreplay-4.2.6.tar.gz 3494827 BLAKE2B 57222d7347efd780d2e1297145a7d81c8cce
 DIST tcpreplay-4.3.0_beta1.tar.xz 719884 BLAKE2B 872ea10a3986f122cbf48bf9217d8df96f8c8c08e37aee095fc92ab5d5cf2607b42327aab9de5453c8bd198e1a32a3ae8964b085ba3065a6b3adfd853dd0b43b SHA512 55a9c419d4604cb4912571a631035ad4bc70d06b44d0248629a47b76411c23cba63b824322c23e0f2eeac4131a5d6e4c1fb2b9a60c0f57a7397d46760ff818f9
 EBUILD tcpreplay-4.1.2-r1.ebuild 2020 BLAKE2B a8ab8eb44bdb1f221541ce2088afd501f160095ff3232892715f0bffa68c343fa7705e09586903a2b15cd3ffec038f8965eb88ce9abf57838df361de6df57a18 SHA512 f39b594d93adf778e7432fc0770ac4e3328fea9cb082169fe426e09034e997ddbff43b5b2678ed8324e7d0a95fb05513384c6bcdc94816711b05e2bff561c67b
 EBUILD tcpreplay-4.2.6.ebuild 1923 BLAKE2B c376b7b1e702e0a38cf05c8db6c574ca8b5c41a4ee22fe760969519be75698b081c215ff4314084fb7f58fd7f8ee3cd6b7efe180b3c69f2e52f1189b5a3f8ad0 SHA512 a9d31e3a2db7b7ec12c68a3229c7f0137daaaf6acf35808f7f797f11c025263c3f533c528d5bc763fe8f490ae24aa72f2351a5c2ef9154f96e347bf9c1486752
-EBUILD tcpreplay-4.3.0_beta1.ebuild 1927 BLAKE2B dfc35af47ade8207971ace379041582cf537a84ff866702a87cec4e9a0fce3248b473491e07fdac8773d06e267305b5309d52a636cbc17e4b35add19ead3f903 SHA512 b21165352d6bd301ef2f5a413a2636c9faa8018b44449d5971783fa2114716ddf3a38daf9f019f38dc676ca775e4d7f9bcfb571c89757cc054afdd71ff40c7fd
+EBUILD tcpreplay-4.3.0_beta1.ebuild 1922 BLAKE2B 1c0157c7a5b5ce349e09df3a1ed23e0459c8b24c171061b9925032cfc08ec3e1ad83f7d2189223ec0887fae40515c802a8ce190339667eb1e1a81d77aa54fbfb SHA512 e29584f2e7a1865ba60c53d19dc14a74ce8b491fcedd98ba2afbbe2adace9192eb16e2d36be4f2f63e3f4f7326058ac31f3531aa3393eb492afab759a752949b
 MISC metadata.xml 1116 BLAKE2B 23c8b7009a77b68831affc57432a87a31fde213d7e7ee88f68ced4a4e21a56c55f97497e610fc486a42c699759ef1edf1904fa9b0fe976df4fc9930535f97037 SHA512 58cb13a648ba7b9f9fd8c7a7cdfd37d56f0d7b957824a55d63001a8708f93d529b29e52df051bdce0c87eb672d24c7b2c35ee8a1e94ba062e2a1e12dd0d0ee1b
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.0_beta1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.0_beta1.ebuild
index d9206da3d29c..24946408748e 100644
--- a/net-analyzer/tcpreplay/tcpreplay-4.3.0_beta1.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-4.3.0_beta1.ebuild
@@ -10,7 +10,7 @@ LICENSE="BSD GPL-3"
 SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV/_/-}/${P/_/-}.tar.xz -> ${P}.tar.xz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~sparc ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE="debug pcapnav +tcpdump"
 
 DEPEND="
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index a1c76a7673f8..118bfc83be40 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -11,6 +11,6 @@ DIST wireshark-2.4.6.tar.xz 28851192 BLAKE2B 19a69d077b794ab07fbfb22b7cf9e61ff54
 DIST wireshark-2.6.1.tar.xz 28386244 BLAKE2B fe45f4249c81fd83ce35384b7038d7f1b5e21d884a5faec4344dda8f0c8b71393207e043672ce57bb6f1c45800ffce8feed8573a064db8048b3c0268feb0b486 SHA512 e68f7fa5975f10feccb76ab64c9a00f141cd04a12fa586a9839c93630d3554565d8e2ddfab83ec31cb813485b14b3227b7ec6e59baef007a6fe74b8b2a5ed444
 EBUILD wireshark-2.4.5.ebuild 7380 BLAKE2B 0fd3f07582d42cf9651496978c983c9cfa54b2ee0df52151c04bcb7ffd7c886aecf233598226dc2427ec0fbf6fa7d5d4ca8bf92f361c853a10b72dd625fa72dd SHA512 558350df39da8b7419d63251544900f519d920e120ffa40cdfefc7b088731d2ac6755928758bd4c9379f49b1b00b93f4cda8713601e340647d955cc73e6e590c
 EBUILD wireshark-2.4.6.ebuild 7388 BLAKE2B 1d73922229e3216ee9aeb3f95f964da3aa6afea193e88209df3f91419ba99de6de201538750dd79c3421bd8cf12dcfd1b12022b0be97a21f3e743fea17f70107 SHA512 dc66e5dd25527f9fd7ec05f6d810b4d92f2c138e2337def5571e7a7bcaf6034099ad649869190aa366700e6223e9de09997fa36c6910f9dbbc5e0c736e26a92b
-EBUILD wireshark-2.6.1.ebuild 6752 BLAKE2B 819c84447a18d2fdffde575d7c8979e69221cf022b83ac0d3dc8d0225ec91ad36feca1610bfb36bedb555845dd59c41a627112cc24788e1fa979012d9a39c1b0 SHA512 bc4a8279532e3f665eae398662df0d56c2e8e17d123d3241321c6b112d29107d1b8826d7c227183f49f4e760d8e1f5be468f6bfdfe4b6664518ff83581a985c9
+EBUILD wireshark-2.6.1.ebuild 6753 BLAKE2B 1a67962d383ec161863f0289792121ac1a248aee550005005be2683728f9188cec95a484c25a8ae023f23dbd0850a6725c6f8a7b754d26e715f0356075da6c43 SHA512 271f9c37fc1c59063f1feecc8f5392303d01587833d9736e63146c037ad161cd875f9cd912bb93abf13fe3b72300c4826016cb21cbd4b3c704163c0c476e4b05
 EBUILD wireshark-99999999.ebuild 6599 BLAKE2B 88bd901752d603d201d8f5cedaa986b70c19f934f3998003d8f14039eb9b86dfda8983a5a987f70efdb32fec3a2075e0059492d82b66f8ae9510a2475a434f43 SHA512 8b3d5fae3df5f2ca4cfcdd9fcfd110dbe88e7b9a283f2574242ccd7ef39aac44f3957d1488dc944166af7445aef6dff2d6f0c7371a5694a67ca877806371fc5f
 MISC metadata.xml 4787 BLAKE2B dcdb28c47094cfddc0effc4c16aa9132386f94d4d6e6cdb46f31a06ebb5dd7cd5c7bf967f50c6a002b7aeecddeb8aa8b86cb5961405a463c10389d6ec9b5cb7f SHA512 b683b159266bc37471ef26f6c0c4b2e94f72d2a77a2a7647e28b8b49e611973522af294c39050dbfa8aa5cca65bf2670f9d4c1e6a93d01b386e76f1ab75ff2e9
diff --git a/net-analyzer/wireshark/wireshark-2.6.1.ebuild b/net-analyzer/wireshark/wireshark-2.6.1.ebuild
index bd104037aace..b2bdb6d5cf75 100644
--- a/net-analyzer/wireshark/wireshark-2.6.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~hppa ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
 	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc
 	+dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
diff --git a/net-analyzer/zmap/Manifest b/net-analyzer/zmap/Manifest
index cf2981c13555..028efa36002b 100644
--- a/net-analyzer/zmap/Manifest
+++ b/net-analyzer/zmap/Manifest
@@ -1,6 +1,6 @@
 DIST zmap-1.2.1.tar.gz 99840 BLAKE2B 11e04684444f23d30f0e91b7f70a3f60968cffb02623c1f3918774eb92206ce6fc9858ae41ea899cc84afa8e5205247c7c2eb9a57f75cc9acbe336c4655adc32 SHA512 1b3d7fa41bb75c859463f3ec8bcde31778f5d91a6f561aa9638ba93be97dacdba89493574581ce52aebcf093a86b042dcce41cffe6cb0849bb76a6005b714be2
 DIST zmap-2.1.1.tar.gz 131689 BLAKE2B c4bcea835b080dca879c227691230ad135d1822db0b81245ea60963b0a78ac71fd64df7ddca5d5a762c3d7dc67f2d689fd9d0d13e0ee9be21033de75c61ebd1f SHA512 9d62dceff77fa20ff5945516b0766340366175947130bb844f19c11dac7676e658bcdedd6be29ffc945706aa3cdc0e4ac207bd127b618592769a4d3e75892857
 EBUILD zmap-1.2.1.ebuild 827 BLAKE2B df66e2ac38b090956169fa0125f8563e4f7d80de12ac8c25e3f797c09eaf940bd50b3de1b49c651f71b352d9a5f6697fc56057c216983f380dbf01794ebc83e6 SHA512 d804ffea470b2ed54edea33eb025ce9c47f986e118c1fad063708ef75450836a78c05b9c980443ecf2cc5ff60993f8c6291ebd72b3090255eb4eddb420185dc9
-EBUILD zmap-2.1.1.ebuild 1001 BLAKE2B 64c3264b0ed163f307637dd3f01fcdd03ecbdec738d64fc7735543a4d92a180210189dec5919c06be29a6492bb74a1293feee1b5dc80b70c3c41a47a643fea45 SHA512 b64eb68e9068cd3e0488dada4185acbd47585f373ec03bc067ee4316f10b3f7b84bb9eacbbbd7ff06f0aac0ed6b09e317d02faafba23181a6a99658287121b01
+EBUILD zmap-2.1.1.ebuild 996 BLAKE2B b949b8f2cd63b06ac59d9a37cc5d287c782db0864e5acbe4ea2221213a253ddff864ffa9274fe1f0ca7556b6c16c13bd87f5763b48146e728c2faac7ceaa6239 SHA512 9c0a8d348a455e2c51374fe2282af3f37bf395233c966c535d99d35f359b083aa6d6e0ffeef22a90aa14a5a31136da0801b05cb2f850f1f88512305d3ebda061
 EBUILD zmap-9999.ebuild 822 BLAKE2B aa127933409d7e7f4dba6558b99085d7681ecb98b833a46ef88d08da2f680f26e6d6b00f66c519793b5f7b6162be31a47ff8b5034c46acd58c7eefd376fc6aae SHA512 17404dc9dfa2ba9a5cdd138a66574d99d65c6e4fc3dbf64fa8903ce0feae026e3bc725ccd2e52a2c91c272ef86b3b0b15f1225631f439bff0a8f3bebd6198284
 MISC metadata.xml 1137 BLAKE2B 1474e02866f4ff83084a8dc259badf0904219685b5c11ec357eb07ce17b4b07c99d43a5392e1ddadd08b09e510634493b940bd7e4ac4e22a936191aa15825757 SHA512 ba948942b57ac083ad7a7baa0b31cdb8d009945419e20e60c374b0bda1b009fe09eca2a7575f79ce3d05f3282aa3e6cde061b72eec512bfecec6d255dfbfaad6
diff --git a/net-analyzer/zmap/zmap-2.1.1.ebuild b/net-analyzer/zmap/zmap-2.1.1.ebuild
index bab11e96bbfc..0f401274207c 100644
--- a/net-analyzer/zmap/zmap-2.1.1.ebuild
+++ b/net-analyzer/zmap/zmap-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="json mongo redis"
 
 RDEPEND="