gentoo resync : 03.03.2019

4 files changed, 0 insertions, 473 deletions

diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 3c1451e5122d..5e7633532eae 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,12 +1,8 @@
 AUX 99_nagios4.conf 368 BLAKE2B 147f4b73bd2f7d71dabb56f646399b939d3a87c288efed9b135e9401120e81c27e2a05f96982b62e601d1dd9b21be494e866103467a363336234b8b15095daf1 SHA512 f0b239f23d74afa89483806f27fb9259054e46bc5742de8a414c9a9a9852a4fbdc14db45aeb148a15288196c8f7d51bdd485b005e20d012892e9e7321b50e161
 AUX lighttpd_nagios4.conf 325 BLAKE2B f89b9d5aed8305d54f76adf29c65ba20bee74b6c82d149c8b0a786dddacc58c62337072691136c486d4050d1e3bce82420398d5f525ebc0bb36eefdf3a6a2e7f SHA512 a2f854713512ee8ee5c451235beb6ffccf2e04617a98619c6de807a5abca0a424e0581c34b4d255dcbc108e677e18bed25dd33e3d38df8fe10d7d8d4fab015c9
-AUX nagios-4.4.2-pre.patch 7936 BLAKE2B 143d1d80ae6d940165f5bff8e27deaee216f2a06b465968060b5a29da79ef2ec5277f3484c9b0774ad62284740b8513571e4df574c82acd03db341b6d5984d80 SHA512 0aa946192ab5f24b22f5c0737d8e2f5764317ee5e1ceab9d9c97b43eb2a4f3a8856c370d3a26d91ea9727b4e17f77876e790e399bf67a01eef3221c116a4558c
-AUX nagios-4.4.3-pre.patch 1479 BLAKE2B cc3f4b1e04f82ec97c5b15e7cb15defb7d700d776ee4faf0123d74afac998b8897796f77924e30e3dd1999d48f15b112481dd4bac4a6d5f5f01774881aad3b3c SHA512 fea7837f745efb85e64450b6cf3795cb011d3d5cf4d70e1e51b5037474f09943d94e2216839d9290fa8507176b14794c1028fd26d2c84f3259e728a3dcbca994
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820 SHA512 f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
-DIST nagios-4.4.2.tar.gz 11301454 BLAKE2B 1b5ffa775bbf147e96d07edd36a387db271802d58cc1a1d1eb867645955aec0044e757785578a60c12549bd4e66e4c95ef06dd0f3f8be3599187d0ef0bcc8a4b SHA512 a6ddb2d8ca1c523d02659a2af0b9c67a3802893c946279bb15be53645dc64c997cd5562b77eab9dae03e756ec6622a9a641f7bd68269aba4ddd56ee21f50959e
 DIST nagios-4.4.3.tar.gz 11302228 BLAKE2B d22ab64268832897dfa67d805a5d74656f7aa96ce1427c7326b632060d8c1ea0fbd07564f3c7a978bb5e2c0cba0c06290e7b0d579017fe73b900eb290c7853ae SHA512 07c91a796d634ffda73305edb54e01e46cb4fc9dc996c937e657c18f8067d7e2d31421b058a04b7395ef739962445ea149c486caaac94b7d422b4032bdaa07d4
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
 EBUILD nagios-core-4.3.4.ebuild 6633 BLAKE2B b179113b24ff38a5c147de20cd48db21fa1379f4ab377c7c354a1f107f9651f1b348f7dbd26825aaacb1fe8ce54d8feedbd7a44b65d3c897480d1c87a1fd4183 SHA512 43668b229464870ff2843790b1fd3bed7e3e2c4ba58f8cc19b90d8e85418c0e86b3b604089ccf52a63f24f6c0fb5e9ea4045769b2f63df96dc7d70c53d3e8411
-EBUILD nagios-core-4.4.2.ebuild 6692 BLAKE2B cef816faef6561bb8ee0dae09266fb0fce684ac0d6e2c65227e0e6aa2080bf20ff4612e189d269f66c946de516dd7620820f9acc76d6cbb89380dbda1d552a0d SHA512 26524450d6a3c207d5d05562767f635f04828f19e7d065ab2e0a826b5c82c444811d344cc3380bee814d2369451a82423aab4047feadae84077e97c1b1130963
 EBUILD nagios-core-4.4.3-r1.ebuild 6606 BLAKE2B 158f1629920032d07ccef39a5f6c8b596f894a957fae83b4efee89a42560f20eb4c2c248c0634ceac84b7315e1e0825a7608f1053a5485ab58d83b3b4dc33a44 SHA512 79985b40a69782d73780b5c0d85d758c96e57e87f24725d2bb338c8e761cadca4ac17e82d22a3662657408bb8cc1b03cc1e1eea2220424d75314f81fdccc6e75
 MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b
diff --git a/net-analyzer/nagios-core/files/nagios-4.4.2-pre.patch b/net-analyzer/nagios-core/files/nagios-4.4.2-pre.patch
deleted file mode 100644
index 6483b9df9f29..000000000000
--- a/net-analyzer/nagios-core/files/nagios-4.4.2-pre.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-diff --git a/Changelog b/Changelog
-index 1e1bd9e2..8dd26fec 100644
---- a/Changelog
-+++ b/Changelog
-@@ -2,6 +2,18 @@
- Nagios Core 4 Change Log
- ########################
- 
-+4.4.2 - ??????????
-+------------------
-+FIXES
-+* Fix comment data being duplicated after a `service nagios reload` or similar (Bryan Heden)
-+* Fix check_interval and retry_interval not changing at the appropriate times (Scott Wilkerson)
-+* Fixed passive checks sending recovery email when host was previously UP (Scott Wilkerson)
-+* Fixed flapping comments duplication on nagios reload (Christian Jung)
-+* Fix for CVE-2018-13441, CVE-2018-13458, CVE-2018-13457 null pointer dereference (Trevor McDonald)
-+* Fixed syntax error in file: default-init.in (#558) (Christian Zettel)
-+* Reset current notification number and state flags when the host recovers, reset all service variables when they recover fixes (#557) (Scott Wilkerson)
-+* Fixed wrong counting of service status totals when showing servicegroup details (#548) (Christian Zettel, Bryan Heden)
-+
- 4.4.1 - 2018-06-25
- ------------------
- FIXES
-diff --git a/base/checks.c b/base/checks.c
-index 725dec9d..d45b6ac4 100644
---- a/base/checks.c
-+++ b/base/checks.c
-@@ -911,6 +911,11 @@ static inline void service_state_or_hard_state_type_change(service * svc, int st
- 
- 	if (state_or_type_change) {
- 
-+		/* check if service should go into downtime from flexible downtime */
-+		if (svc->pending_flex_downtime > 0) {
-+			check_pending_flex_service_downtime(svc);
-+		}
-+
- 		/* reset notification times and suppression option */
- 		svc->last_notification = (time_t)0;
- 		svc->next_notification = (time_t)0;
-@@ -941,7 +946,10 @@ static inline void host_state_or_hard_state_type_change(host * hst, int state_ch
- 
- 		log_debug_info(DEBUGL_CHECKS, 2, "Check type passive and passive host checks aren't false\n");
- 		
--		hst->current_attempt = 1;
-+		if (state_change == TRUE) {
-+            hst->current_attempt = 1;
-+        }
-+        
- 		hard_state_change = TRUE;
- 	}
- 
-@@ -989,6 +997,9 @@ static inline void host_state_or_hard_state_type_change(host * hst, int state_ch
- 
- 	if (state_or_type_change) {
- 
-+		/* check if host should go into downtime from flexible downtime */
-+		check_pending_flex_host_downtime(hst);
-+
- 		/* reset notification times and suppression option */
- 		hst->last_notification = (time_t)0;
- 		hst->next_notification = (time_t)0;
-@@ -1228,7 +1239,7 @@ int handle_async_service_check_result(service *svc, check_result *cr)
- 	next_check = (time_t)(svc->last_check + (svc->check_interval * interval_length));
- 
- 	/***********************************************/
--	/********** SCHEDULE HOST CHECK LOGIC **********/
-+	/********** SCHEDULE SERVICE CHECK LOGIC **********/
- 	/***********************************************/
- 	if (svc->current_state == STATE_OK) {
- 
-@@ -1269,6 +1280,7 @@ int handle_async_service_check_result(service *svc, check_result *cr)
- 
- 			svc->host_problem_at_last_check = TRUE;
- 		}
-+        
- 	}
- 	else {
- 
-@@ -1368,6 +1380,9 @@ int handle_async_service_check_result(service *svc, check_result *cr)
- 		else {
- 
- 			log_debug_info(DEBUGL_CHECKS, 1, "Service is a non-OK state (%s)!", service_state_name(svc->current_state));
-+            
-+            svc->state_type = SOFT_STATE;
-+			svc->current_attempt = 1;
- 
- 			handle_event = TRUE;
- 		}
-@@ -1395,6 +1410,21 @@ int handle_async_service_check_result(service *svc, check_result *cr)
- 
- 				log_debug_info(DEBUGL_CHECKS, 1, "Service experienced a SOFT recovery.\n");				
- 			}
-+            
-+            
-+            /* reset all service variables because its okay now... */
-+            svc->host_problem_at_last_check = FALSE;
-+            svc->current_attempt = 1;
-+            svc->state_type = HARD_STATE;
-+            svc->last_hard_state = STATE_OK;
-+            svc->last_notification = (time_t)0;
-+            svc->next_notification = (time_t)0;
-+            svc->current_notification_number = 0;
-+            svc->problem_has_been_acknowledged = FALSE;
-+            svc->acknowledgement_type = ACKNOWLEDGEMENT_NONE;
-+            svc->notified_on = 0;
-+            
-+            hard_state_change = TRUE;
- 		}
- 
- 		/***** SERVICE IS STILL IN PROBLEM STATE *****/
-@@ -1418,6 +1448,14 @@ int handle_async_service_check_result(service *svc, check_result *cr)
- 			}
- 		}
- 	}
-+    
-+    /* soft states should be using retry_interval */
-+    if (svc->state_type == SOFT_STATE) {
-+        
-+            log_debug_info(DEBUGL_CHECKS, 2, "Service state type is soft, using retry_interval\n");
-+            
-+            next_check = (unsigned long) (current_time + svc->retry_interval * interval_length);
-+    }
- 
- 	/* check for a state change */
- 	if (svc->current_state != svc->last_state || (svc->current_state == STATE_OK && svc->state_type == SOFT_STATE)) {
-@@ -1454,6 +1492,8 @@ int handle_async_service_check_result(service *svc, check_result *cr)
- 	if (svc->current_attempt >= svc->max_attempts && svc->current_state != svc->last_hard_state) {
- 
- 		log_debug_info(DEBUGL_CHECKS, 2, "Service had a HARD STATE CHANGE!!\n");
-+        
-+        next_check = (unsigned long)(current_time + (svc->check_interval * interval_length));
- 
- 		hard_state_change = TRUE;
- 
-@@ -2197,6 +2237,9 @@ int handle_async_host_check_result(host *hst, check_result *cr)
- 		else {
- 
- 			log_debug_info(DEBUGL_CHECKS, 1, "Host is no longer UP (%s)!\n", host_state_name(hst->current_state));
-+            
-+            hst->state_type = SOFT_STATE;
-+            hst->current_attempt = 1;
- 
- 			/* propagate checks to immediate parents if they are UP */
- 			host_propagate_checks_to_immediate_parents(hst, FALSE, current_time);
-@@ -2276,7 +2319,9 @@ int handle_async_host_check_result(host *hst, check_result *cr)
- 	if (hst->current_state != HOST_UP && (hst->check_type == CHECK_TYPE_ACTIVE || translate_passive_host_checks == TRUE)) {
- 
- 		hst->current_state = determine_host_reachability(hst);
--		next_check = (unsigned long)(current_time + (hst->retry_interval * interval_length));
-+		if (hst->state_type == SOFT_STATE)
-+            next_check = (unsigned long)(current_time + (hst->retry_interval * interval_length));
-+        
- 	}
- 
- 	/* check for state change */
-@@ -2310,7 +2355,9 @@ int handle_async_host_check_result(host *hst, check_result *cr)
- 
- 		log_debug_info(DEBUGL_CHECKS, 2, "Host had a HARD STATE CHANGE!!\n");
- 
--		hard_state_change = TRUE;
-+		next_check = (unsigned long)(current_time + (hst->check_interval * interval_length));
-+        
-+        hard_state_change = TRUE;
- 		send_notification = TRUE;
- 	}
- 
-@@ -2372,6 +2419,12 @@ int handle_async_host_check_result(host *hst, check_result *cr)
- 		}
- 	}
- 
-+    /* the host recovered, so reset the current notification number and state flags (after the recovery notification has gone out) */
-+    if(hst->current_state == HOST_UP && hst->state_type == HARD_STATE && hard_state_change == TRUE) {
-+        hst->current_notification_number = 0;
-+        hst->notified_on = 0;
-+        }
-+        
- 	if (obsess_over_hosts == TRUE) {
- 		obsessive_compulsive_host_check_processor(hst);
- 	}
-diff --git a/base/nagios.c b/base/nagios.c
-index 520ba71e..24719647 100644
---- a/base/nagios.c
-+++ b/base/nagios.c
-@@ -878,6 +878,9 @@ int main(int argc, char **argv) {
- 			/* clean up the scheduled downtime data */
- 			cleanup_downtime_data();
- 
-+			/* clean up comment data */
-+			free_comment_data();
-+
- 			/* clean up the status data if we are not restarting */
- 			if(sigrestart == FALSE) {
- 				cleanup_status_data(TRUE);
-diff --git a/cgi/status.c b/cgi/status.c
-index 20c4ed48..8b1c8b31 100644
---- a/cgi/status.c
-+++ b/cgi/status.c
-@@ -873,6 +873,11 @@ void show_service_status_totals(void) {
- 				count_service = 1;
- 			}
- 		else if(display_type == DISPLAY_SERVICEGROUPS) {
-+
-+			if (is_service_member_of_servicegroup(find_servicegroup(servicegroup_name), temp_service) == FALSE) {
-+				continue;
-+			}
-+
- 			if(show_all_servicegroups == TRUE) {
- 				count_service = 1;
- 				}
diff --git a/net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch b/net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch
deleted file mode 100644
index 3c5eb030547c..000000000000
--- a/net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/Changelog b/Changelog
-index c695bd54..4c348894 100644
---- a/Changelog
-+++ b/Changelog
-@@ -2,6 +2,11 @@
- Nagios Core 4 Change Log
- ########################
- 
-+4.4.3 - 2018-XX-XX
-+------------------
-+FIXES
-+* Fixed services sending recovery emails when they recover if host in down state (#572) (Scott Wilkerson)
-+
- 4.4.2 - 2018-08-16
- ------------------
- FIXES
-diff --git a/base/notifications.c b/base/notifications.c
-index d4574c41..58ad140f 100644
---- a/base/notifications.c
-+++ b/base/notifications.c
-@@ -591,10 +591,6 @@ int check_service_notification_viability(service *svc, int type, int options) {
- 		return ERROR;
- 		}
- 
--	/***** RECOVERY NOTIFICATIONS ARE GOOD TO GO AT THIS POINT *****/
--	if(svc->current_state == STATE_OK)
--		return OK;
--
- 	/* don't notify contacts about this service problem again if the notification interval is set to 0 */
- 	if(svc->no_more_notifications == TRUE) {
- 		log_debug_info(DEBUGL_NOTIFICATIONS, 1, "We shouldn't re-notify contacts about this service problem.\n");
-@@ -1501,10 +1497,6 @@ int check_host_notification_viability(host *hst, int type, int options) {
- 		return ERROR;
- 		}
- 
--	/***** RECOVERY NOTIFICATIONS ARE GOOD TO GO AT THIS POINT *****/
--	if(hst->current_state == HOST_UP)
--		return OK;
--
- 	/* check if we shouldn't renotify contacts about the host problem */
- 	if(hst->no_more_notifications == TRUE) {
- 		log_debug_info(DEBUGL_NOTIFICATIONS, 1, "We shouldn't re-notify contacts about this host problem.\n");
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild
deleted file mode 100644
index bfd8898d4883..000000000000
--- a/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs user
-
-MY_P=${PN/-core}-${PV}
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/"
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-	web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="apache2 classicui lighttpd perl +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-# sys-devel/libtool dependency is bug #401237.
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi
-#   * mod_cgid
-#   * mod_fcgid
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-DEPEND="sys-devel/libtool
-	virtual/mailx
-	perl? ( dev-lang/perl:= )
-	web? (
-		app-arch/unzip
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd[php] )
-		apache2? (
-			|| (
-				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
-				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
-				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
-			|| (
-				dev-lang/php:*[apache2]
-				dev-lang/php:*[cgi]
-				dev-lang/php:*[fpm] )
-		)
-	)"
-RDEPEND="${DEPEND}
-	vim-syntax? ( app-vim/nagios-syntax )"
-
-PATCHES=(
-	"${FILESDIR}/nagios-4.4.3-pre.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_configure() {
-	local myconf
-
-	if use perl; then
-		myconf="${myconf} --enable-embedded-perl --with-perlcache"
-	fi
-
-	if use !apache2 && use !lighttpd ; then
-		myconf="${myconf} --with-command-group=nagios"
-	else
-		if use apache2 ; then
-			myconf="${myconf} --with-command-group=apache"
-			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
-		elif use lighttpd ; then
-			myconf="${myconf} --with-command-group=lighttpd"
-		fi
-	fi
-
-	econf ${myconf} \
-		--prefix=/usr \
-		--bindir=/usr/sbin \
-		--sbindir=/usr/$(get_libdir)/nagios/cgi-bin \
-		--datadir=/usr/share/nagios/htdocs \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--libexecdir=/usr/$(get_libdir)/nagios/plugins
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) nagios
-
-	if use web; then
-		# Only compile the CGIs/HTML when USE=web is set.
-		emake CC=$(tc-getCC) DESTDIR="${D}" cgis html
-	fi
-}
-
-src_install() {
-	dodoc Changelog CONTRIBUTING.md README.md THANKS UPGRADING
-
-	# There is no way to install the CGIs unstripped from the top-level
-	# makefile, so descend into base/ here. The empty INSTALL_OPTS
-	# ensures that root:root: owns the nagios executables.
-	cd "${S}/base" || die
-	emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
-	cd "${S}" || die
-
-	# Otherwise this gets installed as 770 and you get "access denied"
-	# for some reason or other when starting nagios. The permissions
-	# on nagiostats are just for consistency (these should both get
-	# fixed upstream).
-	fperms 775 /usr/sbin/nagios /usr/sbin/nagiostats
-
-	# INSTALL_OPTS are needed for most of install-basic, but we don't
-	# want them on the LIBEXECDIR, argh.
-	emake DESTDIR="${D}" install-basic
-	fowners root:root /usr/$(get_libdir)/nagios/plugins
-
-	# Don't make the configuration owned by the nagios user, because
-	# then he can edit nagios.cfg and trick nagios into running as root
-	# and doing his bidding.
-	emake INSTALL_OPTS="" DESTDIR="${D}" install-config
-
-	# No INSTALL_OPTS used in install-commandmode, thankfully.
-	emake DESTDIR="${D}" install-commandmode
-
-	if use web; then
-		# There is no way to install the CGIs unstripped from the
-		# top-level makefile, so descend into cgi/ here. The empty
-		# INSTALL_OPTS ensures that root:root: owns the CGI executables.
-		cd "${S}/cgi" || die
-		emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
-		cd "${S}" || die
-
-		# install-html installs the new exfoliation theme
-		emake INSTALL_OPTS="" DESTDIR="${D}" install-html
-
-		if use classicui; then
-			# This overwrites the already-installed exfoliation theme
-			emake INSTALL_OPTS="" DESTDIR="${D}" install-classicui
-		fi
-
-		# Install cute Gentoo icons (bug #388323), setting their
-		# owner, group, and mode to match those of the rest of Nagios's
-		# images.
-		insinto /usr/share/nagios/htdocs/images/logos
-		doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
-	fi
-
-	newinitd startup/openrc-init nagios
-
-	if use web ; then
-		if use apache2 ; then
-			# Install the Nagios configuration file for Apache.
-			insinto "/etc/apache2/modules.d"
-			doins "${FILESDIR}"/99_nagios4.conf
-		elif use lighttpd ; then
-			# Install the Nagios configuration file for Lighttpd.
-			insinto /etc/lighttpd
-			newins "${FILESDIR}/lighttpd_nagios4.conf" nagios.conf
-		else
-			ewarn "${CATEGORY}/${PF} only supports apache or lighttpd"
-			ewarn "out of the box. Since you are not using one of them, you"
-			ewarn "will have to configure your webserver yourself."
-		fi
-	fi
-}
-
-pkg_postinst() {
-
-	if use web; then
-		if use apache2 || use lighttpd ; then
-			if use apache2; then
-				elog "To enable the Nagios web front-end, please edit"
-				elog "${ROOT}etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\""
-				elog "to APACHE2_OPTS. Then Nagios will be available at,"
-				elog
-			elif use lighttpd; then
-				elog "To enable the Nagios web front-end, please add"
-				elog "'include \"nagios.conf\"' to the lighttpd configuration"
-				elog "file at ${ROOT}etc/lighttpd/lighttpd.conf. Then Nagios"
-				elog "will be available at,"
-				elog
-			fi
-
-			elog "  http://localhost/nagios/"
-		fi
-	fi
-
-	elog
-	elog "If your kernel has /proc protection, nagios"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding nagios into"
-	elog "the group wheel, but this is not recomended."
-	elog
-}