gentoo auto-resync : 03:03:2024 - 17:42:46

3 files changed, 80 insertions, 45 deletions

diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index da55608c8b08..680a239cb761 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,5 +1,5 @@
 DIST phonon-backend-vlc-0.11.3.tar.xz 67196 BLAKE2B 597ead8300bfcd4dd1a94ee1733e77ea15436eea01924093ba6655d08de7b2334cd39c10e61655adcbf12e5ca1afb239c0ee0bd05fefe2e294cc1cb1ef5c7799 SHA512 11593d15874734d92922bcfd8e038a2a4f528d9145d525d6654aad7bb9d7edb911f31f564d83217341dff3be973c8cf00d91f03b66a90305f4f7ed97c2d57033
 DIST phonon-backend-vlc-0.12.0.tar.xz 71664 BLAKE2B 9ace1020d8e9a9e97243706ff81703d3f22bf892f402e44451147a24547d09bcf12f5745377c01d65b4d1fb03cd975b323b2cab62f8136880d1d9c004cca7d7b SHA512 78f5ead829d5025c7cb9e01b33819514d795651d1d932c03bd8cc2ad5d427e5aaaeeb6016820d5a7bb9907f6df1142a0fbc097830d7c63b01f77d2167a0c9264
 EBUILD phonon-vlc-0.11.3-r1.ebuild 736 BLAKE2B 68e053bf42c51ecbbad2f94e76cb8b1d982d706320cd4913aa9954cff08b7f4f6332d1f8739bf664c6dda930dbec3ec88177dd6a530c95a36caf6ec59467fa6a SHA512 f5c1296f63b6d71265c4d77b224b38bbc2ccc3b70349bd07db9432643796407f4661d3da97b8a75a556bc50e560a3290c47e4a264a3303c92d060e6fc1b4039e
-EBUILD phonon-vlc-0.12.0.ebuild 1012 BLAKE2B 7136746914bcee3a5b95744639ce852709f425004d8fcf3de69ae728236cc299a746c70b2b745dc762f8b2ef715b6f70fab40aa10d898a91e6316b3ae181998a SHA512 0dbd0c0497afa81012ce9af5ed952c211a78a0da0c636be08931007d0698d4572e06d2cd636d8849bd504ab7ef4600beca89d009ccc438195145d379c3e50f11
+EBUILD phonon-vlc-0.12.0-r1.ebuild 1786 BLAKE2B 4189ecf5eb77de0b1eb4b48862dec2f4562fa4bb23fe2457cbde82650954023c3b31ab15c8fb051be95a2fa2b6e3ef55d66bcd964ba90fb264e1cfd3d792ba89 SHA512 ddfe137f75c78c7309eda5eb9cf1e49320b2e2266ef98237d349305f6c5c772d01d04b2b4255d9358f91fad7d925e42a7e0720e9b667ff6599d1881aa709e92a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
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
-}