gentoo resync : 18.11.2017

10 files changed, 262 insertions, 11 deletions

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 0df70bf89024..ffad35e709cb 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -4,10 +4,12 @@ AUX icinga2.initd 2276 SHA256 13a2603c0ba54aa095e17cb31489b9e30a4c9d0262c6b053d8
 DIST icinga2-2.7.0.tar.gz 2435398 SHA256 8f06d23e5d922ba7a74f92dbb9af792be063d06d3aea9011aba39370935c6980 SHA512 470dd4ffa4ef608a018ede5c25b41f16213bf18c679eed8aaeed155fe6adc74a70abcc2e8be42ca20bf60f9b4b620c971ebbc96d608de2a90e480d72b93111bb WHIRLPOOL c926086c296affaafc7d55471ea5c1414b2d2cb8545657215a53bb9744c3147c32f8398317ad670e0d12fb95c83b54f0712f061e5e93bab868c4f04d833c3b47
 DIST icinga2-2.7.1.tar.gz 2475348 SHA256 79f2cd2cba66b2d2a785d37cccd4a47611f7b0b7d52b9a625a22f0c7ff12f7f0 SHA512 8233c33b7191706569a236d583fff689b35eba750fca01a06cfd14ef636b01314b6b142d78777987bd08a9df1cc53f42652fd1c900532b73f0a0363aa220c6cd WHIRLPOOL be07801033b8e10d3a4aaa26e9cd6b75663aed4cf513f8d592b05ea13e0626ab3021d5a52ebeedfa754752057a1d3378fd54c1f8fd1ec5dc72338c891d6b9785
 DIST icinga2-2.7.2.tar.gz 2471098 SHA256 7e9691ad3389f04a53042d88c1ac8a37e2c9aaf8287856cad3fa48825adaee84 SHA512 69cd7c56eaae832712723fcd21e2177b8180b3975bcf773223ca52d3817d1ca538cfd620002bd7a9ccf2e89deffa80d07e6281111146295b21377de99170302d WHIRLPOOL 55e55189b9a1f6646cb94748a7b22731cd5f0d576a858737530187bbab83f40c8973f1a9f508449b0dcb997af443e75a15c9b2ef775c8fe95d1740c72db214c9
+DIST icinga2-2.8.0.tar.gz 2497043 SHA256 bdb1434dc1f502f350c659371c0920d68eeb982add0c5e94b5c16068dbef8fd0 SHA512 20399251c91aa3b07a0e884e0c52fa2540b645d24fd46cdb550fcc5accfbfa23a703f7d310ccde4fa68008c44e8dc6bcdc5351a21e82181e39b1add5a92d90c6 WHIRLPOOL 3af07a98c9debf2bf846e5cbb619e86cdb8b0b91b5a3796b6046ddad96ab23b4526ee47c128ee2c85e82348f6b6a11ac4681604005ac23c9aeebdd7518ce4e3e
 EBUILD icinga2-2.7.0-r1.ebuild 4648 SHA256 33c144d265f50ac1e01216c28558a2cb45b8a14436d1af1d5e55b397ef40194f SHA512 aa2c2ac86a697c75a4ef4c14a8ae1f57164d7614e06082aadbed2b43bcd8762938ac8afd9beb64c982bfb4e29dc5d08b530987248132e218247b8c930195837f WHIRLPOOL a9d22e681fe0163b4e31cdf19a899f5915b87a296ffa5efbdbb3aba4d4fdbea7f97ee101eb757b91cd2d53ed6a517539295901750cf6f3c294b0e6535d113ffc
 EBUILD icinga2-2.7.1-r1.ebuild 4758 SHA256 c1bef9b852ab9338f6826f4fc56f0301f6d95de6d1a40d112dda339282dd8913 SHA512 62084a343b8362cbb2b6a2d25e10366e6739316a90152b57e8542b53026dde020196b96e67d20cd9dce199cf551d2d2a34685d6ea3b97878fe76524e5212a280 WHIRLPOOL 0d965229b4f871773a79050e7b617b77b10a629cd928f034e15c82d2c383a6a190ee08da06b1a0576d7765e9672d59c829baad729f27eb17ab7d576360c3260e
 EBUILD icinga2-2.7.2.ebuild 4760 SHA256 358c5155e922cd954ebbd4c14af4af549c6fe919f857db05dc62170b917111e6 SHA512 87fa97f3731c5c5c4e6801fd40d2a235fd43039ecf2ab78f969cea26c8115a20dc42d4499a9bfe987335131ceb053e6f7994db806466d932a9fe54119e34c734 WHIRLPOOL 94317744d6fd00389d7c4f7b10607f58114a8f6e6e0aef7d538c14cc7bc8de90cd439b5c9476bc285a020c6b9627130864090d08c053d1078d916fb2a384f3d0
-EBUILD icinga2-9999.ebuild 4628 SHA256 94fc1cc4ed70df5bb57236104943f875060c81f365da3fdf03ff64db90566e91 SHA512 45ba99e9812faf3859a9c7ec4e48c60a25536874d0e9e767fc68f66b70eba7cf5abb2119fd95bb452c11aa40c23ea390d1921700499671924c6b605d18351ee1 WHIRLPOOL 7028d665f67c1c5d107af412d6a6d52710939a1299cbd48c02c698e530c82d3791da7db529758aad6af20ebe0e015f4a055f1bbbcffc5da9b788c9be4a0736ad
+EBUILD icinga2-2.8.0.ebuild 4664 SHA256 556a9a08492889a489152986dad4d16b8437d10bc6507ee8ecf8189fd0008de7 SHA512 bf4c4c91f36ad8822f28c7016b24e175fec0491f67123d85b8012b98bd15d610253d2f27a90c484f973a13979389eeef23239375ffc275210ac2adbbf3c06fd9 WHIRLPOOL b5d781304bb683ec0e590363583fd30f471f03bb065b811b6554a56dc98bbcadc7665401d9e0aac20b26945f1826e24c3532634321b4a5e2cf1b17ebde8f9415
+EBUILD icinga2-9999.ebuild 4640 SHA256 d3b287090694d8994587d43da3d794ce09788cd86ff4a78fff25d1da3d0eb4d4 SHA512 af60417cf3d755e82fdef7fbb3ce310e20e35ca4d68696d67e4d53340bd747e94058da89bb7f6ca1ae31317d76471291d276fcbd1cd51edfef615db1a31f1688 WHIRLPOOL cfb8c5d9e2ea89662fe240696ced70f8220b99cb0c74d18234ca7491916bd7cb3abf69aabc659ead1589fa50c7b649288f181587dc04922b823d82c58d659312
 MISC ChangeLog 12523 SHA256 6b33c1cd3ef131f9444c216ae86700732bf8d9c571ab558db1157b4d21c5abdf SHA512 5bd2ff47e0bf2714f6bdaf4339a3a7ed95a59b528bf25680831236be63d753603cc8e60de6ff7826c69e20154ba650c7c2b27a0775ac7f118b833a1d048c56f9 WHIRLPOOL 8858e1686faa46a57c300161254950d2332a632bf857e6394e3818ada73e40802a458a2ad61acd5715df35c94f8cd54df054486d1482b432eb798f0a41bf8d4f
 MISC ChangeLog-2015 6716 SHA256 319e8121e497e7d44d8f115750f68283a6605b9a6ff1f0ade569b8b660a21e67 SHA512 e1618c3469eba79ff34786b5e357add06044f61154070cc726951eed6609f3e458656f61a1daed11caf42b13aaf7a91eced1924a1ad7491c4a12e91e50e39d10 WHIRLPOOL b715c79bc75d0613a864a7338e869bbd7fa6cab0e65e36e5c32e8124f2f4159ec45837195c5e2ca285249fd518ff04db10063065353a30ae49b4868a04f2d8c0
 MISC metadata.xml 816 SHA256 1936f6fa03ebee51be39b5ab1499db12128d6d161b66c217886bd0ac0beb3e0e SHA512 0d3ac2d9233f7ce53a8105caed0231cefa402861e26c760de3fb23163ea68c21b97f5ec0de65bc6953aaf2dd8fa90a9edc045a2fea8b622efdd1336959e9e60b WHIRLPOOL 118b4a5b65cd2fe6794f2e3ac5e052f4e4077bdb08a796d31a4b4dc5a3683b36429611ab1ce5941aeba36fd838b51b0e88d38523c9d32e7f49e060d8fb3f7211
diff --git a/net-analyzer/icinga2/icinga2-2.8.0.ebuild b/net-analyzer/icinga2/icinga2-2.8.0.ebuild
new file mode 100644
index 000000000000..1f39bf4c1399
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.8.0.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2017 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="~ppc ~ppc64"
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/boost-1.58-r1
+	console? ( dev-libs/libedit )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+
+RDEPEND="
+	${CDEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	mail? ( virtual/mailx )
+	classicui? ( net-analyzer/icinga[web] )
+	studio? ( x11-libs/wxGTK:3.0 )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+PATCHES=(
+)
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	if use studio ; then
+		setup-wxwidgets
+	fi
+	enewgroup icinga
+	enewgroup icingacmd
+	enewgroup nagios  # for plugins
+	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+	sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=FALSE
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+		-DLOGROTATE_HAS_SU=ON
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+		)
+	fi
+	# LTO
+	if use lto; then
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=OFF
+		)
+	fi
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=OFF
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd "${BUILDDIR}" || die
+
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/icinga2.initd icinga2
+
+	if use mysql ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	elif use postgres ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners root:icinga /etc/icinga2
+	fperms 0750 /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners -R icinga:icingacmd /var/lib/icinga2/api
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+	fi
+}
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 32561101621d..11f3af622732 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+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 ~x86"
+	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"
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index a6c90304b376..6aab3a577573 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -2,7 +2,7 @@ AUX define-own-mysql-port-constant.patch 3271 SHA256 25d25d3aafa1a3e77df0ec87398
 DIST nagios-plugins-2.0.3.tar.gz 2659772 SHA256 8f0021442dce0138f0285ca22960b870662e28ae8973d49d439463588aada04a SHA512 2753e6f3fc7433a5583fee01e63a65b9ea74155964f2b6e6bf3458e56cb29ea5dbd020f83816044a717b66d6548d203b3a082fba0faedcd629c7a8457bc19b36 WHIRLPOOL 4b0e4024833373df3f0db44657345a1f4495c4022e56bf6b369cc2846f9127e565520f6b7cdf1b94384592e78327d584da7d939a3ac0586e0ae67fd1258c138b
 DIST nagios-plugins-2.2.1.tar.gz 2728818 SHA256 647c0ba4583d891c965fc29b77c4ccfeccc21f409fdf259cb8af52cb39c21e18 SHA512 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3 WHIRLPOOL 57579a7948ab1ce5c66db47e7221b5b8087e3fa027b2a69ad95129ba44af6ba13eaa4b766f3a2de11f708a80e3f44d6d54c6d513388e58c5be75c7bb166325e8
 EBUILD nagios-plugins-2.0.3-r2.ebuild 2828 SHA256 8ad04b08572e3e7d56ae11f9e0b82fd87f041040fd8fbf1cfdb8a2fdd4fe6b78 SHA512 cabe19f142006c4d104721361c2c58fc7a103717041050a21bc21b47adb6702bf05c77f1ed8b063f74b11a59a2dd1120d8478e5b1d803636aeb9f1ae92c2ae91 WHIRLPOOL 3bdfcb4df0bb46509d9ce0cdfbe3e0e74cb9e7452f0f0c314f570bffac452366e858f4d0175292da9e97188c5a0ec0ffff972ca0bf821fe93ef520328c12f016
-EBUILD nagios-plugins-2.2.1-r2.ebuild 3115 SHA256 357090140031d7109f91ae8181ba24907a60a5c13eb6ee4f13d7fc2302704712 SHA512 b70231b8e2fd2dedf9e3308ac2005e43d6fef8ea2f17555cc155e689f0194e38977f9961ec233a84f81560c6dedfbdbf1d2108ce5238035a4ed101c46fbf2329 WHIRLPOOL b841614c25cd7de02a397c50581f2699b5998c4934488e040747e700e8f1b431b348785c9e69cc140e5d64c3cab774fc12d72426cbac06cb850901f9191307b4
+EBUILD nagios-plugins-2.2.1-r2.ebuild 3114 SHA256 e2f984d091e9d5061639fa87c224696e675380885c80d2f3c6e9cd8f52a43575 SHA512 ab80c71e4893f4a9fb278d89931da2b0cdf89075635e52221209879cfbb6b885067c68be6b7247d8b8550b7a1d552d41746d7a3c99bd2fccbb0fcd0ae72e6241 WHIRLPOOL 256ddc7bb201a0f61fbf24833357f2aa61e35583e15c614f2be29269f645cffa53844ec3af86aba2e9373558925b3776160d722ddee193a8317d419968aacae9
 MISC ChangeLog 4744 SHA256 4c08d4f657682469e96dd1a18715ab6b6439de60e0b69132de016bd98acf3138 SHA512 5af2e792504b1771880084c26439b4446bf614c3e1fcc00a1b84c600eb35ce02b729af739d8f7443671a093f16d37ba5f20129c1d43aaab54640e109c128762a WHIRLPOOL 4765d0aae5d3f87f28506bcdbbfbf7e6bcf1dd5a66366b0c05c69423a910b8d4f54168f397dc84343ec85dce9d9a5170c84be02e88dbc837a4698698f0768f4c
 MISC ChangeLog-2015 16032 SHA256 0fcc0dcd50ab5fd579c2fe7d87c33deb815f396f4c70a31909f1da00a47b7a74 SHA512 2ac4eb36d06e72159faa28f62cafa23f8e3b5db0f030209717cf65775f1ff3bd3f95511fd5c17f95866689e77624ab76835876dc00c1598bae45d6f6e4ed9fe5 WHIRLPOOL 2eb21e54a88026a1adfbd242b1ed2892b4c28b8fb418f6dee36f2077571d9b9f25f6c82f9b3774847e62aa6e5261b695d4bdfc3d31cf06ced31aa493a6a47496
 MISC metadata.xml 1430 SHA256 656fca85f1a00b533736cd3d51ab50a2d4c110b31fc33214a6740ee15435c0ea SHA512 d6cbc6820de52e1ed471b97a6c592af72474db492204594314eebb656b8abe89a01667a7bbb621418fd393aeacb28e9a10c5749de7ace67dd15119f701019e72 WHIRLPOOL 6bbedfdaf61e458a0ed5ded3e6e2be96ac27d05aca94dbcef212e8226f57c7cba4db05cfaaa80c238dafa83d49039183969870975bff28e119b200220c6dcf5a
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild
index 7cdc0f879966..a2125bbdd312 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 59b1dda63cee..f0cfab76860f 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -7,6 +7,7 @@ AUX nmap-7.25-CXXFLAGS.patch 302 SHA256 33132cef48902d5bc241eb61f918b966e7b8171b
 AUX nmap-7.25-libpcre.patch 291 SHA256 78ea0907c6a7f1e93b80539baa211e53e86fc8b36396aae4353f5086e5ed8efe SHA512 75963ed6eb156475a8e928f6fd6ad18cdc61ed658a3e0a82a7719bbc4998b186981fa93c2b39b8bc92e10cc0ad19f5097224a9a68bc4b35e1b771d4a27532b1d WHIRLPOOL 6145155ee667764da67ef46e760ac0135cb0e1c19900c70bdb5d08dcff2f30c6c294543b3cb7cf6860ac6a4999ff708e4c1332d0924c07bf031c5f945932c542
 AUX nmap-7.25-no-FORTIFY_SOURCE.patch 2258 SHA256 33c0c0591791ecee3ef0e7a1b69f01fac6ffe5999bd62b67435735640d981210 SHA512 29b19e8cedc5e9edf66e728d89b71c4c0ada29fdbb9c167bec84b5aad2c9d52fe111a902c32b247106ace0154734f2a3b4eeae119887dc7203ad2271c8c240a3 WHIRLPOOL 664aee863b7b20ef27b0e8c43e2985b03bd0c2a1460683c2bda9bdbc028917533927b38a721990379a810351012070a2676e27983050d85c992a5115e768e7ef
 AUX nmap-7.31-libnl.patch 498 SHA256 5c5e740eb64b0a06d1bef9754f73b72fa3ddea38c3aabee35f5d7763cfe4a05f SHA512 e7047faaac2bec6c8e0aaae04cbc6e97a8da7999fbb1a8ff015a78ffafe3ce645b71746fd6da826e3ad9baa8d8a917d3791836e67a346dc9c1ca6678cd04e7c8 WHIRLPOOL 92f6d423d1fc2ee3ce99031c0179b93c61251f1c69561b9640398f647ec2fbaf7106c8b0c63485384cfe951ad9e5839406c037ffb423cf01f288bc9ef291e296
+AUX nmap-9999-zlib.patch 226 SHA256 f841d70a1ceae13bd5a66c68b6f417cc78ea3ac627e74f02bca7e18e49b9746e SHA512 ea36e9e16660b960bad457ec29c1654f1b940088e56011deb58b6e4d9f1ac81e7b0434f6847e0c5a857527132b3fbefe2fdd68ff4cd3d0da100a4d23f56b9345 WHIRLPOOL 93d5fd8cd4264dccef8e46c115cecdd3f554ac7424fc181d7250f94b8f3163647de40c4898ac101d843103ac576b8e89ba28a36ea11196aeaf9ff39d4007b810
 DIST nmap-7.40.tar.bz2 9043221 SHA256 9e14665fffd054554d129d62c13ad95a7b5c7a046daa2290501909e65f4d3188 SHA512 98e37bf1c29789ea19ee4542d719ed6970c8bcc1bf92af4948a52a75273c2403329149f6b5df6368c23840d1bb3f47af9e5ce543f7a36596a33896609574f02d WHIRLPOOL 735133455aec227149478cb273e41d33b7dbd77a6998682b6d80bdc72c77555cd745895adfcde1c194281c258131e7fce49254e79349fe112a5f146768fd1c51
 DIST nmap-7.50.tar.bz2 9309616 SHA256 e9a96a8e02bfc9e80c617932acc61112c23089521ee7d6b1502ecf8e3b1674b2 SHA512 b74c5711f03bae363164cdb7e62923ab938c81c7bbcd080eaa2d1acc89f09eb0a7e0f5deb9628b81057c7a35ecd487a2d09dfe3b58b0db6c84cf0b39f526e5f2 WHIRLPOOL 9fd0a9fb8de6e4e169cf7a9ce8b06b3e245f66aa3643cb6be4b1933d824091d4211d3207893f5bff5621c7746434db92a5745c3500e3ce8de1bb0c6e2820d365
 DIST nmap-7.60.tar.bz2 10394925 SHA256 a8796ecc4fa6c38aad6139d9515dc8113023a82e9d787e5a5fb5fa1b05516f21 SHA512 74ba8f6de026ade9ee6bb2252bee18a57210f8207977df7f1c04556629dcdc1e6127f33febc8a52ef88a1dac876116d590564dee4f1c23798c3ac37529991aa4 WHIRLPOOL ca5a10ca5a685c53fa37a72857c009333287c6559409fb1dfcc5edc5e48034b3d280f76e555e159156b5befc0167b9198673e07ccd2e6a0a80c2d3dc2395fff0
@@ -14,7 +15,7 @@ DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b
 EBUILD nmap-7.40.ebuild 4352 SHA256 ca57620e3f11cc066f64d9ab9368b691a12535dd5ce11e2666ec68144f02e93d SHA512 e7f602c98215e2583a88360493e24c4ade72994154bd24b524426edb64aa5a3c688aa5e841fb1bfedf73566f8e494108636c2d7f29201e7fe179a7aa13117f90 WHIRLPOOL fcea595f8eadf6f3da399af6f7a2fcf5023e62e9f93247f3f912f85b0931187a8d81f8d5532f278839b2b5665e7958178b669fa94b96461f86fead12d2591a13
 EBUILD nmap-7.50.ebuild 4353 SHA256 d4575223ddf8a3a7b315c3b3bd312d3bf5b08f05e31738f0d62eeb28068590c3 SHA512 f061ce79bc7c48fc30be3105c70e24621fcf0d0cfbfbe8416e67d10b497998117e4a782e073e14a52490d668916a180e2dab266ccdc2524733caff03d4aff482 WHIRLPOOL f2cdcf5218631273b69767d176f83b175d28a8ffb43607e140a6f5da29bffb75d77ca4ed76e3710dcd3a7af8aa3675514d95cae1650d5a3054bacc0ba6532057
 EBUILD nmap-7.60.ebuild 4567 SHA256 94d8a52179d43e8d93b3f139ba3efafd87b8f150f165baf4d7ff72279cc71afb SHA512 8648fbb304949199b84d4e74faf281dd2893fcd3eca75ed07d3424ef4c97b00f8bfac795d08bd3fa72620122f71eb8c4054366c029ba82b4f76bc2d1d44f50b1 WHIRLPOOL c190449eea7a1d5a3d75645d38df6e05845210a79bfaf322df90370569a10d7306d117692a89b8fb96b769fbbd1e4bc1b4a6383a34f37fb836892ac6e2eebbc5
-EBUILD nmap-9999.ebuild 4242 SHA256 802b6b00877bbc3bbd685c41b86eae12aeaedc1e2b52054ab1683c8a34794c33 SHA512 d8418a66dfff647f9a560981f63918370839a5e624c6435ebc73e4867117a0414c9b45978e14ba9bebb2539bd9f356339c328de4a2a75e03e0a88c6674bf2a8d WHIRLPOOL dc0b890eb00b1887dd72fe2c5efc47297457e728f2807974d82c5f71d965584a70f82fb9643525a97af027f6723352fd042a23b99a59c0da1c2bd967eaf9a73a
+EBUILD nmap-9999.ebuild 4382 SHA256 a793be94c089a9d88a9c5dbed97d890f6f8e5b66596c803e3b3ae90db3b9d7d3 SHA512 cf7694cb46891ce0e8fcd231085eb2adbced0e2ad9ad88e4fee5df72b4c34c81ff07fe55a0ef9fe661d98a1c4062e66f2963b33e23eb3728c2a8943da240d45b WHIRLPOOL 00ff01c970c4a0ff8f7f0cc84e79c3b7cce252a19a6052a82a82b07480e72e29f8ba00973300b27a5455dc7fab4896596be399e384656d14e74877ff0335d55f
 MISC ChangeLog 10254 SHA256 3365bab3624dfa11a549abeb9f5e39b56c5852688426950f8a1249699584c92c SHA512 e7eeb7818966a07001d0bef7585e0e23f6e206ea3546d731b26bd9ccbde3d16bc8718c6e2671f0e8569378225f86d48881655fba63cda15cf99ecc08d1bdb9eb WHIRLPOOL 49caea6a3ee438e0891c3a9144ab21b7b08343e806953924437a8160febfc8fe429634c616e4175d6bcb985356efe902c1a815f8de75ebfb12a0b44ad1117a60
 MISC ChangeLog-2015 43855 SHA256 2d0433ddb0eecf16df05f1cc0e283681a88020690caaf3fd4d6bd03d9e39fcc4 SHA512 16cfb6bc28cccd58800f7b66fb3465378abb4df2459595180a7956deef8e7e6761c80dd98f38c73883cffac72edd8ee7684f031c73e28cf13c2e6b039d2431a4 WHIRLPOOL 10ba3498a09130fa31e1a230254ec7c20fd6b3ff88a2840120a7e784a641037b5b430649b809f02dd4172b0f01848ed70d4203c4c4f0984dfa90d88742a0849f
 MISC metadata.xml 920 SHA256 a367e189b1a012a1b489b55664114d2d2c3fcef020f5c87a71be239adef02046 SHA512 56d44c71139e48b75a89140bedd2c4a1bc20c8fe99e16ee8b71fb490cb606997571de95d6ac93147bdee81bbcbb736588c87c43b9cd4f9fac71280416a499185 WHIRLPOOL a391aceab50e0f218616dcf891f701efdf4884ae7ff29c6a6a0deefbf0264847db7694bd7641d3ec238ac59be205d664aa16c491330a3ce04752528ca5bd5979
diff --git a/net-analyzer/nmap/files/nmap-9999-zlib.patch b/net-analyzer/nmap/files/nmap-9999-zlib.patch
new file mode 100644
index 000000000000..3f260ae48f41
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-9999-zlib.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -105,7 +105,7 @@
+ NSE_HDRS+=nse_libssh2.h
+ NSE_OBJS+=nse_libssh2.o
+ endif
+-ifneq (@LIBZLIB_LIBS@,)
++ifneq (@ZLIB_LIBS@,)
+ NSE_SRC+=nse_zlib.cc
+ NSE_HDRS+=nse_zlib.h
+ NSE_OBJS+=nse_zlib.o
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index d78311ad1c1b..f92eba2649f1 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite,xml"
 inherit autotools flag-o-matic git-r3 python-single-r1 toolchain-funcs user
@@ -24,24 +23,26 @@ IUSE="
 "
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
 IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
 REQUIRED_USE="
 	system-lua? ( nse )
 	ndiff? ( ${PYTHON_REQUIRED_USE} )
 	zenmap? ( ${PYTHON_REQUIRED_USE} )
 "
-
 RDEPEND="
 	dev-libs/liblinear:=
 	dev-libs/libpcre
 	net-libs/libpcap
-	libssh2? ( net-libs/libssh2[zlib] )
+	libssh2? (
+		net-libs/libssh2[zlib]
+		sys-libs/zlib
+	)
 	ndiff? ( ${PYTHON_DEPS} )
 	nls? ( virtual/libintl )
 	nmap-update? (
 		dev-libs/apr
 		dev-vcs/subversion
 	)
+	nse? ( sys-libs/zlib )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:= )
@@ -65,6 +66,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
 	"${FILESDIR}"/${PN}-7.25-libpcre.patch
 	"${FILESDIR}"/${PN}-7.31-libnl.patch
+	"${FILESDIR}"/${PN}-9999-zlib.patch
 )
 S="${WORKDIR}/${MY_P}"
 
@@ -75,7 +77,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	rm -r libpcap/ || die
+	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
 
 	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
 
@@ -135,6 +137,7 @@ src_configure() {
 		$(use_with ssl openssl) \
 		$(use_with zenmap) \
 		$(usex libssh2 --with-zlib) \
+		$(usex nse --with-zlib) \
 		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
 		--cache-file="${S}"/config.cache \
 		--with-libdnet=included \
diff --git a/net-analyzer/prometheus-alertmanager/Manifest b/net-analyzer/prometheus-alertmanager/Manifest
index b536416d42dd..522148de0425 100644
--- a/net-analyzer/prometheus-alertmanager/Manifest
+++ b/net-analyzer/prometheus-alertmanager/Manifest
@@ -1,5 +1,7 @@
 AUX prometheus-alertmanager.confd 56 SHA256 822dc8df1e3b74ddb51bdfd27cf312d24048f10040bf6cd7be53cce772619c5e SHA512 3ec5894fa121a3449f2b1c3f82283abc3fc31f39b4397760101a5d3c7c41a35cad50b03387542e4c950ae61bcc456b3ff4a92b52c53a04d12755005d0287d57e WHIRLPOOL 65a2b32dc9c8e5081b0c0f2acc22a2168f30a7bc58de6fe0619c6ab027ae76db4d232c93b10debd9554c183505b1fc5001b7026ee4799b97fbae24843bedbe07
 AUX prometheus-alertmanager.initd 587 SHA256 8e2e5d66d386500257cd8056bf9b7fe9d32c46a71c0cdd33dc0dca4ae4f40504 SHA512 7e19c82d62d9b226d2bc5926ba6a988bdd283bbeb911cb9339e451885ded5a1e9a4a1f5635f5d5266b23f3fbe896a334586c940ccc505ffbb84ff9fb9ff7d75f WHIRLPOOL 0662b12be3214f947f85246968e1026ad353e2243c3bead29a276d0b4c9f3a414376010925a6897a38f0d7e2af5b61c4ea6cda5389f70d355b79f743480f5597
+DIST prometheus-alertmanager-0.11.0.tar.gz 3683030 SHA256 0d1a27f220101cf6691adfd504311a824c95cf2ed02bed900536616aa398aaf3 SHA512 33e6d5010979a7abab032019c1e50bc3e8f3630dd7e2453b1a1b37ce1035694bc78ae748ad1903afef95b6646aa167a3c0fa7f4e7b74bd3f1336106ca998b342 WHIRLPOOL 6b63bce13242054d2bbc5838c38d79bf3d793337435863887fa16bd0954efeca6579730cbbb30e0215bdfcf239612887d03a2d1e9cc3746f836a14319a2df989
 DIST prometheus-alertmanager-0.9.1.tar.gz 3671292 SHA256 067e00773efd0948918a30449d5e96b5cc9b0b9ecb1271d75bbd46ad3944a699 SHA512 423079c630466a6c3eeaab56d60bd9b7c77049955e9a67b703ef51665ccf7af0b319e8e3748c8e6d055dcf442173028cbe475181be08221d93a5ad3d20900c65 WHIRLPOOL 1fdf9803ffb99bda6ca49f250ff2895e29a6a77b17b1f38f47ca1f858262580f307f56bd95f0a6e97cd7a0a04e3b0df1fe28401cc6f66b71a72311df0971b970
+EBUILD prometheus-alertmanager-0.11.0.ebuild 1340 SHA256 15450833232b61afeed4357118ffcaba26c5200ec9f5f37e4b642f61ba0bb6d5 SHA512 f16322bbd9bdf3709debaadbe39e8bc33d8f9422ead655554b43b791a52275901798dc3a1e02769c238f4255061cde4a03fe4fbec89c321b90262aca6d1ee6f0 WHIRLPOOL a92b03b5ade2301a434b1581237cbf970cd5fd995cd1c4e7687a76562da925f057ee041d38658f031b37624696b52869e1c18ab43d5a069b0fac84877655a17b
 EBUILD prometheus-alertmanager-0.9.1.ebuild 1340 SHA256 4e59b840318773b52452bcec046748333185053549ff1562b22ab6c23c93e208 SHA512 e9a557f400e3dac49a33c5773b9c51ae7780781098aa11a2167ed352aceac02667584f31f03859e44776d47f66c98468aa9575765ab39014855f5eb45e0d0f6b WHIRLPOOL 9ddb57b19cd6677a8efd221d15913911fb020f5b089354a1ff80e3c1e82b2cea312b0e3d32330888abeff93c934851d014e50c7c2e2d541807f3ac12f6d4cc83
 MISC metadata.xml 333 SHA256 87b061dda62d5911cfa1088391d83b6486b4fc817ddaf93d174dab1aca11c186 SHA512 2059ca45e92e3a833d93097362e1ae79ef085c35f87ec2bcbde4ee2d20f8938cb27fb19647d083990c1224b3d0c06f163a3f1bedfabfb59a6b3b15a90697ac0f WHIRLPOOL 188807823233f2274caa356920208f2395bc43fb8e839d0a016a165d99647e05a68e62a28aaf9b41f4f562deabcfdf988d27abece5de28bb3f0a9926434a2789
diff --git a/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.11.0.ebuild b/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.11.0.ebuild
new file mode 100644
index 000000000000..e634cb981727
--- /dev/null
+++ b/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.11.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/alertmanager"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+ALERTMANAGER_COMMIT="30dd042"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
+HOMEPAGE="https://github.com/prometheus/alertmanager"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${ALERTMANAGER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	mkdir -p bin || die
+	GOPATH="${S}" promu build -v --prefix alertmanager || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin alertmanager/alertmanager
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	insinto /etc/alertmanager/
+	newins doc/examples/simple.yml config.yml.example
+	popd || die
+	keepdir /var/lib/alertmanager /var/log/alertmanager
+	fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}