From: Thomas Beierlein <tomjbe@gentoo.org>
Date: Tue, 4 Jul 2017 07:07:01 +0000 (+0200)
Subject: app-backup/bacula: Fix installation with USE=logwatch (bug #617918). Tnx A. Kochov.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b214bb1bcbe9289965e413ef7978136212ce37f0;p=gentoo.git

app-backup/bacula: Fix installation with USE=logwatch (bug #617918). Tnx A. Kochov.

New bacula treis to decide wether to install in old logwatch's /etc/log.d directory
or to newer /etc/logwatch but fails to do it correctly.
Adapt install path to gentoos logwatch default.

Package-Manager: Portage-2.3.6, Repoman-2.3.2
---

diff --git a/app-backup/bacula/bacula-7.4.6.ebuild b/app-backup/bacula/bacula-7.4.6.ebuild
index 0f853396fd17..ccbfb5260967 100644
--- a/app-backup/bacula/bacula-7.4.6.ebuild
+++ b/app-backup/bacula/bacula-7.4.6.ebuild
@@ -272,10 +272,10 @@ src_install() {
 		# the logwatch scripts
 		if use logwatch; then
 			diropts -m0750
-			dodir /etc/log.d/scripts/services
-			dodir /etc/log.d/scripts/shared
-			dodir /etc/log.d/conf/logfiles
-			dodir /etc/log.d/conf/services
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
 			pushd "${S}"/scripts/logwatch >&/dev/null || die
 			emake DESTDIR="${D}" install
 			popd >&/dev/null || die
diff --git a/app-backup/bacula/bacula-7.4.7.ebuild b/app-backup/bacula/bacula-7.4.7.ebuild
index 0f853396fd17..ccbfb5260967 100644
--- a/app-backup/bacula/bacula-7.4.7.ebuild
+++ b/app-backup/bacula/bacula-7.4.7.ebuild
@@ -272,10 +272,10 @@ src_install() {
 		# the logwatch scripts
 		if use logwatch; then
 			diropts -m0750
-			dodir /etc/log.d/scripts/services
-			dodir /etc/log.d/scripts/shared
-			dodir /etc/log.d/conf/logfiles
-			dodir /etc/log.d/conf/services
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
 			pushd "${S}"/scripts/logwatch >&/dev/null || die
 			emake DESTDIR="${D}" install
 			popd >&/dev/null || die