summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Ahlberg <aliz@gentoo.org>2005-01-07 18:45:12 +0000
committerDaniel Ahlberg <aliz@gentoo.org>2005-01-07 18:45:12 +0000
commitf9e8de92debc131fea2732c76d656a5c0843e5f1 (patch)
tree90fd34eb45a68f8601717b46e639c909ef2848a5 /net-misc
parentnew version released. fixes bug #77035. (diff)
downloadhistorical-f9e8de92debc131fea2732c76d656a5c0843e5f1.tar.gz
historical-f9e8de92debc131fea2732c76d656a5c0843e5f1.tar.bz2
historical-f9e8de92debc131fea2732c76d656a5c0843e5f1.zip
Closing #68290.
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/vnc/ChangeLog3
-rw-r--r--net-misc/vnc/Manifest4
-rw-r--r--net-misc/vnc/vnc-4.0-r1.ebuild18
3 files changed, 16 insertions, 9 deletions
diff --git a/net-misc/vnc/ChangeLog b/net-misc/vnc/ChangeLog
index fddba6d92c32..d67ff40ff534 100644
--- a/net-misc/vnc/ChangeLog
+++ b/net-misc/vnc/ChangeLog
@@ -1,6 +1,6 @@
# ChangeLog for net-misc/vnc
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.30 2005/01/07 18:12:04 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.31 2005/01/07 18:45:12 aliz Exp $
*vnc-4.0-r1 (07 Jan 2005)
@@ -11,6 +11,7 @@
Create /usr/X11R6/lib/modules/extensions so that .so file gets installed, closing #63596.
Added patch to prevent /tmp execution, closing #71295.
Don't hardcode CC/CXX, closing #69277.
+ Split server and client with USE flags, closing #68290."
Updated SRC_URI to xorg.freedesktop.org.
15 Sep 2004; <agriffis@gentoo.org> vnc-4.0.ebuild:
diff --git a/net-misc/vnc/Manifest b/net-misc/vnc/Manifest
index 574b31ba8be0..17c98002f204 100644
--- a/net-misc/vnc/Manifest
+++ b/net-misc/vnc/Manifest
@@ -1,7 +1,7 @@
-MD5 6d56c554001dec424bca1aa93cca7433 vnc-4.0-r1.ebuild 2198
+MD5 90426deb4f2e2a25ccf0813d2c1d93fe vnc-4.0-r1.ebuild 2351
MD5 9f66c7decfb747aef1c43e2df6a85757 vnc-4.0.ebuild 2089
MD5 6f59f15a8b013fa3c8897c311ae596ff vnc-3.3.7.ebuild 1628
-MD5 97d555a714a8313cdeeb9640b2217e49 ChangeLog 5998
+MD5 5d5b2e5db8e939437ae078723fc127c7 ChangeLog 6057
MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
MD5 a30c29b08a93f6fb42177887aa132e18 files/vnc-3.3.3-10-xdm-auth-support.patch 11575
MD5 aa54243fe6893130280fe1224204b780 files/digest-vnc-4.0 270
diff --git a/net-misc/vnc/vnc-4.0-r1.ebuild b/net-misc/vnc/vnc-4.0-r1.ebuild
index 05d711c19d9e..e3efbf155c35 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-2005 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.1 2005/01/07 18:12:04 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.0-r1.ebuild,v 1.2 2005/01/07 18:45:12 aliz Exp $
inherit eutils toolchain-funcs
@@ -17,7 +17,7 @@ SRC_URI="http://www.realvnc.com/dist/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~x86 ~sparc ~ppc ~amd64"
-IUSE=""
+IUSE="client server"
DEPEND="sys-libs/zlib
media-libs/freetype
@@ -27,6 +27,12 @@ DEPEND="sys-libs/zlib
PROVIDE="virtual/vnc"
S="${WORKDIR}/${MY_P}"
+pkg_setup() {
+ if ! use client && ! use server ; then
+ die "You must have either client or server or both in USE"
+ fi
+}
+
src_unpack() {
mkdir -p ${S}/xc ; cd ${S}
@@ -58,13 +64,13 @@ src_unpack() {
}
src_compile() {
- # client
+ use client && (
econf --with-installed-zlib || die
- emake || die
+ emake || die )
- # server
+ use server && (
cd ${S}/xc
- make CDEBUGFLAGS="${CFLAGS}" CXXDEBUGFLAGS="${CXXFLAGS}" World FAST=1 || die
+ make CDEBUGFLAGS="${CFLAGS}" CXXDEBUGFLAGS="${CXXFLAGS}" World FAST=1 || die )
}
src_install() {