Version bump to new snapshot. Drop old.

(Portage version: 2.2_rc55/cvs/Linux x86_64)

3 files changed, 25 insertions, 64 deletions

diff --git a/media-sound/phonon/ChangeLog b/media-sound/phonon/ChangeLog
index b4700b41406a..54e9fdea3ce5 100644
--- a/media-sound/phonon/ChangeLog
+++ b/media-sound/phonon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/phonon
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/phonon/ChangeLog,v 1.29 2009/11/30 04:43:14 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/phonon/ChangeLog,v 1.30 2009/12/04 15:58:38 scarabeus Exp $
+
+*phonon-4.3.80 (04 Dec 2009)
+
+  04 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +phonon-4.3.80.ebuild, -phonon-4.4_pre20090520.ebuild,
+  -phonon-4.4_pre20091119.ebuild:
+  Version bump to new snapshot. Drop old.
 
   30 Nov 2009; Joseph Jezak <josejx@gentoo.org>
   phonon-4.4_pre20090520.ebuild:
diff --git a/media-sound/phonon/phonon-4.4_pre20091119.ebuild b/media-sound/phonon/phonon-4.3.80.ebuild
index 6f79329516f9..d21484a16804 100644
--- a/media-sound/phonon/phonon-4.4_pre20091119.ebuild
+++ b/media-sound/phonon/phonon-4.3.80.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/phonon/phonon-4.4_pre20091119.ebuild,v 1.2 2009/11/18 21:49:26 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/phonon/phonon-4.3.80.ebuild,v 1.1 2009/12/04 15:58:38 scarabeus Exp $
 
 EAPI="2"
-
 inherit cmake-utils
 
 DESCRIPTION="KDE multimedia API"
 HOMEPAGE="http://phonon.kde.org"
-SRC_URI="mirror://gentoo/${P}.tar.lzma"
+SRC_URI="mirror://kde/unstable/phonon/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa debug gstreamer +xcb +xine"
+IUSE="alsa debug gstreamer pulseaudio +xcb +xine"
 
 RDEPEND="
 	!kde-base/phonon-xine
@@ -27,6 +26,10 @@ RDEPEND="
 		media-libs/gst-plugins-base
 		alsa? ( media-libs/alsa-lib )
 	)
+	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 )
@@ -42,13 +45,22 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	echo ">>> Unpacking ${P}.tar.xz to ${PWD}"
+	xz -dc "${DISTDIR}"/${P}.tar.xz | tar xof -
+	assert "failed unpacking ${P}.tar.xz"
+}
+
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with alsa)
 		$(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_use_with xcb)
+	"
 
 	cmake-utils_src_configure
 }
diff --git a/media-sound/phonon/phonon-4.4_pre20090520.ebuild b/media-sound/phonon/phonon-4.4_pre20090520.ebuild
deleted file mode 100644
index 01bb3fcb7409..000000000000
--- a/media-sound/phonon/phonon-4.4_pre20090520.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/phonon/phonon-4.4_pre20090520.ebuild,v 1.7 2009/11/30 04:44:07 josejx Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="KDE multimedia API"
-HOMEPAGE="http://phonon.kde.org"
-SRC_URI="http://dev.gentooexperimental.org/~alexxy/kde/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="debug gstreamer +xcb +xine"
-
-RDEPEND="
-	!kde-base/phonon-xine
-	!x11-libs/qt-phonon:4
-	>=x11-libs/qt-test-4.4.0:4
-	>=x11-libs/qt-dbus-4.4.0:4
-	>=x11-libs/qt-gui-4.4.0:4
-	>=x11-libs/qt-opengl-4.4.0:4
-	gstreamer? (
-		media-libs/gstreamer
-		media-libs/gst-plugins-base
-	)
-	xine? (
-		>=media-libs/xine-lib-1.1.15-r1[xcb?]
-		xcb? ( x11-libs/libxcb )
-	)
-"
-DEPEND="${RDEPEND}
-	>=kde-base/automoc-0.9.87
-"
-
-pkg_setup() {
-	if use !xine && use !gstreamer; then
-		die "you must at least select one backend for phonon"
-	fi
-}
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with gstreamer GStreamer)
-		$(cmake-utils_use_with gstreamer GStreamerPlugins)
-		$(cmake-utils_use_with xine)"
-
-	if use xine; then
-		mycmakeargs="${mycmakeargs}
-			$(cmake-utils_use_with xcb)"
-	else
-		sed -i -e '/xine/d' CMakeLists.txt || die "sed failed"
-	fi
-
-	cmake-utils_src_configure
-}