x11-base/xorg-server: reverting the previous commit, see bug #278487

(Portage version: 2.2_rc36/cvs/Linux i686, RepoMan options: --force)

5 files changed, 22 insertions, 33 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 4b650b07fed7..a946c2e93f08 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.436 2009/08/08 19:46:09 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.437 2009/08/10 17:37:33 remi Exp $
+
+  10 Aug 2009; Rémi Cardona <remi@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:
+  reverting the previous commit, see bug #278487
 
   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,
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 174b195eba87..2f9e9c916f58 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.13 2009/08/08 19:46:09 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild,v 1.14 2009/08/10 17:37:33 remi Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -118,17 +118,12 @@ 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-cursor-misc
-	)
+		media-fonts/font-adobe-75dpi )
 	>=x11-libs/libxkbui-1.0.2
 	kdrive? ( sdl? ( media-libs/libsdl ) )"
 	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
@@ -165,10 +160,8 @@ 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 d2b6906c3956..aee70c59c839 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.3 2009/08/08 19:46:09 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r7.ebuild,v 1.4 2009/08/10 17:37:33 remi Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -119,17 +119,12 @@ 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-cursor-misc
-	)
+		media-fonts/font-adobe-75dpi )
 	>=x11-libs/libxkbui-1.0.2
 	kdrive? ( sdl? ( media-libs/libsdl ) )"
 	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
@@ -166,10 +161,8 @@ 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 4df7eb2eee0f..132a44949e5f 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.2 2009/08/08 19:46:09 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.6.2.901.ebuild,v 1.3 2009/08/10 17:37:33 remi Exp $
 
 EAPI="2"
 
@@ -130,7 +130,6 @@ 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 a29947dd8ff3..f84fe8ef2e50 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.2 2009/08/08 19:46:09 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.6.3.ebuild,v 1.3 2009/08/10 17:37:33 remi Exp $
 
 EAPI="2"
 
@@ -130,7 +130,6 @@ 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 ) )"