From 8a1e99e44adcd02c81b54fed0b35c53365427dca Mon Sep 17 00:00:00 2001
From: Samuli Suominen <ssuominen@gentoo.org>
Date: Sat, 6 Nov 2010 12:57:37 +0000
Subject: revert

(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)
---
 xfce-base/xfce4-settings/ChangeLog                   | 7 +------
 xfce-base/xfce4-settings/xfce4-settings-4.7.3.ebuild | 5 ++---
 2 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'xfce-base/xfce4-settings')

diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog
index a72ffe97477a..da3c9b6eb02a 100644
--- a/xfce-base/xfce4-settings/ChangeLog
+++ b/xfce-base/xfce4-settings/ChangeLog
@@ -1,11 +1,6 @@
 # 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.56 2010/11/04 15:54:21 ssuominen Exp $
-
-  04 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
-  xfce4-settings-4.7.3.ebuild:
-  Block <libxfcegui4-4.7.0 to avoid conflict with function
-  xfce_shortcuts_provider_set_shortcut.
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.57 2010/11/06 12:57:37 ssuominen Exp $
 
 *xfce4-settings-4.7.3 (03 Nov 2010)
 
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.7.3.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.7.3.ebuild
index 7d0510ba5df9..1401849f0af6 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.7.3.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.7.3.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.3.ebuild,v 1.2 2010/11/04 15:54:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.7.3.ebuild,v 1.3 2010/11/06 12:57:37 ssuominen Exp $
 
 EAPI=3
 inherit xfconf
@@ -29,8 +29,7 @@ RDEPEND=">=dev-libs/glib-2.16:2
 	libnotify? ( >=x11-libs/libnotify-0.1.3 )
 	keyboard? ( >=x11-libs/libxklavier-0.3 )
 	sound? ( >=media-libs/libcanberra-0.25[sound] )
-	!<x11-base/xorg-server-1.5.3
-	!<xfce-base/libxfcegui4-4.7.0"
+	!<x11-base/xorg-server-1.5.3"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
-- 
cgit v1.2.3-65-gdbad