Allow nxagent 3.3.0 usage

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

4 files changed, 12 insertions, 127 deletions

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index df3d1e54be83..178dd283ca83 100644
--- a/net-misc/nxserver-freenx/ChangeLog
+++ b/net-misc/nxserver-freenx/ChangeLog
@@ -1,6 +1,10 @@
 # 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.53 2008/08/25 18:36:05 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.54 2008/11/24 14:14:11 voyageur Exp $
+
+  24 Nov 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  -nxserver-freenx-0.7.3.ebuild, nxserver-freenx-0.7.3-r1.ebuild:
+  Allow nxagent 3.3.0 usage
 
 *nxserver-freenx-0.7.3-r1 (25 Aug 2008)
 
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index 5d9d44b8acc9..71e117a1c999 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -8,7 +8,6 @@ AUX nxserver.init 568 RMD160 a48a0d4853fcd28c0ec6dd2e0366bc69ac1e4b28 SHA1 3980d
 DIST freenx-server-0.7.2.tar.gz 105394 RMD160 fd962a4d7f26db7d5d7aeb8a169950ce54c88759 SHA1 036a51fb4850007558f41b1968d47c2232ee0315 SHA256 9fea37f0c95a2e9a634dbb1537871ebc3187fce285b8b31d3109e56dc712a6ed
 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 3617 RMD160 4627a052f0da3c701763c26ae4701a92f11f1a43 SHA1 dbfb23a35ef0b5a593baf67e1118b343b5df47c6 SHA256 08c8e4e259a169916199c5181dd4f213fdef8971e1fccad617cf4890054f3342
-EBUILD nxserver-freenx-0.7.3.ebuild 3570 RMD160 ab9bd5966e91b44127b510eec6210b9bebf3ad7d SHA1 ca2104b89aa13a9991e361df5a61c2255533bde0 SHA256 cca8e8dd96464b746f1078c36ffdaf45f12f24bfc9a90547220892be5cd22f47
-MISC ChangeLog 12590 RMD160 68f95f8147449b2651044d0599d270fdf3b9c419 SHA1 ca24133c4fc96ec97ac029db9c4de24a88d42baf SHA256 bdb460cbf16a0f1a20cfc8f7f2cd9f7bd182b677dd0e219bdcfd64d6c8824025
+EBUILD nxserver-freenx-0.7.3-r1.ebuild 3662 RMD160 1b8f4bccfb1b5a2a4640eaa2323efc9ed2758018 SHA1 08827c96aee9d0ccb7e0e84f99b734b2f6ce939c SHA256 0b34097cada930afcf030b8c07d68af166b5ab368cbf469b0783f8cfa150a772
+MISC ChangeLog 12740 RMD160 5b14634915b90e341c7f12d4d1bd4c68f83b0cec SHA1 86ffff8df17de30ad3541a7639bfbeb3b5737439 SHA256 4266f6a52264eccf44df7349ef74814beeaa258299c5e80ffbc8b7b7cd47730b
 MISC metadata.xml 444 RMD160 320adc515fae7b427d477b0aef5175f1b9abf1d7 SHA1 70ec3ac0ab16d652576871bc07970b4799cfe0a0 SHA256 ec5e28af478976bd4ab094f5c4f668d443b82711550d7fd1d320688b4178a4fb
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r1.ebuild
index 7a1ff342b767..3358794e625f 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r1.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2008/08/25 18:36:05 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r1.ebuild,v 1.2 2008/11/24 14:14:11 voyageur Exp $
 
 inherit multilib eutils
 
@@ -51,8 +51,10 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-roundrobin.patch
 	epatch "${FILESDIR}"/${PN}-0.7.2-cups.patch
 
-	sed -i "/PATH_LIB=/s/lib/$(get_libdir)/g" nxloadconfig || die
-	sed -i "/REAL_PATH_BIN=/s/lib/$(get_libdir)/g" nxloadconfig || die
+	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
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3.ebuild
deleted file mode 100644
index 7deec58928ec..000000000000
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# 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.ebuild,v 1.1 2008/08/22 13:04:53 voyageur Exp $
-
-inherit multilib eutils
-
-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="virtual/ssh
-	dev-tcltk/expect
-	sys-apps/gawk
-	net-analyzer/gnu-netcat
-	nxclient? ( net-misc/nxclient )
-	!nxclient? ( !net-misc/nxclient
-				 || ( x11-misc/xdialog
-					  x11-apps/xmessage ) )
-	>=net-misc/nx-2.1.0
-	arts? ( kde-base/arts )
-	cups? ( net-print/cups )
-	esd? ( media-sound/esound )
-	!net-misc/nxserver-freeedition
-	!net-misc/nxserver-2xterminalserver"
-
-RDEPEND="${DEPEND}
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	x11-apps/xauth
-	x11-apps/xrdb
-	x11-apps/sessreg"
-
-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}"/${PN}-0.7.2-cups.patch
-
-	sed -i "/PATH_LIB=/s/lib/$(get_libdir)/g" nxloadconfig || die
-	sed -i "/REAL_PATH_BIN=/s/lib/$(get_libdir)/g" nxloadconfig || die
-
-	# 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_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"
-}