commit: 9f9307bfe64af9aecb5ce42e32e1b7b44c999d20 Author: Craig Andrews <candrews <AT> gentoo <DOT> org> AuthorDate: Mon Jul 22 14:42:34 2019 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Mon Jul 22 14:43:00 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f9307bf
media-video/rtmpdump: directly depend on dev-libs/nettle:0= Closes: https://bugs.gentoo.org/690422 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild | 7 +++++-- media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild | 7 +++++-- media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild | 5 ++++- media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild | 7 +++++-- media-video/rtmpdump/rtmpdump-9999.ebuild | 5 ++++- 5 files changed, 23 insertions(+), 8 deletions(-) diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild index ba1b98b2b9e..baadc800af8 100644 --- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild +++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -16,7 +16,10 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd IUSE="gnutls ssl libressl" DEPEND="ssl? ( - gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] ) + gnutls? ( + >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] + dev-libs/nettle:0=[${MULTILIB_USEDEP}] + ) !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild index 8a45c29d0d0..6c6bbb4ef98 100644 --- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild +++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -14,7 +14,10 @@ SLOT="0" IUSE="gnutls ssl libressl" DEPEND="ssl? ( - gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] ) + gnutls? ( + >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] + dev-libs/nettle:0=[${MULTILIB_USEDEP}] + ) !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild index 597b6842efc..2bf9f5d0cef 100644 --- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild +++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild @@ -14,7 +14,10 @@ SLOT="0" IUSE="gnutls ssl libressl" DEPEND="ssl? ( - gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] ) + gnutls? ( + >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] + dev-libs/nettle:0=[${MULTILIB_USEDEP}] + ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild index bb95a41dd31..d7c99b0d7dc 100644 --- a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild +++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -16,7 +16,10 @@ KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64 IUSE="gnutls ssl libressl" DEPEND="ssl? ( - gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] ) + gnutls? ( + >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] + dev-libs/nettle:0=[${MULTILIB_USEDEP}] + ) !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild index 42acf5134f9..d4e9a79c5e1 100644 --- a/media-video/rtmpdump/rtmpdump-9999.ebuild +++ b/media-video/rtmpdump/rtmpdump-9999.ebuild @@ -14,7 +14,10 @@ SLOT="0" IUSE="gnutls ssl libressl" DEPEND="ssl? ( - gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] ) + gnutls? ( + >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] + dev-libs/nettle:0=[${MULTILIB_USEDEP}] + ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
