gentoo resync : 11.02.2018

29 files changed, 515 insertions, 226 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 6410844fe80a..c1122040181a 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/barnyard2/Manifest b/net-analyzer/barnyard2/Manifest
index 90303396756b..845cb2b787f4 100644
--- a/net-analyzer/barnyard2/Manifest
+++ b/net-analyzer/barnyard2/Manifest
@@ -2,4 +2,4 @@ AUX barnyard2.confd 1485 BLAKE2B 595580c6e765755c159b0e114475ccffe73b587714e9436
 AUX barnyard2.initd 680 BLAKE2B 3cd613eb91029876a98900f38bde0cfaca15e47d66d9900a109797bf698ec61f4430cb4bed266c6875ec2a4bfa41a285e5c068b2f9b1f11b16394b9bba6d889b SHA512 32370ac32444e44df517dcc86ae59c548311ab02e49d2cf81d391e111334335968ee1d639c8a36a937dfdaa6a83f5dc33fb9f44ab3d7b822ace28985eabe3423
 DIST barnyard2-1.9.tar.gz 652879 BLAKE2B 958c926b26ff81c2baaf6993c1eafb10b48d1dc570b885f20f5893d64a56176f39ed5a872fb326d24b699406a0e60bbd1347df56612b5b85148505c72f6544ed SHA512 441a5751b28fd5c0aca73a78a58219a6ce58393e15bf735ae012719d1180e8e58a91d4170fe5c623bfe83de8ca0c04fb6975c8c7d5b6421ceedbf2023b44e72a
 EBUILD barnyard2-1.9.ebuild 1698 BLAKE2B 07fe6d8e7d696a9f94f992b28c2c397532c14c402967d2960a5a06dcdbf34b2cc058b512b8939f0f5683e8d2d2d4af2d151a3505c77837528381e605a3c83958 SHA512 0470caca3b6f1e2ee1013fcff6412907d854de6855c6f06df411cfea1fe8a864a50149274d4f47c826b5ef081e9d14440c01109be1acbf2e2bf8f4e317aa236a
-MISC metadata.xml 1306 BLAKE2B 3aa264e9c7e333a76ac553405d6abce23b52c01a352d8149b7ec5aa63e799dcb2b021a742ac00924b7a0f120d02e07d23303624878ccbf7d22be1ae49e7a6943 SHA512 270e811a9222fcc873b34aa5c19d40470cf8bd622c79efeb6d5f1268eb905d921d08d632c86b8ae658b58fdda151cef3873f1c8f3a278002909c0533a75bdc74
+MISC metadata.xml 1266 BLAKE2B 00bb6b8c75617632fb4e89059005bcaf90e6f637a1227f6717a3d3d3f5957b17eee0936764ae5f74b37a76fd3681dfd87feed8858170ff8dc56a1683549bd028 SHA512 fcc818ef5d01ef3887994a1426e3ded3df4c8239e9b68edc6be943392252a072a42cd98dacb119fc568097e72d8dff0909bc3241e81314194290b40ae0f56b27
diff --git a/net-analyzer/barnyard2/metadata.xml b/net-analyzer/barnyard2/metadata.xml
index be80ad6bbcbf..c97636709d30 100644
--- a/net-analyzer/barnyard2/metadata.xml
+++ b/net-analyzer/barnyard2/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
-		<description>Maintainer</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>netmon@gentoo.org</email>
diff --git a/net-analyzer/bro/Manifest b/net-analyzer/bro/Manifest
index fb4dcf816be8..ca754fe4489b 100644
--- a/net-analyzer/bro/Manifest
+++ b/net-analyzer/bro/Manifest
@@ -2,4 +2,4 @@ AUX bro-2.4.1-fix-python-install-dir.patch 1748 BLAKE2B 5e1f5695a5d5c21f2e3aa506
 AUX bro-2.4.1-remove-unnecessary-remove.patch 878 BLAKE2B 00ace3b27a7a71e2ab7b6e0b3abe856864190b53b0c7fd693236504700c8c92cc36c80177cb9075f1d27b4320885569e182e58231b56d78bc6b1710a1442f7c9 SHA512 e996a7571c3f9b85f1eb40206c07825f0cfdf7f9fc4a930d8dbb216e8e4636461f0a6be01fc341e6b4d5396d7637d76e39911c3d65e2d645da959d3aad17252d
 DIST bro-2.4.1.tar.gz 15010455 BLAKE2B 34e087253a62ad3d6948e1175fa05c34ceac7298103aef40a0ce791e1e83c8495d6f65c9489d0e7214ff1b743db766dfbf7b44544f7796b7b1f70ee7a1bedc67 SHA512 4f7bf6c037fe7b16214830d2dba9f7abffd853f66030aa710fb9f174a475f8cd27d8de6bacf965f142f942a42093ceb78dcd8cbcedac6fbcfdd65ac07b3dd410
 EBUILD bro-2.4.1-r2.ebuild 2229 BLAKE2B 7dd3a29a41a9bf2477b4004e8638363fa9b475f21cb75c5e0c703ae50677c1324b213701f8abbf3fa35edae346ee72ff4901c8727db431c165095341b9da1456 SHA512 9c06e2cf3dc695567a1c8eaae4aeffee36848945190f630d13d31f4ddfbf30f662d6d56ee36178a5f3b693bd5aec0c49f0ed104f19daf7687d6da29ed6347b08
-MISC metadata.xml 1363 BLAKE2B 9e9686ce9f4b1562729b342bff2baefaa5e97b99f7e5d097170864fc2a2f198b545d896eb9187348f19e9210f84f33b5624119d9a6745a3a1b25feb9dd85b23e SHA512 bd47d3cda8757cde18b296de8c7717a545f40308d5f2d1fffc906eb01b7eee9a6ce0ef9c7e21fe19ff38a4dcd9b06b04eac798852d42c93c043492b82192284a
+MISC metadata.xml 1297 BLAKE2B 2850b05e2db1b594f5ab581c17944c0fdfc2d5a00ff911c9f3d481aa3ceee5f5c48ffe2c1777a2b0bb2842fa48e32e7e11ab89184fb79251d35fa9f141416dac SHA512 59c7b91fbbe98223f5ed946e254c99848c09508b2bd9efba976a5721a02e5d93a20da4549703776b6ffc6cb7d243f3a9d6b1be233f32db5eb10b18f67b0a771d
diff --git a/net-analyzer/bro/metadata.xml b/net-analyzer/bro/metadata.xml
index cb35341ee9f5..8370fd7db45a 100644
--- a/net-analyzer/bro/metadata.xml
+++ b/net-analyzer/bro/metadata.xml
@@ -4,7 +4,6 @@
     <maintainer type="person">
         <email>tomboy64@sina.cn</email>
         <name>M.B.</name>
-        <description>Maintainer, assign bugs to him</description>
     </maintainer>
     <maintainer type="project">
         <email>proxy-maint@gentoo.org</email>
diff --git a/net-analyzer/dhcp_probe/Manifest b/net-analyzer/dhcp_probe/Manifest
index 0256521d330e..5e8e21a66980 100644
--- a/net-analyzer/dhcp_probe/Manifest
+++ b/net-analyzer/dhcp_probe/Manifest
@@ -10,6 +10,5 @@ AUX dhcp_probe.confd 221 BLAKE2B 0d54b9705fc70d1bacffd62b9017d484c6534f737e69ac5
 AUX dhcp_probe.initd 1189 BLAKE2B 8b6aa24418782d4efb551f7c6d7e1d78852681034829c1b323636467c4e0cd8c8d642b0dc976641d31bca8485134ac0beb0287b8ee61c25c6b149d140102ff7e SHA512 bca85a97c55625a7a72241edf738b61dc13b2c96b8ef53fef6d7594d744b0b65f0c0b0d3aad209b629906f13bb39591240a224bb0d59a2516a924ec921463742
 AUX dhcp_probe_mail 627 BLAKE2B 830dd02b1e309fc343692d91feb0380a13b8b3889ebf1fea5b29f085b15ad8a8bf4bcf75a9cb836229c503532fc48cfaab6b651b9d578b743a91f96bdfb68b0c SHA512 2a66c702d71835115a0a3b340d2c9e256ce2de6a983247dd4e2c3c0d908a5ac9f0cf7ffbbe45c1e441e906833c7091eb0c19b6c6034ca46edf1d635dfa15b0c0
 DIST dhcp_probe-1.3.0.tar.gz 211613 BLAKE2B cbcc43b292fe537216ef40de9e417c1f700be4ad5f34feacd9475eb31866b68957ce66c5abc47db3b7e5a0dc8751ca6e54200b79ab2f1f8c3f308f6c1c7aef4d SHA512 d643012529ee5149adbc0c1f19f8e579c55201e86de2aec9b3313be9412db4e973162f864d1baaf79fa340b7bd9a7385f0f1406d1b616e801ced3c7bb387c854
-EBUILD dhcp_probe-1.3.0-r3.ebuild 933 BLAKE2B 64f2fb43c42f48e057d6b434511cfa237b03c4e4d1be618149099f6d488cb1b4ce6672dec3a4e4c730a0bd6a8e91b632e8209c52a7e6bb65721373de9baac56b SHA512 3bd008e5a8299dc9a8799f03ad23032e10d85e390ab218a25609db1180a2083b7ce51b7773c2be6689c4ae42783350f6646272e90fa0e8d15cf62b9057b45f7c
 EBUILD dhcp_probe-1.3.0-r4.ebuild 1129 BLAKE2B 95bbeadb7d309e8f776ba911e9dbe7a67c93f81e39917eafc134e35ef21d79c7eac0c7fe1ddfce72db69486d0fbcd85bb5573eaf504d932f4b737b58d9b6636d SHA512 f54f7e4e3d79c82b3f36ffff0ea14639d677f6e2cbc872a671cffb9848c62116a2b12b7a433506330ee05435390e08ebe2a1458128487f0839e9cf3108653233
 MISC metadata.xml 521 BLAKE2B 07e75a2da58fd92619929b8c5b33edb63317a304999977c5a29bdb5fa96e35fde034a575b376a9fa312fb7158661439d647692b8728d41dabee50c5627add65e SHA512 c04b196d9e86da49576a5300f10039f9d82df0684e626c1d0517ba70b4eccd5306f681821ba6e2539d557b1cc1b33680ac2137879ab11f247db1fd62c1626c9f
diff --git a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r3.ebuild b/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r3.ebuild
deleted file mode 100644
index 83aad9792a35..000000000000
--- a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="dhcp_probe attempts to discover DHCP and BootP servers on a directly-attached Ethernet network"
-HOMEPAGE="http://www.net.princeton.edu/software/dhcp_probe/"
-SRC_URI="http://www.net.princeton.edu/software/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="
-	net-libs/libpcap
-	>=net-libs/libnet-1.1.2.1-r2
-	"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}/*.patch
-}
-
-src_configure() {
-	use amd64 && append-flags -D__ARCH__=64
-	STRIP=true econf || die "econf failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	dodoc \
-		extras/dhcp_probe.cf.sample \
-		NEWS \
-		README \
-		ChangeLog \
-		AUTHORS \
-		TODO \
-		|| die "dodoc failed"
-}
diff --git a/net-analyzer/dnstracer/Manifest b/net-analyzer/dnstracer/Manifest
index 951358095761..98c4f7160682 100644
--- a/net-analyzer/dnstracer/Manifest
+++ b/net-analyzer/dnstracer/Manifest
@@ -1,3 +1,5 @@
+AUX dnstracer-1.9-argv0.patch 343 BLAKE2B d3a1fe5b9aec3099ef2e385fdbd4e638cd8877bf533e59abbbfdf46bb80d6c0a64f4d3ad6ebc96e83bb007bc3bd22a1c26815fc7a7e98e63d8ef7a975f0307f4 SHA512 6871b93a4ebf1d307c4ef56ca134d8e39c152fe22564e6845ead6d7d97c96ff21982649808618d098b7105159a9bf09a201c4147c61be0b98676a69a9f4bfaa2
 DIST dnstracer-1.9.tar.gz 130884 BLAKE2B cf08795eed59851c6da5d5c0ecc1a0b8445584ab10a9adf3cc526f5f831ceef9ed8deee8728ec964c35808a71e865f841f698403bcc0f16346e3abd5e13cac8b SHA512 e69fe772062ff315ff3148c26df78bd41c75d11dcfa6431f1e9374e6069182bd80826b22dc116011d975838d9527913d46edd78de049edd25e3ac9247d5f3473
 EBUILD dnstracer-1.9-r1.ebuild 477 BLAKE2B 93d941b4915e6604fb79c4ca398cd6cec9ad68c9f4ab074fbe9251e825fbe7330c73f8317b771908dacbd63fd9f795d5fc8f972e64b998287cdd9c02360a5feb SHA512 d4eb0a6b6ed57a8325ba5d98d524888052d729d2b06e117de4ccad1bd66049fe35ef95886e049ac6723c3cf57276cd33939d589f8063f91b54e8bf3b7bd50565
+EBUILD dnstracer-1.9-r2.ebuild 531 BLAKE2B f20c08ecc61f087ffe8639ada50f2aaaeda1f04b89075ba1da0791aab7aa1d60cc115114990b3b2389cdbc09c4d8be91b7fa6e5fa0b782abbb43920b2e1d60e9 SHA512 e2ec56b2008956c1bb117da6a68f9e50896dc7e9f14e383856ab335e78f5c7cf53409bb10da50d589efcfcf0e39e46b36f95f4a645aa37960e5aaa1b771fdaac
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild b/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild
new file mode 100644
index 000000000000..4a58c5f6c651
--- /dev/null
+++ b/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Determines where a given nameserver gets its information from"
+HOMEPAGE="http://www.mavetju.org/unix/general.php"
+SRC_URI="http://www.mavetju.org/download/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux"
+IUSE="ipv6"
+
+DOCS=( CHANGES README )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9-argv0.patch
+)
+
+src_configure() {
+	econf $(use_enable ipv6)
+}
diff --git a/net-analyzer/dnstracer/files/dnstracer-1.9-argv0.patch b/net-analyzer/dnstracer/files/dnstracer-1.9-argv0.patch
new file mode 100644
index 000000000000..c83c38ea7d74
--- /dev/null
+++ b/net-analyzer/dnstracer/files/dnstracer-1.9-argv0.patch
@@ -0,0 +1,11 @@
+--- a/dnstracer.c
++++ b/dnstracer.c
+@@ -1619,7 +1619,7 @@
+     if (argv[0] == NULL) usage();
+ 
+     // check for a trailing dot
+-    strcpy(argv0, argv[0]);
++    strncpy(argv0, argv[0], NS_MAXDNAME);
+     if (argv0[strlen(argv[0]) - 1] == '.') argv0[strlen(argv[0]) - 1] = 0;
+ 
+     printf("Tracing to %s[%s] via %s, maximum of %d retries\n",
diff --git a/net-analyzer/ipsumdump/Manifest b/net-analyzer/ipsumdump/Manifest
index a0d0055acc59..c91e1bbe74ea 100644
--- a/net-analyzer/ipsumdump/Manifest
+++ b/net-analyzer/ipsumdump/Manifest
@@ -1,3 +1,3 @@
 DIST ipsumdump-1.85.tar.gz 919540 BLAKE2B 870e003f4d9149904e6a411ae89b6df3e6f90e378b300dea823701e5f168d7f7b2c788702c3ca9c5840dbbe4372e30435e6fab79fd975328ddc474bc3e797559 SHA512 b42844cf028b9c1ea9da90306be8d731bffcec1a8f5c9eeb8029f563ddd5781651c583913a2105d8ad99cabac4b003345e1e8fdfb83367cabf806de1bca31596
 EBUILD ipsumdump-1.85.ebuild 566 BLAKE2B 21324b6effeee5a7d4c148aac10c127c50e69a4c1a79f613b73dc44e7578eb137e297fa6dc7ebd1c00f74f1f088330a07be3be0a17ece27acff7edab367b13b1 SHA512 7bdd99fc11e9384a6ccadd786b71e142ef8890bd9b4082f254b56a62797761ec4e26a70b0a9193ca882f95eec91a157a62fcd5f3d539aa54a86b53fa4e51460d
-MISC metadata.xml 836 BLAKE2B f196377f516c5d9a4923d5f7e5207fa1e158ae56d0f88c882c0f3b94ca22d111bbfc651012e4732c718e75930c344a5a78fcd8cbcf867536f791e4836e00e9cc SHA512 3789ba4324f2e610041417555d1775de2e464b1b8ca5809450cfc41e5598c4d353f76216b682540e86867aa73d7ec2cb3ed77cf713601cad095a4badc6a2e804
+MISC metadata.xml 770 BLAKE2B d94e9c83946607b1e4c503a7a110e7e0602474f630155ce0e987a8c522e77199ac2c03df470ed898e2a806042980cb881d185a875ef548b9c0dc3d46660c5e4c SHA512 02accc898d4771c406546ce91a3c475debf7653ba54b8d455493659f4db1e4a07c0511e979eda8fd3a6cecd1b78d81b577a71777b93563d12804fae1cb727512
diff --git a/net-analyzer/ipsumdump/metadata.xml b/net-analyzer/ipsumdump/metadata.xml
index 43ceb8c9a02e..e440233dc9b0 100644
--- a/net-analyzer/ipsumdump/metadata.xml
+++ b/net-analyzer/ipsumdump/metadata.xml
@@ -4,7 +4,6 @@
     <maintainer type="person">
         <email>tomboy64@sina.cn</email>
         <name>M.B.</name>
-        <description>Maintainer, assign bugs to him</description>
     </maintainer>
     <maintainer type="project">
         <email>proxy-maint@gentoo.org</email>
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index 4b20e5017505..356919f8a6e2 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -4,4 +4,4 @@ DIST monitoring-plugins-2.2.tar.gz 2461548 BLAKE2B 0f68b492e089c6dfd09db6aab78ab
 EBUILD monitoring-plugins-2.1.2.ebuild 2858 BLAKE2B 3b07074b43e7dce8b468946f5184938a51444c093c3fb68a6abdfe7b3ea825f141c2b1994a54bed25b5362454a9d48e5684b12ed220ae14623c712dbd737fe81 SHA512 9426fdb164c60771cc3dddc6cff2e526ae7770400378b74dde706a2cfce7dba51aecddfb7c7a532e6bc07078d05cf28d64ddddc3e4eefeb4ec2bb70f44151f7a
 EBUILD monitoring-plugins-2.2-r2.ebuild 3014 BLAKE2B 78d8a4893f2c6b85cef516f8f20273aff29357b23aaf5b42c256903e6a8091d29632317f001a5c1ec41d63fec13b6a0482341b495888685aaaf9c0661839e6b1 SHA512 116db40f08b66e142691fd1dafda2c53e5ff8d069617d6778f98ac0aa25b514f6a4a10da8a51a1241921ac7ca43a0c5c6e6df191771cf0a8250874228cd066da
 EBUILD monitoring-plugins-2.2.ebuild 2875 BLAKE2B 8dfdf9c0bdb239768f0d441ba4f2a6648ed9f7d23580b9def8d2f93ec40d91653a841d821e54aed856bc6f30939ce386fbdde23a7bb86122113ab3d89fe0ff78 SHA512 67a2e298d56b06cfa7ef0f718889c4e300cccd668e7335f6574e36b929dbf349473ce4c4541a083a703440e8d61abea0551e2e245bfec4dbf95cd174e72114d5
-MISC metadata.xml 1551 BLAKE2B c5200e2ade4d968c7f02fbe830658b6da7aba3965629a3d8718a4a7c74f3655554fdc38a21691094fa27167ccfa89d6034e90de20c9128cb14162abeb954b09b SHA512 5c41ed2615a101375171ddebccf5a746fbe7716a57b66c46b35c19755e524cf0bc0b03267bd3a6f4b0689d1db743f7489248d101e0bdda3e32ab0bd4e20fb75f
+MISC metadata.xml 1404 BLAKE2B 68d3a914681db790872872cee7114b053aaa118b9eacbf33b02db932d3b970a80b0fc1d79d9e3f836f7d0f8870066bdf78b6b688864cac753d5ddf42a7ad9f9c SHA512 766657a0c9a0d16fa9fc0c052342b65c1f5b32dbbc0eb4e8fb014274b92dd0370dc19a6821ceed3979a1def5f429e1e3f23ccbf2ca443f787a50e00b503acf42
diff --git a/net-analyzer/monitoring-plugins/metadata.xml b/net-analyzer/monitoring-plugins/metadata.xml
index f355cb420c63..654cb6c8c64d 100644
--- a/net-analyzer/monitoring-plugins/metadata.xml
+++ b/net-analyzer/monitoring-plugins/metadata.xml
@@ -4,12 +4,10 @@
   <maintainer type="person">
       <email>hydrapolic@gmail.com</email>
       <name>Tomas Mozes</name>
-      <description>Primary maintainer. Assign bugs to him.</description>
   </maintainer>
   <maintainer type="person">
       <email>mjo@gentoo.org</email>
       <name>Michael Orlitzky</name>
-      <description>Secondary maintainer. Please CC on bugs.</description>
   </maintainer>
   <maintainer type="project">
       <email>proxy-maint@gentoo.org</email>
diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index 6367cb53d83a..99b47862ddc7 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -3,11 +3,12 @@ AUX smokeping-2.6.9-pod.patch 482 BLAKE2B 8490774fffcdac52d5375bd7155a1246f03a74
 AUX smokeping.conf 32 BLAKE2B ea64af0cebbb847c89503b3d893c902ab2d761afbce6594731d8851cc5f9a81118c9ce9ff76888b0bddcbf6b4341a47a76a74f64aecdc3d1610510714f119ee7 SHA512 75863f16f8b57ca9ae7c7d65076acaf28aac66fa2d52ed78bce2bb3a4938dc75a1e8ed54236c52c3965b170a8348145780dd5c0f3d0fc8c95f4b88085252a4ef
 AUX smokeping.init.3 1737 BLAKE2B 0c1ad0e4c5dd843097eadbdd2e2309f9f89c5f336ae20938680f2629c16e6ee265a56a4aaa26b40243d9d85331775315ac4eb5235eb51c7ff6d981ab2dd3a683 SHA512 87386971b42bf842c6cf59f641576cfcfd7439fe9f10139730b0c73acea610945d634d3effc3a5db793a71e2e625b49184a02813cbf34473dd94ac4a3931ed67
 AUX smokeping.init.4 1757 BLAKE2B a47cbbc27e38333490b615971f795ce3a7a6efebd03ad28244ab3a72368d08eca8cc3ce38bbb92915a604f586a04595d857d83c3adb33b213806f62ef09864bf SHA512 5e32a248899d79ea112595591bd9457c073c8276d8bb124b4f765bc9654bd5dac36866344c8c444c98ba4cde32829d7092067e73db5bd3c38ca75f7679a875f1
+AUX smokeping.init.5 1360 BLAKE2B 4213a42dcd43c1166c5f10d287c9e50be37265f8be6db3a8b9e18351dfbe7259a8ca98eff044cd1c7ef657356e3960e60745aea63a79bdc73fd009b3bd746bd7 SHA512 64adf577c9d7d79c268cf46c40ed7db23c93cbd49897070d9028ee6636794b1c101d1a9d1ff6f92c24512e18bf0f06b10b67117090918920fb8b8189dec85d4f
 AUX smokeping.service 200 BLAKE2B 77110386e5d304c04d00114800c1f42bb5e8b5ce1eab419afd2fa7c59c1a569fe244c7f7c18e01519d82389bf66f5b6935dd212b3bf68ace9b480e981c311001 SHA512 2f8824143b8283ad02274107c5ed0e84f0c1465fc089823e36ef44a42fec68564d8cc4ff5fb0ad6dc0443e21fac5a8cbcbb0a9bea151b57efaff2a082d15f344
-DIST smokeping-2.6.10.tar.gz 415383 BLAKE2B 7a502eddeb634404e379df67470595cf85512d64a5e137f6d7c344ceb606f99275016e1044ec820b2e9217e1d1b567164b636186bfe54e91249d585ef75c646a SHA512 e91ac80ceafccb945ec48cc80020b8cbf2afe29b5f422dc5aaf7c52387eafc498180c293cf82dccc4fdec88ec56f80fb1bd08ebcb2ae9aea563475a069b91f13
-DIST smokeping-2.6.11.tar.gz 417338 BLAKE2B e1ff2fc05fd8d39f42e1cc89831aa36ef0522716d1768dba9bdedf09f6c64cc2b35f30c3b727959dd93ed8922235729a27c85acceb1e1c3ec9c5f60e21455ab9 SHA512 928722832d6e01ffbb7b74542678f7b9d5fc22819c0feae164ce58b8d8a5595800f617c8a672e07cae4b2c4ccbfa4883a11438ba2a172fc2887abc2933388422
 DIST smokeping-2.6.9.tar.gz 427185 BLAKE2B 3b626d852542f5e9e616ce88a8fd2fd773036822f10f548a1cec242f5d420ec67d940ee49c08da99f7e0815921251cb474b103c8c12c364f90651a4e74e9abf3 SHA512 ab3cec15fd9f90510f902da7ce5bac5915558cac198cc88f0ce193a53a0158c9055e28c8c6671cc6653ac42ab51346e1eb19e537f1ab5c234fd498c6b777499d
-EBUILD smokeping-2.6.10-r1.ebuild 4100 BLAKE2B 8b2b8b8dfcb1e992adfb84c6f38d07f1bd6886db16e9a67195e38798a7e6c5d5fe7a6e564a79cfc80ea90ce9bfe42071871f4fb62deedbd4820ef357517cad68 SHA512 6d2a2b5fd8756ee62dfdc6093083b6374da60679f0ce63af585506962b979a7108d336f363b550ee65cda08d3c132cc910ca62271a178ad38cada05a313ba7ea
-EBUILD smokeping-2.6.11-r1.ebuild 4086 BLAKE2B 4a73ecb65aec7f39cdc66ece0fe2071591354e83baddf59188ddae4c6521262366238dffc43d0a2e4c533d512065e97a044385b689eaaa8673fb580b663ef277 SHA512 2cbea948678f9c31a2b315137bfbdcd573918dd3bf66defb7fb0c3d52c107cd09876e017dc75b42d4eacf8b8eccc72c31ed6ac9a64a6a156e49e4c4a7c648515
+DIST smokeping-2.7.0.tar.gz 8914621 BLAKE2B a139fdcaafe37c61695ea2e31e3ddaeb4389f754f28fd41318db120f2ae5f4b5f355ebfb5e0c852b48e2e6872194952bc3733ff5f6bcd2886859a1c276835121 SHA512 17ada10e2cdc7966e81e589dec603fe77bc0a273790734b36342ff2b8ac3d5bca6797f6eb95a6e2e22a576b7bb5d2ca4232b4fb23057b360de9c156d141ed0ca
+DIST smokeping-2.7.1.tar.gz 8919251 BLAKE2B 91f348b573d5a7ce98e8b51c96d9f45bb0af21cae4b049ba113bfc97c60800d8fdea0c05eb5414ec861f07f30170abf64ee34e0e29899528c01283ddab0ecde8 SHA512 c7208a40725e5694813a0545d6f8b663bab49739fe716bed5fd85ed6258c1c0abde4a18a0678988fff067ecc7807c83313abf12c04b935377b0b7158f07d8626
 EBUILD smokeping-2.6.9-r1.ebuild 4195 BLAKE2B 814e0156f457b0a331e1d661d75ce0aa39d38585400f7da8b215880881591c72bc712ff441c85a523d097303e257703c4a6a8d47aa5d02d554c4ec614e29ad68 SHA512 3349666be7eb8693b0158235fd8b9f55f9394abfa49f78bc88de739075d5a57a2ad393264025de0c252fab0d3d0ed2752a85149590f078d7f2d2bb51c487f608
+EBUILD smokeping-2.7.0.ebuild 4334 BLAKE2B 4ea3db6ec3dc725c67ad182029d18fc2706cfcbbcd704ed260c256c1811c6cb98902c0a23ffbea0b209221dc3344ea3c11e59f93b0bdf93c22c2113ac5767308 SHA512 c6f012fa366d646502f4ec9486b711618e10fac1477f31533778572d425dfe1657b7632acf16e1b928c9a7b12f549eb306da1420aa647b5e49fd0f17f303287e
+EBUILD smokeping-2.7.1.ebuild 4146 BLAKE2B 14895ef861cb55aab2a4f47e5c7c1e87b52b563241d160e1b6a8530810e9d4aa366479d8a56882b13dedcb4090d6d47dda42542278499fe1ae720aed436d1676 SHA512 4d29c64bb9ecd576c5c037c84ccae1790873b0fb77232f7afe07e1273ad2085c2a3c609dc3794b10baa708ae8839de642a1e6f42f6d52273c6789cf7dfb1d3a4
 MISC metadata.xml 609 BLAKE2B 80a690cf6d514c95f27e370c0417cdc1787a0e149e7791bdd3684b195d2cf6ada9543d1001fd5353a00e05a01c62272b73e09ec838d9ea927b4c3bcbb274ab15 SHA512 cd5bbbf1af0cadf236c3385628a1392c2e5379958e4f002d71230ed9e7627989cfdee7e0a9fd584f94c4c29bb1756f9ade81df0888f4668f9b3a8ab9e31bf727
diff --git a/net-analyzer/smokeping/files/smokeping.init.5 b/net-analyzer/smokeping/files/smokeping.init.5
new file mode 100644
index 000000000000..3c08c3fdc65e
--- /dev/null
+++ b/net-analyzer/smokeping/files/smokeping.init.5
@@ -0,0 +1,56 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/smokeping"
+command_args="--nodaemon"
+command_background="true"
+command_user="smokeping:smokeping"
+pidfile="/run/${RC_SVCNAME}.pid"
+extra_started_commands="dump reload restore"
+required_files="/etc/smokeping/config"
+
+depend() {
+	need net
+	use dns
+}
+
+start_pre() {
+    export LC_ALL=C
+}
+
+reload() {
+	ebegin "Reloading smokeping"
+	"${command}" --reload 2>&1 >/dev/null
+	eend $?
+}
+
+dump() {
+	ebegin "Dumping smokeping rrd files to XML for backup or upgrade use"
+	if service_started "${myservice}" ; then
+		eerror "You need to stop smokeping before dumping files!"
+		return 1
+	fi
+	for f in $(find /var/lib/smokeping -name '*.rrd' -print) ; do
+		f_xml=$(dirname $f)/$(basename $f .rrd).xml
+		rrdtool dump "$f" > "${f_xml}"
+		chown root:0 "${f_xml}"
+	done
+	eend $?
+}
+
+restore() {
+	ebegin "Restoring smokeping rrd files from XML dump files"
+	if service_started "${myservice}" ; then
+		eerror "You need to stop smokeping before restoring files!"
+		return 1
+	fi
+	for f in $(find /var/lib/smokeping -name '*.xml' -print) ; do
+		f_rrd=$(dirname $f)/$(basename $f .xml).rrd
+		mv -f "${f_rrd}" "${f_rrd}.bak"
+		chown root:0 "${f_rrd}.bak"
+		rrdtool restore "$f" "${f_rrd}"
+		chown smokeping:smokeping "${f_rrd}"
+	done
+	eend $?
+}
diff --git a/net-analyzer/smokeping/smokeping-2.6.11-r1.ebuild b/net-analyzer/smokeping/smokeping-2.7.0.ebuild
index a5f7c689ef10..47835a3a6b71 100644
--- a/net-analyzer/smokeping/smokeping-2.6.11-r1.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils user systemd
+EAPI=6
+inherit autotools eutils multilib user systemd
 
 DESCRIPTION="A powerful latency measurement tool"
 HOMEPAGE="http://oss.oetiker.ch/smokeping/"
@@ -22,6 +22,7 @@ DEPEND="
 	>=dev-perl/SNMP_Session-1.13
 	>=net-analyzer/fping-2.4_beta2-r2[suid]
 	>=net-analyzer/rrdtool-1.2[graph,perl]
+	dev-perl/CGI
 	dev-perl/CGI-Session
 	dev-perl/Config-Grammar
 	dev-perl/Digest-HMAC
@@ -56,7 +57,14 @@ pkg_setup() {
 }
 
 src_prepare() {
-	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} # dev-perl/SNMP_Session
+	default
+
+	sed -i -e '/^SUBDIRS = / s|thirdparty||g' Makefile.am || die
+	sed -i -e '/^perllibdir = / s|= .*|= $(libdir)|g' lib/Makefile.am || die
+	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die # dev-perl/SNMP_Session
+	echo ${PV} > VERSION
+
+	eautoreconf
 }
 
 src_configure() {
@@ -70,6 +78,7 @@ src_compile() {
 }
 
 src_install() {
+	dodir /usr/$(get_libdir)
 	default
 
 	newinitd "${FILESDIR}"/${PN}.init.4 ${PN}
diff --git a/net-analyzer/smokeping/smokeping-2.6.10-r1.ebuild b/net-analyzer/smokeping/smokeping-2.7.1.ebuild
index 698506161260..7f9baf701feb 100644
--- a/net-analyzer/smokeping/smokeping-2.6.10-r1.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils user systemd
+EAPI=6
+inherit autotools eutils multilib user systemd
 
 DESCRIPTION="A powerful latency measurement tool"
 HOMEPAGE="http://oss.oetiker.ch/smokeping/"
@@ -10,40 +10,40 @@ SRC_URI="http://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-# dropping hppa and sparc because of way too may dependencies not having
-# keywords in those architectures.
 KEYWORDS="~amd64 ~x86"
 
-# removing fcgi useflag as the configure script can't avoid it without patching
-IUSE="apache2 curl dig echoping ipv6 ldap radius ssh telnet"
+IUSE="apache2 curl dig echoping ipv6 radius"
 
 DEPEND="
-	!apache2? ( virtual/httpd-cgi )
-	apache2? (
-		>=www-apache/mod_perl-2.0.1
-		www-apache/mod_fcgid
-	)
-	curl? ( >=net-misc/curl-7.21.4 )
-	dig? ( net-dns/bind-tools )
-	echoping? ( >=net-analyzer/echoping-6.0.2 )
-	ipv6? ( >=dev-perl/Socket6-0.20 )
-	ldap? ( dev-perl/perl-ldap )
-	radius? ( dev-perl/Authen-Radius )
-	ssh? ( dev-perl/Net-OpenSSH )
-	telnet? ( dev-perl/Net-Telnet )
-	|| ( dev-perl/CGI-Fast <dev-perl/CGI-4 )
 	>=dev-lang/perl-5.8.8-r8
 	>=dev-perl/SNMP_Session-1.13
 	>=net-analyzer/fping-2.4_beta2-r2[suid]
 	>=net-analyzer/rrdtool-1.2[graph,perl]
+	dev-perl/CGI
 	dev-perl/CGI-Session
 	dev-perl/Config-Grammar
 	dev-perl/Digest-HMAC
 	dev-perl/FCGI
 	dev-perl/IO-Socket-SSL
+	dev-perl/IO-Tty
 	dev-perl/Net-DNS
+	dev-perl/Net-OpenSSH
+	dev-perl/Net-SNMP
+	dev-perl/Net-Telnet
 	dev-perl/libwww-perl
+	dev-perl/perl-ldap
 	virtual/perl-libnet
+	|| ( dev-perl/CGI-Fast <dev-perl/CGI-4 )
+	!apache2? ( virtual/httpd-cgi )
+	apache2? (
+		>=www-apache/mod_perl-2.0.1
+		www-apache/mod_fcgid
+	)
+	curl? ( >=net-misc/curl-7.21.4 )
+	dig? ( net-dns/bind-tools )
+	echoping? ( >=net-analyzer/echoping-6.0.2 )
+	ipv6? ( >=dev-perl/Socket6-0.20 )
+	radius? ( dev-perl/Authen-Radius )
 "
 
 RDEPEND="${DEPEND}"
@@ -54,7 +54,14 @@ pkg_setup() {
 }
 
 src_prepare() {
-	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} # dev-perl/SNMP_Session
+	default
+
+	sed -i -e '/^SUBDIRS = / s|thirdparty||g' Makefile.am || die
+	sed -i -e '/^perllibdir = / s|= .*|= $(libdir)|g' lib/Makefile.am || die
+	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die # dev-perl/SNMP_Session
+	echo ${PV} > VERSION
+
+	eautoreconf
 }
 
 src_configure() {
@@ -68,9 +75,10 @@ src_compile() {
 }
 
 src_install() {
+	dodir /usr/$(get_libdir)
 	default
 
-	newinitd "${FILESDIR}"/${PN}.init.4 ${PN}
+	newinitd "${FILESDIR}"/${PN}.init.5 ${PN}
 	systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf
 	systemd_dounit "${FILESDIR}"/"${PN}".service
 
@@ -85,7 +93,7 @@ src_install() {
 		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
 		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
 		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \
-	    -e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
+		-e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
 		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
 		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
 		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 2490d808a9c3..16859bf0cf26 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -20,4 +20,4 @@ EBUILD snort-2.9.8.2.ebuild 8546 BLAKE2B 57f4cd76d296716cdff5b9fce134ff169cc7ee8
 EBUILD snort-2.9.8.3-r1.ebuild 8339 BLAKE2B b2512ed4ac2bb9deedbc5e416bf4457e3fab857d859e1a867824d753aaa6e13acb2ac1db0fdc924e3642e4c318e3382e88accaad7f1d9a7998a8a6a812ac4dc0 SHA512 8c0ee1620090ce311512e199f3a3f117b563912871dd0d128f2a852f851c030027b774f8f61c6461902a38f1f47a6df96679a28fc9c30c12c578d9a5c19112de
 EBUILD snort-2.9.8.3-r2.ebuild 8497 BLAKE2B af5a4974c76f054301d8063fd6477124c4f4b6f490d385a7ccf185767f9f9dec11ec31c5b89749f85d06bd5a55f63d382522603da9da11861239ae99e15614af SHA512 24dcc8e8f35c58f3a269e80a81ab00ca50e41c04b395cc617c469c31a94574f7a2f453e09f2e9e62c8a89849c3dca3f7af79a062371882d6e0094fa10e4e0588
 EBUILD snort-2.9.8.3.ebuild 8546 BLAKE2B 17d3da06897fb64d21adaff11d91e43671ad8caef6c21e4038aa49a4af2a36d5527058510133e482a5749079b33c29eedaab1565be7a9bf15ab28e358745eea5 SHA512 e2b0a6e303ef3cb0d906a6c809d3d12ff9c3540fe9cdafdea24579ca88c3adf53e1895b60035db42e2a7058e39e16b83798cd2818f42d7b64d89eb25471816f3
-MISC metadata.xml 5063 BLAKE2B b6bbdc669be5d6b2bc9be7b2a66418f6c88c59b7f5fcf4dd22dad8d6d817d35b57c7df14752bac682921ec3b31e1e142382862b3921eb0c7f414c086687f508a SHA512 9519263bb296703af5f24459c66ba70f84edbeeb36983bbacc9d674794505edee507bf181049d23f2c59a18f49975ba6788d0404f476292b0c7f4af86dccdb27
+MISC metadata.xml 5023 BLAKE2B 35c2987bcd84a253582bc798a8c2fc1d4b83e9d740686ed6b0831699567227813f239841b908ab78681de1d819b9e094cac66a29e1ca173eece3f372477f04a4 SHA512 752b51aefc9d4136bd44742d239c8e8d83ccd63f1f055ed07741b0adb82bd58954616bd05a6f6d6ecb2fb040a2435f58c6d22b2bce40bac2ba0189bd0d482e8b
diff --git a/net-analyzer/snort/metadata.xml b/net-analyzer/snort/metadata.xml
index 1c031275ed33..bfd9b69b2e8f 100644
--- a/net-analyzer/snort/metadata.xml
+++ b/net-analyzer/snort/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
-		<description>Maintainer</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>netmon@gentoo.org</email>
diff --git a/net-analyzer/sslsniff/Manifest b/net-analyzer/sslsniff/Manifest
index 220a3f82abca..5761079659ba 100644
--- a/net-analyzer/sslsniff/Manifest
+++ b/net-analyzer/sslsniff/Manifest
@@ -4,4 +4,4 @@ AUX sslsniff-0.8-fix-compatibility-with-boost-1.47-and-higher.patch 2316 BLAKE2B
 AUX sslsniff-0.8-underlinking.patch 1631 BLAKE2B 606e6cdfb4d5d0467d3fa30130c40abfd3dadcef5281f3965838f13e44760c8dfd2af9ed7069958f45dfeef2112131f5a538ebed5bafb7466d637c9f515c557e SHA512 8ffbb67f9fbec85179769c0ace64e62f8a3d27e403f33bdd761195339cdcffe37cb473621cb20a739b2b2ce26c6b2335a4d5ea7c6cb697c4328ac7f7047b5e01
 DIST sslsniff-0.8.tar.gz 207858 BLAKE2B bb53f5bee6528bd27e07a529ca3c908df4eb13c0b7164b34566faa1d6b36b55d118bbac2311fbfda9ae7a8d908a253ac7cfebc261b554ff56c930eb4a0cdf4a5 SHA512 4ac1bcff8f396d868b2381bc73bb0307022e9a7d5228c83722abde8d4d01e4c6273042763c1e003c8e60f606d60923a573122d33680f5d892b4ef7b62f02009f
 EBUILD sslsniff-0.8-r2.ebuild 1098 BLAKE2B c131524f896278a702e46268fd8f45efb297ca0f84643a0d306ef1735970c9a64038b2681de2b1d6cae291a10d661368c146f40c7045532dcc9e6c6e0cc10ce0 SHA512 b30839b74cdc741b6363aa5b8e360b9f86ca78466f91d5d0db45c7109a43330333feae7722a2b8e3b4d11ba6162b419752e4f2ef0c902fbcb78aa6c6f543c438
-MISC metadata.xml 449 BLAKE2B 5d3a9c9a7c5047da61808a38c6705f2bb1b7e58f21983dcbeeb5a23cebfb89f0b0434c47bc7a169d7072818f2a59c5c27fca87daea329e84258d27affdf81e1e SHA512 c31421b1e27c6f9ec70a97fbe92030447306e71be3eba6631d93d228f1ca7d37e9cb2e2de0aed775006913fc2b6624f802f010e01f77baa9979e01b4403b9900
+MISC metadata.xml 406 BLAKE2B 827749fa0fb08eefd7613363c7c812d206605c9acd42e9060bab8a961f5297055e762f76d755e7de5449bfe38876ae50cdd9eee5084ad40750e7b60114b75dc9 SHA512 60f83f56f139edcdd6e6d74fd76faaa92e2e288ba1d19f5bcfb8dfcddcd9db54b4f23dad09c5e6cb18bbcc8620e0a7415f45ded24cffb2b02d42a6bffebd66f3
diff --git a/net-analyzer/sslsniff/metadata.xml b/net-analyzer/sslsniff/metadata.xml
index 44077c9f826f..e3c364f20d17 100644
--- a/net-analyzer/sslsniff/metadata.xml
+++ b/net-analyzer/sslsniff/metadata.xml
@@ -10,6 +10,5 @@
 <maintainer type="person">
   <email>zerochaos@gentoo.org</email>
   <name>Rick Farina</name>
-  <description>co-maintainer</description>
 </maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/tcptrace/Manifest b/net-analyzer/tcptrace/Manifest
index 927b7c4b28bb..50894099ae22 100644
--- a/net-analyzer/tcptrace/Manifest
+++ b/net-analyzer/tcptrace/Manifest
@@ -1,6 +1,5 @@
 AUX tcptrace-6.6.7-cross-compile.patch 1348 BLAKE2B f38a64ed02c45482db7b0fb18865c9584481f5875a9703cf010db603f977bf1bc7696391d3c135060f2b9160b76ebd8986c4a17091b4634e757772b690977377 SHA512 ea5f8d5352f1eb4059c0284abbce9ff9b6df78ac8c7cb17a2aa138fa912cb4197f09b8e43e91bd04b980b6d73e1670deb7e9a3b1386eaaede61a7bdb0f410d1e
 DIST tcptrace-6.6.7.tar.gz 3773308 BLAKE2B cae5816cb25c33f71c316d14de3c18ff26f0e7452375a962b88c4818ca7c43425e7298e788bd8cb43f2e22ac7dc9b89ed1921b7bd70d0e8befab3ee791453fb1 SHA512 3638770c342aea6c71aa556e758ed22e1fd44730f6c652cf82d3861eb1c31b186952c660071bd1df45020b80eaf9dd090a4ff58c979cc907eb8154dcb7b9b432
 DIST tcptrace_6.6.7-4.1.diff.gz 29161 BLAKE2B 83768d0a6f14525f20b484421181078a3cf7ac3adeada3cf02a7441530593632743c6e515dd8738f5a4692422d97f4eb718dda076a234489096a10defb97dd5f SHA512 2f6dfeb8e15faa0151bdbb18194587e51de040f63117eb1b469a826091d5c1e5eb41a306bdc94e89ce993d0d04ec31324e5f7eea0a1a52852e07ee80006b2087
-EBUILD tcptrace-6.6.7-r2.ebuild 1028 BLAKE2B b45bd98f2e72f91d1caa90aaea71e143c8bac603867c207e5fbfb6cbed0ce238eaae60d35a7af46747b8e86462e7a9a2b6fa827554fde5561aee95161b7a0df2 SHA512 cc29ad6fa8921d7f34ba073993d96cdb44f4d5fa203758c44b457b2ed6271958df592711cc33c2d8a0127e573249c4da897c48a279d8d8bb0d9fafee19e6af30
-EBUILD tcptrace-6.6.7_p4_p1.ebuild 1483 BLAKE2B db7816a4c6ef7d7e7ef3de1a701e1df2fdfa9da4c581abfda9b7a73e719d3f370fa86872eb846bff630566b426c35bdcdb4043c94f805035a363152e30b3e196 SHA512 aa66451f74d56e68ea4e1cad736d3ebb9e0efd2ad9c4fe9be9045c24d0f6e310ef45f7bd20c0edfba2d8b8c9d6553f723bc3b696893cde58fc4d021a6644e3ad
+EBUILD tcptrace-6.6.7_p4_p1.ebuild 1482 BLAKE2B bdb5cbfdefd511b1a25e5c9ad5419a3da024c45b66fba910ef4878e7c1ce049344c0a69f9d3a3598a3c834e99d1196400c6a002a93dc7263b7dc20bfa68131c0 SHA512 3d9fd141afe03bc7f729ab47871d6c55f3c7ea7ff3a2e50a2f3855e2b964a2559e9e12917f45d13a5ca53556114bad0ce4288f3ff01f60a28ee5e2f36b883888
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7-r2.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7-r2.ebuild
deleted file mode 100644
index c00386bbbde0..000000000000
--- a/net-analyzer/tcptrace/tcptrace-6.6.7-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="A Tool for analyzing network packet dumps"
-HOMEPAGE="http://www.tcptrace.org/"
-SRC_URI="
-	http://www.tcptrace.org/download/${P}.tar.gz
-	http://www.tcptrace.org/download/old/6.6/${P}.tar.gz
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ppc64 x86"
-IUSE=""
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cross-compile.patch
-	eautoreconf
-	append-cppflags -D_BSD_SOURCE
-}
-
-src_compile() {
-	emake CCOPT="${CFLAGS}"
-}
-
-src_install() {
-	dobin tcptrace xpl2gpl
-
-	newman tcptrace.man tcptrace.1
-	dodoc CHANGES COPYRIGHT FAQ README* THANKS WWW
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN}; then
-		elog "Note: tcptrace outputs its graphs in the xpl (xplot)"
-		elog "format. Since xplot is unavailable, you will have to"
-		elog "use the included xpl2gpl utility to convert it to"
-		elog "the gnuplot format."
-	fi
-}
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild
index e0a0ede25bfe..9e42190df0b0 100644
--- a/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild
+++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
 
 DEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index eaf6fe40ddef..bed49d184c36 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -6,8 +6,10 @@ AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f92022
 DIST wireshark-2.2.7.tar.bz2 32309420 BLAKE2B a4ec32fab15235c5bde9f03ceafc5760055a769dd40d96526a18ad16d5642e957f620fc58f42c3323745bd679d6ef7b006283e7b9ddc52ddadc2680789d957ea SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716
 DIST wireshark-2.4.3.tar.xz 28807920 BLAKE2B 831691d084fc9ed6198b23c0347efa487398df37ca0cf5972db64b0724fad04b3104a5faed104b5d4b560254b19a2e41118c8d7b71cce785f38ede077215e80f SHA512 4344b9efeda3afba4b13bb468f7a12c4565da96c6182a8203cc5815baa11e7d84f3f11003b4289c6c11391cfb590b8c0319268196cc646a8f0226c432e9bb433
 DIST wireshark-2.4.4.tar.xz 28818372 BLAKE2B 1a28cabdc8dfbed16244c6906ef360c2d3edee3cd75a5134ea7b21b138c3be08de9327a1415cb308f7a01c382e0aa5cf14e4466b4c3762c29a7f7cbc4683890e SHA512 b6625f860a10e10babd686820680a5e169594f171e7e176fc96325255ec096481da2e8a0fdff10b42cead82011740714a4331003dda0d48bf3b419da37834bdc
+DIST wireshark-2.5.0.tar.xz 28197388 BLAKE2B 5d50d3752078a71d1d83f48a85ee564d14950efab39d5679430a61a266f9b93749278cd19d155036326753fbab86f83c5edb764adec5d68325730dbba19a920f SHA512 963c03dd363850cd0ad8a32a3e8c85410f2b23fadc081f00e4e3a2ad3a324a5f35626fbb7e490ec01c61260500363fef93c52bf7796b917e9490fff4044ee67f
 EBUILD wireshark-2.2.7-r1.ebuild 6481 BLAKE2B 36529064a3216f6c9ae71ae23ec31049c6a0d7862be41c333f369bfdd0cb62ac5315883c465d2be517e2a4ddd780d110e59c413725f791f0cf9ac0380dbe36ce SHA512 cd90dd82e3418c000ff142a207a4f05db6bfdb5f8087b4c7b1f595bede0847277fba43a615972c2222e4261c647849ff3165fba64d67dcd55e4441b76324e3d0
 EBUILD wireshark-2.4.3-r1.ebuild 7378 BLAKE2B 1b79f8342f72b96831dc875072c90f53d903e6e750e0fadd0f39aa1787bce4ebbbc8073e47f9945b32e437a5dc1e2e04e98d3e6c5e4cadea10bdbe34fc497e52 SHA512 88aa8d2e67db9a8d309d412a890ff52c91ea296cf1592fe7445ebb9c8707cadbad44d66ccb3c9ea71ceb2cc23dd958028e51db88a3f65b3446c50f3c13c9ad0d
 EBUILD wireshark-2.4.4.ebuild 7383 BLAKE2B b3c2fb215055d0ba48c4edd8a2a846f77187ddb1add61477e03d20a817f0bcf5054876eea2180268afeab0e636325d3afc7de553da6a66fe4fbef98fbde94aaa SHA512 79432eeaa844a0984b35087019dd26c99f4f6b0b4195d3f6cb440a4d13017b42d894718d5d90a0c866502a8aef1a0e92684cca61909c13ae9d32f9809fb3b356
-EBUILD wireshark-99999999.ebuild 7259 BLAKE2B e6cd9d0222161c4280dbd722bf159e91b4659ab52eb9b3e0c549715734a1dcc610cebe9e22c4e5a3bd170457655160c88d5dcf4f8aac67a076d1c6b9f17f3a21 SHA512 edbf3a090c9af2531e9f0a4735ed38ed8e56b5fa2eb727a4866cfe3b6573846c24fa2ef8c67c087d4a768d3d38b8085f80d35c0981b75e9cb363ca1ca37bb718
-MISC metadata.xml 4780 BLAKE2B 57512cc79565297a5357767a663a93a49655de7d7ec8adbe7d0da21e0617c69255ca3a52153f7f2e2a21a3b96f378ab0c691666f5336896af422fc88ee5fada3 SHA512 60941d415e0733be68ab15af456f842e5793eeef6cf4459449cc919ff5255d1ab2b194ece2c4b4d90bdebc5f1601fd98952fe22bafff8918e25613180233dec5
+EBUILD wireshark-2.5.0.ebuild 7109 BLAKE2B b382d712d053dc7003aab929c53724ad86bb6c71811b77e94c246af5b28bca60eb22d58d09d34075c0b0eb572134c03f19593eaf7caec25ffebfdf7607b495f8 SHA512 d36bad8ff3372c18af5be721a7469a66e93e317ba12efe902ddecd033092b233ed4c00c113222ac341579211bbf147b01914b2895bb4ee8fb854cd0d9ec3a428
+EBUILD wireshark-99999999.ebuild 7128 BLAKE2B 9e7037c3cb3635e0c2e39635f98061bc188dc575053bf54824c9fdfaa8b335b4e7c28dbdc1d11e7aebaac989902c675d8958db0b20829ea0e5bef6fdb6791296 SHA512 692cb84ef62ac6dacc77b7002abe5f15000507d16027fa4dd95146a633ac2ab143847ed97f882bc0bf68e6a67e8fc8f02e7ac336b85148df0764c011c85bde1c
+MISC metadata.xml 4772 BLAKE2B 30bdf52594176cdd8314d5292ed55500f26841c71900acd0d0772e1555f51e9979cce7ff3b301beee21dab10565ccc259596cc78bab455fe8cf42cda40314d86 SHA512 1694eb364cf39049d899d056d209c6fd51cd72b6477132312587de7af4f49bc026d5873e97c3c80e3b99228b3f57da99a00f0a10a6596e4659d2a89d1fd6965b
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 1dcbdb4e4770..9801f150cc4c 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -1,62 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>netmon@gentoo.org</email>
-		<name>Gentoo network monitoring and analysis project</name>
-	</maintainer>
-	<longdescription>
-	Wireshark is the world's foremost network protocol analyzer, and is the de
-	facto (and often de jure) standard across many industries and educational
-	institutions. Wireshark has a rich feature set which includes 1) deep
-	inspection of hundreds of protocols, with more being added all the time, 2)
-	live capture and offline analysis, 3) standard three-pane packet browser, 4)
-	captured network data can be browsed via a GUI, or via the TTY-mode TShark
-	utility, 5) the most powerful display filters in the industry, 6) rich VoIP
-	analysis, 7) read/write many different capture file formats: tcpdump
-	(libpcap), Catapult DCT2000, Cisco Secure IDS iplog, Microsoft Network
-	Monitor, Network General Sniffer® (compressed and uncompressed), Sniffer®
-	Pro, and NetXray®, Network Instruments Observer, Novell LANalyzer, RADCOM
-	WAN/LAN Analyzer, Shomiti/Finisar Surveyor, Tektronix K12xx, Visual Networks
-	Visual UpTime, WildPackets EtherPeek/TokenPeek/AiroPeek, and many others, 8)
-	capture files compressed with gzip can be decompressed on the fly, 9) live
-	data can be read from Ethernet, IEEE 802.11, PPP/HDLC, ATM, Bluetooth, USB,
-	Token Ring, Frame Relay, FDDI, and others, 10) decryption support for many
-	protocols, including IPsec, ISAKMP, Kerberos, SNMPv3, SSL/TLS, WEP, and
-	WPA/WPA2, 11) coloring rules can be applied to the packet list for quick,
-	intuitive analysis, 12) output can be exported to XML, PostScript®, CSV, or
-	plain text 
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>
+Wireshark is the world's foremost network protocol analyzer, and is the de
+facto (and often de jure) standard across many industries and educational
+institutions. Wireshark has a rich feature set which includes 1) deep
+inspection of hundreds of protocols, with more being added all the time, 2)
+live capture and offline analysis, 3) standard three-pane packet browser, 4)
+captured network data can be browsed via a GUI, or via the TTY-mode TShark
+utility, 5) the most powerful display filters in the industry, 6) rich VoIP
+analysis, 7) read/write many different capture file formats: tcpdump (libpcap),
+Catapult DCT2000, Cisco Secure IDS iplog, Microsoft Network Monitor, Network
+General Sniffer® (compressed and uncompressed), Sniffer® Pro, and NetXray®,
+Network Instruments Observer, Novell LANalyzer, RADCOM WAN/LAN Analyzer,
+Shomiti/Finisar Surveyor, Tektronix K12xx, Visual Networks Visual UpTime,
+WildPackets EtherPeek/TokenPeek/AiroPeek, and many others, 8) capture files
+compressed with gzip can be decompressed on the fly, 9) live data can be read
+from Ethernet, IEEE 802.11, PPP/HDLC, ATM, Bluetooth, USB, Token Ring, Frame
+Relay, FDDI, and others, 10) decryption support for many protocols, including
+IPsec, ISAKMP, Kerberos, SNMPv3, SSL/TLS, WEP, and WPA/WPA2, 11) coloring rules
+can be applied to the packet list for quick, intuitive analysis, 12) output can
+be exported to XML, PostScript®, CSV, or plain text.
 </longdescription>
-	<use>
-		<flag name="adns">Use the GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag>
-		<flag name="androiddump">Install androiddump, an extcap interface to capture from Android devices</flag>
-		<flag name="capinfos">Install capinfos, to print information about capture files</flag>
-		<flag name="captype">Install captype, to print the file types of capture files</flag>
-		<flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag>
-		<flag name="crypt">Use <pkg>dev-libs/libgcrypt</pkg> to decrypt traffic</flag>
-		<flag name="dftest">Install dftest, to display filter byte-code, for debugging dfilter routines</flag>
-		<flag name="doc-pdf">Build documentation in pdf format (US and a4 paper sizes)</flag>
-		<flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag>
-		<flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag>
-		<flag name="libssh">Use <pkg>net-libs/libssh</pkg> (for sshdump)</flag>
-		<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML configuration in dissectors</flag>
-		<flag name="lz4">Use <pkg>app-arch/lz4</pkg> for compression/decompression</flag>
-		<flag name="mergecap">Install mergecap, to merge two or more capture files into one</flag>
-		<flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
-		<flag name="nghttp2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag>
-		<flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
-		<flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag>
-		<flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag>
-		<flag name="reordercap">Install reordercap, to reorder input file by timestamp into output file</flag>
-		<flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag>
-		<flag name="sharkd">Install sharkd, the daemon variant of wireshark</flag>
-		<flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
-		<flag name="snappy">Use <pkg>app-arch/snappy</pkg> for snappy compression and decompression</flag>
-		<flag name="spandsp">Use <pkg>media-libs/spandsp</pkg> for for G.722 and G.726 codec support in the RTP Player</flag>
-		<flag name="sshdump">Install sshdump, an extcap interface to capture from a remote host through SSH</flag>
-		<flag name="text2pcap">Install text2pcap, to generate a capture file from an ASCII hexdump of packets</flag>
-		<flag name="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag>
-		<flag name="tshark">Install tshark, to dump and analyzer network traffic from the command line</flag>
-		<flag name="udpdump">Install udpdump, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file</flag>
-	</use>
+<use>
+<flag name="adns">Use <pkg>net-dns/c-ares</pkg> to resolve DNS names</flag>
+<flag name="androiddump">Install androiddump, an extcap interface to capture from Android devices</flag>
+<flag name="bcg729">Use <pkg>media-plugins/mediastreamer-bcg729</pkg> to play G.729 codec</flag>
+<flag name="capinfos">Install capinfos, to print information about capture files</flag>
+<flag name="captype">Install captype, to print the file types of capture files</flag>
+<flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag>
+<flag name="crypt">Use <pkg>dev-libs/libgcrypt</pkg> to decrypt traffic</flag>
+<flag name="dftest">Install dftest, to display filter byte-code, for debugging dfilter routines</flag>
+<flag name="doc-pdf">Build documentation in pdf format (US and a4 paper sizes)</flag>
+<flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag>
+<flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag>
+<flag name="libssh">Use <pkg>net-libs/libssh</pkg> (for sshdump)</flag>
+<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML configuration in dissectors</flag>
+<flag name="lz4">Use <pkg>app-arch/lz4</pkg> for compression/decompression</flag>
+<flag name="mergecap">Install mergecap, to merge two or more capture files into one</flag>
+<flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
+<flag name="nghttp2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag>
+<flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
+<flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag>
+<flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag>
+<flag name="reordercap">Install reordercap, to reorder input file by timestamp into output file</flag>
+<flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag>
+<flag name="sharkd">Install sharkd, the daemon variant of wireshark</flag>
+<flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
+<flag name="snappy">Use <pkg>app-arch/snappy</pkg> for snappy compression and decompression</flag>
+<flag name="spandsp">Use <pkg>media-libs/spandsp</pkg> for for G.722 and G.726 codec support in the RTP Player</flag>
+<flag name="sshdump">Install sshdump, an extcap interface to capture from a remote host through SSH</flag>
+<flag name="text2pcap">Install text2pcap, to generate a capture file from an ASCII hexdump of packets</flag>
+<flag name="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag>
+<flag name="tshark">Install tshark, to dump and analyzer network traffic from the command line</flag>
+<flag name="udpdump">Install udpdump, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file</flag>
+</use>
 </pkgmetadata>
diff --git a/net-analyzer/wireshark/wireshark-2.5.0.ebuild b/net-analyzer/wireshark/wireshark-2.5.0.ebuild
new file mode 100644
index 000000000000..bcdf2d88a691
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.5.0.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2018 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 ~hppa ~ia64 ~x86"
+IUSE="
+	adns androiddump bcg729 +capinfos +caps +captype ciscodump
+	cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk
+	kerberos libssh libxml2 lua lz4 +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 )
+	bcg729? ( media-libs/bcg729 )
+	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:* )
+	lz4? ( app-arch/lz4 )
+	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/speexdsp
+			<media-libs/speex-1.2.0
+		)
+		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
+
+	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 bcg729) \
+		$(use_with caps libcap) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh) \
+		$(use_with libxml2) \
+		$(use_with lua) \
+		$(use_with lz4) \
+		$(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-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* doc/randpkt.txt doc/README*
+
+	if use doc-pdf; then
+		docinto /usr/share/doc/${PF}/pdf/
+		dodoc docbook/{developer,user}-guide.pdf
+	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 \
+		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 s
+		for s in 16 32 48 64 128 256 512 1024; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins image/wsicon${s}.png wireshark.png
+		done
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins image/WiresharkDoc-${s}.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
+}
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 9d9fca8d8a03..bb1724389ab4 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,11 +12,11 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
-	adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
-	+dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua
-	lz4 +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump
-	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap
-	tfshark +tshark +udpdump zlib
+	adns androiddump bcg729 +capinfos +caps +captype ciscodump
+	cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk
+	kerberos libssh libxml2 lua lz4 +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 )
@@ -30,6 +30,7 @@ CDEPEND="
 	dev-libs/libgcrypt:0
 	netlink? ( dev-libs/libnl:3 )
 	adns? ( >=net-dns/c-ares-1.5 )
+	bcg729? ( media-libs/bcg729 )
 	caps? ( sys-libs/libcap )
 	geoip? ( dev-libs/geoip )
 	gtk? (
@@ -171,6 +172,7 @@ src_configure() {
 		$(use_enable tshark) \
 		$(use_enable udpdump) \
 		$(use_with adns c-ares) \
+		$(use_with bcg729) \
 		$(use_with caps libcap) \
 		$(use_with geoip) \
 		$(use_with gtk gtk 3) \
@@ -216,16 +218,11 @@ src_install() {
 	default
 
 	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README.* \
-		doc/{randpkt.txt,README*}
+	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/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
+	if use doc-pdf; then
+		docinto /usr/share/doc/${PF}/pdf/
+		dodoc docbook/{developer,user}-guide.pdf
 	fi
 
 	# install headers
@@ -252,16 +249,14 @@ src_install() {
 	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
+		local s
+		for s in 16 32 48 64 128 256 512 1024; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins image/wsicon${s}.png wireshark.png
 		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
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
 		done
 	fi