Xvfb requires font-cursor-misc runtime, bug #278487.

Package-Manager: portage-2.1.6.13/cvs/Linux i686
RepoMan-Options: --force

6 files changed, 43 insertions, 22 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/Manifest b/x11-base/xorg-server/Manifest
index f61967487c3d..b71947674a41 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -58,9 +58,9 @@ DIST xorg-server-1.6.2.901.tar.bz2 4646810 RMD160 e9822920c4b91ff24c0a6f1907f848
 DIST xorg-server-1.6.3.tar.bz2 4651487 RMD160 5b9ddfeb9fb7082ef600e368ada8abbb006fe418 SHA1 1f28e8723e110e5c1a1adf3bc89325a81a526184 SHA256 7de60906f128b43730585ed760ece8979146dff841038ddc59bff4ad5d4ed308
 EBUILD xorg-server-1.3.0.0-r6.ebuild 15966 RMD160 2c831d0d626eb065bc7682f135c311b8109a653c SHA1 44ab792f54e6be500f355acd8a5ff698094e5d11 SHA256 3993d8b87b1391f7feeacd22a84d469a725ddbba704d994649b9e091a3ccf237
 EBUILD xorg-server-1.4.2.ebuild 15876 RMD160 a187aef0f5d8a4458d4e5998838bec6f9b28f558 SHA1 07be9692088f1ce275e46e8a3dd88d966f19cb47 SHA256 9b7eca8160d77f77e67d6c31817ec6da5c2997c66dde834a7b2ca16bafb4e12e
-EBUILD xorg-server-1.5.3-r6.ebuild 15747 RMD160 0199ed264e62c7e2846b8a232b37b5d611225ea7 SHA1 33bd9729567a7c8f09103a6b6d29b3636f3ee332 SHA256 cb982b8bbccbe16a6b42286a1c630d0e74553b208791ef92243eddfbce2bdadf
-EBUILD xorg-server-1.5.3-r7.ebuild 15844 RMD160 e5aa688e0094227e81b61e59d2fb3d862485cb9a SHA1 93efcee3c42bd3e3b834ca7ac9bc179719045ba4 SHA256 184b1e1ba14b82afd23a372c8b33a76a8855b8f2a7dc7e9eb81cb16793d10cff
-EBUILD xorg-server-1.6.2.901.ebuild 13071 RMD160 a099c3227fd9ecdc75203f3267166a2be9aaa2e0 SHA1 1857c05adeaff64dcf69cf44cd7960e712584665 SHA256 5889cdd7a7de67f8c2d12439859b89b8237b6bc653d5606f9dda9a5adfa4e47c
-EBUILD xorg-server-1.6.3.ebuild 12812 RMD160 45270d0f431f08f93509a7badf25f2137dd2ad5e SHA1 167f020027a0bf29934ebc00d1cb65ef9df16755 SHA256 f28345734bdd30ea305be26e9c581427306219fc7e8d976b9c41c4b84281c303
-MISC ChangeLog 99611 RMD160 fe13556036569c7fcd63759cabedf1ebfc199cf0 SHA1 d56ebf253dd3e66dae10da4950af29b1e7f52cc4 SHA256 979c5fb1d1d58e9ffe4aac2046c16a2e85969fe8eeb163020b72d07cb68d8736
+EBUILD xorg-server-1.5.3-r6.ebuild 15783 RMD160 c03b2ce3c08072a53205209083dfa3b717ff9ef5 SHA1 7738ef6b3d7f6e846d417580dae0b0f6569c308c SHA256 b51e802bbbe51af725b59c037d30469e640c7c215b4a6854d563f512b783ac97
+EBUILD xorg-server-1.5.3-r7.ebuild 15885 RMD160 828bb4bf37cc2c882faa9f9f6f0cd3b5fa263cb3 SHA1 a3c490de66b20efb4a602182e2f0691fd4897932 SHA256 f422e89169b3141e719a97e5e9108716e8ad1739165a1ffc338b70a472cf4cec
+EBUILD xorg-server-1.6.2.901.ebuild 13104 RMD160 33de120a46537ebd5606acebe12403b9e8deb983 SHA1 444b6976b0b197f94a155d278189336a2ec32b3d SHA256 0799ec3fcdfe4ffb2dfd2ac94cd232a778672e4901ec23ed6bf5b967fc4dcd1b
+EBUILD xorg-server-1.6.3.ebuild 12845 RMD160 d393d81466e47907be873a1eac4e1080a747d944 SHA1 e8e8bbe59d1f7d2ff5fda821e6dde175c8cdce4f SHA256 acecd2b88c0bd99094ed3a6811dc73a4a77ea0ab161350b7fb9b453c11318c25
+MISC ChangeLog 99834 RMD160 c9f7c198fd928cb7332cb36b9522ac0f947301b3 SHA1 6b85132f3735ba5c9540ba5aa622d5a666ce459a SHA256 299176acdc0184aec8552e8874e1b08d51b075e024a1a5d7f747500694f2c638
 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
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 ) )"