New version for GNOME 2.26. Pulseaudion support and lots of fixes. Clean up old revisions.

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

3 files changed, 85 insertions, 51 deletions

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index 2e70a4ce988a..b435b74a12fd 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.29 2009/04/28 11:48:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.30 2009/05/10 23:01:36 eva Exp $
+
+*gnome-settings-daemon-2.26.1-r1 (10 May 2009)
+
+  10 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-settings-daemon-2.22.2.1.ebuild,
+  +gnome-settings-daemon-2.26.1-r1.ebuild:
+  New version for GNOME 2.26. Pulseaudion support and lots of fixes. Clean
+  up old revisions.
 
   28 Apr 2009; Raúl Porcel <armin76@gentoo.org>
   gnome-settings-daemon-2.24.1-r1.ebuild:
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild
deleted file mode 100644
index 6ea08e086db6..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2008-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild,v 1.12 2008/11/13 19:26:45 ranger Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="alsa debug esd gstreamer"
-
-RDEPEND=">=dev-libs/dbus-glib-0.74
-		 >=dev-libs/glib-2.15
-		 >=x11-libs/gtk+-2.10
-		 >=gnome-base/gconf-2.6.1
-		 >=gnome-base/gnome-vfs-2.18
-		 >=gnome-base/libgnomekbd-2.21.4
-
-		 >=gnome-base/libglade-2
-		 >=gnome-base/libgnome-2.0
-		 >=gnome-base/libgnomeui-2.0
-		 >=gnome-base/gnome-desktop-2.21.4
-
-		 x11-libs/libX11
-		 x11-libs/libXi
-		 x11-libs/libXrandr
-		 x11-libs/libXext
-		 x11-libs/libXxf86misc
-		 >=x11-libs/libxklavier-3.3
-
-		 alsa? ( >=media-libs/alsa-lib-0.99 )
-		 esd? ( >=media-sound/esound-0.2.28 )
-		 gstreamer? (
-						>=media-libs/gstreamer-0.10.1.2
-						>=media-libs/gst-plugins-base-0.10.1.2
-					)
-		 !<gnome-base/gnome-control-center-2.22"
-DEPEND="${RDEPEND}
-		  sys-devel/gettext
-		>=dev-util/intltool-0.35.0
-		>=dev-util/pkgconfig-0.19
-		x11-proto/inputproto
-		x11-proto/xproto"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable alsa) $(use_enable debug) $(use_enable esd) $(use_enable gstreamer)"
-}
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.26.1-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.26.1-r1.ebuild
new file mode 100644
index 000000000000..bb12dbbea212
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.26.1-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.26.1-r1.ebuild,v 1.1 2009/05/10 23:01:36 eva Exp $
+
+EAPI="2"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Gnome Settings Daemon"
+HOMEPAGE="http://www.gnome.org"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${P}-readd-gst-vol-control-support.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug libnotify pulseaudio"
+
+RDEPEND=">=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.18.0
+	>=x11-libs/gtk+-2.13
+	>=gnome-base/gconf-2.6.1
+	>=gnome-base/libgnomekbd-2.21.4
+
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/gnome-desktop-2.25.6
+
+	libnotify? ( >=x11-libs/libnotify-0.4.3 )
+
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXext
+	x11-libs/libXxf86misc
+	>=x11-libs/libxklavier-3.8
+	media-libs/fontconfig
+
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.12 )
+	!pulseaudio? (
+		>=media-libs/gstreamer-0.10.1.2
+		>=media-libs/gst-plugins-base-0.10.1.2 )"
+DEPEND="${RDEPEND}
+	!<gnome-base/gnome-control-center-2.22
+	sys-devel/gettext
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.19
+	x11-proto/inputproto
+	x11-proto/xproto"
+
+# README is empty
+DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable debug)
+		$(use_with libnotify)
+		$(use_enable pulseaudio pulse)
+		$(use_enable !pulseaudio gstreamer)"
+
+	if use pulseaudio; then
+		elog "Building volume media keys using Pulseaudio"
+	else
+		elog "Building volume media keys using GStreamer"
+	fi
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Restore gstreamer volume control support, upstream bug #571145
+	epatch "${WORKDIR}/${P}-readd-gst-vol-control-support.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}