From: Craig Andrews Date: Thu, 9 Jun 2016 17:29:59 +0000 (-0400) Subject: media-video/rtmpdump: Depend on net-libs/gnutls when USE=gnutls is on. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ef71138791d15731c7cf6d7319cc9ad343bac6dc;p=gentoo.git media-video/rtmpdump: Depend on net-libs/gnutls when USE=gnutls is on. Gentoo-Bug: https://bugs.gentoo.org/498840 Package-Manager: portage-2.3.0_rc1 Closes: https://github.com/gentoo/gentoo/pull/1634 Signed-off-by: Patrice Clement --- diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild index b0191aeac6be..254ab5c78f5f 100644 --- a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild +++ b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild @@ -17,7 +17,7 @@ KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux IUSE="gnutls polarssl ssl libressl" DEPEND="ssl? ( - gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] ) + gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] ) polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) ) !gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) ) >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild index de3ef6a31b14..87c1cf317d67 100644 --- a/media-video/rtmpdump/rtmpdump-9999.ebuild +++ b/media-video/rtmpdump/rtmpdump-9999.ebuild @@ -17,7 +17,7 @@ KEYWORDS="" IUSE="gnutls polarssl ssl libressl" DEPEND="ssl? ( - gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] ) + gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] ) polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) ) !gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) ) >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]