summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Baergen <joshuabaergen@gentoo.org>2005-11-16 05:05:08 +0000
committerJoshua Baergen <joshuabaergen@gentoo.org>2005-11-16 05:05:08 +0000
commit7bcdadb5bee3b80389d79b9797c8bee3369312aa (patch)
tree9200416af8170b550e416133f083f22d39431209 /x11-base
parentChanged xorg-x11 blocker for clarity. (diff)
downloadgentoo-2-7bcdadb5bee3b80389d79b9797c8bee3369312aa.tar.gz
gentoo-2-7bcdadb5bee3b80389d79b9797c8bee3369312aa.tar.bz2
gentoo-2-7bcdadb5bee3b80389d79b9797c8bee3369312aa.zip
Changed xorg-x11 blocker for clarity.
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog6
-rw-r--r--x11-base/xorg-x11/xorg-x11-7.0.0_rc1.ebuild4
-rw-r--r--x11-base/xorg-x11/xorg-x11-7.0.0_rc2.ebuild4
3 files changed, 9 insertions, 5 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/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}