16 files changed, 200 insertions, 455 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 311894cd92cc..db2dd5aff38f 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 31791a0af1af..0690e92c17d8 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.2.tar.gz 2507304 BLAKE2B 0f2cc58fff6d9f648b302c3af07e24fcf20e0c10c140d4052991477e1dbf5c158157f0c64e8d3aa26a6fadc46db25eb26d7b5d5c791a8a7d91445be10f0cecea SHA512 55a9791fa14d0e3e559b3083ec83ad301b62a677a1b56ad30227b1a3591612e2fe536a34a25705fb935a6ca8e42f45ff006f9856b47103da054db15582455579
+DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5 SHA512 b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
 EBUILD icinga2-2.8.2.ebuild 4604 BLAKE2B 074505319ffdb68d93df79dbfe6c2a88a971b1a188e28526dd97e131d7494e6076173cbe9b8ee3599c7deecb62610f23828f0c107460555d47394d29f81eedbe SHA512 be570d2178c8750227b1dfb46c682a1805696fe9b46241f6ef9f59fa1e6ac9886d7e88cc14bcd5e094cd3671f49dfa1ad91046d3e08288b8266f888fde37a2a1
+EBUILD icinga2-2.8.4.ebuild 4608 BLAKE2B 01c0eadcb5ff07ab19315aa5243859531830ac1c43a252ade687a7ae2a621acbd16f80059ab43cacd16374490755b10166858f90767e84d8c1b9006831761c80 SHA512 50333c932859db9d872e4617ad97fda03017449d3cc50a5d1d548994e0e1564ba42302ec23f10903976361f306d494c3671e65d6d4b167e2e4158d02cd22c23b
 EBUILD icinga2-9999.ebuild 4608 BLAKE2B e3c3b8c7c93458ee579764b087395cc004855dee56cc463a22d2787c541661e5963cf8d7b9d70374c302d1a82e3453a750c16d51d55daed81496b998335d9cc8 SHA512 d6d1d15e9e3e7bfb461c9eee901448cd489bb2fd86575291790e463c16d133ec1ecf15f72f3a67e5a9ee3de4dba450ad51b6940c5b966ae688d8a9d51ba4d5fc
 MISC metadata.xml 816 BLAKE2B 6d820358c90a580be01149ae631f40dbeb5f50ce0df937ac484269c9a58f21a450d3861dce3b34ee0882b3b61d981da8162af735c5a3de90bb7b74dae9523d08 SHA512 0d3ac2d9233f7ce53a8105caed0231cefa402861e26c760de3fb23163ea68c21b97f5ec0de65bc6953aaf2dd8fa90a9edc045a2fea8b622efdd1336959e9e60b
diff --git a/net-analyzer/icinga2/icinga2-2.8.4.ebuild b/net-analyzer/icinga2/icinga2-2.8.4.ebuild
new file mode 100644
index 000000000000..4108f14e4147
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.8.4.ebuild
@@ -0,0 +1,176 @@
+# 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 studio +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] )
+	studio? ( x11-libs/wxGTK:3.0 )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	if use studio ; then
+		setup-wxwidgets
+	fi
+	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
+		-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
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=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/nagios-check_linux_bonding/Manifest b/net-analyzer/nagios-check_linux_bonding/Manifest
index f2f35a0e4254..bcb687f1f257 100644
--- a/net-analyzer/nagios-check_linux_bonding/Manifest
+++ b/net-analyzer/nagios-check_linux_bonding/Manifest
@@ -1,3 +1,3 @@
 DIST check_linux_bonding-1.4.tar.gz 24670 BLAKE2B 6f136043fdcc74f677963ad4798ea18a8f813c3bf6cf1d00f6649d72dfc7d953c01a43bd3050758a8461f255ce3a9d3ddbdd1bcb29de316ea6438f20409ce699 SHA512 2b1e11007680accd8667ceb8710c7a7448766fd0c5aa3be60a34209f1b25892e7fecc46f9fc5e7cc0d4776f68cc17f8db8d8f2758695c82045a5832e8a4c7e81
 EBUILD nagios-check_linux_bonding-1.4.ebuild 715 BLAKE2B 7a7274e75740d03026e83d8c9d7dd6b17d65259e76c9ef5e52b46da00fe932a68b66c470cc013c103c5efd663a83b3eb1cf4619e4098139a62cbf7ba68dc94c5 SHA512 1c3e9cabe175877fb22d3e9821b9d9d54eabd37e7c2ac1f49071e618a335a24b4f8293ec26fc44048c45136ef33630a7e12c3c54396664cf1593d4ff4db8cd2a
-MISC metadata.xml 254 BLAKE2B ac21e0d512ed35dc324c06da92be70b3da50223304de1259df23a113a27d298699b15f7ccea4aa70f25340d35fdcf765925e4c8d4a826088a37360cc95c7e1a5 SHA512 d54bbd438702882474a84ef2661d0010a26676a9b1d2315076519409fe5432f4e818fa8c4838f3f773be36dc1ebe18f291e9ed81f87ef6e059ef2ecde072cfd6
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-analyzer/nagios-check_linux_bonding/metadata.xml b/net-analyzer/nagios-check_linux_bonding/metadata.xml
index 1b3572fd9b8e..7a38bb900964 100644
--- a/net-analyzer/nagios-check_linux_bonding/metadata.xml
+++ b/net-analyzer/nagios-check_linux_bonding/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>ercpe@gentoo.org</email>
-		<name>Johann Schmitz (ercpe)</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index d0c829749720..8cfef9500881 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -15,5 +15,5 @@ DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b
 EBUILD nagios-core-3.5.1.ebuild 6154 BLAKE2B a12a36fc2217394d21f7084fce74104f5c17749271fcf984a1dd96cac505327abb89a20e9582c927286b4b93dbcbecfa131129bc3362a29b900441138dae580a SHA512 c402040b5449fe096d40d0313ee08380089788c57da4dc780a8736eb335fb775379db4667145baed355dbbe9128e99d2662f54d9a57e44f2cc5fc35f0fe2bf01
 EBUILD nagios-core-4.3.1-r1.ebuild 7579 BLAKE2B 931cbb9b132ad116fc2e7ed6670d309ecb5165b172eef9e24ef401b7946c4dc0f434f9678a338f4ecac2cf65cd2147cdda046d9ede2676e8aa7f7b5d5b8795b5 SHA512 8a4273cb4e2f50ed4e69d190743c362db3c1c9480ea19d061501dc57e48fea7e6b3c1811107714667b7ead9eb748ee8a7a106b792f066422ef13640b14bd5aac
 EBUILD nagios-core-4.3.3.ebuild 7466 BLAKE2B af8a11f344adbb8e8e7bb46b48c8bb414ef7c58e7b8aab77c2988919bc5fae24c6272f96cf51a9b43f64f6e42003187e6616d4d87d56f86a5e00184c8c5e9483 SHA512 860b07673f9d77e296bfc471291cd07de65b1195ea2cfd0bad7ceffdf316afa23fda0c5f90a2de2c7115f053f54dbced5e45627d6747512af62833d0c398682b
-EBUILD nagios-core-4.3.4.ebuild 6647 BLAKE2B fcf294cd621733b63dec7228232b43201624d40c5f3fecd8c13d9cb8c1554216de5279f7ecdc0ed2a30b89852a488016b1d8b48e9a75c1e002966f4b1a0cfbd3 SHA512 7cbe1d7067a862543aafcd591a2cf8b5abe40af75f7daa3eecbc4aa3f8afaaa5a0f366c4f4175b1680f7d30c481aa2d39296049a9963631c6c29edad465949e4
+EBUILD nagios-core-4.3.4.ebuild 6645 BLAKE2B a68204732d6613a7f7265d30aed20c093fa7077b468afab2bf35938210b910be4533dc768c0e9f9aad9b81ed75de72a7333e2aa3014958f5f6029bbc191d8d0f SHA512 5a1da06d0244646b68b36cd5cdd549d05ebf2ca379ad0fcf4aee92dd76d68bdee98635c290c613d12b3660aeda8b342fea8bda0bf39aed3dbb2672e47313ebc8
 MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
index 6de6b181b223..e2924762eced 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.4.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
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/nrpe/Manifest b/net-analyzer/nrpe/Manifest
index ed9889116404..52cf056c3f1c 100644
--- a/net-analyzer/nrpe/Manifest
+++ b/net-analyzer/nrpe/Manifest
@@ -8,6 +8,6 @@ AUX nrpe.service 242 BLAKE2B 715f0e8b91d6c40405d6d1f3689bbbf750e61e78e1d727debbe
 AUX nrpe.xinetd.2 245 BLAKE2B 3e9db31c7d5b28dab18d2f5855d0465f25fc9cf4a70deac9a5d0c87c7cc546a33b432dbca172a49addadc0bd6583d870ec0fe350bf60e015e325d8bb923aca47 SHA512 d687cb2a5babfd28a97d3a5f1ac665758341ecc37fdd0193dbf0df4cba68c88aa24776a33a706989843fa5356b2e3e995662a823ceb2b86ba8f846f8c47e18fb
 DIST nrpe-2.15.tar.gz 419695 BLAKE2B 999ecc633cbd2dc516ff0654db3ac0cc58a88d93ae4ace1040888fe73d8fb471306d95312ac364c79b3a47300ac57c0c429a24697c37bfa639f1da55cb6bc756 SHA512 03ce9774b5112d03235dc9da075770d89d1bcc5ffa5faf221ff7ea8ec5c92ded1e1ae9222581a87cf53736d190ac047e1acce7edc2f31f26c432d786cdef0e73
 DIST nrpe-3.2.1.tar.gz 518015 BLAKE2B c9be2bf24e3d9977a7ff5c2f0e08bfe841729289af836bb7ac6ccb2c173a519958b12cc3e90ece612ac6c2527ad472ef1464be648a66b11ff8ad483d5ad78cc1 SHA512 ec6ff42a00bd97ed80010a82e26dc35fd419f2feda65820cda0108068173c1ae44eee698833a50fd2079429a6f5eb1321c4f06b09c6708bc5fbe48f176389856
-EBUILD nrpe-2.15-r3.ebuild 3946 BLAKE2B 9724e432f8c8e2e424694b86deaa7c3a17bbaf833969d8b34035314e1588dab106c9ffe896c145f34216f9dcc17f1f5eb243ce8c2826421a3160a59d9d25b82e SHA512 bd85540c064f550072e1bd53928cbc5c2965a43f9a7847d2caf4f7cfcee681f7d6d0235d8dc9c4940b0d2bf44bb065cba1df0552af61a1aa7558bb2fa1bf99e4
-EBUILD nrpe-3.2.1.ebuild 1873 BLAKE2B 96e8361263ac7acbe74b44ba77d0b5b87f7f7834db4454840cce81840fb6cffad0c93f9a19f65cdfd722ede0ca841a3952e9397c9022737ecc93b2eb35840f65 SHA512 cf17db5aa952fb6743629fa05c0d226c2f04affecd676034c5f44f81478c430794dbd263dfc4868a6921148301b64ac1ef852ad839e85288c964004009086967
+EBUILD nrpe-2.15-r3.ebuild 4013 BLAKE2B 6609597c36f1df0228f627a66f1a2edaf2c30c93d3f143c69ab92c2c914f1e83bbb3bfd2bdd286fdc42411b3d86ca9716609f278838849ed940aa35dc7cad9c0 SHA512 d2442384f0bea253479f06186b78f013514f6fbaddc1aea531eec6b7f0436061aab3852d4035bd61fcaa6beefa2f2724200d8845d62851ced816895aa9258179
+EBUILD nrpe-3.2.1.ebuild 1938 BLAKE2B bd00244a5585503b24b108f167345560d0b7855a8cdd1497fc4e853b86b42e4f9fb67aa1fc767ca67f5e3b1e13424828f295b0a74316c95a17ebb26dbea7aa0f SHA512 f0fa9659e5c06ad4239ede15ac5303675812db6cd06febade51c68aaa05e289ad1f206e53f78c327e918955be4e69e07b621671110044b3f1fc1d161ee36ee64
 MISC metadata.xml 882 BLAKE2B 76bf034c9869b503725f301f0f478c0449787057f1ba4bc22842ddee2d4460b68be1654cdc18e04504469880b71113e7a4b5a0a37fc9138eeb1b39fc2c8833f1 SHA512 2bbdd6bb5d0802985b242b8c058c749eca1adfb102820e2c587699622299936df90ee1ff43445df8686e1dd1648d0131bee40639ddfad3e26e9877c0c61dc40e
diff --git a/net-analyzer/nrpe/nrpe-2.15-r3.ebuild b/net-analyzer/nrpe/nrpe-2.15-r3.ebuild
index 90481423d1fe..afdbdc893c41 100644
--- a/net-analyzer/nrpe/nrpe-2.15-r3.ebuild
+++ b/net-analyzer/nrpe/nrpe-2.15-r3.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=5
@@ -11,9 +11,13 @@ SRC_URI="mirror://sourceforge/nagios/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="command-args minimal selinux ssl tcpd"
+IUSE="command-args libressl minimal selinux ssl tcpd"
 
-DEPEND="ssl? ( dev-libs/openssl:0 )
+DEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
 	!minimal? ( tcpd? ( sys-apps/tcp-wrappers ) )"
 RDEPEND="${DEPEND}
 	!minimal? (
diff --git a/net-analyzer/nrpe/nrpe-3.2.1.ebuild b/net-analyzer/nrpe/nrpe-3.2.1.ebuild
index fabe5f984cae..3a4f9d8d2513 100644
--- a/net-analyzer/nrpe/nrpe-3.2.1.ebuild
+++ b/net-analyzer/nrpe/nrpe-3.2.1.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
@@ -11,10 +11,13 @@ SRC_URI="${HOMEPAGE}/releases/download/${P}/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="command-args selinux ssl"
+IUSE="command-args libressl selinux ssl"
 
 DEPEND="sys-apps/tcp-wrappers
-	ssl? ( dev-libs/openssl:0 )"
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
 RDEPEND="${DEPEND}
 	|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )
 	selinux? ( sec-policy/selinux-nagios )"
diff --git a/net-analyzer/nsat/Manifest b/net-analyzer/nsat/Manifest
index 38ebf09dc3eb..8e61de2e2136 100644
--- a/net-analyzer/nsat/Manifest
+++ b/net-analyzer/nsat/Manifest
@@ -6,7 +6,5 @@ AUX nsat-1.5-misc.patch 2422 BLAKE2B 093cbcb9ec6201f6674a0d191db23fc462c9e6bcdf1
 AUX nsat-1.5-strip.patch 205 BLAKE2B ac4b4b54ff6f8cf1771f57497317040eb40be829c8bcbb03c2f063fcaa190419e74b8ff5481f8fab4332af223d9a8ba7526d793d084be1f1498d0046db820227 SHA512 3e8b312e704f08fbe86caea37a8491851474cb0b773a73f4b2995532086fefa85a5240f49084bb0e1195089bfbfa937e68c45c0908a2bb7f427775ccb4535e8e
 AUX nsat-1.5-va_list.patch 470 BLAKE2B 2ac6936d216b497ecbd47cc167f9f142fd6bf20f834b123ce6ace47d9fa999102f8606e856b55db4b03243c6a427931ee56092c5e0dbc8e9357b139f26e28892 SHA512 1963419110a34b826d27b5b34e22ae71906380bc8a2ce130d374c00ad91827fab3781e97aadf417613f042d195ee9e85e50b898befff82190c7e031276903baa
 DIST nsat-1.5.tgz 410603 BLAKE2B 083ac2879afae87d1282bb643d0988b2f858f9c934fe7a6e24407c0f5cf90ceba7be17aeeae8e7cb9d0f7a31cce171fed6382351ea8413b13d3e4343339f0c9c SHA512 1a5b8e88f7bcacdbe1144a719a2e446c0ea025ad4e5f8c79ccb939083308cd2c1b2c1f3d7ab3b791924d5855994cbc3fded95aa36df23c12fd76fc20341a87d0
-EBUILD nsat-1.5-r3.ebuild 1448 BLAKE2B 3fb6b15d31da75be14233670718eca29182d194004f03eaa7df8548b210cae077c32431a51927269a4fda389d5674a0682d8ed694d39d1cfa94a5ac343d17f95 SHA512 e9fed8fba8257ccafe401a4f16cbc70b9b8cace66342d6cbaadd70d88084fa84dc8a4a54e0b5047a201e159668ab3badf99f38a011f7130368b789043010d9d4
-EBUILD nsat-1.5-r4.ebuild 1548 BLAKE2B fc4e2e35ad7e75644b307e5e0b9ff78dc27ae6c65fcf2a132a5aef15075ca92579753792d0192fdfef51b2026743e6d3e866f2b6108c5a2a8d17458742ee6efb SHA512 6973436f22c62ffefdd76e198e3b436f28bd84dcf4ddab01c528f519d6d5268cbaca8da7531ef3cc95d908e683ed12287e076ee2a9adb8ba54158a6954f70a12
 EBUILD nsat-1.5-r5.ebuild 1505 BLAKE2B a1a22c52b13874f1989cac52547f8e758b4341901801f6576e2cae198c001a52e3a3571b43f37086903745f4da9a3134f50396889b4ecfb47fb7f3aeeebd9372 SHA512 cbbf8fdc0c51440864e64119805a6c7f9f1d8c55406922df6d972461ee302cb7dc26f53403d3b5327fd4b342abfd573c926abbca4b5a908554b1084edbf9f63a
 MISC metadata.xml 468 BLAKE2B abead434d23b600816574da4b21286111215e5a5683b14f4b24dff935bcc79c691e787688d78d3bf33e937b3260650dc0a75a8b231ff59c0a6ecbbd8983426a2 SHA512 54bdd25a484a9b3f2ec4642494f4f8e9433c33f013eadc149a77b0ffc3455579a3598ba323344107143b41ae81e1cef6195dcab5b38c6f093f804e468a650454
diff --git a/net-analyzer/nsat/nsat-1.5-r3.ebuild b/net-analyzer/nsat/nsat-1.5-r3.ebuild
deleted file mode 100644
index 67ce3ebbb2ba..000000000000
--- a/net-analyzer/nsat/nsat-1.5-r3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Network Security Analysis Tool, an application-level network security scanner"
-HOMEPAGE="http://nsat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/nsat/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="X"
-
-RDEPEND="
-	X? (
-		x11-libs/libX11
-		dev-lang/tk
-	)
-	dev-libs/libmix
-	net-libs/libpcap
-"
-DEPEND="$RDEPEND"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-configure.patch
-	epatch "${FILESDIR}"/${P}-lvalue-gcc4.patch
-	epatch "${FILESDIR}"/${P}-strip.patch
-	epatch "${FILESDIR}"/${P}-misc.patch
-	epatch "${FILESDIR}"/${P}-va_list.patch
-	use amd64 && epatch "${FILESDIR}"/${P}-amd64-compat.patch
-
-	sed -i \
-		-e "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \
-		nsat.conf || die
-	sed -i -e "s:/usr/local:/usr:g" tools/xnsat || die
-	sed -i \
-		-e "s:/usr/local/share/nsat/nsat.conf:/etc/nsat/nsat.conf:g" \
-		-e "s:/usr/local/share/nsat/nsat.cgi:/usr/share/nsat/nsat.cgi:g" \
-		src/lang.h || die
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	econf $(use_with X x)
-}
-
-src_compile() {
-	emake MIXOBJ=-lmix++
-}
-
-src_install () {
-	dobin nsat smb-ns
-	use X && dobin tools/xnsat
-
-	insinto /usr/share/nsat
-	doins nsat.cgi
-
-	insinto /etc/nsat
-	doins nsat.conf
-
-	dodoc README doc/CHANGES
-	doman doc/nsat.8
-}
diff --git a/net-analyzer/nsat/nsat-1.5-r4.ebuild b/net-analyzer/nsat/nsat-1.5-r4.ebuild
deleted file mode 100644
index 71f484cf1270..000000000000
--- a/net-analyzer/nsat/nsat-1.5-r4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Network Security Analysis Tool, an application-level network security scanner"
-HOMEPAGE="http://nsat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/nsat/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="X"
-
-RDEPEND="
-	dev-libs/libmix
-	net-libs/libnsl:0=
-	net-libs/libpcap
-	X? (
-		dev-lang/tk:*
-		x11-libs/libX11
-	)
-	|| (	<sys-libs/glibc-2.26
-		(
-			net-libs/libtirpc
-			net-libs/rpcsvc-proto
-		)
-	)
-"
-DEPEND="$RDEPEND"
-S="${WORKDIR}/${PN}"
-PATCHES=(
-	"${FILESDIR}"/${P}-configure.patch
-	"${FILESDIR}"/${P}-lvalue-gcc4.patch
-	"${FILESDIR}"/${P}-strip.patch
-	"${FILESDIR}"/${P}-misc.patch
-	"${FILESDIR}"/${P}-va_list.patch
-	"${FILESDIR}"/${P}-libtirpc.patch
-	"${FILESDIR}"/${P}-amd64-compat.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \
-		nsat.conf || die
-	sed -i -e "s:/usr/local:/usr:g" tools/xnsat || die
-	sed -i \
-		-e "s:/usr/local/share/nsat/nsat.conf:/etc/nsat/nsat.conf:g" \
-		-e "s:/usr/local/share/nsat/nsat.cgi:/usr/share/nsat/nsat.cgi:g" \
-		src/lang.h || die
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	econf $(use_with X x)
-}
-
-src_compile() {
-	emake MIXOBJ=-lmix++
-}
-
-src_install () {
-	dobin nsat smb-ns
-	use X && dobin tools/xnsat
-
-	insinto /usr/share/nsat
-	doins nsat.cgi
-
-	insinto /etc/nsat
-	doins nsat.conf
-
-	dodoc README doc/CHANGES
-	doman doc/nsat.8
-}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index c224504f6743..afda93101373 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,11 +5,9 @@ AUX wireshark-2.4.3-libsmi.patch 7153 BLAKE2B 33b7237eb213fcb2aab0a9db9c28a22dfb
 AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f920221ca7ccf774702e8018f982e00318afbaac174d4e7ae961fefd448cc56dca6b7d0448a2ac99d1e5afacb61a37de0546ee3557e SHA512 a9794c5bcb1d288c113e84b03ac4f185e6fb7bccc16aefa3311ebd37aab7e9d5c715022f5b54032812ac2ab1244c65d9fd716c826ee27e677b011976f218f9da
 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
+DIST wireshark-2.6.0.tar.xz 28314868 BLAKE2B 2121a667115474ac4b1fe05d50ffc02383bf7a8057ea072480455562c62a75d18f3c6b6886ca1e7345101d15057a67a250a3d2a2050777ff5bb1654279b1ac87 SHA512 a419ed32caeb9f25fc26e345c7baf7d847fee35730c64efad66870a786b26b9f8d5a8665b8b99be88f9cf504f6d9e640584d9849558ff09efc83400588dc6da8
 EBUILD wireshark-2.4.5.ebuild 7392 BLAKE2B 833313e93273e8a70800ace0fd0118b0c110d57201ab93fca9874deb5a31054151c38b18f9d8afab1f9bd3d32937500d587f96687341b4c34552fd3f026d0f89 SHA512 f0fd759e54e070e1821c63f998711c59f0d12aca3511f6bbe5b1b04788e4d7f69c26c387e9ce8b0468bfe6e83e61157869f905016759ccb383a87fff1a395c82
 EBUILD wireshark-2.4.6.ebuild 7400 BLAKE2B b7285588257633fc37bd8065c9dbef66c5a89cc2fe181bf3a4345beb8f144d889c6227939265ba152795eaac3cc08c84828455f35dd431f54f8e51e4f6536077 SHA512 f372729872f52aee8ab308bb97f284b198308af4abc9fe25f2edf2b6b9535ac17c548fde0720a46e409a53708067b8e00bb67811a79907fff5521585e1a926c7
-EBUILD wireshark-2.5.0.ebuild 7136 BLAKE2B 0d4694ca0f61af34f8b54ac29d43d146ffabe22ec905e78f4ca1f49667d9a09dd4e5bfbb01f42d6ca2003712e2daaf4c52d4c00c03afdf492b638cfae95016a3 SHA512 642a7f788b98b0f820880f14a3245122803ce5f96a4290b327144be3c22f4ea7c23eb9142bf47332defa9b63ed2e8e5a81f20a69137d1ce1d5af84d14377deea
-EBUILD wireshark-2.5.1.ebuild 6669 BLAKE2B 71ff363e37f83bdf5529346c7943b2c758d0ed50bf01471630b8f3f1f669bf7faea0e2e10373b36a453023b24b165b2c2575ebd0437161ff63a85ab29560cb0a SHA512 517a363489eff99f5d8dfa9e64025ac9940598824253c2b59598060804a7bcc1cc10fe94aeb007ec8f4fcfec0e8b02b9be0465b0373d76f403435b4c947132e5
+EBUILD wireshark-2.6.0.ebuild 6669 BLAKE2B 71ff363e37f83bdf5529346c7943b2c758d0ed50bf01471630b8f3f1f669bf7faea0e2e10373b36a453023b24b165b2c2575ebd0437161ff63a85ab29560cb0a SHA512 517a363489eff99f5d8dfa9e64025ac9940598824253c2b59598060804a7bcc1cc10fe94aeb007ec8f4fcfec0e8b02b9be0465b0373d76f403435b4c947132e5
 EBUILD wireshark-99999999.ebuild 7143 BLAKE2B 1f37c8e34e6d65965ba0b54056198c7d1fd15f763c987a9a753cf8a6c6c8487ebf977c8ccd6171d1336e1074cad7fe28620721b8b4eae74f1dc7e84b6a0ab38d SHA512 ef42790fdbf27aed911a8922abc7e094e2ccf08ea2c34f04587f17a3b9b892238bc401a4a9a9b017a1025098ddc17a8c47970d5b84811dd6690a742969d276ba
 MISC metadata.xml 4787 BLAKE2B dcdb28c47094cfddc0effc4c16aa9132386f94d4d6e6cdb46f31a06ebb5dd7cd5c7bf967f50c6a002b7aeecddeb8aa8b86cb5961405a463c10389d6ec9b5cb7f SHA512 b683b159266bc37471ef26f6c0c4b2e94f72d2a77a2a7647e28b8b49e611973522af294c39050dbfa8aa5cca65bf2670f9d4c1e6a93d01b386e76f1ab75ff2e9
diff --git a/net-analyzer/wireshark/wireshark-2.5.0.ebuild b/net-analyzer/wireshark/wireshark-2.5.0.ebuild
deleted file mode 100644
index 48af1f016059..000000000000
--- a/net-analyzer/wireshark/wireshark-2.5.0.ebuild
+++ /dev/null
@@ -1,285 +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="~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
-IUSE="
-	adns androiddump bcg729 +capinfos +caps +captype ciscodump
-	cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk
-	kerberos libssh libxml2 lua lz4 +mergecap +netlink nghttp2 +pcap portaudio
-	+qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy
-	spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib
-"
-REQUIRED_USE="
-	ciscodump? ( libssh )
-	sshdump? ( libssh )
-"
-
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-	>=dev-libs/glib-2.14:2
-	dev-libs/libgcrypt:0
-	netlink? ( dev-libs/libnl:3 )
-	adns? ( >=net-dns/c-ares-1.5 )
-	bcg729? ( media-libs/bcg729 )
-	caps? ( sys-libs/libcap )
-	geoip? ( dev-libs/geoip )
-	gtk? (
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:3
-		x11-libs/pango
-		x11-misc/xdg-utils
-	)
-	kerberos? ( virtual/krb5 )
-	libssh? ( >=net-libs/libssh-0.6 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( >=dev-lang/lua-5.1:* )
-	lz4? ( app-arch/lz4 )
-	nghttp2? ( net-libs/nghttp2 )
-	pcap? ( net-libs/libpcap )
-	portaudio? ( media-libs/portaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		|| (
-			media-libs/speexdsp
-			<media-libs/speex-1.2.0
-		)
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy )
-	spandsp? ( media-libs/spandsp )
-	ssl? ( net-libs/gnutls:= )
-	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
-"
-# We need perl for `pod2html`.  The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-	dev-lang/perl
-	!<virtual/perl-Pod-Simple-3.170
-	!<perl-core/Pod-Simple-3.170
-	doc? (
-		app-doc/doxygen
-		app-text/asciidoc
-		dev-libs/libxml2
-		dev-libs/libxslt
-		doc-pdf? ( dev-java/fop )
-		www-client/lynx
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND="
-	${CDEPEND}
-	gtk? ( virtual/freedesktop-icon-theme )
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
-	"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch
-	"${FILESDIR}"/${PN}-2.4-androiddump.patch
-	"${FILESDIR}"/${PN}-99999999-androiddump.patch
-)
-
-pkg_setup() {
-	enewgroup wireshark
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				myconf+=( "--with-ssl" )
-				;;
-		esac
-	fi
-
-	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
-	if use gtk || use qt5; then
-		myconf+=( "--enable-wireshark" )
-	else
-		myconf+=( "--disable-wireshark" )
-	fi
-
-	if ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	# Hack around inability to disable doxygen/fop doc generation
-	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
-
-	econf \
-		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use dumpcap && use_with pcap dumpcap-group wireshark) \
-		$(use_enable androiddump) \
-		$(use_enable capinfos) \
-		$(use_enable captype) \
-		$(use_enable ciscodump) \
-		$(use_enable dftest) \
-		$(use_enable dumpcap) \
-		$(use_enable editcap) \
-		$(use_enable mergecap) \
-		$(use_enable randpkt) \
-		$(use_enable randpktdump) \
-		$(use_enable reordercap) \
-		$(use_enable sharkd) \
-		$(use_enable sshdump) \
-		$(use_enable text2pcap) \
-		$(use_enable tfshark) \
-		$(use_enable tshark) \
-		$(use_enable udpdump) \
-		$(use_with adns c-ares) \
-		$(use_with bcg729) \
-		$(use_with caps libcap) \
-		$(use_with geoip) \
-		$(use_with gtk gtk 3) \
-		$(use_with kerberos krb5) \
-		$(use_with libssh) \
-		$(use_with libxml2) \
-		$(use_with lua) \
-		$(use_with lz4) \
-		$(use_with nghttp2) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with sbc) \
-		$(use_with smi libsmi) \
-		$(use_with snappy) \
-		$(use_with spandsp) \
-		$(use_with ssl gnutls) \
-		$(use_with zlib) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-		$(usex netlink --with-libnl=3 --without-libnl) \
-		$(usex qt5 --with-qt=5 '') \
-		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	fi
-}
-
-src_install() {
-	default
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-	if use doc-pdf; then
-		docinto /usr/share/doc/${PF}/pdf/
-		dodoc docbook/{developer,user}-guide.pdf
-	fi
-
-	# install headers
-	local wsheader
-	for wsheader in \
-		config.h \
-		epan/*.h \
-		epan/crypt/*.h \
-		epan/dfilter/*.h \
-		epan/dissectors/*.h \
-		epan/ftypes/*.h \
-		epan/wmem/*.h \
-		wiretap/*.h \
-		ws_diag_control.h \
-		ws_symbol_export.h \
-		wsutil/*.h
-	do
-		insinto /usr/include/wireshark/$( dirname ${wsheader} )
-		doins ${wsheader}
-	done
-
-	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	if use gtk || use qt5; then
-		local s
-		for s in 16 32 48 64 128 256 512 1024; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins image/wsicon${s}.png wireshark.png
-		done
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-
-	if use 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.5.1.ebuild b/net-analyzer/wireshark/wireshark-2.6.0.ebuild
index 75b779a48983..75b779a48983 100644
--- a/net-analyzer/wireshark/wireshark-2.5.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.0.ebuild