summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2005-09-20 19:17:04 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2005-09-20 19:17:04 +0000
commit2696b3389e2b08c28bbcb938020d17396693ac5f (patch)
treee601d8fb86e6384a12944b5bf171b22bdee00db6 /x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild
parentMarkgin ~ppc-macos (bug #106614) (diff)
downloadgentoo-2-2696b3389e2b08c28bbcb938020d17396693ac5f.tar.gz
gentoo-2-2696b3389e2b08c28bbcb938020d17396693ac5f.tar.bz2
gentoo-2-2696b3389e2b08c28bbcb938020d17396693ac5f.zip
Make util-linux conditional to GNU userland, added note for FBSD.
(Portage version: 2.0.52-r1)
Diffstat (limited to 'x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild')
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild5
1 files changed, 3 insertions, 2 deletions
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild
index 485dbdeee0e4..17fc8a13b6b6 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r4.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-6.8.2-r4.ebuild,v 1.2 2005/09/19 16:34:55 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild,v 1.3 2005/09/20 19:17:04 flameeyes Exp $
# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
# voodoo3 cards.
@@ -87,13 +87,14 @@ DEPEND=">=sys-libs/ncurses-5.1
opengl? ( >=x11-base/opengl-update-2.2.0 )
!nocxx? ( >=x11-misc/ttmkfdir-3.0.9-r2 )
>=sys-apps/sed-4
- sys-apps/util-linux
+ userland_GNU? ( sys-apps/util-linux )
dev-lang/perl
media-libs/libpng
!<=app-emulation/emul-linux-x86-xlibs-1.2-r3
!virtual/xft
!virtual/x11"
# x11-libs/xft -- blocked because of interference with xorg's
+# FBSDTODO: need to check that X is not pulled in before freebsd-ubin for 'col' presence
RDEPEND="
>=sys-libs/zlib-1.1.3-r2