Gentoo Archives: gentoo-commits

From: "Bernard Cafarelli (voyageur)" <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/nxserver-freeedition: nxserver-freeedition-3.5.0.9.ebuild ChangeLog nxserver-freeedition-3.5.0.11.ebuild nxserver-freeedition-3.5.0.5.ebuild nxserver-freeedition-3.5.0.8.ebuild
Date: Thu, 07 Jun 2012 22:51:53
Message-Id: 20120607225144.84CA12004B@flycatcher.gentoo.org
voyageur    12/06/07 22:51:44

  Modified:             nxserver-freeedition-3.5.0.9.ebuild ChangeLog
                        nxserver-freeedition-3.5.0.5.ebuild
  Added:                nxserver-freeedition-3.5.0.11.ebuild
  Removed:              nxserver-freeedition-3.5.0.8.ebuild
  Log:
  Maintenance release bump, mostly fixes for newer cairo support. Inherit user eclass
  
  (Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.9.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.9.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.9.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.9.ebuild?r1=1.1&r2=1.2

Index: nxserver-freeedition-3.5.0.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.9.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nxserver-freeedition-3.5.0.9.ebuild	4 Nov 2011 15:38:44 -0000	1.1
+++ nxserver-freeedition-3.5.0.9.ebuild	7 Jun 2012 22:51:44 -0000	1.2
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.9.ebuild,v 1.1 2011/11/04 15:38:44 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.9.ebuild,v 1.2 2012/06/07 22:51:44 voyageur Exp $
 
 EAPI=2
-inherit eutils versionator
+inherit eutils user versionator
 
 MAJOR_PV="$(get_version_component_range 1-3)"
 FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)"



1.59                 net-misc/nxserver-freeedition/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog?rev=1.59&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog?rev=1.59&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog?r1=1.58&r2=1.59

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ChangeLog	4 Nov 2011 15:38:44 -0000	1.58
+++ ChangeLog	7 Jun 2012 22:51:44 -0000	1.59
@@ -1,6 +1,18 @@
 # ChangeLog for net-misc/nxserver-freeedition
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.58 2011/11/04 15:38:44 voyageur Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.59 2012/06/07 22:51:44 voyageur Exp $
+
+  07 Jun 2012; Bernard Cafarelli <voyageur@g.o>
+  nxserver-freeedition-3.5.0.5.ebuild, -nxserver-freeedition-3.5.0.8.ebuild,
+  nxserver-freeedition-3.5.0.9.ebuild, +nxserver-freeedition-3.5.0.11.ebuild:
+  Maintenance release bump, mostly fixes for newer cairo support. Inherit user
+  eclass
+
+*nxserver-freeedition-3.5.0.11 (07 Jun 2012)
+
+  07 Jun 2012; Bernard Cafarelli <voyageur@g.o>
+  +nxserver-freeedition-3.5.0.11.ebuild:
+  Maintenance release bump, mostly fixes for newer cairo support
 
 *nxserver-freeedition-3.5.0.9 (04 Nov 2011)
 



1.4                  net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.5.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.5.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.5.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.5.ebuild?r1=1.3&r2=1.4

Index: nxserver-freeedition-3.5.0.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.5.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nxserver-freeedition-3.5.0.5.ebuild	23 Aug 2011 17:26:18 -0000	1.3
+++ nxserver-freeedition-3.5.0.5.ebuild	7 Jun 2012 22:51:44 -0000	1.4
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.5.ebuild,v 1.3 2011/08/23 17:26:18 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.5.ebuild,v 1.4 2012/06/07 22:51:44 voyageur Exp $
 
 EAPI=2
-inherit eutils versionator
+inherit eutils user versionator
 
 MAJOR_PV="$(get_version_component_range 1-3)"
 FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)"



1.1                  net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.11.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.11.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.11.ebuild?rev=1.1&content-type=text/plain

Index: nxserver-freeedition-3.5.0.11.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.11.ebuild,v 1.1 2012/06/07 22:51:44 voyageur Exp $

EAPI=4

inherit eutils user versionator

MAJOR_PV="$(get_version_component_range 1-3)"
FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)"
DESCRIPTION="Free edition NX server from NoMachine"
HOMEPAGE="http://www.nomachine.com/"
SRC_URI="amd64? ( http://64.34.161.181/download/${MAJOR_PV}/Linux/FE/nxserver-${FULL_PV}.x86_64.tar.gz )
	x86? ( http://64.34.161.181/download/${MAJOR_PV}/Linux/FE/nxserver-${FULL_PV}.i386.tar.gz )"

LICENSE="nomachine"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
IUSE=""
RESTRICT="strip"

DEPEND="=net-misc/nxnode-${MAJOR_PV}*"
RDEPEND="${DEPEND}
	media-fonts/font-misc-misc
	media-fonts/font-cursor-misc
	x11-apps/xauth
	x11-apps/xhost"

S="${WORKDIR}"/NX

pkg_preinst() {
	enewuser nx -1 -1 /usr/NX/home/nx
}

src_prepare() {
	epatch "${FILESDIR}"/nxserver-3.0.0-r4-setup.patch
	epatch "${FILESDIR}"/nxserver-3.3.0-dontupdatekeys.patch
}

src_install() {
	# we install nxserver into /usr/NX, to make sure it doesn't clash
	# with libraries installed for FreeNX

	into /usr/NX
	dobin bin/nxserver

	dodir /usr/NX/etc/keys
	insinto /usr/NX/etc
	doins etc/administrators.db.sample
	doins etc/guests.db.sample
	doins etc/passwords.db.sample
	doins etc/profiles.db.sample
	doins etc/users.db.sample
	doins etc/server.lic.sample

	newins etc/server-debian.cfg.sample server-gentoo.cfg.sample

	cp -R home "${D}"/usr/NX || die "Unable to install home folder"
	cp -R lib "${D}"/usr/NX || die "Unable to install lib folder"
	cp -R scripts "${D}"/usr/NX || die "Unable to install scripts folder"
	cp -R share "${D}"/usr/NX || die "Unable to install share folder"
	cp -R var "${D}"/usr/NX || die "Unable to install var folder"

	newinitd "${FILESDIR}"/nxserver-2.1.0-init nxserver
}

pkg_postinst () {
	# Other NX servers ebuilds may have already created the nx account
	# However they use different login shell/home directory paths
	if [[ ${ROOT} == "/" ]]; then
		usermod -s /usr/NX/bin/nxserver nx || die "Unable to set login shell of nx user!!"
		usermod -d /usr/NX/home/nx nx || die "Unable to set home directory of nx user!!"
	else
		elog "If you had another NX server installed before, please make sure"
		elog "the nx user account is correctly set to:"
		elog " * login shell: /usr/NX/bin/nxserver"
		elog " * home directory: /usr/NX/home/nx"
	fi

	# only run install when no configuration file is found
	if [ -f /usr/NX/etc/server.cfg ]; then
		einfo "Running NoMachine's update script"
		"${ROOT}"/usr/NX/scripts/setup/nxserver --update || die "Update script failed"
	else
		einfo "Running NoMachine's setup script"
		"${ROOT}"/usr/NX/scripts/setup/nxserver --install || die "Installation script failed"
	fi

	if ! has_version net-misc/openssh[pam]; then
		elog ""
		elog "net-misc/openssh was not built with PAM support"
		elog "You will need to unlock the nx account by setting a password for it"
	fi

	elog "Remember to add nxserver to your default runlevel"
}