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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 20 insertions, 15 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/Manifest b/x11-base/xorg-server/Manifest
index 473ad82feb7e..5546c927270a 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -11,15 +11,15 @@ DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea449981002
 DIST xorg-server-1.6.5-gentoo-patches-01.tar.bz2 5482 RMD160 4e415d7aeb24172035f648ae14776aad33f7a441 SHA1 81d59f957f13c30cdcecc3bca0adb58befb26c0e SHA256 10a2184a63eafba51846b96833acd4b67c0524b1338bd4ef0218686d7f8e7414
 DIST xorg-server-1.6.5.tar.bz2 4678406 RMD160 702970358a5643dbc9205f42e39c5b8ed2ff845a SHA1 c57c80dd15d3ca492e58ae993b9015d085ec6ea6 SHA256 f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
 DIST xorg-server-1.7.6.tar.bz2 4927689 RMD160 811ca10c01da9b4bdeb743ee90b6845971dfd4c7 SHA1 77a8c3dec86960e1be818df3a75d69b5fad6a3c0 SHA256 da372e064aa5c2a0421830941372d4fea864e69c70290d56d6ffc042a6e80760
-EBUILD xorg-server-1.5.3-r6.ebuild 15605 RMD160 732f7b45d94b65ecc3458e4fb3dc4eea979f35d4 SHA1 92dc0563740107701664442e9273a65399b6f604 SHA256 d6250ae0808d1819ee15c6556a67dacf5c21dee751e35dd0405792fa89745603
-EBUILD xorg-server-1.6.5-r1.ebuild 6842 RMD160 ea73fe68637ed109806a567347e5dbbecc56b793 SHA1 2765155c3e03a7b1cf6a7509c78264147ef15552 SHA256 2da2a9575319fee5f1d95e1b9cb458be4da148470f72c4bca85659f466b4f813
-EBUILD xorg-server-1.7.6.ebuild 7081 RMD160 f9d6ba70a50f26f69946a753152a7fd0741c0a9b SHA1 7116a4efca96454c75c9a3eede7777ee53302d63 SHA256 da8cba3a2e0faeb110c8dcccbbdf8b5b1732d5a4b4d91d2f9d5ad5b54b1f7458
-MISC ChangeLog 111613 RMD160 08badddc355e6c37027ef2e1543aa063805b3475 SHA1 7a8d16e07b6ab71e6a645aa5f0bd0bef173b3998 SHA256 64babac410faa09846ec36ecaa592494ce3013346abf0ea8a424932682127081
+EBUILD xorg-server-1.5.3-r6.ebuild 15607 RMD160 13afb38910b3e04ff352c363aea529f984066de9 SHA1 55d4538178c2d4a1d3775ac605b03a852e9813db SHA256 230f98c9cdcebd42f94f1364a1a0ae317de9772968bcd97229e1be2e08f1d4af
+EBUILD xorg-server-1.6.5-r1.ebuild 6842 RMD160 7dc826b80d62c7bad6bc36dbcd9d5134ac8def0e SHA1 fca33f2816607703c3ed2612be1238f9cd6f28da SHA256 71441f59df32e25dad5deae4838e312e62a87497e0e4362cd297e27f33b96584
+EBUILD xorg-server-1.7.6.ebuild 7078 RMD160 2d4c77360099a7989ed5dc771548d760113e7fae SHA1 9ceadda3f410e247afafdda1007ceda88c91a300 SHA256 ab1e4a0e5a50d10c5c9fe078295e997105ddf644828afa52a663da9a8f193377
+MISC ChangeLog 111820 RMD160 6d8af3cceebc21ce271de4718b5235bdc53d5036 SHA1 6a1696413a98a84f2195862581012a58baa4ca14 SHA256 b20e0d4c37c26848bd38230aba16fea6c6981dc66668f22641b7d6939ec025ed
 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkug9rQACgkQHB6c3gNBRYesGgCgmX21tfCRQP16LMU6/eNy4g1O
-MWwAn1jpa6UPvCLqZtF9qpw2ueDdf9Xw
-=Okcx
+iEYEARECAAYFAku/AWkACgkQHB6c3gNBRYcwDwCgpDAAW4mjl+CZEyRoZywdLrCA
+/eYAoLFJF/v1/kVrps5u77wIzjuUuUSx
+=Pkak
 -----END PGP SIGNATURE-----
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