summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2004-05-28 08:41:28 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2004-05-28 08:41:28 +0000
commitccdd29ad3b5ce57816025474495215de185f3b38 (patch)
tree9f40246047ed6a4cd68d5d6b5873e1aa0f8fa346
parentPATCH_VER 0.7. Add 9860_all_xorg-xkb_winkeys.patch to fix broken windows keys... (diff)
downloadhistorical-ccdd29ad3b5ce57816025474495215de185f3b38.tar.gz
historical-ccdd29ad3b5ce57816025474495215de185f3b38.tar.bz2
historical-ccdd29ad3b5ce57816025474495215de185f3b38.zip
Add explicit x11-base/xorg-x11 blocker.
-rw-r--r--x11-base/xfree/ChangeLog5
-rw-r--r--x11-base/xfree/xfree-4.3.0-r5.ebuild3
2 files changed, 6 insertions, 2 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 579de7c4eb5f..7483b9b34061 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-base/xfree
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.335 2004/05/12 13:31:56 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.336 2004/05/28 08:41:28 spyderous Exp $
+
+ 28 May 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild:
+ Add explicit x11-base/xorg-x11 blocker.
12 May 2004; Alexander Gabert <pappy@gentoo.org> xfree-4.3.0-r5.ebuild,
xfree-4.3.0-r6.ebuild:
diff --git a/x11-base/xfree/xfree-4.3.0-r5.ebuild b/x11-base/xfree/xfree-4.3.0-r5.ebuild
index da0480e2d202..b85c18964112 100644
--- a/x11-base/xfree/xfree-4.3.0-r5.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r5.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/xfree/xfree-4.3.0-r5.ebuild,v 1.13 2004/05/12 13:31:56 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r5.ebuild,v 1.14 2004/05/28 08:41:28 spyderous Exp $
# Make sure Portage does _NOT_ strip symbols. We will do it later and make sure
# that only we only strip stuff that are safe to strip ...
@@ -139,6 +139,7 @@ DEPEND=">=sys-apps/baselayout-1.8.3
pam? ( >=sys-libs/pam-0.75 )
truetype? ( !bindist? ( app-arch/cabextract ) )
!virtual/x11
+ !x11-base/xorg-x11
!x11-libs/xft"
#RDEPEND="$DEPEND"
# unzip - needed for savage driver (version 1.1.27t)