Ebuild cleanup, fix depend, and CC/CFLAGS handling, closes bug #246819

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 162 insertions, 2 deletions

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index 178dd283ca83..d9e665cc5c18 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.54 2008/11/24 14:14:11 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.55 2008/12/19 16:12:10 voyageur Exp $
+
+*nxserver-freenx-0.7.3-r2 (19 Dec 2008)
+
+  19 Dec 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/nxserver-freenx-0.7.3-cflags.patch,
+  +nxserver-freenx-0.7.3-r2.ebuild:
+  Ebuild cleanup, fix depend, and CC/CFLAGS handling, closes bug #246819
 
   24 Nov 2008; Bernard Cafarelli <voyageur@gentoo.org>
   -nxserver-freenx-0.7.3.ebuild, nxserver-freenx-0.7.3-r1.ebuild:
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index 71e117a1c999..039d86d97013 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -2,6 +2,7 @@ AUX nxserver-freenx-0.7.2-cups.patch 1312 RMD160 c6f0a0675fe7902cc2e53123e708f17
 AUX nxserver-freenx-0.7.2-exitstatus.patch 1015 RMD160 446f7e0fd5317fb0b62ec0e1666080889152fdb5 SHA1 b0b72c5c86d9a9281575edb2659ca3f4f7d63c6e SHA256 556bae4afe6f8c28e5c3f2ede7454928a4b7875ff3a1f38ea4a7a78d1290c84a
 AUX nxserver-freenx-0.7.2-nolistentcp.patch 610 RMD160 1a1625bb2b5840cddf0c927567640a32295206d4 SHA1 adcb471f196294aacc682db449dcf94b178b34ba SHA256 e133da25a6a57a8e8097c4eaef4de2d0a1f45919f1d39af822e4c26b9d6b6fdf
 AUX nxserver-freenx-0.7.2-nxloadconfig.patch 3235 RMD160 a781432921cd62c2c705a83b2efcd76dccf5472d SHA1 6a9e9c8538effd16d4911431fdbcf8200d43a0e6 SHA256 954c77d2629c0c430c036bcedd1ef4be217f73448536378c306b902fa1737666
+AUX nxserver-freenx-0.7.3-cflags.patch 573 RMD160 fee4ca54ec92b945510da592709dc8936c836ca6 SHA1 8c39527466d30ede77b0faa7a0cda060177ef8ec SHA256 ae6c753a12100b580d89b7d09162aa2ac34dc04cc5a0fb8ebd1beb03848e24f2
 AUX nxserver-freenx-0.7.3-nxloadconfig.patch 2849 RMD160 fafa9dea7324d2c20dc099242cec34a1b828a920 SHA1 d97f5780a06870441ba2506b0d5cce435f1d9fbc SHA256 8a9c0f16cfd5079cfc055dc7c52b88fb4c5c4c9e45a929189ea6a9c3915ca1de
 AUX nxserver-freenx-0.7.3-roundrobin.patch 4130 RMD160 605a87e06ad4626d78abdcfa15ec1f73d3ea0a18 SHA1 c3407eef092b3432c9aba82a6b38e52c45b3dc34 SHA256 4d08d5a75c56f3b976282e191ed8041b6e776fe028f38dce23a2360f911279ed
 AUX nxserver.init 568 RMD160 a48a0d4853fcd28c0ec6dd2e0366bc69ac1e4b28 SHA1 3980df2e35c594a806b18062e781fa5e52131ff9 SHA256 eda452183da56f6ef5730f1f9e7c968c462b2d3ad31c58ed6100d90c7533c4f2
@@ -9,5 +10,6 @@ DIST freenx-server-0.7.2.tar.gz 105394 RMD160 fd962a4d7f26db7d5d7aeb8a169950ce54
 DIST freenx-server-0.7.3.tar.gz 114680 RMD160 7a635b2d4796f4ab405c974c881985ea66e8efaf SHA1 888344f946cfb0802e2532e6b93601248c909eb8 SHA256 1afa8a64def93ee95a10f9105de2e6a6ff18076ee187c8ad20b34dc54116a3e4
 EBUILD nxserver-freenx-0.7.2-r2.ebuild 3634 RMD160 62ee3e7d5470dfe8eb2c6c49862488c6364c44e3 SHA1 c36ac4bdf75093b71e5ee18df350452508515f72 SHA256 1f6eb34bbbd0deed164d89641695f818fd04376e1b2f02d62460093474b237d8
 EBUILD nxserver-freenx-0.7.3-r1.ebuild 3662 RMD160 1b8f4bccfb1b5a2a4640eaa2323efc9ed2758018 SHA1 08827c96aee9d0ccb7e0e84f99b734b2f6ce939c SHA256 0b34097cada930afcf030b8c07d68af166b5ab368cbf469b0783f8cfa150a772
-MISC ChangeLog 12740 RMD160 5b14634915b90e341c7f12d4d1bd4c68f83b0cec SHA1 86ffff8df17de30ad3541a7639bfbeb3b5737439 SHA256 4266f6a52264eccf44df7349ef74814beeaa258299c5e80ffbc8b7b7cd47730b
+EBUILD nxserver-freenx-0.7.3-r2.ebuild 3837 RMD160 696377cc795a200d55f16fd7529bea12eb4a8692 SHA1 11d5ff236629626e93f56d6f6e6d593d31917be3 SHA256 5daffb2981241a8e76bc0d8d882633369b87db1e5c6fd4a1264ef443fffc1822
+MISC ChangeLog 12991 RMD160 5b4e615d28041f9ab3b568a1ef049593526191e4 SHA1 5ab608e901fa5c3514aa5e1c13ecda9856cbd92d SHA256 66b984d2ea7d5a2e6315be0c65643c0a7ed0a1ec486fa640536794ead061d744
 MISC metadata.xml 444 RMD160 320adc515fae7b427d477b0aef5175f1b9abf1d7 SHA1 70ec3ac0ab16d652576871bc07970b4799cfe0a0 SHA256 ec5e28af478976bd4ab094f5c4f668d443b82711550d7fd1d320688b4178a4fb
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3-cflags.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3-cflags.patch
new file mode 100644
index 000000000000..cfb71f139439
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3-cflags.patch
@@ -0,0 +1,22 @@
+--- nx-session-launcher/Makefile.orig	2008-12-19 16:34:02.000000000 +0100
++++ 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
+--- nxredir/Makefile.orig	2008-12-19 16:33:53.000000000 +0100
++++ nxredir/Makefile	2008-12-19 16:34:48.000000000 +0100
+@@ -1,7 +1,6 @@
+ all: libnxredir.so.0
+ 
+-CC=gcc
+-CFLAGS=-g -O2 -Wall -fPIC
++CFLAGS+=-fPIC
+ LIBNAME=libnxredir.so.0
+ 
+ libnxredir.so.0: nxredir.o
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r2.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r2.ebuild
new file mode 100644
index 000000000000..1a5a183f80ae
--- /dev/null
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r2.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2008 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-r2.ebuild,v 1.1 2008/12/19 16:12:10 voyageur Exp $
+
+inherit multilib eutils toolchain-funcs
+
+MY_PN="freenx-server"
+DESCRIPTION="Free Software Implementation of the NX Server"
+HOMEPAGE="http://freenx.berlios.de/"
+SRC_URI="mirror://berlios/freenx/${MY_PN}-${PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip"
+IUSE="arts cups esd nxclient"
+
+DEPEND="x11-misc/gccmakedep
+	x11-misc/imake"
+RDEPEND="dev-tcltk/expect
+	media-fonts/font-misc-misc
+	media-fonts/font-cursor-misc
+	net-analyzer/gnu-netcat
+	>=net-misc/nx-2.1.0
+	sys-apps/gawk
+	virtual/ssh
+	x11-apps/xauth
+	x11-apps/xrdb
+	x11-apps/sessreg
+	arts? ( kde-base/arts )
+	cups? ( net-print/cups )
+	esd? ( media-sound/esound )
+	nxclient? ( net-misc/nxclient )
+	!nxclient? ( !net-misc/nxclient
+				 || ( x11-misc/xdialog
+					  x11-apps/xmessage ) )
+	!net-misc/nxserver-freeedition
+	!net-misc/nxserver-2xterminalserver"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+export NX_HOME_DIR=/var/lib/nxserver/home
+
+pkg_setup () {
+	enewuser nx -1 -1 ${NX_HOME_DIR}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-nxloadconfig.patch
+	epatch "${FILESDIR}"/${P}-roundrobin.patch
+	epatch "${FILESDIR}"/${P}-cflags.patch
+	epatch "${FILESDIR}"/${PN}-0.7.2-cups.patch
+
+	sed -e "s/3\.\[012\]/3.[0123]/g" \
+		-e "/PATH_LIB=/s/lib/$(get_libdir)/g" \
+		-e "/REAL_PATH_BIN=/s/lib/$(get_libdir)/g" \
+		-i nxloadconfig || die "nxloadconfig sed failed"
+
+	# Change the defaults in nxloadconfig to meet the users needs.
+	if use arts ; then
+		einfo "Enabling arts support."
+		sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' nxloadconfig || die
+		sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' node.conf.sample || die
+	fi
+	if use esd ; then
+		einfo "Enabling esd support."
+		sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' nxloadconfig || die
+		sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' node.conf.sample || die
+	fi
+	if use cups ; then
+		einfo "Enabling cups support."
+		sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' nxloadconfig || die
+		sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' node.conf.sample || die
+	fi
+}
+
+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 -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 --clean --purge"
+	elog "This will use the default Nomachine SSH key"
+}