Limit stable to NX 3.4.0, bump to support 3.5.0

Package-Manager: portage-2.2.0_alpha34/cvs/Linux x86_64

4 files changed, 27 insertions, 20 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/Manifest b/net-misc/nxserver-freenx/Manifest
index 866cbee93077..6d6a741ed0a9 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX nxserver-freenx-0.7.2-cups.patch 1312 RMD160 c6f0a0675fe7902cc2e53123e708f17e36c44dcd SHA1 3bcd5c4a8bd5ed560f91a705c5f45d3f756c16e9 SHA256 50d0ae81b1bf86aecb0eec82920db481633ae0181dfe2894ac1b10faf5b8644d
 AUX nxserver-freenx-0.7.3_p102-cflags.patch 925 RMD160 d735fffcac7500ed1329e273a97d4b5da5a3d825 SHA1 a28ad4001ec8a28b33a4646e48a453bd2e89ba02 SHA256 ca99ad30acaf356ece570ebbc0ca4e52e40590533173bc028872dffc1055066b
@@ -10,14 +10,14 @@ AUX nxserver-freenx-0.7.3_p104-nxnode_setup_samba.patch 2709 RMD160 973befb2e3c3
 AUX nxserver-freenx-0.7.3_p104-pam_ssh.patch 441 RMD160 f1adcb881d23cb7f950f67210f5842fc91a27b01 SHA1 bfac4b1cdf01ad3b3886dba631b733e8ec7ba2a8 SHA256 854d17b3656ac2382d84b32ed9de893b291217648f08f1f496e3d09a32b8d857
 AUX nxserver.init 568 RMD160 a48a0d4853fcd28c0ec6dd2e0366bc69ac1e4b28 SHA1 3980df2e35c594a806b18062e781fa5e52131ff9 SHA256 eda452183da56f6ef5730f1f9e7c968c462b2d3ad31c58ed6100d90c7533c4f2
 DIST freenx-server_0.7.3+teambzr104.orig.tar.gz 118242 RMD160 6dc846efa3953516110a212fe6030ba4936ad21d SHA1 47046b08b1f329a00feaccd3fff9129b1aee0b9e SHA256 0d8b8ea883d67551f40c6e1c3a4a280d5bd663f27147a054e879c58b31873c71
-EBUILD nxserver-freenx-0.7.3_p104-r4.ebuild 3841 RMD160 304ef490b76f1ece866b5b239555d769470163fa SHA1 75adc69a500ae2846d40cc4f6bf6d180aa8f6907 SHA256 b4046e16c338c91823808c5f48df3c33c8d91746f80bdc080226a86703e7e713
-EBUILD nxserver-freenx-0.7.3_p104-r5.ebuild 3854 RMD160 e9cdc35938bb2bbdb3ef42a10c2b061abb7e56cf SHA1 20bb9122da9803e1b0c653d8ce08238f9147aaea SHA256 324db84923c5927febe5a29a6637b47fc238c463c92759b68e27c35d989ed219
-MISC ChangeLog 18205 RMD160 00adbf7115b1b2b31ba6f89c3bb65a5cf79d07a6 SHA1 f3ed72db0e65c6893e5b75696c071f54639a016b SHA256 039b1f44384a623dfb20cb16048d19ed05cf4f2523c3c5491afa26e2f95539c9
+EBUILD nxserver-freenx-0.7.3_p104-r5.ebuild 3855 RMD160 6027563c28843426f32926194ad01cc478752684 SHA1 8701aa9de21741347b5afefd89b5255ee57985c1 SHA256 a1b38f23e92d9a3ee85cab82cc9ee1d2efa3e0c6ae018e1b50ae56912391b85e
+EBUILD nxserver-freenx-0.7.3_p104-r6.ebuild 3862 RMD160 ac86822bea0522d197e98aff1a94cc940e9f79e1 SHA1 bee536e09f6c6a27da9f8fbafe9410461c67894f SHA256 921da0d97f1dcb91f5a72d01ecce750b53e8b0b1d71e8a8722f49a2ebf9300d1
+MISC ChangeLog 18479 RMD160 622e8a7d36094b352970d3762a1074b0aaff8ea5 SHA1 dea66bc89b17f8db4cd72caf173143875cccb19d SHA256 811600187799f95499e9a49295b9acd4e081c12eb90615ce06472ec3fd5969ab
 MISC metadata.xml 525 RMD160 6b438e37f35775bbce33bbb1a04494049956aa04 SHA1 cf904293a398fd2acb8492d4c0a6c43045d71ea5 SHA256 50af7f059bc7dbf3a4040618c7c9bfa9a6f57ce7eeb2d135ed912a60bcc373bc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkyrlAYACgkQkKaRLQcq0GJUEACgr+yN1pjs3FHxU98WY3Wg2zsm
-4ecAoK0fOy866GuBQ6frAcRyvzba1DhQ
-=1870
+iF4EAREIAAYFAk3ZGdYACgkQFYEBGcdFJfKGYgEAok9CWOIDjLTv8nughwa4/pdw
+EfWq162cGbpszdSqlf4A+wRKXkTbcd6g+VW2u2cU1iJnVsfYc26mKerT0fD/SZzK
+=igVi
 -----END PGP SIGNATURE-----
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"
 }