amd64 stable wrt #305917

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

7 files changed, 10 insertions, 201 deletions

diff --git a/media-sound/pavucontrol/ChangeLog b/media-sound/pavucontrol/ChangeLog
index a8569adba724..a5e4c4afd76e 100644
--- a/media-sound/pavucontrol/ChangeLog
+++ b/media-sound/pavucontrol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/pavucontrol
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pavucontrol/ChangeLog,v 1.29 2009/12/10 18:02:32 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pavucontrol/ChangeLog,v 1.30 2010/02/20 14:02:49 ssuominen Exp $
+
+  20 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  pavucontrol-0.9.10.ebuild:
+  amd64 stable wrt #305917
 
   10 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
   pavucontrol-0.9.4.ebuild, pavucontrol-0.9.5.ebuild,
diff --git a/media-sound/pavucontrol/files/pavucontrol-0.9.8-icons.patch b/media-sound/pavucontrol/files/pavucontrol-0.9.8-icons.patch
deleted file mode 100644
index 7ec645848f69..000000000000
--- a/media-sound/pavucontrol/files/pavucontrol-0.9.8-icons.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 874ebedf163195c7d54d5f9da3ff1725c1e43aa2 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Sun, 14 Jun 2009 19:28:32 +0200
-Subject: [PATCH] don't abort when icon is missing from the theme
-
----
- src/mainwindow.cc |   13 +++++++++----
- 1 files changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/src/mainwindow.cc b/src/mainwindow.cc
-index 9d2a33d..61156c4 100644
---- a/src/mainwindow.cc
-+++ b/src/mainwindow.cc
-@@ -111,12 +111,17 @@ static void set_icon_name_fallback(Gtk::Image *i, const char *name, Gtk::IconSiz
- 
-     Gtk::IconSize::lookup(size, width, height);
-     theme = Gtk::IconTheme::get_default();
--    pixbuf = theme->load_icon(name, width, Gtk::ICON_LOOKUP_GENERIC_FALLBACK);
- 
--    if (pixbuf)
--        i->set(pixbuf);
--    else
-+    try {
-+        pixbuf = theme->load_icon(name, width, Gtk::ICON_LOOKUP_GENERIC_FALLBACK);
-+
-+        if (pixbuf)
-+            i->set(pixbuf);
-+        else
-+            i->set(name);
-+    } catch (Gtk::IconThemeError &e) {
-         i->set(name);
-+    }
- }
- 
- void MainWindow::updateCard(const pa_card_info &info) {
--- 
-1.6.2.4
-
diff --git a/media-sound/pavucontrol/files/pavucontrol-0.9.9-potfiles.patch b/media-sound/pavucontrol/files/pavucontrol-0.9.9-potfiles.patch
deleted file mode 100644
index ebf2ad6913a2..000000000000
--- a/media-sound/pavucontrol/files/pavucontrol-0.9.9-potfiles.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 556bdc76c0723a97b57966fbd193bd0c1841904f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Sun, 13 Sep 2009 20:25:35 +0200
-Subject: [PATCH] Add missing source file to POTFILES.in.
-
----
- po/POTFILES.in |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index 1fa8bc9..23b3af3 100644
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -10,3 +10,4 @@ src/sinkinputwidget.cc
- src/sinkwidget.cc
- src/sourceoutputwidget.cc
- src/sourcewidget.cc
-+src/streamwidget.cc
--- 
-1.6.4.2
-
diff --git a/media-sound/pavucontrol/pavucontrol-0.9.10.ebuild b/media-sound/pavucontrol/pavucontrol-0.9.10.ebuild
index 27ca8e12fea7..3696bd189558 100644
--- a/media-sound/pavucontrol/pavucontrol-0.9.10.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-0.9.10.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.2 2009/12/10 18:02:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pavucontrol/pavucontrol-0.9.10.ebuild,v 1.3 2010/02/20 14:02:49 ssuominen Exp $
 
 EAPI=2
-inherit eutils
 
 DESCRIPTION="Pulseaudio Volume Control, GTK based mixer for Pulseaudio"
 HOMEPAGE="http://0pointer.de/lennart/projects/pavucontrol/"
@@ -11,7 +10,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE="nls"
 
 RDEPEND=">=dev-cpp/gtkmm-2.16:2.4
@@ -36,5 +35,5 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 }
diff --git a/media-sound/pavucontrol/pavucontrol-0.9.5.ebuild b/media-sound/pavucontrol/pavucontrol-0.9.5.ebuild
deleted file mode 100644
index 12b4a05259c7..000000000000
--- a/media-sound/pavucontrol/pavucontrol-0.9.5.ebuild
+++ /dev/null
@@ -1,47 +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/pavucontrol/pavucontrol-0.9.5.ebuild,v 1.7 2009/12/10 18:02:32 ssuominen Exp $
-
-inherit eutils
-
-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=""
-
-DEPEND=">=dev-cpp/gtkmm-2.4
-	>=dev-cpp/libglademm-2.4
-	>=dev-libs/libsigc++-2.2
-	>=media-sound/pulseaudio-0.9.7"
-
-RDEPEND="${DEPEND}
-	x11-themes/gnome-icon-theme"
-
-DEPEND="${DEPEND}
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	if ! built_with_use --missing true media-sound/pulseaudio glib; then
-		eerror "You need to build media-sound/pulseaudio with 'glib' use flag enabled."
-		die "Missing glib use flag on media-sound/pulseaudio."
-	fi
-}
-
-src_compile() {
-	# Lynx is used during make dist basically
-	econf \
-		--disable-dependency-tracking \
-		--disable-lynx || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dohtml -r doc
-	dodoc README doc/todo
-}
diff --git a/media-sound/pavucontrol/pavucontrol-0.9.8-r1.ebuild b/media-sound/pavucontrol/pavucontrol-0.9.8-r1.ebuild
deleted file mode 100644
index 6335e365ab71..000000000000
--- a/media-sound/pavucontrol/pavucontrol-0.9.8-r1.ebuild
+++ /dev/null
@@ -1,44 +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/pavucontrol/pavucontrol-0.9.8-r1.ebuild,v 1.2 2009/12/10 18:02:32 ssuominen Exp $
-
-EAPI=2
-inherit eutils
-
-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.4
-	dev-cpp/libglademm:2.4
-	>=dev-libs/libsigc++-2.2:2
-	>=x11-libs/gtk+-2.16:2
-	>=media-sound/pulseaudio-0.9.15[glib]
-	>=media-libs/libcanberra-0.11[gtk]
-	|| ( x11-themes/tango-icon-theme x11-themes/gnome-icon-theme )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext
-		dev-util/intltool )
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-icons.patch
-}
-
-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 "emake install failed"
-}
diff --git a/media-sound/pavucontrol/pavucontrol-0.9.9.ebuild b/media-sound/pavucontrol/pavucontrol-0.9.9.ebuild
deleted file mode 100644
index 3d1162e34c0e..000000000000
--- a/media-sound/pavucontrol/pavucontrol-0.9.9.ebuild
+++ /dev/null
@@ -1,44 +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/pavucontrol/pavucontrol-0.9.9.ebuild,v 1.4 2009/12/10 18:02:32 ssuominen Exp $
-
-EAPI=2
-inherit eutils
-
-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 )
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-potfiles.patch
-}
-
-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 "emake install failed"
-}