summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2006-01-25 02:24:50 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2006-01-25 02:24:50 +0000
commit98a9449fe3d61cc352182273b212ec7285ba9e61 (patch)
treee1f3eb2cd8056c1ecfa99f11ec87fa08b821e2ba /net-misc/vnc
parentVersion bump, bug #118565. (diff)
downloadgentoo-2-98a9449fe3d61cc352182273b212ec7285ba9e61.tar.gz
gentoo-2-98a9449fe3d61cc352182273b212ec7285ba9e61.tar.bz2
gentoo-2-98a9449fe3d61cc352182273b212ec7285ba9e61.zip
(#110666) Add modular X deps.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'net-misc/vnc')
-rw-r--r--net-misc/vnc/ChangeLog5
-rw-r--r--net-misc/vnc/vnc-4.0-r1.ebuild22
2 files changed, 23 insertions, 4 deletions
diff --git a/net-misc/vnc/ChangeLog b/net-misc/vnc/ChangeLog
index abcb55a056e0..eadb6825496b 100644
--- a/net-misc/vnc/ChangeLog
+++ b/net-misc/vnc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/vnc
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.43 2006/01/20 21:57:24 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.44 2006/01/25 02:24:49 spyderous Exp $
+
+ 25 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>; vnc-4.0-r1.ebuild:
+ (#110666) Add modular X deps.
20 Jan 2006; Marcelo Goes <vanquirius@gentoo.org>
-files/vnc-3.3.3-10-xdm-auth-support.patch,
diff --git a/net-misc/vnc/vnc-4.0-r1.ebuild b/net-misc/vnc/vnc-4.0-r1.ebuild
index 110a26ece065..f80f5d67e72c 100644
--- a/net-misc/vnc/vnc-4.0-r1.ebuild
+++ b/net-misc/vnc/vnc-4.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.0-r1.ebuild,v 1.17 2006/01/20 21:57:24 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.0-r1.ebuild,v 1.18 2006/01/25 02:24:50 spyderous Exp $
inherit eutils toolchain-funcs multilib
@@ -21,10 +21,26 @@ SLOT="0"
KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
IUSE="server"
-DEPEND="sys-libs/zlib
+RDEPEND="sys-libs/zlib
media-libs/freetype
- x11-base/xorg-x11
+ || ( ( x11-libs/libSM
+ x11-libs/libXtst
+ )
+ virtual/x11
+ )
+ server? ( || ( ( x11-libs/libXi
+ x11-libs/libXmu
+ x11-libs/libXrender
+ )
+ virtual/x11
+ )
+ )
!net-misc/tightvnc"
+DEPEND="${RDEPEND}
+ || ( ( x11-proto/xextproto
+ )
+ virtual/x11
+ )"
S="${WORKDIR}/${MY_P}"