Version bump.

(Portage version: 2.2.0_alpha81/cvs/Linux i686)

4 files changed, 77 insertions, 4 deletions

diff --git a/media-libs/phonon/ChangeLog b/media-libs/phonon/ChangeLog
index 91954b350abf..2a4a9c3f9dbe 100644
--- a/media-libs/phonon/ChangeLog
+++ b/media-libs/phonon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/phonon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.26 2011/12/02 19:22:19 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.27 2011/12/23 13:17:06 johu Exp $
+
+*phonon-4.6.0 (23 Dec 2011)
+
+  23 Dec 2011; Johannes Huber <johu@gentoo.org> +phonon-4.6.0.ebuild,
+  metadata.xml, phonon-9999.ebuild:
+  Version bump.
 
   02 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org> phonon-4.4.2.ebuild,
   phonon-4.4.3.ebuild, phonon-4.5.0.ebuild, phonon-4.5.1-r1.ebuild:
diff --git a/media-libs/phonon/metadata.xml b/media-libs/phonon/metadata.xml
index 728ddc9cb0cf..10f0c216eeba 100644
--- a/media-libs/phonon/metadata.xml
+++ b/media-libs/phonon/metadata.xml
@@ -4,5 +4,6 @@
 <herd>kde</herd>
 <use>
 	<flag name="vlc">Install VLC Phonon backend</flag>
+	<flag name="zeitgeist">Add support for Zeitgeist event tracking system</flag>
 </use>
 </pkgmetadata>
diff --git a/media-libs/phonon/phonon-4.6.0.ebuild b/media-libs/phonon/phonon-4.6.0.ebuild
new file mode 100644
index 000000000000..a380de71cc0a
--- /dev/null
+++ b/media-libs/phonon/phonon-4.6.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.6.0.ebuild,v 1.1 2011/12/23 13:17:06 johu Exp $
+
+EAPI=4
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/stable/phonon/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+	SCM_ECLASS="git-2"
+	EGIT_REPO_URI="git://anongit.kde.org/${PN}"
+	KEYWORDS=""
+fi
+
+inherit cmake-utils ${SCM_ECLASS}
+
+DESCRIPTION="KDE multimedia API"
+HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="aqua debug +gstreamer pulseaudio vlc xine zeitgeist"
+
+COMMON_DEPEND="
+	!!x11-libs/qt-phonon:4
+	>=x11-libs/qt-core-4.6.0:4
+	>=x11-libs/qt-dbus-4.6.0:4
+	>=x11-libs/qt-gui-4.6.0:4
+	>=x11-libs/qt-test-4.6.0:4
+	pulseaudio? (
+		dev-libs/glib:2
+		>=media-sound/pulseaudio-0.9.21[glib]
+	)
+	zeitgeist? ( dev-libs/libqzeitgeist )
+"
+# directshow? ( media-sound/phonon-directshow )
+# mmf? ( media-sound/phonon-mmf )
+# mplayer? ( media-sound/phonon-mplayer )
+# waveout? ( media-sound/phonon-waveout )
+PDEPEND="
+	aqua? ( media-libs/phonon-qt7 )
+	gstreamer? ( media-libs/phonon-gstreamer )
+	vlc? ( >=media-libs/phonon-vlc-0.3.2 )
+	xine? ( >=media-libs/phonon-xine-0.4.4 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-base/phonon-xine
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/automoc-0.9.87
+	dev-util/pkgconfig
+"
+
+REQUIRED_USE="|| ( aqua gstreamer vlc xine )"
+
+PATCHES=( "${FILESDIR}/${PN}-4.5.1-qmakeworkaround.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with pulseaudio GLIB2)
+		$(cmake-utils_use_with pulseaudio PulseAudio)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index 0008e0961efc..6d886df5b13a 100644
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.12 2011/11/08 19:04:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.13 2011/12/23 13:17:06 johu Exp $
 
 EAPI=4
 
@@ -20,10 +20,10 @@ HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="aqua debug +gstreamer pulseaudio vlc xine"
+IUSE="aqua debug +gstreamer pulseaudio vlc xine zeitgeist"
 
 COMMON_DEPEND="
-	!x11-libs/qt-phonon:4
+	!!x11-libs/qt-phonon:4
 	>=x11-libs/qt-core-4.6.0:4
 	>=x11-libs/qt-dbus-4.6.0:4
 	>=x11-libs/qt-gui-4.6.0:4
@@ -32,6 +32,7 @@ COMMON_DEPEND="
 		dev-libs/glib:2
 		>=media-sound/pulseaudio-0.9.21[glib]
 	)
+	zeitgeist? ( dev-libs/libqzeitgeist )
 "
 # directshow? ( media-sound/phonon-directshow )
 # mmf? ( media-sound/phonon-mmf )