diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-10-13 15:49:43 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-10-13 15:49:43 +0000 |
| commit | 3b764d2a605b612372757b23cbe08a415ae96ae8 (patch) | |
| tree | bf4c4d0ae1e4a6b09c6ef994244682b4288b938d /xfce-base/xfce4-settings | |
| parent | Gentoo Prefix cannot build xorg-server, exclude it from the deps (diff) | |
| download | gentoo-2-3b764d2a605b612372757b23cbe08a415ae96ae8.tar.gz gentoo-2-3b764d2a605b612372757b23cbe08a415ae96ae8.tar.bz2 gentoo-2-3b764d2a605b612372757b23cbe08a415ae96ae8.zip | |
Fix previous commit (and bug 262333) in a different way to avoid xorg-server dep.
(Portage version: 2.2_rc46/cvs/Linux x86_64)
Diffstat (limited to 'xfce-base/xfce4-settings')
| -rw-r--r-- | xfce-base/xfce4-settings/ChangeLog | 7 | ||||
| -rw-r--r-- | xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog index b8acb61b5a33..e8f38fe53769 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-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.22 2009/10/13 15:28:43 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.23 2009/10/13 15:49:43 ssuominen Exp $ + + 13 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> + xfce4-settings-4.6.3.ebuild: + Fix previous commit (and bug 262333) in a different way to avoid + xorg-server dep. 13 Oct 2009; Jeremy Olexa <darkside@gentoo.org> xfce4-settings-4.6.3.ebuild: diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild index 21d139693ccf..1ea06922018d 100644 --- a/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild +++ b/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 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.6.3.ebuild,v 1.4 2009/10/13 15:28:43 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild,v 1.5 2009/10/13 15:49:43 ssuominen Exp $ EAPI=2 inherit xfconf @@ -23,14 +23,14 @@ RDEPEND=">=dev-libs/glib-2.12:2 >=x11-libs/libXi-1 >=x11-libs/libXrandr-1.1 >=x11-libs/libwnck-2.12 - !prefix? ( >=x11-base/xorg-server-1.5.3 ) >=xfce-base/libxfce4util-4.6 >=xfce-base/libxfcegui4-4.6 >=xfce-base/xfconf-4.6 >=xfce-base/exo-0.3.100 libnotify? ( >=x11-libs/libnotify-0.1.3 ) keyboard? ( >=x11-libs/libxklavier-0.3 ) - sound? ( media-libs/libcanberra )" + sound? ( media-libs/libcanberra ) + !<x11-base/xorg-server-1.5.3" DEPEND="${RDEPEND} dev-util/intltool sys-devel/gettext |