Make sure index.theme from sound-theme-freedesktop is available by depending on USE="sound" of media-libs/libcanberra wrt #323379.

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

4 files changed, 8 insertions, 81 deletions

diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog
index 3d6fa0650404..f4aa27c4b5d8 100644
--- a/xfce-base/xfce4-settings/ChangeLog
+++ b/xfce-base/xfce4-settings/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/xfce4-settings
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.53 2010/09/05 20:54:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.54 2010/09/23 09:20:42 ssuominen Exp $
+
+  23 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-settings-4.7.2.ebuild:
+  Make sure index.theme from sound-theme-freedesktop is available by
+  depending on USE="sound" of media-libs/libcanberra wrt #323379.
 
 *xfce4-settings-4.7.2 (05 Sep 2010)
 
diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.7.1-libxklavier.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.7.1-libxklavier.patch
deleted file mode 100644
index 142932c8940a..000000000000
--- a/xfce-base/xfce4-settings/files/xfce4-settings-4.7.1-libxklavier.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur xfce4-settings-4.7.1.orig/configure.ac xfce4-settings-4.7.1/configure.ac
---- xfce4-settings-4.7.1.orig/configure.ac	2010-01-23 13:48:05.000000000 +0200
-+++ xfce4-settings-4.7.1/configure.ac	2010-02-15 14:20:55.000000000 +0200
-@@ -142,6 +142,8 @@
-                            [libxklavier], [Keyboard layout selection])
- XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER4], [libxklavier], [4.0],
-                            [libxklavier], [Keyboard layout selection])
-+XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER5], [libxklavier], [5.0],
-+                           [libxklavier], [Keyboard layout selection])
- 
- dnl ************************************
- dnl *** Xsettings daemon is optional ***
-diff -ur xfce4-settings-4.7.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c xfce4-settings-4.7.1/dialogs/keyboard-settings/xfce-keyboard-settings.c
---- xfce4-settings-4.7.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c	2010-01-23 13:48:05.000000000 +0200
-+++ xfce4-settings-4.7.1/dialogs/keyboard-settings/xfce-keyboard-settings.c	2010-02-15 14:23:24.000000000 +0200
-@@ -395,7 +395,11 @@
- 
- #ifdef HAVE_LIBXKLAVIER
-   /* Stop xklavier engine */
-+#ifdef HAVE_LIBXKLAVIER5
-+  xkl_engine_stop_listen (settings->priv->xkl_engine, XKLL_TRACK_KEYBOARD_STATE);
-+#else
-   xkl_engine_stop_listen (settings->priv->xkl_engine);
-+#endif /* HAVE_LIBXKLAVIER5 */
- #endif /* HAVE_LIBXKLAVIER */
- 
-   g_object_unref (G_OBJECT (settings->priv->provider));
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.7.1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.7.1.ebuild
deleted file mode 100644
index 46d89ffc27b1..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.7.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.7.1.ebuild,v 1.3 2010/09/06 17:53:09 ssuominen Exp $
-
-EAPI=3
-EAUTORECONF=yes
-inherit xfconf
-
-DESCRIPTION="Settings daemon for Xfce4"
-HOMEPAGE="http://www.xfce.org"
-SRC_URI="mirror://xfce/src/xfce/${PN}/4.7/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug +keyboard libnotify sound"
-
-RDEPEND=">=dev-libs/glib-2.16:2
-	>=dev-libs/dbus-glib-0.34
-	>=gnome-base/libglade-2
-	>=x11-libs/gtk+-2.14:2
-	>=x11-libs/libX11-1
-	>=x11-libs/libXcursor-1.1
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXrandr-1.1
-	>=x11-libs/libwnck-2.12
-	>=xfce-base/libxfce4util-4.6
-	>=xfce-base/libxfce4ui-4.7
-	>=xfce-base/xfconf-4.6
-	>=xfce-base/exo-0.5
-	libnotify? ( >=x11-libs/libnotify-0.1.3 )
-	keyboard? ( >=x11-libs/libxklavier-0.3 )
-	sound? ( media-libs/libcanberra )
-	!<x11-base/xorg-server-1.5.3"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	dev-util/pkgconfig
-	x11-proto/inputproto
-	x11-proto/xf86vidmodeproto"
-
-pkg_setup() {
-	XFCONF="--disable-dependency-tracking
-		--disable-static
-		$(use_enable libnotify)
-		$(use_enable keyboard libxklavier)
-		$(use_enable sound sound-settings)
-		$(use_enable debug)"
-	DOCS="AUTHORS ChangeLog NEWS TODO"
-	PATCHES=( "${FILESDIR}/${P}-libxklavier.patch" )
-}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.7.2.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.7.2.ebuild
index 7b79ca5b8476..1b09d32a12fb 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.7.2.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.7.2.ebuild,v 1.2 2010/09/06 17:53:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.7.2.ebuild,v 1.3 2010/09/23 09:20:42 ssuominen Exp $
 
 EAPI=3
 inherit xfconf
@@ -28,7 +28,7 @@ RDEPEND=">=dev-libs/glib-2.16:2
 	>=xfce-base/exo-0.5
 	libnotify? ( >=x11-libs/libnotify-0.1.3 )
 	keyboard? ( >=x11-libs/libxklavier-0.3 )
-	sound? ( media-libs/libcanberra )
+	sound? ( >=media-libs/libcanberra-0.25[sound] )
 	!<x11-base/xorg-server-1.5.3"
 DEPEND="${RDEPEND}
 	dev-util/intltool