summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2004-04-07 22:49:42 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2004-04-07 22:49:42 +0000
commit0e6609ea3199b4b7ecfb59248e6704986e58dbf7 (patch)
tree216d3509aacc01c3ef93ce8146702e1669e8f64a
parentI meant bug 45828 (diff)
downloadhistorical-0e6609ea3199b4b7ecfb59248e6704986e58dbf7.tar.gz
historical-0e6609ea3199b4b7ecfb59248e6704986e58dbf7.tar.bz2
historical-0e6609ea3199b4b7ecfb59248e6704986e58dbf7.zip
Change blocker on xfree to blocker on other virtual/x11.
-rw-r--r--x11-base/xorg-x11/ChangeLog5
-rw-r--r--x11-base/xorg-x11/Manifest4
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.7.0.ebuild4
3 files changed, 8 insertions, 5 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 0078f4aca41f..8d66f995cac5 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-base/xorg-x11
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.6 2004/04/07 21:54:43 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.7 2004/04/07 22:49:42 spyderous Exp $
+
+ 07 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+ Change blocker on xfree to blocker on other virtual/x11.
07 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
FILES_VER 0.2. Fix libGL.la path -- #47100.
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 8e76d609c137..08fa21188726 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,4 +1,4 @@
MD5 f33d86266389c80f7f24467eef8552e7 metadata.xml 232
-MD5 b548117b7d8fae5ce7f721b0379b820a ChangeLog 975
-MD5 ee707c04362f2a61d8b418687cc4eee5 xorg-x11-6.7.0.ebuild 36646
+MD5 edb8f5a1e6699ed0723bf95b3e226714 ChangeLog 1113
+MD5 7c6120bdf57bb27769fa93b4c40a0efd xorg-x11-6.7.0.ebuild 36643
MD5 0b2728a5313945c57032214fc9fa379c files/digest-xorg-x11-6.7.0 904
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild
index 6cea17c99b3a..7834d3f772d3 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild,v 1.5 2004/04/07 21:54:43 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild,v 1.6 2004/04/07 22:49:42 spyderous Exp $
# This is a snapshot of the XORG-RELEASE-1 branch.
@@ -139,7 +139,7 @@ DEPEND=">=sys-apps/baselayout-1.8.3
media-libs/libpng
>=sys-apps/portage-2.0.50_pre9
!virtual/xft
- !x11-base/xfree"
+ !virtual/x11"
# x11-libs/xft -- blocked because of interference with xorg's
PDEPEND="x86? (