diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-11-04 14:59:43 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-11-04 14:59:43 +0000 |
| commit | df63cbaaeba49cbd0114e5d1220cf4dd17de173e (patch) | |
| tree | b2ee9aa3305553dcc313e69ac639f59c634761ac /xfce-base/xfwm4 | |
| parent | Drop also local use desc. (diff) | |
| download | gentoo-2-df63cbaaeba49cbd0114e5d1220cf4dd17de173e.tar.gz gentoo-2-df63cbaaeba49cbd0114e5d1220cf4dd17de173e.tar.bz2 gentoo-2-df63cbaaeba49cbd0114e5d1220cf4dd17de173e.zip | |
Block <libxfcegui4-4.7.0 to avoid conflict with function xfce_shortcuts_provider_set_shortcut.
(Portage version: 2.2.0_alpha3/cvs/Linux x86_64)
Diffstat (limited to 'xfce-base/xfwm4')
| -rw-r--r-- | xfce-base/xfwm4/ChangeLog | 6 | ||||
| -rw-r--r-- | xfce-base/xfwm4/xfwm4-4.7.1.ebuild | 5 |
2 files changed, 8 insertions, 3 deletions
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/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 |