Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/
Date: Sun, 17 Nov 2019 21:27:55
Message-Id: 1574026065.900c85f11a6b64428e1f5545c1f60e46b014105b.whissi@gentoo
1 commit: 900c85f11a6b64428e1f5545c1f60e46b014105b
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 17 21:26:43 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 17 21:27:45 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=900c85f1
7
8 app-admin/rsyslog: install examples into /usr/share/$PN to avoid false positive QA check
9
10 BadInsIntoDir check is going crazy when it finds "doc" in path and want you
11 to use dodoc functions.
12
13 Package-Manager: Portage-2.3.79, Repoman-2.3.18
14 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
15
16 .../rsyslog/{rsyslog-8.1910.0.ebuild => rsyslog-8.1910.0-r1.ebuild} | 6 +++---
17 .../rsyslog/{rsyslog-8.1911.0.ebuild => rsyslog-8.1911.0-r1.ebuild} | 4 ++--
18 2 files changed, 5 insertions(+), 5 deletions(-)
19
20 diff --git a/app-admin/rsyslog/rsyslog-8.1910.0.ebuild b/app-admin/rsyslog/rsyslog-8.1910.0-r1.ebuild
21 similarity index 98%
22 rename from app-admin/rsyslog/rsyslog-8.1910.0.ebuild
23 rename to app-admin/rsyslog/rsyslog-8.1910.0-r1.ebuild
24 index d8a51113e54..85601a397b5 100644
25 --- a/app-admin/rsyslog/rsyslog-8.1910.0.ebuild
26 +++ b/app-admin/rsyslog/rsyslog-8.1910.0-r1.ebuild
27 @@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
28
29 inherit git-r3
30 else
31 - KEYWORDS="amd64 arm ~arm64 ~hppa x86"
32 + KEYWORDS="amd64 arm ~arm64 hppa x86"
33
34 SRC_URI="
35 https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
36 @@ -318,12 +318,12 @@ src_install() {
37 newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
38
39 if use mysql; then
40 - insinto /usr/share/doc/${PF}/scripts/mysql
41 + insinto /usr/share/${PN}/scripts/mysql
42 doins plugins/ommysql/createDB.sql
43 fi
44
45 if use postgres; then
46 - insinto /usr/share/doc/${PF}/scripts/pgsql
47 + insinto /usr/share/${PN}/scripts/pgsql
48 doins plugins/ompgsql/createDB.sql
49 fi
50
51
52 diff --git a/app-admin/rsyslog/rsyslog-8.1911.0.ebuild b/app-admin/rsyslog/rsyslog-8.1911.0-r1.ebuild
53 similarity index 99%
54 rename from app-admin/rsyslog/rsyslog-8.1911.0.ebuild
55 rename to app-admin/rsyslog/rsyslog-8.1911.0-r1.ebuild
56 index 09eed323e45..b1ce46d2e2f 100644
57 --- a/app-admin/rsyslog/rsyslog-8.1911.0.ebuild
58 +++ b/app-admin/rsyslog/rsyslog-8.1911.0-r1.ebuild
59 @@ -318,12 +318,12 @@ src_install() {
60 newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
61
62 if use mysql; then
63 - insinto /usr/share/doc/${PF}/scripts/mysql
64 + insinto /usr/share/${PN}/scripts/mysql
65 doins plugins/ommysql/createDB.sql
66 fi
67
68 if use postgres; then
69 - insinto /usr/share/doc/${PF}/scripts/pgsql
70 + insinto /usr/share/${PN}/scripts/pgsql
71 doins plugins/ompgsql/createDB.sql
72 fi