commit: b247952b9264ea079576875191690e98f280bd8d Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Oct 13 21:33:30 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Oct 13 21:38:31 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b247952b
media-video/vlc: Update IUSE qt dependencies (ported to Qt6) Strictly only looking at the Qt changes. Closes: https://bugs.gentoo.org/931967 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-video/vlc/vlc-9999.ebuild | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 2d66aaaa613d..3de4fee9b517 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -8,7 +8,7 @@ LUA_COMPAT=( lua5-{1..2} ) MY_PV="${PV/_/-}" MY_PV="${MY_PV/-beta/-test}" MY_P="${PN}-${MY_PV}" -if [[ ${PV} = *9999 ]] ; then +if [[ ${PV} = *9999* ]] ; then if [[ ${PV%.9999} != ${PV} ]] ; then EGIT_BRANCH="3.0.x" fi @@ -22,10 +22,12 @@ else fi KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 -sparc ~x86" fi + inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg DESCRIPTION="Media player and framework with support for most multimedia files and streaming" HOMEPAGE="https://www.videolan.org/vlc/"; +S="${WORKDIR}/${MY_P}" LICENSE="LGPL-2.1 GPL-2" SLOT="0/12-9" # vlc - vlccore @@ -114,14 +116,12 @@ RDEPEND=" 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 - ) + dev-qt/qt5compat:6[qml] + dev-qt/qtbase:6=[gui,widgets] + dev-qt/qtdeclarative:6 + dev-qt/qtsvg:6 + kde-frameworks/kwindowsystem:6 + X? ( x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 @@ -237,8 +237,6 @@ PATCHES=( DOCS=( AUTHORS THANKS NEWS README.md doc/fortunes.txt ) -S="${WORKDIR}/${MY_P}" - pkg_setup() { if use lua; then lua-single_pkg_setup
