summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-sound/phonon-gstreamer/Manifest2
-rw-r--r--media-sound/phonon-gstreamer/phonon-gstreamer-9999.ebuild5
-rw-r--r--media-sound/phonon-xine/Manifest2
-rw-r--r--media-sound/phonon-xine/phonon-xine-9999.ebuild3
-rw-r--r--media-sound/phonon/Manifest2
-rw-r--r--media-sound/phonon/phonon-9999.ebuild2
6 files changed, 8 insertions, 8 deletions
diff --git a/media-sound/phonon-gstreamer/Manifest b/media-sound/phonon-gstreamer/Manifest
index 9aab6d6c8d1..08e588b93cd 100644
--- a/media-sound/phonon-gstreamer/Manifest
+++ b/media-sound/phonon-gstreamer/Manifest
@@ -1,2 +1,2 @@
-EBUILD phonon-gstreamer-9999.ebuild 731 RMD160 ce2bc67cccce847acece46d701034b0e50a777b9 SHA1 708382b2c1fc52871f91dbac73ae7986972ac30b SHA256 635809e4c8bc68560d20de0721870335a97fcfbf6d0b13298aef3100617a6ccb
+EBUILD phonon-gstreamer-9999.ebuild 712 RMD160 9089b1c67652a9eefad5a89d0a5a5469096b8eeb SHA1 50de1992a97a73d21645e53d7a28f233991a2210 SHA256 981cf32abbd1b3ffc4377dcb71fab51f6bcc93767a324a6fbf39bc59c2053a4e
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 4c225359517..e330caa62fd 100644
--- a/media-sound/phonon-gstreamer/phonon-gstreamer-9999.ebuild
+++ b/media-sound/phonon-gstreamer/phonon-gstreamer-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="3"
inherit cmake-utils git
-DESCRIPTION="Phonon XINE backend"
+DESCRIPTION="Phonon GStreamer backend"
HOMEPAGE="http://phonon.kde.org"
EGIT_REPO_URI="git://anongit.kde.org/${PN}"
@@ -16,6 +16,7 @@ KEYWORDS=""
IUSE="alsa pulseaudio"
COMMON_DEPEND="
+ >=media-sound/phonon-4.4.4
media-libs/gstreamer
media-plugins/gst-plugins-meta[alsa?]
pulseaudio? (
@@ -23,9 +24,7 @@ COMMON_DEPEND="
>=media-sound/pulseaudio-0.9.21[glib]
)
"
-# 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-xine/Manifest b/media-sound/phonon-xine/Manifest
index 09791f78098..86bf3bd2c12 100644
--- a/media-sound/phonon-xine/Manifest
+++ b/media-sound/phonon-xine/Manifest
@@ -1,2 +1,2 @@
-EBUILD phonon-xine-9999.ebuild 847 RMD160 53c4f44a049c6bafdb37f3f803fa2601f4081c0c SHA1 c00f8e74e9783fee9bdebae61f4d87c5096cb3ed SHA256 46f5b24a3d54bde02b8488da5676e52105b53205d3ae1aad098c264c95a35cc2
+EBUILD phonon-xine-9999.ebuild 823 RMD160 2c8f587e3a743027be705f583db9c5bca9edb99e SHA1 8f6e4172622f671165822a08466136914f4017a3 SHA256 2a259391bcc586562c2be14fbe50c238aeb7e8e39c8f651d991d02cc26fbfb4d
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 1330d7efb44..305074404f7 100644
--- a/media-sound/phonon-xine/phonon-xine-9999.ebuild
+++ b/media-sound/phonon-xine/phonon-xine-9999.ebuild
@@ -16,6 +16,7 @@ KEYWORDS=""
IUSE="aqua pulseaudio +xcb"
COMMON_DEPEND="
+ >=media-sound/phonon-4.4.4
>=media-libs/xine-lib-1.1.15-r1[xcb?]
pulseaudio? (
dev-libs/glib:2
@@ -23,9 +24,7 @@ COMMON_DEPEND="
)
xcb? ( x11-libs/libxcb )
"
-# 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/Manifest b/media-sound/phonon/Manifest
index 05eb1cc52ae..df4f4a24edb 100644
--- a/media-sound/phonon/Manifest
+++ b/media-sound/phonon/Manifest
@@ -1,3 +1,3 @@
AUX phonon-4.4-qt7.patch 15299 RMD160 ec017cf0dbbd79577a29c595f5bd6cbe9df7e199 SHA1 565b2c407acea17bcfeb5e24c82b14dbb398af38 SHA256 68b51882663ed0a8ef0bfa4bbb9acc8d113e033f7704cddba6add8adb061c6e3
-EBUILD phonon-9999.ebuild 2717 RMD160 59e4f1a8d672ed452c8fdbd186231fe42cf3b0b5 SHA1 0677d149223a4bb34072b4f046135097cdb68691 SHA256 97f988ad6fffdcdb1033d88ee61e2e65c808289e1aa581e45609a1e70050d88a
+EBUILD phonon-9999.ebuild 2729 RMD160 b9022757d2b18cbdc56935898746f16f489622c7 SHA1 271f0d24748925263f3c66bebdb71513de559b09 SHA256 abea8412e3aee2d573bdbce6d31b194bbc30d1bb8d8ccd2b00956bb30ba36bf4
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/media-sound/phonon/phonon-9999.ebuild b/media-sound/phonon/phonon-9999.ebuild
index 44b1e0abf4c..92948dd3884 100644
--- a/media-sound/phonon/phonon-9999.ebuild
+++ b/media-sound/phonon/phonon-9999.ebuild
@@ -26,6 +26,8 @@ RDEPEND="
dev-libs/glib:2
>=media-sound/pulseaudio-0.9.21[glib]
)
+"
+PDEPEND="
vlc? ( media-sound/phonon-vlc )
xine? ( media-sound/phonon-xine )
"