Raise pulseaudio dep (#464936 by Roland)

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 16 insertions, 48 deletions

diff --git a/media-sound/pavucontrol/ChangeLog b/media-sound/pavucontrol/ChangeLog
index f845e1f76ab4..3379a9ca6fb0 100644
--- a/media-sound/pavucontrol/ChangeLog
+++ b/media-sound/pavucontrol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/pavucontrol
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pavucontrol/ChangeLog,v 1.41 2013/12/23 16:11:50 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pavucontrol/ChangeLog,v 1.42 2014/07/15 15:14:17 pacho Exp $
+
+  15 Jul 2014; Pacho Ramos <pacho@gentoo.org> -pavucontrol-0.9.10.ebuild,
+  pavucontrol-2.0.ebuild:
+  Raise pulseaudio dep (#464936 by Roland)
 
   23 Dec 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due bug #221237
diff --git a/media-sound/pavucontrol/pavucontrol-0.9.10.ebuild b/media-sound/pavucontrol/pavucontrol-0.9.10.ebuild
deleted file mode 100644
index 8ecd28f382d7..000000000000
--- a/media-sound/pavucontrol/pavucontrol-0.9.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pavucontrol/pavucontrol-0.9.10.ebuild,v 1.5 2012/05/05 08:46:01 mgorny Exp $
-
-EAPI=2
-
-DESCRIPTION="Pulseaudio Volume Control, GTK based mixer for Pulseaudio"
-HOMEPAGE="http://0pointer.de/lennart/projects/pavucontrol/"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
-IUSE="nls"
-
-RDEPEND=">=dev-cpp/gtkmm-2.16:2.4
-	dev-cpp/libglademm:2.4
-	>=dev-libs/libsigc++-2.2:2
-	>=x11-libs/gtk+-2.16:2
-	>=media-sound/pulseaudio-0.9.16[glib]
-	>=media-libs/libcanberra-0.16[gtk]
-	|| ( x11-themes/tango-icon-theme x11-themes/gnome-icon-theme )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext
-		dev-util/intltool )
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--disable-dependency-tracking \
-		--disable-lynx \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/media-sound/pavucontrol/pavucontrol-2.0.ebuild b/media-sound/pavucontrol/pavucontrol-2.0.ebuild
index 3ca50d674604..f71a8b2da115 100644
--- a/media-sound/pavucontrol/pavucontrol-2.0.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pavucontrol/pavucontrol-2.0.ebuild,v 1.1 2013/04/05 08:37:06 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pavucontrol/pavucontrol-2.0.ebuild,v 1.2 2014/07/15 15:14:17 pacho Exp $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Pulseaudio Volume Control, GTK based mixer for Pulseaudio"
 HOMEPAGE="http://freedesktop.org/software/pulseaudio/pavucontrol/"
@@ -13,17 +13,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="nls"
 
-RDEPEND=">=dev-cpp/gtkmm-3.0:3.0
+RDEPEND="
+	>=dev-cpp/gtkmm-3.0:3.0
 	>=dev-libs/libsigc++-2.2:2
 	>=media-libs/libcanberra-0.16[gtk3]
-	>=media-sound/pulseaudio-0.9.16[glib]
-	virtual/freedesktop-icon-theme"
+	>=media-sound/pulseaudio-3[glib]
+	virtual/freedesktop-icon-theme
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? (
 		dev-util/intltool
 		sys-devel/gettext
-		)"
+		)
+"
 
 src_configure() {
 	econf \