Gentoo Archives: gentoo-commits

From: Thomas Beierlein <tomjbe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
Date: Tue, 04 Jul 2017 07:08:00
Message-Id: 1499152021.b214bb1bcbe9289965e413ef7978136212ce37f0.tomjbe@gentoo
1 commit: b214bb1bcbe9289965e413ef7978136212ce37f0
2 Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 4 07:07:01 2017 +0000
4 Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 4 07:07:01 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b214bb1b
7
8 app-backup/bacula: Fix installation with USE=logwatch (bug #617918). Tnx A. Kochov.
9
10 New bacula treis to decide wether to install in old logwatch's /etc/log.d directory
11 or to newer /etc/logwatch but fails to do it correctly.
12 Adapt install path to gentoos logwatch default.
13
14 Package-Manager: Portage-2.3.6, Repoman-2.3.2
15
16 app-backup/bacula/bacula-7.4.6.ebuild | 8 ++++----
17 app-backup/bacula/bacula-7.4.7.ebuild | 8 ++++----
18 2 files changed, 8 insertions(+), 8 deletions(-)
19
20 diff --git a/app-backup/bacula/bacula-7.4.6.ebuild b/app-backup/bacula/bacula-7.4.6.ebuild
21 index 0f853396fd1..ccbfb526096 100644
22 --- a/app-backup/bacula/bacula-7.4.6.ebuild
23 +++ b/app-backup/bacula/bacula-7.4.6.ebuild
24 @@ -272,10 +272,10 @@ src_install() {
25 # the logwatch scripts
26 if use logwatch; then
27 diropts -m0750
28 - dodir /etc/log.d/scripts/services
29 - dodir /etc/log.d/scripts/shared
30 - dodir /etc/log.d/conf/logfiles
31 - dodir /etc/log.d/conf/services
32 + dodir /usr/share/logwatch/scripts/services
33 + dodir /usr/share/logwatch/scripts/shared
34 + dodir /etc/logwatch/conf/logfiles
35 + dodir /etc/logwatch/conf/services
36 pushd "${S}"/scripts/logwatch >&/dev/null || die
37 emake DESTDIR="${D}" install
38 popd >&/dev/null || die
39
40 diff --git a/app-backup/bacula/bacula-7.4.7.ebuild b/app-backup/bacula/bacula-7.4.7.ebuild
41 index 0f853396fd1..ccbfb526096 100644
42 --- a/app-backup/bacula/bacula-7.4.7.ebuild
43 +++ b/app-backup/bacula/bacula-7.4.7.ebuild
44 @@ -272,10 +272,10 @@ src_install() {
45 # the logwatch scripts
46 if use logwatch; then
47 diropts -m0750
48 - dodir /etc/log.d/scripts/services
49 - dodir /etc/log.d/scripts/shared
50 - dodir /etc/log.d/conf/logfiles
51 - dodir /etc/log.d/conf/services
52 + dodir /usr/share/logwatch/scripts/services
53 + dodir /usr/share/logwatch/scripts/shared
54 + dodir /etc/logwatch/conf/logfiles
55 + dodir /etc/logwatch/conf/services
56 pushd "${S}"/scripts/logwatch >&/dev/null || die
57 emake DESTDIR="${D}" install
58 popd >&/dev/null || die