diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2006-02-06 23:36:57 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2006-02-06 23:36:57 +0000 |
| commit | 07a97a97c5b756c967fc18e1377f7e57e2cbbf62 (patch) | |
| tree | 133ebc97d27156af8c29aba43b20487c54fde132 /x11-base | |
| parent | New, restructured, maintained package for XKB configuration data, expected to... (diff) | |
| download | gentoo-2-07a97a97c5b756c967fc18e1377f7e57e2cbbf62.tar.gz gentoo-2-07a97a97c5b756c967fc18e1377f7e57e2cbbf62.tar.bz2 gentoo-2-07a97a97c5b756c967fc18e1377f7e57e2cbbf62.zip | |
Add an OR dependency with xkbdata for new x11-misc/xkeyboard-config, and prefer it over xkbdata.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.0.1-r2.ebuild | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index c2fd7283bb9f..78c61e5a3d72 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.84 2006/02/03 07:32:49 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.85 2006/02/06 23:36:57 spyderous Exp $ + + 06 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-1.0.1-r2.ebuild: + Add an OR dependency with xkbdata for new x11-misc/xkeyboard-config, and + prefer it over xkbdata. 03 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; xorg-server-1.0.1-r2.ebuild: diff --git a/x11-base/xorg-server/xorg-server-1.0.1-r2.ebuild b/x11-base/xorg-server/xorg-server-1.0.1-r2.ebuild index 6c29b288d146..55f496dda7f1 100644 --- a/x11-base/xorg-server/xorg-server-1.0.1-r2.ebuild +++ b/x11-base/xorg-server/xorg-server-1.0.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.1-r2.ebuild,v 1.3 2006/02/03 07:32:49 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.1-r2.ebuild,v 1.4 2006/02/06 23:36:57 spyderous Exp $ # Must be before x-modular eclass is inherited # Hack to make sure autoreconf gets run @@ -38,7 +38,7 @@ RDEPEND="x11-libs/libXfont media-fonts/font-misc-misc media-fonts/font-cursor-misc x11-misc/xbitmaps - x11-misc/xkbdata + || ( x11-misc/xkeyboard-config x11-misc/xkbdata ) x11-apps/iceauth x11-apps/rgb x11-apps/xauth |