summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2005-10-17 17:47:25 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2005-10-17 17:47:25 +0000
commit5885a03cccd52abc25afa006da445499b224933a (patch)
tree1a29863709268e1cb5ebec1c89abf2c4817eea26 /x11-base
parentPruning old version (diff)
downloadgentoo-2-5885a03cccd52abc25afa006da445499b224933a.tar.gz
gentoo-2-5885a03cccd52abc25afa006da445499b224933a.tar.bz2
gentoo-2-5885a03cccd52abc25afa006da445499b224933a.zip
(#109354) In some mystical way all the dependency changes got reverted in the new revision.
(Portage version: 2.0.53_rc5)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog7
-rw-r--r--x11-base/xorg-server/xorg-server-0.99.1_p20051013-r1.ebuild20
2 files changed, 22 insertions, 5 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 140298ad6b15..b9ea0cdc8656 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.58 2005/10/16 20:04:43 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.59 2005/10/17 17:47:25 spyderous Exp $
+
+ 17 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-server-0.99.1_p20051013-r1.ebuild:
+ (#109354) In some mystical way all the dependency changes got reverted in
+ the new revision.
16 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
-files/0.99.1-r10-check-for-glproto.patch,
diff --git a/x11-base/xorg-server/xorg-server-0.99.1_p20051013-r1.ebuild b/x11-base/xorg-server/xorg-server-0.99.1_p20051013-r1.ebuild
index f247a0d6bc31..f601940610b7 100644
--- a/x11-base/xorg-server/xorg-server-0.99.1_p20051013-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-0.99.1_p20051013-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.1_p20051013-r1.ebuild,v 1.1 2005/10/16 20:03:49 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.1_p20051013-r1.ebuild,v 1.2 2005/10/17 17:47:25 spyderous Exp $
# Must be before x-modular eclass is inherited
# Hack to make sure autoreconf gets run
@@ -42,7 +42,19 @@ RDEPEND="x11-libs/libXfont
x11-apps/rgb
x11-apps/xauth
x11-apps/xinit
- app-admin/eselect-opengl"
+ app-admin/eselect-opengl
+ x11-libs/libXaw
+ x11-libs/libXpm
+ x11-libs/libXxf86misc
+ x11-libs/libXxf86vm
+ !minimal? ( x11-libs/libdmx
+ x11-libs/libXtst
+ x11-libs/libXres )
+ x11-libs/libxkbui"
+ # Xres is dmx-dependent, xkbui is xorgcfg-dependent
+ # Xaw is dmx- and xorgcfg-dependent
+ # Xpm is dmx- and xorgcfg-dependent, pulls in Xt
+ # Xxf86misc and Xxf86vm are xorgcfg-dependent
DEPEND="${RDEPEND}
x11-proto/randrproto
x11-proto/renderproto
@@ -58,7 +70,6 @@ DEPEND="${RDEPEND}
x11-proto/compositeproto
x11-proto/recordproto
x11-proto/resourceproto
- x11-proto/dmxproto
x11-proto/videoproto
x11-proto/scrnsaverproto
x11-proto/evieext
@@ -69,7 +80,8 @@ DEPEND="${RDEPEND}
x11-proto/inputproto
x11-proto/bigreqsproto
x11-proto/xcmiscproto
- x11-proto/glproto
+ >=x11-proto/glproto-1.4.1_pre20051013
+ !minimal? ( x11-proto/dmxproto )
dri? ( x11-proto/xf86driproto
x11-libs/libdrm )
xprint? ( x11-proto/printproto