commit: 9817e950a3f0edb45ee0b8e51429004965315005 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Aug 30 08:38:50 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Aug 30 09:58:30 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9817e950
media-video/vlc: Switch IUSE=qt5 -> IUSE=gui Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-video/vlc/vlc-3.0.9999.ebuild | 43 ++++++++++++++++++------------------- media-video/vlc/vlc-9999.ebuild | 39 ++++++++++++++++----------------- 2 files changed, 40 insertions(+), 42 deletions(-) diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index c88bc2c4ce2..5adbabb6c6d 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -29,16 +29,15 @@ HOMEPAGE="https://www.videolan.org/vlc/"; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5-9" # vlc - vlccore -IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast - dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac - fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate - libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc - live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses - nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp - run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib - theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X - x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx - cpu_flags_x86_sse +IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus + dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth + fontconfig +gcrypt gme gnome-keyring gstreamer +gui ieee1394 jack jpeg kate + libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua + macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg + omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image + sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame + udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf zvbi + cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse " REQUIRED_USE=" chromecast? ( encode ) @@ -47,7 +46,7 @@ REQUIRED_USE=" libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) - skins? ( qt5 truetype X xml ) + skins? ( gui truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X ) @@ -109,6 +108,16 @@ RDEPEND=" gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) + gui? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + X? ( + dev-qt/qtx11extras:5 + x11-libs/libX11 + ) + ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 @@ -154,16 +163,6 @@ RDEPEND=" media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - X? ( - dev-qt/qtx11extras:5 - x11-libs/libX11 - ) - ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) @@ -321,6 +320,7 @@ src_configure() { $(use_enable gme) $(use_enable gnome-keyring secret) $(use_enable gstreamer gst-decode) + $(use_enable gui qt) $(use_enable ieee1394 dv1394) $(use_enable jack) $(use_enable jpeg) @@ -353,7 +353,6 @@ src_configure() { $(use_enable png) $(use_enable projectm) $(use_enable pulseaudio pulse) - $(use_enable qt5 qt) $(use_enable rdp freerdp) $(use_enable run-as-root) $(use_enable samba smbclient) diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index c501e315737..c7d6c95b35e 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -29,16 +29,15 @@ HOMEPAGE="https://www.videolan.org/vlc/"; LICENSE="LGPL-2.1 GPL-2" SLOT="0/12-9" # vlc - vlccore -IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast - dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac - fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate kms +IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus + dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth + fontconfig +gcrypt gme gnome-keyring gstreamer +gui ieee1394 jack jpeg kate kms libass libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses - nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp - run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib - theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X - x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx - cpu_flags_x86_sse + nfs ogg omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba + sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype + twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf + zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse " REQUIRED_USE=" chromecast? ( encode ) @@ -47,7 +46,7 @@ REQUIRED_USE=" libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) - skins? ( qt5 truetype X xml ) + skins? ( gui truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X ) @@ -109,6 +108,16 @@ RDEPEND=" gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) + gui? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + X? ( + dev-qt/qtx11extras:5 + x11-libs/libX11 + ) + ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 @@ -156,16 +165,6 @@ RDEPEND=" media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - X? ( - dev-qt/qtx11extras:5 - x11-libs/libX11 - ) - ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) @@ -322,6 +321,7 @@ src_configure() { $(use_enable gme) $(use_enable gnome-keyring secret) $(use_enable gstreamer gst-decode) + $(use_enable gui qt) $(use_enable ieee1394 dv1394) $(use_enable jack) $(use_enable jpeg) @@ -355,7 +355,6 @@ src_configure() { $(use_enable png) $(use_enable projectm) $(use_enable pulseaudio pulse) - $(use_enable qt5 qt) $(use_enable rdp freerdp) $(use_enable run-as-root) $(use_enable samba smbclient)
