gentoo resync : 05.04.2018

24 files changed, 462 insertions, 59 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 88718ca4f2cc..43f89b7aca22 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/bro/Manifest b/net-analyzer/bro/Manifest
index ca754fe4489b..73103aaefc64 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 1297 BLAKE2B 2850b05e2db1b594f5ab581c17944c0fdfc2d5a00ff911c9f3d481aa3ceee5f5c48ffe2c1777a2b0bb2842fa48e32e7e11ab89184fb79251d35fa9f141416dac SHA512 59c7b91fbbe98223f5ed946e254c99848c09508b2bd9efba976a5721a02e5d93a20da4549703776b6ffc6cb7d243f3a9d6b1be233f32db5eb10b18f67b0a771d
+MISC metadata.xml 1065 BLAKE2B f8d529f18a04bf8c5b5f5920dfe343e9fad6e8675a38cf889b729d4764735902958ede3734b09bd4d471b526762af60b44835006cf35c0b833972a6dfe50738b SHA512 db905212d8b96c0f9dc303f2c879c3644ce3e86ab8dd1601c2b1dc37317f3975e4216f398709ea21a6bdc845c7231f7a663bf052daac8fc1e41b20e6fec7606d
diff --git a/net-analyzer/bro/metadata.xml b/net-analyzer/bro/metadata.xml
index 8370fd7db45a..90d38c4236c6 100644
--- a/net-analyzer/bro/metadata.xml
+++ b/net-analyzer/bro/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>tomboy64@sina.cn</email>
-        <name>M.B.</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
+<!-- maintainer-needed -->
     <use>
         <flag name="broccoli">Enable the Bro Client Communication Library</flag>
         <flag name="broctl">An interactive shell for managing Bro installations</flag>
@@ -21,7 +14,6 @@
         <flag name="tcmalloc">Enable Google's Performance Analysis Tools</flag>
         <flag name="tools">Small auxiliary tools for Bro</flag>
     </use>
-    <longdescription lang="en">
-        Bro is a powerful network analysis framework that is much different from the typical IDS you may know.
+    <longdescription lang="en">Bro is a powerful network analysis framework that is much different from the typical IDS you may know.
     </longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/chronograf/Manifest b/net-analyzer/chronograf/Manifest
new file mode 100644
index 000000000000..9b679eae9ac8
--- /dev/null
+++ b/net-analyzer/chronograf/Manifest
@@ -0,0 +1,6 @@
+AUX chronograf.confd 456 BLAKE2B 149872b15c8f52e1419a02661e65d1029275fecea68821e212e16642e61caddfbc5bd879c82f017f56cb639ef0bcbfbcb5ccd52b3af5a969004b0e0acd5dcbda SHA512 d77e008c9afcc8a8a3edc24587e5df5ffe6033458d5f6d41d0468799aca37f3f39db69acbfdf656dadd83b697c17ec5bf0a986e2115d58df5964eb8ed4e7f851
+AUX chronograf.rc 595 BLAKE2B 7f067eb786c7790dbfda0e5ff1bc0f63993b631795eb978e164b5170af66696936106f3327223a3a4bbedf416b50cf2ea9dcc13c5adfda0ca2570ad782699c08 SHA512 722fe501606a9e55d2bfaff54bc3b34992fb22bc2ccc82cb53bdbd0683bd844bebb3ea7f3148c011e4321b163866380e0528826e0e59268dd334229ba0741816
+DIST chronograf-1.4.3.0.tar.gz 3979946 BLAKE2B 963511250e1d49ca92e9fde23b3c0899331ef22fe071c47c8d9d6a0ab0264e2dcb1dc083559424ff0b4bb59b0d4eb3121febe6f1ce828bac24598ae8be51cb6a SHA512 49a7565dc58f4f79ad1feb25bf6f74e9267630f6dab5f8767411d11f12dd7a76e9486b8f52c961c27dae6511286192585cee67363acf558287da436c39500ef9
+DIST chronograf-gen-1.4.3.0.tar.gz 2488979 BLAKE2B 47738629d25dd6b5c11f942bdcea089291bfd8ad1476f448985d35fd35fa4a59274e95b863f7055c34ac0047f584fc45c83e3143aceb8b13b6c4fd28c42039ec SHA512 0346c19f80bea597c87a54f2d5409854a30dfa020bb0326791a6387d81aafe0c6e5112b6d086b21f95dc4f68a269a8fb2e0113156122636c3a6281ba58df6b49
+EBUILD chronograf-1.4.3.0.ebuild 1850 BLAKE2B 458d6135b4a0659c43f76fcc12187dcb1324f888a6554761b81d4fe8821c2aba6f55b011060e23ad9eefb367b262926caf1ffdb624e190a31ed1a8e3a91677a0 SHA512 ff41bdb1e5516b4dbdd0ef4599d04d47a3864e229def6f4cc6874f49489a4a550be9a103e72c25682177470ea4791f9b0548ccc6431224f136763eef4636fc10
+MISC metadata.xml 384 BLAKE2B 824a046c27fd9dc3a8f597d8b4bfb89455f033809b6ceb2c34114f3c204e96499f7a6e5942ed56ee5bd3e982b983b9b7af7123b97c6a6af79fb0ff9b7313f7e7 SHA512 dde52f9fbd10db52072d2a40b4c32df30dc596914ab41088d45c931d467e87b4cfffef381f5a35c2eed584ae3bd9798c9b34e3afefb86fb6ca65081f9eaf7126
diff --git a/net-analyzer/chronograf/chronograf-1.4.3.0.ebuild b/net-analyzer/chronograf/chronograf-1.4.3.0.ebuild
new file mode 100644
index 000000000000..2b2c7163f727
--- /dev/null
+++ b/net-analyzer/chronograf/chronograf-1.4.3.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=github.com/influxdata/chronograf
+
+inherit golang-build golang-vcs-snapshot systemd user
+
+DESCRIPTION="Monitoring, processing and alerting on time series data"
+HOMEPAGE="https://www.influxdata.com"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~williamh/dist/${PN}-gen-${PV}.tar.gz"
+
+LICENSE="AGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+pkg_setup() {
+	enewgroup chronograf
+	enewuser chronograf -1 -1 /var/lib/chronograf chronograf
+}
+
+src_unpack() {
+	local f
+	golang-vcs-snapshot_src_unpack
+	pushd "${S}/src/${EGO_PN}" > /dev/null || die
+	for f in ${A}; do
+		case $f in
+			${PN}-gen-*.tar.*)
+				unpack ${f}
+				;;
+		esac
+	done
+}
+
+src_compile() {
+	pushd "src/${EGO_PN}" > /dev/null || die
+	set -- env GOPATH="${S}" go build -o chronograf cmd/chronograf/main.go
+	echo "$@"
+	"$@" || die "building chronograf failed"
+	set -- env GOPATH="${S}" go build -o chronoctl cmd/chronoctl/main.go
+	echo "$@"
+	"$@" ||	die "building chronoctl failed"
+	popd > /dev/null || die
+}
+
+src_install() {
+	pushd "src/${EGO_PN}" > /dev/null || die
+dobin chronograf chronoctl
+	dodoc CHANGELOG.md
+	insinto /etc/logrotate.d
+	newins etc/scripts/logrotate chronograf
+	systemd_dounit etc/scripts/chronograf.service
+	insinto /usr/share/chronograf/canned
+doins canned/*.json
+keepdir /usr/share/chronograf/resources
+	keepdir /var/log/chronograf
+	fowners chronograf:chronograf /var/log/chronograf
+	newconfd "${FILESDIR}"/chronograf.confd chronograf
+	newinitd "${FILESDIR}"/chronograf.rc chronograf
+	popd > /dev/null || die
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		einfo "In order to use chronograf, you will need to configure"
+		einfo "the appropriate options in ${EROOT}etc/conf.d/chronograf"
+	fi
+}
diff --git a/net-analyzer/chronograf/files/chronograf.confd b/net-analyzer/chronograf/files/chronograf.confd
new file mode 100644
index 000000000000..a70c355c6fb6
--- /dev/null
+++ b/net-analyzer/chronograf/files/chronograf.confd
@@ -0,0 +1,16 @@
+#The convention in this file is to show the default setting commented
+#out.
+#To change the setting, uncomment it then change the value.
+
+#This is the chronograf error log:
+#error_log="/var/log/chronograf/chronograf.log"
+
+#This is the chronograf output log:
+#output_log="/dev/null"
+
+# If you set this to yes, chronograf will report anonymous usage stats
+# to influx data.
+#report_usage_stats="no"
+
+# Extra options to pass to chronograf:
+#chronograf_opts=""
diff --git a/net-analyzer/chronograf/files/chronograf.rc b/net-analyzer/chronograf/files/chronograf.rc
new file mode 100644
index 000000000000..335240dbf269
--- /dev/null
+++ b/net-analyzer/chronograf/files/chronograf.rc
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+
+command=/usr/bin/chronograf
+command_args="${chronograf_opts}"
+command_background=yes
+command_user=chronograf:chronograf
+make_pidfile=yes
+pidfile=/var/run/chronografd.pid
+
+# Logging
+error_log="${error_log:-/var/log/chronograf/chronograf.log}"
+output_log="${output_log:-/dev/null}"
+
+start_pre() {
+	export HOST=127.0.0.1
+	export PORT=8888
+	export BOLT_PATH=/var/lib/chronograf/chronograf-v1.db
+	export CANNED_PATH=/usr/share/chronograf/canned
+	export RESOURCES_PATH=/usr/share/chronograf/RESOURCES
+	yesno "${report_usage_stats:-no}" || export REPORTING_DISABLED=yes
+	return 0
+}
diff --git a/net-analyzer/chronograf/metadata.xml b/net-analyzer/chronograf/metadata.xml
new file mode 100644
index 000000000000..ed7262b70f1e
--- /dev/null
+++ b/net-analyzer/chronograf/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		Open source framework for processing, monitoring and alerting on
+		time series data.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/gr-fosphor/Manifest b/net-analyzer/gr-fosphor/Manifest
index 9a2a330577b9..3b822ae4ad48 100644
--- a/net-analyzer/gr-fosphor/Manifest
+++ b/net-analyzer/gr-fosphor/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-fosphor-9999.ebuild 1301 BLAKE2B f4a9b167ba19ffcbc64a391594c526bfaa52653f5e260ed0057fb8b1a0e6ea34333efb898e573816b9586d8110e487afafdf2efa2d1775ed77f7a01e2b5b9b51 SHA512 18aedf7be6470b6cb41503908c1e3feced546776ca57aecf74294f6d4231f522834d743c2ff0743595a65f3e87e5e6d971410abde00a3931562b42dfe28b5b6f
+EBUILD gr-fosphor-9999.ebuild 1266 BLAKE2B 881f58972e6c63671162b6793ff35cabcb4649c906ffa855725e429a7a0a57f4fa3f413ae8df986daec13aa4ad622549ee80bef314f02dc7126bd36d29d9fe78 SHA512 5396e3f2ddee52a91f4981ce14490d9e5fdf1120bff9ed201b0115e0896199e2ea92a3a58bdc3f9c83c819db25f85cfc7080ddf43e820e9a7148931d8a95aab0
 MISC metadata.xml 308 BLAKE2B 365c82d2c544f94f613bee62f13ab91dcbefd1652fccfec5222a616443714400c686eb5d77c892b44ab0c1badd1877b4bd0dcb9040c98720c13934d567482857 SHA512 cca3e1ffd2ee31e64dbea0f66093f3295b9e1ce2161b9b71dbd1d518a6a0ff83843c684c1c958bffb80b4f4fda9d5a272be8d6ab2ecf6f0fe57202a65a218df9
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
index 80888f939b37..29c293990ccf 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
@@ -24,14 +24,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="+glfw qt4 wxwidgets"
+IUSE="+glfw wxwidgets"
 
-RDEPEND="qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-	)
-	>=net-wireless/gnuradio-3.7_rc:0=[qt4?,wxwidgets?,${PYTHON_USEDEP}]
+RDEPEND="
+	>=net-wireless/gnuradio-3.7_rc:0=[wxwidgets?,${PYTHON_USEDEP}]
 	media-libs/freetype
 	dev-libs/boost:=
 	glfw? ( >=media-libs/glfw-3 )
@@ -56,9 +52,10 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DENABLE_GLFW="$(usex glfw)"
-		-DENABLE_QT="$(usex qt4)"
+		-DENABLE_QT=OFF
 		-DENABLE_WX="$(usex wxwidgets)"
 		-DENABLE_PYTHON=ON
 	)
+	# re-enable Qt if port to Qt5 is ever finished
 	cmake-utils_src_configure
 }
diff --git a/net-analyzer/ipsumdump/Manifest b/net-analyzer/ipsumdump/Manifest
index c91e1bbe74ea..3d5441ece218 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 770 BLAKE2B d94e9c83946607b1e4c503a7a110e7e0602474f630155ce0e987a8c522e77199ac2c03df470ed898e2a806042980cb881d185a875ef548b9c0dc3d46660c5e4c SHA512 02accc898d4771c406546ce91a3c475debf7653ba54b8d455493659f4db1e4a07c0511e979eda8fd3a6cecd1b78d81b577a71777b93563d12804fae1cb727512
+MISC metadata.xml 547 BLAKE2B c9ef96740f07144aed5354015ac10e5a71192792ea80867ae69a470545eae9a321301e9f301d6a126cd5d662da87c1bc830c3b98ff3b6534bf5b816b6a997c73 SHA512 811294d5746b68c75300be9f66c90090a1338844f992f08e7b8cf02195cd5c90c3ddd0b0e88e753d9903b0c517b29cc5b9811504cbac2230660e0f5840ead7ab
diff --git a/net-analyzer/ipsumdump/metadata.xml b/net-analyzer/ipsumdump/metadata.xml
index e440233dc9b0..b26c707b2498 100644
--- a/net-analyzer/ipsumdump/metadata.xml
+++ b/net-analyzer/ipsumdump/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>tomboy64@sina.cn</email>
-        <name>M.B.</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
+<!-- maintainer-needed -->
     <use>
         <flag name="nanotimestamp">Enable timestamps with nano-second resolution</flag>
     </use>
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 950f41f83273..f8f18bc98c5e 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -6,11 +6,13 @@ 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.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258 SHA512 2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3
+DIST wireshark-2.4.6.tar.xz 28851192 BLAKE2B 19a69d077b794ab07fbfb22b7cf9e61ff54ded5dcd0396ba97d1cbd99addaeb9670d5a870f5e83c39384230def04c078d676580bded81746753716cb392ee05a SHA512 171047fa36a6cb29d1edb8e28086e24075f8b77581d9f3142fa39af8ae3d6dfe0c2e41a9335ca5d9851578b54ac9e6e74ff5bd92a96af262a5cc7a73857b8b81
 DIST wireshark-2.5.0.tar.xz 28197388 BLAKE2B 5d50d3752078a71d1d83f48a85ee564d14950efab39d5679430a61a266f9b93749278cd19d155036326753fbab86f83c5edb764adec5d68325730dbba19a920f SHA512 963c03dd363850cd0ad8a32a3e8c85410f2b23fadc081f00e4e3a2ad3a324a5f35626fbb7e490ec01c61260500363fef93c52bf7796b917e9490fff4044ee67f
 DIST wireshark-2.5.1.tar.xz 28229472 BLAKE2B ac832e3d8727a20754153949d7dfba9cfbc359955e55c06a9181ecbd3c9d9ddac269a745a430c47907b3e205d1b593241e0908b5b6c232613cbd4d23c96c4f61 SHA512 c3e1abb1c8b6a035640d655c59bfb8a9a846c88f49035b8086ae81a6e74cb296419f15bc4969489208fdce6578d279663c6fbc8d6eebff1b6097d1dbd0e71b75
 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.5.ebuild 7393 BLAKE2B 480ba1146f7fa04f3ba3dc8ee2c31b0fdbb259aa35893b972a75cfd85ffe9d804dbd3b04162921e97d4faed7c6bbe0606a9f3718fafcde851d21c9f590ed47a1 SHA512 7d3f9b423ab116274cf3e7d9f8c7e566cb667c7b2cb66b35c0cf13f4f5722d22b94ee87e07bc14089e8c13dd233706be0ad3598ea3f1f352e7474172205a66f8
+EBUILD wireshark-2.4.6.ebuild 7396 BLAKE2B a38f625603f0e9145dea4624222a8b340405140810a004e0e6947e3238a8253f2fd114d6099571f6e50293e0adbb6555cbaeffc16617cbe0743e28fe717b08db SHA512 38b4a32b44028d1ac95be8ae8b18711c39de84506c5fb188f2352af7033c4a9511481d39eb47f30364ffb43448f41022b60219be4a1820c74eaf0a754dd78960
 EBUILD wireshark-2.5.0.ebuild 7136 BLAKE2B 0d4694ca0f61af34f8b54ac29d43d146ffabe22ec905e78f4ca1f49667d9a09dd4e5bfbb01f42d6ca2003712e2daaf4c52d4c00c03afdf492b638cfae95016a3 SHA512 642a7f788b98b0f820880f14a3245122803ce5f96a4290b327144be3c22f4ea7c23eb9142bf47332defa9b63ed2e8e5a81f20a69137d1ce1d5af84d14377deea
 EBUILD wireshark-2.5.1.ebuild 6664 BLAKE2B a6385ce71f757f3ac7fa7a38b6cacff2b21cbb235af9aeba31088f1965bdad709a848a3f2365c8eb31dd648d5eafb981dd58017719222afda341632b1e9866ca SHA512 fb2d172976a00b24e1bb7507bc0f3f5707a57e515bcccfb6561749d6d0857530c3e7d705ddfb571bc07ef0d4541f9c5d8ec2b30ea966b3e73b165e16284c7af3
 EBUILD wireshark-99999999.ebuild 7143 BLAKE2B 1f37c8e34e6d65965ba0b54056198c7d1fd15f763c987a9a753cf8a6c6c8487ebf977c8ccd6171d1336e1074cad7fe28620721b8b4eae74f1dc7e84b6a0ab38d SHA512 ef42790fdbf27aed911a8922abc7e094e2ccf08ea2c34f04587f17a3b9b892238bc401a4a9a9b017a1025098ddc17a8c47970d5b84811dd6690a742969d276ba
diff --git a/net-analyzer/wireshark/wireshark-2.4.6.ebuild b/net-analyzer/wireshark/wireshark-2.4.6.ebuild
new file mode 100644
index 000000000000..730f9e0a9b89
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.4.6.ebuild
@@ -0,0 +1,293 @@
+# 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 ~arm ~arm64 hppa ~ia64 ~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
+	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 )
+	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
+	"${FILESDIR}"/${PN}-2.4.3-libsmi.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 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-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 dumpcap && 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/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 50268aca5462..5b013de56e4b 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -31,13 +31,13 @@ DIST zabbix-3.2.9.tar.gz 16098846 BLAKE2B a8d7ab803cab075889bbaee10806c1f35be42a
 DIST zabbix-3.4.5.tar.gz 17170228 BLAKE2B bd799a3ad25256421bc2a8458019237da17e78d2dd5253485cebbc40df785e550e7cf15fcf8925a225c118e38e9aaad3f7532f909ba3eaff3a175136033ae81a SHA512 e77c8693d687c9f1e3c160f2f41161b5e4ac663f0db69f4bff424da4ba607815ad0148448c6f80a2b9357ad7472016610f4beed173e40c6fcf661874d75c69a4
 DIST zabbix-3.4.6.tar.gz 17162881 BLAKE2B cf8a461f720b2f1d4910d8f512ac9949c56b9116fb9ddd1a26687b22da2c3938c4f10e6d0029bf348101e897fe6d352880964aaf5a0f55dd377fb6eec59a5006 SHA512 02300b103278f6f2867629a958a8bc5ea8e6cfe5743056b7e2f9d59afdeea04e29f51cae7c5d9847899c45c321a4c15cdaf66203c627fb1d85b3af619afe73ca
 DIST zabbix-3.4.7.tar.gz 17177022 BLAKE2B db465ff9c0085922e23ba042b0975d1368abb15408e943aa784e8efb49f7c412761742d1c8cda19c3cf86ea03d358d731cbe022ba3c9b139963f396290e4a272 SHA512 8397ee41c3b4efc2fb66638fd7c554ea668fad0a7c79d8aa3ed442cae065e62355c1e16e2008c7a65def775f23e6dfa1d75bbc682c49a45c9db5d7eddf905140
-EBUILD zabbix-2.2.16.ebuild 9411 BLAKE2B 695aa532dcd84bc0ae58d065e5fe3b95a717462d126927981e19011918a92630a6fb2626598b6022f6f7677c9c8e31bb0a9b2d684bdff9f1f490c9120ac7682e SHA512 522fdcebd45a24c517c7a74b9e80969d4573f63205440ca61c0252d6280529f83019864c3ae24f89493974c06be09f7fe9872fc56332b1d8b950de6782b8d95c
-EBUILD zabbix-2.2.21.ebuild 9413 BLAKE2B eb875afcae273c71166dd96e3e06e438326ee692997a30a0bb73e3f14ae4a4ec24080ff8d0c8539a23a4b021e6dac291b6ce9d225e75c94ef0725d2ca4059d22 SHA512 1127ec9fba4f124bd506faaf6dd9679441a5defc726655a05520af818a8f226634bca5e3b73bb721c83554992731179a3dcfad15d3767e784099c9d89cffda55
-EBUILD zabbix-3.0.14.ebuild 9276 BLAKE2B cce198f1a7554d02976347c0bf80330fe564294de9566da18a8ad055e0ad73356abdd3f250fa53827298f2ba3abd8491e26d56d14e7e055f731e4eefbe45fdf9 SHA512 67895e8069a0c97517a3771d681a152aa333b876143a8d4c137d6997d19764e52b73bd45cbce58d1d1dbcc8793bbc987c749634cfb0c419c2505c4956166a623
-EBUILD zabbix-3.2.10.ebuild 9240 BLAKE2B 6aebb13ffa636b4887b74d93b1493858a66ac0b6b41a1e56d25481cb517bcc84e5fddbbde1abc17533c02f373b928291c68f8e912305b48c7c5d398c77c78ba4 SHA512 502e7299347bce819d47662096eeb5d5161f63777d0ba337bc18b75936d81b3a416c37703506dd342e40792051e3233dff168c3dc99aa611c4af7ae43dec8016
-EBUILD zabbix-3.2.11.ebuild 9240 BLAKE2B 1a9bccc597365723fa97e1ae0ed072bebbf10d716f59be126c21dfc5bf440b9117e56990132efeaeba18c37d2a9bd8cc40f98c095eda6d66ccbe5fae447124fd SHA512 63d1cd271fc8603b0a0252e8d896a5af9f7d72c6cf4648426d76c9d7a6751582875fb91ecaf433c4da13fb6f823f0ec13b8190fb56b4b98231207a3d3d0a6d7f
-EBUILD zabbix-3.2.9.ebuild 9240 BLAKE2B 6aebb13ffa636b4887b74d93b1493858a66ac0b6b41a1e56d25481cb517bcc84e5fddbbde1abc17533c02f373b928291c68f8e912305b48c7c5d398c77c78ba4 SHA512 502e7299347bce819d47662096eeb5d5161f63777d0ba337bc18b75936d81b3a416c37703506dd342e40792051e3233dff168c3dc99aa611c4af7ae43dec8016
-EBUILD zabbix-3.4.5.ebuild 9254 BLAKE2B afd0e2919599fce07c20692225d61be80d90773c30f90005137d604e9b588614fb24d29a5667c90c1b664041801606978950b1eef6a757beb471ba85c46fb4c7 SHA512 7f5034ab8296f755737f36cbbdf6873acd36f277d879ef94ee7837221637f19a3ae71f21ae8b5c5ea186e85cc6385315bd0d2e4d2d696f417ecd8b4e59cc3d51
-EBUILD zabbix-3.4.6.ebuild 9254 BLAKE2B afd0e2919599fce07c20692225d61be80d90773c30f90005137d604e9b588614fb24d29a5667c90c1b664041801606978950b1eef6a757beb471ba85c46fb4c7 SHA512 7f5034ab8296f755737f36cbbdf6873acd36f277d879ef94ee7837221637f19a3ae71f21ae8b5c5ea186e85cc6385315bd0d2e4d2d696f417ecd8b4e59cc3d51
-EBUILD zabbix-3.4.7.ebuild 9254 BLAKE2B afd0e2919599fce07c20692225d61be80d90773c30f90005137d604e9b588614fb24d29a5667c90c1b664041801606978950b1eef6a757beb471ba85c46fb4c7 SHA512 7f5034ab8296f755737f36cbbdf6873acd36f277d879ef94ee7837221637f19a3ae71f21ae8b5c5ea186e85cc6385315bd0d2e4d2d696f417ecd8b4e59cc3d51
+EBUILD zabbix-2.2.16.ebuild 9413 BLAKE2B 4c2f72c08f12993c7d4c8ffe201453d32b92230390695e97b722b4605bcbc85351370e6e322bf83df03876ae7569e3781610462bf0f4d5f4241f510d1499404b SHA512 95ee0052cc65dca964d61357b492a4004cc6632c7dd363e3e52fc2d91ffbd7865dc7485472c72f17da552528e894a66f2e6e22765c2d5958e63da4e3466bb2eb
+EBUILD zabbix-2.2.21.ebuild 9415 BLAKE2B ba4dbbdaca1263e8d71e088d572453014a33b30a46c8e06f4fd11903c2518042819fb3f378d683a15ba2f8e2ffc6e92c8a49aab7adc63d950710e28afc4ffb4f SHA512 9e6df3a7f82362c3078821600f8795c9adbcc54022f431a91b2b3870f98c1dd03486988db27c2aeb7c2c5566db559cc3985d23b9054af0b13938fd47a7779c4b
+EBUILD zabbix-3.0.14.ebuild 9278 BLAKE2B 6e5e42556fbd612fb7060a205bd5a4e12d13db91c6ac5ac0a0724e3462dbab5657db6992f7e5b8d746a91fc2b8ee1cdb2d0c8e982b57b14a141877318dbfcc0e SHA512 7219c5535aa5d91be8132fd74bb7fc7eee2dda0fedc761c031518c0b7b86ec97dee74a03a444979ae2f556e9de252f339e88b337fbedf6efc1a5d97fcefea04c
+EBUILD zabbix-3.2.10.ebuild 9242 BLAKE2B d9efa0a15a6eef66c3f23771cfca8b5d188fb240a611952160b920c2e6cd0ee92903f34b163cf0b0bee703c9f7e19e29ca2c9ff2c9ad9b7a07cfc52c2d77c39e SHA512 0a1c38ce26b3a3a6ea3d15267114083b3d4c56b70c4000d1cf8ac1c87cb0b7af1ea0c64c0283365160846ebfddb33f6eeeac8129dded6f5e80a5c484b27bdeaa
+EBUILD zabbix-3.2.11.ebuild 9242 BLAKE2B d9efa0a15a6eef66c3f23771cfca8b5d188fb240a611952160b920c2e6cd0ee92903f34b163cf0b0bee703c9f7e19e29ca2c9ff2c9ad9b7a07cfc52c2d77c39e SHA512 0a1c38ce26b3a3a6ea3d15267114083b3d4c56b70c4000d1cf8ac1c87cb0b7af1ea0c64c0283365160846ebfddb33f6eeeac8129dded6f5e80a5c484b27bdeaa
+EBUILD zabbix-3.2.9.ebuild 9242 BLAKE2B d9efa0a15a6eef66c3f23771cfca8b5d188fb240a611952160b920c2e6cd0ee92903f34b163cf0b0bee703c9f7e19e29ca2c9ff2c9ad9b7a07cfc52c2d77c39e SHA512 0a1c38ce26b3a3a6ea3d15267114083b3d4c56b70c4000d1cf8ac1c87cb0b7af1ea0c64c0283365160846ebfddb33f6eeeac8129dded6f5e80a5c484b27bdeaa
+EBUILD zabbix-3.4.5.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980
+EBUILD zabbix-3.4.6.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980
+EBUILD zabbix-3.4.7.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980
 MISC metadata.xml 1402 BLAKE2B 02819796719872a78ba4f7f534344bcde607fd95d10ae0087d62b65490289946f81a70b6ae5341ed6579f4855e998fc46bcff6cc463aa7feb4e768736509128a SHA512 8d3ad204e8cfb4d2aa76f0af90c77d7b6e4cc13da54772d95fe43d68bf85eb96e9d96bc2b11b08421e4684b03ad53042a4f4c0a44817f0e4ea804b81996cda5a
diff --git a/net-analyzer/zabbix/zabbix-2.2.16.ebuild b/net-analyzer/zabbix/zabbix-2.2.16.ebuild
index 4f7cac6a16d0..6b9787c9939c 100644
--- a/net-analyzer/zabbix/zabbix-2.2.16.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.2.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -8,10 +8,10 @@ WEBAPP_OPTIONAL="yes"
 inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
+HOMEPAGE="https://www.zabbix.com/"
 MY_P=${P/_/}
 MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
diff --git a/net-analyzer/zabbix/zabbix-2.2.21.ebuild b/net-analyzer/zabbix/zabbix-2.2.21.ebuild
index 8f1e563fd432..4d5efd941fad 100644
--- a/net-analyzer/zabbix/zabbix-2.2.21.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.2.21.ebuild
@@ -8,10 +8,10 @@ WEBAPP_OPTIONAL="yes"
 inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
+HOMEPAGE="https://www.zabbix.com/"
 MY_P=${P/_/}
 MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
diff --git a/net-analyzer/zabbix/zabbix-3.0.14.ebuild b/net-analyzer/zabbix/zabbix-3.0.14.ebuild
index eb110121f1a1..c3575d4f121b 100644
--- a/net-analyzer/zabbix/zabbix-3.0.14.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.0.14.ebuild
@@ -8,10 +8,10 @@ WEBAPP_OPTIONAL="yes"
 inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
+HOMEPAGE="https://www.zabbix.com/"
 MY_P=${P/_/}
 MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
diff --git a/net-analyzer/zabbix/zabbix-3.2.10.ebuild b/net-analyzer/zabbix/zabbix-3.2.10.ebuild
index 31176f59177a..98f96b4b092c 100644
--- a/net-analyzer/zabbix/zabbix-3.2.10.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.2.10.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"
@@ -8,10 +8,10 @@ WEBAPP_OPTIONAL="yes"
 inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
+HOMEPAGE="https://www.zabbix.com/"
 MY_P=${P/_/}
 MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
diff --git a/net-analyzer/zabbix/zabbix-3.2.11.ebuild b/net-analyzer/zabbix/zabbix-3.2.11.ebuild
index 7d7666c0eb6a..98f96b4b092c 100644
--- a/net-analyzer/zabbix/zabbix-3.2.11.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.2.11.ebuild
@@ -8,10 +8,10 @@ WEBAPP_OPTIONAL="yes"
 inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
+HOMEPAGE="https://www.zabbix.com/"
 MY_P=${P/_/}
 MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
diff --git a/net-analyzer/zabbix/zabbix-3.2.9.ebuild b/net-analyzer/zabbix/zabbix-3.2.9.ebuild
index 31176f59177a..98f96b4b092c 100644
--- a/net-analyzer/zabbix/zabbix-3.2.9.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.2.9.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"
@@ -8,10 +8,10 @@ WEBAPP_OPTIONAL="yes"
 inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
+HOMEPAGE="https://www.zabbix.com/"
 MY_P=${P/_/}
 MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
diff --git a/net-analyzer/zabbix/zabbix-3.4.5.ebuild b/net-analyzer/zabbix/zabbix-3.4.5.ebuild
index d51a6c625af6..94b8bc3cdfff 100644
--- a/net-analyzer/zabbix/zabbix-3.4.5.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.4.5.ebuild
@@ -8,10 +8,10 @@ WEBAPP_OPTIONAL="yes"
 inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
+HOMEPAGE="https://www.zabbix.com/"
 MY_P=${P/_/}
 MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
diff --git a/net-analyzer/zabbix/zabbix-3.4.6.ebuild b/net-analyzer/zabbix/zabbix-3.4.6.ebuild
index d51a6c625af6..94b8bc3cdfff 100644
--- a/net-analyzer/zabbix/zabbix-3.4.6.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.4.6.ebuild
@@ -8,10 +8,10 @@ WEBAPP_OPTIONAL="yes"
 inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
+HOMEPAGE="https://www.zabbix.com/"
 MY_P=${P/_/}
 MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
diff --git a/net-analyzer/zabbix/zabbix-3.4.7.ebuild b/net-analyzer/zabbix/zabbix-3.4.7.ebuild
index d51a6c625af6..94b8bc3cdfff 100644
--- a/net-analyzer/zabbix/zabbix-3.4.7.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.4.7.ebuild
@@ -8,10 +8,10 @@ WEBAPP_OPTIONAL="yes"
 inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
+HOMEPAGE="https://www.zabbix.com/"
 MY_P=${P/_/}
 MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"