summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2005-12-20 13:27:24 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2005-12-20 13:27:24 +0000
commit96c2665905c8b8c57562c85004a4563a9b0a0d08 (patch)
treea082b9ebbe1aef84c66beda03f7f7110b5ee7cf2 /x11-misc/x11vnc
parentStable on sparc (diff)
downloadgentoo-2-96c2665905c8b8c57562c85004a4563a9b0a0d08.tar.gz
gentoo-2-96c2665905c8b8c57562c85004a4563a9b0a0d08.tar.bz2
gentoo-2-96c2665905c8b8c57562c85004a4563a9b0a0d08.zip
Add dependencies for modular X. See bug #116162.
(Portage version: 2.1_pre1)
Diffstat (limited to 'x11-misc/x11vnc')
-rw-r--r--x11-misc/x11vnc/ChangeLog5
-rw-r--r--x11-misc/x11vnc/x11vnc-0.7.2.ebuild28
2 files changed, 27 insertions, 6 deletions
diff --git a/x11-misc/x11vnc/ChangeLog b/x11-misc/x11vnc/ChangeLog
index d79a5b762c47..d3e92623f9dd 100644
--- a/x11-misc/x11vnc/ChangeLog
+++ b/x11-misc/x11vnc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-misc/x11vnc
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.13 2005/10/08 22:02:47 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.14 2005/12/20 13:27:24 flameeyes Exp $
+
+ 20 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> x11vnc-0.7.2.ebuild:
+ Add dependencies for modular X. See bug #116162.
08 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
x11vnc-0.7.1-r1.ebuild:
diff --git a/x11-misc/x11vnc/x11vnc-0.7.2.ebuild b/x11-misc/x11vnc/x11vnc-0.7.2.ebuild
index 6883bc69b858..947508faabae 100644
--- a/x11-misc/x11vnc/x11vnc-0.7.2.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.7.2.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-misc/x11vnc/x11vnc-0.7.2.ebuild,v 1.1 2005/07/13 21:21:03 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.7.2.ebuild,v 1.2 2005/12/20 13:27:24 flameeyes Exp $
DESCRIPTION="A VNC server for real X displays"
HOMEPAGE="http://www.karlrunge.com/x11vnc/"
@@ -11,16 +11,34 @@ SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~sparc"
IUSE="jpeg zlib"
-DEPEND="virtual/x11
- zlib? ( sys-libs/zlib )
+RDEPEND="zlib? ( sys-libs/zlib )
jpeg? (
media-libs/jpeg
sys-libs/zlib
- )"
+ )
+ || ( (
+ x11-libs/libXinerama
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libX11
+ x11-libs/libXtst
+ x11-libs/libXdamage
+ x11-libs/libXext
+ ) virtual/x11 )"
+
+DEPEND="${RDEPEND}
+ || ( (
+ x11-libs/libXt
+ x11-proto/xineramaproto
+ x11-proto/trapproto
+ x11-proto/recordproto
+ x11-proto/xproto
+ x11-proto/xextproto
+ ) virtual/x11 )"
src_compile() {
local myconf=""
- use jpeg && myconf="${myconf} --enable-zlib"
+ use jpeg && myconf="${myconf} --with-zlib"
econf \
$(use_with jpeg) \