gentoo resync : 25.11.2020

2 files changed, 21 insertions, 22 deletions

diff --git a/net-analyzer/nsca/Manifest b/net-analyzer/nsca/Manifest
index 0e6023b5f842..dda09685e821 100644
--- a/net-analyzer/nsca/Manifest
+++ b/net-analyzer/nsca/Manifest
@@ -1,5 +1,5 @@
 AUX nsca.conf 219 BLAKE2B 0ce329240a846e3fc011b82322e2635aa396bfd5eecadf5834becb08b1085e32d30be337b174d777208a882dd2fdcc71939d3fed100534e0c6b431a4e11f9b5a SHA512 c7dda1f94611e028b52ae6bf330db1415b18a88590a8a7c54d1f862aaa326751b39e88380cd24217aab11f32ef5842c6b1d4a0333ca0310a5be0e94c573165b2
 AUX nsca.init 645 BLAKE2B baa298df97c4c29fa563a1dde1ef6cf962acf2ec50797b68f073f744fd56eadf97b6163196c497e83d49b4daf8c2eac04378d8b4d00ffae32796e0f8e926ab3d SHA512 88fab799a388dc6f10a2eac94b1ee5d1a76687c408958cc8cf5c22219d10b439d0c9c64a9ae9f34211e19eccb95cb2417e4b972c5549d23ef4bdd5493cdaf224
 DIST nsca-2.7.2.tar.gz 104953 BLAKE2B 74dce7b59149cd41fe316dc48588d744131efbbe8073d0defe3542a774ac7dd7429a23e5e7f6b2c9b9e45fa1938cdb2994bfcf93e745c12c8fb5bfbbeb627e6e SHA512 f84cac3613bbd0ded4ec700c1dadac71ed075544d0f48281a70946a67792b7f4bcdf6dc3bd5ccf1293cc6a0277638e0f034c33064bf9c05696b4f015e7f15010
-EBUILD nsca-2.7.2-r103.ebuild 2127 BLAKE2B b282376efe16c25c8c3af3012d5fb95ed97026444e1a329fc71ada0510be732caacccc35db0ac8d350cdb096b8e56272deface4119c50dd9dc5d61f6e429871d SHA512 be64c75074fb50cb65f02a4a1e0dfce1ec43f8f648ab4a54e9e221fad2a7fb5cfcfbe1514822f4ebac8df7b24cbeeb768dd4e4e5c8b380fccfea33fe8557765e
+EBUILD nsca-2.7.2-r103.ebuild 2008 BLAKE2B ff80c71588eed60158e78636aef991cbcaa143a4b3645a7eb69abc13e4b96502b7e7d070371c62fe0c1c76fe20a5b7c5251dffc024966890b7d935b31b558949 SHA512 11cfa59fd4e36ff0174354848fff571b2147390fdb5993e85f0671b521dc67a623e3817909cf57805abf466298f9b55960009d62720d3c90500aac06c8f51d29
 MISC metadata.xml 1732 BLAKE2B 9a1c8c74f4a0b8fb4d79340d3f1860ecb0b885b5709f54ea63eb7a8b288b99ce31875d54829c87b5865b62fa75126f2713f64febc2e812981113c7172fe3aa70 SHA512 1e24a8adef9fb860b05eed48d741e7b2b981ca826300f14ee3c2b7ddd6a497fbc3318a31a9f284eb11a7f216d71ad567d4a4438e03876c83985bd8683b525a1b
diff --git a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
index 9fe0ae002f79..c7120d06b665 100644
--- a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
+++ b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit multilib user eutils
+EAPI=7
 
 DESCRIPTION="Nagios Service Check Acceptor"
 HOMEPAGE="https://www.nagios.org/"
@@ -15,28 +13,29 @@ KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86"
 IUSE="tcpd +crypt minimal"
 
 DEPEND="crypt? ( >=dev-libs/libmcrypt-2.5.1-r4 )
-	!minimal? ( tcpd? ( sys-apps/tcp-wrappers ) )"
-
+	!minimal? (
+		tcpd? ( sys-apps/tcp-wrappers )
+		acct-group/icinga
+		acct-group/nagios
+		acct-user/icinga
+		acct-user/nagios
+	)"
 RDEPEND="${DEPEND}
-	!minimal? ( || ( net-analyzer/icinga net-analyzer/nagios ) )
+	!minimal? (
+		|| (
+			net-analyzer/icinga
+			net-analyzer/nagios
+		)
+	)
 	sys-apps/openrc"
 
-pkg_setup() {
-	if ! use minimal; then
-		enewgroup nagios
-		enewgroup icinga
-		enewuser nagios -1 /bin/bash /var/nagios/home nagios
-		enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-	fi
-}
-
 src_configure() {
 	use tcpd || export ac_cv_lib_wrap_main=no
 	use crypt || export ac_cv_path_LIBMCRYPT_CONFIG=/bin/false
 
 	econf \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
+		--localstatedir="${EPREFIX}"/var/nagios \
+		--sysconfdir="${EPREFIX}"/etc/nagios \
 		--with-nsca-user=nagios \
 		--with-nsca-grp=nagios
 }
@@ -49,7 +48,7 @@ src_compile() {
 		-e '/nsca_\(user\|group\)/s:nagios:icinga:' \
 		-e '/nsca_chroot/s:=.*:=/var/lib/icinga/rw:' \
 		-e '/\(command\|alternate_dump\)_file/s:/var/nagios:/var/lib/icinga:' \
-		"${S}"/sample-config/nsca.cfg > "${T}"/nsca.icinga.cfg
+		"${S}"/sample-config/nsca.cfg > "${T}"/nsca.icinga.cfg || die
 }
 
 src_install() {
@@ -58,7 +57,7 @@ src_install() {
 	dobin src/send_nsca
 
 	insinto /etc/nagios
-	doins "${S}"/sample-config/send_nsca.cfg
+	doins sample-config/send_nsca.cfg
 
 	if ! use minimal; then
 		exeinto /usr/libexec
@@ -68,7 +67,7 @@ src_install() {
 		newconfd "${FILESDIR}"/nsca.conf nsca
 
 		insinto /etc/nagios
-		doins "${S}"/sample-config/nsca.cfg
+		doins sample-config/nsca.cfg
 
 		insinto /etc/icinga
 		newins "${T}"/nsca.icinga.cfg nsca.cfg
@@ -79,7 +78,7 @@ pkg_postinst() {
 	if ! use minimal; then
 		elog "If you are using the nsca daemon, remember to edit"
 		elog "the config file /etc/nagios/nsca.cfg"
-		elog ""
+		elog
 		elog "If you intend to use nsca with Icinga, change the"
 		elog "configuration file path in /etc/conf.d/nsca so that"
 		elog "it will default to the correct paths and users."