Gentoo Archives: gentoo-commits

From: Michael Sterrett <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/
Date: Fri, 28 Aug 2015 22:57:21
Message-Id: 1440802633.0036731d9c79c42c6631cd774c5a30d6a9af1928.mr_bones_@gentoo
1 commit: 0036731d9c79c42c6631cd774c5a30d6a9af1928
2 Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 28 22:21:15 2015 +0000
4 Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 28 22:57:13 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0036731d
7
8 cim module needs json so skip installing it unless USE=json
9
10 Package-Manager: portage-2.2.20.1
11
12 app-admin/syslog-ng/syslog-ng-3.7.1.ebuild | 10 +++++++++-
13 1 file changed, 9 insertions(+), 1 deletion(-)
14
15 diff --git a/app-admin/syslog-ng/syslog-ng-3.7.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.7.1.ebuild
16 index 4e713eb..03f6fdf 100644
17 --- a/app-admin/syslog-ng/syslog-ng-3.7.1.ebuild
18 +++ b/app-admin/syslog-ng/syslog-ng-3.7.1.ebuild
19 @@ -4,7 +4,7 @@
20
21 EAPI=5
22 PYTHON_COMPAT=( python2_7 )
23 -inherit python-any-r1 eutils multilib systemd versionator
24 +inherit autotools python-any-r1 eutils multilib systemd versionator
25
26 MY_PV=${PV/_/}
27 MY_PV_MM=$(get_version_component_range 1-2)
28 @@ -46,6 +46,14 @@ pkg_setup() {
29 src_prepare() {
30 epatch_user
31 use python && python_fix_shebang .
32 +
33 + if use !json ; then
34 + sed -i \
35 + -e '1 s/cim //' \
36 + scl/Makefile.am || die
37 + eautoreconf
38 + fi
39 +
40 cp "${FILESDIR}"/*logrotate*.in "${TMPDIR}" || die
41 cd "${TMPDIR}" || die