summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2014-04-03 03:35:14 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2014-04-03 03:35:14 +0000
commita71a27c23937d313a31111d709b8f30baa522198 (patch)
tree529b07d656a54c59f219b41510fec4840027e045 /app-admin
parentreadding jsonschema-0.8.0, because it's still needed (diff)
downloadgentoo-2-a71a27c23937d313a31111d709b8f30baa522198.tar.gz
gentoo-2-a71a27c23937d313a31111d709b8f30baa522198.tar.bz2
gentoo-2-a71a27c23937d313a31111d709b8f30baa522198.zip
make the AMQP support optional for bug #506618
(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/syslog-ng/ChangeLog6
-rw-r--r--app-admin/syslog-ng/metadata.xml1
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.5.4.1.ebuild6
3 files changed, 10 insertions, 3 deletions
diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index c167c8008398..7f6bc46c5bbf 100644
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/syslog-ng
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.379 2014/04/02 10:02:45 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.380 2014/04/03 03:35:14 mr_bones_ Exp $
+
+ 03 Apr 2014; Michael Sterrett <mr_bones_@gentoo.org> metadata.xml,
+ syslog-ng-3.5.4.1.ebuild:
+ make the AMQP support optional for bug #506618
02 Apr 2014; Chema Alonso <nimiux@gentoo.org> syslog-ng-3.4.7.ebuild:
Stable for amd64 wrt bug #504348
diff --git a/app-admin/syslog-ng/metadata.xml b/app-admin/syslog-ng/metadata.xml
index 10496dd867f9..44ef4749c05c 100644
--- a/app-admin/syslog-ng/metadata.xml
+++ b/app-admin/syslog-ng/metadata.xml
@@ -6,6 +6,7 @@
<name>Michael Sterrett</name>
</maintainer>
<use>
+ <flag name='amqp'>Enable support for AMQP destinations</flag>
<flag name='smtp'>Enable support for SMTP destinations</flag>
<flag name='spoof-source'>Enable support for spoofed source addresses</flag>
<flag name='json'>Enable support for JSON template formatting via <pkg>dev-libs/json-glib</pkg></flag>
diff --git a/app-admin/syslog-ng/syslog-ng-3.5.4.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.5.4.1.ebuild
index 93c41e633446..59a24f5a8db5 100644
--- a/app-admin/syslog-ng/syslog-ng-3.5.4.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.5.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.5.4.1.ebuild,v 1.2 2014/03/28 02:00:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.5.4.1.ebuild,v 1.3 2014/04/03 03:35:14 mr_bones_ Exp $
EAPI=5
inherit eutils multilib systemd versionator
@@ -14,7 +14,7 @@ SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/sourc
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="caps dbi geoip ipv6 json mongodb +pcre smtp spoof-source ssl systemd tcpd"
+IUSE="amqp caps dbi geoip ipv6 json mongodb +pcre smtp spoof-source ssl systemd tcpd"
RESTRICT="test"
RDEPEND="
@@ -72,6 +72,8 @@ src_configure() {
$(use_enable mongodb) \
$(use_enable pcre) \
$(use_enable smtp) \
+ $(use_enable amqp) \
+ $(usex amqp --with-librabbitmq-client=internal --without-librabbitmq-client) \
$(use_enable spoof-source) \
$(use_enable dbi sql) \
$(use_enable ssl) \