[QA] Revision bump. EAPI 5. Prefix support. Respect user's CC, CFLAGS and LDFLAGS and other QA issues with a newer patch. Sorted some dependencies. Fixes bug #246819, filed by Peter Volkov (pva).

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 192 insertions, 11 deletions

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index 0f9bf5220684..f2a22ce10677 100644
--- a/net-misc/nxserver-freenx/ChangeLog
+++ b/net-misc/nxserver-freenx/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/nxserver-freenx
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.82 2013/03/02 22:55:17 ottxor Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.83 2014/04/09 12:44:37 tomwij Exp $
+
+*nxserver-freenx-0.7.3_p104-r7 (09 Apr 2014)
+
+  09 Apr 2014; Tom Wijsman <TomWij@gentoo.org>
+  +files/nxserver-freenx-0.7.3_p104-r7-QA-fixes.patch,
+  +nxserver-freenx-0.7.3_p104-r7.ebuild:
+  [QA] Revision bump. EAPI 5. Prefix support. Respect user's CC, CFLAGS and
+  LDFLAGS and other QA issues with a newer patch. Sorted some dependencies.
+  Fixes bug #246819, filed by Peter Volkov (pva).
 
   02 Mar 2013; Christoph Junghans <ottxor@gentoo.org>
   nxserver-freenx-0.7.3_p104-r6.ebuild:
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index 31e44bc9e03b..f6ac8f5fdb7b 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -8,19 +8,21 @@ AUX nxserver-freenx-0.7.3_p104-md5sum.patch 931 SHA256 57f87c221e76380340856a077
 AUX nxserver-freenx-0.7.3_p104-nxloadconfig.patch 2127 SHA256 82bb31a23fff5b5a4333a0a8703d39c7375ffba7db0b261de2e44241e6de96bf SHA512 4e4e6e0b08b891cd613fd6f7a75f4bd20a624e8f85817c269c3d3dd845da51a6873128c9ae1b646bf7d24161964b63bd5d4737f75ac21b7b692449c878d89827 WHIRLPOOL 713131fcb64586aeb713f0a94ec9f1cb2c03ac0c425f070fc573f196f4e03032e38393dbc12586d93b332cdede26c0ecc93b7f094af1cb6efcf7fb2f11f71217
 AUX nxserver-freenx-0.7.3_p104-nxnode_setup_samba.patch 2709 SHA256 ccc3464e6ae44353f98dda81b2ab8cd6fec2d8994586f6991ec823f9ea5ed658 SHA512 63c362262a0fe51db3c300ac76295d162b8d9a005d53da3233411fa5fa5d9179b702077524f3dc23c5a166a5a7f70e1267608fcc5d54a7a21294488f6952b79f WHIRLPOOL ef634c1f2c0770c0dbc75e508a99d4d943b1fd1491e7d422eedbdb3eef21ee4af892ecc4e3bf0c1f6fd10d75ac1b4460a56fc871b66860107b1d8afd6de79ac7
 AUX nxserver-freenx-0.7.3_p104-pam_ssh.patch 441 SHA256 854d17b3656ac2382d84b32ed9de893b291217648f08f1f496e3d09a32b8d857 SHA512 4cf292a3b5d7caa526536da99a389573373e835572f1ecea29725aa7cab35debe774fa169cd41712314d51007036eaeb75e539d22ffa73593def76da132afef6 WHIRLPOOL 5631109eb067e981b011a0e3cdd7243fabd337cbb6c8a6c1cd0e0ea376f3bf20d51aeee9966fe0434e43a416959d3523a0654ee8912cf49621d43ff85d974182
+AUX nxserver-freenx-0.7.3_p104-r7-QA-fixes.patch 1190 SHA256 1a6327bb595a2734377254e4c82d33090ab47d47fbb3b4e91267c020ba8ee594 SHA512 7148edfb31effd1a5bf2a76e46a2d746e060a9f40d98cd76ef5a7fda92608ab641f359c0d28fbf9f53f1488be693b3b4405acd61b6bc1ffbbabfd0a07c593991 WHIRLPOOL d20af3b7119d7c89c70af861a2ed1f2aa0daa2675f4ce004b7798a6308eedd9685fef27a8391c6112c5f0f10fa9745d0b743e07830275955d59018a9ba04379d
 AUX nxserver.init 568 SHA256 eda452183da56f6ef5730f1f9e7c968c462b2d3ad31c58ed6100d90c7533c4f2 SHA512 adca8d9eca173e64c426bc7bb2df63f8b22111c6ba560b7a8a2f51ee9738eb7f33976bd26a3c9685c44d7faaeca8874d547605c77aa14663fb122ab00408fc3c WHIRLPOOL f84430aabee263c5c2662ff77e0e053ac0159c702f7ac2c0e1e683f5187f07ecb3269c5b235c7ffa8984d21c4ea0b641553b26cc328665d650bcfe2bcbaea5ba
 DIST freenx-server_0.7.3+teambzr104.orig.tar.gz 118242 SHA256 0d8b8ea883d67551f40c6e1c3a4a280d5bd663f27147a054e879c58b31873c71 SHA512 1e4f64cc2b9e8a38b8796c950418e89fae77d9acbbd57af00e2d3aea3ae86aa6a9cbc42c8b0bed9ff9ba8687f3ec1e252b4b3a6bb74e495840e5698092163627 WHIRLPOOL d3ac5ef7c05480e4bad336904b24333fdc30fc86a717c4e722c0fc64ee7883be747d3f4d54a9cdf044ccefd9598ac243a2ce96f7a360bfec48171c4e975115ea
 EBUILD nxserver-freenx-0.7.3_p104-r6.ebuild 3841 SHA256 f2cd8cd3a3228e86c8a775ff8a27fb4d3714aa44538ae45102b3955f35e09623 SHA512 70811985c3471d4142b43ee3683e22360a584212965768f45463e930de55dcd644f06f4d03971f933e2b0103f3d3e5324815106d01bbada2617cae3f1766e937 WHIRLPOOL 2d35e0957b1e9cf16efdb7eaae6abbbad8f4a01a26066251cb82e390c93b5a50be37537739eb567f066ea520cb2ee8ce8899409a4dd3c0814945e4d32f5414ec
-MISC ChangeLog 19206 SHA256 de47c5f05717293043579d753ad766018f814261611f05cb64e26e842c807f93 SHA512 d1ab47b2cb8e2d6483e902ae512326e10eff3828e418cb8b2e25c92df970e3f57719e696bd3cb0c5a41ee2ecda29b3fece88f87e350e3e7ab7dd9ca30c969c20 WHIRLPOOL 30e1496299cd29bdd4164ddb7b679283c515eaf1fee7c7323088f949578ae8416751c4a8bc66c53cec9df42e3a60bd494ceac23fc250292b58de350be075630a
+EBUILD nxserver-freenx-0.7.3_p104-r7.ebuild 3880 SHA256 acade375190c115ea6a292253c11d5755015f0d2c94a604e5f07ca42ef09f3b9 SHA512 3b35d8e927702ae8699abeadd0514bc2f4250202cb33dcfcf4101307e7968c906fc3c6cc2293be4b26dfdb2301972dbf4994e82231c59121a3feebe3116e934e WHIRLPOOL 55bc95b39b5cf21dd2469379a0ecf0dc25ed21a6e56af953e100845b4d0c747cfaacd8aa1c26249351355cd8c7de6bcd2bddd3d944ca9b6ec8b7247698c06c02
+MISC ChangeLog 19598 SHA256 e3d6c7ddb34e725f594c83375ebe4a2c069ee4fa3b6e2ce138480f54bca33a68 SHA512 e76fd0bd755c11c4593c8a2135fcdfd45a32f8b9aa904408c163708f3942aac843db869545a62ea3688a619cb110929e02f6593e441243f5872d897df4112834 WHIRLPOOL f578851b754eeaa1d29ee77f2dacab49ea85b80417af949f5fe5e3582acbcbf3c774a469c9ad12e3bb51767b6cc6611730704cb1c037f7d7679870133e042989
 MISC metadata.xml 525 SHA256 50af7f059bc7dbf3a4040618c7c9bfa9a6f57ce7eeb2d135ed912a60bcc373bc SHA512 5081dc5421d6f7996dd0176f98157b6127b6bede23d0a028bea19c405f50fca89305d84e272fbcff338f9b65bfbd82bce8e429cf3eb6d41e2a6597b55ef91632 WHIRLPOOL b3a4b3db1b0b0c8f020e045f7e82eb5a7737ddeeb343d23bd873cf407ebc4fbda91bfa99a263d744dc17baff33bb5320fe2c4bea1a68b17a032ec1bd5de1b613
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRMoNWAAoJEOeBhlrCAAWG0b4H/Re6Se3snHp8EkDkm/c6rnDt
-Kvj1SiYHK3U3mkSnI/nbpOCbyIqxtiM24EF8w1lKpF2jHMJ69KxPL3uI8OEww7a8
-qXqsqeh2Oq4t9gfewsvin+us/rxICSFLiaByBPGk84slKZzt9iEDk+2boDnnUGut
-KndnY+ImlFHCzhiOwq4tcHRu5se5VdngGYW67CRpKAnaU2ULAkb0ljvp5rLBe4Ru
-LfFfuFKdZJCevuYxCF8DU1HfRLVmufrLbZlNtPflccWzOWUZO4e0FJT47jxjEFEu
-SORjPdIKHYMF+CcD7YYtAuCgybpkAckS4hCrK9dyP2wCFZ6WQO7SFZWDl4MJ33E=
-=tL0r
+iQEcBAEBCAAGBQJTRUCTAAoJEJWyH81tNOV9uzMH/0zs6JLw86/ELbVtaHkUL0n4
+wjEjxx9N1TTY5GRTO3I+eAoion+9bjDni4UXcnQI/p1p/VGdP2vRlLO11HyWo6Yc
+dFYFeVZAAmiLnvz7U/L0jhDZ2fFaAZbdT8Ps1+e6ijXov+MjoLdOxCS4FfFBenAD
+gifDokyUikcOdqMDzdMHjWrDpKr7yeia3icld3j1KVAYLsc6eeDwkHhr7FVlEuc+
+dsIe6H7DQkb1hsSGd3zjBXWEJM6KmHGNLLnoQDzULDo2dV3ZFBEKRyvapa2ZS/Mp
+5+YWVCtwCNF5RS5CXc+RgH38RKTXiU0QGLh8qhT/7KGNY5np1SFnvkwbTEDTdAw=
+=8cUX
 -----END PGP SIGNATURE-----
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-r7-QA-fixes.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-r7-QA-fixes.patch
new file mode 100644
index 000000000000..7490ace31aef
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-r7-QA-fixes.patch
@@ -0,0 +1,40 @@
+--- a/nx-session-launcher/Makefile.orig	2008-12-19 16:34:02.000000000 +0100
++++ b/nx-session-launcher/Makefile	2008-12-19 16:34:55.000000000 +0100
+@@ -1,7 +1,6 @@
+ .PHONY: all install
+ 
+-CC=gcc
+-CFLAGS=-g -O2 -Wall -fPIC
++CFLAGS+=-fPIC
+ 
+ SOURCES = nx-session-launcher-suid.c
+ PROGRAMS = nx-session-launcher-suid
+--- a/nxredir/Makefile
++++ b/nxredir/Makefile
+@@ -1,12 +1,11 @@
+ all: libnxredir.so
+ 
+-CC=gcc
+-CFLAGS=-g -O2 -Wall -fPIC
++CFLAGS+=-fPIC
+ LIBNAME=libnxredir.so
+ VERSION=0
+ 
+-libnxredir.so: nxredir.o
+-	$(CC) -fPIC $(CFLAGS) -nostdlib -shared -Wl,-soname,$(LIBNAME).$(VERSION) -o $(LIBNAME).$(VERSION) nxredir.o -ldl -lc
++libnxredir.so: nxredir.c
++	$(CC) -fPIC $(CFLAGS) $(LDFLAGS) -nostdlib -shared -Wl,-soname,$(LIBNAME).$(VERSION) -o $(LIBNAME).$(VERSION) nxredir.c -ldl -lc
+ 
+ clean:
+ 	rm -f $(LIBNAME)
+@@ -14,8 +13,8 @@
+ 	rm -f *.o
+ 
+ ifneq ($(NX_VERSION),)
+-install: all
+-	install -m755 $(LIBNAME) $(DESTDIR)/$$PATH_LIB/
++install:
++	install -m755 $(LIBNAME).$(VERSION) $(DESTDIR)/$$PATH_LIB/
+ 	install -m755 nxredir $(DESTDIR)/$$PATH_BIN/
+ 	install -m755 nxsmb $(DESTDIR)/$$CUPS_BACKEND/
+ 	perl -pi -e "s,PATH_LIB=.*,PATH_LIB=\"$$PATH_LIB\",g" $(DESTDIR)/$$PATH_BIN/nxredir
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r7.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r7.ebuild
new file mode 100644
index 000000000000..0d79fe6af6be
--- /dev/null
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r7.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2014 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-r7.ebuild,v 1.1 2014/04/09 12:44:37 tomwij Exp $
+
+EAPI="5"
+
+inherit multilib eutils toolchain-funcs user 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-2.1.0
+	x11-apps/xauth
+	x11-apps/xrdb
+	x11-apps/sessreg
+	virtual/awk
+	virtual/ssh
+	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 )"
+
+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.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
+	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.\[012345\].0#g" \
+		-i nxloadconfig || die
+
+	# Respect user's CC, CFLAGS and LDFLAGS and do other QA fixes.
+	epatch "${FILESDIR}"/${P}-r7-QA-fixes.patch
+}
+
+src_compile() {
+	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	export NX_ETC_DIR=/etc/nxserver
+	export NX_SESS_DIR=/var/lib/nxserver/db
+
+	default
+
+	# This should be renamed to remove the blocker on net-misc/nxclient
+	if use nxclient ; then
+		rm "${ED}"/usr/bin/nxprint || die
+	fi
+
+	mv "${ED}"/etc/nxserver/node.conf.sample "${ED}"/etc/nxserver/node.conf ||
+		die "cannot find default configuration file"
+
+	dodir ${NX_ETC_DIR}
+	for x in passwords passwords.orig ; do
+		touch "${ED}"/${NX_ETC_DIR}/$x
+		fperms 600 ${NX_ETC_DIR}/$x
+	done
+
+	dodir ${NX_SESS_DIR}
+	for x in closed running failed ; do
+		keepdir ${NX_SESS_DIR}/$x
+		fperms 0700 ${NX_SESS_DIR}/$x
+	done
+
+	dodir ${NX_HOME_DIR}
+
+	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 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
+}