diff options
| author |   Raúl Porcel <armin76@gentoo.org> | 2007-12-27 20:42:10 +0000 |
|---|---|---|
| committer | Raúl Porcel <armin76@gentoo.org> | 2007-12-27 20:42:10 +0000 |
| commit | 1ef092369ccbb76af5b7aaddddde30ddfab8cfc7 (patch) | |
| tree | 35f9b584a85c0986c8bbd9271b63bf86607be8c9 /net-misc/tightvnc | |
| parent | Stable on x86. (diff) | |
| download | gentoo-2-1ef092369ccbb76af5b7aaddddde30ddfab8cfc7.tar.gz gentoo-2-1ef092369ccbb76af5b7aaddddde30ddfab8cfc7.tar.bz2 gentoo-2-1ef092369ccbb76af5b7aaddddde30ddfab8cfc7.zip | |
Block net-misc/xf4vnc as it collides, bug #203513
(Portage version: 2.1.3.19)
Diffstat (limited to 'net-misc/tightvnc')
| -rw-r--r-- | net-misc/tightvnc/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/tightvnc/tightvnc-1.3.9-r1.ebuild | 5 | ||||
| -rw-r--r-- | net-misc/tightvnc/tightvnc-1.3.9.ebuild | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog index f046a55145e6..8aacadc341fd 100644 --- a/net-misc/tightvnc/ChangeLog +++ b/net-misc/tightvnc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/tightvnc # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.114 2007/10/17 23:32:58 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.115 2007/12/27 20:42:10 armin76 Exp $ + + 27 Dec 2007; Raúl Porcel <armin76@gentoo.org> tightvnc-1.3.9.ebuild, + tightvnc-1.3.9-r1.ebuild: + Block net-misc/xf4vnc as it collides, bug #203513 *tightvnc-1.3.9-r1 (17 Oct 2007) diff --git a/net-misc/tightvnc/tightvnc-1.3.9-r1.ebuild b/net-misc/tightvnc/tightvnc-1.3.9-r1.ebuild index 778ea6615cbd..002ea0189998 100644 --- a/net-misc/tightvnc/tightvnc-1.3.9-r1.ebuild +++ b/net-misc/tightvnc/tightvnc-1.3.9-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3.9-r1.ebuild,v 1.1 2007/10/17 23:32:58 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3.9-r1.ebuild,v 1.2 2007/12/27 20:42:10 armin76 Exp $ inherit eutils toolchain-funcs @@ -41,7 +41,8 @@ DEPEND="${RDEPEND} >=x11-misc/imake-1 x11-misc/gccmakedep x11-misc/makedepend - !net-misc/vnc" + !net-misc/vnc + !net-misc/xf4vnc" src_unpack() { diff --git a/net-misc/tightvnc/tightvnc-1.3.9.ebuild b/net-misc/tightvnc/tightvnc-1.3.9.ebuild index 7a9b863d493a..6d21ea79b2e5 100644 --- a/net-misc/tightvnc/tightvnc-1.3.9.ebuild +++ b/net-misc/tightvnc/tightvnc-1.3.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3.9.ebuild,v 1.11 2007/06/27 16:36:18 lavajoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3.9.ebuild,v 1.12 2007/12/27 20:42:10 armin76 Exp $ inherit eutils toolchain-funcs @@ -31,7 +31,8 @@ DEPEND="x11-libs/libX11 x11-misc/gccmakedep ~media-libs/jpeg-6b tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) - !net-misc/vnc" + !net-misc/vnc + !net-misc/xf4vnc" RDEPEND="${DEPEND} server? ( |