[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/

[Alexis Ballier]

commit:     06114cd1a0a4672a7cc3b5efdd1ea45430dc655a
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 15 12:22:12 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 12:22:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06114cd1

media-video/ffmpeg: revert libressl changes in live ebuild.

Those do not work properly, bug #569818 and there is no activity on said bug.

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 media-video/ffmpeg/ffmpeg-9999.ebuild | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild 
b/media-video/ffmpeg/ffmpeg-9999.ebuild
index c7c537a..4996b93 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -97,7 +97,7 @@ FFMPEG_ENCODER_FLAG_MAP=(
 )
 
 IUSE="
-       alsa doc +encode jack libressl oss pic static-libs test v4l
+       alsa doc +encode jack oss pic static-libs test v4l
        ${FFMPEG_FLAG_MAP[@]%:*}
        ${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
 "
@@ -212,10 +212,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? (
-               !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] 
)
-               libressl? ( dev-libs/libressl[${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}] )