(#349798) Pull in xinit 1.3. Do it in RDEPEND instead of PDEPEND so that files moving around between packages don't run into conflicts.

Package-Manager: portage-2.1.9.26/cvs/Linux x86_64

4 files changed, 18 insertions, 13 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 73e11662e660..aea6950e36ff 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.553 2010/12/25 20:13:59 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.554 2010/12/27 05:05:25 dberkholz Exp $
+
+  27 Dec 2010; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.9.2.ebuild, xorg-server-1.9.2.902.ebuild:
+  (#349798) Pull in xinit 1.3. Do it in RDEPEND instead of PDEPEND so that
+  files moving around between packages don't run into conflicts.
 
   25 Dec 2010; Christian Faulhammer <fauli@gentoo.org>
   xorg-server-1.9.2.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 7a004c1d38bf..2c21d102d9af 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -24,14 +24,14 @@ DIST xorg-server-1.9.2.tar.bz2 5274463 RMD160 7abab5627a3a1b226f0348dbdead1728b3
 EBUILD xorg-server-1.7.6.ebuild 7387 RMD160 8f2efc7318211110f241f5ac1df28534ecdabfb5 SHA1 2e9f4fc70f7f5727cfd5f2eb0bc3788dc3533bf4 SHA256 2a32249e29c709743a30a73ad7dc03ca83146f6958e91614f17a526dd7fe4c1e
 EBUILD xorg-server-1.7.7-r1.ebuild 7368 RMD160 ccd93332ed25c2884d25cb0de0e0c774bf457fc8 SHA1 88f38a3a42b06000852a0068c568ad7a89d2f394 SHA256 24f07ebc80adfa98007d5bfab22c19a0b5c079c4bd073838e5502422380e7839
 EBUILD xorg-server-1.8.2.ebuild 8257 RMD160 885186326c9416f17e56e41ca448b55dd1b27b04 SHA1 2b2cb027b65dbf479e786dd3a8c6c74458473b32 SHA256 2a64df0f2d87a495b8fc6133655d58ac8305b755b8427e6e1f6fdd1b7499b225
-EBUILD xorg-server-1.9.2.902.ebuild 7906 RMD160 6dc677c358b7120a3e27edbc2d57016b714dbc50 SHA1 4c017d1ee257932f29d8e226f45ce72687ee7abe SHA256 d9ea60b9d71db7e9b1264ee3170a93d05e8ae52cce47da192e30e9b0d76525c2
-EBUILD xorg-server-1.9.2.ebuild 8177 RMD160 654ace985f588ee210f894de91f52af103b2ce20 SHA1 b027a5620a294647babb6703231b05b3ee4b96a1 SHA256 f82db1fec539cb04817e32fb416d5da18c6edebeaf2c7481e51a2f24a3628e3e
-MISC ChangeLog 121521 RMD160 6edcea0006b242f41fb480894f45c6d52e488108 SHA1 02f83fca0415faf4bd035e13da6520d633c9a80b SHA256 dd8d91e2f8f1dc13a14692bc8a6b8813a72005e66ce6b67281847a531afadabe
+EBUILD xorg-server-1.9.2.902.ebuild 7901 RMD160 184050c0d419ef6fe310c87f0811548e59abd38d SHA1 c3ece5a50ae39feba92f8caf16d393d3b2cf2f7d SHA256 b9bfb2c3e353f2aade82177115ff84fff498db4e3368245aa7e9412b0484d90f
+EBUILD xorg-server-1.9.2.ebuild 8176 RMD160 633125992dd7105d34766582238d8fb2e95cdc06 SHA1 7bf74f7d94a125ec9921530c67fe31463da700e5 SHA256 a311ce6ec11148f71bab815ed0a1b4a34941b8115661c9f31bf10d9c4fce1585
+MISC ChangeLog 121779 RMD160 add3addf0f985a5d776453f3642c779e40d56584 SHA1 cfa9c0ed33c28fc88785bc2331ca6c745f235d30 SHA256 75ec3d3abd57f2a6cd9a024705d2478b3964c12e4722d4cadf250e2c02723550
 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0WUTwACgkQNQqtfCuFneM8mQCfYLXWJo5grhwHBHIDdaUVfRUp
-aNgAmwUe8lbKqfRogfp84QJkb7dHg4vm
-=n4Js
+iEYEARECAAYFAk0YHrgACgkQXVaO67S1rtsTRQCfYtJv3+TVCCieMKW7O5/XqpFZ
+EpYAnivD3QXOhHlozbMZmsVdUad1pc4h
+=U+NJ
 -----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.9.2.902.ebuild b/x11-base/xorg-server/xorg-server-1.9.2.902.ebuild
index f22e6ff7d990..3ac70f0d8d35 100644
--- a/x11-base/xorg-server/xorg-server-1.9.2.902.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.9.2.902.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.9.2.902.ebuild,v 1.1 2010/12/05 11:32:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.2.902.ebuild,v 1.2 2010/12/27 05:05:25 dberkholz Exp $
 
 EAPI=3
 # They generate the configure.ac with wrong version of util-macros
@@ -90,10 +90,10 @@ DEPEND="${RDEPEND}
 		>=x11-proto/xf86driproto-2.1.0
 		>=x11-proto/dri2proto-2.3
 		>=x11-libs/libdrm-2.4.20
-	)"
+	)
+	>=x11-apps/xinit-1.3"
 
 PDEPEND="
-	>=x11-apps/xinit-1.2.1-r1
 	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
 
 EPATCH_FORCE="yes"
diff --git a/x11-base/xorg-server/xorg-server-1.9.2.ebuild b/x11-base/xorg-server/xorg-server-1.9.2.ebuild
index 45e5fd175fee..573bd8b6a027 100644
--- a/x11-base/xorg-server/xorg-server-1.9.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.9.2.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.9.2.ebuild,v 1.5 2010/12/25 20:13:59 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.2.ebuild,v 1.6 2010/12/27 05:05:25 dberkholz Exp $
 
 EAPI=3
 # They generate the configure.ac with wrong version of util-macros
@@ -90,10 +90,10 @@ DEPEND="${RDEPEND}
 		>=x11-proto/xf86driproto-2.1.0
 		>=x11-proto/dri2proto-2.3
 		>=x11-libs/libdrm-2.4.20
-	)"
+	)
+	>=x11-apps/xinit-1.3"
 
 PDEPEND="
-	>=x11-apps/xinit-1.2.1-r1
 	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
 
 EPATCH_FORCE="yes"