From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 43ACC139084 for ; Sat, 9 Dec 2017 16:53:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A5AFE1079; Sat, 9 Dec 2017 16:53:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 33E58E1079 for ; Sat, 9 Dec 2017 16:53:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B6E5533BF55 for ; Sat, 9 Dec 2017 16:53:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3B7DAE76 for ; Sat, 9 Dec 2017 16:53:12 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1512838359.2ef8acc2dc59f474dff36d315c1bc6f59971e1e4.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/vlc/vlc-2.2.8.ebuild media-video/vlc/vlc-2.2.9999.ebuild X-VCS-Directories: media-video/vlc/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2ef8acc2dc59f474dff36d315c1bc6f59971e1e4 X-VCS-Branch: master Date: Sat, 9 Dec 2017 16:53:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9e467dbb-06b8-48e6-8706-7393dffebc7b X-Archives-Hash: 7b92aa6d522c1d90e43cd993d6d6be9b commit: 2ef8acc2dc59f474dff36d315c1bc6f59971e1e4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 9 16:51:51 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 9 16:52:39 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ef8acc2 media-video/vlc: 2.2*: Drop USE=qt4 Package-Manager: Portage-2.3.17, Repoman-2.3.6 media-video/vlc/vlc-2.2.8.ebuild | 14 +++----------- media-video/vlc/vlc-2.2.9999.ebuild | 14 +++----------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/media-video/vlc/vlc-2.2.8.ebuild b/media-video/vlc/vlc-2.2.8.ebuild index e7da531419b..4ce203a7999 100644 --- a/media-video/vlc/vlc-2.2.8.ebuild +++ b/media-video/vlc/vlc-2.2.8.ebuild @@ -37,7 +37,7 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdd macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio - qt4 +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout + +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi @@ -55,10 +55,9 @@ REQUIRED_USE=" libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) - qt4? ( X ) qt5? ( X ) sdl? ( X ) - skins? ( truetype X xml || ( qt4 qt5 ) ) + skins? ( qt5 truetype X xml ) vaapi? ( avcodec X ) vdpau? ( X ) vlm? ( encode ) @@ -133,7 +132,6 @@ RDEPEND=" ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) - !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) rdp? ( =net-misc/freerdp-1*:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) @@ -251,8 +249,6 @@ src_prepare() { # version may be used. Setting QT_SELECT environment variable will enforce correct binaries. if use qt5; then export QT_SELECT=qt5 - elif use qt4; then - export QT_SELECT=qt4 fi } @@ -279,11 +275,7 @@ src_configure() { if use qt5 ; then myconf+=" --enable-qt=5" else - if use qt4 ; then - myconf+=" --enable-qt=4" - else - myconf+=" --disable-qt" - fi + myconf+=" --disable-qt" fi econf \ diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild index 62f545c2ce8..443d35b4c45 100644 --- a/media-video/vlc/vlc-2.2.9999.ebuild +++ b/media-video/vlc/vlc-2.2.9999.ebuild @@ -37,7 +37,7 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdd macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio - qt4 +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout + +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi @@ -55,10 +55,9 @@ REQUIRED_USE=" libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) - qt4? ( X ) qt5? ( X ) sdl? ( X ) - skins? ( truetype X xml || ( qt4 qt5 ) ) + skins? ( qt5 truetype X xml ) vaapi? ( avcodec X ) vdpau? ( X ) vlm? ( encode ) @@ -133,7 +132,6 @@ RDEPEND=" ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) - !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) rdp? ( =net-misc/freerdp-1*:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) @@ -251,8 +249,6 @@ src_prepare() { # version may be used. Setting QT_SELECT environment variable will enforce correct binaries. if use qt5; then export QT_SELECT=qt5 - elif use qt4; then - export QT_SELECT=qt4 fi } @@ -279,11 +275,7 @@ src_configure() { if use qt5 ; then myconf+=" --enable-qt=5" else - if use qt4 ; then - myconf+=" --enable-qt=4" - else - myconf+=" --disable-qt" - fi + myconf+=" --disable-qt" fi econf \