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

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

4 files changed, 99 insertions, 54 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/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 64bd70187b93..b245080195a4 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-settings-daemon-2.24.0-automagic.patch 1656 RMD160 895fe60a74854d14229fa81fb534dc2379b3de8c SHA1 dfbfdc227104cc4339e8ff4c5bc8d3208a18f09c SHA256 ebf248ccbe911200ff256df37345f07c2291caf165b16331e6916ccf24be003d
 AUX gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch 721 RMD160 0a852a0d0027d05b6086e69cc41468edf5d82192 SHA1 07f8e843740d145cc2fc0dd328435586567fbcb9 SHA256 03d5f3e46baff9f4472410e0d2a58477908af23de2148cb3cd9b202121b60663
-DIST gnome-settings-daemon-2.22.2.1.tar.bz2 1139262 RMD160 c79d531226f8e58e0acd8f23177a62c8818b70d7 SHA1 0424486b6e53ab0d2dd676c375d02e35341b3a20 SHA256 72cb9aee096019a2925fb5b99a5e880d01f7d529d4c9e75dfbbea1b1f654d7a9
 DIST gnome-settings-daemon-2.24.1.tar.bz2 1131518 RMD160 27d432cd217a836fcef0deac5f80f638a73cda7c SHA1 d0dbf6ba82cdc1e814d6c46bdc363e61ee9fd0f3 SHA256 a2a5132a5b9d0bef52010ea45b14560b6344f591ce3296ed555165332cce9a70
-EBUILD gnome-settings-daemon-2.22.2.1.ebuild 1402 RMD160 892cee9f8acfcef02afd0ac10fabad5b68c0466f SHA1 d880aec50d6621a48e77fedd41953458f83f0112 SHA256 8f5374607384da838219f0eec28ad6c9dca369b9c6dc848ecb1a3c0c760e0ae7
+DIST gnome-settings-daemon-2.26.1-readd-gst-vol-control-support.patch.bz2 7669 RMD160 dc616c73606981af7f47e01973d2f1881fceed04 SHA1 e0194dc45dbfd57da9eead92f4c9c0e586f8eb9f SHA256 4bb694a0ea484c6d74baf2e252c6e9ddb153a3467b480fe55ba18373312fda81
+DIST gnome-settings-daemon-2.26.1.tar.bz2 1084129 RMD160 5cca5fdcbf144d6fc950c5b5f7d5f1304168f4bd SHA1 0c2cef37a0a3333c314a8205cefea9edb8f0669a SHA256 4dff1daa84fe485e302f61286df1dd188292302ee792ddb4fb1c34e65aea0a80
 EBUILD gnome-settings-daemon-2.24.1-r1.ebuild 2366 RMD160 b4fd68bfbb5cc0a33e30f7fc0652820f3861cd43 SHA1 3b8c4c3e50cb63b3c598d65c44588ed67e395366 SHA256 48854416d3e9ad841d75e18980b14a2f06ecc296733b1b101a8fedc89aa8dd24
-MISC ChangeLog 5261 RMD160 4254264a997d6bf757e5bd4ff7ecedd562443dcc SHA1 41c89bec0df8ef240acf80498bf65b88825dade0 SHA256 6c8304c4d77c60cb773bbae4e38c00e189ae83873f898886cfac93f875e27f17
+EBUILD gnome-settings-daemon-2.26.1-r1.ebuild 1925 RMD160 f6f201130a8eeb65fa7100376c040660b329253b SHA1 5c32a8c9825f008efa61b537d2d4d9d6e858938c SHA256 2aa683669ffd4bdbea8f7be3f225d9994ceb45c9c6a6d7a7f82f44e0868480da
+MISC ChangeLog 5540 RMD160 52fb8a4518d481eb7ae523ebba7bc205f80b26f7 SHA1 0f8e80f5effe5d48a8eba942844dfd4be0844fdd SHA256 6471b13187d556c80a7789f833088f6a72f7fd75a01af3994845eb5ebc09deae
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoHXNUACgkQ1fmVwcYIWAZiBQCdFKREm/376cIOSJYqt/EaXzXo
+H8oAn2NbkDa/fVRmewoksR75sgvXTl/1
+=1FvC
+-----END PGP SIGNATURE-----
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
+}