Version bump, update dependencies in 3.0.0 ebuilds

Package-Manager: portage-2.1.4_rc9

6 files changed, 148 insertions, 17 deletions

diff --git a/net-misc/nxnode/ChangeLog b/net-misc/nxnode/ChangeLog
index 5be9380d8050..081254981cca 100644
--- a/net-misc/nxnode/ChangeLog
+++ b/net-misc/nxnode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/nxnode
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/ChangeLog,v 1.18 2007/12/03 21:48:15 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/ChangeLog,v 1.19 2007/12/14 12:11:41 voyageur Exp $
+
+*nxnode-3.1.0 (14 Dec 2007)
+
+  14 Dec 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  nxnode-3.0.0-r3.ebuild, nxnode-3.0.0-r4.ebuild, +nxnode-3.1.0.ebuild:
+  Version bump, update dependencies in 3.0.0 ebuilds
 
 *nxnode-3.0.0-r4 (03 Dec 2007)
 
diff --git a/net-misc/nxnode/Manifest b/net-misc/nxnode/Manifest
index 5237bb93e34c..28101a98a04a 100644
--- a/net-misc/nxnode/Manifest
+++ b/net-misc/nxnode/Manifest
@@ -10,18 +10,24 @@ DIST nxnode-3.0.0-83.i386.tar.gz 6241477 RMD160 777edf612ff1f0eeae8517f67f536fd9
 DIST nxnode-3.0.0-83.x86_64.tar.gz 6918754 RMD160 9a013438bc0bb2b088b734c59805b574cdff178e SHA1 2bf8933fa524e704df845028c3e03da7323617c3 SHA256 5f584127969128501358dcc43cca4360841db47b5503447d6de9a30638176fa9
 DIST nxnode-3.0.0-93.i386.tar.gz 6283984 RMD160 b3018756dc02e4f213eda95522ccd1604c4347d5 SHA1 8a895f10e7332312368f7371b95104723d537032 SHA256 898d7d1e8d26331e251e0e186aba778890242d3485cd9607380297fa10090807
 DIST nxnode-3.0.0-93.x86_64.tar.gz 6963315 RMD160 c283c6563d621b4da0a4ce19cccbd311b337d23c SHA1 e2347b4aa774454bbfd94d20e6202927487ebd56 SHA256 4e592ded58033df0e9a59c8edc4f94fd0c02b02eb86c51407cb6371a0ce71023
-EBUILD nxnode-3.0.0-r3.ebuild 2954 RMD160 64a1ea9bffc51273ad77ebce52634d54240b97fc SHA1 0caae1eb6dafae0a091d67a293e9a7b1fd6a6c69 SHA256 d0e43bba17621eebd71887a22afaf3907ca97b3dec28fe2fe7bdadecff2be46c
-MD5 f66e4f21346d286f8e87a195d1c9efa6 nxnode-3.0.0-r3.ebuild 2954
-RMD160 64a1ea9bffc51273ad77ebce52634d54240b97fc nxnode-3.0.0-r3.ebuild 2954
-SHA256 d0e43bba17621eebd71887a22afaf3907ca97b3dec28fe2fe7bdadecff2be46c nxnode-3.0.0-r3.ebuild 2954
-EBUILD nxnode-3.0.0-r4.ebuild 3010 RMD160 c8b92b3c73e57a2635685468a36454db3c86dc98 SHA1 70a83bf55149193c4e36ad3e64dfdb24e9eba4fe SHA256 afe76cdd0312849bad5bf150b75ab8a9738f2369936b3ec3856726373c99bfe4
-MD5 fd31f2f58878541e1a40b33c4cfc1691 nxnode-3.0.0-r4.ebuild 3010
-RMD160 c8b92b3c73e57a2635685468a36454db3c86dc98 nxnode-3.0.0-r4.ebuild 3010
-SHA256 afe76cdd0312849bad5bf150b75ab8a9738f2369936b3ec3856726373c99bfe4 nxnode-3.0.0-r4.ebuild 3010
-MISC ChangeLog 2741 RMD160 0165ba407f613680baa961c6bd4a5cf37a3795e0 SHA1 2dbde71dade66375a9696093f61eb5bc9d304771 SHA256 49ba91943440581fe05afc115d893771a301b2eb2b83c4950303117ae03528ef
-MD5 07ca5e56b130198e9395be76dfc83fdf ChangeLog 2741
-RMD160 0165ba407f613680baa961c6bd4a5cf37a3795e0 ChangeLog 2741
-SHA256 49ba91943440581fe05afc115d893771a301b2eb2b83c4950303117ae03528ef ChangeLog 2741
+DIST nxnode-3.1.0-3.i386.tar.gz 6281225 RMD160 539fd4119ac9fb6575cd3aebe50defe9b966c62f SHA1 52b5e746fe02fafe712cd624822549de99ed4ad2 SHA256 cc87a7c2cf01b11300d0082ef2905c496055e959956dd8f610b41c7667fae708
+DIST nxnode-3.1.0-3.x86_64.tar.gz 6960343 RMD160 ab597de8862cb47ad8b808ae9d621d9b17c69a57 SHA1 a8356b75a79d7e81d476a1b2ddf35b1af88d6b6f SHA256 d2dad0c64583e85a8ee3d0b9f8e5a24d2afc220a8fc249815b59f211d015097b
+EBUILD nxnode-3.0.0-r3.ebuild 2961 RMD160 b620f07890b6f2ab4fa343770594d9f7657e1ec2 SHA1 2cabe596a8ffdf91fe61ffa9b53833435c63bf70 SHA256 29ed0b9c23c21273b991fdef4736e06071f4c6a2cb6d03054e77b3e80494276a
+MD5 557703dc719022f74b8c3019f82be885 nxnode-3.0.0-r3.ebuild 2961
+RMD160 b620f07890b6f2ab4fa343770594d9f7657e1ec2 nxnode-3.0.0-r3.ebuild 2961
+SHA256 29ed0b9c23c21273b991fdef4736e06071f4c6a2cb6d03054e77b3e80494276a nxnode-3.0.0-r3.ebuild 2961
+EBUILD nxnode-3.0.0-r4.ebuild 3012 RMD160 775bd115a7211470470cdeb58cfde04d7952796d SHA1 dfc41873bc00d68eaf1de0ae60232afb815af13d SHA256 cbe6569c42738b7e034ee46d18809c498f65c2d28a0537be9e4f45033ce5ead9
+MD5 e5758bb2f7775cc0bdd5545d79ef6eae nxnode-3.0.0-r4.ebuild 3012
+RMD160 775bd115a7211470470cdeb58cfde04d7952796d nxnode-3.0.0-r4.ebuild 3012
+SHA256 cbe6569c42738b7e034ee46d18809c498f65c2d28a0537be9e4f45033ce5ead9 nxnode-3.0.0-r4.ebuild 3012
+EBUILD nxnode-3.1.0.ebuild 3008 RMD160 96b41da39b5e911aadd104dfe928eb6af0120c0d SHA1 df33d961f11a9f70907e6cdfe7673267943a1118 SHA256 95981daf5e4c965001df94f753d1f4e45713569db8b8e8a1735c23a94bff1590
+MD5 7e7e6d801a9b03c14d3cc42797541a6d nxnode-3.1.0.ebuild 3008
+RMD160 96b41da39b5e911aadd104dfe928eb6af0120c0d nxnode-3.1.0.ebuild 3008
+SHA256 95981daf5e4c965001df94f753d1f4e45713569db8b8e8a1735c23a94bff1590 nxnode-3.1.0.ebuild 3008
+MISC ChangeLog 2951 RMD160 47a50e4631f9081b2dc88124cdad6f3dedf27370 SHA1 017a11e4a12ad27dd7202ac7e82a38624baa8878 SHA256 06e7574a2031dcc5e3e2dd24ca80efa3b6d2f21a7beb8cf27ee15e2424a2d557
+MD5 5a3262994a6c5ef07bc19dbb0ca1bd66 ChangeLog 2951
+RMD160 47a50e4631f9081b2dc88124cdad6f3dedf27370 ChangeLog 2951
+SHA256 06e7574a2031dcc5e3e2dd24ca80efa3b6d2f21a7beb8cf27ee15e2424a2d557 ChangeLog 2951
 MISC metadata.xml 264 RMD160 3b4f53808aa9f3ce8bf86bdc8e08bda3fc181219 SHA1 89e785afdbf6b2c6968649c91dc17910066728eb SHA256 3eaf6b268d16ec374617534bf70f0e96d2c6399ca1b0d4ffa3eeee619d775171
 MD5 f90b3b63a5eb737fdf7e3a0470f6488d metadata.xml 264
 RMD160 3b4f53808aa9f3ce8bf86bdc8e08bda3fc181219 metadata.xml 264
@@ -32,3 +38,6 @@ SHA256 9a3bd6e7f1e3003e4fcd6f4905952f1d496f9004880e12fd786ef43ab557e5dc files/di
 MD5 a4588f3c11527727015832aaa9984f4f files/digest-nxnode-3.0.0-r4 536
 RMD160 064205f9fa439cebd4e66c5f1817c2c0bd99b044 files/digest-nxnode-3.0.0-r4 536
 SHA256 f1ff2666bfeabe0a004d525e0dbfa481dba16ddbb0942b72c523fe10348b205a files/digest-nxnode-3.0.0-r4 536
+MD5 2c7f2cc1f8b685ea4b7b44d6ca670fdc files/digest-nxnode-3.1.0 530
+RMD160 3f9025ed4d38880157fac80cfc5970c52bda7de4 files/digest-nxnode-3.1.0 530
+SHA256 7e44cf3dbf14927ddcb505544760f4df28890419c1c0b52e02292f9a05fb3ef1 files/digest-nxnode-3.1.0 530
diff --git a/net-misc/nxnode/files/digest-nxnode-3.1.0 b/net-misc/nxnode/files/digest-nxnode-3.1.0
new file mode 100644
index 000000000000..b78d296af5d0
--- /dev/null
+++ b/net-misc/nxnode/files/digest-nxnode-3.1.0
@@ -0,0 +1,6 @@
+MD5 ceda9e41b3a62fb964929fccbb159b8e nxnode-3.1.0-3.i386.tar.gz 6281225
+RMD160 539fd4119ac9fb6575cd3aebe50defe9b966c62f nxnode-3.1.0-3.i386.tar.gz 6281225
+SHA256 cc87a7c2cf01b11300d0082ef2905c496055e959956dd8f610b41c7667fae708 nxnode-3.1.0-3.i386.tar.gz 6281225
+MD5 ea3da35852b8cbdb2f75fcc3dc88a2ec nxnode-3.1.0-3.x86_64.tar.gz 6960343
+RMD160 ab597de8862cb47ad8b808ae9d621d9b17c69a57 nxnode-3.1.0-3.x86_64.tar.gz 6960343
+SHA256 d2dad0c64583e85a8ee3d0b9f8e5a24d2afc220a8fc249815b59f211d015097b nxnode-3.1.0-3.x86_64.tar.gz 6960343
diff --git a/net-misc/nxnode/nxnode-3.0.0-r3.ebuild b/net-misc/nxnode/nxnode-3.0.0-r3.ebuild
index a61095ed924b..6413adee95e4 100644
--- a/net-misc/nxnode/nxnode-3.0.0-r3.ebuild
+++ b/net-misc/nxnode/nxnode-3.0.0-r3.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/nxnode/nxnode-3.0.0-r3.ebuild,v 1.3 2007/09/20 14:51:02 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/nxnode-3.0.0-r3.ebuild,v 1.4 2007/12/14 12:11:41 voyageur Exp $
 
 inherit eutils
 
@@ -18,7 +18,7 @@ RESTRICT="strip"
 DEPEND="!net-misc/nxserver-freenx
 	!<net-misc/nxserver-freeedition-3.0.0"
 
-RDEPEND="=net-misc/nxclient-3*
+RDEPEND="=net-misc/nxclient-3.0*
 	x11-libs/libICE
 	x11-libs/libXmu
 	x11-libs/libSM
diff --git a/net-misc/nxnode/nxnode-3.0.0-r4.ebuild b/net-misc/nxnode/nxnode-3.0.0-r4.ebuild
index 53913e8b126f..e4c7dea4154c 100644
--- a/net-misc/nxnode/nxnode-3.0.0-r4.ebuild
+++ b/net-misc/nxnode/nxnode-3.0.0-r4.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/nxnode/nxnode-3.0.0-r4.ebuild,v 1.1 2007/12/03 21:48:15 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/nxnode-3.0.0-r4.ebuild,v 1.2 2007/12/14 12:11:41 voyageur Exp $
 
 inherit eutils
 
@@ -19,7 +19,7 @@ RESTRICT="strip"
 DEPEND="!net-misc/nxserver-freenx
 	!<net-misc/nxserver-freeedition-3.0.0"
 
-RDEPEND="=net-misc/nxclient-3*
+RDEPEND="=net-misc/nxclient-3.0*
 	x11-libs/libICE
 	x11-libs/libXmu
 	x11-libs/libSM
diff --git a/net-misc/nxnode/nxnode-3.1.0.ebuild b/net-misc/nxnode/nxnode-3.1.0.ebuild
new file mode 100644
index 000000000000..e63f68546140
--- /dev/null
+++ b/net-misc/nxnode/nxnode-3.1.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/nxnode-3.1.0.ebuild,v 1.1 2007/12/14 12:11:41 voyageur Exp $
+
+inherit eutils
+
+MY_PV="${PV}-3"
+DESCRIPTION="nxnode provides the components that are shared between the different editions of NoMachine's NX Server"
+HOMEPAGE="http://www.nomachine.com/"
+SRC_URI="amd64? ( http://64.34.161.181/download/${PV}/Linux/nxnode-${MY_PV}.x86_64.tar.gz )
+	x86? ( http://64.34.161.181/download/${PV}/Linux/nxnode-${MY_PV}.i386.tar.gz )"
+
+LICENSE="nomachine"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="rdesktop vnc"
+RESTRICT="strip"
+
+DEPEND="!net-misc/nxserver-freenx
+	!<net-misc/nxserver-freeedition-3.0.0"
+
+RDEPEND="=net-misc/nxclient-3.1*
+	x11-libs/libICE
+	x11-libs/libXmu
+	x11-libs/libSM
+	x11-libs/libXt
+	x11-libs/libXaw
+	x11-libs/libXpm
+	x11-apps/xrdb
+	rdesktop? ( net-misc/rdesktop )
+	vnc? ( || ( net-misc/vnc net-misc/tightvnc ) )"
+
+S=${WORKDIR}/NX
+
+pkg_setup() {
+	if use vnc; then
+		if has_version net-misc/vnc && ! built_with_use net-misc/vnc server;
+		then
+			die "net-misc/vnc needs to be built with USE=\"server\" for VNC support"
+		fi
+
+		if has_version net-misc/tightvnc && ! built_with_use net-misc/tightvnc server;
+		then
+			die "net-misc/tightvnc needs to be built with USE=\"server\" for VNC support"
+		fi
+	fi
+}
+
+src_unpack()
+{
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/nxnode-3.0.0-setup.patch
+}
+
+src_install()
+{
+	# we install nxnode into /usr/NX, to make sure it doesn't clash
+	# with libraries installed for FreeNX
+
+	into /usr/NX
+	for x in nxagent nxnode nxsensor nxspool nxuexec ; do
+		dobin bin/$x
+	done
+
+	dodir /usr/NX/etc
+	cp etc/node-debian.cfg.sample "${D}"/usr/NX/etc/node-gentoo.cfg.sample || die
+	sed -e 's|COMMAND_FUSER = .*|COMMAND_FUSER = "/usr/bin/fuser"|;' -i "${D}"/usr/NX/etc/node-gentoo.cfg.sample || die
+	cp etc/node.lic.sample "${D}"/usr/NX/etc/node.lic.sample || die
+
+	dodir /usr/NX/lib
+	cp -R lib "${D}"/usr/NX || die
+
+	dodir /usr/NX/scripts
+	cp -R scripts "${D}"/usr/NX || die
+
+	dodir /usr/NX/share
+	cp -R share "${D}"/usr/NX || die
+
+	dodir /usr/NX/var
+	cp -R var "${D}"/usr/NX || die
+
+	dodir /etc/init.d
+	newinitd "${FILESDIR}"/nxnode-3.0.0-init nxsensor
+}
+
+pkg_postinst()
+{
+	# Only install license file if none is found
+	if [ ! -f /usr/NX/etc/node.lic ]; then
+		cp "${ROOT}"/usr/NX/etc/node.lic.sample "${ROOT}"/usr/NX/etc/node.lic || die
+		chmod 0400 "${ROOT}"/usr/NX/etc/node.lic
+		chown nx:root "${ROOT}"/usr/NX/etc/node.lic
+	fi
+
+	# only run install on the first time
+	if [ -f /usr/NX/etc/node.cfg ]; then
+		einfo "Running NoMachine's update script"
+		"${ROOT}"/usr/NX/scripts/setup/nxnode --update
+	else
+		einfo "Running NoMachine's setup script"
+		"${ROOT}"/usr/NX/scripts/setup/nxnode --install
+	fi
+
+	elog "If you want server statistics, please add nxsensor to your default runlevel"
+	elog
+	elog "  rc-update add nxsensor default"
+	elog
+	elog "You will also need to change EnableSensor to 1 in /usr/NX/etc/node.cfg"
+}