commit: 4e59daaee7cd6cb65079cd01408bedbbfa43b214 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Thu Nov 15 15:51:06 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Thu Nov 15 15:55:41 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e59daae
media-video/ffmpeg: Added sub-slot operator for dev-libs/openssl. Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> media-video/ffmpeg/ffmpeg-3.2.6.ebuild | 2 +- media-video/ffmpeg/ffmpeg-3.2.7.ebuild | 2 +- media-video/ffmpeg/ffmpeg-3.3.4.ebuild | 2 +- media-video/ffmpeg/ffmpeg-3.3.6.ebuild | 2 +- media-video/ffmpeg/ffmpeg-3.3.8.ebuild | 2 +- media-video/ffmpeg/ffmpeg-3.4.5.ebuild | 2 +- media-video/ffmpeg/ffmpeg-4.0.2.ebuild | 2 +- media-video/ffmpeg/ffmpeg-4.0.3.ebuild | 2 +- media-video/ffmpeg/ffmpeg-4.1.ebuild | 2 +- media-video/ffmpeg/ffmpeg-9999.ebuild | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild index 7969d816201..010f59065ed 100644 --- a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild +++ b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild @@ -211,7 +211,7 @@ RDEPEND=" modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild index 63dea731274..b798bf59bc2 100644 --- a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild +++ b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild @@ -211,7 +211,7 @@ RDEPEND=" modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild index 9bfc5b0be2b..e2134969906 100644 --- a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild +++ b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild @@ -227,7 +227,7 @@ RDEPEND=" modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild index 03289d69b79..8edfe99d1be 100644 --- a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild +++ b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild @@ -227,7 +227,7 @@ RDEPEND=" modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-3.3.8.ebuild b/media-video/ffmpeg/ffmpeg-3.3.8.ebuild index d9e3e521ff3..31f31bd7f75 100644 --- a/media-video/ffmpeg/ffmpeg-3.3.8.ebuild +++ b/media-video/ffmpeg/ffmpeg-3.3.8.ebuild @@ -227,7 +227,7 @@ RDEPEND=" modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-3.4.5.ebuild b/media-video/ffmpeg/ffmpeg-3.4.5.ebuild index 07123b94bbf..671893a1624 100644 --- a/media-video/ffmpeg/ffmpeg-3.4.5.ebuild +++ b/media-video/ffmpeg/ffmpeg-3.4.5.ebuild @@ -220,7 +220,7 @@ RDEPEND=" openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild b/media-video/ffmpeg/ffmpeg-4.0.2.ebuild index dc2945d4871..0ecdf810c4b 100644 --- a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.0.2.ebuild @@ -262,7 +262,7 @@ RDEPEND=" RDEPEND="${RDEPEND} libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) !libressl? ( - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) ) ) " diff --git a/media-video/ffmpeg/ffmpeg-4.0.3.ebuild b/media-video/ffmpeg/ffmpeg-4.0.3.ebuild index 3ca1f9a33e6..2a10fdca948 100644 --- a/media-video/ffmpeg/ffmpeg-4.0.3.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.0.3.ebuild @@ -262,7 +262,7 @@ RDEPEND=" RDEPEND="${RDEPEND} libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) !libressl? ( - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) ) ) " diff --git a/media-video/ffmpeg/ffmpeg-4.1.ebuild b/media-video/ffmpeg/ffmpeg-4.1.ebuild index 3ca1f9a33e6..2a10fdca948 100644 --- a/media-video/ffmpeg/ffmpeg-4.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.1.ebuild @@ -262,7 +262,7 @@ RDEPEND=" RDEPEND="${RDEPEND} libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) !libressl? ( - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) ) ) " diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 3ca1f9a33e6..2a10fdca948 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -262,7 +262,7 @@ RDEPEND=" RDEPEND="${RDEPEND} libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) !libressl? ( - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) ) ) "