Version bump.

Package-Manager: portage-2.2.0_alpha81/cvs/Linux i686

5 files changed, 90 insertions, 21 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/Manifest b/media-libs/phonon/Manifest
index 12824d175ca7..90a61503f340 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -8,27 +8,23 @@ DIST phonon-4.4.2.tar.bz2 629193 RMD160 aa37903f166904dd09401541df8fc268a2858606
 DIST phonon-4.4.3.tar.bz2 648733 RMD160 d7f36bf490acc595dabfd1f7fb1f4433cf77ccf8 SHA1 50262d590beb648be9dcad6b913b920db19a84f8 SHA256 60d17a70732df32cebad099e76f970d6d1aeab5e1f68ec305431f8c86a30a1d8
 DIST phonon-4.5.0.tar.bz2 322043 RMD160 80098d330ce4167eed5b6b6004871614178b37ef SHA1 122f7c53939a2c40c3312c2f5e59f25ca2c9ee53 SHA256 66e8913a00dc5a59e4a30c9034757a2a0eb448a8cefcf677c73dc9387a8752dc
 DIST phonon-4.5.1.tar.xz 291088 RMD160 b5aa9313b62bac7d5233716db52c9275168ee191 SHA1 710a9ffffe7e558f4d0ce5ea5c118cb248fb8da8 SHA256 0180f01cb6cae907285adf76e4aece9be33af6a352dc057709e40b7838e2f4c8
+DIST phonon-4.6.0.tar.xz 280712 RMD160 4b6037744c519613f0e39065a92d6742305e1366 SHA1 d8dbc188b58c6dd9c6a73d3742a25291e647bb95 SHA256 2915e7a37c92a0a8237b9e6d2ef67ba8b005ee3529d03991cd3d137f039ba3c4
 EBUILD phonon-4.4.2.ebuild 3228 RMD160 dac66a33e36e719763669547fe2790fa79f3e576 SHA1 72e049dc607772ccd7b40179deaa48eba89523da SHA256 510867bcbd72b2aae0f0e56fcffcdb4645177d176b76f07240888f9bc5067a83
 EBUILD phonon-4.4.3.ebuild 3124 RMD160 f5a71fbc0386abf97cc917111d3da899a77fc63b SHA1 a3b115bd8d6672d977f1845a43ec5cf0e82c2e86 SHA256 66e231fdf800bcad1864b8eae2871eb0e914c709cd9bcb19d9384ebf2e1cd6a7
 EBUILD phonon-4.5.0.ebuild 1457 RMD160 50a6ddfe15812f2cc726c6e6259c60fa93ab2fff SHA1 bcf01312865677dbcba75558478645f2ffb5f35c SHA256 fe1c6aa1d54ae5fdc35d0626215ec5964615fd4971bdb7b9faf2e25bb012cd4b
 EBUILD phonon-4.5.1-r1.ebuild 1648 RMD160 474cc1b149b2c60ba71e3780ee184fd7f547b2a6 SHA1 5053b2cd6c3de94ed9bba625689f0f901f3aaa84 SHA256 b4a7b9014acd6f432c19052dd7f1f13199dc88bece8a16b8406d7941a4b0f990
-EBUILD phonon-9999.ebuild 1590 RMD160 b03dd21328185554fc8eada732cec67b8a2a9aca SHA1 1daa1e0ad9395089221b17465949b04312e68154 SHA256 1a201bdb5554bb4b4929af7033a24a681d42923b6e2879188a169a44de8f0ccd
-MISC ChangeLog 13616 RMD160 c22963d1538eb0a369aee39efb79981815509399 SHA1 dbc02bbd19e7cc049be6148229b59082df8f9f00 SHA256 b9483ce30336d581997b77ae9cc96ffc35bc46c5f029642db0f600837959fce5
-MISC metadata.xml 221 RMD160 3b7c1f5e46245a1df8a099065a5f5e623a9ab574 SHA1 229bab5d18be9bc9f0432a2303ae58bd99eebe09 SHA256 9f8c503e1bbb2d02ea53a17549bda7713c0337d9e94619156bc29f3a219f29d0
+EBUILD phonon-4.6.0.ebuild 1673 RMD160 15af518b2948bcd0c8e771dda1fff8357b7baaf0 SHA1 14cd8d46fa2103dde8f1f1106b8586130d62fc4f SHA256 5beab7a1df332109e95e66ab137a594880cd38fea0a977d843937a8d16eba682
+EBUILD phonon-9999.ebuild 1635 RMD160 683bbef6dd74746149880516055c525e8d4513db SHA1 6e3206bf0ee189fd62ad7cbc94e387a2a4861cfb SHA256 e3ceddaddc11dc6e1451c9e722ba76edfc23142149f30286f14fde341ac24336
+MISC ChangeLog 13763 RMD160 44d450d0eb8b016bb4b61e8822d8369da1d7a0ce SHA1 f3ffe67c1c73c02a02bc2c4ee3ad5e4f2d74ee4c SHA256 d4d47b4a15ba96fe31b0f87538c70fcdf4dc694fb6939c58412481d94bb41f80
+MISC metadata.xml 300 RMD160 24b172a4760108f0f5f808bbf750176d7c66cbe8 SHA1 da0383a93f33fe34e8533b479b975538ae8101e0 SHA256 30942d7da188e105a7f745018a518ecc4438fc8ae8840ecbbabd676eed725bc0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO2SV4AAoJENwGBM22xffeB4YP/ipThx4/m/5CX/Eqzww6RA2Z
-KQkkPjwBrNlcORYsStZwOE7SGEKoyEZAMiHv/JVmFfYEHP989IXYoyneNdYk1pf4
-kO1pisKEB3Z9F4r0PQKpkHewDHwYV4t3gRlXSR47CY841WtSxa/sSVlxwDv7d4gg
-dq+CzXpjryA0CpsxNuyp0ma5XS+cGNX5KvnD2WQqRALQfqIdoeh+QkkdJYaRuCGA
-7KW6ATfWTMxi+IkH+cFnThKkuIDVb63qcYHkWU3hk1GDLLbBFGBhtMzsJtFK8DyB
-caiCOwDijM/QYStnD83szDUd6VwurX93Sdfb9OjEJWYTQt8oWT+oxgv5cYs+rWnX
-okYDv1T2Mmq7MUT1waBe35dg1nqCxMP6HX6WJREM2YH6VZl55mLMrx8IGVTkcnQs
-KHlOhXTv2kJ2NYWxXrPplsd/t6wTKPPcOSt9YTiuj7SFfyVNv+Aml4n2rYvc2JVS
-TPgd/DHkTXdHrGd+ywZSeQD9YzZhg39QNzXWUf2Rk5Wj7SdGX15drJ6eQb9sTujb
-Mi8E/JiRFRbgwKVrFAHLbMpMjVNRp5XFD8c/eHw1pJVLQzx1vql7O9KoLmHYhy/X
-cK/Wn0LxIygrzzU317vjtYTHE8zRyxmcpfeXgWYNVwoQ6ht+CR6o+OeoWDm+QaHG
-EN5ZBoD0rZAr7bIZbnDK
-=wPP0
+iQEcBAEBCgAGBQJO9H/WAAoJEO+t9ga+3I3aIRkIAM+jjlv9GzkvzZqV7ajo1F5g
+o/0IPFQbnKTDa6EN75+qTUpJsoSV3lmVCJwbB+bLqKMRpZOILt+9P0jVQKPEQJe0
+RDyaxCkN9OuM9RNS/bezozIB6uPIP6wZVTxV7nV07KATaTufJUkSTcqeWRWJ04Zb
+K5YqEAJuIYDeOi5HYhCnj/beQqDy3AMe4avrr+RBt1Zsvoy9TlgMTtO/XUA5H7yc
+sfY1YTgej7WLhuQ/4r2MnJjI5qcjZ9YrstAoN0Ur2twKFab6ifpqiM2YI7meDbGC
+PEhnCiWPTW/V3ibY8ep8zMwEwfd/qJUOzrm/cqnZXRgxAUAbDqQbIozRNHW68j0=
+=q2pv
 -----END PGP SIGNATURE-----
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 )