gentoo resync 08.09.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-09-08 10:50:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-09-08 10:50:14 +0100
commit: 3f71901f8c228f4de570abed1831ce3ee425343e (patch)
tree: a2dcd300d05ef8a2ec275b44a92a9d85bd3baa24 /net-analyzer
parent: 12bb627384ddfd47382b9f1b6464481a58d01ebb (diff)
35 files changed, 1439 insertions, 28 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 81a52fb953c6..33627e4317bd 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/gnu-netcat/Manifest b/net-analyzer/gnu-netcat/Manifest
index 97a47684e470..8ecaacf9e411 100644
--- a/net-analyzer/gnu-netcat/Manifest
+++ b/net-analyzer/gnu-netcat/Manifest
@@ -2,6 +2,6 @@ AUX gnu-netcat-LC_CTYPE.patch 479 BLAKE2B a458dc0df5d2f085b30b10d6f33f3ca6beb1b5
 AUX gnu-netcat-close.patch 342 BLAKE2B 24fd65ae42672c292c832fc1b5ca4d9ed64263f3fca45f5bb2b8a492f52bc2191fea471d4738541b660ac513b7adf662c204bbcfb8a919c1d2de083685244618 SHA512 920153a3c65f2a8c54ec1bfe3c2588a300c507fb3e88f80d69c2f816a802c72843a4c34900fd5a2e5bd03ab952f25796a6b601a105e01fa9097b19cff9bf0f11
 AUX gnu-netcat-flagcount.patch 479 BLAKE2B bf3838a82c8df361cb8f596d103bff0f52345d5ab2816f1de056acab71089585e0bca1b1c75793d4b67390246038fc502ed2b3c99c3c667361f6a325ef9df228 SHA512 cc8cefad31422eec8fc549e02c3cac5a725f6d0232d2a6e4383324530f5bdb771ec5e9221f2455b2f4b3d636eeda73a346a9cfb74856977b10136685420199d2
 DIST netcat-0.7.1.tar.bz2 325687 BLAKE2B a846fafcd006cc284f982fe66a3de5154ef1d74d20926344c54066f9b5e86f7bef06eb99313d5ec7f9f09bdb9b12ca82421b945bc6d3b8c6bb5f843cd6d31c2c SHA512 283c02f849c3bb62615a5ccb7796192804dafcecb34f3c6b553cbc12c715654963b81e253762923c6069be9768b93dde576a392b89b167912c323354f1376e83
-EBUILD gnu-netcat-0.7.1-r3.ebuild 836 BLAKE2B 1c46dbb2af156ea1584eed7dd59838e30ba92adc76cae1242ca3584a8687064db84d19fbc96934504c342f541eb7b323be17df2277b651e9420293e46b942a19 SHA512 c714f489e809d3d6d8084cfee67c181f004915e1b5d6497417fc2d58546d28df3d479ae3f37bbf520c8fc735784ad95843e6719bbbde37a8e2a2bf1d3c7f482b
-EBUILD gnu-netcat-0.7.1-r4.ebuild 819 BLAKE2B 1d00ba629c08d1b9db794148da6ea64e69ae236a6df3df848e843f89e182b91144eb257089faf262e21e129068b514b44ff35a2aa774f7aa2e701dbcac210e91 SHA512 b7b8f7c3ec8b553e31bf0dc247dde27e4802a3956089182826aaba50ee16e33bd3b09ed06d31f902dc427c7a1da34675a7b26d0d8ec1da21637c3a958cd430f6
+EBUILD gnu-netcat-0.7.1-r3.ebuild 825 BLAKE2B 551b658157629574a6ab163f61714196a0795db70e69185aafebf91ce252861934996e10b3d0163d2d366ce65cf8235be94fc579a790b04b2a9a95bd38073df2 SHA512 cd9819f4492caed56aea60c1d55b19f78ae338fe79700f0c17bfa819ee895faad9fbada396d06362f388de0e76616dfb3d86f0533b95913603d240e8c1139119
+EBUILD gnu-netcat-0.7.1-r4.ebuild 808 BLAKE2B 1ed69114e472c8e38641c3ef8dadb509d8ba541dd85defc42fb5390d40f942f69d96e11aae57161a886310aebc731cb2d0a2824f11fbed7e9ebd30ce03ab022a SHA512 88cee294f6ad2f0792e760c0397b02cc73b88eac0af1f6bc77b315683ef6df01244736e0efc23ffe5793c8f9e1b516abeb98269f52a4d95dc761d39ca7fe8aa9
 MISC metadata.xml 425 BLAKE2B f13edbb0cd292574b75df3cffd4f9786d267eee4525c839ba668947df28cdcfafa5a460decca9a2deeafbdd6956c8c2af416bed862ffcb43b2f980a54c7f2ea1 SHA512 a2cbcf2da6524c0ce77c0961511555cbcc36adea879aeb0aae82e973827b34e2b3d9f6d78317262bd4b0e07726316fd36055024dd36cd228edb384fe27d84a85
diff --git a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild
index 475dabd261a7..836745b08346 100644
--- a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild
+++ b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/netcat/netcat-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ppc sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nls"
 
 S=${WORKDIR}/netcat-${PV}
diff --git a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r4.ebuild b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r4.ebuild
index f71fcffaaa0b..3685ef0208f2 100644
--- a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r4.ebuild
+++ b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/netcat/netcat-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nls"
 
 PATCHES=(
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 52fd6999e5aa..ffc589b31824 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -3,6 +3,7 @@ AUX icinga2.initd-2 2682 BLAKE2B 613fdb4fdcef7c95bba710c5fcb6ee84dcb3cd739bf0caa
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5 SHA512 b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
 DIST icinga2-2.9.1.tar.gz 2193190 BLAKE2B 29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd22220c396efeb68759acc97938e3ee596e0820e3f6c8f73bc SHA512 1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533
 EBUILD icinga2-2.8.4.ebuild 4604 BLAKE2B 074505319ffdb68d93df79dbfe6c2a88a971b1a188e28526dd97e131d7494e6076173cbe9b8ee3599c7deecb62610f23828f0c107460555d47394d29f81eedbe SHA512 be570d2178c8750227b1dfb46c682a1805696fe9b46241f6ef9f59fa1e6ac9886d7e88cc14bcd5e094cd3671f49dfa1ad91046d3e08288b8266f888fde37a2a1
+EBUILD icinga2-2.9.1-r1.ebuild 4433 BLAKE2B aac55d84d5e6318524227b9477fa895d185d87dae43fabad5c0514580799d13f0f4d7c70bdd302333fb467cfdbfd77096ee99f9b15155d22c65c7c14be56ba5d SHA512 40a3f58a913c481d2e54550e7c9b6186f22542225fa069a06228d31a80868b6472ab7df1f5c5640eabcae9f70add5e3562084d27157505689980c0e8a5598331
 EBUILD icinga2-2.9.1.ebuild 4416 BLAKE2B 0e9e5c307089b8e9feab2ab66468db68e83fd8c7ca54cb4f72dd4405f5ab2879a0a1bb671ddc6abc5638fb2a49cb7f07fc600579889bea1a6fa6540265f7372c SHA512 81ccd2334931c16fed9a5544ace4f8310519c5634437765c7fc9b4ff769def9a7cb717fefb39fc838f7d19f56c5a282f81aad73e8ec5aaa707907266f8d73343
-EBUILD icinga2-9999.ebuild 4418 BLAKE2B e39976a335ad196bf86ced1de4153252390945f055f8f34868480ff4a1fb62a25c8d7bfe926d3a1b0d16fb769dd7c2dc1ea68697d9e835cc0f1d84863e003a20 SHA512 ef87d37438a867f64308895fa4fa77b73555898cc3913c6e054a799e3db1f71a7f0e8f999398daacbd222b25e8053fe2413be06037c8467b0882f3e5c685cabb
+EBUILD icinga2-9999.ebuild 4433 BLAKE2B aac55d84d5e6318524227b9477fa895d185d87dae43fabad5c0514580799d13f0f4d7c70bdd302333fb467cfdbfd77096ee99f9b15155d22c65c7c14be56ba5d SHA512 40a3f58a913c481d2e54550e7c9b6186f22542225fa069a06228d31a80868b6472ab7df1f5c5640eabcae9f70add5e3562084d27157505689980c0e8a5598331
 MISC metadata.xml 816 BLAKE2B 6d820358c90a580be01149ae631f40dbeb5f50ce0df937ac484269c9a58f21a450d3861dce3b34ee0882b3b61d981da8162af735c5a3de90bb7b74dae9523d08 SHA512 0d3ac2d9233f7ce53a8105caed0231cefa402861e26c760de3fb23163ea68c21b97f5ec0de65bc6953aaf2dd8fa90a9edc045a2fea8b622efdd1336959e9e60b
diff --git a/net-analyzer/icinga2/icinga2-2.9.1-r1.ebuild b/net-analyzer/icinga2/icinga2-2.9.1-r1.ebuild
new file mode 100644
index 000000000000..635111837e4c
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.9.1-r1.ebuild
@@ -0,0 +1,164 @@
+# 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:= )
+	dev-libs/yajl"
+
+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-2 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.
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	fi
+}
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index cedd09e7dce0..635111837e4c 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -27,7 +27,8 @@ CDEPEND="
 	>=dev-libs/boost-1.58-r1
 	console? ( dev-libs/libedit )
 	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
+	postgres? ( dev-db/postgresql:= )
+	dev-libs/yajl"
 
 DEPEND="
 	${CDEPEND}
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index ad4a98536722..b5af2356ee87 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,13 +1,16 @@
 AUX 99_nagios4.conf 368 BLAKE2B 147f4b73bd2f7d71dabb56f646399b939d3a87c288efed9b135e9401120e81c27e2a05f96982b62e601d1dd9b21be494e866103467a363336234b8b15095daf1 SHA512 f0b239f23d74afa89483806f27fb9259054e46bc5742de8a414c9a9a9852a4fbdc14db45aeb148a15288196c8f7d51bdd485b005e20d012892e9e7321b50e161
 AUX lighttpd_nagios4.conf 325 BLAKE2B f89b9d5aed8305d54f76adf29c65ba20bee74b6c82d149c8b0a786dddacc58c62337072691136c486d4050d1e3bce82420398d5f525ebc0bb36eefdf3a6a2e7f SHA512 a2f854713512ee8ee5c451235beb6ffccf2e04617a98619c6de807a5abca0a424e0581c34b4d255dcbc108e677e18bed25dd33e3d38df8fe10d7d8d4fab015c9
 AUX nagios-4.4.2-pre.patch 7936 BLAKE2B 143d1d80ae6d940165f5bff8e27deaee216f2a06b465968060b5a29da79ef2ec5277f3484c9b0774ad62284740b8513571e4df574c82acd03db341b6d5984d80 SHA512 0aa946192ab5f24b22f5c0737d8e2f5764317ee5e1ceab9d9c97b43eb2a4f3a8856c370d3a26d91ea9727b4e17f77876e790e399bf67a01eef3221c116a4558c
+AUX nagios-4.4.3-pre.patch 1479 BLAKE2B cc3f4b1e04f82ec97c5b15e7cb15defb7d700d776ee4faf0123d74afac998b8897796f77924e30e3dd1999d48f15b112481dd4bac4a6d5f5f01774881aad3b3c SHA512 fea7837f745efb85e64450b6cf3795cb011d3d5cf4d70e1e51b5037474f09943d94e2216839d9290fa8507176b14794c1028fd26d2c84f3259e728a3dcbca994
 DIST nagios-4.3.3.tar.gz 11101531 BLAKE2B 537d49ecf28b457fbc1e24eaaa9c5d9e8c4db59ed69c91a573c0cacb6cfb6fd2d52c31e87c0cef34b81a69247bb5b9513983d95e7eae3ea7f861742da485d2d4 SHA512 588292a95342cb2d95d7b58f70442b82b99a23dd9fdc1390e9ae0743626a047e5127d77b1d7e6a1d8edd6f34a425e581bcd42459b673a0ddea14125bde4b7d9e
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820 SHA512 f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
 DIST nagios-4.4.0.tar.gz 11295727 BLAKE2B f89e7934b13814ec8c0ae7a19f14eed8842c7b0044fb2812f1399f27a82e5a639b63cc53f04b58ae99aa87bf595b2e25642ad3eb134a041e39f744919bd46d2f SHA512 8c136463133cf26c756ccd39b158ed417297e30f8a0b12d063a4dba6a43f126b27bb5f7ea962c8cde9fb9c1fd8d3439d7cfeaab833045315a9800c993fa0676f
 DIST nagios-4.4.1.tar.gz 11296403 BLAKE2B fdbaec5f913d18d5591f44cd1e0622b9741d7415b591f24f1521f2897b8a1bdbff00e9378ef6b3a6a99ab8d639960abd3d734fd66b665ea88ea1de169b552ace SHA512 d84f22a8fd21a573b4162f232c3a6bb2ba0b7d3a470e5fd80183a1862d2ae666956cfc2dd4c7fe6319ee7ccedb9f8a6920ba39a6b499ed9ff5b8be60a9779fa9
+DIST nagios-4.4.2.tar.gz 11301454 BLAKE2B 1b5ffa775bbf147e96d07edd36a387db271802d58cc1a1d1eb867645955aec0044e757785578a60c12549bd4e66e4c95ef06dd0f3f8be3599187d0ef0bcc8a4b SHA512 a6ddb2d8ca1c523d02659a2af0b9c67a3802893c946279bb15be53645dc64c997cd5562b77eab9dae03e756ec6622a9a641f7bd68269aba4ddd56ee21f50959e
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
 EBUILD nagios-core-4.3.3.ebuild 7467 BLAKE2B f337eabcfbd918295f437ec735917fda59e0695ee2a6800eea4a15d9f49b1fb63ee135498c8556c0c1a545f7ff0f0141abfb2080a605f19928a5036cac1fdfac SHA512 250b84f3b417756fbb9034af2a909c94c7c2ec7e1539f66590f84b4ff3735314d403b8b6496880c9e0aee2f4052dd7d7829779d1fc4ae78e01f53449abe206ab
 EBUILD nagios-core-4.3.4.ebuild 6642 BLAKE2B c0791a70440fc8cacdd1c84a5d7e2789316554344d6b26654d8595664fdf67a67e2e278c690c666632995f3abcbca920ff612ca34862fe7a34ca69c35c8dfe1d SHA512 8309de23dfa46bb1a31e70c0f28b2d7c2e6719d8d1e0ce2660298d530d1123978814612dfdb9a56103d1209bea9477b4fb81df3c623f6bf8d07a7419a28d4ae3
 EBUILD nagios-core-4.4.0.ebuild 6650 BLAKE2B 71f116cd32789faa2bc1d4cbccf4042043da69dd26c1c561af86cd56a58c0ba5f48e84b2fa50c01a90bfd696787656921793079c97422a336a0483cba556f34a SHA512 701adbe2152b67cde427b279d201bb157d8c700a3457bb45eb50853185e0612b99a385e384b4c6ca0b9667bce68a6dee6b57a47dedaeb4db3398c49b95a06104
 EBUILD nagios-core-4.4.1.ebuild 6701 BLAKE2B 9fbd08043bbe2c31effaa3d01c45bee3d6b485e9d12890ac7463a0859cbbf6c61fe5732a32e33493c2db97c2bde3c8d15b25f1ce175dd72141d9d7d91e47dbfd SHA512 e2aabed02bcc285cfc8e0f117dc59f87c13f14eb61e2ac96361e746a44ce2da856c2af724f7470d58d7976a62df7df8835e383c2e35f17f22ef31abbdf978070
+EBUILD nagios-core-4.4.2.ebuild 6701 BLAKE2B 26c9c3ce190bf218341628e77932e3f8370661db3ae8ea203fdeb91e547792c636f5e5f5ea47bd0da835d3f63663441a0454f3fa4cac4fc82edfcbc8680f4153 SHA512 db1278c25750b93707362b2438e8677929f0a3d24e8ad36f687616758c442aeb9a4396497522b1dfd4e81c64c44545e85c3c4744df05c72bec34669933bff98d
 MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b
diff --git a/net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch b/net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch
new file mode 100644
index 000000000000..3c5eb030547c
--- /dev/null
+++ b/net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch
@@ -0,0 +1,42 @@
+diff --git a/Changelog b/Changelog
+index c695bd54..4c348894 100644
+--- a/Changelog
++++ b/Changelog
+@@ -2,6 +2,11 @@
+ Nagios Core 4 Change Log
+ ########################
+ 
++4.4.3 - 2018-XX-XX
++------------------
++FIXES
++* Fixed services sending recovery emails when they recover if host in down state (#572) (Scott Wilkerson)
++
+ 4.4.2 - 2018-08-16
+ ------------------
+ FIXES
+diff --git a/base/notifications.c b/base/notifications.c
+index d4574c41..58ad140f 100644
+--- a/base/notifications.c
++++ b/base/notifications.c
+@@ -591,10 +591,6 @@ int check_service_notification_viability(service *svc, int type, int options) {
+ 		return ERROR;
+ 		}
+ 
+-	/***** RECOVERY NOTIFICATIONS ARE GOOD TO GO AT THIS POINT *****/
+-	if(svc->current_state == STATE_OK)
+-		return OK;
+-
+ 	/* don't notify contacts about this service problem again if the notification interval is set to 0 */
+ 	if(svc->no_more_notifications == TRUE) {
+ 		log_debug_info(DEBUGL_NOTIFICATIONS, 1, "We shouldn't re-notify contacts about this service problem.\n");
+@@ -1501,10 +1497,6 @@ int check_host_notification_viability(host *hst, int type, int options) {
+ 		return ERROR;
+ 		}
+ 
+-	/***** RECOVERY NOTIFICATIONS ARE GOOD TO GO AT THIS POINT *****/
+-	if(hst->current_state == HOST_UP)
+-		return OK;
+-
+ 	/* check if we shouldn't renotify contacts about the host problem */
+ 	if(hst->no_more_notifications == TRUE) {
+ 		log_debug_info(DEBUGL_NOTIFICATIONS, 1, "We shouldn't re-notify contacts about this host problem.\n");
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild
new file mode 100644
index 000000000000..cb47956dba4d
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs user
+
+MY_P=${PN/-core}-${PV}
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="https://www.nagios.org/"
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+	web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+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
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+# sys-devel/libtool dependency is bug #401237.
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi
+#   * mod_cgid
+#   * mod_fcgid
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+DEPEND="sys-devel/libtool
+	virtual/mailx
+	perl? ( dev-lang/perl:= )
+	web? (
+		app-arch/unzip
+		media-libs/gd[jpeg,png]
+		lighttpd? ( www-servers/lighttpd[php] )
+		apache2? (
+			|| (
+				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
+				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
+				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
+			|| (
+				dev-lang/php:*[apache2]
+				dev-lang/php:*[cgi]
+				dev-lang/php:*[fpm] )
+		)
+	)"
+RDEPEND="${DEPEND}
+	vim-syntax? ( app-vim/nagios-syntax )"
+
+PATCHES=(
+	"${FILESDIR}/nagios-4.4.3-pre.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+src_configure() {
+	local myconf
+
+	if use perl; then
+		myconf="${myconf} --enable-embedded-perl --with-perlcache"
+	fi
+
+	if use !apache2 && use !lighttpd ; then
+		myconf="${myconf} --with-command-group=nagios"
+	else
+		if use apache2 ; then
+			myconf="${myconf} --with-command-group=apache"
+			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
+		elif use lighttpd ; then
+			myconf="${myconf} --with-command-group=lighttpd"
+		fi
+	fi
+
+	econf ${myconf} \
+		--prefix=/usr \
+		--bindir=/usr/sbin \
+		--sbindir=/usr/$(get_libdir)/nagios/cgi-bin \
+		--datadir=/usr/share/nagios/htdocs \
+		--localstatedir=/var/nagios \
+		--sysconfdir=/etc/nagios \
+		--libexecdir=/usr/$(get_libdir)/nagios/plugins
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) nagios
+
+	if use web; then
+		# Only compile the CGIs/HTML when USE=web is set.
+		emake CC=$(tc-getCC) DESTDIR="${D}" cgis html
+	fi
+}
+
+src_install() {
+	dodoc Changelog CONTRIBUTING.md README.md THANKS UPGRADING
+
+	# There is no way to install the CGIs unstripped from the top-level
+	# makefile, so descend into base/ here. The empty INSTALL_OPTS
+	# ensures that root:root: owns the nagios executables.
+	cd "${S}/base" || die
+	emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
+	cd "${S}" || die
+
+	# Otherwise this gets installed as 770 and you get "access denied"
+	# for some reason or other when starting nagios. The permissions
+	# on nagiostats are just for consistency (these should both get
+	# fixed upstream).
+	fperms 775 /usr/sbin/nagios /usr/sbin/nagiostats
+
+	# INSTALL_OPTS are needed for most of install-basic, but we don't
+	# want them on the LIBEXECDIR, argh.
+	emake DESTDIR="${D}" install-basic
+	fowners root:root /usr/$(get_libdir)/nagios/plugins
+
+	# Don't make the configuration owned by the nagios user, because
+	# then he can edit nagios.cfg and trick nagios into running as root
+	# and doing his bidding.
+	emake INSTALL_OPTS="" DESTDIR="${D}" install-config
+
+	# No INSTALL_OPTS used in install-commandmode, thankfully.
+	emake DESTDIR="${D}" install-commandmode
+
+	if use web; then
+		# There is no way to install the CGIs unstripped from the
+		# top-level makefile, so descend into cgi/ here. The empty
+		# INSTALL_OPTS ensures that root:root: owns the CGI executables.
+		cd "${S}/cgi" || die
+		emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
+		cd "${S}" || die
+
+		# install-html installs the new exfoliation theme
+		emake INSTALL_OPTS="" DESTDIR="${D}" install-html
+
+		if use classicui; then
+			# This overwrites the already-installed exfoliation theme
+			emake INSTALL_OPTS="" DESTDIR="${D}" install-classicui
+		fi
+
+		# Install cute Gentoo icons (bug #388323), setting their
+		# owner, group, and mode to match those of the rest of Nagios's
+		# images.
+		insinto /usr/share/nagios/htdocs/images/logos
+		doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
+	fi
+
+	newinitd startup/openrc-init nagios
+
+	if use web ; then
+		if use apache2 ; then
+			# Install the Nagios configuration file for Apache.
+			insinto "/etc/apache2/modules.d"
+			doins "${FILESDIR}"/99_nagios4.conf
+		elif use lighttpd ; then
+			# Install the Nagios configuration file for Lighttpd.
+			insinto /etc/lighttpd
+			newins "${FILESDIR}/lighttpd_nagios4.conf" nagios.conf
+		else
+			ewarn "${CATEGORY}/${PF} only supports apache or lighttpd"
+			ewarn "out of the box. Since you are not using one of them, you"
+			ewarn "will have to configure your webserver yourself."
+		fi
+	fi
+}
+
+pkg_postinst() {
+
+	if use web; then
+		if use apache2 || use lighttpd ; then
+			if use apache2; then
+				elog "To enable the Nagios web front-end, please edit"
+				elog "${ROOT}etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\""
+				elog "to APACHE2_OPTS. Then Nagios will be available at,"
+				elog
+			elif use lighttpd; then
+				elog "To enable the Nagios web front-end, please add"
+				elog "'include \"nagios.conf\"' to the lighttpd configuration"
+				elog "file at ${ROOT}etc/lighttpd/lighttpd.conf. Then Nagios"
+				elog "will be available at,"
+				elog
+			fi
+
+			elog "  http://localhost/nagios/"
+		fi
+	fi
+
+	elog
+	elog "If your kernel has /proc protection, nagios"
+	elog "will not be happy as it relies on accessing the proc"
+	elog "filesystem. You can fix this by adding nagios into"
+	elog "the group wheel, but this is not recomended."
+	elog
+}
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index 9817bc1b49cf..685528aa09fa 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -2,4 +2,5 @@ EBUILD nagios-4.3.3.ebuild 393 BLAKE2B 9698b8a0efcd6930c84611cb9aee6a792dc155592
 EBUILD nagios-4.3.4.ebuild 400 BLAKE2B fbd1d3c6d07c27bae1f9ebe45385f5c02797e85c557b1ea2276de7a211cb0afe4edb7589e6b492d466daa66906cf14ce4cb73fccdd3915ce99a4f861a1d24e01 SHA512 e766f3e115adb6e8c1ad8e490b107d8dfc1d8125e7290ce854332198f49d9d2cf0ee7adc5c9091250b8ca2357dc1f48e875fe31e7f0b811b4e631e79cc1efb93
 EBUILD nagios-4.4.0.ebuild 400 BLAKE2B fbd1d3c6d07c27bae1f9ebe45385f5c02797e85c557b1ea2276de7a211cb0afe4edb7589e6b492d466daa66906cf14ce4cb73fccdd3915ce99a4f861a1d24e01 SHA512 e766f3e115adb6e8c1ad8e490b107d8dfc1d8125e7290ce854332198f49d9d2cf0ee7adc5c9091250b8ca2357dc1f48e875fe31e7f0b811b4e631e79cc1efb93
 EBUILD nagios-4.4.1.ebuild 400 BLAKE2B fbd1d3c6d07c27bae1f9ebe45385f5c02797e85c557b1ea2276de7a211cb0afe4edb7589e6b492d466daa66906cf14ce4cb73fccdd3915ce99a4f861a1d24e01 SHA512 e766f3e115adb6e8c1ad8e490b107d8dfc1d8125e7290ce854332198f49d9d2cf0ee7adc5c9091250b8ca2357dc1f48e875fe31e7f0b811b4e631e79cc1efb93
+EBUILD nagios-4.4.2.ebuild 400 BLAKE2B fbd1d3c6d07c27bae1f9ebe45385f5c02797e85c557b1ea2276de7a211cb0afe4edb7589e6b492d466daa66906cf14ce4cb73fccdd3915ce99a4f861a1d24e01 SHA512 e766f3e115adb6e8c1ad8e490b107d8dfc1d8125e7290ce854332198f49d9d2cf0ee7adc5c9091250b8ca2357dc1f48e875fe31e7f0b811b4e631e79cc1efb93
 MISC metadata.xml 1110 BLAKE2B a3577be74f7ae7da47c1add86da6b9cd2972ebea1e4e4241886027e7c4aecb936ffa776a32bcc0b77498c393ebb4c81aa9a98a3c8d45cbd5556f8b9014384e52 SHA512 7614b25879899b4939a136de6cd4cbd3995372747e95d2d6b90ccd8e074800b6acb738df5f9c852625c34f5a72c3072c0dec910266068ec8a72184f75aa204e1
diff --git a/net-analyzer/nagios/nagios-4.4.2.ebuild b/net-analyzer/nagios/nagios-4.4.2.ebuild
new file mode 100644
index 000000000000..a29da55bee71
--- /dev/null
+++ b/net-analyzer/nagios/nagios-4.4.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The Nagios metapackage"
+HOMEPAGE="https://www.nagios.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="~net-analyzer/nagios-core-${PV}
+	|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )"
diff --git a/net-analyzer/netcat6/Manifest b/net-analyzer/netcat6/Manifest
index 6b7a123b57e1..27bef5200d0d 100644
--- a/net-analyzer/netcat6/Manifest
+++ b/net-analyzer/netcat6/Manifest
@@ -1,5 +1,5 @@
 AUX netcat6-1.0-automake-1.14.patch 428 BLAKE2B 3ed473a4287f51ea22aa96a9155ae3bfb6883dc44258d569510667f0aaed0a632a7092205016a887bc53652e33d08a793c19d3cc85fcffad01853c39ab9e9e77 SHA512 91aa92162b379632318e429853382c0e73d8c37ac73fce91975dcc7340705435e5832c4fa7a185a1ad3f4c7b492a256fe08e8233da4bce963969325983f1e473
 AUX netcat6-1.0-unix-sockets.patch 8039 BLAKE2B 24ce41cc8d12280d4a06662fe3a2c2801f5a33087578eab27fed05bc8d4fc9a276057483de304ef78f28f2c89a48673ce670d9b819b86a2d763515d79cb41725 SHA512 2fbbbb4bdabada521d9fb33ad545459a03a8b443387a490a07a8bcd403817650a2f2cfd73c8a4e8e8fd02d1f5c0bd8a045ecd31ec5ffbdf5d22e0c1b758b12bc
 DIST nc6-1.0.tar.bz2 264257 BLAKE2B 2e9ebdfb45246b8cbfd8515e51ab3262593425f98d1eec623dd21932d48a6bd200d537d3e326e3122835a3a18584c19d1dcc43118ba34d9a21cb8505c8510d3c SHA512 199f3bd18bb452544da8ca1b0f5347f79662bea81e9af335a41ed62c12d5d8cb41d99442ca54f301538d27aec4ada5f59db87461e5b0f20333ba1b52859bd35a
-EBUILD netcat6-1.0-r2.ebuild 1127 BLAKE2B 9e734891351bdc619cf67a963138bf8d98939a00b6c34c2312d87ae7c616972823ceb8a9ffc9695fe24bc360dd8cc20962774db3f3d43b06e925af16ef5ece6d SHA512 4f0d32dae23c7ea1da0dddf5400d5586b04d73e98d0b18a3e4244adcc81412147d5403ecbe87e599ef7b9b07ee08a0a295f278a147ead8191a7b5a5c08b2eb22
+EBUILD netcat6-1.0-r2.ebuild 1116 BLAKE2B 6e755a729b79bc818f20d6a570064ad514d9518e5d0a8e11260aae45f6cdc5b5fd0a4b711991cebbdbe00a47cd97ee5689796c41474d82008a9825132b4e4931 SHA512 d9b45dc911fd2dd14c5d533f29aa73655af08b6ea0874582cf3c30ea7c51a5b9382583b63b546ea0867e90d70f2007c3fb4cb261c23b7e8bf4eb81ebd8b46cfe
 MISC metadata.xml 357 BLAKE2B 775c1871988fa11fb08eb8d923a2f7119a9cdc4e6d1325b0bba5408e7ea51268687661d46fe3a4a45aa265bf30783edb42cc1b0ae2e1bbf15738e0907a8df3e6 SHA512 a5b578146dd743e567e6edceda335342e825a502c0ccabd25597c8c0bc0f8cea6ed662547af284ac6e28da05822f95ac4087411d93d503822379cac49118a6bb
diff --git a/net-analyzer/netcat6/netcat6-1.0-r2.ebuild b/net-analyzer/netcat6/netcat6-1.0-r2.ebuild
index f325cd1cdc2a..3843aaecb781 100644
--- a/net-analyzer/netcat6/netcat6-1.0-r2.ebuild
+++ b/net-analyzer/netcat6/netcat6-1.0-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 nls bluetooth"
 
 # need to block netcat as we provide the "nc" file now too
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index ff7819b8142f..d36813ff47d7 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -9,6 +9,6 @@ AUX nmap-7.25-no-FORTIFY_SOURCE.patch 2258 BLAKE2B 28e3dbd2d2ccac4d01fc640377fd8
 AUX nmap-7.31-libnl.patch 498 BLAKE2B 15ba0015ce0c5f266adf1f6b53ad99db82521a3ef8b226f040acc4f0f7759af762fafbce2a1820675e55e04d6b4dfbe04f67711d3fdd1e9dabd750b200ef9d3a SHA512 e7047faaac2bec6c8e0aaae04cbc6e97a8da7999fbb1a8ff015a78ffafe3ce645b71746fd6da826e3ad9baa8d8a917d3791836e67a346dc9c1ca6678cd04e7c8
 DIST nmap-7.70.tar.bz2 10467371 BLAKE2B 53d751773851e45fcfa7604f8b325297f429f525bafdef91e7f693b9a9876ddb23e978c50821776b64764adb5bf36e759042cac3254bdbf36bff7048dfb6f58d SHA512 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5
 DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3
-EBUILD nmap-7.70.ebuild 4528 BLAKE2B 9f880f05a7525b9947cfe40fe917eee7efde39bce1aca35dd9359161aa9e4ced9b7b731e280e3999da48309fd96f8102f84b2bc77660906a07369ed54d47ecbe SHA512 4f5ae8693eb6634f4eecab9eee36ca04d1d37e52d7009c5eba06f4394ad3ad0a1ff824db2035a573fb687e899f7abf367a32928e274438351878ae017c72b99c
+EBUILD nmap-7.70.ebuild 4517 BLAKE2B f75af2eebce015967a3d99714eb1a743f91ac10382b3934996c14c55ba8cd6e95ab5d15075701f82d159dbfe364154ad098b9bab1c87870bab3be86edab9e06d SHA512 5ebcbf15de1f26b964f08564833946807b16bf1141d2cc733a86a440efecb58f0c10da563f2f0d20b353e9b96e10993f6ccc38d7af70ed977aa8d30c5bd9ca24
 EBUILD nmap-9999.ebuild 4315 BLAKE2B 7d83887400200359844f202b29e30cb358a6c35a35f23754c69455f1807fdb9e1e6739f856d5e575058a01b9f0a4686a83602e53f3d202d80fcd33e636264141 SHA512 c9b708642cf84cc3caa3555085779ae3f3d93a575f07b033f5e562ed2dd3bc4f94f17f27244a4baf5b15b98ebafa1432df292d11c991a357fed65d21af2def18
 MISC metadata.xml 920 BLAKE2B c07add545e072588022e15d9de0595f1924fe10fdbec7a11cd401429a76a56ee0a53e4675b3e784f5e2e44372f531073cbdc3da717e4a7f3f906b5c1987530d8 SHA512 56d44c71139e48b75a89140bedd2c4a1bc20c8fe99e16ee8b71fb490cb606997571de95d6ac93147bdee81bbcbb736588c87c43b9cd4f9fac71280416a499185
diff --git a/net-analyzer/nmap/nmap-7.70.ebuild b/net-analyzer/nmap/nmap-7.70.ebuild
index 40fea0e3b9d3..692e3cb12908 100644
--- a/net-analyzer/nmap/nmap-7.70.ebuild
+++ b/net-analyzer/nmap/nmap-7.70.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="
 	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua
diff --git a/net-analyzer/p0f/Manifest b/net-analyzer/p0f/Manifest
index cf0fb088589e..57edaf1c3006 100644
--- a/net-analyzer/p0f/Manifest
+++ b/net-analyzer/p0f/Manifest
@@ -1,3 +1,3 @@
 DIST p0f-3.09b.tgz 92896 BLAKE2B 5db3fe335c1dd3fedca5c007e8a133ff7327189c640ec6bce254ae7b1e6fe5729acd39d5a3d507e286742ac0b7c7612eb5aae452d60ab0e737cb05b0191ffbbb SHA512 2a688baa865f27c91c023a7c53e530649f56a681e6ca2533152ab07b42883857b20c378b636e87dda8d1d5dfac17e426d09ee032b363d0b7d98e57a9ff6164d0
-EBUILD p0f-3.09_beta.ebuild 1125 BLAKE2B 899bda89104c6f135d8c74b36706a7a9de6b683640d2f98b0c1a51dd2834afb59343c7669b62a597aa9a6e19fddb702592c23ac06e276af26ead5732f1a3677f SHA512 7ff25df174c07e974d09a8eec6a691c753d65ac0e4e74c00f415747bb4e5b8ae3fe8c069fde21a3ccdb7b42d3d0ad13ef6c1a8aab44170279deba25a46e24732
+EBUILD p0f-3.09_beta.ebuild 1114 BLAKE2B 6f3274bd5d51a391a069c44e2fe13cc2d5661a45872b2dd35f6b1f2104e2c366cbd4ded0711b3a33f122bd116db5edd8e6a2139bd6a1dab6f10651e4052b3e3d SHA512 f21bd79fae2c4aeb6c4c07fedfcde224d42b32d9d69e91efcdfe6ef8eccc300e34db50748425418f8bd8d19d9c944461d6f8e3f30dc7626945fb2ddda4bd2498
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/p0f/p0f-3.09_beta.ebuild b/net-analyzer/p0f/p0f-3.09_beta.ebuild
index 192d999c2654..68db0781a828 100644
--- a/net-analyzer/p0f/p0f-3.09_beta.ebuild
+++ b/net-analyzer/p0f/p0f-3.09_beta.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://lcamtuf.coredump.cx/p0f3/releases/${MY_P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug ipv6"
 
 RDEPEND="net-libs/libpcap"
diff --git a/net-analyzer/sec/Manifest b/net-analyzer/sec/Manifest
index a0c2b4eb3608..e4f4d683c640 100644
--- a/net-analyzer/sec/Manifest
+++ b/net-analyzer/sec/Manifest
@@ -1,9 +1,9 @@
 AUX sec.conf.d 352 BLAKE2B 7324f809c3fcadaa3755994ae43fda4ff7b9df2282fd68e831de3a798f62c99f3e986829ac42ab92e4698ff1e50e447c427140cc5eb18b0d1b934f27a9214adf SHA512 204fb6f95a8f4d2a4680a1a2493e52d394dece4fe349ac6604d099db701c6aa2f9464109c1bae80f7edaebebd8bd8c2b3b7412c304d5d203fa62d73f231492b9
 AUX sec.init.d 693 BLAKE2B c8c9320d9eed23c576ead743444bbb2f528bbb7ca6ef5511a7ca86f272206f0d93b3f9984813382a2e4063b0cf0bcee0f3c2ccef1c7cf48c7bb6e535f65738f6 SHA512 9f079d629e21d20e16b4455d6b6b3279a56c0979abdcc90a8b488cae5225cdef4f7d95374b7e5b623196f06d91f2bd3c50691e787b40c90cbe34b478d8b37952
-DIST sec-2.7.11.tar.gz 134533 BLAKE2B ec50f1d4c930f17aa64f1de57a1af54867da6e189b3a36a979e87502ba4366d419a8f8e8d03df799a278833667294890357d9a6a92b41c0b8e975b1b5ab8928f SHA512 2de3c131f85029a91e7db1405be236b8ef31454bdffa28d5a2f912af73a2d0b0fbfb37a2f1548f7899ae3c43248e9c20084b7cb55a6b309c00d103d8b8019e80
 DIST sec-2.7.12.tar.gz 134197 BLAKE2B 9997788c61a35c87036e6347c93782aacdd34e4cd3f6ec5d457a571237d5594b3f7860ab7be4ef37638c2dc1b22f7de666bdd287ae634d8ab259e0c0dd04d8bf SHA512 927ce602057c58993d7abd0aca0a7cde7ce6f77af01f72a414d165b93326a8e0a12bb5bc8c1f8d7737416beb16de92911db5ea20a8109e343e2e26e8efc649bd
 DIST sec-2.7.6.tar.gz 121621 BLAKE2B 43dbccd05aa274459ba8746c8aba33bae0307929524a9ad77087a6c28305b2f0b7d34f9cb79b7503d2269b84524687b24441263ee99a7061c0e033e15e4b9f01 SHA512 9c050b89970663784f5c149d46c6c6ab941590ef4300ca09ea35b347b2eaa3bad12083bd6e619f25d5024a35de69e020c354b507ac49e3faef1013336ea2d5f5
-EBUILD sec-2.7.11.ebuild 588 BLAKE2B 125a5154eb4d9a5da32180d28946e41c4f0011936f4c57bd833a03595f89ccc96d1f79fac079802225b8426983ec84faf803f670dcebd0023c190ef7ed72d4d0 SHA512 6a81a8daa5835d4dc20151ec69bb97d2020b6b341ea9329ce41141e48b87cc5d85e932651dfdd8bfebacd4034ca32e891c60cb55999831fdf97f59b7ba530d99
+DIST sec-2.8.0.tar.gz 143621 BLAKE2B f547635ee42860b6e9caa2d2a0604e91d3ae5c0846e10d5c9352650d822d9e2d884892c455b9cef3b39e649258720f4761055dd78d74ec6c6be4455438a4fb60 SHA512 e0a4bdc07c80ef6b061b20d4b444ff8dc406a63cf48a77defa3563d6980f5b5bc9f6ff8d70b2ff51e9f40955655ad3c750be5a01726a848b80a84aec0d6d1bad
 EBUILD sec-2.7.12.ebuild 588 BLAKE2B c2ddde9713b7dce5df0adaeb529234b6b5a6e721799c0a50d6735b871eb7035f6196ee0501c9406dfc777825c379efaef0bcaa12a21d7f62324f820b6ec1de1c SHA512 a9d7f07089fad6109027d235cda4ad0e884903446abbdc8b7044e61ac1a9f592d1ff1bf491e6b40e27f746e1dd5635eff85a029f455dc69591c8610adfe3e1eb
 EBUILD sec-2.7.6-r1.ebuild 586 BLAKE2B e3bde9b861cc02de2581baf734db4010ebbee161112761bec720b29c6c8adf4edec9cb5ebe91f601ea0b7ff1192275de33bb9c39a540b83613dabb56927d49eb SHA512 4034915b115742ecb4af7064d5201b307a130d9f5f0c81d4d4c4107b144bc46de592cc01c391412e6c1e42f457b51d44abda67753f47856cd2ae3ea065b78b6d
+EBUILD sec-2.8.0.ebuild 588 BLAKE2B 5772d21353eda48ebfe7b4b3eb6ae773e9dd0b17a24e9e43bd40a6ddfdeeb60816a346b977d33956edbbeba1cadd3635f56c028a97cf0e2f8ee717332658c0a8 SHA512 5e0df4741d9983809aef22e7402ebdd8ea873bffdd87ba25eabc004263861699b829b2be6069052b7cfc725543699c4c1c01cd255ab3618f3833b1fb024fa37f
 MISC metadata.xml 420 BLAKE2B 29fa29df871421f64c8830bb568810b3a5247096ddd393276fa1fb0ae6f935f89c60ff4aa98a38ce5f3360d1974e454ab82f86c0a6e92c3f587140abbc0a6326 SHA512 328ae47d44a57623e92e4a03d1877898d18088aeca6998d4d5a827688e8f449337668e83ecb93ba4d74a011f5b19f8862e59ca657246a5e85a6749c19f0c7dab
diff --git a/net-analyzer/sec/sec-2.7.11.ebuild b/net-analyzer/sec/sec-2.8.0.ebuild
index e109badd5d25..e7f3b225461f 100644
--- a/net-analyzer/sec/sec-2.7.11.ebuild
+++ b/net-analyzer/sec/sec-2.8.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="Simple Event Correlator"
 HOMEPAGE="https://github.com/simple-evcorr/sec"
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 695cf2a3bc91..52aea4c6a8a5 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,4 +1,4 @@
 DIST tcpdump-4.9.2.tar.gz 2298386 BLAKE2B b7e90d1091affa6f4734a622f23565976b0cb5be8c0afa12656f52acea29384306f2875477dc180b5dc60110a57e0f30f5654ba27dac9f03ff610ca0548de0a7 SHA512 e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b
-EBUILD tcpdump-4.9.2.ebuild 2085 BLAKE2B 446e89b171d3eec3ecb3db30576939004664214889c74ebfab6d4924a9e036823fbf575a0cdcee3d7da102a864db6848b949eaf963489f26f166cd88c2d108d0 SHA512 3dcc26ee312c4be33465c8fb7d33f1c8931d9b369e36004499f7bab8363dcbb86599a1ca44b65ec9a28d57e356ae025ac35179ffcefbc846a9200c7f48b8b186
-EBUILD tcpdump-9999.ebuild 2213 BLAKE2B 7882e2bce5692484384cb06191be0235f00ac98083b54140849a83ac76682a6bd2406983dcb9d12dccb7fa898a967088f6b1513a8692ef5adef98e7a633d96f2 SHA512 ad832aa82cced2d7d893713b1bd26198041178283114a2aadc33399954931971a80546a7e66c5a5e4ea95f0b5e588de3ea1a13a136fcbab944fa330ab7a58b85
+EBUILD tcpdump-4.9.2.ebuild 2074 BLAKE2B 94a22e1acea10408c02fcca114547eba248491b0a99505ee369549c681e23e5a5ffa51f4dd43ba6ae2eaa79d0abc85f1f5c1f9a057a96c70189d47e9d98e0028 SHA512 48bd328212aae63dc3f0361352f93b29edb165cbbe12f7d92cc3588c9240e4584e5257bda6adc52872b271e72dfcd65cbd78d79b1faf86b76088fe4f3244376f
+EBUILD tcpdump-9999.ebuild 2202 BLAKE2B bda2d7229a0da196d4a16b263cea1b3a48197485e48118fa368288c8a1ed5138b0090017321528d22a56b20ab0fae177e9b798e7ef4e8d1c1cf41dc73d23d1e7 SHA512 c6a450a094a69fb62b9b742c1fbd63bd8fb30326bffc484f19e60c6ab7fe6e4ae2f0fd73b6330ddb4b825db3f919cd62b0a18e3f40a673d3250e7ff10a1991dc
 MISC metadata.xml 580 BLAKE2B 0769370fb4433cb7be15b66cbf8598298818b3ae024c534aab956afa695766cc77ec44041559547daac91a1b71d8427039137353497da9b8c6d8dbdb24c41952 SHA512 b8fd75f13c0993c8aa97e0c35649b4f11f992413f4dce8f737c28741d047bb36637b6c509139a046594fa788eb2932ee39a87046742372c63fe0bc6e037da49a
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
index 519175a1f4bb..250b25f46250 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+drop-root libressl smi ssl samba suid test"
 
 RDEPEND="
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 0d8200183ddf..5386a5f79cea 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/the-${PN}-group/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/net-analyzer/tcptraceroute/Manifest b/net-analyzer/tcptraceroute/Manifest
index c3bfb07c0c9a..83bd348b631e 100644
--- a/net-analyzer/tcptraceroute/Manifest
+++ b/net-analyzer/tcptraceroute/Manifest
@@ -1,4 +1,4 @@
 AUX tcptraceroute-1.5_beta7-cross-compile-checks.patch 1228 BLAKE2B f18640804c946225fed7324203c928062b37001053ac87a8f78c500b1bb6c65f3263650484f51ccf20b09bb8d1ce95f871b2ad53f8752154e0134b5e26b2e01a SHA512 a994d9d0dfd633fd9f091c77a0ca96b0b73dc9a7373631feece29fef3f3daeb38dddf7fc6fc829c64cb8eb3809d7e25d22f3c18d2202188df9d94ca237601815
 DIST tcptraceroute-1.5_beta7.tar.gz 119059 BLAKE2B e2d627c7fa96439e77be7d2fb5d57e0b92451367c95022876895fcbebdc0adf8c78b262e41ecb8a2696e8377e9862b45f2139cb8ca9d92a696d9a0dc319d4a64 SHA512 ad5588e62a56f1b5fa851b68280a88e66a900777fe4fd67587262245cd9da17b536b7dc972abe540fc124a93ac76abcabbc55bc32f9f8ee872d5df57b08f7222
-EBUILD tcptraceroute-1.5_beta7-r2.ebuild 953 BLAKE2B 29b4b17af88138274f3e1516fcf1fcb572f8fa7d511b513ff2ccaf810611a9f196a4c060af31dd018103c87c329a9ccdec00872f26c34a5a28d36f63c2d91f5e SHA512 6d58e44dd448e0733aa3c091684fd2405390abaaf193ed948d445e09e4a30c25272e92f98030df9b892968ca06151c2f4cb248c432dd50a01f8c0f097ddf4dce
+EBUILD tcptraceroute-1.5_beta7-r2.ebuild 942 BLAKE2B 54238e0e80eb89945dcb61701f7974f3b7294d035ee2ecc96b1f6c85e7eb3f14f04c3a3ed4a155f32f088dac6b240373351387ea053f5d4485ef78fcdc916d16 SHA512 42f277c577eb7161f5c62262536c5f50c2cd53cdddf55748924e67ac4b9e15d85c3ba04fa5446b88c207fe1dde12e0c5cba6107069dc2b5e4ea2ac943655df1b
 MISC metadata.xml 362 BLAKE2B 7e5066833673e1881f77a10c92f8ff281c050140a6a77154fedb4f469b99d6c53abbdb0a35702d5325e294f7acfe8b050254be7ffac4c3832455777c65a98cd5 SHA512 783a1867b40907e8704e19ec6d423f4db8a97ba683f64efc72ea7bf4e4157e9bf630470fcf8a0410d6fa9bc5cf63f810f1f577828bdfe1203f2f56e55458c7cf
diff --git a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r2.ebuild b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r2.ebuild
index d2c90c2dc80e..c3d71529138d 100644
--- a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r2.ebuild
+++ b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://codeload.github.com/mct/${PN}/tar.gz/${MY_P} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 DEPEND="
 	net-libs/libnet:1.1
diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest
index dcf525e1aec8..3fb086a7c3f1 100644
--- a/net-analyzer/traceroute/Manifest
+++ b/net-analyzer/traceroute/Manifest
@@ -1,7 +1,7 @@
 DIST traceroute-2.0.20.tar.gz 68907 BLAKE2B 0b80836fe05cad955f8d1a31ecad56f46b29f4710c949c43cac2f908aef551867f808672e3e750cf4b228a94685dca0032c3d2d3ed9d8d5982dfffbe824adbf4 SHA512 ba82468f5e52a14cf029ff977d85e9cc395bdac2fdf8c29232f9e664bf15efdbaca4f56a78533f2afadd3aef95e31d4497f00f4fc29f74a699a149f0434b484d
 DIST traceroute-2.0.22.tar.gz 69001 BLAKE2B 8678bf2636b3a0615e7282923ccfeae9c721adbecaecee1deff9324bdca8be26e9b821131f84e01411455806c07ded5bdb34b6ab64d4572ffef24af3cfd17c39 SHA512 f7981188b5aa13b6a6c26e7bb3b6cbab88b1adec53a04bff4b878f800bb32a62d82fa389fb36aefd81cc3e9da31740e095f6b6f7eba4dd5926520ad3cff7a92c
 DIST traceroute-2.1.0.tar.gz 71460 BLAKE2B 4c2126fa98625d525d0a1b0075d16a6ff37836e18d2ce8319f58c89bfa22a6a5e3bbe2ded22fa98d5128c7bb58578327db08120a5b78c1c4ff5673dcc0dea7e6 SHA512 3578007c734091ea0c906637c03fd133a8b0154fbf2e6b5c0c881184947918196bc03aeaf872d3bd53777b9b771cba5cf97f73fb5916bb53b75037f429b40ed3
-EBUILD traceroute-2.0.20.ebuild 948 BLAKE2B 59a753534f1a41d487d79540e2bd0233982fa06f671d4acf52bc03d50910b11e469d186f9bfc982ed5618ea5be6f0bee994ca3f345a018c6cddf9faabaa3e06f SHA512 d868c7d06c04bcd147a82f93de78cc61bb3833ffde4a9f0c970a86bad535bd63f8aaa29cde056cd529a5e784cff3b4efba22af326791ebd8e38824e05fa13795
-EBUILD traceroute-2.0.22.ebuild 899 BLAKE2B c9b830768018d0986cc808aab8008b18abe7832d403a03fed43c80a471e8732a89988c4039925d4111a9c9d90e9f812391809744ec36f6b89a8f28c666ad8326 SHA512 77968573ab9dde4236a9a4c5322738482a13be38457ed64602f51b3d739a5cbd9d17229da3a9f00cf8f955b161d773c81ef38d701bca0411eaadfd9a6e9faed2
-EBUILD traceroute-2.1.0.ebuild 897 BLAKE2B 027942b495d16c7ce07d0cd54ccb153d8903f785a8aca4d4aca79f975f411612c35046d895c1f4ebd3ac2ab84d941b7f97cfe987fca439dcbdcbb7c27a442d93 SHA512 ffb40681e258cfe2d6b579350ac84431421522012fa5135f5064d0b64b86362babe1c94fc391349718e4190e0fd98a96dc9d58cb0ee120bce826d1859abab847
+EBUILD traceroute-2.0.20.ebuild 937 BLAKE2B c725daf3511d8d24b2e3a49942944595529245483bcb981457911be9c6216dd1baaa3a13ef2bbb78c9647d6e232d3829e31739880cdff65666ea00f935f3fddc SHA512 7bdeef7eedc93e792e57e8c09d256e55bc0b7f9216035d174da66523119e57ae71eb5f9b8805a4421b0910a0a658c2412053f67999ed34d140e2b9d3c2a9cb5f
+EBUILD traceroute-2.0.22.ebuild 888 BLAKE2B af947b2e99b1d4d6ea9996c40b3aded90699a04583ee9fc56714650df3762812e7c7628ca611ded9f2d694fa30240ae9b8a03a85bf4fe574396597c0351b2fad SHA512 0c299339fa16328123c82428f339cb7b1b1ffb528d76fbe0795f10035eb4520c507901c67c32a68e08cf2d221dad56b68cb239f9dbecb99611c28f90f77a094c
+EBUILD traceroute-2.1.0.ebuild 886 BLAKE2B 52feca954820f9821cc4044e4a31f5630f4b355be00698a6524bd33ba34c681d19ba0d60d6eae778f42d0e84edf6460b76998364b82f111c84e9a4415b6f668b SHA512 160241c581f52cfbf4cd80635f50c30042f88fea9a1329ecd5c58866788de88c67551089b92b3c85d3aac126573a16c1f57c7de51627c902f92a7fea0471b70e
 MISC metadata.xml 437 BLAKE2B bbef3a65676e67e78b4f78846a46986a3ffc8b74bb73517795b4796b2865ee0ae4d6ecf99edb1a9b12dc97988cc51fb161dfb757e8ef449a3b46fa1eac5c8411 SHA512 928cbbbcefe88681f5f797616d8f8b4de75cf789157afa536a757e7e72f44b07c337105380816aa79713ec143c324ae16577351648357a77267b6625b962924d
diff --git a/net-analyzer/traceroute/traceroute-2.0.20.ebuild b/net-analyzer/traceroute/traceroute-2.0.20.ebuild
index 2591edda883f..ea1aac275119 100644
--- a/net-analyzer/traceroute/traceroute-2.0.20.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.0.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 RDEPEND="!<net-misc/iputils-20121221-r1
diff --git a/net-analyzer/traceroute/traceroute-2.0.22.ebuild b/net-analyzer/traceroute/traceroute-2.0.22.ebuild
index 80b2fb236062..521ac050e4a8 100644
--- a/net-analyzer/traceroute/traceroute-2.0.22.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.0.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 RDEPEND="!<net-misc/iputils-20121221-r1
diff --git a/net-analyzer/traceroute/traceroute-2.1.0.ebuild b/net-analyzer/traceroute/traceroute-2.1.0.ebuild
index 35d643119bff..b3ecb43d34c8 100644
--- a/net-analyzer/traceroute/traceroute-2.1.0.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 RDEPEND="!<net-misc/iputils-20121221-r1
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 1a4602beb9a7..f45211cfe680 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,13 +5,16 @@ AUX wireshark-2.4.3-libsmi.patch 7153 BLAKE2B 33b7237eb213fcb2aab0a9db9c28a22dfb
 AUX wireshark-2.6.0-androiddump-wsutil.patch 640 BLAKE2B 07e8bbb0a892d35fc58d63c6faff9b0aeb08ed0097be31b6dfa5335aedfb53c6d18768848c18f20ef3af47fb1299ec498b3386f5c25ee07153d03ef29d7d0986 SHA512 26f99d8abedf60ec590331bffbef14de59ef6581e70a098b5b93b264c7bfce7ad9208c3037b11d2477ab3a5e7fdb87ff401d759fb665dc078a075cf296a7a034
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
 AUX wireshark-2.6.2-qtsvg.patch 548 BLAKE2B a86981841b4bd76c429d68bb94439317c29404a8917ee8419b7f9e729e857a6dafb94c738f656633672f4f31a8a0e3ccc6a1946b6db3a15b27244cf5ab34a7e5 SHA512 08530766e3e3e3273847a7147303c0bbb0f2b9230e54f057fe4e266ea4f67d577d301a4c02e63d69bb5cdeaf0445466c906278ab76e636a0f2bb8a886eb21ddc
+AUX wireshark-2.6.3-docbook.patch 1457 BLAKE2B 8e0c940b522a9ec11781f594c30343a3b9b2b81b70c91bfe5afbf36b3e1a341374a7182bdb317a2738de5e0a1dbf98b709d19d2f339a305be9e46d8f2303c17e SHA512 181f259a6330204bde89ddf8bf8ea10a80b3c47c25eb252060acd820dbf8cca2c4b390af765fd174722e909ec7a9fd903245bcce1f6d7f82fecd3e26994bbf19
 AUX wireshark-99999999-androiddump-wsutil.patch 655 BLAKE2B 46ebdd2d22a5e7b0af061ae18e4bfaa6ba25c30353e08dbe146489d64c242cec4d80c261b4159d5581b6a8343d1fee7dc928a6194720daecfc4ae0efa5a8d47e SHA512 d3c79efaf922e4d018150281e73c5a40914019f6189baa8b097e88ac513ac80b0cdd560e78ff817bb4e69e3c5239190eac8c9adc0138d264f686c4924a680ef9
 AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f920221ca7ccf774702e8018f982e00318afbaac174d4e7ae961fefd448cc56dca6b7d0448a2ac99d1e5afacb61a37de0546ee3557e SHA512 a9794c5bcb1d288c113e84b03ac4f185e6fb7bccc16aefa3311ebd37aab7e9d5c715022f5b54032812ac2ab1244c65d9fd716c826ee27e677b011976f218f9da
 AUX wireshark-99999999-qtsvg.patch 900 BLAKE2B 309fa6d8f64962c2d255d6325b062e3adcbd8bdd98d25bd7d49d017375e4bd8a1d75cb4fe941f1f6f2785ef3b4a012309a59d12b562103a1d875e4d9d3f409a4 SHA512 a9df139cd58d8ddb84c019f1839087ccad63152102734e00191e2ab2191ae93c7b830121e5b3ad6efca5c26cd215f48f9e152045b37c17362adf2d7807af632b
 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.6.2.tar.xz 28392140 BLAKE2B 08fb59061f618494ee07ca19cd97ab2ebe7c483419c1932e185dd42a0fe2b6d0070834ae5b7aaea4981f6fbc4baeaadb7c9eee8bf32b823af77e753c468257ce SHA512 e39cd8dec44c8c64e5da25df0ffda529130541e5267fb0bdaa232fb4a4438c28ac5c9169ba17a37119d6cedf04a022b40da09f35f44a3739bdfb9486703f39e2
+DIST wireshark-2.6.3.tar.xz 28384004 BLAKE2B f275c73173fbaf3f819c58f28859362e9c53ae50cf2649ac42c8d172362241eb00d7f43d0aead184ec67cb8da34d405124be10c5bf31226c2cb4800b8a01955b SHA512 87e5335840baa401a1064ee83e3f0ee859c059dd37a09f63f19eb5d91ad273e84f1c0e7a8fdd63fe8a7076abff5e79593827544c5796d921cf7dc7682c7c3f80
 EBUILD wireshark-2.4.5.ebuild 7328 BLAKE2B 0c392be5f1d943074da911c0b5d04d3ffca7806f30ab940d8f9fda2bb59b8c9b671a73fb9b47aac73914d4ecb064f52f6714fb0390326a49a2d257a02a7da3ca SHA512 b4827cbf3d48400149bc3be3da2b22c691c8ae1e7bde646d3cc9b248e1c942b2038c98446678d4fdda7a1d9e1d30576861be77f5e36c90b085466a767b43be2a
 EBUILD wireshark-2.6.2.ebuild 6562 BLAKE2B 48ef5ef280cde587005a9c682612da089aabdb54a05a972387f82511e8576361ba2579aa017b15aaf290c638a3673b21fe7cca3e40844049b47e8529e26b230d SHA512 c2ee0bd193c80a3e1095c0aec53e37be72398e21aacf12ba200b742167ce6e5dff32b21a1e8b6e592f3eb22f9e2efd924897088511ed52ab4be631201a15177e
+EBUILD wireshark-2.6.3.ebuild 6605 BLAKE2B 0fba3d61b9d2c588dade85c2c56c5d9501698db7a856029cf0957e59496c90c4b3c6ffd364b9ac2a6c68453829f025a3e54e2e9006f47a82891ae6a09f940f9c SHA512 fc49a2b431dcf8e3e694069dd21e9148b94a8e30bad2bedad75256a33f345db905109d6d222cd72ac03d77eff7d5f2a6e58c3fc4f03eea953775048e12feccd1
 EBUILD wireshark-99999999.ebuild 6375 BLAKE2B 05637feca26d8c5cc2329b5a86a6bef9742e4470309ff569ccc23a9f1da56f30d9ae2bd16fa1862c5a21508d56b467cbf51cf4f3a31ce08894a7a06691284266 SHA512 4cfc11f50a4eddc08b7f526350752cf60bb016f0992f0bafe892ef834def88fe7915ff7d856c27c4d709c4e2d34ad9bd3d6ebb4f1e4e363e60c62b3706f07cac
 MISC metadata.xml 4787 BLAKE2B dcdb28c47094cfddc0effc4c16aa9132386f94d4d6e6cdb46f31a06ebb5dd7cd5c7bf967f50c6a002b7aeecddeb8aa8b86cb5961405a463c10389d6ec9b5cb7f SHA512 b683b159266bc37471ef26f6c0c4b2e94f72d2a77a2a7647e28b8b49e611973522af294c39050dbfa8aa5cca65bf2670f9d4c1e6a93d01b386e76f1ab75ff2e9
diff --git a/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch b/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch
new file mode 100644
index 000000000000..9e5e8810991e
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch
@@ -0,0 +1,56 @@
+--- a/docbook/CMakeLists.txt
++++ b/docbook/CMakeLists.txt
+@@ -61,21 +61,22 @@
+ 	common_graphics/warning.svg
+ )
+ 
+-set(WSUG_TOOLS_HELP_COMMANDS
++set(WSUG_TOOLS_COMMANDS
+ 	capinfos
++	dumpcap
+ 	editcap
+ 	mergecap
++	rawshark
+ 	reordercap
+ 	text2pcap
+ 	tshark
+ )
+ 
+-if (PCAP_FOUND)
+-	list(APPEND WSUG_TOOLS_HELP_COMMANDS
+-		dumpcap
+-		rawshark
+-	)
+-endif(PCAP_FOUND)
++foreach(th_build ${WSUG_TOOLS_COMMANDS})
++if (TARGET ${th_build})
++	list(APPEND WSUG_TOOLS_HELP_COMMANDS ${th_build})
++endif(TARGET ${th_build})
++endforeach()
+ 
+ # We want the wsug_* targets to depend on the tools help files.
+ # We want update_tools_help to be an independent target.
+@@ -92,6 +93,7 @@
+ 
+ foreach(th_command ${WSUG_TOOLS_HELP_COMMANDS})
+ 	set(th_file ${CMAKE_CURRENT_SOURCE_DIR}/wsug_src/${th_command}-h.txt)
++	add_dependencies(th_file th_command)
+ 	list(APPEND WSUG_TOOLS_HELP_FILES ${th_file})
+ 	add_custom_command(
+ 		OUTPUT ${th_file}
+@@ -103,6 +105,7 @@
+ # Extra command output
+ # Note that these won't work on Windows unless we make -F and -T write
+ # to stdout and return 0 or wrap the commands similar to hhc.exe.
++if (TARGET editcap)
+ set(th_file ${CMAKE_CURRENT_SOURCE_DIR}/wsug_src/editcap-F.txt)
+ list(APPEND WSUG_TOOLS_HELP_FILES ${th_file})
+ add_custom_command(
+@@ -117,6 +120,7 @@
+ 	COMMAND $<TARGET_FILE:editcap> -T > ${th_file}
+ 	DEPENDS $<TARGET_FILE:editcap>
+ )
++endif(TARGET editcap)
+ 
+ add_custom_target(update_tools_help
+ 	DEPENDS ${WSUG_TOOLS_HELP_FILES}
diff --git a/net-analyzer/wireshark/wireshark-2.6.3.ebuild b/net-analyzer/wireshark/wireshark-2.6.3.ebuild
new file mode 100644
index 000000000000..fd0b1bc63b47
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.6.3.ebuild
@@ -0,0 +1,243 @@
+# 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}-2.6.3-docbook.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/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 24994929133e..3f4be0ac4be7 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -27,17 +27,21 @@ DIST zabbix-2.2.21.tar.gz 15489747 BLAKE2B e00fe140977f0ce995497954a15ff647c813c
 DIST zabbix-2.2.23.tar.gz 15504361 BLAKE2B c0eec293a92564607ed56c570aca30385481cf028fdee2bb51fbb29b40d7a1908a6065a6ee21c019ed6fb9eee294bc8fb58414669ae8e16e50f614a0650e2dbd SHA512 178e193f83dbaaa8aa0a0b87dd621acf7aa24e0d84d0010532b419139ed02e3cf892e4e772362bb855efb5966a64b9da8d3512eb91e759835039dc8c3529ea56
 DIST zabbix-3.0.19.tar.gz 15642128 BLAKE2B b9b84f21371db1eb8efdfb547e2b4a9216e9fb3c76fe54420ab1c76bad5cbf4537f6f0aca720748d39fb2ebf0447c3f82bf9e0d276f9fa4c9e91bc70e8b67f22 SHA512 30239db9236f536325f0ad3a8ea08abd8c460caf60dfd80b881cc9532d2f65d6154e8911be89d141539f7eeced359809405cf1b655eafdab1b940c314c8d3132
 DIST zabbix-3.0.20.tar.gz 15653766 BLAKE2B 4c36611e6fa26f9f5a8e3201eea0f08f3c2945542284be0a823751ad39f51deffc450e1994bc685c6179d7e72bd3dd58e0071071cd02446d6d733cddf8d7f916 SHA512 06832600f31f13781b42083a56b8bca18f6a2034b6641b6809e338e374fa08dabbae6c9d54ee711b3dd2ac5017203fea3e0cbf7f70a1a1da60dda43c7e1af00c
+DIST zabbix-3.0.21.tar.gz 15658030 BLAKE2B 8a943f015ba137c7a161439a31d09bf023bd02bf6ad420c8b02f316adedccf3b23df3775ecea7b27c5b4c893e881f2689cab1c28a4e6c1fe5b79ec08d5d86f43 SHA512 bffe02dac6f009ba8929e0d9ba222ae4bb9da05550f9eaff034fe444ee1c866bd231bb8aa814b7dedc01a5338171b40d461567a7bf619bfccfc523362db579a1
 DIST zabbix-3.2.11.tar.gz 16099820 BLAKE2B 7038679ecc9ae1b6684d65b3dd0019865e587c82e5a3ffe55610c057f8516ebe34978101065ac31628e6fd54077877c447d64cb1d169e0ad7402e727c7e65d76 SHA512 a14e0af4b183c8deb524c8965700c2988c0c131844f7fbc748aa8d1703b9dad73c2cf6d77663799fbd455adf58fdd1ce8dc5fd6404a9269c1a42160ad0e33e6e
 DIST zabbix-3.4.10.tar.gz 17300622 BLAKE2B 1b4c275d271ae4d4607400cb6e5f955ba624bf19cd116728e7a71a1b4adc0fbbde8cf91e6b0a71c5d48bf5c38b2ebe0db79f00ba3a42cc4213a0e310d56d5e29 SHA512 25e85cbe7a93a088fa0132ed6f3f75ad1aadedb839d745be38e180f0f9b858e32045b9d057b10cab4d3a8aa770b22b631aa0894fe5f1c3ca4ca62a000934bf94
 DIST zabbix-3.4.11.tar.gz 17517171 BLAKE2B 72f7d1cad3e8cb7972cb9c3698d35f70c45de1244c14a87f403a0c2c9b1825d679fa32e54dc4b2aae80a24acb7723ce489e0d409fb027c1afc8bb4eccecf9867 SHA512 1360e1de02fbbda30539e0f1dbe9d4aee57bc693f597db011cdefe7e7c4acaa6e3452813ee29e0e614794336e7fc9210ff3458f3761fcec90db66fb4a2275373
 DIST zabbix-3.4.12.tar.gz 17509251 BLAKE2B 158c7b3061059cc54a5988296404ed6670ca872fa8fa55f8de9708871ee03f163d0365420e23ef5df89a0a85e2f23d607952cf4fc02c974037555534ca164f08 SHA512 6707ff5a15d2c139775b4b5de32ceb4982c90aa4023af310ab9cb849895387984d32f59b7dc9fbaff8f317a630238437e4651ab8272b4535fb5fc3d88750e3ef
+DIST zabbix-3.4.13.tar.gz 17507365 BLAKE2B a5d1fa1a48df2ad66b844c2c85038a088ea5f7e3e67c2c3ab5f5d1ad695b3a31664d317e6a1cbf64d1f6a211304f50e5c38f5d973d4607f2caa202e1184420cf SHA512 4edcf6d9df0f100c639efa6bc18e67ed59819e719a2226593fd81212d4c2e46a19cb50501cca005246b4c01c4082a18e21c9049a99ac9df263180a3c24fa52f0
 EBUILD zabbix-2.2.16.ebuild 9436 BLAKE2B 3d7e32e772074500827d0bd469e280f77a4f7319ada11d1556bfa3148d0a25e6b00b84d604ac0cca436d375cabfe9cb145c5e51902c8293668135396d1dfc160 SHA512 c244b2dcff1fc7a1e7dc82c254eef974a4153f3f4bdf1b202d50e3006de3e0237d4dcc587ee66ffcbc16bb39ee4ad29a4dfe283332a3593aba2585f5c970d563
 EBUILD zabbix-2.2.21.ebuild 9438 BLAKE2B 2032d57e9e5dec45250fba571414aa22b896ecd3f13d42d04b86f0392f153e2cfdc9097cac3b983a331dabd03bcde7b74685139879114bd361a15449bd850123 SHA512 dcda14cad8ea47a09853f5768fb9f538a8150a0fc1da33350ab7d77e161fa85b3719dfcac9515b461815d7c710da7b2ca5ff24db7b7a05a26edeceb00931944d
 EBUILD zabbix-2.2.23.ebuild 9438 BLAKE2B 2032d57e9e5dec45250fba571414aa22b896ecd3f13d42d04b86f0392f153e2cfdc9097cac3b983a331dabd03bcde7b74685139879114bd361a15449bd850123 SHA512 dcda14cad8ea47a09853f5768fb9f538a8150a0fc1da33350ab7d77e161fa85b3719dfcac9515b461815d7c710da7b2ca5ff24db7b7a05a26edeceb00931944d
 EBUILD zabbix-3.0.19.ebuild 9278 BLAKE2B 6e5e42556fbd612fb7060a205bd5a4e12d13db91c6ac5ac0a0724e3462dbab5657db6992f7e5b8d746a91fc2b8ee1cdb2d0c8e982b57b14a141877318dbfcc0e SHA512 7219c5535aa5d91be8132fd74bb7fc7eee2dda0fedc761c031518c0b7b86ec97dee74a03a444979ae2f556e9de252f339e88b337fbedf6efc1a5d97fcefea04c
 EBUILD zabbix-3.0.20.ebuild 9278 BLAKE2B 6e5e42556fbd612fb7060a205bd5a4e12d13db91c6ac5ac0a0724e3462dbab5657db6992f7e5b8d746a91fc2b8ee1cdb2d0c8e982b57b14a141877318dbfcc0e SHA512 7219c5535aa5d91be8132fd74bb7fc7eee2dda0fedc761c031518c0b7b86ec97dee74a03a444979ae2f556e9de252f339e88b337fbedf6efc1a5d97fcefea04c
+EBUILD zabbix-3.0.21.ebuild 9278 BLAKE2B 6e5e42556fbd612fb7060a205bd5a4e12d13db91c6ac5ac0a0724e3462dbab5657db6992f7e5b8d746a91fc2b8ee1cdb2d0c8e982b57b14a141877318dbfcc0e SHA512 7219c5535aa5d91be8132fd74bb7fc7eee2dda0fedc761c031518c0b7b86ec97dee74a03a444979ae2f556e9de252f339e88b337fbedf6efc1a5d97fcefea04c
 EBUILD zabbix-3.2.11.ebuild 9265 BLAKE2B 489884d6ce42e154f3c7c0a9b1f2e0143b9fdd38a1778b13dd8be48d0e4ba1e6645934fcb495dd08a19a22f23201270c2ef79d3d2885316b2eebae142a4bb04a SHA512 f2fd5f8759e9625a798edad0b00868c27f961cb2d3327855cde7e53e46f4950b269bdc95f280d79d89a95291cf92288a6e163fd72562a889f900ddf519a9e44e
 EBUILD zabbix-3.4.10.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980
 EBUILD zabbix-3.4.11.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980
 EBUILD zabbix-3.4.12.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980
+EBUILD zabbix-3.4.13.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980
 MISC metadata.xml 1402 BLAKE2B 02819796719872a78ba4f7f534344bcde607fd95d10ae0087d62b65490289946f81a70b6ae5341ed6579f4855e998fc46bcff6cc463aa7feb4e768736509128a SHA512 8d3ad204e8cfb4d2aa76f0af90c77d7b6e4cc13da54772d95fe43d68bf85eb96e9d96bc2b11b08421e4684b03ad53042a4f4c0a44817f0e4ea804b81996cda5a
diff --git a/net-analyzer/zabbix/zabbix-3.0.21.ebuild b/net-analyzer/zabbix/zabbix-3.0.21.ebuild
new file mode 100644
index 000000000000..c3575d4f121b
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.0.21.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping )
+	server? ( net-analyzer/fping
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.4.13.ebuild b/net-analyzer/zabbix/zabbix-3.4.13.ebuild
new file mode 100644
index 000000000000..94b8bc3cdfff
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.4.13.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping[suid] )
+	server? ( net-analyzer/fping[suid]
+		app-admin/webapp-config
+		dev-libs/libevent )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
+		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-09-08 10:50:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-09-08 10:50:14 +0100
commit	3f71901f8c228f4de570abed1831ce3ee425343e (patch)
tree	a2dcd300d05ef8a2ec275b44a92a9d85bd3baa24 /net-analyzer
parent	12bb627384ddfd47382b9f1b6464481a58d01ebb (diff)