summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2004-06-02 06:27:44 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2004-06-02 06:27:44 +0000
commitb2811cda8aa74938600071a01be9071faf996876 (patch)
treeb9b911502f2176ca540fb300dcc29d862d111de9 /x11-libs/xft
parentversion bump - bug #52573 (Manifest recommit) (diff)
downloadgentoo-2-b2811cda8aa74938600071a01be9071faf996876.tar.gz
gentoo-2-b2811cda8aa74938600071a01be9071faf996876.tar.bz2
gentoo-2-b2811cda8aa74938600071a01be9071faf996876.zip
Add blocker on x11-base/xorg-x11. (#52409).
Diffstat (limited to 'x11-libs/xft')
-rw-r--r--x11-libs/xft/ChangeLog5
-rw-r--r--x11-libs/xft/xft-2.0.1-r2.ebuild5
2 files changed, 7 insertions, 3 deletions
diff --git a/x11-libs/xft/ChangeLog b/x11-libs/xft/ChangeLog
index 5cd325d62e44..15405676d980 100644
--- a/x11-libs/xft/ChangeLog
+++ b/x11-libs/xft/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/xft
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xft/ChangeLog,v 1.22 2004/04/17 23:02:17 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xft/ChangeLog,v 1.23 2004/06/02 06:27:44 spyderous Exp $
+
+ 02 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; xft-2.0.1-r2.ebuild:
+ Add blocker on x11-base/xorg-x11. (#52409).
17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> xft-2.0.1-r2.ebuild:
Added IUSE.
diff --git a/x11-libs/xft/xft-2.0.1-r2.ebuild b/x11-libs/xft/xft-2.0.1-r2.ebuild
index c9b276981296..25157657ad90 100644
--- a/x11-libs/xft/xft-2.0.1-r2.ebuild
+++ b/x11-libs/xft/xft-2.0.1-r2.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-libs/xft/xft-2.0.1-r2.ebuild,v 1.10 2004/04/17 23:02:17 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xft/xft-2.0.1-r2.ebuild,v 1.11 2004/06/02 06:27:44 spyderous Exp $
inherit eutils
@@ -16,7 +16,8 @@ RDEPEND="x11-base/xfree
>=media-libs/fontconfig-2.1-r1"
DEPEND="${RDEPEND}
>=sys-devel/autoconf-2.58
- !>=x11-base/xfree-4.3.0-r2"
+ !>=x11-base/xfree-4.3.0-r2
+ !x11-base/xorg-x11"
PROVIDE="virtual/xft"
S="${WORKDIR}/fcpackage.${PV/\.0\./_}/Xft"