gentoo resync : 18.08.2019

3 files changed, 14 insertions, 32 deletions

diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest
index a3e8cf6b7b66..56ddde0cab75 100644
--- a/media-libs/phonon-gstreamer/Manifest
+++ b/media-libs/phonon-gstreamer/Manifest
@@ -3,6 +3,6 @@ AUX phonon-gstreamer-4.9.0-qt-5.11.patch 2144 BLAKE2B a11065fab61037e11f54ab2b3a
 DIST phonon-backend-gstreamer-4.9.0.tar.xz 75960 BLAKE2B 676810dc99f3734a6932bfe355a37df1334c3460eba9a6d96e039442ce2729b61db61798c1f7207aef68a30f79355703c80e6aeb1a2ca7156f22e9fd7e07027b SHA512 9c13d37c6c7070c2bd8fcc562f743ac2f55289bc7cc82147ef0ae990e5d380d541cc1d9ce61e6ad1549ed1935d41faafaeeb0cd5463e4c656ea8fee636ff4dfe
 DIST phonon-backend-gstreamer-4.9.1.tar.xz 88460 BLAKE2B 236a1ecdc5fcb96d041e9e743993c1f613e6a9fde8b2c8a094216f00f5862f1a5617bc87d2a5b6b8dc935de6538233b6c6ee54ca67ae7796f3f6b96be835c2b5 SHA512 c7ad71c4273d3037cb245abffeba679e4920b0797b72cf5876b0b9a5a76be200de317a7d5da5dd9eaf46932030fd8ff9e5c64975d1258319d6c8ad1c17d773e0
 EBUILD phonon-gstreamer-4.9.0-r3.ebuild 1262 BLAKE2B a3b5ea35d373f02fae13ab3461f31b12a629e3017375de6ec7112686d11b8b87aad215377aa26671fbbbd16a33cfa94d517874101195123a2b1b689fb5f46f80 SHA512 1aa2be3410239b3549cac802f74f61309a6a06cd01bbfcb5e805e8e012ebbb945e1e4a0d24fd0533a8e8cc3395df212a65a7f850f5710b7480e573e3e4d31b1f
-EBUILD phonon-gstreamer-4.9.1.ebuild 1169 BLAKE2B c2141b77f575ff9982e02ac7dd1099ef04e5a99e999cc5452d0eeff9151667c26836606faf929db307574cb416df63f9110ac7a826103fd9ea8da3caed8cc484 SHA512 037509201a8ecba808bd190769078e798e195331bcd930d5a1568f7350d79a8ae144b7e9722691912888b32b0daf8539b94a0d48edabc502dfa088c2cd344875
-EBUILD phonon-gstreamer-9999.ebuild 1169 BLAKE2B c2141b77f575ff9982e02ac7dd1099ef04e5a99e999cc5452d0eeff9151667c26836606faf929db307574cb416df63f9110ac7a826103fd9ea8da3caed8cc484 SHA512 037509201a8ecba808bd190769078e798e195331bcd930d5a1568f7350d79a8ae144b7e9722691912888b32b0daf8539b94a0d48edabc502dfa088c2cd344875
+EBUILD phonon-gstreamer-4.9.1.ebuild 1167 BLAKE2B 2573fbb5833c6ae70cefcef07c19e8e500dd23e19ee01cf6bd29bc3b04106470eaac01e6b0e205faa5422976d7928feebec3642c09ef41b2cb4b4d3473f0c77d SHA512 f5c466442aacc222459148efb3d877e623c86314bb7483ea68f0f95aa442e1af5df4519c9131274603f720c787211cb809056b716b0386573338639d1881f306
+EBUILD phonon-gstreamer-9999.ebuild 932 BLAKE2B 058991aa20da444ff1d248a694e24df3bed4a5784119d9c7fb4b3f4b413bd1720faeaa1387cab19e255fafe785570cfa30a7ae54baf05645418bc2a00999b87d SHA512 3dc4437dcaa8f1ba154047feb40284627db0a2273db10d088c4e2338b49e3fc2affd38727b7f69a36d990f104e0b0aafd23dc830e359b7e456fd237d8cd188da
 MISC metadata.xml 339 BLAKE2B 2e6fd710b9791c7dd1f8836dac9209a84608dcb54d5ebef458acef6651c03eb55d8733d23df0a6cd0dbe470f00d43e0413b3d18b432f8a38a765af458e5662fc SHA512 c481721ab8e7762b2b951501cc99f7e2d2263ffd682dce3731fb415b677b74f7fbfe7770e9d2b1b1ce496c10254b84bb7489ff971593dac90c151a9ff1623e9a
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.1.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.1.ebuild
index 24ced106443d..84a04fda0ae0 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.1.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.1.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 	dev-qt/qtx11extras:5
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
-	>=media-libs/phonon-4.10.0
+	=media-libs/phonon-4.10*
 	media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
 	virtual/opengl
 	network? ( media-plugins/gst-plugins-soup:1.0 )
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
index 24ced106443d..777afe2e954d 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
@@ -3,55 +3,37 @@
 
 EAPI=7
 
-MY_PN="phonon-backend-gstreamer"
-MY_P=${MY_PN}-${PV}
+inherit kde5
 
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
+DESCRIPTION="GStreamer backend for the Phonon multimedia library"
+HOMEPAGE="https://phonon.kde.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/phonon/phonon-backend-gstreamer/${PV}/phonon-backend-gstreamer-${PV}.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 xdg-utils
-
-DESCRIPTION="Phonon GStreamer backend"
-HOMEPAGE="https://phonon.kde.org/"
-
 LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
 IUSE="alsa debug +network"
 
 BDEPEND="
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 "
 DEPEND="
 	dev-libs/glib:2
 	dev-libs/libxml2:2
-	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtopengl:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
-	>=media-libs/phonon-4.10.0
+	media-libs/gstreamer:1.0
+	>=media-libs/phonon-4.10.60
 	media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
 	virtual/opengl
+"
+RDEPEND="${DEPEND}
 	network? ( media-plugins/gst-plugins-soup:1.0 )
 "
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}