app-admin/rsyslog: handle implicit libuuid dep via USE=uuid

URL: https://crbug.com/670567
Reported-by: Daniel Kurtz <djkurtz@chromium.org>

diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index 71dd8500a4c5a888a8a06f6eee58e09859cca32e..d402aea6b412a56b9b7edd89c2c19e6c3b602b4a 100644 (file)
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -29,6 +29,7 @@
                <flag name="snmp">Build the snmp modify and output module (requires <pkg>net-analyzer/net-snmp</pkg>)</flag>
                <flag name="ssl">Add support for encrypted client/server communication (requires <pkg>net-libs/gnutls</pkg>)</flag>
                <flag name="systemd">Build the journal input and output module (requires <pkg>sys-apps/systemd</pkg>)</flag>
+               <flag name="uuid">Include UUIDs in messages (requires <pkg>sys-apps/util-linux</pkg>)</flag>
                <flag name="usertools">Installs the user tools (rsgtutil, rscryutil...) corresponding to the set USE flags</flag>
                <flag name="zeromq">Build the ZeroMQ input and output modules (requires <pkg>net-libs/czmq</pkg>)</flag>
        </use>

diff --git a/app-admin/rsyslog/rsyslog-8.19.0.ebuild b/app-admin/rsyslog/rsyslog-8.19.0.ebuild
index a9f1a17354e32b3e88fcc1568bccd9be01945a34..72ff306a1d6c1bd911d9d723edd8ca5a9d5dc4e0 100644 (file)
--- a/app-admin/rsyslog/rsyslog-8.19.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.19.0.ebuild
@@ -58,7 +58,7 @@ fi
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
 IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mongodb mysql normalize omhttpfs"
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq"
+IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools uuid zeromq"
 
 RDEPEND="
        >=dev-libs/libfastjson-0.99.2:=
@@ -92,6 +92,7 @@ RDEPEND="
        snmp? ( >=net-analyzer/net-snmp-5.7.2 )
        ssl? ( >=net-libs/gnutls-2.12.23:0= )
        systemd? ( >=sys-apps/systemd-208 )
+       uuid? ( sys-apps/util-linux:0= )
        zeromq? (
                >=net-libs/zeromq-4.1.1:=
                >=net-libs/czmq-3.0.0
@@ -228,6 +229,7 @@ src_configure() {
                $(use_enable systemd imjournal)
                $(use_enable systemd omjournal)
                $(use_enable usertools)
+               $(use_enable uuid)
                $(use_enable zeromq imczmq)
                $(use_enable zeromq imzmq3)
                $(use_enable zeromq omczmq)

diff --git a/app-admin/rsyslog/rsyslog-8.22.0.ebuild b/app-admin/rsyslog/rsyslog-8.22.0.ebuild
index 20e8e7b84a4a53e9bc4df4d2e38e240c9cb0be45..94baf970cedd1a89d1934811616b9bfde43c9963 100644 (file)
--- a/app-admin/rsyslog/rsyslog-8.22.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.22.0.ebuild
@@ -58,7 +58,7 @@ fi
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
 IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mongodb mysql normalize omhttpfs"
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq"
+IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools uuid zeromq"
 
 RDEPEND="
        >=dev-libs/libfastjson-0.99.2:=
@@ -92,6 +92,7 @@ RDEPEND="
        snmp? ( >=net-analyzer/net-snmp-5.7.2 )
        ssl? ( >=net-libs/gnutls-2.12.23:0= )
        systemd? ( >=sys-apps/systemd-208 )
+       uuid? ( sys-apps/util-linux:0= )
        zeromq? (
                >=net-libs/zeromq-4.1.1:=
                >=net-libs/czmq-3.0.0
@@ -229,6 +230,7 @@ src_configure() {
                $(use_enable systemd imjournal)
                $(use_enable systemd omjournal)
                $(use_enable usertools)
+               $(use_enable uuid)
                $(use_enable zeromq imczmq)
                $(use_enable zeromq imzmq3)
                $(use_enable zeromq omczmq)

diff --git a/app-admin/rsyslog/rsyslog-8.23.0.ebuild b/app-admin/rsyslog/rsyslog-8.23.0.ebuild
index e768213858172dac193271616546a131281069ef..e6394361f7974cc17a9348eea5e80428c775d040 100644 (file)
--- a/app-admin/rsyslog/rsyslog-8.23.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.23.0.ebuild
@@ -58,7 +58,7 @@ fi
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
 IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mongodb mysql normalize omhttpfs"
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq"
+IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools uuid zeromq"
 
 RDEPEND="
        >=dev-libs/libfastjson-0.99.3:=
@@ -92,6 +92,7 @@ RDEPEND="
        snmp? ( >=net-analyzer/net-snmp-5.7.2 )
        ssl? ( >=net-libs/gnutls-2.12.23:0= )
        systemd? ( >=sys-apps/systemd-208 )
+       uuid? ( sys-apps/util-linux:0= )
        zeromq? (
                >=net-libs/zeromq-4.1.1:=
                >=net-libs/czmq-3.0.0
@@ -229,6 +230,7 @@ src_configure() {
                $(use_enable systemd imjournal)
                $(use_enable systemd omjournal)
                $(use_enable usertools)
+               $(use_enable uuid)
                $(use_enable zeromq imczmq)
                $(use_enable zeromq imzmq3)
                $(use_enable zeromq omczmq)