gentoo resync : 23.06.2018

9 files changed, 0 insertions, 664 deletions

diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest
index 02f8a24218ce..296aea8be541 100644
--- a/net-analyzer/pnp4nagios/Manifest
+++ b/net-analyzer/pnp4nagios/Manifest
@@ -1,16 +1,6 @@
 AUX 98_pnp4nagios-2.4.conf 725 BLAKE2B ca04f13ad57a90d339980566008d7176aed8be5def8ddb1d4e55ed9ef846900f690ca9bcf37893d73c559c8dea625a027966407f9b87c9ea474447dad9d61314 SHA512 9698529decd9587b4c48dfd5a92069645d4a8fb0796f05fea104459bc4a58aab081f10fc110d75e97331ec960e5fef71a85745c3ea58c6b9f6c37bcec4143000
-AUX 98_pnp4nagios.conf 1025 BLAKE2B ed7df45632b47395c0020ab8578cd9dccbf28cfffab430ff241b0a13e7f8f4ffefa80bd9bcfacbd20ddf27f0ac71251d709d66cf5e1d66aabf6be156335935e0 SHA512 ac7f4cd92951e856c5af44eb8cfa0c75a867364b6d3d76ed5fb2479631f9ae20587f2d0a09ff4810602665558210232ab41ce6abf53859884a956826cbb5bfc2
-AUX npcd 647 BLAKE2B 4e62fa54c2aac0eed23f5c8e81d831d03534e082a950ec374dae0c906a215893242bd0b9fae80b34d644a5f4069f55e069c9cad3d0a6d7573d61e67f89d21db6 SHA512 44facf1300e151f085851e5dfb67e2d67cccc3e9fd9169b15a160af78e02dfbb5e8720b4a63ad4ee61a5aedcdc86cd75520c2f5b0fce26a631d4a38b464af89f
 AUX npcd.initd 364 BLAKE2B b985e4951f95807f4d1d887cfe4f65780150ec827cbe6995e24a955290ce040c263c5848773f24c4ab8e05f5d78ab34693a3636bc8837aae8ef718e64f5c4e3c SHA512 efbf969865ce8f61a733ea0f0e3846854231b55d148dbf0121b4cf6022fedd94cb1ea8f717920f38aedddd6a8f33edf473f139599dc01cc2da14eedb80f7f4f2
 AUX pnp4nagios-0.6.14-makefile.patch 1057 BLAKE2B 623115771d66839df357cf19ceb0eac9600cac220cb77b77638c76ac1a5a419b7dd83145192779cfeb845a122729728bccd7cc069de1a4da51180aabbff1b91c SHA512 a67e4b66b0f24db25f9b67d982d99a90c20ad229d404537c9963b2e9f1c5df39a46faa34ecdeb1a9e69b46efd96104d97a39a7e326a01d1c2d09dcc149171602
-AUX pnp4nagios-0.6.25-rrdtool-0.6.0-support.patch 3578 BLAKE2B d452715960cbf2418d394d13a547177462cc97d30e19e7adfc9ba83e64d511efe6231a1020f2a4ed943ec10aa1e5cc97679a23d88c7ef0eae9a2fa5c5d71f800 SHA512 a0a5c57808b59b748c7d8cb3febe1b4f29fce1e37abe546ae65b4037da330f580b90f155f7c179f7ae8ddcc8d25d5e595d8e6d5699738531f22dfab40e5cfc84
-DIST pnp4nagios-0.6.24.tar.gz 2919182 BLAKE2B 95f2e00182e8fcce7bb17c56d0900def9c7a99c7f709983a906465a3033807fc673de64d2312f61446247b34a2bb56a06972fad225b7929ed87250abece7bb47 SHA512 7e8c32e0ac69ab747a57e8ab6cc59fddfb63e16598fda9c1e6270d6309ff0885cd1bd0876d05aa1d30bffa76b281d41dc8fbe59e430778bf4d3bdddc4a7bee9f
-DIST pnp4nagios-0.6.25.tar.gz 2921068 BLAKE2B 9497af2e5d2ffc24685f0cae6e3ab6b912765cb246b22dac2c93a196ebf13fce0909fcd4a1d94438ca986808168416f54ade97972d278a64d069d38fff8ebbb8 SHA512 e561fcac8243e6b1ab401312b4a05a6c752e2869da7366a22e4e48d54ae1e9c17c52cb2dffb1ca5748179f3bc856f779317196992643e9862eb09c4debf277c8
 DIST pnp4nagios-0.6.26.tar.gz 3039265 BLAKE2B 1adb3c41222e6bc93671af955a1564387d77901ce118f5d309d101d88c691140e0feef1c2594bc5db44706ff01505a4fcf99b79b6a0c5b5cb923838dd00f1ff0 SHA512 caf6dcced74967174d9e6f09dd1a5bee17397c10a68d0f577c37dcc836f928d78c20d75a0189539e9ffa93715ab7b6e732e9f36b9698cf4dd9c09cfb65184427
-EBUILD pnp4nagios-0.6.24.ebuild 1970 BLAKE2B f186f42c32e1f5e767c8e9de01c94d9d1b3c320c89577b90a4901dad29800b67027f441329876d9d453fe88697322b060685054681fef9c6a181f99d3325bad3 SHA512 248b5f4ff3bbaa3d2dd71ae1efbb5a65e1926ca709034e2e3d4c62966608f9e83c6136ed0be63586c5dbd4b1d5e0f56705ccd68ccefaeb9d420d89f8bd26fd02
-EBUILD pnp4nagios-0.6.25-r1.ebuild 2906 BLAKE2B 06c491fcc0b3396f8c118bfc136009d5854f14bcd8bb14246f911036271071f2b1e5ca6c3b87a2a05c2d1b4b4b9c55080863eaf083f22c2a93a858f1a45f3656 SHA512 f1c56eba7c88eb6359f50f637f871cedd22f74134522ba0b2e0de355411c4322f013fe438503b366986962072ba168ac4d015145b10aa6893b3999b6776707c5
-EBUILD pnp4nagios-0.6.25-r2.ebuild 2995 BLAKE2B 23f45b9bc7dbd7d6093fe70d5e070921aa134b8b73c670e1efc70e7156f87d13e2f1e15a9f76221e48f666be8cb436f33b906fd6efb73a2cd9ea5a99f320a94c SHA512 142625f3438c605aab45689b2965bdce80d905680a23f3fb40ffc1bb0b0487842235d28493df0042616341a8e93ee3ee79b70361502f2cd5b85d594d5400f447
-EBUILD pnp4nagios-0.6.25-r3.ebuild 2868 BLAKE2B bd9740058486234cfc4ae2f3452df23469b67011cf97e68289822b4448189d2f09560c4cb54548789485fcacf7a87a395757c3fa675491103e0c0628dae83680 SHA512 45b01c76de8002a28e804895d55e2fbeb5f5dac61a0f6dd5314b60ac0113f76007f58d4c586b7d3fd19ab8a54e544d64f76b4d3f0c6837dd83544a0868521ff0
-EBUILD pnp4nagios-0.6.25.ebuild 2909 BLAKE2B 048c5c1bccd6e87586a292ce249ce3143e79b13d341c0a95aaa37e8731a8698826391c1df61dcfa5cda9656201dbeab78393e4ca05f66aa900b2c3f1bec077ae SHA512 79633a38ff8bb00563edcd3ab5b1cad51f104eb696de227599fd4a6dc51fd0d9e5a7fe8c610c72f49bdf4c223834efe47b9456a19f1ad6c5706fb3a905285ae3
 EBUILD pnp4nagios-0.6.26-r9.ebuild 3101 BLAKE2B d4c6461563e1dd89223f8684f03c7d093b32846777238e15c8dd2aeff3ee5ab293f5f1ef968cfe229f11f25f2e9e6a3381244c05f0d343ab65499d191466bc2c SHA512 670fb5974ea643834f1a14e8b92b01daf2feafcfdf7af82b3aef11dc918c773693a791475a52eea0af87a4cc40acb048960657114a0e7bb7541cb1ef4418071a
 MISC metadata.xml 716 BLAKE2B 571931c0525f50709ef759d13290bb5606ad311954ce10a8fa60a521cd1fd5d1917316ddc32231c2d16c07b2c0d6fc17c38a81b317e1ed4927645f1663b315ba SHA512 ad8ef6398f119ad3a0d51613fb67546ff9ec43b57825f1f251d27ea3feaf3fe2cb0029f30c179db9dba79f984e14a15926268868930910266f97671c8bea2a55
diff --git a/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf b/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf
deleted file mode 100644
index 4879779a8f93..000000000000
--- a/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-<IfDefine PNP>
-        Alias /pnp4nagios /usr/share/pnp/
-        <Directory /usr/share/pnp>
-                AllowOverride AuthConfig
-                Order allow,deny
-                Allow from all
-                <IfModule mod_rewrite.c>
-                        # Turn on URL rewriting
-                        RewriteEngine On
-                        Options FollowSymLinks
-                        # Installation directory
-                        RewriteBase /pnp4nagios
-                        # Protect application and system files from being viewed
-                        RewriteRule ^(application|modules|system) - [F,L]
-                        # Allow any files or directories that exist to be displayed directly
-                        RewriteCond %{REQUEST_FILENAME} !-f
-                        RewriteCond %{REQUEST_FILENAME} !-d
-                        # Rewrite all other URLs to index.php/URL
-                        RewriteRule .* index.php/$0 [PT,L]
-                </IfModule>
-        </Directory>
-</IfDefine>
diff --git a/net-analyzer/pnp4nagios/files/npcd b/net-analyzer/pnp4nagios/files/npcd
deleted file mode 100644
index 9ae67362d645..000000000000
--- a/net-analyzer/pnp4nagios/files/npcd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-opts="${opts} reload"
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting npcd"
-	start-stop-daemon --start --exec /usr/bin/npcd \
-		-- -f /etc/pnp/npcd.cfg \
-		-d
-	eend $? "Failed to Start npcd"
-}
-
-stop() {
-	ebegin "Stopping npcd"
-	start-stop-daemon --stop --quiet -n npcd
-	eend $? "Failed to Stop npcd"
-}
-
-reload() {
-        ebegin "Reloading npcd"
-        kill -HUP `pgrep npcd`
-        eend $? "Failed to reload npcd"
-}
-
-restart() {
-	ebegin "Restarting npcd"
-	svc_stop
-	svc_start
-	eend $? "Failed to Restart npcd"
-}
diff --git a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.25-rrdtool-0.6.0-support.patch b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.25-rrdtool-0.6.0-support.patch
deleted file mode 100644
index 1a16d771c7b3..000000000000
--- a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.25-rrdtool-0.6.0-support.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 0a539e1c7ab03ec015c27e4ad0fe16343a98c269 Mon Sep 17 00:00:00 2001
-From: Louis Sautier <sautier.louis@gmail.com>
-Date: Mon, 25 Apr 2016 12:31:49 +0200
-Subject: [PATCH] Use complete option arguments for compatibility with rrdtool
- 1.6.0
-
-Since rrdtool switched to optparse, it seems that complete option
-arguments must be used:
-https://github.com/oetiker/rrdtool-1.x/commit/83530d3e43cebc32da157733d35c60bf4bb098da
----
- share/pnp/templates.dist/check_dns.php       | 2 +-
- share/pnp/templates.dist/check_multi.php     | 2 +-
- share/pnp/templates.dist/check_ping_tick.php | 2 +-
- share/pnp/templates.dist/check_users.php     | 2 +-
- share/pnp/templates.dist/default.php         | 6 +++---
- 5 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/share/pnp/templates.dist/check_dns.php b/share/pnp/templates.dist/check_dns.php
-index b8ab048..dad209a 100644
---- a/share/pnp/templates.dist/check_dns.php
-+++ b/share/pnp/templates.dist/check_dns.php
-@@ -4,7 +4,7 @@
- # Template for check_dns
- #
- 
--$opt[1] = "--lower=$MIN[1] --vertical-label $UNIT[1]  --title \"DNS Response Time\" ";
-+$opt[1] = "--lower-limit=$MIN[1] --vertical-label $UNIT[1]  --title \"DNS Response Time\" ";
- 
- 
- $def[1] =  "DEF:var1=$RRDFILE[1]:$DS[1]:AVERAGE " ;
-diff --git a/share/pnp/templates.dist/check_multi.php b/share/pnp/templates.dist/check_multi.php
-index ba6bcd1..cd0794a 100644
---- a/share/pnp/templates.dist/check_multi.php
-+++ b/share/pnp/templates.dist/check_multi.php
-@@ -4,7 +4,7 @@
- # Template for check_multi
- # 
- 
--$opt[1] = "--lower=$MIN[1] --vertical-label num  --title \"Number of Checks\" ";
-+$opt[1] = "--lower-limit=$MIN[1] --vertical-label num  --title \"Number of Checks\" ";
- $ds_name[1] = "Executed Plugins";
- 
- $def[1] =  "DEF:var1=$RRDFILE[1]:$DS[1]:AVERAGE " ;
-diff --git a/share/pnp/templates.dist/check_ping_tick.php b/share/pnp/templates.dist/check_ping_tick.php
-index 865479f..f191049 100644
---- a/share/pnp/templates.dist/check_ping_tick.php
-+++ b/share/pnp/templates.dist/check_ping_tick.php
-@@ -6,7 +6,7 @@
- # RTA
- #
- $ds_name[1] = "Round Trip Times";
--$opt[1]  = "--lower=0 --vertical-label \"RTA\" --title \"Ping times\" ";
-+$opt[1]  = "--lower-limit=0 --vertical-label \"RTA\" --title \"Ping times\" ";
- $opt[1] .=  rrd::darkteint();
- $def[1]  =  rrd::def("var1", $RRDFILE[1], $DS[1], "AVERAGE") ;
- $def[1] .=  rrd::ticker("var1", $WARN[1], $CRIT[1]) ;
-diff --git a/share/pnp/templates.dist/check_users.php b/share/pnp/templates.dist/check_users.php
-index 9fe878d..c66fc01 100644
---- a/share/pnp/templates.dist/check_users.php
-+++ b/share/pnp/templates.dist/check_users.php
-@@ -4,7 +4,7 @@
- # Template for check_users
- #
- 
--$opt[1] = "--lower=$MIN[1] --vertical-label \"Users\"  --title \"Users\" ";
-+$opt[1] = "--lower-limit=$MIN[1] --vertical-label \"Users\"  --title \"Users\" ";
- 
- 
- $def[1] =  "DEF:var1=$RRDFILE[1]:$DS[1]:MAX " ;
-diff --git a/share/pnp/templates.dist/default.php b/share/pnp/templates.dist/default.php
-index 6fdf38c..823ee6a 100644
---- a/share/pnp/templates.dist/default.php
-+++ b/share/pnp/templates.dist/default.php
-@@ -47,7 +47,7 @@
- 		$crit_min = $VAL['CRIT_MIN'];
- 	}
- 	if ( $VAL['MIN'] != "" && is_numeric($VAL['MIN']) ) {
--		$lower = " --lower=" . $VAL['MIN'];
-+		$lower = " --lower-limit=" . $VAL['MIN'];
- 		$minimum = $VAL['MIN'];
- 	}
- 	if ( $VAL['MAX'] != "" && is_numeric($VAL['MAX']) ) {
-@@ -55,8 +55,8 @@
- 	}
- 	if ($VAL['UNIT'] == "%%") {
- 		$vlabel = "%";
--		$upper = " --upper=101 ";
--		$lower = " --lower=0 ";
-+		$upper = " --upper-limit=101 ";
-+		$lower = " --lower-limit=0 ";
- 	}
- 	else {
- 		$vlabel = $VAL['UNIT'];
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild
deleted file mode 100644
index 7a79e5d51e9a..000000000000
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit depend.apache eutils
-
-DESCRIPTION="A performance data analyzer for nagios"
-HOMEPAGE="http://www.pnp4nagios.org"
-SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-
-DEPEND="
-	dev-lang/php[json,simplexml,zlib,xml,filter]
-	>=dev-lang/php-5.3
-	>=net-analyzer/rrdtool-1.2[graph,perl]
-	|| ( net-analyzer/nagios-core net-analyzer/icinga net-analyzer/icinga2 )"
-RDEPEND="${DEPEND}
-	virtual/perl-Getopt-Long
-	virtual/perl-Time-HiRes
-	media-fonts/dejavu
-	apache2? ( www-servers/apache[apache2_modules_rewrite] )"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.6.14-makefile.patch
-}
-
-src_configure() {
-	local var_dir=
-	local user_group=
-
-	if has_version net-analyzer/nagios-core; then
-		var_dir=/var/nagios/
-		user_group=nagios
-	else
-		var_dir=/var/lib/icinga/
-		user_group=icinga
-	fi
-
-	econf \
-		--sysconfdir=/etc/pnp \
-		--datarootdir=/usr/share/pnp \
-		--mandir=/usr/share/man \
-		--with-perfdata-dir=${var_dir}/perfdata \
-		--with-nagios-user=${user_group} \
-		--with-nagios-group=${user_group} \
-		--with-perfdata-logfile=${var_dir}/perfdata.log \
-		--with-perfdata-spool-dir=/var/spool/pnp
-}
-
-src_compile() {
-	# The default target just shows a help
-	emake all
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-config
-	newinitd "${FILESDIR}"/npcd.initd npcd
-	rm "${D}"/usr/share/pnp/install.php || die
-
-	if use apache2 ; then
-		insinto "${APACHE_MODULES_CONFDIR}"
-		doins "${FILESDIR}"/98_pnp4nagios.conf
-	fi
-
-	# Bug 430358 - CVE-2012-3457
-	find "${D}/etc/pnp" -type f -exec chmod 0640 {} \; || die
-	find "${D}/etc/pnp" -type d -exec chmod 0750 {} \; || die
-}
-
-pkg_postinst() {
-	elog "Please make sure to enable URL rewriting in Apache or any other"
-	elog "webserver you're using, to get pnp4nagios running!"
-}
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r1.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r1.ebuild
deleted file mode 100644
index ea74516d0c55..000000000000
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit depend.apache eutils
-
-DESCRIPTION="A performance data analyzer for nagios"
-HOMEPAGE="http://www.pnp4nagios.org/"
-SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-# A lot of things (sync mode, for one) are broken with nagios-4.x.
-DEPEND="
-	dev-lang/php:*[filter,gd,json,simplexml,xml,zlib]
-	>=net-analyzer/rrdtool-1.2[graph,perl]
-	|| ( <net-analyzer/nagios-core-4 net-analyzer/icinga net-analyzer/icinga2 )"
-
-# A list of modules used in our Apache config file.
-APACHE_MODS="apache2_modules_alias,"       # "Alias" directive
-APACHE_MODS+="apache2_modules_authz_core," # "Require" directive
-APACHE_MODS+="apache2_modules_rewrite"     # "RewriteEngine" and friends
-
-RDEPEND="${DEPEND}
-	virtual/perl-Getopt-Long
-	virtual/perl-Time-HiRes
-	media-fonts/dejavu
-	apache2? ( >=www-servers/apache-2.4[${APACHE_MODS}] )"
-
-# There is no want_apache2_4, but we needed to specify that manually
-# anyway to be able to include the list of modules.
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.6.14-makefile.patch"
-}
-
-src_configure() {
-	local var_dir=
-	local user_group=
-
-	if has_version net-analyzer/nagios-core; then
-		var_dir=/var/nagios/
-		user_group=nagios
-	else
-		var_dir=/var/lib/icinga/
-		user_group=icinga
-	fi
-
-	econf \
-		--sysconfdir=/etc/pnp \
-		--datarootdir=/usr/share/pnp \
-		--mandir=/usr/share/man \
-		--with-perfdata-dir=${var_dir}/perfdata \
-		--with-nagios-user=${user_group} \
-		--with-nagios-group=${user_group} \
-		--with-perfdata-logfile=${var_dir}/perfdata.log \
-		--with-perfdata-spool-dir=/var/spool/pnp
-}
-
-src_compile() {
-	# The default target just shows a help
-	emake all
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-config
-	newinitd "${FILESDIR}"/npcd.initd npcd
-	rm "${D}/usr/share/pnp/install.php" || \
-		die "unable to remove ${D}/usr/share/pnp/install.php"
-
-	if use apache2 ; then
-		insinto "${APACHE_MODULES_CONFDIR}"
-		newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf
-
-		# Allow the apache user to read our config files. This same
-		# approach is used in net-analyzer/nagios-core.
-		chgrp -R apache "${D}/etc/pnp" \
-			|| die "failed to change group of ${ROOT}etc/pnp"
-	fi
-
-	# Bug 430358 - CVE-2012-3457
-	find "${D}/etc/pnp" -type f -exec chmod 0640 '{}' + || \
-		die "unable to set file permissions under ${D}/etc/pnp"
-
-	find "${D}/etc/pnp" -type d -exec chmod 0750 '{}' + || \
-		die "unable to set directory permissions under ${D}/etc/pnp"
-}
-
-pkg_postinst() {
-	elog "To enable the pnp4nagios web front-end, please visit"
-	elog "${ROOT}etc/conf.d/apache2 and add \"-D PNP -D PHP5\""
-	elog "to APACHE2_OPTS. Then pnp4nagios will be available at,"
-	elog
-	elog "  http://localhost/pnp4nagios"
-	elog
-}
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild
deleted file mode 100644
index 7630fe3e6f9b..000000000000
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit depend.apache eutils
-
-DESCRIPTION="A performance data analyzer for nagios"
-HOMEPAGE="http://www.pnp4nagios.org/"
-SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-
-# A lot of things (sync mode, for one) are broken with nagios-4.x.
-DEPEND="
-	dev-lang/php:*[filter,gd,json,simplexml,xml,zlib]
-	>=net-analyzer/rrdtool-1.2[graph,perl]
-	|| ( <net-analyzer/nagios-core-4 net-analyzer/icinga net-analyzer/icinga2 )"
-
-# A list of modules used in our Apache config file.
-APACHE_MODS="apache2_modules_alias,"       # "Alias" directive
-APACHE_MODS+="apache2_modules_authz_core," # "Require" directive
-APACHE_MODS+="apache2_modules_rewrite"     # "RewriteEngine" and friends
-
-RDEPEND="${DEPEND}
-	virtual/perl-Getopt-Long
-	virtual/perl-Time-HiRes
-	media-fonts/dejavu
-	apache2? ( >=www-servers/apache-2.4[${APACHE_MODS}] )"
-
-# There is no want_apache2_4, but we needed to specify that manually
-# anyway to be able to include the list of modules.
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.6.14-makefile.patch"
-}
-
-src_configure() {
-	local var_dir=
-	local user_group=
-
-	if has_version net-analyzer/nagios-core; then
-		var_dir=/var/nagios/
-		user_group=nagios
-	elif has_version net-analyzer/icinga2; then
-		var_dir=/var/lib/icinga2/
-		user_group=icinga
-	else
-		var_dir=/var/lib/icinga/
-		user_group=icinga
-	fi
-
-	econf \
-		--sysconfdir=/etc/pnp \
-		--datarootdir=/usr/share/pnp \
-		--mandir=/usr/share/man \
-		--with-perfdata-dir=${var_dir}/perfdata \
-		--with-nagios-user=${user_group} \
-		--with-nagios-group=${user_group} \
-		--with-perfdata-logfile=${var_dir}/perfdata.log \
-		--with-perfdata-spool-dir=/var/spool/pnp
-}
-
-src_compile() {
-	# The default target just shows a help
-	emake all
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-config
-	newinitd "${FILESDIR}"/npcd.initd npcd
-	rm "${D}/usr/share/pnp/install.php" || \
-		die "unable to remove ${D}/usr/share/pnp/install.php"
-
-	if use apache2 ; then
-		insinto "${APACHE_MODULES_CONFDIR}"
-		newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf
-
-		# Allow the apache user to read our config files. This same
-		# approach is used in net-analyzer/nagios-core.
-		chgrp -R apache "${D}/etc/pnp" \
-			|| die "failed to change group of ${ROOT}etc/pnp"
-	fi
-
-	# Bug 430358 - CVE-2012-3457
-	find "${D}/etc/pnp" -type f -exec chmod 0640 '{}' + || \
-		die "unable to set file permissions under ${D}/etc/pnp"
-
-	find "${D}/etc/pnp" -type d -exec chmod 0750 '{}' + || \
-		die "unable to set directory permissions under ${D}/etc/pnp"
-}
-
-pkg_postinst() {
-	elog "To enable the pnp4nagios web front-end, please visit"
-	elog "${ROOT}etc/conf.d/apache2 and add \"-D PNP -D PHP5\""
-	elog "to APACHE2_OPTS. Then pnp4nagios will be available at,"
-	elog
-	elog "  http://localhost/pnp4nagios"
-	elog
-}
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r3.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r3.ebuild
deleted file mode 100644
index 2044e45a7e0d..000000000000
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A performance data analyzer for nagios"
-HOMEPAGE="http://www.pnp4nagios.org/"
-SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-# A lot of things (sync mode, for one) are broken with nagios-4.x.
-DEPEND="
-	dev-lang/php:*[filter,gd,json,simplexml,xml,zlib]
-	>=net-analyzer/rrdtool-1.2[graph,perl]
-	|| ( <net-analyzer/nagios-core-4 net-analyzer/icinga net-analyzer/icinga2 )"
-
-# A list of modules used in our Apache config file.
-APACHE_MODS="apache2_modules_alias,"       # "Alias" directive
-APACHE_MODS+="apache2_modules_authz_core," # "Require" directive
-APACHE_MODS+="apache2_modules_rewrite"     # "RewriteEngine" and friends
-
-RDEPEND="${DEPEND}
-	virtual/perl-Getopt-Long
-	virtual/perl-Time-HiRes
-	media-fonts/dejavu
-	apache2? ( >=www-servers/apache-2.4[${APACHE_MODS}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.14-makefile.patch"
-	"${FILESDIR}/${P}-rrdtool-0.6.0-support.patch"
-)
-
-src_configure() {
-	local var_dir user_group
-
-	if has_version net-analyzer/nagios-core; then
-		var_dir=/var/nagios
-		user_group=nagios
-	elif has_version net-analyzer/icinga2; then
-		var_dir=/var/lib/icinga2
-		user_group=icinga
-	else
-		var_dir=/var/lib/icinga
-		user_group=icinga
-	fi
-
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/pnp \
-		--datarootdir="${EPREFIX}"/usr/share/pnp \
-		--with-perfdata-dir="${EPREFIX}"${var_dir}/perfdata \
-		--with-nagios-user=${user_group} \
-		--with-nagios-group=${user_group} \
-		--with-perfdata-logfile="${EPREFIX}"${var_dir}/perfdata.log \
-		--with-perfdata-spool-dir="${EPREFIX}"/var/spool/pnp
-}
-
-src_compile() {
-	# The default target just shows a help
-	emake all
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-config
-	einstalldocs
-	newinitd "${FILESDIR}"/npcd.initd npcd
-	rm "${ED%/}/usr/share/pnp/install.php" || \
-		die "unable to remove ${ED%/}/usr/share/pnp/install.php"
-
-	if use apache2 ; then
-		insinto "${APACHE_MODULES_CONFDIR}"
-		newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf
-
-		# Allow the apache user to read our config files. This same
-		# approach is used in net-analyzer/nagios-core.
-		chgrp -R apache "${ED%/}/etc/pnp" \
-			|| die "failed to change group of ${ED%/}/etc/pnp"
-	fi
-
-	# Bug 430358 - CVE-2012-3457
-	local f
-	while IFS="" read -d $'\0' -r f ; do
-		chmod 0640 "${f}" || die
-	done < <(find "${ED%/}/etc/pnp" -type f)
-
-	while IFS="" read -d $'\0' -r f ; do
-		chmod 0750 "${f}" || die
-	done < <(find "${ED%/}/etc/pnp" -type d)
-}
-
-pkg_postinst() {
-	elog "To enable the pnp4nagios web front-end, please visit"
-	elog "${EROOT%/}/etc/conf.d/apache2 and add \"-D PNP -D PHP5\""
-	elog "to APACHE2_OPTS. Then pnp4nagios will be available at,"
-	elog
-	elog "  http://localhost/pnp4nagios"
-	elog
-}
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild
deleted file mode 100644
index 8c83a932fe0c..000000000000
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit depend.apache eutils
-
-DESCRIPTION="A performance data analyzer for nagios"
-HOMEPAGE="http://www.pnp4nagios.org/"
-SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-# A lot of things (sync mode, for one) are broken with nagios-4.x.
-DEPEND="
-	>=dev-lang/php-5.3:*[json,simplexml,zlib,xml,filter]
-	>=net-analyzer/rrdtool-1.2[graph,perl]
-	|| ( <net-analyzer/nagios-core-4 net-analyzer/icinga net-analyzer/icinga2 )"
-
-# A list of modules used in our Apache config file.
-APACHE_MODS="apache2_modules_alias,"       # "Alias" directive
-APACHE_MODS+="apache2_modules_authz_core," # "Require" directive
-APACHE_MODS+="apache2_modules_rewrite"     # "RewriteEngine" and friends
-
-RDEPEND="${DEPEND}
-	virtual/perl-Getopt-Long
-	virtual/perl-Time-HiRes
-	media-fonts/dejavu
-	apache2? ( >=www-servers/apache-2.4[${APACHE_MODS}] )"
-
-# There is no want_apache2_4, but we needed to specify that manually
-# anyway to be able to include the list of modules.
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.6.14-makefile.patch"
-}
-
-src_configure() {
-	local var_dir=
-	local user_group=
-
-	if has_version net-analyzer/nagios-core; then
-		var_dir=/var/nagios/
-		user_group=nagios
-	else
-		var_dir=/var/lib/icinga/
-		user_group=icinga
-	fi
-
-	econf \
-		--sysconfdir=/etc/pnp \
-		--datarootdir=/usr/share/pnp \
-		--mandir=/usr/share/man \
-		--with-perfdata-dir=${var_dir}/perfdata \
-		--with-nagios-user=${user_group} \
-		--with-nagios-group=${user_group} \
-		--with-perfdata-logfile=${var_dir}/perfdata.log \
-		--with-perfdata-spool-dir=/var/spool/pnp
-}
-
-src_compile() {
-	# The default target just shows a help
-	emake all
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-config
-	newinitd "${FILESDIR}"/npcd.initd npcd
-	rm "${D}/usr/share/pnp/install.php" || \
-		die "unable to remove ${D}/usr/share/pnp/install.php"
-
-	if use apache2 ; then
-		insinto "${APACHE_MODULES_CONFDIR}"
-		newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf
-
-		# Allow the apache user to read our config files. This same
-		# approach is used in net-analyzer/nagios-core.
-		chgrp -R apache "${D}/etc/pnp" \
-			|| die "failed to change group of ${ROOT}etc/pnp"
-	fi
-
-	# Bug 430358 - CVE-2012-3457
-	find "${D}/etc/pnp" -type f -exec chmod 0640 '{}' + || \
-		die "unable to set file permissions under ${D}/etc/pnp"
-
-	find "${D}/etc/pnp" -type d -exec chmod 0750 '{}' + || \
-		die "unable to set directory permissions under ${D}/etc/pnp"
-}
-
-pkg_postinst() {
-	elog "To enable the pnp4nagios web front-end, please visit"
-	elog "${ROOT}etc/conf.d/apache2 and add \"-D PNP -D PHP5\""
-	elog "to APACHE2_OPTS. Then pnp4nagios will be available at,"
-	elog
-	elog "  http://localhost/pnp4nagios"
-	elog
-}