diff options
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, 3 insertions, 8 deletions
diff --git a/xfce-base/xfwm4/ChangeLog b/xfce-base/xfwm4/ChangeLog index e32253010535..2353cd63ce42 100644 --- a/xfce-base/xfwm4/ChangeLog +++ b/xfce-base/xfwm4/ChangeLog @@ -1,10 +1,6 @@ # 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.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. +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.154 2010/11/06 12:57:15 ssuominen Exp $ *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 7d4adcd12935..11dbfc989be8 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.2 2010/11/04 14:59:43 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.7.1.ebuild,v 1.3 2010/11/06 12:57:15 ssuominen Exp $ EAPI=3 inherit xfconf @@ -31,8 +31,7 @@ RDEPEND=">=dev-libs/glib-2.10:2 startup-notification? ( x11-libs/startup-notification ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage - x11-libs/libXfixes ) - !<xfce-base/libxfcegui4-4.7.0" + x11-libs/libXfixes )" DEPEND="${RDEPEND} dev-util/intltool dev-util/pkgconfig |