diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-11-04 15:54:21 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-11-04 15:54:21 +0000 |
| commit | 44e890963b3d13f33d2123a05481f491809f896d (patch) | |
| tree | 878775bdb248e88b235b7a8a2adc50c61ba6c0e8 /xfce-base | |
| parent | add version supporting minor version slotting (diff) | |
| download | gentoo-2-44e890963b3d13f33d2123a05481f491809f896d.tar.gz gentoo-2-44e890963b3d13f33d2123a05481f491809f896d.tar.bz2 gentoo-2-44e890963b3d13f33d2123a05481f491809f896d.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')
| -rw-r--r-- | xfce-base/xfce4-settings/ChangeLog | 7 | ||||
| -rw-r--r-- | xfce-base/xfce4-settings/xfce4-settings-4.7.3.ebuild | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog index 863f782e29be..a72ffe97477a 100644 --- a/xfce-base/xfce4-settings/ChangeLog +++ b/xfce-base/xfce4-settings/ChangeLog @@ -1,6 +1,11 @@ # 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.55 2010/11/03 21:09:08 ssuominen Exp $ +# $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. *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 5f08b759fc32..7d0510ba5df9 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.1 2010/11/03 21:09:08 ssuominen Exp $ +# $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 $ EAPI=3 inherit xfconf @@ -29,7 +29,8 @@ 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" + !<x11-base/xorg-server-1.5.3 + !<xfce-base/libxfcegui4-4.7.0" DEPEND="${RDEPEND} dev-util/intltool sys-devel/gettext |