diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2009-09-17 09:23:19 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2009-09-17 09:23:19 +0000 |
| commit | d27c7367c8a8966b79c3958f98878507f3c7c897 (patch) | |
| tree | 76ae00b62a67771bb717c1cb95143589d0c4a1a5 /net-misc | |
| parent | Update pkg_postinst to match other NX servers, remove blocker as files do not... (diff) | |
| download | gentoo-2-d27c7367c8a8966b79c3958f98878507f3c7c897.tar.gz gentoo-2-d27c7367c8a8966b79c3958f98878507f3c7c897.tar.bz2 gentoo-2-d27c7367c8a8966b79c3958f98878507f3c7c897.zip | |
Remove blocker as files do not collide anymore for some time
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/nxserver-freenx/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r1.ebuild | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog index 32a9366df7eb..e7d3f3bbe367 100644 --- a/net-misc/nxserver-freenx/ChangeLog +++ b/net-misc/nxserver-freenx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/nxserver-freenx # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.64 2009/05/29 14:02:36 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.65 2009/09/17 09:23:19 voyageur Exp $ + + 17 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org> + nxserver-freenx-0.7.3_p104-r1.ebuild: + Remove blocker as files do not collide anymore for some time 29 May 2009; Bernard Cafarelli <voyageur@gentoo.org> -nxserver-freenx-0.7.2-r2.ebuild, -nxserver-freenx-0.7.3_p102.ebuild: diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r1.ebuild index 4fdb8ace6afc..3a817d8e3ef3 100644 --- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r1.ebuild +++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r1.ebuild,v 1.1 2009/05/14 15:15:46 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r1.ebuild,v 1.2 2009/09/17 09:23:19 voyageur Exp $ EAPI=1 @@ -36,9 +36,7 @@ RDEPEND="dev-tcltk/expect x11-apps/xmessage ) ) rdesktop? ( net-misc/rdesktop ) vnc? ( x11-misc/x11vnc - || ( net-misc/tightvnc net-misc/vnc ) ) - !net-misc/nxserver-freeedition - !net-misc/nxserver-2xterminalserver" + || ( net-misc/tightvnc net-misc/vnc ) )" S=${WORKDIR}/${MY_PN} |