summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog7
-rw-r--r--x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild21
-rw-r--r--x11-base/xorg-server/xorg-server-1.5.3-r7.ebuild21
-rw-r--r--x11-base/xorg-server/xorg-server-1.6.2.901.ebuild3
-rw-r--r--x11-base/xorg-server/xorg-server-1.6.3.ebuild3
5 files changed, 38 insertions, 17 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 6598dba83a25..4b650b07fed7 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.435 2009/08/02 21:28:21 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.436 2009/08/08 19:46:09 gengor Exp $
+
+ 08 Aug 2009; Gordon Malm <gengor@gentoo.org> xorg-server-1.5.3-r6.ebuild,
+ xorg-server-1.5.3-r7.ebuild, xorg-server-1.6.2.901.ebuild,
+ xorg-server-1.6.3.ebuild:
+ Xvfb requires font-cursor-misc runtime, bug #278487.
02 Aug 2009; Rémi Cardona <remi@gentoo.org> -xorg-server-1.6.2.ebuild,
-xorg-server-1.6.2-r1.ebuild:
diff --git a/x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild b/x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild
index 32f059f69a1a..174b195eba87 100644
--- a/x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.5.3-r6.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/x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild,v 1.12 2009/08/01 16:42:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild,v 1.13 2009/08/08 19:46:09 gengor Exp $
# Must be before x-modular eclass is inherited
SNAPSHOT="yes"
@@ -118,12 +118,17 @@ RDEPEND="hal? ( sys-apps/hal )
>=x11-libs/libXxf86misc-1.0.1
>=x11-libs/libXxf86vm-1.0.2
>=x11-libs/libpciaccess-0.10.3
- dmx? ( >=x11-libs/libdmx-1.0.2
- >=x11-libs/libXfixes-4.0.3 )
- !minimal? ( >=x11-libs/libXtst-1.0.3
+ dmx? (
+ >=x11-libs/libdmx-1.0.2
+ >=x11-libs/libXfixes-4.0.3
+ )
+ !minimal? (
+ >=x11-libs/libXtst-1.0.3
>=x11-libs/libXres-1.0.3
>=media-libs/mesa-7.1
- media-fonts/font-adobe-75dpi )
+ media-fonts/font-adobe-75dpi
+ media-fonts/font-cursor-misc
+ )
>=x11-libs/libxkbui-1.0.2
kdrive? ( sdl? ( media-libs/libsdl ) )"
# Xres is dmx-dependent, xkbui is xorgcfg-dependent
@@ -160,8 +165,10 @@ DEPEND="${RDEPEND}
>=x11-proto/xcmiscproto-1.1.2
>=x11-proto/glproto-1.4.9
dmx? ( >=x11-proto/dmxproto-2.2.2 )
- !minimal? ( >=x11-proto/xf86driproto-2.0.4
- >=x11-libs/libdrm-2.3 )"
+ !minimal? (
+ >=x11-proto/xf86driproto-2.0.4
+ >=x11-libs/libdrm-2.3
+ )"
# Drivers
PDEPEND="
diff --git a/x11-base/xorg-server/xorg-server-1.5.3-r7.ebuild b/x11-base/xorg-server/xorg-server-1.5.3-r7.ebuild
index f42b93aa0953..d2b6906c3956 100644
--- a/x11-base/xorg-server/xorg-server-1.5.3-r7.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.5.3-r7.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/x11-base/xorg-server/xorg-server-1.5.3-r7.ebuild,v 1.2 2009/07/13 10:53:18 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r7.ebuild,v 1.3 2009/08/08 19:46:09 gengor Exp $
# Must be before x-modular eclass is inherited
SNAPSHOT="yes"
@@ -119,12 +119,17 @@ RDEPEND="hal? ( sys-apps/hal )
>=x11-libs/libXxf86misc-1.0.1
>=x11-libs/libXxf86vm-1.0.2
>=x11-libs/libpciaccess-0.10.3
- dmx? ( >=x11-libs/libdmx-1.0.2
- >=x11-libs/libXfixes-4.0.3 )
- !minimal? ( >=x11-libs/libXtst-1.0.3
+ dmx? (
+ >=x11-libs/libdmx-1.0.2
+ >=x11-libs/libXfixes-4.0.3
+ )
+ !minimal? (
+ >=x11-libs/libXtst-1.0.3
>=x11-libs/libXres-1.0.3
>=media-libs/mesa-7.1
- media-fonts/font-adobe-75dpi )
+ media-fonts/font-adobe-75dpi
+ media-fonts/font-cursor-misc
+ )
>=x11-libs/libxkbui-1.0.2
kdrive? ( sdl? ( media-libs/libsdl ) )"
# Xres is dmx-dependent, xkbui is xorgcfg-dependent
@@ -161,8 +166,10 @@ DEPEND="${RDEPEND}
>=x11-proto/xcmiscproto-1.1.2
>=x11-proto/glproto-1.4.9
dmx? ( >=x11-proto/dmxproto-2.2.2 )
- !minimal? ( >=x11-proto/xf86driproto-2.0.4
- >=x11-libs/libdrm-2.3 )"
+ !minimal? (
+ >=x11-proto/xf86driproto-2.0.4
+ >=x11-libs/libdrm-2.3
+ )"
# Drivers
PDEPEND="
diff --git a/x11-base/xorg-server/xorg-server-1.6.2.901.ebuild b/x11-base/xorg-server/xorg-server-1.6.2.901.ebuild
index 541d8bbba0a5..4df7eb2eee0f 100644
--- a/x11-base/xorg-server/xorg-server-1.6.2.901.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.6.2.901.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/x11-base/xorg-server/xorg-server-1.6.2.901.ebuild,v 1.1 2009/07/28 13:03:22 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.6.2.901.ebuild,v 1.2 2009/08/08 19:46:09 gengor Exp $
EAPI="2"
@@ -130,6 +130,7 @@ RDEPEND="hal? ( sys-apps/hal )
>=x11-libs/libXtst-1.0.3
>=x11-libs/libXres-1.0.3
>=media-libs/mesa-7.3_rc1[nptl=]
+ media-fonts/font-cursor-misc
)
>=x11-libs/libxkbui-1.0.2
kdrive? ( sdl? ( media-libs/libsdl ) )"
diff --git a/x11-base/xorg-server/xorg-server-1.6.3.ebuild b/x11-base/xorg-server/xorg-server-1.6.3.ebuild
index c47920267b6c..a29947dd8ff3 100644
--- a/x11-base/xorg-server/xorg-server-1.6.3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.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/x11-base/xorg-server/xorg-server-1.6.3.ebuild,v 1.1 2009/08/02 21:25:16 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.6.3.ebuild,v 1.2 2009/08/08 19:46:09 gengor Exp $
EAPI="2"
@@ -130,6 +130,7 @@ RDEPEND="hal? ( sys-apps/hal )
>=x11-libs/libXtst-1.0.3
>=x11-libs/libXres-1.0.3
>=media-libs/mesa-7.3_rc1[nptl=]
+ media-fonts/font-cursor-misc
)
>=x11-libs/libxkbui-1.0.2
kdrive? ( sdl? ( media-libs/libsdl ) )"