gentoo resync : 22.10.2018

23 files changed, 631 insertions, 53 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index c5819c04d49c..28c6598ab103 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/bing/Manifest b/net-analyzer/bing/Manifest
index 29ef58ccbe0e..be9c1c27c07c 100644
--- a/net-analyzer/bing/Manifest
+++ b/net-analyzer/bing/Manifest
@@ -1,3 +1,3 @@
 DIST bing_1.1.3.orig.tar.gz 38847 BLAKE2B ba01ff0e9a53fa8e9cd44ee085d78ae8d8891cc5478697a0d8fb13917c9a4104a672dcc7aba0c6c91e7f0084ac4254b6f565cf44486b6162225c5a21cb1614a7 SHA512 df56f93047454a02b305154b12898b063c340e96778db9e11114ac4598446648b3ed5fe4304e0f3e33f612069b0f0e4e231396ee878655683f923ad5418d6242
-EBUILD bing-1.1.3-r1.ebuild 686 BLAKE2B 644689146cd749a0a929b423d5ea799b3237b4f3b9550823f52ad7256af252bbebc0423caf53e4c87a6636b031afd3ccd6500f51b2f06fc54b5bd481ab3cfe88 SHA512 e3914efe7f54fa8da148dd19b61bc8dcc2b33c6c3e5d13c54559282ecd49a2af6203b054868faf98d1a04f0d21e55b63c9c96e3d98d4621e69fc0fa0fb4c5e8e
+EBUILD bing-1.1.3-r2.ebuild 604 BLAKE2B e96192ba7e9eb17aa28a8e66628153ae652fedcbaa916482d81c56c16e7d14fefe0b0948763b048fb9cad3ede0b3f90952444419267b496277384fbc42d1a748 SHA512 1585c67cb662f5b0207a4e5cd6655cc16459e7763341b4482d69ec88998a0215cd2eedbbfd2d3f6c945c3f5ab2be754e2d58cbc022914fe150b64698c2219213
 MISC metadata.xml 243 BLAKE2B f6898ed42cda5e8c4bb81d5737f88ff6118fe3507e7ddcebf4686fa26effb75d03176ee091289e1011788f1a98cab52d5374e29dc04c2c298112c47a2c336f02 SHA512 efed1be9deecfbfc884a140e4ecb918eb473ec755a7910ab9afd29fa236d3c34c09c8d11454a0f8c26331539cbad1461f4824ff348b7fb7335cc88fb51d3882b
diff --git a/net-analyzer/bing/bing-1.1.3-r1.ebuild b/net-analyzer/bing/bing-1.1.3-r2.ebuild
index 02b9d58b1f04..83f643000e81 100644
--- a/net-analyzer/bing/bing-1.1.3-r1.ebuild
+++ b/net-analyzer/bing/bing-1.1.3-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,21 +12,18 @@ HOMEPAGE="http://fgouget.free.fr/bing/index-en.shtml"
 LICENSE="BSD-4"
 SLOT="0"
 KEYWORDS="amd64 ~arm ia64 ppc sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=">=sys-apps/sed-4"
 
 src_prepare() {
+	default
 	sed -i -e "s:#COPTIM = -g: COPTIM = ${CFLAGS}:" Makefile || die
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)"|| die "emake failed"
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
-	dobin bing || die
-	doman unix/bing.8 || die
-	dodoc ChangeLog Readme.{1st,txt} || die
+	dobin bing
+	doman unix/bing.8
+	dodoc ChangeLog Readme.{1st,txt}
 }
diff --git a/net-analyzer/bro/Manifest b/net-analyzer/bro/Manifest
index 509df47459bf..cfbbf57168ef 100644
--- a/net-analyzer/bro/Manifest
+++ b/net-analyzer/bro/Manifest
@@ -1,5 +1,5 @@
 AUX bro-2.4.1-fix-python-install-dir.patch 1748 BLAKE2B 5e1f5695a5d5c21f2e3aa506a351f7c3a8ddfe14e80071fc197fe9dbe1a75fc76973461c0aa113318a2dc33e1d84875c66e3596a75ea07b295b0b59719c62fa9 SHA512 0957f05ef4e4efff90f23a6ac885277f4d57df8ade4cf2f9a22b6935fc46679369857ad181f7bb4f071cb4c373d6b4bc8c49c8e8f9bea9325d85a7b2d2e6b62e
 AUX bro-2.4.1-remove-unnecessary-remove.patch 878 BLAKE2B 00ace3b27a7a71e2ab7b6e0b3abe856864190b53b0c7fd693236504700c8c92cc36c80177cb9075f1d27b4320885569e182e58231b56d78bc6b1710a1442f7c9 SHA512 e996a7571c3f9b85f1eb40206c07825f0cfdf7f9fc4a930d8dbb216e8e4636461f0a6be01fc341e6b4d5396d7637d76e39911c3d65e2d645da959d3aad17252d
 DIST bro-2.4.1.tar.gz 15010455 BLAKE2B 34e087253a62ad3d6948e1175fa05c34ceac7298103aef40a0ce791e1e83c8495d6f65c9489d0e7214ff1b743db766dfbf7b44544f7796b7b1f70ee7a1bedc67 SHA512 4f7bf6c037fe7b16214830d2dba9f7abffd853f66030aa710fb9f174a475f8cd27d8de6bacf965f142f942a42093ceb78dcd8cbcedac6fbcfdd65ac07b3dd410
-EBUILD bro-2.4.1-r2.ebuild 2454 BLAKE2B 8729ac158182dae9b0ab2bb923ccf9496045781775f26fe6987490cc89ba01143ca4d77488fa4b65cc6cc045c6a27a7a3679e6efd0f7887a911dde4fb7e5a77e SHA512 b947b5b90dd38d95257ce93e2f7278bf2a1e80f50db9a5513da46758385c41ecb9bdc9f3f04d39afea6ff46113d475bc796dfc91d054baff0ff57fe7cd635b27
-MISC metadata.xml 1065 BLAKE2B f8d529f18a04bf8c5b5f5920dfe343e9fad6e8675a38cf889b729d4764735902958ede3734b09bd4d471b526762af60b44835006cf35c0b833972a6dfe50738b SHA512 db905212d8b96c0f9dc303f2c879c3644ce3e86ab8dd1601c2b1dc37317f3975e4216f398709ea21a6bdc845c7231f7a663bf052daac8fc1e41b20e6fec7606d
+EBUILD bro-2.4.1-r2.ebuild 2473 BLAKE2B 2671634c9b7a0ad22ac0eae5fd53f274bd71e6ed7fa07fb485034725f36698a0a2287140f1b968d051d2a85a204b5dfcde6b5a25657b6644698ed969082b9019 SHA512 9c9a29c1806453ba231ca243cd1368b27dff78efb65c497d31f45a19f99f1ff49b62cca710bbcf9e6c599c9bc1614226de382fbaf0d6a467960c3df542e76c28
+MISC metadata.xml 1023 BLAKE2B 2b02ca31298c44c9932802e1701cd490d371a9078dcddcf407c10f16890ca36e57e81fb92f65876bb643a9c8f5683534c0c29d09c9f0c8924f5e9b51d9f3c963 SHA512 d95795994abf21198ba6a64de4eb4073ad83fb77f1ae4bf171ba29677e03a4abcf94d8b6163fe2a009dc64956b4cd8ce54287f6993c262b43a7b9e2b5ee3a28c
diff --git a/net-analyzer/bro/bro-2.4.1-r2.ebuild b/net-analyzer/bro/bro-2.4.1-r2.ebuild
index 5170d3b253a6..68ee260dc778 100644
--- a/net-analyzer/bro/bro-2.4.1-r2.ebuild
+++ b/net-analyzer/bro/bro-2.4.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,13 +15,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+broccoli +broctl -broker curl debug geoip ipv6 jemalloc +python -ruby tcmalloc static-libs +tools"
 
-RDEPEND="app-shells/bash:0
-	dev-libs/openssl:0
+RDEPEND="
+	app-shells/bash:0
+	dev-libs/openssl:0=
 	net-analyzer/ipsumdump
 	net-dns/bind-tools
 	net-libs/libpcap
 	sys-libs/zlib
-	broker? ( =dev-libs/actor-framework-0.13.2* )
+	broker? ( dev-libs/actor-framework:0/13.2 )
 	broctl? ( virtual/mta )
 	curl? ( net-misc/curl )
 	geoip? ( dev-libs/geoip )
@@ -29,16 +30,23 @@ RDEPEND="app-shells/bash:0
 	jemalloc? ( dev-libs/jemalloc )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( >=dev-lang/ruby-1.8:= )
-	tcmalloc? ( dev-util/google-perftools )"
+	tcmalloc? ( dev-util/google-perftools )
+"
 DEPEND="${RDEPEND}
 	>=dev-lang/swig-3.0.3
-	dev-lang/perl"
+	dev-lang/perl
+"
 
-REQUIRED_USE="broker? ( python )
+REQUIRED_USE="
+	broker? ( python )
 	broctl? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-PATCHES=( "${FILESDIR}/bro-2.4.1-remove-unnecessary-remove.patch"
-	"${FILESDIR}/bro-2.4.1-fix-python-install-dir.patch" )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=(
+	"${FILESDIR}/bro-2.4.1-remove-unnecessary-remove.patch"
+	"${FILESDIR}/bro-2.4.1-fix-python-install-dir.patch"
+)
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -57,10 +65,6 @@ src_configure() {
 		-DDISABLE_PERFTOOLS=$(usex tcmalloc false true)
 		-DENABLE_BROKER=$(usex broker true false)
 		-DENABLE_CXX11=$(usex broker true false)
-		-DBROKER_PYTHON_PREFIX="/usr"
-		-DLIBCAF_INCLUDE_DIR_CORE="/usr/include/"
-		-DLIBCAF_INCLUDE_DIR_IO="/usr/include/"
-		-DLIBCAF_ROOT_DIR="/usr"
 		-DENABLE_STATIC=$(usex static-libs true false)
 		-DINSTALL_BROCCOLI=$(usex broccoli true false)
 		-DINSTALL_BROCTL=$(usex broctl true false)
@@ -77,3 +81,10 @@ src_configure() {
 
 	cmake-utils_src_configure
 }
+
+src_install() {
+	cmake-utils_src_install
+	keepdir /var/log/bro /var/spool/bro/tmp
+	# Doesn't exist
+	rm -f "${ED}"/usr/share/broctl/scripts/broctl-config.sh
+}
diff --git a/net-analyzer/bro/metadata.xml b/net-analyzer/bro/metadata.xml
index 90d38c4236c6..61a2fa9e9057 100644
--- a/net-analyzer/bro/metadata.xml
+++ b/net-analyzer/bro/metadata.xml
@@ -8,11 +8,10 @@
         <flag name="broker">Bro's new Messaging Library (experimental)</flag>
         <flag name="geoip">Enable support for Maxmind's GeoIP library</flag>
         <flag name="ipv6">Support for mobile IPv6</flag>
-        <flag name="jemalloc">Support for the Jemalloc allocator</flag>
         <flag name="python">Enable Python bindings</flag>
         <flag name="ruby">Enable Ruby bindings (deprecated)</flag>
         <flag name="tcmalloc">Enable Google's Performance Analysis Tools</flag>
-        <flag name="tools">Small auxiliary tools for Bro</flag>
+        <flag name="tools">Auxiliary tools for Bro: adtrace, bro-cut, devel-tools, rst</flag>
     </use>
     <longdescription lang="en">Bro is a powerful network analysis framework that is much different from the typical IDS you may know.
     </longdescription>
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 2a2f600c3378..d581f8620b43 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,12 +1,15 @@
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
 AUX icinga2.initd-2 2682 BLAKE2B 613fdb4fdcef7c95bba710c5fcb6ee84dcb3cd739bf0caa42130e2d1a4faf7341d82447bbac6070567581b90beba261302e8d03c148876db157c68054f64e233 SHA512 1ca1001e6095b17d57cd7ff70a2cc302f6dfa466cbe0a71154dd188caabd31e4b69821a3d8383ed855dcb2d2c396b2141a70de298a6f3c40ab79993c292fa6cb
+AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
+DIST icinga2-2.10.1.tar.gz 4406432 BLAKE2B cccc60f63faabed43f9a99f313e3835c15afab9d70e1335f987f431f3187907fedb94451457fe4652886e950b1b058952957832bc7fb5ad5e8f6f4f1f47d4178 SHA512 88e0ef1dfd93a399535f3238cb675e86159ca23d1abfd78009797c3533d10ac5c5167008ff04dfc64d4b9f225e75d85947ce85c5a941250699c0d772be9c0aeb
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5 SHA512 b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
 DIST icinga2-2.9.1.tar.gz 2193190 BLAKE2B 29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd22220c396efeb68759acc97938e3ee596e0820e3f6c8f73bc SHA512 1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533
 DIST icinga2-2.9.2.tar.gz 2194226 BLAKE2B edf3309711657437439db907f39d9dd04b57ae6b245f4299cfdfc9e8c27d18bdfa704dc5c1459a94d47985103979915a5d2d8594072586cf908e5f8a9d209ee6 SHA512 75a638a37f66a68f47ec161be4bcadbd1ca0e121143528d08d83170209e0b117fa12b1b9a03d1c1550f495bfd0509ca15f4d80be618177f2791b7a1a69308f99
+EBUILD icinga2-2.10.1-r1.ebuild 4739 BLAKE2B af9e0e626730fb2514cd38c8decf2308046beffffba6df1e5768593da0941f23a702913af03ca67b0a4034dc59cc7a5f0745fe36903a9bb7c4665a4bd06c1705 SHA512 3f6d8bda9d1f4729d3abf162d1d8d883e7da4310a29d83d8468ced54db64b84caf9c27d2c10b128d2ec8d7aeb9cd654c5416904d8deade3b243ec8a851711f06
 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-r2.ebuild 4742 BLAKE2B e16c72fda3de6b45a4f6f3682d683f8e037a3a2f3dbbea136f7c9c2a013892938586d2094cce045a81564046a80a9ba7bfa0f5925b92c3266695a24054235295 SHA512 2201d7a9f01dab71ed53245e9447044d928eb444da952f71aaa366bf27f5e9965e742ea70efd59064ffbc765940445f4b35b7cf5767524379e43a130da0b89fd
 EBUILD icinga2-2.9.1.ebuild 4416 BLAKE2B 0e9e5c307089b8e9feab2ab66468db68e83fd8c7ca54cb4f72dd4405f5ab2879a0a1bb671ddc6abc5638fb2a49cb7f07fc600579889bea1a6fa6540265f7372c SHA512 81ccd2334931c16fed9a5544ace4f8310519c5634437765c7fc9b4ff769def9a7cb717fefb39fc838f7d19f56c5a282f81aad73e8ec5aaa707907266f8d73343
 EBUILD icinga2-2.9.2.ebuild 4739 BLAKE2B 10e76feb6b03018bfdb9409e70c54c6309572eea19bbf57dbadcf6d85ccaea5b93e552d9116ad125adbba79390f6a52d35cc005beea443980739234d51301a59 SHA512 b045c1be0d84f1f7a63a6e8c4a3da4151d50e18d9fc738762efe8a7bc07bf7110c6718b36cc3cf371dfa3184d2a9e01dba58c9964bf6debd0d86f11d76f13b77
-EBUILD icinga2-9999.ebuild 4742 BLAKE2B e16c72fda3de6b45a4f6f3682d683f8e037a3a2f3dbbea136f7c9c2a013892938586d2094cce045a81564046a80a9ba7bfa0f5925b92c3266695a24054235295 SHA512 2201d7a9f01dab71ed53245e9447044d928eb444da952f71aaa366bf27f5e9965e742ea70efd59064ffbc765940445f4b35b7cf5767524379e43a130da0b89fd
+EBUILD icinga2-9999.ebuild 4739 BLAKE2B af9e0e626730fb2514cd38c8decf2308046beffffba6df1e5768593da0941f23a702913af03ca67b0a4034dc59cc7a5f0745fe36903a9bb7c4665a4bd06c1705 SHA512 3f6d8bda9d1f4729d3abf162d1d8d883e7da4310a29d83d8468ced54db64b84caf9c27d2c10b128d2ec8d7aeb9cd654c5416904d8deade3b243ec8a851711f06
 MISC metadata.xml 894 BLAKE2B 45c6d004ea4200544a543c452df876bd89ce3f2143ce5879c671cfc79c31878abb7ce127a350e3149214c3b5b69f5f8a1b75a4c59ac10d7016b4f5023b276646 SHA512 e370c17e46b447f97281616efab16e591b8c6ecfb85896259c2f7cb5ed61a474ccebceaefe5df5eb6885902f518990963324d13b942b3167d73de093499568dd
diff --git a/net-analyzer/icinga2/files/icinga2.initd-3 b/net-analyzer/icinga2/files/icinga2.initd-3
new file mode 100644
index 000000000000..5af259d5ddf8
--- /dev/null
+++ b/net-analyzer/icinga2/files/icinga2.initd-3
@@ -0,0 +1,81 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+# Set defaults, see /etc/conf.d/icinga2 to override
+: ${DAEMON:=/usr/sbin/icinga2}
+: ${ICINGA2_CONFIG_FILE:=/etc/icinga2/icinga2.conf}
+: ${ICINGA2_RUN_DIR:=/run/icinga2}
+: ${ICINGA2_STATE_DIR:=/var/cache/icinga2}
+: ${ICINGA2_PID_FILE:=${ICINGA2_RUN_DIR}/icinga2.pid}
+: ${ICINGA2_CMD_DIR:=${ICINGA2_RUN_DIR}/cmd}
+: ${ICINGA2_LOG_DIR:=/var/log/icinga2}
+: ${ICINGA2_ERROR_LOG:=/var/log/icinga2/error.log}
+: ${ICINGA2_STARTUP_LOG:=/var/log/icinga2/startup.log}
+: ${ICINGA2_LOG:=/var/log/icinga2/icinga2.log}
+: ${ICINGA2_CACHE_DIR:=/var/cache/icinga2}
+: ${ICINGA2_USER:=icinga}
+: ${ICINGA2_GROUP:=icingacmd}
+: ${ICINGA2_COMMAND_GROUP:=icingacmd}
+
+ICINGA2_DAEMON_ARGS="daemon -c $ICINGA2_CONFIG_FILE -e $ICINGA2_ERROR_LOG -d"
+
+depend() {
+    need net
+}
+
+checkconfig() {
+    if [ ! -e "$ICINGA2_CONFIG_FILE" ]; then
+       ewarn "Config file '$ICINGA2_CONFIG_FILE' does not exist."
+       eend 1
+    fi
+
+    checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_RUN_DIR
+    checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_STATE_DIR
+    checkpath -d -m 2750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_CMD_DIR
+    checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_CACHE_DIR
+
+    if ! $DAEMON daemon -c $ICINGA2_CONFIG_FILE -C > $ICINGA2_STARTUP_LOG 2>&1; then
+        eerror "Icinga2 detected configuration errors. Check '$ICINGA2_STARTUP_LOG' for details."
+        return 1
+    fi
+}
+
+start() {
+    checkconfig || return 1
+
+    ebegin "Starting icinga2"
+    start-stop-daemon --start --exec "${DAEMON}" \
+        --pidfile "${ICINGA2_PID_FILE}" \
+        -- $ICINGA2_DAEMON_ARGS > $ICINGA2_STARTUP_LOG 2>&1
+    local retval=$?
+    if [ $retval -ne 0 ]; then
+        ewarn "Error starting icinga2. '$ICINGA2_STARTUP_LOG' for details."
+    fi
+    eend $retval
+}
+
+stop() {
+    ebegin "Stopping icinga2"
+    start-stop-daemon \
+        --stop \
+        --pidfile $ICINGA2_PID_FILE \
+        --retry "SIGTERM/15 SIGKILL/30" \
+        --progress
+    eend $?
+}
+
+reload() {
+    checkconfig || return 1
+
+    ebegin "Reloading icinga2"
+    start-stop-daemon --signal HUP --pidfile "$ICINGA2_PID_FILE"
+
+    local retval=$?
+    if [ $retval -ne 0 ]; then
+        ewarn "Error reloading icinga2."
+    fi
+    eend $retval
+}
diff --git a/net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild b/net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild
new file mode 100644
index 000000000000..913217ef694f
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="classicui console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres 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 )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	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? ( || ( mariadb 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-3 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/*
+	fi
+	if use mariadb ; then  # same as mysql
+		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/*
+	fi
+	if 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 c0f291e4ea22..913217ef694f 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -109,7 +109,7 @@ src_install() {
 
 	einstalldocs
 
-	newinitd "${FILESDIR}"/icinga2.initd-2 icinga2
+	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
 
 	if use mysql ; then
 		docinto schema
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index b5af2356ee87..06a6d6e2f51a 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -8,9 +8,9 @@ DIST nagios-4.4.0.tar.gz 11295727 BLAKE2B f89e7934b13814ec8c0ae7a19f14eed8842c7b
 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
+EBUILD nagios-core-4.3.3.ebuild 7459 BLAKE2B 24b655f0309a5b3793ded3d70110cbb2fd181834ca07673efca032d51a327b6522225f38a7feb57e542bf306ef86cb228d8e45bf4368cf237782ed60ed73748c SHA512 e00da7ae2a31559ff1510bd76117392014ea949db0a90575e1cc75f58ade9e481ace47afce06535d6684ff5a6e0e1de1149f53141b2c436a55abbf23d3dd503c
+EBUILD nagios-core-4.3.4.ebuild 6633 BLAKE2B b179113b24ff38a5c147de20cd48db21fa1379f4ab377c7c354a1f107f9651f1b348f7dbd26825aaacb1fe8ce54d8feedbd7a44b65d3c897480d1c87a1fd4183 SHA512 43668b229464870ff2843790b1fd3bed7e3e2c4ba58f8cc19b90d8e85418c0e86b3b604089ccf52a63f24f6c0fb5e9ea4045769b2f63df96dc7d70c53d3e8411
+EBUILD nagios-core-4.4.0.ebuild 6641 BLAKE2B 1264cb8277e44b047418073c7808c4b99d865ebcd3ffd92f7c030703e8a04d2ef7c8aff89a3191d8cda4c5aa903297b6c7a83c6b354cd4c3956ce9ee107d1e5a SHA512 5bc7f701186cc0fc6869e606bd831fd66fe466865ec68144235a0d62ab8ae2c3893ba467201140b82e91d4e8e8ef615924b5a766a8a9507a3f8d2239e7f33456
+EBUILD nagios-core-4.4.1.ebuild 6692 BLAKE2B 74b0316cb39b05736af99112c2cd7d41733f9089d7826f1a808e79860dc5ae8dde4c23f69dc69c798c528f3ed53740c4eee01e97a1c58e965e0c919964c9b5c4 SHA512 cd8b77093fd231a531c432d51c1971b4c2018b8b3829648fc2ee32f7a2a5b3c1de5139f52e61f967c1558fcebc9fa9661f60eb6c8d78b3e8218be4379882a7a4
+EBUILD nagios-core-4.4.2.ebuild 6692 BLAKE2B cef816faef6561bb8ee0dae09266fb0fce684ac0d6e2c65227e0e6aa2080bf20ff4612e189d269f66c946de516dd7620820f9acc76d6cbb89380dbda1d552a0d SHA512 26524450d6a3c207d5d05562767f635f04828f19e7d065ab2e0a826b5c82c444811d344cc3380bee814d2369451a82423aab4047feadae84077e97c1b1130963
 MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
index 5773285f59b5..11e40c1b8e02 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
index 9ee27cd6da9c..1df849693e9b 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild
index ec0577881b03..4f2dbf117c3f 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.1.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.1.ebuild
index bfc0aac4a73d..b29021b26ea8 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild
index cb47956dba4d..bfd8898d4883 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index fc2f228394c5..8a0e65b7a8da 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,4 +1,5 @@
 DIST testssl-2.9.5_p5.tar.gz 8955523 BLAKE2B dcafb0931ddfb9d653acf79f72d2e30b2acc4a80246ecb3f26eaa35d4a69d5af65123005de34d09c563978593450895bf451b866182fd3ea38bdb121fb8e9385 SHA512 8a26989e1b8f45a2ac25efab500c89eeec2dbdbb9c0af715a61433ce0737ed69221df09a9554b6ae4415081a66ef4f6afd44c92405afefe4a810cb4375988700
 EBUILD testssl-2.9.5_p5-r1.ebuild 1291 BLAKE2B dde1e0edccf415dc4f717515e6fb8f333e935215e6452c3457fd203153e523bdf4546a03aef68defee5234359d75d6ab8f74ad91a2504a2b4695e80b601fdd5d SHA512 6ec8005eb3a27a079e800d21b5b03382435e32e8fd9b1def669b464400cdcb182598b3a9f6ece631defc0ae2549fdebeed4f6da4c182929d227e6d63139a60ba
+EBUILD testssl-2.9.5_p5-r2.ebuild 1529 BLAKE2B 989592309812555613fd5d6ecff8173fe1c1bbe384aad4d406f8a827911037e459c1627b08ccf5f0f0f5f20c95f68f9eee0f358c77476d3f985c481d9b6cd6b3 SHA512 e1e6277065413fa8f80a734b008a60ace4ce7275981ff3a2f1d15ca960d69f124545496c39d86228b7f6cf605bf8d56edb48b6446dd54839417c9b75431deb04
 EBUILD testssl-2.9.5_p5.ebuild 1477 BLAKE2B a26cf73f44a63fe823838d748d943cf8e910fa36efc86b13a900af29a17c08061012fa66c07810473c5e9fa43ab6e49290903ebe8beaa2b2407529d7b4350436 SHA512 e217b3f116f62202485715a917f18ea32d902bcd0514dfaa9f5ddc6d3e435df76885daac253243dad99a812f31f51239c8dff6c886b1c376d3f6138f52639780
 MISC metadata.xml 427 BLAKE2B 5504150e6ed2e079db47b71afd8826e0543162d259ffb690caab572f6f87cf358ec4216b7859c274047f4d880aed40ab6858633856e12f9d9d05683198b75fba SHA512 83dacfa2293a8f14bce97a01f732376e76f84c4eb4fffbed1049b08210850cc5b54381d83df15bec2ecc1c1a592148d538ac37053b36fa1022542e023a97d9ab
diff --git a/net-analyzer/testssl/testssl-2.9.5_p5-r2.ebuild b/net-analyzer/testssl/testssl-2.9.5_p5-r2.ebuild
new file mode 100644
index 000000000000..2cabe7984eb1
--- /dev/null
+++ b/net-analyzer/testssl/testssl-2.9.5_p5-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN}.sh"
+MY_PV="${PV/_p/-}"
+
+DESCRIPTION="Tool to check TLS/SSL cipher support"
+HOMEPAGE="https://testssl.sh/"
+SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 bundled-openssl? ( openssl )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bundled-openssl kerberos"
+
+RDEPEND="
+	app-shells/bash[net]
+	net-dns/bind-tools
+	sys-apps/util-linux
+	sys-libs/ncurses:0
+	sys-process/procps
+	bundled-openssl? (
+		kerberos? (
+			sys-libs/zlib
+			virtual/krb5
+		)
+	)
+	!bundled-openssl? ( dev-libs/openssl:0 )
+"
+
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+QA_PREBUILT="opt/${PN}/*"
+
+pkg_setup() {
+	if use amd64; then
+		if use kerberos; then
+			BUNDLED_OPENSSL="openssl.Linux.x86_64.krb5"
+		else
+			BUNDLED_OPENSSL="openssl.Linux.x86_64"
+		fi
+	elif use x86; then
+		BUNDLED_OPENSSL="openssl.Linux.i686"
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i ${PN}.sh \
+		-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
+		-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
+
+	if use bundled-openssl; then
+		sed -i ${PN}.sh \
+			-e "/find_openssl_binary()/a OPENSSL=\"/opt/${PN}/${BUNDLED_OPENSSL}\"" || die
+	fi
+}
+
+src_install() {
+	dodoc CHANGELOG.stable-releases.txt CREDITS.md Readme.md
+	dodoc openssl-rfc.mappping.html
+
+	dobin ${PN}.sh
+
+	insinto /etc/${PN}
+	doins etc/*
+
+	if use bundled-openssl; then
+		exeinto /opt/${PN}
+		use amd64 && doexe bin/${BUNDLED_OPENSSL}
+	fi
+}
diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest
index a5be1019f5be..3a90d1029f17 100644
--- a/net-analyzer/traceroute/Manifest
+++ b/net-analyzer/traceroute/Manifest
@@ -3,5 +3,5 @@ DIST traceroute-2.0.22.tar.gz 69001 BLAKE2B 8678bf2636b3a0615e7282923ccfeae9c721
 DIST traceroute-2.1.0.tar.gz 71460 BLAKE2B 4c2126fa98625d525d0a1b0075d16a6ff37836e18d2ce8319f58c89bfa22a6a5e3bbe2ded22fa98d5128c7bb58578327db08120a5b78c1c4ff5673dcc0dea7e6 SHA512 3578007c734091ea0c906637c03fd133a8b0154fbf2e6b5c0c881184947918196bc03aeaf872d3bd53777b9b771cba5cf97f73fb5916bb53b75037f429b40ed3
 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 874 BLAKE2B accd50fa5679831bf1ea019525d79b92ea193373c0f5f93a38f31f96cb0f0465769b0c4eaae572fac1062db9047f8a6d34f28f76fd8ee90c3e1c31b77448e20f SHA512 575f1debae404646d78434912ca0ee25b363947021f2dc99e3a058bae64aa5cd3f122c554114bf049a3a479efef03d4f1a52d9a04aff86f768fff87909704e9f
+EBUILD traceroute-2.1.0.ebuild 873 BLAKE2B f8b93f99eb075c220dbeb76eb62882908b7b590524c79875f5695fa74faaf44d3decb12b1b72501cb478078d10f812fa7dbbd9b2cc831cfc44e8ef7bd4deb57c SHA512 c68761f15837ade0255b549e789f66ae781e295fd095c44a46eb0785f65fac234ac35d80cd01ca265185c388946c278828531d99ecc05209dd3a54573de68479
 MISC metadata.xml 437 BLAKE2B bbef3a65676e67e78b4f78846a46986a3ffc8b74bb73517795b4796b2865ee0ae4d6ecf99edb1a9b12dc97988cc51fb161dfb757e8ef449a3b46fa1eac5c8411 SHA512 928cbbbcefe88681f5f797616d8f8b4de75cf789157afa536a757e7e72f44b07c337105380816aa79713ec143c324ae16577351648357a77267b6625b962924d
diff --git a/net-analyzer/traceroute/traceroute-2.1.0.ebuild b/net-analyzer/traceroute/traceroute-2.1.0.ebuild
index 5b1611a1a775..4378e4df6646 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 ~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 114ac129b28d..7a557e676330 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -12,7 +12,9 @@ AUX wireshark-99999999-qtsvg.patch 900 BLAKE2B 309fa6d8f64962c2d255d6325b062e3ad
 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.3.tar.xz 28384004 BLAKE2B f275c73173fbaf3f819c58f28859362e9c53ae50cf2649ac42c8d172362241eb00d7f43d0aead184ec67cb8da34d405124be10c5bf31226c2cb4800b8a01955b SHA512 87e5335840baa401a1064ee83e3f0ee859c059dd37a09f63f19eb5d91ad273e84f1c0e7a8fdd63fe8a7076abff5e79593827544c5796d921cf7dc7682c7c3f80
+DIST wireshark-2.6.4.tar.xz 28218232 BLAKE2B d54d7661801667f78f0c3248f4099c77ef016222ae942dc7a5776af2c5c18f7b00305556ac84df6afd19cf3d2bd59e78365067dd9402f978ae0a7db76c1730ca SHA512 bc740548901b30f2e44c2b0933717288615fa38edc5e092607a8b12c60ecfacaa5aa7c59d7644cf29238d0d636fbe03d85559a0f2de81a3bf8ceac55fcf9ff07
 EBUILD wireshark-2.4.5.ebuild 7324 BLAKE2B 37579953238776d82c3887994830e72d6df6b928471f6d5ae955c53a58b0b70887c139c0962d5a27119da15ec6af0e416793d41ea3aa4ee18374f441abec0876 SHA512 f8fa063eff8b7c3e76fe2861b287a8c65368710b2cdbec670453a54e5d629a060dc368d05a6c6efb2ad8031174613026c79a3d8eea9fe9e43caa3953e5a72d74
 EBUILD wireshark-2.6.3.ebuild 6603 BLAKE2B b9406cf5e104ab342ff8b9eaedd2b0a01b79b6f0bd6a79657c2860d53fcb648cb5868b97ec559b9cce5cdd9ed0ef5cb985edcfd093e60da16dbb42035cabec23 SHA512 95f5f555a393ce995c55a8dee07189fac90fc3032642dcecbf0f50e777d3bc919321d048c68e9bda3553ded1c92383235804cd47f6e0c9aa3303d116684e60d3
-EBUILD wireshark-99999999.ebuild 6375 BLAKE2B 05637feca26d8c5cc2329b5a86a6bef9742e4470309ff569ccc23a9f1da56f30d9ae2bd16fa1862c5a21508d56b467cbf51cf4f3a31ce08894a7a06691284266 SHA512 4cfc11f50a4eddc08b7f526350752cf60bb016f0992f0bafe892ef834def88fe7915ff7d856c27c4d709c4e2d34ad9bd3d6ebb4f1e4e363e60c62b3706f07cac
+EBUILD wireshark-2.6.4-r1.ebuild 6514 BLAKE2B 0203f94f5919cf7ee0d9434cdaea93383cc816568886fe050da346cd6bf285967214c3d75d579b76c130b9d41bcfaae81b02fb1b5865a46a3dccac81818371be SHA512 57b01b0093b4cb9cf083df51451c198fe740e34bc08e3709ae546df696681813c1dd89d582e68af72a41ca7318adec1ebe4d027ddb464ced5cab13622b239400
+EBUILD wireshark-99999999.ebuild 6323 BLAKE2B 0d65cabecbbba46d9e2164dc29024542d4497b80e5694dc004e7a1e2317f903b0df135b40d785150b1661dfe1f90ce12f4ab072391bdb04e88e5d8f4df582c44 SHA512 d422f24094189a03cef3947f1d1b05ad6537a0725572d23fd1060202a50ac8ede3cd9cbbe2da6eaa66bd55b560b66a2526b778c8073a54d799117089d0b4b5e2
 MISC metadata.xml 4787 BLAKE2B dcdb28c47094cfddc0effc4c16aa9132386f94d4d6e6cdb46f31a06ebb5dd7cd5c7bf967f50c6a002b7aeecddeb8aa8b86cb5961405a463c10389d6ec9b5cb7f SHA512 b683b159266bc37471ef26f6c0c4b2e94f72d2a77a2a7647e28b8b49e611973522af294c39050dbfa8aa5cca65bf2670f9d4c1e6a93d01b386e76f1ab75ff2e9
diff --git a/net-analyzer/wireshark/wireshark-2.6.4-r1.ebuild b/net-analyzer/wireshark/wireshark-2.6.4-r1.ebuild
new file mode 100644
index 000000000000..9dafeca71f94
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.6.4-r1.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	!<virtual/perl-Pod-Simple-3.170
+	!<perl-core/Pod-Simple-3.170
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk? ( virtual/freedesktop-icon-theme )
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+	"${FILESDIR}"/${PN}-2.4-androiddump.patch
+	"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-2.6.2-qtsvg.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump.patch
+)
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_configure() {
+	local mycmakeargs
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+				;;
+		esac
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	mycmakeargs+=(
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dumpcap=$(usex dumpcap)
+		-DBUILD_editcap=$(usex editcap)
+		-DBUILD_mergecap=$(usex mergecap)
+		-DBUILD_mmdbresolve=$(usex maxminddb)
+		-DBUILD_randpkt=$(usex randpkt)
+		-DBUILD_randpktdump=$(usex randpktdump)
+		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sharkd=$(usex sharkd)
+		-DBUILD_sshdump=$(usex sshdump)
+		-DBUILD_text2pcap=$(usex text2pcap)
+		-DBUILD_tfshark=$(usex tfshark)
+		-DBUILD_tshark=$(usex tshark)
+		-DBUILD_udpdump=$(usex udpdump)
+		-DBUILD_wireshark=$(usex qt5)
+		-DBUILD_wireshark_gtk=$(usex gtk)
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_CAP=no
+		-DENABLE_CARES=$(usex adns)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex nghttp2)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_PORTAUDIO=$(usex portaudio)
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+	# install headers
+	insinto /usr/include/wireshark
+	doins ws_diag_control.h ws_symbol_export.h \
+		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
+
+	local dir dirs=(
+		epan
+		epan/crypt
+		epan/dfilter
+		epan/dissectors
+		epan/ftypes
+		epan/wmem
+		wiretap
+		wsutil
+	)
+	for dir in "${dirs[@]}"
+	do
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking
+	# in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use gtk || use qt5; then
+		local s
+		for s in 16 32 48 64 128 256 512 1024; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins image/wsicon${s}.png wireshark.png
+		done
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+	chgrp wireshark "${EROOT}"/usr/bin/dumpcap
+
+	if use dumpcap && use pcap; then
+		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index eb8caa256baa..325185d09e21 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,8 +42,6 @@ CDEPEND="
 		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 )