gentoo resync : 15.11.2017

11 files changed, 194 insertions, 131 deletions

diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index 4fa872acef7f..31aed8ff1a38 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -1,6 +1,6 @@
 DIST ettercap-0.8.2.tar.gz 8082561 SHA256 f38514f35bea58bfe6ef1902bfd4761de0379942a9aa3e175fc9348f4eef2c81 SHA512 18137b1cc518c9db3c9650157a5cbf09dbb665b79876a24875d6c5125e8923ebde543464adb61cf1d1244101242f4d66b80d94ef3b36aa265cefca7646aa6415 WHIRLPOOL 3acc250a8c8929cf3f5533edf0e4657b8670525542f1f727c0ecd2af560db9de9004c16e880f05577fffa5cedd5535b448d4e675e3adbd4ae11675ee8f229bfd
-EBUILD ettercap-0.8.2.ebuild 1635 SHA256 309b330402a61105b667d3c25e5191c6ed191640a96a6fbceaad33515cbe4d9a SHA512 898efe8f5940791be61dda3406628bb9d4b857148fe3cc7d8a879fd0eeb2d1407887bff50f3fa7722fec0f2c34f5d3cb938dbd88f60c71fd7fc0d115e1bf5632 WHIRLPOOL d53134759daebcb17095faa4fa2ab23e2602c7424779823d32d703412406859505f954fba60b7a9e0dae389de21c11ab8e44175e593ce96606fef0a3aee94a54
-EBUILD ettercap-9999.ebuild 1944 SHA256 f3ecb944900ba35d84ee88f3bc6d9bde3f344d3c31d356f000c5a3b03977be87 SHA512 1651bd8444ab6decf9f0284f99b6924e318e80a04edf8acc6061e3698d10a35e6eb91d24b0cb906e3b9dd07471654e6887a57a24c206b748dd0e84d1520d5e0f WHIRLPOOL 9e3ba242c075e365ac180aa2400208056e7e6f2171c1a1913ad02bc8d08b6f43157db09c35788a3a4e5a457b8ac2da3ef1fcfef3aba5578d843ae649b3d5e94d
+EBUILD ettercap-0.8.2.ebuild 1660 SHA256 11e2f36f840d8c80f42bd876de2af172d2a409bf80c92c783199577f7545f636 SHA512 d8a2b9dc5f6952cbffb15fe18689a7e3587a8d40e52159e65aaea9199f0de43da48bfc6b9c5ee6ab008f24f424d8350b0095246689d7ce36c4cd0a8c9f4f1015 WHIRLPOOL 146e2762a5d41ab5a16906bd549316f1b244d9df38cb7b80d59d86ff44efc697288c8a6673c80f1ae959aa07e94543b7411921fe7b6bbb7b7e08ac8cd113b7b1
+EBUILD ettercap-9999.ebuild 1969 SHA256 044cfd925df3d6233bd5211d8f1794c4f1af9a25f908fdbd4be627ab2ea2e231 SHA512 d94cd0e2655ba36f02a1fb2431c8902f4b60f3f9389f30631c8dbfc73ebce9021069800f74c97faaf31aa33d4370bb3b523998242b448aa04fa8b5f875d90493 WHIRLPOOL 7ec4b278d01792b506c4df0eeb27eb3fb209440017d31fbe1653e2dc7806f2124c3ca523bcf695947efc79ac221159906918893c23998f71c068aef86b083d39
 MISC ChangeLog 2622 SHA256 c47011a5aa62600858d363d96e9e215cd94417988b6950b147414f767c19f8bd SHA512 d2e4a950ed58c817e3f37e6b82bdf03cc94d88a61d0bc9c8db3d9d64f11b54456571e4071549ab1e337b7b0e20097143a9b890185f5dec019642ac7776101fec WHIRLPOOL 5187f295c1a5371512c7f76ac7880a244589483a3b7b5ee28fe9e76dbfd542b4670d5a88d4fabf0a2fdf3eace5f11445a0cb6186696985ba1b72a9584020a56a
 MISC ChangeLog-2015 22295 SHA256 ac8da1367d3f7b72f8a2621f2880416422009247cd51675a7a2a05d99b324e1f SHA512 9edad2e9cdf22c2dc7a289b4518db2e7a3219e9584404f922e6c7a31cbf4dbb1a6091de2b4599faf1aebbf5f3844b3a01cedb018a3142f6cc285efc5082a4518 WHIRLPOOL ce858740ffe5c912721948cb682d31e2b1fdfe85845dfb752d68d35dce864ff6884da5d458cf62ea93a25ce2843458e0295af3ae5cd0adaa4d8457838be25f46
 MISC metadata.xml 657 SHA256 6371ec1d11cb1075012628eb33eb6f7f10396c19f7314e1771a5edb76703a784 SHA512 0b682cb596f905882f2c0682c163d31410b94ca873a468db93e155103aeb1e943bff1c55bde1c9537478ce324d368f468bcb91c98f0aefb9dfa2a2239d7f73d5 WHIRLPOOL ff1a15b34ead7dddfab2af34b98872c5e9450ce661dc87bffe12ec8ef91622da9287267a074e403ff91129d7df1e4e36c80c4a967d96c94d57e805a620e4f0b5
diff --git a/net-analyzer/ettercap/ettercap-0.8.2.ebuild b/net-analyzer/ettercap/ettercap-0.8.2.ebuild
index f2f9af225aa5..7cb81f8684c1 100644
--- a/net-analyzer/ettercap/ettercap-0.8.2.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,6 +37,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
+	cmake-utils_src_prepare
 }
 
 src_configure() {
diff --git a/net-analyzer/ettercap/ettercap-9999.ebuild b/net-analyzer/ettercap/ettercap-9999.ebuild
index 548bda336349..c8f2e6e8f41b 100644
--- a/net-analyzer/ettercap/ettercap-9999.ebuild
+++ b/net-analyzer/ettercap/ettercap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -47,6 +47,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
+	cmake-utils_src_prepare
 }
 
 src_configure() {
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 24cd98c5489f..0df70bf89024 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -3,8 +3,10 @@ AUX fix-missing-include-2.7.1.patch 597 SHA256 9616dc5c074379b5dbb4aabdb96a1b1e9
 AUX icinga2.initd 2276 SHA256 13a2603c0ba54aa095e17cb31489b9e30a4c9d0262c6b053d8dfd710b6784d8b SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082 WHIRLPOOL a78ca106fab9e3f9689abc6723656e49368ff499021f5fbdbede04a6933e54a252567c615d40c007f7311c9dd464632af2a6503866303fe45ad619d0479d8968
 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
 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
 MISC ChangeLog 12523 SHA256 6b33c1cd3ef131f9444c216ae86700732bf8d9c571ab558db1157b4d21c5abdf SHA512 5bd2ff47e0bf2714f6bdaf4339a3a7ed95a59b528bf25680831236be63d753603cc8e60de6ff7826c69e20154ba650c7c2b27a0775ac7f118b833a1d048c56f9 WHIRLPOOL 8858e1686faa46a57c300161254950d2332a632bf857e6394e3818ada73e40802a458a2ad61acd5715df35c94f8cd54df054486d1482b432eb798f0a41bf8d4f
 MISC ChangeLog-2015 6716 SHA256 319e8121e497e7d44d8f115750f68283a6605b9a6ff1f0ade569b8b660a21e67 SHA512 e1618c3469eba79ff34786b5e357add06044f61154070cc726951eed6609f3e458656f61a1daed11caf42b13aaf7a91eced1924a1ad7491c4a12e91e50e39d10 WHIRLPOOL b715c79bc75d0613a864a7338e869bbd7fa6cab0e65e36e5c32e8124f2f4159ec45837195c5e2ca285249fd518ff04db10063065353a30ae49b4868a04f2d8c0
diff --git a/net-analyzer/icinga2/icinga2-2.7.2.ebuild b/net-analyzer/icinga2/icinga2-2.7.2.ebuild
new file mode 100644
index 000000000000..2f4dc84145d7
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.7.2.ebuild
@@ -0,0 +1,182 @@
+# 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=(
+	"${FILESDIR}/fix-missing-include-2.7.1.patch"
+	"${FILESDIR}/fix-missing-include-2.7.1-2.patch"
+)
+
+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/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index 5f467d74eee9..a6c90304b376 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -3,7 +3,6 @@ DIST nagios-plugins-2.0.3.tar.gz 2659772 SHA256 8f0021442dce0138f0285ca22960b870
 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.ebuild 2979 SHA256 29d987c96b656566dcc806be515cf6fd157f707f813830bd520fef7690616589 SHA512 d11747ef8007eedb29f51598bdd2109fbb17a8cc93304b441b22be94fbbbb4ce8b59132340e20999428123650972708f3812fc8134cc95256d4ab09cff6f2ba2 WHIRLPOOL 5db78b4a161216381bf3cb3d1488c37f9fd37ae7f0702d0778cdf06047763823bcd4f0710bb2bbb1a38b9b8924f8197645702161cf0d27bd95cde41dc70dc073
 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.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1.ebuild
deleted file mode 100644
index 25ec7dd32f37..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="Official plugins for Nagios"
-HOMEPAGE="http://nagios-plugins.org/"
-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"
-IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres samba selinux snmp ssh +ssl"
-
-# Most of the plugins use automagic dependencies, i.e. the plugin will
-# get built if the binary it uses is installed. For example, check_snmp
-# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
-# installed. End result: most of our runtime dependencies are required
-# at build time as well.
-#
-# REAL_DEPEND contains the dependencies that are actually needed to
-# build. DEPEND contains those plus the automagic dependencies.
-#
-REAL_DEPEND="dev-lang/perl
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:* )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)"
-
-DEPEND="${REAL_DEPEND}
-	nagios-dns? ( net-dns/bind-tools )
-	nagios-game? ( games-util/qstat )
-	nagios-ping? ( net-analyzer/fping )
-	samba? ( net-fs/samba )
-	ssh? ( net-misc/openssh )
-	snmp? ( dev-perl/Net-SNMP
-			net-analyzer/net-snmp[-minimal] )"
-
-# Basically everything collides with nagios-plugins.
-RDEPEND="${DEPEND}
-	!net-analyzer/monitoring-plugins
-	selinux? ( sec-policy/selinux-nagios )"
-
-# At least one test is interactive.
-RESTRICT="test"
-
-DOCS=(
-	ACKNOWLEDGEMENTS
-	AUTHORS
-	CODING
-	ChangeLog
-	FAQ
-	NEWS
-	README
-	REQUIREMENTS
-	SUPPORT
-	THANKS
-)
-
-src_prepare() {
-	default
-
-	# Fix the path to our perl interpreter
-	sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \
-		"${S}"/plugins-scripts/*.pl \
-		|| die 'failed to fix perl interpreter path'
-}
-
-src_configure() {
-	# Use an array to prevent econf from mangling the ping args.
-	local myconf=()
-
-	if use ssl; then
-		myconf+=( $(use_with ssl openssl /usr) )
-	else
-		myconf+=( --without-openssl )
-		myconf+=( --without-gnutls )
-	fi
-
-	# The autodetection for these two commands can hang if localhost is
-	# down or ICMP traffic is filtered. Bug #468296.
-	myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
-
-	if use ipv6; then
-		myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
-	fi
-
-	econf \
-		$(use_with mysql) \
-		$(use_with ipv6) \
-		$(use_with ldap) \
-		$(use_with postgres pgsql /usr) \
-		"${myconf[@]}" \
-		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
-		--sysconfdir="/etc/nagios"
-}
-
-pkg_preinst() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-pkg_postinst() {
-	elog "This ebuild has a number of USE flags that determine what you"
-	elog "are able to monitor. Depending on what you want to monitor, some"
-	elog "or all of these USE flags need to be set."
-	elog
-	elog "The plugins are installed in ${ROOT}usr/$(get_libdir)/nagios/plugins"
-}
diff --git a/net-analyzer/ripe-atlas-tools/Manifest b/net-analyzer/ripe-atlas-tools/Manifest
index f4f6be5a1bf6..961aed22fede 100644
--- a/net-analyzer/ripe-atlas-tools/Manifest
+++ b/net-analyzer/ripe-atlas-tools/Manifest
@@ -6,4 +6,4 @@ EBUILD ripe-atlas-tools-1.2.2.ebuild 1269 SHA256 4880a21716763697ddbb0b33d782968
 EBUILD ripe-atlas-tools-1.2.3-r1.ebuild 1303 SHA256 948be222379f8c3cc5bc874fcfa135341f22a06fdf0d20789f2407764dc08311 SHA512 0fbb6e077ae0855fa070620a34b0c63f6a6a749b6e9cd871ecbd94a0ec4bd4d8ae3f6e28ccd4365b67c584c720fa33e1c9dfbdcdebaada5c1cbe74ec232e8c14 WHIRLPOOL 55541881cdaddefed595120b345c805858a7d5a24ae277f24247b1264531e815582fcad5167988c78c67b800ed0c36a0d1134f5a8be9582107ee477f93684450
 EBUILD ripe-atlas-tools-1.2.3.ebuild 1301 SHA256 7b654b3ad0f5401c2317284380b8a30f5e586bb1307a5d06619484d1cd44a977 SHA512 c7fd5df592c73ee30e4341fe4494f601a716c52538ab3d0f71294648a5e7668cd2261c5bc215d5a48ee2d26abe0018ae5b0bff92013aa4e6e6fed606d427d59a WHIRLPOOL 8ba79e2b6ee7d8752041009410d4e5c9d8cd6d3fcf4afa8bd4749a9d3919b02091f44fbe2b348f147e8939790ad58d18f298fafda3000001e6c08acdf1c8229f
 MISC ChangeLog 2096 SHA256 8ebbc85ba10caf4071da1edca158faae5f33601502cbd65deed891082f9d7226 SHA512 f4c865118392635f062fa90b55baada65dc57fe2708c9b6f1d96052b8d390161beff161a888a7422fe5c84950d4639fc260cbfe8efeeffb8a42a7cfcd9c03b55 WHIRLPOOL fbb4679c391ce7eb8271a4083a50a44083e8aac1d24afa458606f678099cbaffbcb56f539488ece922539f9ec06098c65bf3c8bec863f047ac1b40f3af1ea70c
-MISC metadata.xml 523 SHA256 950faa567998fcc1ae440778eee961376693f6414f07ce08ab49cacc31680dad SHA512 e1d1bfcfeec6ef799e20d0133bd577d8a7106d4828eecff1c4d2baced482067d40023bbd4539d2b2407504fb9055d52beab22d3bc829ceee647fad570dbcd1d7 WHIRLPOOL 3841103376f373e9f4b7bb4611673dd6d9647538e78ab312035eae341ca7371652a75bb26ecee4ef962075543cd481d9e18d365611e17559fa6a1b8e84d7759c
+MISC metadata.xml 245 SHA256 39f9b86005d116d4007c5365bbefd4e3abe45d021f53492b3e4cb0e53cc95cff SHA512 d4e3e22b2dde06b42ba712b048c38c8809da125ad6eacb06823f2013d5c9c9b82a4a0b5ffc104f0b786ef048700980c72bed9cabb90a1003db929d2ead0db9d5 WHIRLPOOL 2b47d1721ed62ca56bb97a9887296ec76a212814be0889d2190fc17f74b074f1d2510c45aad26a096aa1332bef60460b9766eb504fb030dc17479684528d83c8
diff --git a/net-analyzer/ripe-atlas-tools/metadata.xml b/net-analyzer/ripe-atlas-tools/metadata.xml
index f57278f1e3c7..d68fdc3559c5 100644
--- a/net-analyzer/ripe-atlas-tools/metadata.xml
+++ b/net-analyzer/ripe-atlas-tools/metadata.xml
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@danielquinn.org</email>
-		<name>Daniel Quinn</name>
-		<description>Proxied maintainer; set to assignee in all bugs</description>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">ripe.atlas.tools</remote-id>
 	</upstream>
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 9cde2e940b47..2087eb0604cb 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,7 +5,7 @@ AUX wireshark-99999999-androiddump.patch 198 SHA256 7607082abf45448fd4def4693522
 DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44
 DIST wireshark-2.4.2.tar.xz 28791712 SHA256 d1acb24735fd35e18e9b7a0555ec58277c2b87da45a19ebeb8087c3dda55f47d SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417 WHIRLPOOL 245454643e138c61ccb380ae236482fea702cf4c0507de1c1d3d6dc9f7312809533db7b0fba585f95b8caf5b76affa4da23ad263b8f95174dfbb9c2ee3300177
 EBUILD wireshark-2.2.7.ebuild 6489 SHA256 0978c03c370a2d1b8e2e910bd1c3a57f8cd6984fa2e25b15e152b3fbbd4b95b9 SHA512 3aad3004619a02cd4a2bb8a9d4f87e0a669e2ea23a0e83377056477af4a2b5a6f7ed95d9c7fe1373e847fb186c014c87f5cb96f5f32d4bff7bfc2700710301f9 WHIRLPOOL a3715bb7c19f1007dac053ec1aaf1e49232b31605ec55761884bb6556e19fb1f0b53440657bf0f49330630d5beef435881f157cb6af3be02cc5cfd90134c156f
-EBUILD wireshark-2.4.2.ebuild 7341 SHA256 25f8c3f7da9f8a1c57b842faf8dd5385836815991f69ca52eb9bddc47dfeaf65 SHA512 531a6e329021adffd3d6ad7935b817c8fbdbd7b9956e96765ae68d484351a227bf8d38df175c2c437549ce842ebb48e6eda7c03ede374ffef257bdf045a67051 WHIRLPOOL 86eeecb80d0282370cb04b50537b676616a466db1024d305239f4b12bf8c2aaa7c05d48a6ba7fb81a7eaa938e5c64fe1cfd38c2be725b2c1281197d37a203df0
+EBUILD wireshark-2.4.2.ebuild 7340 SHA256 5447ac997eda17162abd853321abf30c5946c25933ae4b79de5ef2d0e7381d6d SHA512 94be379d87fc115c63d536babb6c078f589595d1d2034a4834c1344d35f791f41bc0aa29d29aeb5696807bb3b6ac451e302439ac764e3d4a43ad3dde56b8328e WHIRLPOOL d967f0b7e1588bbab8fb700b910a3faf2caa050d801a43b46b10f0ae6e095040e7b6c60027f4d39d745b2a779135d2b0d17bea7e81ac775422662a7956cc6c40
 EBUILD wireshark-99999999.ebuild 7244 SHA256 72ba7b56f2f65ede095d2694d246225ce9162512166962bcede6fe89d842cc52 SHA512 84107c356b10259f6b230931ff136c3dcd364e7aa928cc29609d253ec36e11193e7f723548965c9f085c49040a9ddcf9bfcfd476242178b25ae8213eb0617742 WHIRLPOOL e985f39f06d5dbda4a4a71290b8f024ef483c65ac3c5cf2fe9aac02c79f7ef685eeefeb5a0a5a75c75765342116d554983620aec0f24b893c86db9cdc19c9e61
 MISC ChangeLog 28152 SHA256 4d533b118cf6326befb9d60fef7212306a14528010f3c1864ea6657e20b00605 SHA512 1dbf03f303e0e05eb243d70595fd88e7ea4d14e397a3d717fe2ac9ba05e2407e1928f2cd78b7bc6fe205ce8d660e75b6f11608546b32a70ffc1ec24629567fd5 WHIRLPOOL fbb5a086aa52c90e28c392813dd7b8ade906f4376ec596741e2396b9160e2e64a45148a793b45530ae3ab6dd744dccf6c30261cdf354ada3a50c11a545afd811
 MISC ChangeLog-2015 107469 SHA256 077b97e93bc0bcebd520af0c72ec9df8da0af9b004423b34190b15c201341b2b SHA512 ce81239e7a9731845ee59ef8206094263b501ab74130cf2a34f8e052e6bf431f019c116c732e2b290c1c61e65ab548e1e10009d1d269cc83fed7f295aee555bc WHIRLPOOL 936c3ea54e274000a61a4114c7d69415f7289183b7c7f75b72925fa9ca0f0f6d42a4ef367d625d4e5892587eee680bbf63eb2945fbc4a98e68b04907ed3fdbc5
diff --git a/net-analyzer/wireshark/wireshark-2.4.2.ebuild b/net-analyzer/wireshark/wireshark-2.4.2.ebuild
index 9372865de979..e67516f52289 100644
--- a/net-analyzer/wireshark/wireshark-2.4.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ~ppc ppc64 x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
 	+dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua