gentoo resync : 12.10.2017

7 files changed, 345 insertions, 6 deletions

diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 3fa6b4ecc510..82fb5130d758 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -1,4 +1,3 @@
-AUX logrotate.d-munin.2 532 SHA256 3b2597a52a2dc6b49099be6ab9c685be2ea09ed136666c2c1d56af1883fe4378 SHA512 25cd3017c9edcf07ac8e54b75a7b881255a4043cbe6c5f99320aa87cea00118be03010d9b76e5c214eeac82ebc4e4d3807474c5d112bff23d83238e7650d6563 WHIRLPOOL bc956e4454887cc1f102eb4ac0a563b5317acf9cd83a76b1bf379b2cd06e5518878aded99be04e7c03d79bcda02265864d3b83e65afef76a19da81464154937f
 AUX logrotate.d-munin.3 647 SHA256 07059049fd24b261142203e78c217bd037d6ba4d666bcf29c58fcdd3f49de953 SHA512 14ec0363b561695ae58db95e8d6fc68d7161805cfa0002001ec60566d0b22cc6103ae949de12715dc646131d692e023735895007c04807940c6d1a22de342302 WHIRLPOOL 49b8b65f89c208ae6ef7ed4f7750a9d74d9b5e5d76d1489859e72fdcba66380d7cd34abb0f9d21ded4a991f132aa449bbdb13b60a255e4e2b15e361472f3fffc
 AUX munin-1.3.2-plugins.conf 1760 SHA256 50d99bb4612ce0a7be79991c064ab16a833b3312afd8bafc6b9ab13a1ba79e75 SHA512 c3498c4364cedd27016562568f918995be92dd6b3c2735ddd008190de0a729f8ea59e61f8517f6f48beaad14edb349af7476a39f55d246ab06d6cbe91679565f WHIRLPOOL 2accb14a5a72ba89c9559358d3889c1f8c6980c348b8394c0df7faf13bfeeb550b664e8746f8b3fbfdc64ade5d0cb0cdf7b083aeda629b2c93e34e36e78d7efd
 AUX munin-2.0.33-perl526.patch 849 SHA256 baafc45d3b7f5397af02c44b5dc81cc19566d3183c716c194b5f852e96001431 SHA512 b20e6b7de057ea88cfe5420fe79520d1fbb23cfdf961096c355c6bd48384b6d78a74b7545e8ded47374eeb5b884f54b39556abf950577e025d8221f69ef43789 WHIRLPOOL 0564927117e44b33c559645ea2759301f46afd69f2fad4434809e73fca248d6c07e3c530f06740306a42a09d971f0cc7def321c7c39cc19bdc452368a46edbe6
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index 7d7579c22064..05ea4a1cbdf1 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,10 +1,9 @@
 AUX nagstamon-2.0-setup.patch 1095 SHA256 1d6520383ea4870c008ecb4423e9d56fc0eb5e317cc95c284aff6e0d73adda84 SHA512 93f98a8e590bd46f8745f5ec9b4ea363a4c4fd7810013aa329bdc4fce12d3f8bfcea46412aea7c87188b4cf2634d002c9f91f09e12870c4686cb0646f6c6a428 WHIRLPOOL f62efe14dd58d5319896b7a112454e831b56b12740a243fab0c8fe098803dc23274f42d02f0cfe916e7564fbbb70c62d2cb3923f9965a88f96309a9348934004
 AUX nagstamon-3.0-setup.patch 1139 SHA256 3ac25bb7e4ea5dec4dfc78b59324db3563f84429fe79f2d9d88854c50231acda SHA512 7ec4f621e1dc91cb941811aaacb6322fee8024d39dfa65e39b3a19631a3ef7c78d4fcd4d8df5630b76904e3c415290b35ac777c4d0e863ce83e15832d061ea4d WHIRLPOOL e1abf37a3c3d9cfcdeb404244d36d0ccef92060efb02d2c82a145a7432d5cfea7f93291be4aa1e97e7645cb0f6127c6c7166c97a063c2f72be5d6b5dbca256bc
-AUX nagstamon.desktop 284 SHA256 f339017716aebaca3f75b0ff395809823d8ac0c0c48803874104bf73fc0c33fb SHA512 1ac7315d89967135de804ccf4c4dd78e28a6018e72bd4ca2274aa81fde8978d93542cf5ad96a58b44e0f1efd4d397b1c42dcc339a3f32b0b33346804162da60e WHIRLPOOL ff2cbafaff167e5e36ebea64f3c66c07f67909c593d31a13482dad1cf6f8a5ca6071d00b82c43cdd4f23ca5927bbf136b4d143ff30d8ffc6271783c45e007559
 DIST Nagstamon-2.0.1.tar.gz 535814 SHA256 3d4b22190d47250b175a4a70b12391c694ba2399832320887e5909e1ce3dfd7b SHA512 f9c8ab928a78f289693ae58cd3dde6fa75dd66dc931dbec6a4affc35bd96f16c39a03cb441575c9ca42e810ae5962fc7226513b8cc2a17871e0365aa3a207db6 WHIRLPOOL fb1ab6f9c3ccef81f4d62f238bf998d98186ff24d44e2a41554a13f82a783e8a14a1ac21d046f179ef62347dd252cb34d818d032c0ef78d7f742fd45acbec033
-DIST Nagstamon-3.0.1.tar.gz 541845 SHA256 e1782d5299205baec54fe003fbe5e4f6bec15986c1e7a942fe3af4b381332128 SHA512 1facbdbba9f9cb545f73b7d63f7c6350f7d01b3dd1104444c2b1c50272361b21f9f1cb2f72f019ad22a554a0863aaa29d0780e8722767e9c2448d8980207c252 WHIRLPOOL 857fcfb39eb6f451dcc111a11b661c87a31d55d075fabfaa42320dba48433d3597e6bcf69356e293be3da160805667be9b00cde2e87630906b69da891be1cd0c
+DIST Nagstamon-3.0.2.tar.gz 542005 SHA256 a6e9fbb3c4ad8f88ec8540f62457a7d32b6180e6aa0a5ff28ddacb15bc646f9d SHA512 8b05b74adc7399b84cfb66d4c55ff80b2a37af7612496578bdc72ce00f712c8eae087204d00e7d7f1e1d35377f7bb8460d5cf337e315943a48a4ad5108e8d14f WHIRLPOOL 17504e479c99e9a944a47c5f263a89cc3e143376e406cd0e5de399ce972675fbb18a54833eb01658e7bf199b5dc5b0c819197aa0c0539c6badf74d14dfaf42d8
 EBUILD nagstamon-2.0.1.ebuild 1193 SHA256 6fdb284059aa1a3144c15386d4e39400dac664be7fe70014a3159e046090f6c9 SHA512 4e4e469d11fcb40dfc5a3a2f0ce5c95886432c92f11116f9e860fb7f3ae7a0159ea26108bf32729ef75807bc37e885e96cb97b22e9b806057eeac0e27ae298e1 WHIRLPOOL 93d273581c0c0d80bff18f1a24c874bb65a64394d48059109b73624f6c83519a6332b7290fbe6762dbaff5ea78b7016b8d327828db49a6468a272976b573e8bc
-EBUILD nagstamon-3.0.1.ebuild 1379 SHA256 8f00073bcb8b04b9386500484c5c8a269d6e991643cca2fc40de318d1b42bab8 SHA512 9b0f15f63c4a6ede8f885a1ca5dd234ef8b9a93e0856e7e5c5e5654a46ed5c0953fd480e7ee3ce40ac3d179a200ce368b691a38481ee1cd4ec8c9ee820086ba4 WHIRLPOOL d7a0ea5b90c2752ae7d179cd4005e55e0e7acd2980ac76cb3e9f1757f2e4589a6e11c3a88d25b2f4530b4d7aa1aa17d5888ae44e453655b77b2e6228e989b5a0
+EBUILD nagstamon-3.0.2.ebuild 1379 SHA256 8f00073bcb8b04b9386500484c5c8a269d6e991643cca2fc40de318d1b42bab8 SHA512 9b0f15f63c4a6ede8f885a1ca5dd234ef8b9a93e0856e7e5c5e5654a46ed5c0953fd480e7ee3ce40ac3d179a200ce368b691a38481ee1cd4ec8c9ee820086ba4 WHIRLPOOL d7a0ea5b90c2752ae7d179cd4005e55e0e7acd2980ac76cb3e9f1757f2e4589a6e11c3a88d25b2f4530b4d7aa1aa17d5888ae44e453655b77b2e6228e989b5a0
 MISC ChangeLog 3771 SHA256 2f1e8c8b5f1d22ff1612a0e1e4d16e939c6ab015798314a2bc8317dc6d70c0d7 SHA512 12a41982e6217a0e1bc0267b769d88422f2ca655590828d0393e3d0d0c03129dc287c81e6c15ea2ffdf63db2e3f628206071d7cf089dd114c23df7eb75275c57 WHIRLPOOL 5463a92f0af5fad985881181eeb5513c24554594105190a0b294c8ce54f4db9a52a3be440221ec3ffe960714a14f4b761b679455a8bc26b9880307ad576041c8
 MISC ChangeLog-2015 9077 SHA256 84f7785a087cf79ae90a50c6308f486af11672d64465279f4250543d8cdab60f SHA512 ddc3c13957dac3ad83b9e12721233c683ddf759c7430fe42f6b039e0930d8e31bc94a618f5969e843c5d5910e73c20cd3abd1062431d36515874076ed226d6dd WHIRLPOOL e504c5560cc8820789b4005bc04990b545749a8b30957dec61442dc02c00f07e78dbb662525fb5e8585d8786f1b9a754664770a21668f766d13d978d4e42a06e
 MISC metadata.xml 525 SHA256 97dfb7033f8f6ad2664488b47a5dc9bc9e64859045d84a73f751b16dd13e2bd2 SHA512 5a1bf5be48ee8d28b501dceea33c65791b13cf0301c6bb170e4fe5ecd7b771cc28d3e9a49b82440770800854146961069cb26529ed5fe3e2c9a796329b085c64 WHIRLPOOL d3cdcc13c69163617e09965524c96f0a8536c3617fb2296bf452179ab742ad53ad5e15d62233d0812a5316a52257d00cf52e3a30625b48ebfd88ffd98e4db80e
diff --git a/net-analyzer/nagstamon/nagstamon-3.0.2.ebuild b/net-analyzer/nagstamon/nagstamon-3.0.2.ebuild
new file mode 100644
index 000000000000..992274b0ce37
--- /dev/null
+++ b/net-analyzer/nagstamon/nagstamon-3.0.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit eutils python-r1 distutils-r1
+
+MY_PN="Nagstamon"
+MY_P="${MY_PN}-${PV/_p/-}"
+
+DESCRIPTION="status monitor for the desktop"
+DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems"
+HOMEPAGE="https://nagstamon.ifw-dresden.de"
+SRC_URI="https://nagstamon.ifw-dresden.de/files/stable/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/secretstorage[${PYTHON_USEDEP}]
+	>=dev-python/python-xlib-0.19[${PYTHON_USEDEP}]
+	dev-python/requests-kerberos[${PYTHON_USEDEP}]
+	dev-python/typing[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES="${FILESDIR}/${PN}-3.0-setup.patch"
+
+src_prepare() {
+	default_src_prepare
+
+	mv ${PN}.py ${PN} || die
+
+	rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
+}
diff --git a/net-analyzer/prometheus-node_exporter/Manifest b/net-analyzer/prometheus-node_exporter/Manifest
index 07e4be5c9dab..47a03be270f9 100644
--- a/net-analyzer/prometheus-node_exporter/Manifest
+++ b/net-analyzer/prometheus-node_exporter/Manifest
@@ -1,6 +1,6 @@
 AUX prometheus-node_exporter.confd 111 SHA256 51b9d1c0a9a05f7ccaaa88ae8bc5f6c31c10c7efb097e9cae257cc6af658b533 SHA512 cce5db8eccf2ecfe1198aa8252b04fd6a96006f707e7132c2d01c5400d175551c3b9890c4d57fec9ccbe17594dfb937e1f99ead0e1c3fd8cf22930dabd70418d WHIRLPOOL be439ab6a38d5a61b5c33b4140040f61d783b64ec39d7f0bb837ce09f123293eaec435703df0870b80dc1fee73d0a8c86b65db1d6da0c04c34128037d9add866
 AUX prometheus-node_exporter.initd 614 SHA256 2d35b4ecdf385700d1b341a4d4ec0691f9663a220acd45755313d15d7d0209e8 SHA512 5332d59b0548939fa41fa666f013eb573ad7bae699fd65ff6a0171d74ac5ab8d14306beff14046b8eba06fef62963f0f0b7194b47c511ddb4c6050ba72cdb831 WHIRLPOOL 9961e0505c642b82a8af26fe40a3e992504456363014c98536da12d34ec4626dd77c6f030e0512482a6146a1f6d98b22c0624a6a5b22b2681e72eed3e47ca047
 DIST prometheus-node_exporter-0.14.0.tar.gz 1086402 SHA256 312d7e1c07d6a7548f2f116b983da87f7b3a7630f9332eb41c306fd71b2e6ec1 SHA512 28b1c3a17b0065f7005636f0751e535f9455675f7c17546a584fb709f43f2608e4854fe4e7f0e3790b89eff21016b41dccb0a96f16eae466de1040b57c4b1c98 WHIRLPOOL 176eb95a76fefb388817fa27f0b43fca9b1ed235d39e73e97254ef829025d7493f710ce0ef2cf11b00ffa509c08f7b12664cdff38939a5ea62eb79e7991c0bd3
-EBUILD prometheus-node_exporter-0.14.0-r1.ebuild 1207 SHA256 418f157ee60d11ca328c473080b8c51eaf4163728831f9d15bec360e20810f74 SHA512 54d13e54be3ce4fb029423d48bfa6cea570ed645c5a58e561a7e6fc56e8f1a7bf600384e790646806ddc82a5501e812995ab937e0177ded8ae32531645b5d1cc WHIRLPOOL 20bd9780882e73a12ce6e38a96f7f527ca3679610614dd8a45f60158b1d8eb947a66fbb3ac4e6387ca66d13b7e1bd1173ff0286890ed1131261562d1b4fd0fec
+EBUILD prometheus-node_exporter-0.14.0-r1.ebuild 1221 SHA256 68421cd22c0a53ef0b1471f326ad6f487f8fb39b7c95447a2d31257a81fd339d SHA512 12573499da3fadf971ce5341d85f06a6157f84294d2e10ed4da246f7af94681741e70a593b16ff4a199174f942c7207a7ffa223f8c631fa822913e902dcbe692 WHIRLPOOL b07e4ee0c052c69a16f98132868ee032bd64f6ff296f4626b787f1a81f9ebe7deb386f484b8d039226de377a5d57d91aad0846a5179d8982aaa09457a2b17b93
 MISC ChangeLog 481 SHA256 0ee6994116c7d3d57b63373d23c1eae0c9f937018749b99d9d047fe5fd4d2b23 SHA512 bb4010b6957fef58e18717bed4add6840af8bb60c247e96d1be40612b0d88664186f81f5d99e94c6c0688783424b4bfd0037c71b1ede37097a362520718ef021 WHIRLPOOL b4f6808f2c6c20d1a47c5620942a2dea412f7c0c3bb477be84c89e7fe8dac0dbd107338f0acf344f857bc446e39aa328c62bf601e5d9eff257f4a57cecbb36f2
 MISC metadata.xml 345 SHA256 33246077887c4702208b9287ea57ed0b62e5eec5f1d5d84ff624c10b8f1e0af4 SHA512 d4966395f1b3e4ac0c5b16d9910e67d3552099f40e8c70d9094a40c415decd00c44f1f032d55ae7efd5ad6e55d103d001c0f8394fc3e7b0817699ad17e42774d WHIRLPOOL 5bd5a43ca3c506b460999fba8ac3823e2e137b146844ee59e7a6ffc1057715f02926493a3b335066abb92471becc388ac258aab7cd4849e614622f20bf3df370
diff --git a/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0-r1.ebuild b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0-r1.ebuild
index 48eb30aac765..5714d4e1feb6 100644
--- a/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0-r1.ebuild
+++ b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0-r1.ebuild
@@ -38,7 +38,7 @@ src_compile() {
 
 src_install() {
 	pushd src/${EGO_PN} || die
-	dobin node_exporter
+	dobin node_exporter/node_exporter
 	dodoc {README,CHANGELOG,CONTRIBUTING}.md
 	popd || die
 	keepdir /var/lib/node_exporter /var/log/node_exporter
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 592831a807a7..ae41ae794f04 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -4,8 +4,10 @@ AUX wireshark-2.4-androiddump.patch 1135 SHA256 d381eb84b6b4a1e6807de6f062c129ea
 AUX wireshark-99999999-androiddump.patch 198 SHA256 7607082abf45448fd4def4693522e219b448f92868a199c64ae7e2f9387a8494 SHA512 7fd971d2b7bbf0bc3685021e0bf55e412e9995cb5d95be85da92d3191227f4af4de94b13a99cfef4f71c74225aa3fd471e5ca23ac6586ab9372f563f3c18c967 WHIRLPOOL 497f50079df7d4aacc13e12ad1a4f09a37701f6cb8cbe5fe89bae905510eedcfb3f037504d4bd726686923d9883403a331dc3eed0150263f35c3998902fafe35
 DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44
 DIST wireshark-2.4.1.tar.xz 28780384 SHA256 02ddbcf9b10f9dfa1e36eec00fe00cb5b5ce8e07203843baf056ac7909911fcd SHA512 66f3f9abecc00c4c153c61f42739522b091ba06cc68b6bd79fe45a1064192fbb88e38e96d4df6722255b06a3520f23d2db6c5fa5e4faf5e8641cf2f5dce10056 WHIRLPOOL 3cdf5b1a3fe95bfaf2416f1ea1310999dd6d34babd5c040797ae4b2ea5faee7b90797a6507fed9be77e6038e90acd052484982b2dc62d9da67ac1e2520ef94c2
+DIST wireshark-2.4.2.tar.xz 28791712 SHA256 d1acb24735fd35e18e9b7a0555ec58277c2b87da45a19ebeb8087c3dda55f47d SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417 WHIRLPOOL 245454643e138c61ccb380ae236482fea702cf4c0507de1c1d3d6dc9f7312809533db7b0fba585f95b8caf5b76affa4da23ad263b8f95174dfbb9c2ee3300177
 EBUILD wireshark-2.2.7.ebuild 6489 SHA256 0978c03c370a2d1b8e2e910bd1c3a57f8cd6984fa2e25b15e152b3fbbd4b95b9 SHA512 3aad3004619a02cd4a2bb8a9d4f87e0a669e2ea23a0e83377056477af4a2b5a6f7ed95d9c7fe1373e847fb186c014c87f5cb96f5f32d4bff7bfc2700710301f9 WHIRLPOOL a3715bb7c19f1007dac053ec1aaf1e49232b31605ec55761884bb6556e19fb1f0b53440657bf0f49330630d5beef435881f157cb6af3be02cc5cfd90134c156f
 EBUILD wireshark-2.4.1-r3.ebuild 7337 SHA256 794e6daf4d2bd724e87882d0d879d55c456e3e935cdab3b36bfb32725b2e6509 SHA512 54e39d028ba1cbd4fcf925eca2c14b6ccc0a8a058b30a0a9adab5a8712eca2781ef0b5f0795bb2115a1c4dcc77e7ba56ef78327f804ac999be3d5ee3aaf66157 WHIRLPOOL 041b4fb98160d4ac4a45a1a83a04318f7a292512bbf928016b5f84411d533f49e5bd806fabbbabbff155d23d97fec2a21bedf0962fc934bc9a6ebdf32b80a654
+EBUILD wireshark-2.4.2.ebuild 7338 SHA256 3df14fd2f1c33f623dcf8cad2510661e26fecad268daf5ec9e957b783b7f437e SHA512 b292111218c9cd8d1bbb4334a34186119df3224d46b470277a31afa04b134cae8ddd50944b51b6b2e0dfcfd7a2da16f1a4d5c812c89174a116649dec115ba623 WHIRLPOOL 2e03235ef0013548d10d9e8935a7f1069800f87dca9246474b977cdabd91444163ecc0efaba5e03c2bf5e0615ced560a73028216d9320f8b607ffc15968120ba
 EBUILD wireshark-99999999.ebuild 7244 SHA256 72ba7b56f2f65ede095d2694d246225ce9162512166962bcede6fe89d842cc52 SHA512 84107c356b10259f6b230931ff136c3dcd364e7aa928cc29609d253ec36e11193e7f723548965c9f085c49040a9ddcf9bfcfd476242178b25ae8213eb0617742 WHIRLPOOL e985f39f06d5dbda4a4a71290b8f024ef483c65ac3c5cf2fe9aac02c79f7ef685eeefeb5a0a5a75c75765342116d554983620aec0f24b893c86db9cdc19c9e61
 MISC ChangeLog 28152 SHA256 4d533b118cf6326befb9d60fef7212306a14528010f3c1864ea6657e20b00605 SHA512 1dbf03f303e0e05eb243d70595fd88e7ea4d14e397a3d717fe2ac9ba05e2407e1928f2cd78b7bc6fe205ce8d660e75b6f11608546b32a70ffc1ec24629567fd5 WHIRLPOOL fbb5a086aa52c90e28c392813dd7b8ade906f4376ec596741e2396b9160e2e64a45148a793b45530ae3ab6dd744dccf6c30261cdf354ada3a50c11a545afd811
 MISC ChangeLog-2015 107469 SHA256 077b97e93bc0bcebd520af0c72ec9df8da0af9b004423b34190b15c201341b2b SHA512 ce81239e7a9731845ee59ef8206094263b501ab74130cf2a34f8e052e6bf431f019c116c732e2b290c1c61e65ab548e1e10009d1d269cc83fed7f295aee555bc WHIRLPOOL 936c3ea54e274000a61a4114c7d69415f7289183b7c7f75b72925fa9ca0f0f6d42a4ef367d625d4e5892587eee680bbf63eb2945fbc4a98e68b04907ed3fdbc5
diff --git a/net-analyzer/wireshark/wireshark-2.4.2.ebuild b/net-analyzer/wireshark/wireshark-2.4.2.ebuild
new file mode 100644
index 000000000000..2413590812e0
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.4.2.ebuild
@@ -0,0 +1,289 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic gnome2-utils multilib qmake-utils user xdg-utils
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="
+	adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
+	+dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua
+	+mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump
+	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap
+	tfshark +tshark +udpdump zlib
+"
+REQUIRED_USE="
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	>=dev-libs/glib-2.14:2
+	dev-libs/libgcrypt:0
+	netlink? ( dev-libs/libnl:3 )
+	adns? ( >=net-dns/c-ares-1.5 )
+	caps? ( sys-libs/libcap )
+	geoip? ( dev-libs/geoip )
+	gtk? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/pango
+		x11-misc/xdg-utils
+	)
+	kerberos? ( virtual/krb5 )
+	libssh? ( >=net-libs/libssh-0.6 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	nghttp2? ( net-libs/nghttp2 )
+	pcap? ( net-libs/libpcap )
+	portaudio? ( media-libs/portaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		media-libs/speex
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+"
+# We need perl for `pod2html`.  The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	!<virtual/perl-Pod-Simple-3.170
+	!<perl-core/Pod-Simple-3.170
+	doc? (
+		app-doc/doxygen
+		app-text/asciidoc
+		dev-libs/libxml2
+		dev-libs/libxslt
+		doc-pdf? ( dev-java/fop )
+		www-client/lynx
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk? ( virtual/freedesktop-icon-theme )
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+	"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch
+	"${FILESDIR}"/${PN}-2.4-androiddump.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump.patch
+)
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				myconf+=( "--with-ssl" )
+				;;
+		esac
+	fi
+
+	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
+	if use gtk || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	if ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	# Hack around inability to disable doxygen/fop doc generation
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
+
+	# dumpcap requires libcap
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use dumpcap && use_with pcap dumpcap-group wireshark) \
+		$(use_enable androiddump) \
+		$(use_enable capinfos) \
+		$(use_enable captype) \
+		$(use_enable ciscodump) \
+		$(use_enable dftest) \
+		$(use_enable dumpcap) \
+		$(use_enable editcap) \
+		$(use_enable mergecap) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable reordercap) \
+		$(use_enable sharkd) \
+		$(use_enable sshdump) \
+		$(use_enable text2pcap) \
+		$(use_enable tfshark) \
+		$(use_enable tshark) \
+		$(use_enable udpdump) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh ssh) \
+		$(use_with libxml2) \
+		$(use_with lua) \
+		$(use_with nghttp2) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with snappy) \
+		$(use_with spandsp) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		$(usex qt5 --with-qt=5 '') \
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
+		--disable-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	fi
+}
+
+src_install() {
+	default
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	if use doc; then
+		docinto /usr/share/doc/${PF}/html
+		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			docinto /usr/share/doc/${PF}/pdf/
+			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
+		fi
+	fi
+
+	# install headers
+	local wsheader
+	for wsheader in \
+		config.h \
+		epan/*.h \
+		epan/crypt/*.h \
+		epan/dfilter/*.h \
+		epan/dissectors/*.h \
+		epan/ftypes/*.h \
+		epan/wmem/*.h \
+		register.h \
+		wiretap/*.h \
+		ws_diag_control.h \
+		ws_symbol_export.h \
+		wsutil/*.h
+	do
+		insinto /usr/include/wireshark/$( dirname ${wsheader} )
+		doins ${wsheader}
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use gtk || use qt5; then
+		local c d
+		for c in hi lo; do
+			for d in 16 32 48; do
+				insinto /usr/share/icons/${c}color/${d}x${d}/apps
+				newins image/${c}${d}-app-wireshark.png wireshark.png
+			done
+		done
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+
+	if use pcap; then
+		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}