gentoo resync : 21.07.2018

28 files changed, 650 insertions, 335 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index fdaf5e9a011b..6468203d73e8 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/arpon/Manifest b/net-analyzer/arpon/Manifest
index b79b1b863983..692d5bd1a145 100644
--- a/net-analyzer/arpon/Manifest
+++ b/net-analyzer/arpon/Manifest
@@ -2,4 +2,4 @@ AUX arpon.confd 128 BLAKE2B 864417d8892d037f005123938b3ffd970c69f6ad06fdc6e03187
 AUX arpon.initd 406 BLAKE2B b519b05207a2cf54301493d85a5b50205d27bacc5c4eb2dedb18ccc450a01b74b9d159da0c66b6aed20a31ec454747e0ab533906633cd8dc7ab6bdaaa9d44ca0 SHA512 5a889f94fa495ee63475a8ca2774b09247548a0a7170b32b0c74ed5808822818fda23516959ad4c3598ed39f31ad2a2ab68b81f00a715267b0d12e194532324a
 DIST ArpON-2.7.2.tar.gz 2780607 BLAKE2B 58d7a0db475658d90112441508d4c4d9babd601533a6ab9a22b24f07e037b6f3debcbe0f3c1f09a87b7e0cdf9217a38f52b85431db023d12b0f1ee58765e0bfb SHA512 7518f8f8920817725c9b3e0a6420190dcc101b1c0c7cd9eec50870b3f893fe2322eddc90cb71e9c3c35326b4e1730aa02797ca51775caa9401807da3978628b4
 EBUILD arpon-2.7.2.ebuild 884 BLAKE2B e83db5a744d62b0a7f7f3e7441a300345f81799617c93f220f320cb61f653c209aaa631fb0525d159c95337d83d339ca19e979a8cd3f4a35580e487c8085101d SHA512 4427110fc2ac7557d57d2bf9b453bb2b121ac5121e287d4273f1aea4bdc503ab38f64092c1776ca64d2ad66fddbeae4a25c82b53b98d6734b3a3347b070adbbe
-MISC metadata.xml 325 BLAKE2B 6c4ea869444055aea198dffd4446c5bbb8a73e47f3ca7413fad581414d6838c84b542c955fe49792afbee4b15511c96f7bef5b30fd3ed7e1b6dd057f86bf9417 SHA512 16d4be756ad83262eab59a91c3dd5b86d550eb5640dae17a236c07380848035ed81a9a2447f306a4eddc145d484a3f542f3a427c3c938382c47057e60d4901c3
+MISC metadata.xml 242 BLAKE2B ff85d6f7c94b7a327031d666c89344f6d69ed7a8c5cac45f89650c5f3aeb43edd3a4c7b5814ace420c7804a411235ba0f7deda58424e417681f74f9468e0ef0e SHA512 a01133ba691e36e58aa94e18a91db4a4a42b8ae621540319cab84241a07cc541263f753268ab759430699332a77018423c1a54d886d9c2fd3fab24537b64742d
diff --git a/net-analyzer/arpon/metadata.xml b/net-analyzer/arpon/metadata.xml
index 2e90eb6ff783..d587671b9bf6 100644
--- a/net-analyzer/arpon/metadata.xml
+++ b/net-analyzer/arpon/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">arpon</remote-id>
 	</upstream>
diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest
index 94cc130a63f5..5afc064665db 100644
--- a/net-analyzer/bwping/Manifest
+++ b/net-analyzer/bwping/Manifest
@@ -4,4 +4,4 @@ DIST bwping-1.9.tar.gz 90877 BLAKE2B f19b865b30cf92e80f7482c8c19b9fa364b95ec3359
 EBUILD bwping-1.7-r1.ebuild 413 BLAKE2B fe0207442e38ee224b650126ae837f67b7df4dd52e17603628c46967b7fe659c2d8c44a6d6d40297b0879a099a84652c935ea3b2dd3d75ddc47b0115bc62a03f SHA512 28af947741c68432f9e6a9312cb74cef83aaaccb3dcd00d808a9b76dee3665ebe0d04d7a2c12b2eed06e78cd13e58a73f98102999e87147dbdaa5d175488874f
 EBUILD bwping-1.8.ebuild 415 BLAKE2B dd194c432b928cb4c696b4424d6b5f65af043d54dbc95549a73cdd864cc4151131c45d8a9d3cbbb21c47062138c147da6e2cb288a02fdf2f6bdc3ccc151bd0b1 SHA512 b920655976c17e7a73a3a7f7f7f444241bcc787fa94fead1ca7125f5a1a4b11930df5e50ac254044f80cbba5191ce29530c75f512d7753c4ca61ee9f9b108efb
 EBUILD bwping-1.9.ebuild 415 BLAKE2B e3e994562d53530ae3f925d911d220ce3b4d99207aef29d2ea702869018c7d28cea53dd2527f882d097740c9663324587938a409fc67b2ad951be346ebdb4034 SHA512 147edbc346d231e9134e8052d5c252e43bf4351f48e424754f191098fd9ac3396ae1bf3b50f526ca84724273ba3808ac152c3c589dc996b65f1a4f1b15c05005
-MISC metadata.xml 762 BLAKE2B 9817fed6b9deaea3108dc166ad6e99dfb2919d1664256ca5a993df02b901c4bce8f34dccbf10044d19b09ea5570dd3736e464bdafdccbe2ac83aa53985faca52 SHA512 250abfb0ba5bab99ccad8b1494814339844b6e46ebb6d3af9fa3933d01964ce5a3c97e74e2ded0d5bea221c4eed20ffd7cc7bc9c1e8680feec907f390df27dd2
+MISC metadata.xml 651 BLAKE2B 5879ca4d339fc3b541e1b7f68be857a9552c9a06efd8b1985470f5143f1e1e14edb0eccb4815b7498590718a02ddbb155a1e49556cdef76ebd9fae6dc6f306c8 SHA512 bef41fb4c3d894de7f2b39b16171fd22e6ce584d2dd2a65e2ce2c645ffc4ae1d1b38d7667765fa3e6fbfacb92cd3ef7006d141b14a5a476489ed235d2ca095e0
diff --git a/net-analyzer/bwping/metadata.xml b/net-analyzer/bwping/metadata.xml
index a3345073919a..a5d9e36f9669 100644
--- a/net-analyzer/bwping/metadata.xml
+++ b/net-analyzer/bwping/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index a657ff2003c3..90cbc934174c 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,5 +1,7 @@
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5 SHA512 b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
+DIST icinga2-2.9.0.tar.gz 2192684 BLAKE2B b27da06a8b1d70108c792ccbef67a8082b7bb1ec9326ffdcd56406e8bf00e00fa7ef7cbedae803835cc7576bfb1db07cac4e6d1c8338d67e0ff071b821a661ea SHA512 e95f29f9a7e2ba9ad2ca16972fad23a9d18ee0470fbfd70f0bbc8efba9cdcce77d7c5abd2fca98e7b30c64f0014f89f9edd494473769efa6a6e01c08ebdcc1a4
 EBUILD icinga2-2.8.4.ebuild 4604 BLAKE2B 074505319ffdb68d93df79dbfe6c2a88a971b1a188e28526dd97e131d7494e6076173cbe9b8ee3599c7deecb62610f23828f0c107460555d47394d29f81eedbe SHA512 be570d2178c8750227b1dfb46c682a1805696fe9b46241f6ef9f59fa1e6ac9886d7e88cc14bcd5e094cd3671f49dfa1ad91046d3e08288b8266f888fde37a2a1
-EBUILD icinga2-9999.ebuild 4608 BLAKE2B e3c3b8c7c93458ee579764b087395cc004855dee56cc463a22d2787c541661e5963cf8d7b9d70374c302d1a82e3453a750c16d51d55daed81496b998335d9cc8 SHA512 d6d1d15e9e3e7bfb461c9eee901448cd489bb2fd86575291790e463c16d133ec1ecf15f72f3a67e5a9ee3de4dba450ad51b6940c5b966ae688d8a9d51ba4d5fc
+EBUILD icinga2-2.9.0.ebuild 4432 BLAKE2B 2a5f9a690609af8d683c98bfe2e4f53026b8ce261bf91e2585781a51994bb515e5ce86624923c908d2fd8f9ef11c3fd68a88f9e0de42a3cafe0cda51ff5ef2db SHA512 f7cffee062c8830c32f9888b026b39de2924cb4d7c017404a6db3567b561191f07ae5d4250bcd3edd5e13c3e60fc5b2d62994a656ea7a2e5da6506b1da9f77b0
+EBUILD icinga2-9999.ebuild 4432 BLAKE2B 2a5f9a690609af8d683c98bfe2e4f53026b8ce261bf91e2585781a51994bb515e5ce86624923c908d2fd8f9ef11c3fd68a88f9e0de42a3cafe0cda51ff5ef2db SHA512 f7cffee062c8830c32f9888b026b39de2924cb4d7c017404a6db3567b561191f07ae5d4250bcd3edd5e13c3e60fc5b2d62994a656ea7a2e5da6506b1da9f77b0
 MISC metadata.xml 816 BLAKE2B 6d820358c90a580be01149ae631f40dbeb5f50ce0df937ac484269c9a58f21a450d3861dce3b34ee0882b3b61d981da8162af735c5a3de90bb7b74dae9523d08 SHA512 0d3ac2d9233f7ce53a8105caed0231cefa402861e26c760de3fb23163ea68c21b97f5ec0de65bc6953aaf2dd8fa90a9edc045a2fea8b622efdd1336959e9e60b
diff --git a/net-analyzer/icinga2/icinga2-2.9.0.ebuild b/net-analyzer/icinga2/icinga2-2.9.0.ebuild
new file mode 100644
index 000000000000..3085070c612b
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.9.0.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} != 9999 ]]; then
+	inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets
+	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
+	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
+	EGIT_BRANCH="master"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins systemd +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/boost-1.58-r1
+	console? ( dev-libs/libedit )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+
+RDEPEND="
+	${CDEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	mail? ( virtual/mailx )
+	classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	enewgroup icinga
+	enewgroup icingacmd
+	enewgroup nagios  # for plugins
+	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+	sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=FALSE
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+		-DUSE_SYSTEMD=$(usex systemd ON OFF)
+		-DLOGROTATE_HAS_SU=ON
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+		)
+	fi
+	# LTO
+	if use lto; then
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=OFF
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd "${BUILDDIR}" || die
+
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/icinga2.initd icinga2
+
+	if use mysql ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	elif use postgres ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners root:icinga /etc/icinga2
+	fperms 0750 /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners -R icinga:icingacmd /var/lib/icinga2/api
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+	fi
+}
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index ebdd790be879..3085070c612b 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.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
@@ -18,7 +18,7 @@ HOMEPAGE="http://icinga.org/icinga2"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax"
+IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins systemd +vim-syntax"
 WX_GTK_VER="3.0"
 
 CDEPEND="
@@ -41,8 +41,7 @@ RDEPEND="
 		net-analyzer/nagios-plugins
 	) )
 	mail? ( virtual/mailx )
-	classicui? ( net-analyzer/icinga[web] )
-	studio? ( x11-libs/wxGTK:3.0 )"
+	classicui? ( net-analyzer/icinga[web] )"
 
 REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
 
@@ -50,9 +49,6 @@ want_apache2
 
 pkg_setup() {
 	depend.apache_pkg_setup
-	if use studio ; then
-		setup-wxwidgets
-	fi
 	enewgroup icinga
 	enewgroup icingacmd
 	enewgroup nagios  # for plugins
@@ -74,6 +70,7 @@ src_configure() {
 		-DICINGA2_GROUP=icingacmd
 		-DICINGA2_COMMAND_GROUP=icingacmd
 		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+		-DUSE_SYSTEMD=$(usex systemd ON OFF)
 		-DLOGROTATE_HAS_SU=ON
 	)
 	# default to off if minimal, allow the flags to be set otherwise
@@ -98,16 +95,6 @@ src_configure() {
 			-DICINGA2_LTO_BUILD=OFF
 		)
 	fi
-	# STUDIO
-	if use studio; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=OFF
-		)
-	fi
 
 	cmake-utils_src_configure
 }
diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest
index f4edacceaf63..c4641902fe10 100644
--- a/net-analyzer/mrtg/Manifest
+++ b/net-analyzer/mrtg/Manifest
@@ -2,6 +2,8 @@ AUX mrtg-2.17.4-socket6.patch 481 BLAKE2B 2294221471be6b9db0a5676a3f819684b0bdac
 AUX mrtg.confd 402 BLAKE2B 8a06370eeb0b31e435eb93be8e625a8ba151278462576c0f3f600747cef9f043b66c4f5142900f515a12dd1c38a7fe27f04dcdc832d050e980ee08ccb6e7739f SHA512 18066805d2fea3090a3165a15f963310a94b4e4ee5e9fa88617eb246b1a1a4e91e3faabe4f4a2fe2ebd8f7a69acae82f1b51e3830bdab04da64f03d84c2e7e7c
 AUX mrtg.rc 1275 BLAKE2B 180e9070e8648e05ff02b24a642c9e4f1b22d3a952385ab58c70411c1ed2fde4bef3f9ae61b35808049a1451d82822f7bfc2e3c222a3689dabafcd83a49ee00c SHA512 bcf5d95130e2e8ec4df9b3d97e99e2a36e65ed41b23ca8b249e3507e61ac0945945a0576e80efae9efaca9deca4d1a64ead95e05c285fd62fb0ea914864b6d51
 DIST mrtg-2.17.4.tar.gz 1096879 BLAKE2B 12d485e8bdb28ff3706341d5b53e78dc37291e6f157e7792f1d2f3b43ee09c7b7eed57acfd8c7e9c9621187f75ee117e0ea85ce1ec34636f26aaf7e06ca58e14 SHA512 b15dac707e387714ba1a181c487894fcacbb9c2c1a1710475ebe86a11e30d758a4b44c139b42638de7fdef6616cf3112afc4e5a8c5fbf53718829673698ee110
+DIST mrtg-2.17.7.tar.gz 1098650 BLAKE2B f8191296fc163b950792b8ecee773cfe643a7390d49444ce8b5012b2dbd932093cb4f71745ba2c86bda579fbcd3c73a4f9cebc1fa4e7f791a7b4461ae92ac191 SHA512 b25ab38416213bc5128612724530f36f4a855bb66a65f8bbe4bdafef05d2688eed68f5c3df1e13193102507a4114e71ec226ad32dd6b4d3ae2e2291320d8e768
 EBUILD mrtg-2.17.4-r1.ebuild 824 BLAKE2B 34727aafba25ed97e7eb8e5f37806f533eac1d4300bf225c6142dc884cc2d7dcbf33cd0a4367a06427d789c076f78d0d4c6bd75a36c6adf16fd44f1f76d549f5 SHA512 a81daab88b80342d21a46eb8be24135b301e0c1169abd6871c4fa7081a765ed7adb8a39a4de35774f5da151788c7a805e9c7b082a5127074575146f03a9ed9c4
 EBUILD mrtg-2.17.4-r2.ebuild 1000 BLAKE2B 335c76bb71ba16bc1908762dc5002b8ab26e464ce294d6ecab2763bda86fde929bcd826fbafcb9d3b69bc1a64f58ffed09de597914bc4d5b9eb7badeb3481196 SHA512 3c71dfe63faa649b90aba120b148348a2b1bdf5ff6250887006183939f8e94f0d87fc855e94782f3f9aa6c1f355a2ec27dfca5af820906319b681e80a5dddba4
+EBUILD mrtg-2.17.7.ebuild 1008 BLAKE2B 1425567185472439f014548534d2568c19b3ddcccc48ed1c76229ae3944e1213dccd63838d55806fd715a82aea88d3019edf6678b0d639f2a2c999c95bcb3edc SHA512 9215aa63ab6fc3c8c3099dbf36149e2f84f10cd57d615029112e09c4e97acc276bbc8e6c7d14534a22388db74a6197d74d2ef35295ccc005749e70c52285c547
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/mrtg/mrtg-2.17.7.ebuild b/net-analyzer/mrtg/mrtg-2.17.7.ebuild
new file mode 100644
index 000000000000..926ed585809a
--- /dev/null
+++ b/net-analyzer/mrtg/mrtg-2.17.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib
+
+DESCRIPTION="A tool to monitor the traffic load on network-links"
+HOMEPAGE="https://oss.oetiker.ch/mrtg/"
+SRC_URI="${HOMEPAGE}pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND="
+	>=dev-perl/SNMP_Session-1.13-r2
+	>=dev-perl/Socket6-0.23
+	dev-lang/perl
+	media-libs/gd[png]
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-mrtg )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.17.4-socket6.patch
+)
+
+src_prepare() {
+	rm ./lib/mrtg2/{SNMP_{Session,util},BER}.pm || die
+
+	sed -i \
+		-e 's|main::SL}lib${main::SL|main::SL}'"$(get_libdir)"'${main::SL|g' \
+		$(find bin -type f) contrib/cfgmaker_dlci/cfgmaker_dlci || die
+
+	default
+}
+
+src_install () {
+	keepdir /var/lib/mrtg
+
+	default
+
+	mv "${ED}"/usr/share/doc/{mrtg2,${PF}} || die
+
+	newinitd "${FILESDIR}/mrtg.rc" ${PN}
+	newconfd "${FILESDIR}/mrtg.confd" ${PN}
+}
diff --git a/net-analyzer/netwatch/Manifest b/net-analyzer/netwatch/Manifest
index d3de0de85a96..2aedd7c23223 100644
--- a/net-analyzer/netwatch/Manifest
+++ b/net-analyzer/netwatch/Manifest
@@ -6,4 +6,4 @@ AUX netwatch-1.3.0.1-open.patch 446 BLAKE2B 37fcc069b4fa7867cb1ec2bffd2930fb7fcc
 AUX netwatch-1.3.0.1-tinfo.patch 1444 BLAKE2B 9160adbe768a7306bd46a832e4761864c6d05347d310fe130427fde56958714edeef121e56879ffeb3263ead7b2b53fc45b41ccf5b79611bc9b8b4d89c80b9f4 SHA512 675545527013a67de3a8dc32fab9b197f90d7ff24847e6e2d6959dd97ff4bc2838446807c7948d68c34790aac1d45d322506f94b99c47534af5d33e1bf85903d
 DIST netwatch-1.3.0-1.tgz 187936 BLAKE2B 9b7b9f822f344eb707977b13cfb603e5bfe8387d04b826182e667740953ef1315b646c521995185190b1dffa5d725f0001f1f6bdeca11ce1332786ca571421b7 SHA512 c0feddf01d118c7d8ff1fd8344692db5ad6f1bbaf375a7ed296756314454a7b1fb430f73d698156aca7a4391578215b3e6cb0f899044be228827a0acb4caba2a
 EBUILD netwatch-1.3.0.1-r3.ebuild 1004 BLAKE2B d671a299e4e4ad06b26774c37b4b8fbe3d47bac238927e48c7f9c7efbf62501ebac117e5c7787d82abb57d722586b92bc92b65e8795302f1cd70cbcb49d88391 SHA512 75964e3687c8323ba835b249de104cf8b49e6de8bff300bd0229c5dbe3fb835ffddc4d4b01477b87992a5ae58c3c434398f609ea82648f99febca3a51e197c59
-MISC metadata.xml 379 BLAKE2B a008d3d3cd917ef147f3ec86c8dfc827bacb9397d66cc1656bfec6ff36a22eb2e6424a5608d064db2928d78ee34eec99ff4482c6c924b6188a2b44d1f63c47d5 SHA512 f5dde23a39bad67db3b9594517b410ac2c2713927c8e53682fc3e13ea186fe80b93bd66e500220ac600457bf6d47364113785acacd28bd56bcb2d52084a30e9f
+MISC metadata.xml 274 BLAKE2B 75e74aa7e81d0d0097bcd02f91b106e38607e8c17cd10ecf224e3423d3b117d6110bfd0345a723b1e84a4b5d63ab07e8be1661e71f83eaaffcf6164d780e8858 SHA512 1d248e6ffe1a07fd1e2d6ca9f83f8108d8d5941b5067860e8c8daf5cf383446d21008f9fc1555fa6d3b045138173661e0426fb68b923969ffec027bc858bd53d
diff --git a/net-analyzer/netwatch/metadata.xml b/net-analyzer/netwatch/metadata.xml
index fb98d86a637d..af0a0fe5e3bb 100644
--- a/net-analyzer/netwatch/metadata.xml
+++ b/net-analyzer/netwatch/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
 <maintainer type="project">
 <email>netmon@gentoo.org</email>
 <name>Gentoo network monitoring and analysis project</name>
diff --git a/net-analyzer/prelude-correlator/Manifest b/net-analyzer/prelude-correlator/Manifest
index 6de722fd9e3b..96a5c9890279 100644
--- a/net-analyzer/prelude-correlator/Manifest
+++ b/net-analyzer/prelude-correlator/Manifest
@@ -1,10 +1,13 @@
+AUX prelude-correlator-4.1.1-fix_python3.patch 984 BLAKE2B 5b51c44d1da541e16b68788357e5b25274b6b2620880c1a81e7dda2dc07d77e12c1746fa966d1251d0a548ad0cc00e545bae50540b601c21c215f31e4ad43d67 SHA512 ef72812b5a2daceff20efb54c68311ef3486b8ffd56ec8bbc62ffba96e674a1f88562ed94eef531629684db13f6e2aa5c3a42d558c62869664131feb61939bea
 AUX prelude-correlator.initd 654 BLAKE2B 10bb6e1ba38c916394cbeab1d314e39ee61753c6f46e613f2a500fb3deffa3d62861ffb41fb1dbed30126cc3cb1a7afd381632c229cc33732d6e6a627ef08ef6 SHA512 15be6f991499d6d2b72bd11cd91343a1be164c13454c702b6f42f55b69dbfdda4a380cc6f24aecbf0e9d6a2b3f21b1a947838038ad95e7d7377c3d36118f12e5
 AUX prelude-correlator.run 139 BLAKE2B 2eac955ca980c1e49d39946d3890c5dba1b7f5a40670c28f788d66535e1a52735fb8620a78a1ec6cdb59ae517d0317c363c72779087fcfbdc7011e3b1bdd9370 SHA512 f05c771f387b2eb59e37006ba5bb959d8d67cbdbdfdd5a7c5a42b592d2c9d4532bfa425565722745ad52e7fb1d327738c02f1602e0eeb42ea403275d69380f51
 AUX prelude-correlator.service 339 BLAKE2B 25275e92b5471521e1f8e3f23d1a0a483c7cb3300edbcc563cb84c280f64a7555b47e4cbe97c00ee76777e9f44de9bbd911de69deec5bec2898a09c1a206f7a1 SHA512 8f0d0478bea87e2bdc8266044e580f983b12dcaafec1b7cb87074f9cd3825a9c0b2b6d59fba8fc4a62a5af0b9f0dede6f8c5d3cbf436fcf900b031947ea20f68
 DIST prelude-correlator-3.0.1.tar.gz 181019 BLAKE2B 9156b7c76ac641326dcbb6e89f336ad1a65ed9c0af3b32acaa2d4430d3ba0b5015b5baf6372bdeb8e08d269b7742304f84ac026c512b63ca8710cc757697d0c6 SHA512 2aa159251cf7f9fead117737f67cc01e7cb2012c4fd9db77454c7d639cf477888d5ea6476661bf501c2da7aaef58ea7101b7780669f025af1480acd9480ce8d3
 DIST prelude-correlator-3.1.0.tar.gz 185812 BLAKE2B 8390059cf00f1f4038d31eff401d4a2e475f9ef89fe84b4748c891ccf521fa6c6d241e4e441d6398a2acaf2bf01451e4407188e95779f8c0dbb19713c405cc6d SHA512 f44d805445c19af1f80f2662b7c5d2678e9928fd5cea17e1938a712157ca3ac51eaf361bd164ec6fa38836461b3719cf739232c130f3c784cf692e1588256d79
 DIST prelude-correlator-4.0.0.tar.gz 347973 BLAKE2B 93f383d5d3ca3632f841b8523efa829f00ee36e4fdce76c982ef638f468dc574fa69452b4e9e5abcdaec87697a4a824faf543f0383756d15a72e99c0ac02cabe SHA512 aeeb5d1e29a464afa41b8a04f5324e0915b8450eceea68a07cb6d8bb61823ab8da8df51e1a331f5a66fd295bd2a514f484da5c396e0508c4fc5634c98382779b
+DIST prelude-correlator-4.1.1.tar.gz 237036 BLAKE2B f3965b179d101450bd5b64805d0c982cc093de47fbbc4b4e0077f231cffcf152f3ace78cab5e96d7e18d8af0fae7de0fb5c70c17b8888245558ab091bee6438d SHA512 ac6eb554ab8d20325afbe49fcec9e238d84579cb68ee5731e6ec7d1da11c1b745e60117fade76d8747c93f57d4ae91461fd6e82160f659f88a0bb545e4990597
 EBUILD prelude-correlator-3.0.1-r1.ebuild 723 BLAKE2B 7eadb37a0f6316a87acd061ea90011fdf5158b2d1e0dd025eaa8b07426959af0fe55a57dc76bac474eaa1a43fadf4836621a60f6a708682bcb30ce49f2aca2c5 SHA512 23cfb488a3d604f4bc5351de67c2fedfafc9668c04e81ada545525f0b134ec5765b6555329f8b50fd5ffe7f3f41a79801d556a9faa67b17cd0e4c45604a3c9d1
 EBUILD prelude-correlator-3.1.0.ebuild 730 BLAKE2B 66213e6210c1a2aedeafb7aa964968916e7dae6c98e7fb8c99745146487d898f90c5e94bbd1f0ef56cc707d015e47427538341cb980dd9350c81bdd8608cc9ee SHA512 f79772b4efec8ed3cd4f1023dc6e9661b5669233321393e807519bf28f792491488bf44562114b3cbd98a7c5fbd4b1b0131818dc592908e3dcf7fa2c665bb00f
 EBUILD prelude-correlator-4.0.0.ebuild 759 BLAKE2B bcf71507bec9e7978cf9f861fe091c9550394edcf1092d8a5715540de6a27b9ac52c8bdc9d09684b9adcc4ac2a5165e5c340d910e8729eef3388d7b81faca0ae SHA512 1b5ac5a4685186fb94a4d81695cf06f98409c73e1f87b2e9440a81c72e6fbe14b3d6ea4419de539177257e7a0c5a9957d836e01e56e70ea389a455f37cc3fb07
+EBUILD prelude-correlator-4.1.1.ebuild 817 BLAKE2B b739386a10b3b5c3286ddb3b29f62fd95ba83733d4f36a0fd928b71a08112dd1a5641168426e4d00a7a1ab3e083db01feb6e9418bb926c1c916be90099f13cdf SHA512 17713240c2ec9af350c3d804572d8108c2463b69e286d52bbb7db75c50392866bc822b7feb2338744a163abdc575c8e6eb21439855fb239ea33240adb442aae2
 MISC metadata.xml 824 BLAKE2B c17f62271dea0b8f93fdc83b0ccf67545ea24c5bd3f71d782832bc9c8588bdd98b513ed3f6bc5c307aebb3bc3be76e7e8311e38438234779d5da6f248383fb15 SHA512 3b0db2aace5a45f8994622063ca9fb32a06bcb385b63fb013c191606f07e9bb03c1354549b07ac4c17d74a9f25db44be7ea45fc34d6332079209cc56f5262209
diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator-4.1.1-fix_python3.patch b/net-analyzer/prelude-correlator/files/prelude-correlator-4.1.1-fix_python3.patch
new file mode 100644
index 000000000000..a671aa476585
--- /dev/null
+++ b/net-analyzer/prelude-correlator/files/prelude-correlator-4.1.1-fix_python3.patch
@@ -0,0 +1,36 @@
+--- a/preludecorrelator/config.py
++++ b/preludecorrelator/config.py
+@@ -19,7 +19,11 @@
+ 
+ import os
+ import glob
+-import StringIO
++import sys
++if sys.version_info >= (3, 0):
++    from io import StringIO
++else:
++    import StringIO
+ try:
+     import configparser
+ except:
+@@ -77,5 +81,8 @@
+                 f = open(fname, 'r')
+             except IOError:
+                 continue
+-            self.readfp(StringIO.StringIO('[prelude]\n' + f.read()))
++            if sys.version_info >= (3, 0):
++                self.readfp(StringIO('[prelude]\n' + f.read()))
++            else:
++                self.readfp(StringIO.StringIO('[prelude]\n' + f.read()))
+             f.close()
+--- a/preludecorrelator/context.py
++++ b/preludecorrelator/context.py
+@@ -362,7 +362,7 @@
+ 
+         try:
+             _CONTEXT_TABLE.update(ContextUnpickler(fd).load())
+-        except EOFError:
++        except:
+             return
+ 
+         logger.debug("[load]: %d context loaded", len(_CONTEXT_TABLE))
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild
new file mode 100644
index 000000000000..1ff9d4c41e25
--- /dev/null
+++ b/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Real time correlator of events received by Prelude Manager"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/4.1.0/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="~dev-libs/libprelude-4.1.0[python,${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.1-fix_python3.patch"
+)
+
+src_install() {
+	distutils-r1_src_install
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+}
diff --git a/net-analyzer/prelude-lml-rules/Manifest b/net-analyzer/prelude-lml-rules/Manifest
index 97c1ea5f17e8..95ececc9d51f 100644
--- a/net-analyzer/prelude-lml-rules/Manifest
+++ b/net-analyzer/prelude-lml-rules/Manifest
@@ -1,7 +1,9 @@
 DIST prelude-lml-rules-3.0.1.tar.gz 117551 BLAKE2B 65b4c5a03adf0cad2063463526165a3789ecffd15c75131acbbce6510e354e9e5ddb1575cc682b235e6833a16872889ce67c1557bbe19557e7f154b219c68b00 SHA512 fc3b35fcb6249b40e5f5fad6b22b238167f7039a48a3e7732110a77f23fd82d0f0150a891f83e07ab7e0ccd8b33cbcff5d8498f6f14f01248d87b8f37e6ea9a3
 DIST prelude-lml-rules-3.1.0.tar.gz 117010 BLAKE2B 0ec6c3a02dcc013368ba7793c8ad3446991099b7ae9224b7ee7daa210acd31c7933eb5e0b4098b7a4a870ca9a85937d8642074e09cb9e870efb11bfbf06881a9 SHA512 8addb0ac785098d49aa220e63e95805290028f42504df868660f8ccd5f516c9a7f53e794714fe395c8a50935e64575cd405a20f65dd02692c5613c9bc9a028b7
 DIST prelude-lml-rules-4.0.0.tar.gz 115058 BLAKE2B 93f3bc14f14a8aea70850b67a427f74818bd8119e7f54c66c3391a2e81656dd13462362a6e82d03997701cc8d8189b744922545c7e7463df79b0052e2449c302 SHA512 9244d7d5e4a7a64c10adc2f8bc0662e7ada2a367b6bf6b38292db3abab484bcb0bf3a26696576ecbb593a82de5e372ae3d381070af06a65ba03b01b9273a19f3
+DIST prelude-lml-rules-4.1.0.tar.gz 116148 BLAKE2B 0b24d5673a186f085935cd146dc27d38224736141ec480564e5be0bea7f6d624084e5bd2178453950a5ce57caf1b8ff6e3574d789b230ec07268559801856528 SHA512 a4752bb16a0b7d24f2a5d1ee62390d646778509e63dbdefa2419caca6d6251c429f18abf38dce7729cf185b9a3ef819de3fa75324e36787b984800a76c8dd3f7
 EBUILD prelude-lml-rules-3.0.1.ebuild 485 BLAKE2B 4386ff4b8f8ff7034e601e8e2ad8efb381cd5398f2acc645bb35a99edfada906b6e2de89a9962c453021d7d3a2af62dec5b81795aff4a5c597ad3b66d95dde12 SHA512 69939ca37558057b4c3b2dbce32e755e834235acfbf9ce11b7570bf049d6cd5f8270264284c60904211bf61ccddce1f4c5b84812c43add186a9b64fdb2a860a1
 EBUILD prelude-lml-rules-3.1.0.ebuild 492 BLAKE2B 2c9758156f5793d7924aa5df076f811658a40b61ca03871208317794587e179751cc66b495df14493450e432f76003e01485b9735a6c78b8d6fddbbbf1d49c84 SHA512 3bab272f739243b2b4af96ab9227562bc58d2d4d36a723f4e31a876b7e48c7a7d0633f4e542b0511df6b8cad70baa3b6306536a36d18214b7d0d0541f740d655
 EBUILD prelude-lml-rules-4.0.0.ebuild 456 BLAKE2B 9defe3181c15de9e839092b35afc63d8e5a2b62dd2341f15d20b8c50825cfb3a5eb1ea49d6997a6c658e9c88098b7ae67ba43afead0f0a6e5cfafc4bf388a305 SHA512 78766de94e82be4044997cefef9434f5d3b72c2b69833e4516002f0170bac933eb469c1d65c8cf700e36bfb9a6d2afb55d2e61df8d41b798e6002ec12e2ce67d
+EBUILD prelude-lml-rules-4.1.0.ebuild 456 BLAKE2B 8973181a90812fe583f17cfbdf2c294f4f5437edc0376e1ce89d9ec037565c290082970f4c5cfc451b442ca6ec977f4ca5f1002ae1b3ad3b599fb6a6642c81c1 SHA512 094855a812d3f0e55cffd72d3e33a512d674d9e268d93af11c6466334877884868d56ed5db3e3b57b98449fd47f6dfa903f43e0ae728192513f762dbcee98109
 MISC metadata.xml 476 BLAKE2B ff36dabaf589375064e572c154dc5725109905c5ce43e20b4c47ffdbb857a24c9a6e89f8cc3f2dc8977458e8207e52bc77a5354f901b3b6c2298c515f030e811 SHA512 67d80e0bc56afd5694c392259e8ca7488b9595cfd2a2c79479344398513511549b4fa1acab280a67b5d1295bff1a73f2a0a8f5e36980a0087d00a67d2d43d410
diff --git a/net-analyzer/prelude-lml-rules/prelude-lml-rules-4.1.0.ebuild b/net-analyzer/prelude-lml-rules/prelude-lml-rules-4.1.0.ebuild
new file mode 100644
index 000000000000..59a9a724b22b
--- /dev/null
+++ b/net-analyzer/prelude-lml-rules/prelude-lml-rules-4.1.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Prelude LML community ruleset"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="~net-analyzer/prelude-lml-${PV}"
+
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto "/etc/prelude-lml/ruleset"
+	doins ruleset/*.rules
+}
diff --git a/net-analyzer/prelude-lml/Manifest b/net-analyzer/prelude-lml/Manifest
index 9d626684c7fe..c23bcbf671bd 100644
--- a/net-analyzer/prelude-lml/Manifest
+++ b/net-analyzer/prelude-lml/Manifest
@@ -8,7 +8,9 @@ AUX prelude-lml.service 297 BLAKE2B c1ecbb3f69c21ccd82f7c985598a3cfcf5313d9004d9
 DIST prelude-lml-3.0.0.tar.gz 1391203 BLAKE2B b3e4bfab596f869919c70dd7d2c3860bba33754970eff9b1a8c238f35cafec67601548985bd36244740062455a19fc816cbd7eb50bc6a3c4c97cf9da5b288dd3 SHA512 f206407f99df394186466566608b434a94d4fdce3e5e8991a4236f2ee670f6ae2573adea22bc248fdfea760588e94160faa7260257aeaeb35c938e1bb886ee6c
 DIST prelude-lml-3.1.0.tar.gz 1408600 BLAKE2B 7475754de5df1200e89fe37fbdc27ec7d0862f7d844ad56adf6875fea88c19e3a7f4da725a729bde16171e207ce47f40200eaf10ddeededf0b14ac60fd92cf4a SHA512 16fe23c410f6ee585513589c1f9435e0a7dded010ccfd8bb0a8744603e7e020378afee474f6146472afa39263052defddc8c9115235dbd3015727c18f625773b
 DIST prelude-lml-4.0.0.tar.gz 1435446 BLAKE2B 03231bfe4763bfbbc3256075f832a99f83c8e26221412f6b07ab7464d4d46b6abdad6dccdd3379927dbf05cfe808b31df57398f48bd794a311ced19f6e7fac67 SHA512 e2ae3a754f722b19110a32ae9ab7d0d9ce5ceb256c04a2b56f6549802d605cfa741cef4687c8883b585a0dd59f3507ee2d1275f4eb05050d10d24ad068522ef8
+DIST prelude-lml-4.1.0.tar.gz 1457294 BLAKE2B ec57e0e1d9048918c838965444888e80ee320882057dd3972c5da68402ca2443363dc26efc86e89916b1bc4e25d32c36aeac350ddf4aafb4598e8b3704e4f6e7 SHA512 e34d542e3b9e12873f9e2a19e2573b32e2b686574cbc8678cefbb198d7397695f8a2512effb58be9e6703663158c2294d741e0f6f8db23c5541e58bdd3c7f035
 EBUILD prelude-lml-3.0.0.ebuild 1109 BLAKE2B 4f2be6c6d6bd55d6a6d3f9bd906f1f44d2807cae707ff250104889ba158eef110ee8d05fd1f81bcd85b5e467b30bfbbb54bc27402d1913bfbc0a8e93450ceea9 SHA512 aa73cbe3ef1c8da02224fb03ea7a8f43f1eaf41563bb922428cae527a83378db76a8ead23b5247cc2c0688f47ed32a6c966967f7d9729ea5b9e3505492afae14
 EBUILD prelude-lml-3.1.0.ebuild 967 BLAKE2B 71a06b5af5d23ea93e164ad4046d92c8225f5c96ad435205a217bcbd8f239d775082e8947f60ea6abb4229eeaef0097be502e9b221c7092629e5e03972785f3b SHA512 43e1ce24d1a1929b6848cb1cc66d9d2fad451b9c952a2e816cc4266f2d52c411cb0d892696c7fc6abf8e4da654cf633a0f3aae4ca7713eccc1102746a3bade73
 EBUILD prelude-lml-4.0.0.ebuild 974 BLAKE2B 1d458ff6c476e56b22a0e510c9dbd831d6ee88e6647d9a040b6270507aa7a86779a85c825a029d3333122ac5909b3329817a98e284d7ca9cbeaaa2d53c5557d2 SHA512 c5b5b976364e17a1cd34a7b260b75891a75d8211a808e34551134e6e5419bf004865ea26589ccaed712aaabc31e42e27fdac3c68c61a4068ad46ac4efe7641a2
+EBUILD prelude-lml-4.1.0.ebuild 1045 BLAKE2B d5538ff12b7a81d4828d9f36c89987836f8697228779cae58fb86261b16796792b9ac711680bf82cd6cf6a2f7c71ce2ae9db9e9a2010fccddbdd5cff7ec79ba1 SHA512 b69be9c14f0587bc2bcfd85ea8c23f8f06f49704bcf373c2fee5921402ada7694fb57aa06357277ddace4b1528db05732cd85e4c8063a03b4900c76625412004
 MISC metadata.xml 859 BLAKE2B 029350529cf91a38bba7ebf303271c5388e7407266a1808a410aa05d004d68b01fe48470384cfa45bf671d6ea095b14ee6f9b462b94cee4b30c1198485626e68 SHA512 8a5d558c9a92c34f3a9eb082c2295422cf834c158bf295cdb2c85f6bde1c242d6e350299ef53b8a6556eb736c1ea7cb825723354a370b419a338021b8ca6e724
diff --git a/net-analyzer/prelude-lml/prelude-lml-4.1.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-4.1.0.ebuild
new file mode 100644
index 000000000000..754a0268b461
--- /dev/null
+++ b/net-analyzer/prelude-lml/prelude-lml-4.1.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd
+
+DESCRIPTION="The prelude log analyzer"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="icu ssl"
+
+RDEPEND="~dev-libs/libprelude-${PV}
+	dev-libs/libpcre
+	icu? ( dev-libs/icu:= )
+	ssl? ( net-libs/gnutls:= )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1.0-run.patch"
+	"${FILESDIR}/${PN}-3.0.0-conf.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		$(use_with ssl libgnutls-prefix)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	rm -rv "${ED%/}/run" || die "rm failed"
+	keepdir /var/${PN}
+
+	find "${D}" -name '*.la' -delete || die
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+}
diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index 6f83f36296ff..60962a538e66 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -3,5 +3,5 @@ DIST sslscan-1.11.10-rbsec.tar.gz 52108 BLAKE2B db78ae281149da451cc2f6f60d8379d5
 DIST sslscan-1.11.11-rbsec-openssl.tar.gz 5523256 BLAKE2B d8f5aa8bf748310fe1186ec9ab74ecc33425d6fa3db709d94516780d4efadbdd9cf6358798796704dfeb4032ec615298f3b67c8150e314f1e79a4d826c2589b7 SHA512 9bfdac0b6dcbb9e932ef41db9753f7298cf38ddc18731386968289114fd5ed10d81e95523d557b42b431377638d2f62fb710189e7d944ba89979fe5e3437fd3f
 DIST sslscan-1.11.11-rbsec.tar.gz 53432 BLAKE2B 08be7c5a4126e8dee85adb48bd5d55f5e7931820462a18fe904439edc8fc690d60379c53c436d4953f9fbbb94c4e47eebd3fd48867b00d5819ba651569c99b7b SHA512 9492f1460b45212f80a19364c284ef2a11ad0c343bb324447ec519685d52805104d95a7817fda4d43af98ce2be2edede889e6ae83eab37d75be0ab46dca29d72
 EBUILD sslscan-1.11.10.ebuild 1303 BLAKE2B 2c39f37ed0ad85e4e2a3f76e5b47a29906e2d50150f96686b2466fd5ebb7a364bf9355cf155434720967e1430c6363eaf1b468bbb884039914504038f2bf6085 SHA512 f11f67b88a4577a70c684584e70b6bf75e8498a3b48fc9ed7f07601ce97415375ab3136577e3b4feabc3ebe02d711de3b76b4b14715b2831a4312d517f0d43a4
-EBUILD sslscan-1.11.11.ebuild 1163 BLAKE2B 7bccef3a83ed1a8c7d914dd0959beb92d4402f1c141df390bd209ad7c77eaf7e2346c6547305a7dbf471e0d091199b70e4fbc1583b1076a13ff6c4bb21225400 SHA512 d86e6c4ea2e1437b63956e37d26c3240e71386c2e0dce98edd8077bd8aafb1c7b1ca4d2b8c3cb87250d51af6fa24a86e13992679ebbdd07d3667fa7171cbe920
+EBUILD sslscan-1.11.11.ebuild 1161 BLAKE2B 11d5dc98ef503bef04efdb8037ca794e2e7341378543f3c987b5c3e2c25665ee94c393ea632dd1af69bcb5e7463b727db72dbe6666c812c5e88161b8c589e792 SHA512 b1be927c3ee5a5fe0a26621c089222ca38d31f1d169c4dca73986dfb27a7e4dcdceafb37ce7b68828003422e008a1dca241589777616476b687834b4a6e1eefc
 MISC metadata.xml 295 BLAKE2B 4aed9a7658ee65ef0630a49abe71b2ab860377365b040ea0e19dfd8069f05e64cdab2c93fdf95276ad4087c247a18c195d05c81d90226ab6e753950fafce846e SHA512 561d272316db60726db149ffd3f77a59ed4fd7d16dd96e8064e1994666812d5056180965ef93939904ae653e0aa2cbc04621f5700464d5115490d56c24354bb4
diff --git a/net-analyzer/sslscan/sslscan-1.11.11.ebuild b/net-analyzer/sslscan/sslscan-1.11.11.ebuild
index 61ffbbe5632e..3c2e05a39993 100644
--- a/net-analyzer/sslscan/sslscan-1.11.11.ebuild
+++ b/net-analyzer/sslscan/sslscan-1.11.11.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libressl +static"
 
 DEPEND="libressl? ( dev-libs/libressl )"
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 2ebdc316e604..dfde766bd448 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -6,15 +6,16 @@ AUX wireshark-2.6.0-androiddump-wsutil.patch 640 BLAKE2B 07e8bbb0a892d35fc58d63c
 AUX wireshark-2.6.0-qtsvg.patch 800 BLAKE2B 767fdc6f54ad226b5b55333bfeb9a0c79d989a274b430a582f7a79406ac424474af2b723ade963a8d52428dfc66686aeb71366d133cdf2b0e714efdde549628a SHA512 fe326b15364ce139ac616ba9e6799d2519b00d67fb6e770c5294e15c8141fcf6d9fb4462e31d609bd98ac15c3a67dedd9e37a2eec42f47c95861aba7dee20f31
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
 AUX wireshark-2.6.1-Qt-5.11.patch 1968 BLAKE2B 74c96bfdec9540b7ea91dd71c9420ac735e9f9b7d2ebccafad5447252d7f6768184ce3af16628e966634473687f8da92e300b47c01ab2ce974a475e8796886b9 SHA512 a079b03d35733f837e73c5d2bd6860ccc3dc185f4488ac4768b3cf081bde15e86a562c7c5e445775e2618f993e8286d5bde9b0617f9d3f30e94d1802d4d75a63
+AUX wireshark-2.6.2-qtsvg.patch 548 BLAKE2B a86981841b4bd76c429d68bb94439317c29404a8917ee8419b7f9e729e857a6dafb94c738f656633672f4f31a8a0e3ccc6a1946b6db3a15b27244cf5ab34a7e5 SHA512 08530766e3e3e3273847a7147303c0bbb0f2b9230e54f057fe4e266ea4f67d577d301a4c02e63d69bb5cdeaf0445466c906278ab76e636a0f2bb8a886eb21ddc
 AUX wireshark-99999999-androiddump-wsutil.patch 772 BLAKE2B 061dc2253d10dd088ebf7cacbe6a1afadf2b5b41d37ad1de07e6c3985feb13934f743c3c303dab0548d4df4b762afd876ace6f522a3d0d750ed1d77b823402b7 SHA512 181683e22a2b694c28e49915d2b00e7c3261dc9eabc1893892d0c62f73b4aa28f3811a5b69ff496e2c166e2fa958f0a54776d63489337ccd4851d4eafddc0f0a
 AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f920221ca7ccf774702e8018f982e00318afbaac174d4e7ae961fefd448cc56dca6b7d0448a2ac99d1e5afacb61a37de0546ee3557e SHA512 a9794c5bcb1d288c113e84b03ac4f185e6fb7bccc16aefa3311ebd37aab7e9d5c715022f5b54032812ac2ab1244c65d9fd716c826ee27e677b011976f218f9da
 AUX wireshark-99999999-qtsvg.patch 792 BLAKE2B 88a51d38d3854ff6488a5b3042866f9dba4a94009e241c1ec1838b008af7c006433d59b550a289bc132a01ee873838c22bc478f780d5e930afdb04de295426f0 SHA512 7cc0d21d5689fdae0714799f6b2ba3711a44eb353e55d4f367b5fd1974688be517d9629a8b68537edad8545ce5f5149109a5af3392d1c70e6d76734b7bae1822
 AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
 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.6.1.tar.xz 28386244 BLAKE2B fe45f4249c81fd83ce35384b7038d7f1b5e21d884a5faec4344dda8f0c8b71393207e043672ce57bb6f1c45800ffce8feed8573a064db8048b3c0268feb0b486 SHA512 e68f7fa5975f10feccb76ab64c9a00f141cd04a12fa586a9839c93630d3554565d8e2ddfab83ec31cb813485b14b3227b7ec6e59baef007a6fe74b8b2a5ed444
-EBUILD wireshark-2.4.5.ebuild 7380 BLAKE2B 0fd3f07582d42cf9651496978c983c9cfa54b2ee0df52151c04bcb7ffd7c886aecf233598226dc2427ec0fbf6fa7d5d4ca8bf92f361c853a10b72dd625fa72dd SHA512 558350df39da8b7419d63251544900f519d920e120ffa40cdfefc7b088731d2ac6755928758bd4c9379f49b1b00b93f4cda8713601e340647d955cc73e6e590c
-EBUILD wireshark-2.4.6.ebuild 7388 BLAKE2B 1d73922229e3216ee9aeb3f95f964da3aa6afea193e88209df3f91419ba99de6de201538750dd79c3421bd8cf12dcfd1b12022b0be97a21f3e743fea17f70107 SHA512 dc66e5dd25527f9fd7ec05f6d810b4d92f2c138e2337def5571e7a7bcaf6034099ad649869190aa366700e6223e9de09997fa36c6910f9dbbc5e0c736e26a92b
-EBUILD wireshark-2.6.1.ebuild 6626 BLAKE2B e577e69a7b9db97cb7f35374787d44abd53c5a0a02235f459a68b683ef8b669d3787332b00d5b57b62723c20ad04e0fb09c8ec2dbc30bf3e2a757edf8368fe8c SHA512 443adade8dede2f90531d65ebe34e90f3cec6fb29e2c5cdeb2764326b0509b08437a94532d979fca1270a8a9d0aa5734f2540bb936e38c785c004083eb8b2af3
-EBUILD wireshark-99999999.ebuild 6391 BLAKE2B a97356a1ffeafe735cad35e35d7633dc34c97239f7a0f47542da28d2912ca8eff0f9e5172d37efdc157d921026ddd6a92bb22d45b628cdecfdd485b0369552d4 SHA512 56818a23c3cd32a9553b4e7ca77ca21f99546a0a2bbab5fd8c3311d4c564c7e634fb19da5587609386ceb3c925150031b1c296753e89be68626b0f1e137903d8
+DIST wireshark-2.6.2.tar.xz 28392140 BLAKE2B 08fb59061f618494ee07ca19cd97ab2ebe7c483419c1932e185dd42a0fe2b6d0070834ae5b7aaea4981f6fbc4baeaadb7c9eee8bf32b823af77e753c468257ce SHA512 e39cd8dec44c8c64e5da25df0ffda529130541e5267fb0bdaa232fb4a4438c28ac5c9169ba17a37119d6cedf04a022b40da09f35f44a3739bdfb9486703f39e2
+EBUILD wireshark-2.4.5.ebuild 7334 BLAKE2B 8a968571ad9b7ecfca31dab7e22feda54ecd9ca42e244b89cc8e6f024fc767c9bc81d7fa36408c9332381024b6cd75abda7607fa26bca0dccc7a5dc105a24d3d SHA512 08a980bdb34a2929ea2f0d62ff1dbd73328897ddd3c20d529b67e8564e487c216f0fcddddbaaf54f8132fbc2139261217d0c36e0d9c644c01020600e62b7096f
+EBUILD wireshark-2.6.1.ebuild 6604 BLAKE2B 7d29d72adf6b118afd922ec74bca8f261b98765ac4c28b76620eac8d1aced4329fd85fbe8e5707c0245402385b71f98aaa6a70c4ce080e37893e5c3fe1bd71e1 SHA512 1599d590d6adba1a29baa40045a7fed23f70bfa56e965cab1e8042269705c11194e87442dd152fd9ce5bf3f94fcf363daf69b177c961429db367da43bd6ad8c4
+EBUILD wireshark-2.6.2.ebuild 6566 BLAKE2B da412a21e0fc09082365ea38c19f3aaf0096da797925a47022e8099fb97e3503634529d046092802146f821516bfc68d386609abc945e59ce25f6c13c8c4609b SHA512 a41d38397e8bcd6d68f4111c757d447d45487106bcb30f3d5c54d45090a8d0c3ab82861bfad4fcc4923b4db5b2e741fd1b4cadb786503de5177ca087aa71842b
+EBUILD wireshark-99999999.ebuild 6369 BLAKE2B 099383aae55deb0186a58215a7fc5e13c07e5ebb309f06883ec1ba307fdb8dbb3f8da5b8a8edcf7623d01fef9b1297da44aeda2ec1fe6e16e92cd0af2404cfb8 SHA512 6dafc31e2a5726dd3f57d144b7944924199b331e2d241abbbb79a41641bf8df026a3a8b2db391df67dbb8fa92ca39e06cd9c6290949825668e9dfcbc37a27abe
 MISC metadata.xml 4787 BLAKE2B dcdb28c47094cfddc0effc4c16aa9132386f94d4d6e6cdb46f31a06ebb5dd7cd5c7bf967f50c6a002b7aeecddeb8aa8b86cb5961405a463c10389d6ec9b5cb7f SHA512 b683b159266bc37471ef26f6c0c4b2e94f72d2a77a2a7647e28b8b49e611973522af294c39050dbfa8aa5cca65bf2670f9d4c1e6a93d01b386e76f1ab75ff2e9
diff --git a/net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch
new file mode 100644
index 000000000000..445851090a69
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch
@@ -0,0 +1,17 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -939,14 +939,12 @@
+ 			Qt5LinguistTools
+ 			Qt5Multimedia
+ 			Qt5PrintSupport
+-			Qt5Svg
+ 			Qt5Widgets
+ 		)
+ 		set(Qt5Core_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+ 		set(Qt5LinguistTools_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+ 		set(Qt5Multimedia_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+ 		set(Qt5PrintSupport_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+-		set(Qt5Svg_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+ 		set(Qt5Widgets_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+ 		if (APPLE)
+ 			set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras)
diff --git a/net-analyzer/wireshark/wireshark-2.4.5.ebuild b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
index d5a957dd4257..49ec9932a089 100644
--- a/net-analyzer/wireshark/wireshark-2.4.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~arm64 ppc ppc64 ~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
@@ -61,7 +61,7 @@ CDEPEND="
 	snappy? ( app-arch/snappy )
 	spandsp? ( media-libs/spandsp )
 	ssl? ( net-libs/gnutls:= )
-	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+	zlib? ( sys-libs/zlib )
 "
 # We need perl for `pod2html`.  The rest of the perl stuff is to block older
 # and broken installs. #455122
diff --git a/net-analyzer/wireshark/wireshark-2.4.6.ebuild b/net-analyzer/wireshark/wireshark-2.4.6.ebuild
deleted file mode 100644
index 9ab79ccdd073..000000000000
--- a/net-analyzer/wireshark/wireshark-2.4.6.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# 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="alpha 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/speex-1.2.0
-		media-libs/speexdsp
-		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/wireshark/wireshark-2.6.1.ebuild b/net-analyzer/wireshark/wireshark-2.6.1.ebuild
index efde4f468e86..9e43a2a0eac0 100644
--- a/net-analyzer/wireshark/wireshark-2.6.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.1.ebuild
@@ -59,7 +59,7 @@ CDEPEND="
 	snappy? ( app-arch/snappy )
 	spandsp? ( media-libs/spandsp )
 	ssl? ( net-libs/gnutls:= )
-	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+	zlib? ( sys-libs/zlib )
 "
 # We need perl for `pod2html`. The rest of the perl stuff is to block older
 # and broken installs. #455122
diff --git a/net-analyzer/wireshark/wireshark-2.6.2.ebuild b/net-analyzer/wireshark/wireshark-2.6.2.ebuild
new file mode 100644
index 000000000000..2eefb6006408
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.6.2.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune 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="~alpha amd64 ~arm ~hppa ia64 ~ppc64 x86"
+IUSE="
+	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc
+	+dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
+	nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux
+	+sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump
+	zlib
+"
+
+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 )
+	filecaps? ( sys-libs/libcap )
+	gtk? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/pango
+		x11-misc/xdg-utils
+	)
+	kerberos? ( virtual/krb5 )
+	sshdump? ( >=net-libs/libssh-0.6 )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	lz4? ( app-arch/lz4 )
+	maxminddb? ( dev-libs/libmaxminddb )
+	nghttp2? ( net-libs/nghttp2 )
+	pcap? ( net-libs/libpcap )
+	portaudio? ( media-libs/portaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		>=media-libs/speex-1.2.0
+		media-libs/speexdsp
+		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 )
+"
+# 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
+		dev-ruby/asciidoctor
+	)
+	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.4-androiddump.patch
+	"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-2.6.2-qtsvg.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump.patch
+)
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_configure() {
+	local mycmakeargs
+
+	# 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."
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+				;;
+		esac
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	mycmakeargs+=(
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(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 '')
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dumpcap=$(usex dumpcap)
+		-DBUILD_editcap=$(usex editcap)
+		-DBUILD_mergecap=$(usex mergecap)
+		-DBUILD_mmdbresolve=$(usex maxminddb)
+		-DBUILD_randpkt=$(usex randpkt)
+		-DBUILD_randpktdump=$(usex randpktdump)
+		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sharkd=$(usex sharkd)
+		-DBUILD_sshdump=$(usex sshdump)
+		-DBUILD_text2pcap=$(usex text2pcap)
+		-DBUILD_tfshark=$(usex tfshark)
+		-DBUILD_tshark=$(usex tshark)
+		-DBUILD_udpdump=$(usex udpdump)
+		-DBUILD_wireshark=$(usex qt5)
+		-DBUILD_wireshark_gtk=$(usex gtk)
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_CAP=no
+		-DENABLE_CARES=$(usex adns)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex nghttp2)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_PORTAUDIO=$(usex portaudio)
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+	# install headers
+	insinto /usr/include/wireshark
+	doins ws_diag_control.h ws_symbol_export.h \
+		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
+
+	local dir dirs=(
+		epan
+		epan/crypt
+		epan/dfilter
+		epan/dissectors
+		epan/ftypes
+		epan/wmem
+		wiretap
+		wsutil
+	)
+	for dir in "${dirs[@]}"
+	do
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
+	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
+	chgrp wireshark "${EROOT}"/usr/bin/dumpcap
+
+	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/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index d1a9875cba39..820661327c1d 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -52,7 +52,7 @@ CDEPEND="
 	snappy? ( app-arch/snappy )
 	spandsp? ( media-libs/spandsp )
 	ssl? ( net-libs/gnutls:= )
-	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+	zlib? ( sys-libs/zlib )
 "
 # We need perl for `pod2html`. The rest of the perl stuff is to block older
 # and broken installs. #455122