commit:     bb80c953d6aaff067ded6b27a0b21b082b3edae2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  3 16:09:23 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 16:37:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb80c953

media-libs/phonon-vlc: Use cmake.eclass and multibuild instead of ecm.eclass

Simultanous build of Qt5 and Qt6 is broken, installing Qt6 plugins
in Qt5 paths and vice versa.

ebuild was barely using ecm facilities anyway, this makes sure only those
deps that are needed are also used.

Closes: https://bugs.gentoo.org/923502
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild | 79 +++++++++++++++++++++++
 media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild    | 44 -------------
 2 files changed, 79 insertions(+), 44 deletions(-)

diff --git a/media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild 
b/media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild
new file mode 100644
index 000000000000..bae71d282ec3
--- /dev/null
+++ b/media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic kde.org multibuild
+
+DESCRIPTION="VLC backend for the Phonon multimedia library"
+HOMEPAGE="https://community.kde.org/Phonon";
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+       
SRC_URI="mirror://kde/stable/phonon/phonon-backend-vlc/${PV}/phonon-backend-vlc-${PV}.tar.xz"
+       S="${WORKDIR}"/phonon-backend-vlc-${PV}
+       KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+IUSE="debug +qt5 qt6"
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+DEPEND="
+       >=media-libs/phonon-4.12.0[qt5=,qt6=]
+       media-video/vlc:=[dbus,ogg,vorbis(+)]
+       qt5? (
+               dev-qt/qtcore:5
+               dev-qt/qtgui:5
+               dev-qt/qtwidgets:5
+       )
+       qt6? ( dev-qt/qtbase:6[gui,widgets] )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+       dev-libs/libpcre2:*
+       virtual/pkgconfig
+       qt5? (
+               dev-qt/linguist-tools:5
+               >=kde-frameworks/extra-cmake-modules-5.115.0:*
+       )
+       qt6? (
+               dev-qt/qttools:6[linguist]
+               >=kde-frameworks/extra-cmake-modules-6.0.0:*
+       )
+"
+
+pkg_setup() {
+       MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+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
+               )
+
+               if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
+                       mycmakeargs+=( -DPHONON_BUILD_QT5=OFF )
+               else
+                       mycmakeargs+=( -DPHONON_BUILD_QT6=OFF )
+               fi
+
+               cmake_src_configure
+       }
+
+       multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+       multibuild_foreach_variant cmake_src_compile
+}
+
+src_install() {
+       multibuild_foreach_variant cmake_src_install
+}

diff --git a/media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild 
b/media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild
deleted file mode 100644
index 62401f9834d8..000000000000
--- a/media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit ecm kde.org
-
-DESCRIPTION="VLC backend for the Phonon multimedia library"
-HOMEPAGE="https://community.kde.org/Phonon";
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-       
SRC_URI="mirror://kde/stable/phonon/phonon-backend-vlc/${PV}/phonon-backend-vlc-${PV}.tar.xz"
-       S="${WORKDIR}"/phonon-backend-vlc-${PV}
-       KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="+qt5 qt6"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-DEPEND="
-       >=media-libs/phonon-4.12.0[qt5=,qt6=]
-       media-video/vlc:=[dbus,ogg,vorbis(+)]
-       qt5? (
-               dev-qt/qtgui:5
-               dev-qt/qtwidgets:5
-       )
-       qt6? ( dev-qt/qtbase:6[gui,widgets] )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-       qt5? ( dev-qt/linguist-tools:5 )
-       qt6? ( dev-qt/qttools:6[linguist] )
-       virtual/pkgconfig
-"
-
-src_configure() {
-       local mycmakeargs=(
-               -DPHONON_BUILD_QT5=$(usex qt5)
-               -DPHONON_BUILD_QT6=$(usex qt6)
-       )
-       ecm_src_configure
-}

Reply via email to