Fix cups backend detection, patch by Bruno Redondi <bruno.redondi@ngi.it> in bug #341871

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

4 files changed, 126 insertions, 2 deletions

diff --git a/net-misc/nxnode/ChangeLog b/net-misc/nxnode/ChangeLog
index 1f6696214c87..d71dddf8bda7 100644
--- a/net-misc/nxnode/ChangeLog
+++ b/net-misc/nxnode/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/nxnode
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/ChangeLog,v 1.60 2011/02/10 13:09:15 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/ChangeLog,v 1.61 2011/03/13 23:20:03 voyageur Exp $
+
+*nxnode-3.4.0.16-r1 (13 Mar 2011)
+
+  13 Mar 2011; Bernard Cafarelli <voyageur@gentoo.org>
+  +nxnode-3.4.0.16-r1.ebuild, +files/nxnode-3.4.0-cups_path.patch:
+  Fix cups backend detection, patch by Bruno Redondi <bruno.redondi@ngi.it> in
+  bug #341871
 
 *nxnode-3.4.0.16 (10 Feb 2011)
 
diff --git a/net-misc/nxnode/Manifest b/net-misc/nxnode/Manifest
index c0907f062969..7890af34b0a1 100644
--- a/net-misc/nxnode/Manifest
+++ b/net-misc/nxnode/Manifest
@@ -1,5 +1,6 @@
 AUX nxnode-3.0.0-init 1344 RMD160 fc4c8ed911bf79634537f0567f374688791f482d SHA1 78a9e356c053e1ece469332dd016a0efe425595f SHA256 d0da14f4dac0b3c325086a5b4b1929456681822011b0996d48cee5265e10cce5
 AUX nxnode-3.0.0-setup.patch 1353 RMD160 85c7938126000b10fa6e05aa5501e2affc6d0ec6 SHA1 4d12a2857db5a6d073ceab88bb2e58d0ee93a322 SHA256 04dccdc5eb73df861995e866c0875496b3b893ab43caaa8bdd854a69a74ae17a
+AUX nxnode-3.4.0-cups_path.patch 528 RMD160 d9c6c79d9f4f3c9826b58d4a26081890f96d7e79 SHA1 26f025f2d0cc5753e9fa3e1d37bf909f7091d031 SHA256 17bb5f2636de1ba5550fca8811f877c743ffaba9c5db20a1ce613aec8d5a3587
 AUX nxnode-3.4.0-setup.patch 1874 RMD160 c2f45dbaeb887fb31fad7ed7aa2753bcb1b4c917 SHA1 defb17240346284ae47a633c567728efa3ddfa7a SHA256 d5812c14ac593c9d8a337d12aacb329a59fc6b2c126aaa42107a9ff70cff562b
 DIST nxnode-3.4.0-14.i386.tar.gz 5966508 RMD160 98d0ed7dc093a0b0df5efe20efbb21f3fd5e17d7 SHA1 c5d18aa6e3759e954e9a2d52e22a6e60761bc806 SHA256 f1acfb659709e108bf398ce59c1d506fac55a2e6b9582a3de56a9ebe665cbd4d
 DIST nxnode-3.4.0-14.x86_64.tar.gz 6662999 RMD160 f1b6b52e9eda6fb8924bb89b85c6a570551dc7bb SHA1 bb8306095a52e366ed96d90a007373da4b2a76b7 SHA256 4271bcc256dd006b114139a5234cc556248511948cac89ca02a668e81442960d
@@ -8,7 +9,8 @@ DIST nxnode-3.4.0-16.x86_64.tar.gz 6668113 RMD160 27b2a5514710982d2641ae40506f03
 DIST nxnode-3.4.0-6.i386.tar.gz 5927490 RMD160 741e3052caad883fb9a316a17896702f49f0ad02 SHA1 63c567fd727c47ac33810a98bf14164607360d03 SHA256 46f05deebab3cdc571be3bb93dd4f7e02498391bf05f58c3ccc65a371c8eadeb
 DIST nxnode-3.4.0-6.x86_64.tar.gz 6619533 RMD160 066546cccced079390d2847a37f42de6c03c4630 SHA1 d3a82497dd0343f8a67888e34caa4b76d2c87b84 SHA256 8b7a0df68d1065f0e2b961886f7e29de2e06c225b5711fcbeffa226ca68ae8ce
 EBUILD nxnode-3.4.0.14.ebuild 2789 RMD160 164663f70f623081ee9e02aaf24c2f625f514a2c SHA1 d1719dbca52739baebc91bd4b2d6f23fc4302ab7 SHA256 ed7bde02db3f18a79ee7405d930b5a84ba66c87179b490ec95a3621bbcdbde8a
+EBUILD nxnode-3.4.0.16-r1.ebuild 2843 RMD160 990a47b4c5b0eb16beeabce1e83d8bd98024385a SHA1 dd8bc5ddb00e9e40f14133b72ae77eb7617b38e4 SHA256 fc31c145991efc9ca616d9c41b65724bac02520968515b4ba3dd281a2267f3a6
 EBUILD nxnode-3.4.0.16.ebuild 2789 RMD160 4bfe6ea8e9b16ee8ce95d806786f146922ec4da7 SHA1 9f3371d196b6637637c6f967228b3bfd9927ff64 SHA256 b328deef4b90a846b924dd361f44fef4bf885da791bfe6011ceb3ee9d9112eb0
 EBUILD nxnode-3.4.0.6.ebuild 2780 RMD160 01fabc95defb6958181fad5d505bb2c33f953a85 SHA1 085081fec99501469858dd1ee0e5571ceeb669d1 SHA256 bd1ab1f6d741034c7eee6543acaf1ad43697d1ebfd7d36a9d391cfc1c94bf1f5
-MISC ChangeLog 9421 RMD160 0ff3dc8bdf409dce4eb39ac2164674412e174c68 SHA1 24872fd1c0e7c7475d731f71236a8763bde75731 SHA256 e5356bae57342de74d96e46ecd7317a453ffb4a8e3848a3000e07d81096fe2f7
+MISC ChangeLog 9672 RMD160 4c1de816a0f71c16e096d350c8d46273c37193e8 SHA1 07407c4f613cc5d15cbf1fee3cadf03794163dc5 SHA256 00c4720c37d1aa6147898a7c99f2ecf9102f1869022586d4424db6346d1ee42e
 MISC metadata.xml 264 RMD160 3b4f53808aa9f3ce8bf86bdc8e08bda3fc181219 SHA1 89e785afdbf6b2c6968649c91dc17910066728eb SHA256 3eaf6b268d16ec374617534bf70f0e96d2c6399ca1b0d4ffa3eeee619d775171
diff --git a/net-misc/nxnode/files/nxnode-3.4.0-cups_path.patch b/net-misc/nxnode/files/nxnode-3.4.0-cups_path.patch
new file mode 100644
index 000000000000..a4a3822ad402
--- /dev/null
+++ b/net-misc/nxnode/files/nxnode-3.4.0-cups_path.patch
@@ -0,0 +1,12 @@
+diff -ruN NX~/scripts/setup/nxnode NX/scripts/setup/nxnode
+--- NX~/scripts/setup/nxnode	2010-08-04 12:34:28.000000000 +0200
++++ NX/scripts/setup/nxnode	2010-10-20 12:34:05.418016564 +0200
+@@ -25,7 +25,7 @@
+ 
+ WRAPPER="$NODE_ROOT/bin/nxuexec"
+ 
+-CUPS_PATH="/usr /opt/sfw/cups /usr/local /usr/lib /opt/csw"
++CUPS_PATH="/usr /opt/sfw/cups /usr/local /usr/lib /opt/csw /usr/libexec"
+ SMB_PATH="/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin"
+ CUPS_CERTS_DIR="/var/run/cups/certs /var/lib/cups/certs /etc/cups/certs"
+ 
diff --git a/net-misc/nxnode/nxnode-3.4.0.16-r1.ebuild b/net-misc/nxnode/nxnode-3.4.0.16-r1.ebuild
new file mode 100644
index 000000000000..37a98a3566b4
--- /dev/null
+++ b/net-misc/nxnode/nxnode-3.4.0.16-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/nxnode-3.4.0.16-r1.ebuild,v 1.1 2011/03/13 23:20:03 voyageur Exp $
+
+EAPI="2"
+
+inherit eutils versionator
+
+MAJOR_PV="$(get_version_component_range 1-3)"
+FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)"
+DESCRIPTION="shared components between the different editions of NoMachine's NX Servers"
+HOMEPAGE="http://www.nomachine.com/"
+SRC_URI="amd64? ( http://64.34.161.181/download/${MAJOR_PV}/Linux/nxnode-${FULL_PV}.x86_64.tar.gz )
+	x86? ( http://64.34.161.181/download/${MAJOR_PV}/Linux/nxnode-${FULL_PV}.i386.tar.gz )"
+
+LICENSE="nomachine"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="rdesktop vnc"
+RESTRICT="strip"
+
+DEPEND="!<net-misc/nxserver-freeedition-3.0.0"
+RDEPEND="=net-misc/nxclient-${MAJOR_PV}*[cups]
+	sys-process/lsof
+	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? ( x11-misc/x11vnc
+		   || ( net-misc/tightvnc net-misc/vnc ) )"
+
+S=${WORKDIR}/NX
+
+pkg_preinst()
+{
+	enewuser nx -1 -1 /usr/NX/home/nx
+}
+
+src_prepare()
+{
+	epatch "${FILESDIR}"/nxnode-3.4.0-setup.patch
+	epatch "${FILESDIR}"/nxnode-3.4.0-cups_path.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:0 "${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"
+}