Fix jobserver unavailable QA notice, patch by Myckel Habets <myckel@sdf.lonestar.org> in bug #314873

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 22 insertions, 120 deletions

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index 68cae9552037..681120204345 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.71 2010/04/26 10:58:17 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.72 2010/05/09 19:24:17 voyageur Exp $
+
+  09 May 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  -nxserver-freenx-0.7.3_p104-r3.ebuild,
+  nxserver-freenx-0.7.3_p104-r4.ebuild,
+  +files/nxserver-freenx-0.7.3_p104-jobserver_fix.patch:
+  Fix jobserver unavailable QA notice, patch by Myckel Habets
+  <myckel@sdf.lonestar.org> in bug #314873
 
   26 Apr 2010; Christian Faulhammer <fauli@gentoo.org>
   nxserver-freenx-0.7.3_p104-r4.ebuild:
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-jobserver_fix.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-jobserver_fix.patch
new file mode 100644
index 000000000000..385f96a83ee9
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-jobserver_fix.patch
@@ -0,0 +1,12 @@
+diff -ru freenx-server_orig/Makefile freenx-server/Makefile
+--- freenx-server_orig/Makefile	2009-03-29 14:07:27.000000000 +0200
++++ freenx-server/Makefile	2010-05-09 09:18:36.000000000 +0200
+@@ -6,7 +6,7 @@
+ PROGRAMS=nxacl.sample nxcheckload.sample nxcups-gethost nxdesktop_helper nxdialog nxkeygen nxloadconfig nxnode nxnode-login nxprint nxserver nxserver-helper/nxserver-helper nxsetup nxviewer_helper nxviewer-passwd/nxpasswd/nxpasswd nx-session-launcher/nx-session-launcher nx-session-launcher/nx-session-launcher-suid nxserver-usermode nxserver-suid/nxserver-suid
+ 
+ all:
+-	cd nxviewer-passwd && xmkmf && make Makefiles && make depend
++	cd nxviewer-passwd && xmkmf && $(MAKE) Makefiles && $(MAKE) depend
+ 	source nxloadconfig &&\
+ 	export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION NX_ETC_DIR &&\
+ 	for i in $(SUBDIRS) ; \
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r3.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r3.ebuild
deleted file mode 100644
index 637225eb3116..000000000000
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2010 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-r3.ebuild,v 1.2 2010/04/11 18:51:54 voyageur Exp $
-
-EAPI=2
-
-inherit multilib eutils toolchain-funcs versionator
-
-MAJOR_PV="$(get_version_component_range 1-3)"
-PATCH_VER="$(get_version_component_range 4)"
-MY_PN="freenx-server"
-
-DESCRIPTION="Free Software Implementation of the NX Server"
-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"
-IUSE="+nxclient rdesktop vnc"
-
-DEPEND="x11-misc/gccmakedep
-	x11-misc/imake"
-RDEPEND="dev-tcltk/expect
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc
-	net-analyzer/gnu-netcat
-	<net-misc/nx-3.4.0
-	sys-apps/gawk
-	virtual/ssh
-	x11-apps/xauth
-	x11-apps/xrdb
-	x11-apps/sessreg
-	nxclient? ( net-misc/nxclient )
-	!nxclient? ( !net-misc/nxclient
-				 || ( x11-misc/xdialog
-					  x11-apps/xmessage ) )
-	rdesktop? ( net-misc/rdesktop )
-	vnc? ( x11-misc/x11vnc
-		   || ( net-misc/tightvnc net-misc/vnc ) )"
-
-S=${WORKDIR}/${MY_PN}
-
-export NX_HOME_DIR=/var/lib/nxserver/home
-
-pkg_setup () {
-	enewuser nx -1 -1 ${NX_HOME_DIR}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-pam_ssh.patch
-	epatch "${FILESDIR}"/${P}-nxnode_setup_samba.patch
-	epatch "${FILESDIR}"/${P}-nxloadconfig.patch
-	epatch "${FILESDIR}"/${PN}-0.7.3_p102-cflags.patch
-	epatch "${FILESDIR}"/${PN}-0.7.2-cups.patch
-
-	sed	-e "/PATH_LIB=/s/lib/$(get_libdir)/g" \
-		-e "s#REAL_PATH_LIB#/usr/$(get_libdir)/NX/bin#" \
-		-i nxloadconfig || die "nxloadconfig sed failed"
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CDEBUGFLAGS="${CFLAGS}" || die "compilation failed"
-}
-
-src_install() {
-	export NX_ETC_DIR=/etc/nxserver
-	export NX_SESS_DIR=/var/lib/nxserver/db
-
-	emake DESTDIR="${D}" install || die "install failed"
-
-	# This should be renamed to remove the blocker on net-misc/nxclient
-	use nxclient && rm "${D}"/usr/bin/nxprint
-
-	mv "${D}"/etc/nxserver/node.conf.sample "${D}"/etc/nxserver/node.conf ||
-		die "cannot find default configuration file"
-
-	dodir ${NX_ETC_DIR}
-	for x in passwords passwords.orig ; do
-		touch "${D}"${NX_ETC_DIR}/$x
-		chmod 600 "${D}"${NX_ETC_DIR}/$x
-	done
-
-	dodir ${NX_HOME_DIR}
-
-	for x in closed running failed ; do
-		keepdir ${NX_SESS_DIR}/$x
-		fperms 0700 ${NX_SESS_DIR}/$x
-	done
-
-	newinitd "${FILESDIR}"/nxserver.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/bin/nxserver nx || die "Unable to set login shell of nx user!!"
-		usermod -d ${NX_HOME_DIR} nx || die "Unable to set home directory of nx user!!"
-		usermod -a -G utmp nx || die "Unable to add nx user to utmp group!!"
-	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/bin/nxserver"
-		elog " * home directory: ${NX_HOME_DIR}"
-		elog " * supplementary groups: utmp"
-	fi
-
-	elog "To complete the installation, run:"
-	elog " nxsetup --install --setup-nomachine-key"
-	elog "This will use the default Nomachine SSH key"
-	elog "If you had older NX servers installed, you may need to add \"--clean --purge\" to the nxsetup command"
-
-	if ! built_with_use 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
-}
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-r4.ebuild
index c537b8a55551..a032a743c50b 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-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.2 2010/04/26 10:58:17 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r4.ebuild,v 1.3 2010/05/09 19:24:17 voyageur Exp $
 
 EAPI=2
 
@@ -52,6 +52,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-nxloadconfig.patch
 	epatch "${FILESDIR}"/${PN}-0.7.3_p102-cflags.patch
 	epatch "${FILESDIR}"/${PN}-0.7.2-cups.patch
+	epatch "${FILESDIR}"/${P}-jobserver_fix.patch
 
 	# Path to net-misc/nx files, support for nx 3.4.0
 	sed	-e "/PATH_LIB=/s/lib/$(get_libdir)/g" \