commit: ebab2e6f202ce0be36a89330110bb41968699249
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 18 12:42:09 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jun 18 13:10:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebab2e6f
media-video/mplayer: drop USE=openssl and USE=gnutls
This commit will partly revert commit 6aa84187fb7703127477455b57e2ad41b4f6bcdd.
After discussion on IRC we agreed that these no-op USE flags don't make
any sense.
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-video/mplayer/metadata.xml | 1 -
media-video/mplayer/{mplayer-1.4.ebuild => mplayer-1.4-r1.ebuild} | 6 +++---
media-video/mplayer/mplayer-9999.ebuild | 6 +++---
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index e0687a95818..5f4a3dfe1b7 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -21,7 +21,6 @@
<flag name="mng">MNG input support</flag>
<flag name="network">Enables network streaming support</flag>
<flag name="nut">Enables support for the NUT container format</flag>
- <flag name="openssl">Request OpenSSL support in
<pkg>media-video/ffmpeg</pkg> to enable encrypted network protocols
(TLS/HTTPS)</flag>
<flag name="osdmenu">Enables support for on-screen display (OSD)
menus</flag>
<flag name="pnm">Add PNM video output option, to create PPM/PGM/PGMYUV
images</flag>
<flag name="pvr">Enable Video4Linux2 MPEG PVR</flag>
diff --git a/media-video/mplayer/mplayer-1.4.ebuild
b/media-video/mplayer/mplayer-1.4-r1.ebuild
similarity index 98%
rename from media-video/mplayer/mplayer-1.4.ebuild
rename to media-video/mplayer/mplayer-1.4-r1.ebuild
index 4ce8fdded4c..cc11341688b 100644
--- a/media-video/mplayer/mplayer-1.4.ebuild
+++ b/media-video/mplayer/mplayer-1.4-r1.ebuild
@@ -12,9 +12,9 @@ inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua
bidi bl bluray
bs2b cddb +cdio cdparanoia cpudetection debug dga
doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp ggi gnutls gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx
cpu_flags_x86_mmxext mng mp3 nas
-+network openal opengl openssl +osdmenu oss png pnm pulseaudio pvr
++network openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse
cpu_flags_x86_sse2 cpu_flags_x86_ssse3
tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran"
@@ -61,7 +61,7 @@ RDEPEND+="
sys-libs/ncurses:0=
app-arch/bzip2
sys-libs/zlib
- >=media-video/ffmpeg-4.0:0=[gnutls?,openssl?,vdpau?]
+ >=media-video/ffmpeg-4.0:0=[vdpau?]
a52? ( media-libs/a52dec )
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
diff --git a/media-video/mplayer/mplayer-9999.ebuild
b/media-video/mplayer/mplayer-9999.ebuild
index 4ce8fdded4c..cc11341688b 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -12,9 +12,9 @@ inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua
bidi bl bluray
bs2b cddb +cdio cdparanoia cpudetection debug dga
doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp ggi gnutls gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx
cpu_flags_x86_mmxext mng mp3 nas
-+network openal opengl openssl +osdmenu oss png pnm pulseaudio pvr
++network openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse
cpu_flags_x86_sse2 cpu_flags_x86_ssse3
tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran"
@@ -61,7 +61,7 @@ RDEPEND+="
sys-libs/ncurses:0=
app-arch/bzip2
sys-libs/zlib
- >=media-video/ffmpeg-4.0:0=[gnutls?,openssl?,vdpau?]
+ >=media-video/ffmpeg-4.0:0=[vdpau?]
a52? ( media-libs/a52dec )
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
