Depend on old xinit which ships the init.d and conf.d files.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 13 insertions, 8 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 331ecdbb7c92..bf32bbe78e9e 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.494 2010/03/17 15:35:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.495 2010/04/09 10:28:58 scarabeus Exp $
+
+  09 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  xorg-server-1.5.3-r6.ebuild, xorg-server-1.6.5-r1.ebuild,
+  xorg-server-1.7.6.ebuild:
+  Depend on old xinit which ships the init.d and conf.d files.
 
 *xorg-server-1.7.6 (17 Mar 2010)
 
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 d4963050d983..ebc2c867ea3f 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
+# Copyright 1999-2010 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.18 2009/12/13 23:33:52 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild,v 1.19 2010/04/09 10:28:58 scarabeus Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -110,7 +110,7 @@ RDEPEND="hal? ( sys-apps/hal )
 	>=x11-apps/iceauth-1.0.2
 	>=x11-apps/rgb-1.0.3
 	>=x11-apps/xauth-1.0.3
-	>=x11-apps/xinit-1.0.8-r3
+	<=x11-apps/xinit-1.2.1
 	app-admin/eselect-opengl
 	>=x11-libs/libXaw-1.0.4
 	>=x11-libs/libXpm-3.5.7
diff --git a/x11-base/xorg-server/xorg-server-1.6.5-r1.ebuild b/x11-base/xorg-server/xorg-server-1.6.5-r1.ebuild
index 1262a9abe7c6..1aae065ddc2e 100644
--- a/x11-base/xorg-server/xorg-server-1.6.5-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.6.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.5-r1.ebuild,v 1.9 2010/01/18 19:26:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.6.5-r1.ebuild,v 1.10 2010/04/09 10:28:58 scarabeus Exp $
 
 EAPI="2"
 
@@ -42,7 +42,7 @@ RDEPEND="
 	>=x11-apps/iceauth-1.0.2
 	>=x11-apps/rgb-1.0.3
 	>=x11-apps/xauth-1.0.3
-	>=x11-apps/xinit-1.0.8-r3
+	<=x11-apps/xinit-1.2.1
 	>=app-admin/eselect-opengl-1.0.8
 	>=x11-libs/libXaw-1.0.5
 	>=x11-libs/libXpm-3.5.7
diff --git a/x11-base/xorg-server/xorg-server-1.7.6.ebuild b/x11-base/xorg-server/xorg-server-1.7.6.ebuild
index a986de271831..e070cdb1849d 100644
--- a/x11-base/xorg-server/xorg-server-1.7.6.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.7.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.7.6.ebuild,v 1.1 2010/03/17 15:35:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.6.ebuild,v 1.2 2010/04/09 10:28:58 scarabeus Exp $
 
 EAPI="2"
 
@@ -35,7 +35,7 @@ RDEPEND="hal? ( sys-apps/hal )
 	>=x11-apps/iceauth-1.0.2
 	>=x11-apps/rgb-1.0.3
 	>=x11-apps/xauth-1.0.3
-	>=x11-apps/xinit-1.0.8-r3
+	<=x11-apps/xinit-1.2.1
 	>=app-admin/eselect-opengl-1.0.8
 	dmx? (
 		x11-libs/libXt