commit:     b214bb1bcbe9289965e413ef7978136212ce37f0
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  4 07:07:01 2017 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Tue Jul  4 07:07:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b214bb1b

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

 app-backup/bacula/bacula-7.4.6.ebuild | 8 ++++----
 app-backup/bacula/bacula-7.4.7.ebuild | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app-backup/bacula/bacula-7.4.6.ebuild 
b/app-backup/bacula/bacula-7.4.6.ebuild
index 0f853396fd1..ccbfb526096 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 0f853396fd1..ccbfb526096 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

Reply via email to