summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-base/xorg-server/ChangeLog6
-rw-r--r--x11-base/xorg-server/xorg-server-1.3.0.0-r6.ebuild6
2 files changed, 8 insertions, 4 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 1e0585d7bfed..5d13f6bbb963 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.396 2009/05/05 15:05:50 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.397 2009/05/05 16:17:13 remi Exp $
+
+ 05 May 2009; Rémi Cardona <remi@gentoo.org>
+ xorg-server-1.3.0.0-r6.ebuild:
+ drop x11-misc/xkbdata support (see bug #196650)
05 May 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.4.2.ebuild,
xorg-server-1.5.3-r4.ebuild, xorg-server-1.5.3-r5.ebuild:
diff --git a/x11-base/xorg-server/xorg-server-1.3.0.0-r6.ebuild b/x11-base/xorg-server/xorg-server-1.3.0.0-r6.ebuild
index fd9f04245b1b..8b9f64dda6dc 100644
--- a/x11-base/xorg-server/xorg-server-1.3.0.0-r6.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.3.0.0-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.3.0.0-r6.ebuild,v 1.8 2008/10/22 15:42:26 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0-r6.ebuild,v 1.9 2009/05/05 16:17:13 remi Exp $
# Must be before x-modular eclass is inherited
SNAPSHOT="yes"
@@ -121,7 +121,7 @@ RDEPEND=">=x11-libs/libXfont-1.2.5
media-fonts/font-misc-misc
media-fonts/font-cursor-misc
x11-misc/xbitmaps
- || ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+ x11-misc/xkeyboard-config
x11-apps/iceauth
x11-apps/rgb
x11-apps/xauth