gentoo resync : 03.12.2017

10 files changed, 333 insertions, 49 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 8efc8866343e..597d6ae41bbf 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/dhcp_probe/Manifest b/net-analyzer/dhcp_probe/Manifest
index fc116d0a6ff9..0256521d330e 100644
--- a/net-analyzer/dhcp_probe/Manifest
+++ b/net-analyzer/dhcp_probe/Manifest
@@ -9,6 +9,7 @@ AUX 1.3.0/08-man8.patch 612 BLAKE2B 9d20491e8f4c138f580fef215b2ee1c30b6b02594fe0
 AUX dhcp_probe.confd 221 BLAKE2B 0d54b9705fc70d1bacffd62b9017d484c6534f737e69ac5b8172f17fa6d3cd682b5458983074456b19f5669aa3d4e09267d0946d5e43637b009d640b1c3059b5 SHA512 c12c574da59c4727470c4add4f1bad1a6787329218f2af5cfa17dac46de1bde546011b24e95c06900c173885eb9d152965d8edaed07117cc36f19755da157f47
 AUX dhcp_probe.initd 1189 BLAKE2B 8b6aa24418782d4efb551f7c6d7e1d78852681034829c1b323636467c4e0cd8c8d642b0dc976641d31bca8485134ac0beb0287b8ee61c25c6b149d140102ff7e SHA512 bca85a97c55625a7a72241edf738b61dc13b2c96b8ef53fef6d7594d744b0b65f0c0b0d3aad209b629906f13bb39591240a224bb0d59a2516a924ec921463742
 AUX dhcp_probe_mail 627 BLAKE2B 830dd02b1e309fc343692d91feb0380a13b8b3889ebf1fea5b29f085b15ad8a8bf4bcf75a9cb836229c503532fc48cfaab6b651b9d578b743a91f96bdfb68b0c SHA512 2a66c702d71835115a0a3b340d2c9e256ce2de6a983247dd4e2c3c0d908a5ac9f0cf7ffbbe45c1e441e906833c7091eb0c19b6c6034ca46edf1d635dfa15b0c0
-DIST dhcp_probe-1.3.0.tar.gz 211613 SHA256 227cd6a82a7fa4d989994cb076f18092bc2c82592ceaeb31c4fdd09294b9265f SHA512 d643012529ee5149adbc0c1f19f8e579c55201e86de2aec9b3313be9412db4e973162f864d1baaf79fa340b7bd9a7385f0f1406d1b616e801ced3c7bb387c854 WHIRLPOOL 86a48b10f4a843b95b1b0ec0a3938d831966c701f5d341902595fb0d0b6fede2d9d5ba03a3e3ebaab6a311a6536df02ace1f36613a177392302b6e523a5e98f6
+DIST dhcp_probe-1.3.0.tar.gz 211613 BLAKE2B cbcc43b292fe537216ef40de9e417c1f700be4ad5f34feacd9475eb31866b68957ce66c5abc47db3b7e5a0dc8751ca6e54200b79ab2f1f8c3f308f6c1c7aef4d SHA512 d643012529ee5149adbc0c1f19f8e579c55201e86de2aec9b3313be9412db4e973162f864d1baaf79fa340b7bd9a7385f0f1406d1b616e801ced3c7bb387c854
 EBUILD dhcp_probe-1.3.0-r3.ebuild 933 BLAKE2B 64f2fb43c42f48e057d6b434511cfa237b03c4e4d1be618149099f6d488cb1b4ce6672dec3a4e4c730a0bd6a8e91b632e8209c52a7e6bb65721373de9baac56b SHA512 3bd008e5a8299dc9a8799f03ad23032e10d85e390ab218a25609db1180a2083b7ce51b7773c2be6689c4ae42783350f6646272e90fa0e8d15cf62b9057b45f7c
+EBUILD dhcp_probe-1.3.0-r4.ebuild 1129 BLAKE2B 95bbeadb7d309e8f776ba911e9dbe7a67c93f81e39917eafc134e35ef21d79c7eac0c7fe1ddfce72db69486d0fbcd85bb5573eaf504d932f4b737b58d9b6636d SHA512 f54f7e4e3d79c82b3f36ffff0ea14639d677f6e2cbc872a671cffb9848c62116a2b12b7a433506330ee05435390e08ebe2a1458128487f0839e9cf3108653233
 MISC metadata.xml 521 BLAKE2B 07e75a2da58fd92619929b8c5b33edb63317a304999977c5a29bdb5fa96e35fde034a575b376a9fa312fb7158661439d647692b8728d41dabee50c5627add65e SHA512 c04b196d9e86da49576a5300f10039f9d82df0684e626c1d0517ba70b4eccd5306f681821ba6e2539d557b1cc1b33680ac2137879ab11f247db1fd62c1626c9f
diff --git a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r4.ebuild b/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r4.ebuild
new file mode 100644
index 000000000000..9f05421d375a
--- /dev/null
+++ b/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic
+
+DESCRIPTION="discover DHCP and BootP servers on a directly-attached Ethernet network"
+HOMEPAGE="http://www.net.princeton.edu/software/dhcp_probe/"
+SRC_URI="http://www.net.princeton.edu/software/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND="
+	net-libs/libpcap
+	>=net-libs/libnet-1.1.2.1-r2
+"
+RDEPEND="${DEPEND}"
+DOCS=(
+	"${FILESDIR}"/${PN}_mail
+	AUTHORS
+	ChangeLog
+	NEWS
+	README
+	TODO
+	extras/dhcp_probe.cf.sample
+)
+PATCHES=(
+	"${FILESDIR}"/${PV}/01_dhcp_probe.5.patch
+	"${FILESDIR}"/${PV}/02_dhcp_probe.8.patch
+	"${FILESDIR}"/${PV}/03_implicit_point_conv_bootp.c.patch
+	"${FILESDIR}"/${PV}/04_linux_32_or_64bits.patch
+	"${FILESDIR}"/${PV}/05-cleanup.patch
+	"${FILESDIR}"/${PV}/06-return.patch
+	"${FILESDIR}"/${PV}/07-comment.patch
+	"${FILESDIR}"/${PV}/08-man8.patch
+)
+
+src_configure() {
+	use amd64 && append-flags -D__ARCH__=64
+	STRIP=true econf
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+}
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 9155c38804ee..ab939953bb4d 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -6,8 +6,9 @@ AUX icinga-lighty.conf 465 BLAKE2B fe68f22ac43b2010c50fb47da1219e8e60d5f68ea57ee
 AUX ido2db-conf.d 35 BLAKE2B ca911fa8d9094fc5507849fdc4787156e0015676ee0e77006093af867120af9783d53f91b90493960acdc2878273fe10730bef36bdcc26c017a4a2d3400cf6cc SHA512 c2988f205ce29daaacd2daa20ceb285da2b76e2a68bb5dd695874e73b275714eaea5e0b6bb0afaf7e5d875a9e89ee35c7dfcdb5c77513b2f1a59fbbd28f49f4f
 AUX ido2db-init.d 822 BLAKE2B 6affaf5af609a93ee1c12b9ff0b76e3cd4883ab26e58fedd6bff36978873b6347c005d0ba5018e3b0bb40771b1f8eebf259a6f387786154243a0b00b1c8e4b04 SHA512 8593a676389aae540a4fa3e4c7c6f558254da018b13b8dda7a932307645029775659b1258c68fa2178086978c59250be4820b0cc1a3d3c7ded276aa17a3b9b6e
 DIST CVE-2015-8010_1.13.3.patch 177807 BLAKE2B c3832442d2953f28793236cd29c537041fc68e976e593da4793cd55c240de784c5bb3996ff38464097b3af27bb276d21c7538c90d2470d5067a831b1800f2874 SHA512 bc82e588db33fbb955002cf51ae7b0e40109d4ec3fa6199b046ffbf23b649d74fbdd04c8fb4a5af4cd44301e26f30aa295a9574281c14bc45eec2b9149a6339a
-DIST icinga-1.13.4.tar.gz 18741576 SHA256 5690f6b3f3340d341a265fe61598ff3f64cb7d135a0059e791b51c77bcd4833b SHA512 245f94facfcbb125ed6be26a2544292b7ce6d59a6d38374b7ef1b24b2ca3deaaff56720542c3747d36ab4998b88b367ca40bbd061491e0770e21505bd7c0a1d6 WHIRLPOOL 92c444ae98139c570b420cef83182401ee7756328a4edd89b52187c1844526aea0e374839395df082fff4504e2ace14366488a2d1d0864998890add32cd08c40
+DIST icinga-1.13.4.tar.gz 18741576 BLAKE2B fccc88c8749d405e29961e5a1510bec7f920fc43910be757668392098f4ff19ed9f659de911f97e150eea8bd8cfd7a60b440704bdcd9aba450ba1ea29222d1cf SHA512 245f94facfcbb125ed6be26a2544292b7ce6d59a6d38374b7ef1b24b2ca3deaaff56720542c3747d36ab4998b88b367ca40bbd061491e0770e21505bd7c0a1d6
 DIST icinga-1.14.0.tar.gz 20779347 BLAKE2B 65899e99fdc57563aa1dee6f19572c032c5ab6e2aa7093482bd6d6068b4d066d3630ce9bf1396efcb65592d4f25292149178dac81a2a0b775745f70b7409bcc0 SHA512 f02c60c2bd1d3dff4a5a42f9d3c3362ada421f2cd83362b3cdd05f59b0aafe4f61255b621afed1fbf959415545a94ce6b3124bf2ffac22f0f2bdb8a67e75ad7a
 EBUILD icinga-1.13.4.ebuild 7956 BLAKE2B 656e1db2b2d7ae0d1b7ccb2eb931565212732e2530542c1bb81cdc293f79bcc7909cc80964e475e29bd40a93abded0377dd3fcbb01640bbaa1dd846716053459 SHA512 ec0b90e102cc5f0b282731f923c15b259c4581f35eaed8eafd13678f9455754f808004b38c0f03eb723ff61fcffb51750f90163e6c4b2b5c887a286e029c429f
+EBUILD icinga-1.14.0-r1.ebuild 7690 BLAKE2B 944178a531f71617ee1c9a546d83e62636e306281a1578f14b1b125eddc7b0bd99858abb60ff3a87be419c71d4a0c6846c095178344c687aa70c2040f9388df8 SHA512 7fda9feaffb708bb911ddec60f72311ce90b383ec936bf7e13a927f073dc63d07dbd4422d8e0250c619a82a09587e39868eb1bbc9f265f409e6c67dee9a0551c
 EBUILD icinga-1.14.0.ebuild 7920 BLAKE2B d5fe3a133c5733b7116376e4ca7c64ca7c621a6dfea314c6464e40d11004151a647594ca9502dff679236d7783d85465fab5b48efdb833d8421243462065dc42 SHA512 ef73833c299d5dba38c489e77a8faf22356949bc7599f5e6da2d3540921015507410062227d7330a42155b32e3d84cca252b4366fc43e735d39f3c6a3d1111cd
 MISC metadata.xml 853 BLAKE2B 6825b192328f944e2389f221e4dbf5fffea45f1cb650866a8240e53c723ae9b40473e092d48003844fd99b65db4e6ddc7747eddbf7239e7cf4ecddfcca375eb8 SHA512 1aad02d84c0e90f4f0f5ed54e326d9a14e77f5146b3ba9293279e009f45900a69e1b2fcc9f54cb02111f05bb2aef0370cda1b4bc4fffa4fc4dd0c2a073e0a92b
diff --git a/net-analyzer/icinga/icinga-1.14.0-r1.ebuild b/net-analyzer/icinga/icinga-1.14.0-r1.ebuild
new file mode 100644
index 000000000000..bf0de98f741b
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.14.0-r1.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator
+
+DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
+HOMEPAGE="http://www.icinga.org/"
+#MY_PV=$(delete_version_separator 3)
+#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+#S=${WORKDIR}/${PN}-${MY_PV}
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz"
+S="${WORKDIR}/${PN}-core-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
+DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
+	perl? ( dev-lang/perl:= )
+	virtual/mailx
+	web? (
+		media-libs/gd[jpeg,png]
+		lighttpd? ( www-servers/lighttpd )
+	)
+	!net-analyzer/nagios-core"
+RDEPEND="${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )"
+RESTRICT="test"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	enewgroup icinga
+	enewgroup nagios
+	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
+	eapply_user
+}
+
+src_configure() {
+	local myconf
+
+	myconf="$(use_enable perl embedded-perl)
+	$(use_with perl perlcache)
+	$(use_enable idoutils)
+	$(use_enable ssl)
+	--with-cgiurl=/icinga/cgi-bin
+	--with-log-dir=/var/log/icinga
+	--libdir=/usr/$(get_libdir)
+	--bindir=/usr/sbin
+	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+	--datarootdir=/usr/share/icinga/htdocs
+	--localstatedir=/var/lib/icinga
+	--sysconfdir=/etc/icinga
+	--with-lockfile=/var/run/icinga/icinga.lock
+	--with-temp-dir=/tmp/icinga
+	--with-temp-file=/tmp/icinga/icinga.tmp"
+
+	if use idoutils ; then
+		myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
+		--with-icinga-chkfile=/var/lib/icinga/icinga.chk
+		--with-ido-sockfile=/var/lib/icinga/ido.sock
+		--with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
+	fi
+
+	if use eventhandler ; then
+		myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
+	fi
+
+	if use plugins ; then
+		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
+	else
+		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
+	fi
+
+	if use !apache2 && use !lighttpd ; then
+		myconf+=" --with-command-group=icinga"
+	else
+		if use apache2 ; then
+			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
+			myconf+=" --with-command-group=apache"
+		elif use lighttpd ; then
+			myconf+=" --with-command-group=lighttpd"
+		fi
+	fi
+
+	econf ${myconf}
+}
+
+src_compile() {
+	tc-export CC
+
+	emake icinga
+
+	if use web ; then
+		emake DESTDIR="${D}" cgis
+	fi
+
+	if use contrib ; then
+		emake DESTDIR="${D}" -C contrib
+	fi
+
+	if use idoutils ; then
+		emake DESTDIR="${D}" idoutils
+	fi
+}
+
+src_install() {
+	dodoc Changelog README UPGRADING
+
+	if ! use web ; then
+		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile
+	fi
+
+	emake DESTDIR="${D}" install{,-config,-commandmode}
+
+	if use idoutils ; then
+		 emake DESTDIR="${D}" install-idoutils
+	fi
+
+	if use contrib ; then
+		emake DESTDIR="${D}" -C contrib install
+	fi
+
+	if use eventhandler ; then
+		emake DESTDIR="${D}" install-eventhandlers
+	fi
+
+	newinitd "${FILESDIR}"/icinga-init.d icinga
+	newconfd "${FILESDIR}"/icinga-conf.d icinga
+	if use idoutils ; then
+		newinitd "${FILESDIR}"/ido2db-init.d ido2db
+		newconfd "${FILESDIR}"/ido2db-conf.d ido2db
+		insinto /usr/share/icinga/contrib/db
+		doins -r module/idoutils/db/*
+	fi
+	# Apache Module
+	if use web ; then
+		if use apache2 ; then
+			insinto "${APACHE_MODULES_CONFDIR}"
+			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf
+		elif use lighttpd ; then
+			insinto /etc/lighttpd
+			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf
+		else
+			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
+			ewarn "out-of-the-box. Since you are not using one of them, you"
+			ewarn "have to configure your webserver accordingly yourself."
+		fi
+		fowners -R root:root /usr/$(get_libdir)/icinga
+		cd "${D}"
+		find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
+		find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
+	fi
+
+	if use eventhandler ; then
+		dodir /etc/icinga/eventhandlers
+		fowners icinga:icinga /etc/icinga/eventhandlers
+	fi
+
+	keepdir /etc/icinga
+	keepdir /var/lib/icinga
+	keepdir /var/lib/icinga/archives
+	keepdir /var/lib/icinga/rw
+	keepdir /var/lib/icinga/spool/checkresults
+
+	if use apache2 ; then
+		webserver=apache
+	elif use lighttpd ; then
+		webserver=lighttpd
+	else
+		webserver=icinga
+	fi
+
+	fowners icinga:icinga /var/lib/icinga
+	fowners -R icinga:${webserver} /var/lib/icinga/rw
+
+	fperms 6755 /var/lib/icinga/rw
+
+	# ensure ownership
+	fowners -R root:root /etc/icinga
+	fperms 0750 /etc/icinga
+	fowners -R root:root /usr/sbin
+	fowners -R root:root /usr/$(get_libdir)
+	fowners -R root:root /usr/share/icinga/htdocs
+
+	# paxmarks
+	if use idoutils ; then
+		pax-mark m usr/sbin/ido2db
+	fi
+}
+
+pkg_postinst() {
+	if use web ; then
+		elog "This does not include cgis that are perl-dependent"
+		elog "Currently traceroute.cgi is perl-dependent"
+		elog "Note that the user your webserver is running as needs"
+		elog "read-access to /etc/icinga."
+		elog
+		if use apache2 || use lighttpd ; then
+			elog "There are several possible solutions to accomplish this,"
+			elog "choose the one you are most comfortable with:"
+			elog
+			if use apache2 ; then
+				elog "	usermod -G icinga apache"
+				elog "or"
+				elog "	chown icinga:apache /etc/icinga"
+				elog
+				elog "Also edit /etc/conf.d/apache2 and add a line like"
+				elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
+				elog
+				elog "Icinga web service needs user authentication. If you"
+				elog "use the base configuration, you need a password file"
+				elog "with a password for user \"icingaadmin\""
+				elog "You can create this file by executing:"
+				elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
+				elog
+				elog "you may want to also add apache to the icinga group"
+				elog "to allow it access to the AuthUserFile"
+				elog
+			elif use lighttpd ; then
+				elog "  usermod -G icinga lighttpd "
+				elog "or"
+				elog "  chown icinga:lighttpd /etc/icinga"
+				elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
+			fi
+			elog
+			elog "That will make icinga's web front end visable via"
+			elog "http://localhost/icinga/"
+			elog
+		else
+			elog "IMPORTANT: Do not forget to add the user your webserver"
+			elog "is running as to the icinga group!"
+		fi
+	else
+		ewarn "Please note that you have installed Icinga without web interface."
+		ewarn "Please don't file any bugs about having no web interface when you do this."
+		ewarn "Thank you!"
+	fi
+	elog
+	elog "If you want icinga to start at boot time"
+	elog "remember to execute:"
+	elog "  rc-update add icinga default"
+	elog
+	elog "If your kernel has /proc protection, icinga"
+	elog "will not be happy as it relies on accessing the proc"
+	elog "filesystem. You can fix this by adding icinga into"
+	elog "the group wheel, but this is not recomended."
+	elog
+	if [ -d "${ROOT}"/var/icinga ] ; then
+		ewarn
+		ewarn "/var/icinga was moved to /var/lib/icinga"
+		ewarn "please move the files if this was an upgrade"
+		if use idoutils ; then
+			ewarn "and edit /etc/ido2db.cfg to change the location of the files"
+			ewarn "it accesses"
+			ewarn "update your db with the scripts under the directory"
+			ewarn "/usr/share/icinga/contrib/db/"
+		fi
+		ewarn
+		ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
+		ewarn "remove /var/icinga afterwards to make this warning disappear"
+	fi
+}
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index ba1b7f5e6e21..80449f084003 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,13 +1,13 @@
 AUX fix-missing-include-2.7.1-2.patch 680 BLAKE2B a86b733d4a63e4f5e25eb6c1c6d923f4379c683f546b63f1e2a38b7662063c4c1782e9835bdc72a1eb57b3bab93a390af18f0c8d8595aea0f2365b3f5bee3a45 SHA512 4d1fc39182029c4eb191298dcf4a39b0c5f2f806f8f2e0c6a1f98c64dd76d9181ca3b7090a73e63e66787c71cb337c76be3eae365d784903e79929ff0e644556
 AUX fix-missing-include-2.7.1.patch 597 BLAKE2B f714fbc7622d4cf7b472507eea99c4353a0250e414648b53762969f0af38c3b0d24df1dba57812d6d030d3954fdd2e305df5fdbc3e6673812f8603dad091f415 SHA512 8d889b62d058cdbf318b47252abbb6a7a17e4463376868b94efb9fe875f386093dfa39026226c46a280486520c2e2fe136828810aad5fa2f7aebedc6ca8ee466
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
-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.7.0.tar.gz 2435398 BLAKE2B 06a717f818a7c51972d2d095ea1c588ff8d49473aaa765795d1c48ed4ffc12b2c5d560a03a2be3fe45d8d80de8df2b53edcf75d895e0f31cd4723c4883907b47 SHA512 470dd4ffa4ef608a018ede5c25b41f16213bf18c679eed8aaeed155fe6adc74a70abcc2e8be42ca20bf60f9b4b620c971ebbc96d608de2a90e480d72b93111bb
+DIST icinga2-2.7.1.tar.gz 2475348 BLAKE2B 2e19a3c199b5cbcac78490a9ee1961c8e54f15787d08fa22150a977fb16aa7e736e76b97b66749ebd4070e9d0bfb0c8a484b8430288845de9ac456771d875682 SHA512 8233c33b7191706569a236d583fff689b35eba750fca01a06cfd14ef636b01314b6b142d78777987bd08a9df1cc53f42652fd1c900532b73f0a0363aa220c6cd
+DIST icinga2-2.7.2.tar.gz 2471098 BLAKE2B 362897613616a15114577a044d56f01093246fa421c307faff1c6208a01e2c62dda2d1ff3aabc2e57b58c1cc6d4cb841a51758f0572945be2eced22390eb98ae SHA512 69cd7c56eaae832712723fcd21e2177b8180b3975bcf773223ca52d3817d1ca538cfd620002bd7a9ccf2e89deffa80d07e6281111146295b21377de99170302d
 DIST icinga2-2.8.0.tar.gz 2497043 BLAKE2B 06472b30ad1fa008796fb149ac067cf92062443d4c6ef62043b6e53b901e1c282c68d1949a3ac6eabc33456c3863bb5dfe45cd668b23ac22e705e3e346afbd59 SHA512 20399251c91aa3b07a0e884e0c52fa2540b645d24fd46cdb550fcc5accfbfa23a703f7d310ccde4fa68008c44e8dc6bcdc5351a21e82181e39b1add5a92d90c6
 EBUILD icinga2-2.7.0-r1.ebuild 4648 BLAKE2B 08a2478b8dae25efdfc9cd05c0221b6121c8c0a82a656c7cc6cbae9435fc0bb0a5e404b9363d89bfc5c2705550e8bf64905934175c38108eece05b2076bf43db SHA512 aa2c2ac86a697c75a4ef4c14a8ae1f57164d7614e06082aadbed2b43bcd8762938ac8afd9beb64c982bfb4e29dc5d08b530987248132e218247b8c930195837f
 EBUILD icinga2-2.7.1-r1.ebuild 4758 BLAKE2B e5699067582e9bfac6012fee8a84dfa7885b7987c8992eb1047f1c8a014120ad1b6d6f6501bfcbf3c841b0f0fcad9f2355a0f5ca06b07a2fc797f23f7861534f SHA512 62084a343b8362cbb2b6a2d25e10366e6739316a90152b57e8542b53026dde020196b96e67d20cd9dce199cf551d2d2a34685d6ea3b97878fe76524e5212a280
 EBUILD icinga2-2.7.2.ebuild 4760 BLAKE2B 2ee60166986809c528dd1c09c42a99dbd3a61f16e90540ca2fa6d3c6fbfba140679e663a333247c22ded647b6579bd2d392d4a3b5707cda167c9be95ad57f49d SHA512 87fa97f3731c5c5c4e6801fd40d2a235fd43039ecf2ab78f969cea26c8115a20dc42d4499a9bfe987335131ceb053e6f7994db806466d932a9fe54119e34c734
-EBUILD icinga2-2.8.0.ebuild 4672 BLAKE2B c4d8ae24f14c6c3a24e7e379358bc908803499bb2e72ead217ccc1731a28d099f0841f711bc693a880edd63844c057bfae76aeed590abb9cbb3604ac3f80ca8b SHA512 ca43d0efe3bfa1b8612b90e46722b0be82fee8833a3d355733b656d8381c9f0424d0cdb4c11c290617815f6161745e02c2324613a6435ee0fa52c22268b6e232
-EBUILD icinga2-9999.ebuild 4640 BLAKE2B e5069da49c9bd8ad85acd1ce625830a4288286e6f4f35842befbf20dd86ebac444a7d1ed620d074e99687dba631b32e64e45b2566b151c4a4a158ca526e40ae2 SHA512 af60417cf3d755e82fdef7fbb3ce310e20e35ca4d68696d67e4d53340bd747e94058da89bb7f6ca1ae31317d76471291d276fcbd1cd51edfef615db1a31f1688
+EBUILD icinga2-2.8.0.ebuild 4640 BLAKE2B e504abae176dafdbcaa9f5a75377d257d8eb58695ced25a72acc4acb3230825fee0f1ad2502f094cad6991bde8a79a55ca4c76487d1dd5b1a32ab36697cc855c SHA512 a16c826b90c384188dadfd4eefc9de838d9bb073f5bbca9639ef83fd1c5e857059a78a2690b281060a3ee52768c3384ac44c5a4731457bd368b6234d307ae45d
+EBUILD icinga2-9999.ebuild 4608 BLAKE2B e3c3b8c7c93458ee579764b087395cc004855dee56cc463a22d2787c541661e5963cf8d7b9d70374c302d1a82e3453a750c16d51d55daed81496b998335d9cc8 SHA512 d6d1d15e9e3e7bfb461c9eee901448cd489bb2fd86575291790e463c16d133ec1ecf15f72f3a67e5a9ee3de4dba450ad51b6940c5b966ae688d8a9d51ba4d5fc
 MISC metadata.xml 816 BLAKE2B 6d820358c90a580be01149ae631f40dbeb5f50ce0df937ac484269c9a58f21a450d3861dce3b34ee0882b3b61d981da8162af735c5a3de90bb7b74dae9523d08 SHA512 0d3ac2d9233f7ce53a8105caed0231cefa402861e26c760de3fb23163ea68c21b97f5ec0de65bc6953aaf2dd8fa90a9edc045a2fea8b622efdd1336959e9e60b
diff --git a/net-analyzer/icinga2/icinga2-2.8.0.ebuild b/net-analyzer/icinga2/icinga2-2.8.0.ebuild
index a65926a88a9a..d7a19c659ca5 100644
--- a/net-analyzer/icinga2/icinga2-2.8.0.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.8.0.ebuild
@@ -75,7 +75,6 @@ src_configure() {
 		-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
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 11f3af622732..ebdd790be879 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -72,7 +72,6 @@ src_configure() {
 		-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
diff --git a/net-analyzer/tsung/Manifest b/net-analyzer/tsung/Manifest
index a12bc46554bc..831856d49431 100644
--- a/net-analyzer/tsung/Manifest
+++ b/net-analyzer/tsung/Manifest
@@ -1,5 +1,3 @@
-DIST tsung-1.6.0.tar.gz 1585794 SHA256 56846c3a90fd7037d9a76330cb8f3052238344491e2fe6ef1ebdb0b620eb3d84 SHA512 c66a84fc9b6781398ed4dee67f076fcddca28c5156782c05d6f5d7ce3e5e2ed6dbdb4076585f45a42aea65237b68aa08c8c80539706202a10cfec4e3ac8170cd WHIRLPOOL 3f083239c6c0950b6420dd7d401d0267f30655f5a3470f136326e6cc35414f779d58eb8e8aeac40eecb279976f5228369e5786e9df2b582e4ed75b45dc9fd35b
 DIST tsung-1.7.0.tar.gz 1572265 SHA256 6394445860ef34faedf8c46da95a3cb206bc17301145bc920151107ffa2ce52a SHA512 67490a95fb54f5196ae0302190190a6b8e79bbeba9a7c1932d83a949504489d4cc3ce048380c0cb09c6cae4c1e203d52de9ea0e2f4e7c3d7438b836aef532dac WHIRLPOOL f9175aebcff944b13550a11d10cd20cae8a0a1afadf6b40ab30aad6b02894008db0b340ff48f32ef76c0856be9921c4fcf2d877120937d1fe1ab869efe36825c
-EBUILD tsung-1.6.0.ebuild 738 BLAKE2B 45c0cb113b62798d2383042f742640bf7131aa75ab625c7d9a81b0fa02ae918627f766250a777dfbfc701fc04aae2e3bba4d0fa73ae421e8a00520ae6f054465 SHA512 12fbc734c700bb8e019bae98edbfdc68dd7c526bfb39fef52812ac493d11953157a97b92241893788b3b65724709cd973135badc436661314a8a14e207f655dc
 EBUILD tsung-1.7.0.ebuild 738 BLAKE2B d763a8f22b2a483b84d303631fdbbb08feed9a4c3751728b9bd4a0ca478f257cc2ef3d93e1e73581df3187a25bb8d50845c30d0e8c734e56826763f2d0e2e39c SHA512 b4c4badf3577f83f7a42fc7135157b6b5410a0535a3310b46eaf13fee0eed826155e32a851448f6e0c90422518bf6874b8f307eb2e17788f44e5eeb466bc90f8
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/net-analyzer/tsung/tsung-1.6.0.ebuild b/net-analyzer/tsung/tsung-1.6.0.ebuild
deleted file mode 100644
index 532e451fbaf4..000000000000
--- a/net-analyzer/tsung/tsung-1.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-# Seems to be misconfigured
-RESTRICT="test"
-
-inherit eutils
-
-DESCRIPTION="Erlang's multi-protocol distributed load testing tool"
-HOMEPAGE="http://tsung.erlang-projects.org/"
-SRC_URI="http://tsung.erlang-projects.org/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnuplot"
-
-DEPEND="dev-lang/erlang"
-RDEPEND="
-	gnuplot? (
-		sci-visualization/gnuplot
-		dev-perl/Template-Toolkit
-	)
-	${DEPEND}
-"
-src_configure() {
-	./configure --prefix="/usr" || die "econf failed"
-}
-
-src_compile() {
-	emake || die "Failed building"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "Failed installing"
-}