From b6f32a3cb9199dbb625b94e3a5aba3e87ae071f5 Mon Sep 17 00:00:00 2001
From: Samuli Suominen <ssuominen@gentoo.org>
Date: Thu, 4 Nov 2010 14:59:43 +0000
Subject: Block <libxfcegui4-4.7.0 to avoid conflict with function
 xfce_shortcuts_provider_set_shortcut.

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64
---
 xfce-base/xfwm4/ChangeLog          | 6 +++++-
 xfce-base/xfwm4/Manifest           | 4 ++--
 xfce-base/xfwm4/xfwm4-4.7.1.ebuild | 5 +++--
 3 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'xfce-base')

diff --git a/xfce-base/xfwm4/ChangeLog b/xfce-base/xfwm4/ChangeLog
index 0781139222df..e32253010535 100644
--- a/xfce-base/xfwm4/ChangeLog
+++ b/xfce-base/xfwm4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfwm4
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.152 2010/11/03 21:32:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.153 2010/11/04 14:59:43 ssuominen Exp $
+
+  04 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> xfwm4-4.7.1.ebuild:
+  Block <libxfcegui4-4.7.0 to avoid conflict with function
+  xfce_shortcuts_provider_set_shortcut.
 
 *xfwm4-4.7.1 (03 Nov 2010)
 
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 286d956a2981..53ed77ef570a 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,6 +1,6 @@
 DIST xfwm4-4.6.2.tar.bz2 1849923 RMD160 445e499ca84846222120d607b80b5eac79b422d7 SHA1 34514db4531e95a7dbcd7d73c8d97e5cb9d1bf89 SHA256 212819ee03c24635f79d50930284c422469e22489952d0b286e6fe5af2155828
 DIST xfwm4-4.7.1.tar.bz2 1889457 RMD160 b1288f72fc3f767de7d69a61c2588db79481b30f SHA1 5672762b638df6f6849a392056031fb408253d7d SHA256 d7fc7e026a7d15624541936c10ec27db5b5659d7f5659b9f384cce8ec37b9760
 EBUILD xfwm4-4.6.2.ebuild 1374 RMD160 6a4b645c7952e7ec78609a2672b710b14d41135f SHA1 dbf9b5c73146ce10d1559ca83761f7b9d0a809f4 SHA256 3c77733f14e79d01a028d973ab9edeac1be1968aaf0df8d65975ff9d1d0c9c84
-EBUILD xfwm4-4.7.1.ebuild 1432 RMD160 1232dc6dfae14762a9baaf40d9c393351f305fed SHA1 f438db2e7acbed6c4d68826a2cc6c025b0eda974 SHA256 ef563920a3134f7ac4b94ebe174f276e2d4255f999753a723ff874e1186e80f1
-MISC ChangeLog 17017 RMD160 0b7f67d3e0fe44ee39bb9880d4558f4bfa4e2b0a SHA1 1fdaddda50d50844bcf8b0ff7dc6de58d2d28885 SHA256 51192c59405e7ec1ac158de1ac97aa8d30711e52f06516ee7923c301e5494387
+EBUILD xfwm4-4.7.1.ebuild 1463 RMD160 3f64ba9179df52f8fa41cf465cd29ae3f09f231d SHA1 b61ba6321abc90da4fdb4a6d3604dc70bab3019d SHA256 b5f627762a31773ec7deb53e1d879948808b0533c61461855b0fce25254221b3
+MISC ChangeLog 17191 RMD160 c0666a8c681442417dd46121bc4da7b2523fc52f SHA1 978cd11f47d4a54c4feeb12c95eb4aefcac0359f SHA256 ffdd42f9d81bd514396e8e788d7ce590d3e91bc9b976d2a92aeffcdc2533fc00
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-base/xfwm4/xfwm4-4.7.1.ebuild b/xfce-base/xfwm4/xfwm4-4.7.1.ebuild
index 189ccd1150dc..7d4adcd12935 100644
--- a/xfce-base/xfwm4/xfwm4-4.7.1.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.7.1.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/xfwm4/xfwm4-4.7.1.ebuild,v 1.1 2010/11/03 21:32:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.7.1.ebuild,v 1.2 2010/11/04 14:59:43 ssuominen Exp $
 
 EAPI=3
 inherit xfconf
@@ -31,7 +31,8 @@ RDEPEND=">=dev-libs/glib-2.10:2
 	startup-notification? ( x11-libs/startup-notification )
 	xcomposite? ( x11-libs/libXcomposite
 		x11-libs/libXdamage
-		x11-libs/libXfixes )"
+		x11-libs/libXfixes )
+	!<xfce-base/libxfcegui4-4.7.0"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	dev-util/pkgconfig
-- 
cgit v1.2.3-65-gdbad