From: Michael Orlitzky <mjo@gentoo.org>
Date: Sat, 31 Aug 2019 21:00:23 +0000 (-0400)
Subject: net-analyzer/ndoutils: sync localstatedir with nagios-core.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4d68327b17f6b5058ac7112f1dd0b7dcf73c89c7;p=gentoo.git

net-analyzer/ndoutils: sync localstatedir with nagios-core.

The latest revision of nagios-core moves its localstatedir to
/var/lib/nagios. Because ndoutils is a bit wacky, the simplest
way to keep it working is to force a rebuild of ndoutils with
the same localstatedir and PID directory.

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
---

diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild
similarity index 89%
rename from net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild
rename to net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild
index 018e14d53e39..784309fee43a 100644
--- a/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild
+++ b/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 DEPEND="dev-db/mysql-connector-c
 	dev-perl/DBD-mysql
 	dev-perl/DBI
-	>=net-analyzer/nagios-core-4"
+	>=net-analyzer/nagios-core-4.4.5"
 RDEPEND="${DEPEND}
 	virtual/mysql"
 
@@ -42,16 +42,16 @@ PATCHES=(
 
 src_configure() {
 	# The localstatedir is where our socket will be created by the
-	# nagios daemon, so we put it in /var/nagios where the "nagios" user
-	# will be able to write.
+	# nagios daemon, so we put it in /var/lib/nagios where the "nagios"
+	# user will be able to write.
 	#
 	# And normally, we would use /run for the pid file, but the daemon
-	# drops permissions before creating it, the the piddir also needs
+	# drops permissions before creating it, so the piddir also needs
 	# to be writable by the nagios user.
 	econf --enable-mysql \
-		  --localstatedir=/var/nagios \
+		  --localstatedir=/var/lib/nagios \
 		  --sysconfdir=/etc/nagios \
-		  --with-piddir=/var/nagios
+		  --with-piddir=/var/lib/nagios
 }
 
 src_compile() {