Limit stable to NX 3.4.0, bump to support 3.5.0

(Portage version: 2.2.0_alpha34/cvs/Linux x86_64)

3 files changed, 19 insertions, 12 deletions

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index c3451441d70e..1863c2283fe6 100644
--- a/net-misc/nxserver-freenx/ChangeLog
+++ b/net-misc/nxserver-freenx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/nxserver-freenx
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.77 2010/10/05 21:10:37 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.78 2011/05/22 14:12:31 voyageur Exp $
+
+*nxserver-freenx-0.7.3_p104-r6 (22 May 2011)
+
+  22 May 2011; Bernard Cafarelli <voyageur@gentoo.org>
+  -nxserver-freenx-0.7.3_p104-r4.ebuild, nxserver-freenx-0.7.3_p104-r5.ebuild,
+  +nxserver-freenx-0.7.3_p104-r6.ebuild:
+  Limit stable to NX 3.4.0, bump to support 3.5.0
 
   05 Oct 2010; Markus Meier <maekke@gentoo.org>
   nxserver-freenx-0.7.3_p104-r5.ebuild:
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r5.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r5.ebuild
index 1bfc2f7e8901..994527a24fe1 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r5.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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-r5.ebuild,v 1.3 2010/10/05 21:10:37 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r5.ebuild,v 1.4 2011/05/22 14:12:31 voyageur Exp $
 
 EAPI=2
 
@@ -24,7 +24,7 @@ RDEPEND="dev-tcltk/expect
 	media-fonts/font-cursor-misc
 	media-fonts/font-misc-misc
 	net-analyzer/gnu-netcat
-	>=net-misc/nx-2.1.0
+	<net-misc/nx-3.5.0
 	sys-apps/gawk
 	virtual/ssh
 	x11-apps/xauth
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r4.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r6.ebuild
index 69bd8cc85513..325dfaad69ff 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r4.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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-r4.ebuild,v 1.5 2010/07/19 15:15:10 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r6.ebuild,v 1.1 2011/05/22 14:12:31 voyageur Exp $
 
 EAPI=2
 
@@ -15,13 +15,12 @@ HOMEPAGE="http://freenx.berlios.de/ https://launchpad.net/~freenx-team"
 SRC_URI="http://ppa.launchpad.net/freenx-team/ppa/ubuntu/pool/main/f/${MY_PN}/freenx-server_${MAJOR_PV}+teambzr${PATCH_VER/p}.orig.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+nxclient rdesktop vnc"
 
 DEPEND="x11-misc/gccmakedep
 	x11-misc/imake"
-RDEPEND="!>=dev-libs/openssl-1.0
-	dev-tcltk/expect
+RDEPEND="dev-tcltk/expect
 	media-fonts/font-cursor-misc
 	media-fonts/font-misc-misc
 	net-analyzer/gnu-netcat
@@ -54,11 +53,12 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.7.3_p102-cflags.patch
 	epatch "${FILESDIR}"/${PN}-0.7.2-cups.patch
 	epatch "${FILESDIR}"/${P}-jobserver_fix.patch
+	epatch "${FILESDIR}"/${P}-md5sum.patch
 
-	# Path to net-misc/nx files, support for nx 3.4.0
+	# Path to net-misc/nx files, support for nx >= 3.4.0
 	sed	-e "/PATH_LIB=/s/lib/$(get_libdir)/g" \
 		-e "s#REAL_PATH_LIB#/usr/$(get_libdir)/NX/bin#" \
-		-e "s#3.\[0123\].0#3.\[01234\].0#g" \
+		-e "s#3.\[0123\].0#3.\[012345\].0#g" \
 		-i nxloadconfig || die "nxloadconfig sed failed"
 }