[gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/

[Michael Sterrett]

commit:     0036731d9c79c42c6631cd774c5a30d6a9af1928
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 22:21:15 2015 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 22:57:13 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0036731d

cim module needs json so skip installing it unless USE=json

Package-Manager: portage-2.2.20.1

 app-admin/syslog-ng/syslog-ng-3.7.1.ebuild | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app-admin/syslog-ng/syslog-ng-3.7.1.ebuild 
b/app-admin/syslog-ng/syslog-ng-3.7.1.ebuild
index 4e713eb..03f6fdf 100644
--- a/app-admin/syslog-ng/syslog-ng-3.7.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.7.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 eutils multilib systemd versionator
+inherit autotools python-any-r1 eutils multilib systemd versionator
 
 MY_PV=${PV/_/}
 MY_PV_MM=$(get_version_component_range 1-2)
@@ -46,6 +46,14 @@ pkg_setup() {
 src_prepare() {
        epatch_user
        use python && python_fix_shebang .
+
+       if use !json ; then
+               sed -i \
+                       -e '1 s/cim //' \
+                       scl/Makefile.am || die
+               eautoreconf
+       fi
+
        cp "${FILESDIR}"/*logrotate*.in "${TMPDIR}" || die
        cd "${TMPDIR}" || die