[media-sound/phonon*] Split phonon from its backends

9 files changed, 115 insertions, 34 deletions

diff --git a/media-sound/phonon-gstreamer/Manifest b/media-sound/phonon-gstreamer/Manifest
new file mode 100644
index 00000000000..d1aecdfb59e
--- /dev/null
+++ b/media-sound/phonon-gstreamer/Manifest
@@ -0,0 +1,2 @@
+EBUILD phonon-gstreamer-9999.ebuild 639 RMD160 cd9e451a0be12fa350dc6bcf250d6b5f7bdd99b5 SHA1 f75654a2161b74a38e3995c0a990bbcc7eaf1880 SHA256 e3233b1cbffc557d5948e95fa93435a85a42e9e751c358dd3deccd9f5d76c138
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/media-sound/phonon-gstreamer/metadata.xml b/media-sound/phonon-gstreamer/metadata.xml
new file mode 100644
index 00000000000..8d1e86a9cef
--- /dev/null
+++ b/media-sound/phonon-gstreamer/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+</pkgmetadata>
diff --git a/media-sound/phonon-gstreamer/phonon-gstreamer-9999.ebuild b/media-sound/phonon-gstreamer/phonon-gstreamer-9999.ebuild
new file mode 100644
index 00000000000..843b47abb57
--- /dev/null
+++ b/media-sound/phonon-gstreamer/phonon-gstreamer-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+inherit cmake-utils git
+
+DESCRIPTION="Phonon XINE backend"
+HOMEPAGE="http://phonon.kde.org"
+EGIT_REPO_URI="git://anongit.kde.org/$PNP}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="alsa pulseaudio"
+
+RDEPEND="
+	media-libs/gstreamer
+	media-plugins/gst-plugins-meta[alsa?]
+	pulseaudio? (
+		dev-libs/glib:2
+		>=media-sound/pulseaudio-0.9.21[glib]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/automoc-0.9.87
+"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with pulseaudio GLib2)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/phonon-xine/Manifest b/media-sound/phonon-xine/Manifest
new file mode 100644
index 00000000000..b31611f1420
--- /dev/null
+++ b/media-sound/phonon-xine/Manifest
@@ -0,0 +1,2 @@
+EBUILD phonon-xine-9999.ebuild 755 RMD160 a475376040a754b40aa8b323011a4be0c90c5671 SHA1 9ae218f43d6f46060eae4bfc29eb7a362a27aec6 SHA256 ac29447573ae4cfba3c8cebf8304c231d6e2c4cbee9bfc614c8a769329f8ac92
+MISC metadata.xml 263 RMD160 7a5466a0574ed183b274d960395a08ea1dfba410 SHA1 7ddd4a4281433a2c5944a22945a7a8f78b7eb511 SHA256 72ea86ea8d558544b77c265bded5a81dd0b6ec9325909b8ab7e41838171a6718
diff --git a/media-sound/phonon-xine/metadata.xml b/media-sound/phonon-xine/metadata.xml
new file mode 100644
index 00000000000..5f1c751d1cc
--- /dev/null
+++ b/media-sound/phonon-xine/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+<use>
+	<flag name="xcb">Enable video support in Xine backend, via <pkg>x11-libs/libxcb</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/media-sound/phonon-xine/phonon-xine-9999.ebuild b/media-sound/phonon-xine/phonon-xine-9999.ebuild
new file mode 100644
index 00000000000..6276236a153
--- /dev/null
+++ b/media-sound/phonon-xine/phonon-xine-9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+inherit cmake-utils git
+
+DESCRIPTION="Phonon XINE backend"
+HOMEPAGE="http://phonon.kde.org"
+EGIT_REPO_URI="git://anongit.kde.org/${PN}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="aqua pulseaudio +xcb"
+
+RDEPEND="
+	>=media-libs/xine-lib-1.1.15-r1[xcb?]
+	pulseaudio? (
+		dev-libs/glib:2
+		>=media-sound/pulseaudio-0.9.21[glib]
+	)
+	xcb? ( x11-libs/libxcb )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/automoc-0.9.87
+"
+
+pkg_setup() {
+	if use aqua; then
+		die "XINE backend needs X11 which is not available for USE=aqua"
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with pulseaudio GLib2)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/phonon/Manifest b/media-sound/phonon/Manifest
index 314fcc69226..05eb1cc52ae 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 2924 RMD160 d9bd088feb21b0ec0ccfe381e717c4a294479939 SHA1 7682cdc9859452dd4045408410520540566a3165 SHA256 66e7552c1d45fab356faa8d216144deb9092620c0092da9ffd30af2f6f1407a6
-MISC metadata.xml 263 RMD160 7a5466a0574ed183b274d960395a08ea1dfba410 SHA1 7ddd4a4281433a2c5944a22945a7a8f78b7eb511 SHA256 72ea86ea8d558544b77c265bded5a81dd0b6ec9325909b8ab7e41838171a6718
+EBUILD phonon-9999.ebuild 2717 RMD160 59e4f1a8d672ed452c8fdbd186231fe42cf3b0b5 SHA1 0677d149223a4bb34072b4f046135097cdb68691 SHA256 97f988ad6fffdcdb1033d88ee61e2e65c808289e1aa581e45609a1e70050d88a
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/media-sound/phonon/metadata.xml b/media-sound/phonon/metadata.xml
index 5f1c751d1cc..8d1e86a9cef 100644
--- a/media-sound/phonon/metadata.xml
+++ b/media-sound/phonon/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>kde</herd>
-<use>
-	<flag name="xcb">Enable video support in Xine backend, via <pkg>x11-libs/libxcb</pkg></flag>
-</use>
 </pkgmetadata>
diff --git a/media-sound/phonon/phonon-9999.ebuild b/media-sound/phonon/phonon-9999.ebuild
index 54ebb6b6f35..44b1e0abf4c 100644
--- a/media-sound/phonon/phonon-9999.ebuild
+++ b/media-sound/phonon/phonon-9999.ebuild
@@ -2,46 +2,47 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
 
 inherit cmake-utils git
 
 DESCRIPTION="KDE multimedia API"
 HOMEPAGE="http://phonon.kde.org"
-EGIT_REPO_URI="git://anongit.kde.org/phonon"
+EGIT_REPO_URI="git://anongit.kde.org/${PN}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="alsa aqua debug gstreamer pulseaudio +xcb +xine"
+IUSE="alsa aqua debug directshow gstreamer mmf mplayer quicktime pulseaudio vlc waveout +xine"
 
 RDEPEND="
 	!kde-base/phonon-xine
 	!x11-libs/qt-phonon:4
-	>=x11-libs/qt-test-4.6.0:4[aqua=]
-	>=x11-libs/qt-dbus-4.6.0:4[aqua=]
-	>=x11-libs/qt-gui-4.6.0:4[aqua=]
-	>=x11-libs/qt-opengl-4.6.0:4[aqua=]
-	gstreamer? (
-		media-libs/gstreamer
-		media-plugins/gst-plugins-meta[alsa?]
-	)
+	>=x11-libs/qt-test-4.7.0:4[aqua=]
+	>=x11-libs/qt-dbus-4.7.0:4[aqua=]
+	>=x11-libs/qt-gui-4.7.0:4[aqua=]
+	>=x11-libs/qt-opengl-4.7.0:4[aqua=]
 	pulseaudio? (
 		dev-libs/glib:2
 		>=media-sound/pulseaudio-0.9.21[glib]
 	)
-	xine? (
-		>=media-libs/xine-lib-1.1.15-r1[xcb?]
-		xcb? ( x11-libs/libxcb )
-	)
+	vlc? ( media-sound/phonon-vlc )
+	xine? ( media-sound/phonon-xine )
 "
+#	gstreamer? ( media-sound/phonon-gstreamer )
+#	directshow? ( media-sound/phonon-directshow )
+#	mmf? ( media-sound/phonon-mmf )
+#	mplayer? ( media-sound/phonon-mplayer )
+#	quicktime? ( media-sound/phonon-quicktime )
+#	waveout? ( media-sound/phonon-waveout )
+
 DEPEND="${RDEPEND}
 	>=dev-util/automoc-0.9.87
 "
 
 pkg_setup() {
-	if use !xine && use !gstreamer && use !aqua; then
-		die "you must at least select one backend for phonon"
+	if use !aqua && use !directshow && use !aqua && use !; then
+		ewarn "You must at least select one backend for phonon to be usuable"
 	fi
 
 	if use xine && use aqua; then
@@ -52,25 +53,13 @@ pkg_setup() {
 src_prepare() {
 	# Fix the qt7 backend for MacOS 10.6.
 	[[ ${CHOST} == *-darwin10 ]] && epatch "${FILESDIR}"/${PN}-4.4-qt7.patch
-
-	# On MacOS we additionally want the gstreamer plugin.
-	if use aqua && use gstreamer; then
-		sed -e "/add_subdirectory(qt7)/a add_subdirectory(gstreamer)" \
-			-i CMakeLists.txt \
-			|| die "failed to enable GStreamer backend"
-	fi
 }
 
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with alsa)
 		$(cmake-utils_use_build aqua PHONON_QT7)
-		$(cmake-utils_use_with gstreamer GStreamer)
-		$(cmake-utils_use_with gstreamer GStreamerPlugins)
-		$(cmake-utils_use_with pulseaudio PulseAudio)
 		$(cmake-utils_use_with pulseaudio GLib2)
-		$(cmake-utils_use_with xine)
-		$(cmake-utils_use_with xcb)
 	)
 
 	cmake-utils_src_configure