Changed xorg-x11 blocker for clarity.

Package-Manager: portage-2.0.53_rc7

4 files changed, 12 insertions, 8 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 2afa38dad3af..67579d8c7ed7 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.477 2005/11/11 20:12:03 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.478 2005/11/16 05:03:33 joshuabaergen Exp $
+
+  16 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-x11-7.0.0_rc1.ebuild, xorg-x11-7.0.0_rc2.ebuild:
+  Changed xorg-x11 blocker for clarity.
 
 *xorg-x11-7.0.0_rc2 (11 Nov 2005)
 
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 67e5ade00205..415b1342101c 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,4 +1,4 @@
-MD5 2c4855de18f8a4a90b5539562985e206 ChangeLog 108774
+MD5 634ea8bf0ae3c2ea85e4ed928b13d6be ChangeLog 108928
 MD5 84ed1084819731e2acef3610f0b6b30a files/digest-xorg-x11-6.8.2-r4 506
 MD5 a60034cf312e05f28a2da6b202d53e44 files/digest-xorg-x11-6.8.2-r6 504
 MD5 74c3f07657d69432f516175657c23ba0 files/digest-xorg-x11-6.8.99.15-r4 518
@@ -8,5 +8,5 @@ MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 aa1fdddf5e2240d1b9001668019c55a7 xorg-x11-6.8.2-r4.ebuild 55108
 MD5 8eecd782819774d2b23d36e37a2864f7 xorg-x11-6.8.2-r6.ebuild 55222
 MD5 38dbe8c5ae52c31df510280ef0b3187a xorg-x11-6.8.99.15-r4.ebuild 54183
-MD5 50e2282625e4cd6c7cf3bd0f89e734ee xorg-x11-7.0.0_rc1.ebuild 2765
-MD5 bbd4be9778968621e41efd8954ffa816 xorg-x11-7.0.0_rc2.ebuild 2765
+MD5 8252e5e7dfd036c4c26cc7e44bfd0e1f xorg-x11-7.0.0_rc1.ebuild 2761
+MD5 b975e2d9781a47a6cf3c63d26b4a5bac xorg-x11-7.0.0_rc2.ebuild 2760
diff --git a/x11-base/xorg-x11/xorg-x11-7.0.0_rc1.ebuild b/x11-base/xorg-x11/xorg-x11-7.0.0_rc1.ebuild
index b55fd86031ca..6e8787c4d767 100644
--- a/x11-base/xorg-x11/xorg-x11-7.0.0_rc1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-7.0.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.0.0_rc1.ebuild,v 1.9 2005/11/10 01:10:37 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.0.0_rc1.ebuild,v 1.10 2005/11/16 05:03:33 joshuabaergen Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~mips ~sparc ~x86"
 IUSE="xprint"
 
 # Collision protect will scream bloody murder if we install over old versions
-RDEPEND="!<x11-base/xorg-x11-7.0.0_rc0"
+RDEPEND="!<=x11-base/xorg-x11-6.9"
 
 # Server
 RDEPEND="${RDEPEND}
diff --git a/x11-base/xorg-x11/xorg-x11-7.0.0_rc2.ebuild b/x11-base/xorg-x11/xorg-x11-7.0.0_rc2.ebuild
index e77f99cd51e4..284ac662962a 100644
--- a/x11-base/xorg-x11/xorg-x11-7.0.0_rc2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-7.0.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.0.0_rc2.ebuild,v 1.1 2005/11/11 20:12:03 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.0.0_rc2.ebuild,v 1.2 2005/11/16 05:03:33 joshuabaergen Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~mips ~sparc ~x86"
 IUSE="xprint"
 
 # Collision protect will scream bloody murder if we install over old versions
-RDEPEND="!<x11-base/xorg-x11-7.0.0_rc0"
+RDEPEND="!<=x11-base/xorg-x11-6.9"
 
 # Server
 RDEPEND="${RDEPEND}