commit: 935834319d8bb7264d06af1bfc6efb81992c112f Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Sat Jun 18 22:18:02 2022 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Sat Jun 18 23:00:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93583431
app-admin/rsyslog: add libevent dep, move queue-standalone Closes: https://bugs.gentoo.org/827691 Closes: https://bugs.gentoo.org/850358 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> .../{rsyslog-8.2102.0.ebuild => rsyslog-8.2102.0-r1.ebuild} | 9 ++++++--- .../{rsyslog-8.2104.0.ebuild => rsyslog-8.2104.0-r1.ebuild} | 9 ++++++--- .../{rsyslog-8.2108.0.ebuild => rsyslog-8.2106.0-r1.ebuild} | 8 ++++++-- .../{rsyslog-8.2106.0.ebuild => rsyslog-8.2108.0-r1.ebuild} | 9 ++++++--- .../{rsyslog-8.2110.0.ebuild => rsyslog-8.2110.0-r1.ebuild} | 13 +++++++++---- .../{rsyslog-8.2112.0.ebuild => rsyslog-8.2112.0-r1.ebuild} | 11 ++++++++--- .../{rsyslog-8.2204.0.ebuild => rsyslog-8.2204.0-r1.ebuild} | 11 ++++++++--- 7 files changed, 49 insertions(+), 21 deletions(-) diff --git a/app-admin/rsyslog/rsyslog-8.2102.0.ebuild b/app-admin/rsyslog/rsyslog-8.2102.0-r1.ebuild similarity index 99% rename from app-admin/rsyslog/rsyslog-8.2102.0.ebuild rename to app-admin/rsyslog/rsyslog-8.2102.0-r1.ebuild index 09a86a219fb9..be0291f4147b 100644 --- a/app-admin/rsyslog/rsyslog-8.2102.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2102.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -42,7 +42,6 @@ REQUIRED_USE=" BDEPEND=">=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig - elibc_musl? ( sys-libs/queue-standalone ) test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) @@ -74,7 +73,10 @@ RDEPEND=" omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) + redis? ( + >=dev-libs/hiredis-0.11.0:= + dev-libs/libevent[threads] + ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( @@ -94,6 +96,7 @@ RDEPEND=" >=net-libs/czmq-4:=[drafts] )" DEPEND="${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] )" diff --git a/app-admin/rsyslog/rsyslog-8.2104.0.ebuild b/app-admin/rsyslog/rsyslog-8.2104.0-r1.ebuild similarity index 99% rename from app-admin/rsyslog/rsyslog-8.2104.0.ebuild rename to app-admin/rsyslog/rsyslog-8.2104.0-r1.ebuild index 731eb7f499cf..e6118187a015 100644 --- a/app-admin/rsyslog/rsyslog-8.2104.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2104.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -42,7 +42,6 @@ REQUIRED_USE=" BDEPEND=">=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig - elibc_musl? ( sys-libs/queue-standalone ) test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) @@ -74,7 +73,10 @@ RDEPEND=" omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) + redis? ( + >=dev-libs/hiredis-0.11.0:= + dev-libs/libevent[threads] + ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( @@ -94,6 +96,7 @@ RDEPEND=" >=net-libs/czmq-4:=[drafts] )" DEPEND="${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] )" diff --git a/app-admin/rsyslog/rsyslog-8.2108.0.ebuild b/app-admin/rsyslog/rsyslog-8.2106.0-r1.ebuild similarity index 98% rename from app-admin/rsyslog/rsyslog-8.2108.0.ebuild rename to app-admin/rsyslog/rsyslog-8.2106.0-r1.ebuild index c03f64233c71..17e58184ef8f 100644 --- a/app-admin/rsyslog/rsyslog-8.2108.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2106.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -74,7 +74,10 @@ RDEPEND=" omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) + redis? ( + >=dev-libs/hiredis-0.11.0:= + dev-libs/libevent[threads] + ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( @@ -94,6 +97,7 @@ RDEPEND=" >=net-libs/czmq-4:=[drafts] )" DEPEND="${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] )" diff --git a/app-admin/rsyslog/rsyslog-8.2106.0.ebuild b/app-admin/rsyslog/rsyslog-8.2108.0-r1.ebuild similarity index 99% rename from app-admin/rsyslog/rsyslog-8.2106.0.ebuild rename to app-admin/rsyslog/rsyslog-8.2108.0-r1.ebuild index c03f64233c71..4ead7a5d9cca 100644 --- a/app-admin/rsyslog/rsyslog-8.2106.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2108.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -42,7 +42,6 @@ REQUIRED_USE=" BDEPEND=">=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig - elibc_musl? ( sys-libs/queue-standalone ) test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) @@ -74,7 +73,10 @@ RDEPEND=" omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) + redis? ( + >=dev-libs/hiredis-0.11.0:= + dev-libs/libevent[threads] + ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( @@ -94,6 +96,7 @@ RDEPEND=" >=net-libs/czmq-4:=[drafts] )" DEPEND="${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] )" diff --git a/app-admin/rsyslog/rsyslog-8.2110.0.ebuild b/app-admin/rsyslog/rsyslog-8.2110.0-r1.ebuild similarity index 98% rename from app-admin/rsyslog/rsyslog-8.2110.0.ebuild rename to app-admin/rsyslog/rsyslog-8.2110.0-r1.ebuild index 9dab13ad4b60..425135a780ff 100644 --- a/app-admin/rsyslog/rsyslog-8.2110.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2110.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -42,7 +42,6 @@ REQUIRED_USE=" BDEPEND=">=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig - elibc_musl? ( sys-libs/queue-standalone ) test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) @@ -78,7 +77,10 @@ RDEPEND=" omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) + redis? ( + >=dev-libs/hiredis-0.11.0:= + dev-libs/libevent[threads] + ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( @@ -98,7 +100,10 @@ RDEPEND=" >=net-libs/czmq-4:=[drafts] )" -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone ) +" if [[ ${PV} == "9999" ]]; then BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" diff --git a/app-admin/rsyslog/rsyslog-8.2112.0.ebuild b/app-admin/rsyslog/rsyslog-8.2112.0-r1.ebuild similarity index 99% rename from app-admin/rsyslog/rsyslog-8.2112.0.ebuild rename to app-admin/rsyslog/rsyslog-8.2112.0-r1.ebuild index a96b941c6115..b17c6073c514 100644 --- a/app-admin/rsyslog/rsyslog-8.2112.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2112.0-r1.ebuild @@ -42,7 +42,6 @@ REQUIRED_USE=" BDEPEND=">=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig - elibc_musl? ( sys-libs/queue-standalone ) test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) @@ -78,7 +77,10 @@ RDEPEND=" omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) + redis? ( + >=dev-libs/hiredis-0.11.0:= + dev-libs/libevent[threads] + ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( @@ -98,7 +100,10 @@ RDEPEND=" >=net-libs/czmq-4:=[drafts] )" -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone ) +" if [[ ${PV} == "9999" ]]; then BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" diff --git a/app-admin/rsyslog/rsyslog-8.2204.0.ebuild b/app-admin/rsyslog/rsyslog-8.2204.0-r1.ebuild similarity index 99% rename from app-admin/rsyslog/rsyslog-8.2204.0.ebuild rename to app-admin/rsyslog/rsyslog-8.2204.0-r1.ebuild index c7c024706019..5deb90e1c973 100644 --- a/app-admin/rsyslog/rsyslog-8.2204.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2204.0-r1.ebuild @@ -42,7 +42,6 @@ REQUIRED_USE=" BDEPEND=">=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig - elibc_musl? ( sys-libs/queue-standalone ) test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) @@ -78,7 +77,10 @@ RDEPEND=" omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) + redis? ( + >=dev-libs/hiredis-0.11.0:= + dev-libs/libevent[threads] + ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( @@ -98,7 +100,10 @@ RDEPEND=" >=net-libs/czmq-4:=[drafts] )" -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone ) +" if [[ ${PV} == "9999" ]]; then BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
