diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-11-06 12:56:38 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-11-06 12:56:38 +0000 |
| commit | fc4bfe4bdb02f7c4dd40204f4acf9edff3fafe90 (patch) | |
| tree | 2fda208a2114c026b9a0cbaea2f6ad50d242266c /xfce-base/libxfce4ui | |
| parent | Unmask AqBanking 5.x. (diff) | |
| download | gentoo-2-fc4bfe4bdb02f7c4dd40204f4acf9edff3fafe90.tar.gz gentoo-2-fc4bfe4bdb02f7c4dd40204f4acf9edff3fafe90.tar.bz2 gentoo-2-fc4bfe4bdb02f7c4dd40204f4acf9edff3fafe90.zip | |
Block <libxfcegui4-4.7.0 to avoid conflict with function xfce_shortcuts_provider_set_shortcut in xfce4-settings and xfwm4.
(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)
Diffstat (limited to 'xfce-base/libxfce4ui')
| -rw-r--r-- | xfce-base/libxfce4ui/ChangeLog | 7 | ||||
| -rw-r--r-- | xfce-base/libxfce4ui/libxfce4ui-4.7.4.ebuild | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/xfce-base/libxfce4ui/ChangeLog b/xfce-base/libxfce4ui/ChangeLog index c657f4bb6246..2ed32f003671 100644 --- a/xfce-base/libxfce4ui/ChangeLog +++ b/xfce-base/libxfce4ui/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for xfce-base/libxfce4ui # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4ui/ChangeLog,v 1.12 2010/11/03 20:50:01 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4ui/ChangeLog,v 1.13 2010/11/06 12:56:38 ssuominen Exp $ + + 06 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> + libxfce4ui-4.7.4.ebuild: + Block <libxfcegui4-4.7.0 to avoid conflict with function + xfce_shortcuts_provider_set_shortcut in xfce4-settings and xfwm4. *libxfce4ui-4.7.4 (03 Nov 2010) diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.7.4.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.7.4.ebuild index aea7f74b4e5b..bba5b11166db 100644 --- a/xfce-base/libxfce4ui/libxfce4ui-4.7.4.ebuild +++ b/xfce-base/libxfce4ui/libxfce4ui-4.7.4.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/libxfce4ui/libxfce4ui-4.7.4.ebuild,v 1.1 2010/11/03 20:50:01 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4ui/libxfce4ui-4.7.4.ebuild,v 1.2 2010/11/06 12:56:38 ssuominen Exp $ EAPI=3 inherit xfconf @@ -22,7 +22,8 @@ RDEPEND="x11-libs/libX11 >=xfce-base/libxfce4util-4.7.3 >=xfce-base/xfconf-4.6 glade? ( dev-util/glade:3 ) - startup-notification? ( x11-libs/startup-notification )" + startup-notification? ( x11-libs/startup-notification ) + !<xfce-base/libxfcegui4-4.7.0" DEPEND="${RDEPEND} dev-util/pkgconfig dev-util/intltool |