Version bump. Per bug #323551.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-sound/phonon/ChangeLog b/media-sound/phonon/ChangeLog
index 7e81821e00cbc95debc8d10362c8f2fea735c607..6d40f8ebfff564531da3d8f5f2e963bf42781a95 100644 (file)
--- a/media-sound/phonon/ChangeLog
+++ b/media-sound/phonon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/phonon
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/phonon/ChangeLog,v 1.50 2010/05/24 20:16:01 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/phonon/ChangeLog,v 1.51 2010/06/18 09:58:38 scarabeus Exp $
+
+*phonon-4.4.2 (18 Jun 2010)
+
+  18 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> +phonon-4.4.2.ebuild:
+  Version bump. Per bug #323551.
 
 *phonon-4.4.1-r1 (24 May 2010)
 

diff --git a/media-sound/phonon/Manifest b/media-sound/phonon/Manifest
index 78b5151e6dccf60b28562506741f58ddac9c8c36..4bc53c5ddf20411ab8b9c4b426eb88de10cbc540 100644 (file)
--- a/media-sound/phonon/Manifest
+++ b/media-sound/phonon/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX fix_nonascii_chars.patch 3159 RMD160 cde38d5c7000618eefa910b9638ac6b51ed663f9 SHA1 4b520fbc8e42764225d1fe7ee73213e7bbf92f3f SHA256 5969e2766160c21565dfcef3dffb6c264a9031dc6364a580b9b452358d07d6de
 AUX phonon-4.4-qt7.patch 15299 RMD160 ec017cf0dbbd79577a29c595f5bd6cbe9df7e199 SHA1 565b2c407acea17bcfeb5e24c82b14dbb398af38 SHA256 68b51882663ed0a8ef0bfa4bbb9acc8d113e033f7704cddba6add8adb061c6e3
@@ -7,20 +7,18 @@ AUX phonon-4.4.1-pulseaudio-connect.patch 2856 RMD160 6616c02938d36841927c2c871b
 AUX phonon-4.4.1-xine-volume.patch 1117 RMD160 98166edfe5aece2b134e0553a8bf918cfa372fdf SHA1 dfb9fc4ab44a41a4a4889009de1f74bd8045291c SHA256 89acdff7a719abd42f2b0efaf46e5fa7b0de33696d69e510395ac104aaed6eac
 DIST phonon-4.3.80.tar.bz2 598739 RMD160 5c271c1d53ee8878205255f8f257b7bfcd6c21c3 SHA1 914e4db5a6c23918be4b85e56a31207a2d17bf5d SHA256 89cb295f45d7db1bf261e344569c2597879657d1aa9538e5037bc2db9a508bec
 DIST phonon-4.4.1.tar.bz2 625008 RMD160 945669b48fa5278f4ca59b415799a14d45ed1c55 SHA1 e87474e144c2d03944161aeb1b18a0569642a556 SHA256 8a52b0e74c5fb5c8dd3ce65d745c7052cdcea0e7535658fbc655671cef5e5277
+DIST phonon-4.4.2.tar.bz2 629193 RMD160 aa37903f166904dd09401541df8fc268a2858606 SHA1 c329d924fb75a89a9de8a4d799ff4dcd7ee3302e SHA256 f1404c3f326201b382c26ba37f2d885d30bc71ba5fd8e1479afb632f92d93486
 DIST phonon-4.4_pre20090520.tar.bz2 583005 RMD160 5cd7abe22319124b60fe292b978b7e78fae1a29d SHA1 a0a6942cb40b28c4e30f4272b1420300546a9bdf SHA256 0073efcc672b4d2e6def34e82ff43313cf8cb14ef63d15cd9b4d9f641b998e9d
 EBUILD phonon-4.3.50_pre20090520.ebuild 1434 RMD160 de5914c8e617763edda6b9470a64b80bc2a1be14 SHA1 03d60944ca70db8d0fcfa5ba590727e633fb4431 SHA256 7d79bff1cac696034940b314b30681b7ac5777037cdcc9bcaf60376fd403d67e
 EBUILD phonon-4.3.80-r1.ebuild 3165 RMD160 4678ba4b88724247e7aeb2d2df53a0787ac79095 SHA1 9c251cf4d5be9dbc49aa95dbfc254c645dc8d0ad SHA256 c05738861d371f703c2fbed398c21c4baa9ad501fa3b33ba1abf5e250d16160b
 EBUILD phonon-4.4.1-r1.ebuild 3308 RMD160 41e4d3910735b09dd1303580bd32061f4ceb5a44 SHA1 2e7c7c2ba39482e603df89b7e409e30ffa97be59 SHA256 c342b48ad9ac9031a09c120d6d77f966f01bb993cd9eaa3f1df22b4cf23079ce
-MISC ChangeLog 7052 RMD160 a323b695187050cde2d3f5cd1bd4cf59ee35393e SHA1 2dc864889a8bf53e6e44d83283f5d783fc41f68a SHA256 512fdf5ace39a20a79c71e6d7e10cc07fc187941af14cc8eabe542d20e0ed296
+EBUILD phonon-4.4.2.ebuild 3213 RMD160 d15f4be744f6c131cc20b3e2fa6d7eca63dfb455 SHA1 6d476814cbab5100181fa595f3923d8597fd4df4 SHA256 a31401a5437218795d9f2fc29cb5d424816a3745aa64dffa3eda4b2e001939dd
+MISC ChangeLog 7196 RMD160 7b78a2df5a3ab6a4aaa1b60d5ab1b9decdbc3b26 SHA1 03a82b19f11c74d517081d0f3a1d67baccbf7d0b SHA256 3975a71f98afb1bb3432193cd7e9141733ac93c82b3e61785622252153b70f0b
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iQEcBAEBCgAGBQJL+t6jAAoJEAWF714uGAc6sPoIAJI6B9PGyB80ng0zMlKhVaMp
-1lrt1j83Mtqt4txUuVqO+otZV/dTD3gM9nt4KPoswF+akNt+g0C8cqC/Sn5ru7MJ
-us1+6+wPxxZ4E/2U2OmvZFFp1H2vU33IudgYdtHcZp22A4Q+iWzB22D9/DhBAal+
-7SC00YDARWhlEKBRqGDSKbtXXtXWZXLuFdCjy4lGMxih8BgWhJfWwu1ejxnplm8K
-7GNeky6J1Gd6P7mhkdgk+D7btRuC/6DXLXgilIJ9P5+5OKGVfMz2zAxnKSnAt/G5
-L1+9fkJY6BfbM7Ip0pia1uksRFzt/Op2VMAWkYK4P7WqxSq0VDKWID+JqaEq8kU=
-=U4IC
+iEYEARECAAYFAkwbQ0kACgkQHB6c3gNBRYcC0ACfYlZ8dgRm75qpVjsj0TiBsbJm
+o3sAoM0vjEJaAELUfpLCBFrzo/T0fQnZ
+=Wipt
 -----END PGP SIGNATURE-----

diff --git a/media-sound/phonon/phonon-4.4.2.ebuild b/media-sound/phonon/phonon-4.4.2.ebuild
new file mode 100644 (file)
index 0000000..eb10dc6
--- /dev/null
+++ b/media-sound/phonon/phonon-4.4.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/phonon/phonon-4.4.2.ebuild,v 1.1 2010/06/18 09:58:38 scarabeus Exp $
+
+EAPI="2"
+
+inherit cmake-utils
+
+DESCRIPTION="KDE multimedia API"
+HOMEPAGE="http://phonon.kde.org"
+SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="alsa aqua debug gstreamer pulseaudio +xcb +xine"
+
+RDEPEND="
+       !kde-base/phonon-xine
+       !x11-libs/qt-phonon:4
+       >=x11-libs/qt-test-4.4.0:4[aqua=]
+       >=x11-libs/qt-dbus-4.4.0:4[aqua=]
+       >=x11-libs/qt-gui-4.4.0:4[aqua=]
+       >=x11-libs/qt-opengl-4.4.0:4[aqua=]
+       gstreamer? (
+               media-libs/gstreamer
+               media-plugins/gst-plugins-meta[alsa?]
+       )
+       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 )
+       )
+"
+DEPEND="${RDEPEND}
+       >=dev-util/automoc-0.9.87
+"
+
+S=${WORKDIR}/${P/.0}
+
+pkg_setup() {
+       if use !xine && use !gstreamer && use !aqua; then
+               die "you must at least select one backend for phonon"
+       fi
+
+       if use xine && use aqua; then
+               die "XINE backend needs X11 which is not available for USE=aqua"
+       fi
+}
+
+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
+
+       base_src_prepare
+}
+
+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
+}
+
+src_install() {
+       cmake-utils_src_install
+
+       if use aqua; then
+               local MY_PV=4.4.0
+
+               install_name_tool \
+                       -id "${EPREFIX}/usr/lib/libphonon.${MY_PV::1}.dylib" \
+                       "${ED}/usr/lib/libphonon.${MY_PV}.dylib" \
+                       || die "failed to fix libphonon.${MY_PV}.dylib"
+
+               install_name_tool \
+                       -id "${EPREFIX}/usr/lib/libphononexperimental.${MY_PV::1}.dylib" \
+                       -change "libphonon.${MY_PV::1}.dylib" \
+                               "${EPREFIX}/usr/lib/libphononexperimental.${MY_PV::1}.dylib" \
+                       "${ED}/usr/lib/libphononexperimental.${MY_PV}.dylib" \
+                       || die "failed to fix libphononexperimental.${MY_PV}.dylib"
+
+               # fake the framework for the qt-apps depending on qt-frameworks (qt-webkit)
+               dodir /usr/lib/qt4/phonon.framework/Versions/${MY_PV::1}
+               dosym ${MY_PV::1} /usr/lib/qt4/phonon.framework/Versions/Current \
+                       || die "failed to create symlink"
+               dosym ../../../../libphonon.${MY_PV::1}.dylib /usr/lib/qt4/phonon.framework/Versions/${MY_PV::1}/phonon \
+                       || die "failed to create symlink"
+               dosym Versions/${MY_PV::1}/phonon /usr/lib/qt4/phonon.framework/phonon \
+                       || die "failed to create symlink"
+       fi
+}