[media-sound/phonon-{gstreamer,xine}] Fix EGIT_REPO_URIs, add blocks for monolithic phonon

6 files changed, 17 insertions, 9 deletions

diff --git a/media-sound/phonon-gstreamer/Manifest b/media-sound/phonon-gstreamer/Manifest
index d1aecdfb59e..9aab6d6c8d1 100644
--- a/media-sound/phonon-gstreamer/Manifest
+++ b/media-sound/phonon-gstreamer/Manifest
@@ -1,2 +1,2 @@
-EBUILD phonon-gstreamer-9999.ebuild 639 RMD160 cd9e451a0be12fa350dc6bcf250d6b5f7bdd99b5 SHA1 f75654a2161b74a38e3995c0a990bbcc7eaf1880 SHA256 e3233b1cbffc557d5948e95fa93435a85a42e9e751c358dd3deccd9f5d76c138
+EBUILD phonon-gstreamer-9999.ebuild 731 RMD160 ce2bc67cccce847acece46d701034b0e50a777b9 SHA1 708382b2c1fc52871f91dbac73ae7986972ac30b SHA256 635809e4c8bc68560d20de0721870335a97fcfbf6d0b13298aef3100617a6ccb
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/media-sound/phonon-gstreamer/phonon-gstreamer-9999.ebuild b/media-sound/phonon-gstreamer/phonon-gstreamer-9999.ebuild
index 843b47abb57..4c225359517 100644
--- a/media-sound/phonon-gstreamer/phonon-gstreamer-9999.ebuild
+++ b/media-sound/phonon-gstreamer/phonon-gstreamer-9999.ebuild
@@ -8,14 +8,14 @@ inherit cmake-utils git
 
 DESCRIPTION="Phonon XINE backend"
 HOMEPAGE="http://phonon.kde.org"
-EGIT_REPO_URI="git://anongit.kde.org/$PNP}"
+EGIT_REPO_URI="git://anongit.kde.org/${PN}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
 IUSE="alsa pulseaudio"
 
-RDEPEND="
+COMMON_DEPEND="
 	media-libs/gstreamer
 	media-plugins/gst-plugins-meta[alsa?]
 	pulseaudio? (
@@ -23,7 +23,11 @@ RDEPEND="
 		>=media-sound/pulseaudio-0.9.21[glib]
 	)
 "
-DEPEND="${RDEPEND}
+# Plugins split ~4.4.3
+RDEPEND="${COMMON_DEPEND}
+	!<=media-sound/phonon-4.4.3
+"
+DEPEND="${COMMON_DEPEND}
 	>=dev-util/automoc-0.9.87
 "
 
diff --git a/media-sound/phonon-vlc/Manifest b/media-sound/phonon-vlc/Manifest
index 5e3fe0b75f6..26d77d9d880 100644
--- a/media-sound/phonon-vlc/Manifest
+++ b/media-sound/phonon-vlc/Manifest
@@ -1,2 +1,2 @@
-EBUILD phonon-vlc-9999.ebuild 843 RMD160 6c5d57bf1e2933172ccd7ba9d7ef8aa93dd92fcb SHA1 b11cc940feb1f161f8af2e1ad4c8100eda7a4ac1 SHA256 1ffaeeb3798ffd0af9174048cb0049a4be59181b2912c82754c11a6d9a0b3df6
+EBUILD phonon-vlc-9999.ebuild 838 RMD160 2d53533fd9f4db8996ee726cd0ff10ccbbf23dc5 SHA1 0946eaf837da480fc5dfa04f6dd56b9247d64e02 SHA256 e1697d8bd1a85345ca9ae91aaf2f986608c4f1aa27b0beed8f9d517abde85bf9
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/media-sound/phonon-vlc/phonon-vlc-9999.ebuild b/media-sound/phonon-vlc/phonon-vlc-9999.ebuild
index 6462ba427ad..34d0a90e704 100644
--- a/media-sound/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-sound/phonon-vlc/phonon-vlc-9999.ebuild
@@ -8,7 +8,7 @@ inherit cmake-utils git
 
 DESCRIPTION="Phonon VLC backend"
 HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-vlc"
-EGIT_REPO_URI="git://anongit.kde.org/phonon-vlc"
+EGIT_REPO_URI="git://anongit.kde.org/${PN}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/media-sound/phonon-xine/Manifest b/media-sound/phonon-xine/Manifest
index b31611f1420..09791f78098 100644
--- a/media-sound/phonon-xine/Manifest
+++ b/media-sound/phonon-xine/Manifest
@@ -1,2 +1,2 @@
-EBUILD phonon-xine-9999.ebuild 755 RMD160 a475376040a754b40aa8b323011a4be0c90c5671 SHA1 9ae218f43d6f46060eae4bfc29eb7a362a27aec6 SHA256 ac29447573ae4cfba3c8cebf8304c231d6e2c4cbee9bfc614c8a769329f8ac92
+EBUILD phonon-xine-9999.ebuild 847 RMD160 53c4f44a049c6bafdb37f3f803fa2601f4081c0c SHA1 c00f8e74e9783fee9bdebae61f4d87c5096cb3ed SHA256 46f5b24a3d54bde02b8488da5676e52105b53205d3ae1aad098c264c95a35cc2
 MISC metadata.xml 263 RMD160 7a5466a0574ed183b274d960395a08ea1dfba410 SHA1 7ddd4a4281433a2c5944a22945a7a8f78b7eb511 SHA256 72ea86ea8d558544b77c265bded5a81dd0b6ec9325909b8ab7e41838171a6718
diff --git a/media-sound/phonon-xine/phonon-xine-9999.ebuild b/media-sound/phonon-xine/phonon-xine-9999.ebuild
index 6276236a153..1330d7efb44 100644
--- a/media-sound/phonon-xine/phonon-xine-9999.ebuild
+++ b/media-sound/phonon-xine/phonon-xine-9999.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="aqua pulseaudio +xcb"
 
-RDEPEND="
+COMMON_DEPEND="
 	>=media-libs/xine-lib-1.1.15-r1[xcb?]
 	pulseaudio? (
 		dev-libs/glib:2
@@ -23,7 +23,11 @@ RDEPEND="
 	)
 	xcb? ( x11-libs/libxcb )
 "
-DEPEND="${RDEPEND}
+# Plugins split ~4.4.3
+RDEPEND="${COMMON_DEPEND}
+	!<=media-sound/phonon-4.4.3
+"
+DEPEND="${COMMON_DEPEND}
 	>=dev-util/automoc-0.9.87
 "