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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B835F158046 for ; Sun, 13 Oct 2024 21:39:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CB2DCE0837; Sun, 13 Oct 2024 21:38:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B55B0E0837 for ; Sun, 13 Oct 2024 21:38:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F3F2D3430EC for ; Sun, 13 Oct 2024 21:38:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 373071D0A for ; Sun, 13 Oct 2024 21:38:57 +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: <1728855511.b247952b9264ea079576875191690e98f280bd8d.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-9999.ebuild X-VCS-Directories: media-video/vlc/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b247952b9264ea079576875191690e98f280bd8d X-VCS-Branch: master Date: Sun, 13 Oct 2024 21:38:57 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d9418499-872c-4800-b3b3-5f9574c81964 X-Archives-Hash: 78cbf2808cc632d2e72322677896b6ea commit: b247952b9264ea079576875191690e98f280bd8d Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 13 21:33:30 2024 +0000 Commit: Andreas Sturmlechner gentoo 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 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