public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: media-libs/phonon/
Date: Wed, 02 Jul 2025 17:16:26 +0000 (UTC)	[thread overview]
Message-ID: <1751476171.37b48ed08459b6fb432973f84d750c73ca70398d.asturm@gentoo> (raw)

commit:     37b48ed08459b6fb432973f84d750c73ca70398d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 16 21:08:41 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul  2 17:09:31 2025 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=37b48ed0

media-libs/phonon: Drop IUSE qt5,qt6 - only leaving Qt6 build

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/phonon/phonon-9999.ebuild | 78 +++++++++++-------------------------
 1 file changed, 23 insertions(+), 55 deletions(-)

diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index ffd70189e3..c009987b78 100644
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.ebuild
@@ -3,39 +3,31 @@
 
 EAPI=8
 
-inherit cmake desktop flag-o-matic kde.org multibuild
+inherit cmake desktop flag-o-matic kde.org
 
 DESCRIPTION="KDE multimedia abstraction library"
 HOMEPAGE="https://community.kde.org/Phonon"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 ) !pulseaudio? ( || ( GPL-2 GPL-3 ) )"
 SLOT="0"
-IUSE="debug designer minimal pulseaudio qt5 +qt6"
-REQUIRED_USE="|| ( qt5 qt6 )"
+IUSE="debug designer minimal pulseaudio"
 
 DEPEND="
+	dev-qt/qt5compat:6
+	dev-qt/qtbase:6[gui,widgets]
+	designer? ( dev-qt/qttools:6[designer] )
 	pulseaudio? (
 		dev-libs/glib:2
 		media-libs/libpulse[glib]
 	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		designer? ( dev-qt/designer:5 )
-	)
-	qt6? (
-		dev-qt/qt5compat:6
-		dev-qt/qtbase:6[gui,widgets]
-		designer? ( dev-qt/qttools:6[designer] )
-	)
 "
 RDEPEND="${DEPEND}
+	!media-libs/phonon-gstreamer
 	|| (
 		kde-frameworks/breeze-icons:*
 		kde-frameworks/oxygen-icons:*
@@ -43,57 +35,33 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="
 	dev-libs/libpcre2:*
+	dev-qt/qttools:6[linguist]
 	>=kde-frameworks/extra-cmake-modules-5.115.0:*
 	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
-"
-PDEPEND="
-	!minimal? ( >=media-libs/phonon-vlc-0.12.0[qt5(-)?,qt6(+)?] )
 "
+PDEPEND="!minimal? ( >=media-libs/phonon-vlc-0.12.0-r2 )"
 
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
-}
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # bug 938315
 
 src_configure() {
 	use debug || append-cppflags -DQT_NO_DEBUG
 
-	myconfigure() {
-		local mycmakeargs=(
-			-DQT_MAJOR_VERSION=${MULTIBUILD_VARIANT/qt/}
-			-DPHONON_BUILD_${MULTIBUILD_VARIANT^^}=ON
-			-DKDE_INSTALL_USE_QT_SYS_PATHS=ON # ecm.eclass
-			-DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" # ecm.eclass
-			-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
-			-DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=$(usex !pulseaudio)
-			-DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio=$(usex !pulseaudio)
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
-			mycmakeargs+=(
-				-DPHONON_BUILD_QT5=OFF
-				-DPHONON_BUILD_SETTINGS=$(usex !minimal)
-			)
-		else
-			mycmakeargs+=(
-				-DPHONON_BUILD_QT6=OFF
-				-DPHONON_BUILD_SETTINGS=$(usex !qt6 $(usex !minimal ON OFF) OFF)
-			)
-		fi
-
-		cmake_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
+	local mycmakeargs=(
+		-DQT_MAJOR_VERSION=6
+		-DPHONON_BUILD_QT5=OFF
+		-DPHONON_BUILD_QT6=ON
+		-DPHONON_BUILD_SETTINGS=ON
+		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON # ecm.eclass
+		-DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" # ecm.eclass
+		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=$(usex !pulseaudio)
+		-DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio=$(usex !pulseaudio)
+	)
+	cmake_src_configure
 }
 
 src_install() {
-	multibuild_foreach_variant cmake_src_install
+	cmake_src_install
 	make_desktop_entry "${PN}settings" \
 		"Phonon Audio and Video" preferences-desktop-sound
 }


             reply	other threads:[~2025-07-02 17:16 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-02 17:16 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-07-06 21:01 [gentoo-commits] proj/kde:master commit in: media-libs/phonon/ Andreas Sturmlechner
2024-09-09 14:39 Andreas Sturmlechner
2024-07-07 20:42 Andreas Sturmlechner
2024-07-07 20:37 Andreas Sturmlechner
2024-07-01 19:10 Andreas Sturmlechner
2024-03-03 16:16 Andreas Sturmlechner
2023-12-22  9:26 Andreas Sturmlechner
2023-11-28 22:57 Andreas Sturmlechner
2023-11-27 23:22 Andreas Sturmlechner
2022-07-14 14:51 Andreas Sturmlechner
2019-11-22 13:00 Andreas Sturmlechner
2019-10-24 18:37 Andreas Sturmlechner
2019-08-31  6:39 Andreas Sturmlechner
2019-08-30  7:21 Andreas Sturmlechner
2019-08-26  1:15 Andreas Sturmlechner
2013-11-09 17:40 Johannes Huber
2013-10-13 17:03 Johannes Huber
2013-05-10 17:40 Michael Palimaka
2013-01-20 16:06 Michael Palimaka
2012-05-02 22:16 Johannes Huber
2012-01-31 11:40 Johannes Huber
2011-12-23 13:17 Johannes Huber
2011-12-23 13:17 Johannes Huber
2011-10-25  0:31 Alexey Shvetsov
2011-03-27 13:22 Andreas K. Huettel
2011-03-27 12:47 Andreas K. Huettel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1751476171.37b48ed08459b6fb432973f84d750c73ca70398d.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox