gentoo resync : 03.03.2021

2 files changed, 14 insertions, 4 deletions

diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 29fd97c60ad8..326d06dc1e0d 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -2,6 +2,6 @@ AUX 99_nagios4-r1.conf 309 BLAKE2B c539330d9f100045fc02d13061dd3b8e958370c8885ef
 AUX lighttpd_nagios4-r1.conf 297 BLAKE2B 8976123407c47be6023c5dae57c833f7e0b43ae2c70348dcd72b754453b5a84dd335daa222b4b75e5c19b3d5c18b64496739bdb61b8f2f67f5655b80a0ffb65f SHA512 2ef5268e9ba228d12e3dabb5a23ce73e49b7149a047acd4a2daac3cd3415b5233aaaf3b972c85780e71bd5fe3eefb6755a6222b40a509104fb318e219366867f
 DIST nagios-4.4.6.tar.gz 11333414 BLAKE2B b64d34c9267349582cb43500b7b90f7948152b5fd9b28ecb0a376d0255ec9774e693beba9205512294b07dddc4702f37d0f45b3c3fcc6abbf8e8b4d9236d0ace SHA512 6ceb582816ec741439963bde1fe8d85fa3bc4ed3c2238fb818db0c4f4224a4333d153040c11a7f4d783e919c11f9ff45907bdc478504e4155f64a4c575f80550
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
-EBUILD nagios-core-4.4.6-r1.ebuild 8829 BLAKE2B 61377c315f2f70ed7a88237fd428e61c2486a06664606af6474d51bf3328cf721ebd18cc8874276cdf5324976c2c8f54ad5ecd31747e5c7724c31e58339abf5e SHA512 93f9e7379628d3a4791852e83d703d1728bf1afe0c13e14547e4f93738cf0573a83df99bd96187d876fcea1265c8ede836b1deaa3e0d91d7ecb013bba98d094a
+EBUILD nagios-core-4.4.6-r2.ebuild 9358 BLAKE2B b808540623055f3830a38ed79ffbe30fc8a24851624bd6bbd902df293683e6fac78291b6f59529eaab533ff041fe8d89ddd60c3be08d36210aebd823b2173098 SHA512 4733058532beef20606e4f8bf833ce6c4e0932ca69fdef01f25e45f1533004e720b5282045b32582543d52c020d043f59989a954afbea0697a1868951c766936
 EBUILD nagios-core-4.4.6.ebuild 8499 BLAKE2B 7820eb32090960de3012dde55abcdc4869a250edbcd11a7a532877a1764aee58712b7b4b2d253aa3a8092ad17471b82649dc1c3201bf2d50648c346fc975f918 SHA512 87de36179bcb17d1b1835cb4f1d57f3be33c7bb65b718a512621474ab8db70a0f41a853c32c17044e9522e9657b6b1043613579fac7eed11d7a930fbacc8207d
 MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r1.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
index b345507323e7..90f596a5cc86 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit systemd toolchain-funcs
 
 MY_P="${PN/-core}-${PV}"
 DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
@@ -108,6 +108,9 @@ src_configure() {
 		fi
 	fi
 
+	# We pass "unknown" as the init type because we don't want it to
+	# guess. Later on, we'll manually install both OpenRC and systemd
+	# services.
 	econf ${myconf} \
 		--prefix="${EPREFIX}/usr" \
 		--bindir="${EPREFIX}/usr/sbin" \
@@ -115,7 +118,8 @@ src_configure() {
 		--sysconfdir="${EPREFIX}/etc/nagios" \
 		--libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" \
 		--with-cgibindir="${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin" \
-		--with-webdir="${EPREFIX}/usr/share/nagios/htdocs"
+		--with-webdir="${EPREFIX}/usr/share/nagios/htdocs" \
+		--with-init-type="unknown"
 
 	# The paths in the web server configuration files need to match
 	# those passed to econf above.
@@ -198,7 +202,13 @@ src_install() {
 		doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
 	fi
 
+	# The ./configure script for nagios detects the init system on the
+	# build host, which is wrong for all sorts of reasons. We've gone
+	# to great lengths above to avoid running "install-init" -- even
+	# indirectly -- and so now we must install whatever service files
+	# we need by hand.
 	newinitd startup/openrc-init nagios
+	systemd_newunit startup/default-service nagios.service
 
 	if use web ; then
 		if use apache2 ; then