gentoo resync : 18.08.2019

4 files changed, 21 insertions, 27 deletions

diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 71a181321711..8eba8b3784e2 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,6 +1,6 @@
 DIST phonon-4.10.2.tar.xz 322176 BLAKE2B a73fa78e732ba56745e0791559a1ab195e9a5d867d368935ebc779cc1705a405dfd8302f6b5d92678098da8b6fdb52ec4cc2d553c361c3fefc738d502e3c38b6 SHA512 205c2f41691ed37a2b24aa5e900f7720ba024d2046ea4bf0a9b9c46235ffd72dfb4010287ccf753b13e395f84c2a202cbb76454806de3519faf52c3ac7001c4e
 DIST phonon-4.10.3.tar.xz 336724 BLAKE2B 33ac87fa15985bb57672da0e29389a396e8f5662ca94d475eaa111a5a1fef16f9fc90cdee696b80d131fc53abd9500fbb7907ecb483d81e422e339660e19900d SHA512 2619ac0d7873205a2773bdb226695b5a9e2deb4f47b1a0bb9dbf9a905e3f82f7834ced1b4b1e7a6dadf50fca289f92a5749e3057546c3e16a41e1d6420b594c6
 EBUILD phonon-4.10.2.ebuild 1323 BLAKE2B 005ac868e7b70caed892e2996cc8f670aac6c1f570d8509a7a82daabae23d59bf5f5165d5ca504fcfe450c802fb6770e1f274ba48c2dc097f3d36d4045dfd6d9 SHA512 cd537e3be7548d6db5d847d35f0ad22a4823772e2f5cd42ae89f0fb90c919752a9a55d5324d29d90aaaf8497b0518b2c5aca373607edf4df3e75b0df6dfeb413
-EBUILD phonon-4.10.3.ebuild 1350 BLAKE2B 3ec7589a29c3b500547f79a98e2dbbca5a1f37828453aedd9ae947d6993c45621222fad53b9c16ef46c75f4e9a7671f0ddca95ba58951baa4385b8c29178d633 SHA512 857df22ce1ac9a1963224b488e462b2f70610a93d26587dc594f9cb1f46182f0ce9af5cd4ab8f88474bc041a2a29b6d2418b5d90898ee4a283e635e430924eca
-EBUILD phonon-9999.ebuild 1350 BLAKE2B 3ec7589a29c3b500547f79a98e2dbbca5a1f37828453aedd9ae947d6993c45621222fad53b9c16ef46c75f4e9a7671f0ddca95ba58951baa4385b8c29178d633 SHA512 857df22ce1ac9a1963224b488e462b2f70610a93d26587dc594f9cb1f46182f0ce9af5cd4ab8f88474bc041a2a29b6d2418b5d90898ee4a283e635e430924eca
-MISC metadata.xml 394 BLAKE2B e551fa12fcce92bd237d1cdb3fcbd496768e012004ace1e08a89f1e0e5f5c997d5b9d1488afce03925337d28a9c431994ce23244ffcb46f7138cde951dc26662 SHA512 963308198d2057bc2869eb21b644c59211f3c4bb04a46de3cca04dc85cdcf67b113555870149b971c8c43a0c64fb88cd141ccf20740f6428d1573485844574a6
+EBUILD phonon-4.10.3.ebuild 1331 BLAKE2B fce18c94194e5ad0de090677b1e3690fa9859381e0ac05fefaf1f6f30cc9f2b5148c7ac6951881f8a3827d53b7f7421d628cff9a399f646cedbed3fccae08f7b SHA512 f5605768a9e626fb1334d6b13f0882c136181887948227aa3a8a68b24c17fe1081e17812b1a177035b292fa893db5c14c2567d59f72ad0562e026772e14126a5
+EBUILD phonon-9999.ebuild 1158 BLAKE2B 48544fc9edf14295faf58e68708936ef3c6618319f50a224f94cba044aa5ed9f87933cd4c789b2dc923fd99672c8ee35aff7bc4ca0e63912c0fb6affc9e2c2f2 SHA512 b10e9dc36774d5625571be17354de01a7754dc3a60524788f5f015e4ac355662e9efb184919f7a48833b22b571fd9334e1606a0d0cfa948c03eb53c3a5c5b827
+MISC metadata.xml 472 BLAKE2B a4dd94a8883dceef6cbd2297e395c8e5fb287831d1bd0b69e74ea8c7977508123637177e8df2562ba1b8cfd9459738ab92f981bd926afb109433484d124937ee SHA512 8008de6bbc92f27fa741b915fef5f593aabac9921730d8238dd5f464bf3e54a8061d89107a77cb5d8e6e874479bfba3e013d5b2ba96b6afe17c32673b52d4a58
diff --git a/media-libs/phonon/metadata.xml b/media-libs/phonon/metadata.xml
index c965ebc5d239..206f8e058c2c 100644
--- a/media-libs/phonon/metadata.xml
+++ b/media-libs/phonon/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
+		<flag name="gui">Install device preferences and backend settings GUI</flag>
 		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
 		<flag name="vlc">Install VLC Phonon backend</flag>
 	</use>
diff --git a/media-libs/phonon/phonon-4.10.3.ebuild b/media-libs/phonon/phonon-4.10.3.ebuild
index 18d770debdb9..b6079f78857f 100644
--- a/media-libs/phonon/phonon-4.10.3.ebuild
+++ b/media-libs/phonon/phonon-4.10.3.ebuild
@@ -39,8 +39,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 PDEPEND="
-	gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] )
-	vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] )
+	gstreamer? ( =media-libs/phonon-gstreamer-4.9* )
+	vlc? ( =media-libs/phonon-vlc-0.10* )
 "
 
 src_configure() {
diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index 18d770debdb9..cee83b281de2 100644
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.ebuild
@@ -3,55 +3,48 @@
 
 EAPI=7
 
-if [[ ${PV} != *9999* ]]; then
+inherit kde5
+
+DESCRIPTION="KDE multimedia abstraction library"
+HOMEPAGE="https://phonon.kde.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-else
-	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
-	inherit git-r3
 fi
 
-inherit cmake-utils qmake-utils
-
-DESCRIPTION="KDE multimedia API"
-HOMEPAGE="https://phonon.kde.org/"
-
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-IUSE="debug designer gstreamer pulseaudio +vlc"
+IUSE="debug designer gstreamer gui pulseaudio +vlc"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
-	kde-frameworks/extra-cmake-modules:5
 	virtual/pkgconfig
 "
 DEPEND="
 	!!dev-qt/qtphonon:4
-	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	designer? ( dev-qt/designer:5 )
 	pulseaudio? (
 		dev-libs/glib:2
-		>=media-sound/pulseaudio-0.9.21[glib]
+		media-sound/pulseaudio[glib]
 	)
 "
 RDEPEND="${DEPEND}"
 PDEPEND="
-	gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] )
-	vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] )
+	gstreamer? ( >=media-libs/phonon-gstreamer-4.9.60 )
+	vlc? ( >=media-libs/phonon-vlc-0.9.60 )
 "
 
 src_configure() {
 	local mycmakeargs=(
-		-DPHONON_BUILD_PHONON4QT5=ON
-		-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
-		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
-		-DWITH_GLIB2=$(usex pulseaudio)
-		-DWITH_PulseAudio=$(usex pulseaudio)
-		-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)"/qmake
+		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=$(usex !pulseaudio)
+		-DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio=$(usex !pulseaudio)
+		-DPHONON_BUILD_SETTINGS=$(usex gui)
 	)
-	cmake-utils_src_configure
+	kde5_src_configure
 }