[gentoo-commits] gentoo-x86 commit in net-misc/nxserver-freenx: nxserver-freenx-0.7.0-r1.ebuild ChangeLog nxserver-freenx-0.7.1.ebuild

[Bernard Cafarelli (voyageur)]

voyageur    07/10/31 19:49:55

  Modified:             nxserver-freenx-0.7.0-r1.ebuild ChangeLog
  Added:                nxserver-freenx-0.7.1.ebuild
  Log:
  Version bump, closes bug #197505. Also fix some quoting
  (Portage version: 2.1.3.16)

Revision  Changes    Path
1.3                  net-misc/nxserver-freenx/nxserver-freenx-0.7.0-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.0-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.0-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.0-r1.ebuild?r1=1.2&r2=1.3

Index: nxserver-freenx-0.7.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.0-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nxserver-freenx-0.7.0-r1.ebuild	20 Sep 2007 12:48:26 -0000	1.2
+++ nxserver-freenx-0.7.0-r1.ebuild	31 Oct 2007 19:49:54 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.0-r1.ebuild,v 1.2 2007/09/20 12:48:26 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.0-r1.ebuild,v 1.3 2007/10/31 19:49:54 voyageur Exp $
 
 inherit multilib eutils
 
@@ -44,14 +44,14 @@
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	mv node.conf.sample node.conf || die
 
-	epatch ${FILESDIR}/${PN}-0.6.0-nxloadconfig.patch
-	epatch ${FILESDIR}/${P}-kdecups.patch
-	epatch ${FILESDIR}/${P}-xfsfonts.patch
-	epatch ${FILESDIR}/${P}-nx3support.patch
+	epatch "${FILESDIR}"/${PN}-0.6.0-nxloadconfig.patch
+	epatch "${FILESDIR}"/${P}-kdecups.patch
+	epatch "${FILESDIR}"/${P}-xfsfonts.patch
+	epatch "${FILESDIR}"/${P}-nx3support.patch
 
 	# Fix DISPLAY for XCB-enabled systems
 	sed -i "s/unix:/:/g" nxnode || die
@@ -97,8 +97,8 @@
 
 	dodir ${NX_ETC_DIR}
 	for x in passwords passwords.orig ; do
-		touch ${D}${NX_ETC_DIR}/$x
-		chmod 600 ${D}${NX_ETC_DIR}/$x
+		touch "${D}"${NX_ETC_DIR}/$x
+		chmod 600 "${D}"${NX_ETC_DIR}/$x
 	done
 
 	insinto ${NX_ETC_DIR}



1.34                 net-misc/nxserver-freenx/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/ChangeLog?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/ChangeLog?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/ChangeLog?r1=1.33&r2=1.34

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ChangeLog	20 Sep 2007 23:16:10 -0000	1.33
+++ ChangeLog	31 Oct 2007 19:49:54 -0000	1.34
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/nxserver-freenx
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.33 2007/09/20 23:16:10 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.34 2007/10/31 19:49:54 voyageur Exp $
+
+*nxserver-freenx-0.7.1 (31 Oct 2007)
+
+  31 Oct 2007; Bernard Cafarelli <voyageur@g.o>
+  +files/nxserver-freenx-0.7.1-cups.patch,
+  +files/nxserver-freenx-0.7.1-nscd.patch,
+  +files/nxserver-freenx-0.7.1-nxdialog.patch,
+  +files/nxserver-freenx-0.7.1-nxloadconfig.patch,
+  +nxserver-freenx-0.7.1.ebuild:
+  Version bump, closes bug #197505
 
   20 Sep 2007; Bernard Cafarelli <voyageur@g.o>
   -files/nxserver-freenx-0.6.0-rdesktop.patch,



1.1                  net-misc/nxserver-freenx/nxserver-freenx-0.7.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.1.ebuild?rev=1.1&content-type=text/plain

Index: nxserver-freenx-0.7.1.ebuild
===================================================================
# Copyright 1999-2007 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.1.ebuild,v 1.1 2007/10/31 19:49:54 voyageur Exp $

inherit multilib eutils

MY_PN="freenx"
DESCRIPTION="An X11/RDP/VNC proxy server especially well suited to low bandwidth links such as wireless, WANS, and worse"
HOMEPAGE="http://freenx.berlios.de/"
SRC_URI="http://download.berlios.de/${MY_PN}/${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"

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}"

	mv node.conf.sample node.conf || die

	epatch "${FILESDIR}"/${P}-nxloadconfig.patch
	epatch "${FILESDIR}"/${P}-cups.patch
	epatch "${FILESDIR}"/${P}-nxdialog.patch
	epatch "${FILESDIR}"/${P}-nscd.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 || 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 || 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 || die
	fi
}

src_compile() {
	einfo "Nothing to compile"
}

src_install() {
	NX_ETC_DIR=/etc/nxserver
	NX_SESS_DIR=/var/lib/nxserver/db

	dobin nxserver
	dobin nxnode
	dobin nxnode-login
	dobin nxkeygen
	dobin nxloadconfig
	dobin nxsetup
	dobin nxcups-gethost
	dobin nxdialog
	dobin nxdesktop_helper
	dobin nxviewer_helper

	# This should be renamed to remove the blocker on net-misc/nxclient
	use nxclient || dobin nxprint

	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

	insinto ${NX_ETC_DIR}
	doins node.conf

	dodir ${NX_HOME_DIR}

	for x in closed running failed ; do
		keepdir ${NX_SESS_DIR}/$x
		fperms 0700 ${NX_SESS_DIR}/$x
	done
}

pkg_postinst () {
	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!!"

	elog "To complete the installation, run:"
	elog " nxsetup --install --setup-nomachine-key --clean --purge"
	elog "This will use the default Nomachine SSH key"
}



-- 
gentoo-commits@g.o mailing list