Version bump

Package-Manager: portage-2.1.3.3

6 files changed, 208 insertions, 5 deletions

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index 902fe7f24764..ad2540279e5e 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.28 2007/08/10 18:23:03 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.29 2007/08/10 18:33:35 voyageur Exp $
+
+*nxserver-freenx-0.7.0 (10 Aug 2007)
+
+  10 Aug 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/nxserver-freenx-0.7.0-kdecups.patch,
+  +files/nxserver-freenx-0.7.0-xfsfonts.patch,
+  +nxserver-freenx-0.7.0.ebuild:
+  Version bump, bug #186226
+  Also added a patch to fix font size
 
   10 Aug 2007; Bernard Cafarelli <voyageur@gentoo.org>
   -files/freenx-0.5.0-backingstore.patch, -files/freenx-0.5.0-startup.patch,
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index c0a57fce8ad7..982262c8ab14 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -10,15 +10,28 @@ AUX nxserver-freenx-0.6.0-rootless-mode.patch 1999 RMD160 58e9377f80bb3db572aaf1
 MD5 ed8aa2546babafe902fd99bcb3823ff9 files/nxserver-freenx-0.6.0-rootless-mode.patch 1999
 RMD160 58e9377f80bb3db572aaf106c81248b760800420 files/nxserver-freenx-0.6.0-rootless-mode.patch 1999
 SHA256 725095ce655285780fb413fac2c89f8925c1fa5a458af8c19efdcf4427fb33ec files/nxserver-freenx-0.6.0-rootless-mode.patch 1999
+AUX nxserver-freenx-0.7.0-kdecups.patch 1373 RMD160 34227f429683b4d718321fb696faf5e05ed665dc SHA1 181797315f96fc9b2af32f975d6401deaa169023 SHA256 ad010a7b5d4f1874d9f4e60f18de370eb4a0b1e4ca78aff225918302b00d1ad2
+MD5 8c5f7c0037b3d2e759e1dbfde81ebf9a files/nxserver-freenx-0.7.0-kdecups.patch 1373
+RMD160 34227f429683b4d718321fb696faf5e05ed665dc files/nxserver-freenx-0.7.0-kdecups.patch 1373
+SHA256 ad010a7b5d4f1874d9f4e60f18de370eb4a0b1e4ca78aff225918302b00d1ad2 files/nxserver-freenx-0.7.0-kdecups.patch 1373
+AUX nxserver-freenx-0.7.0-xfsfonts.patch 583 RMD160 74b3fb482b3fd1d689a24df19281ec9ff8223d13 SHA1 8d33b566cc23e52f25b356c4ce9a8675661fc440 SHA256 d5bc41d43d46728d770be26680970e8f1608b1aa97e1e0bb2f0cf34bd6c591df
+MD5 6c71560ff7f6002f6a43a946f8b20e6e files/nxserver-freenx-0.7.0-xfsfonts.patch 583
+RMD160 74b3fb482b3fd1d689a24df19281ec9ff8223d13 files/nxserver-freenx-0.7.0-xfsfonts.patch 583
+SHA256 d5bc41d43d46728d770be26680970e8f1608b1aa97e1e0bb2f0cf34bd6c591df files/nxserver-freenx-0.7.0-xfsfonts.patch 583
 DIST freenx-0.6.0.tar.gz 110758 RMD160 6000d5fed4d11dbb4c750b43c81626991460ccbb SHA1 c43ce0462fa6c7fe84d5c7db8e5c14dc8ab2feed SHA256 928a4be2ecdfb560abc93737d049fa5b2459e64c431d4aa43e46c6c4df52b3ca
+DIST freenx-0.7.0.tar.gz 57614 RMD160 a051d4fcb96fd80b167c5fdc526cb5a789732057 SHA1 243f0c98f02b1c84c59e5b324a5a7e6d3d3d8db3 SHA256 61aedd3f8d3fae02b0e13de5f4ee1cb7bc1397dd7a379a67752a188d1f0119c9
 EBUILD nxserver-freenx-0.6.0.ebuild 3251 RMD160 212a438197bc40eecdb953d410e5f3ae64e023c9 SHA1 cda87eede72ae02b433b7b431a1a62126fe029d8 SHA256 c2f1d560943949d34e44050b6fc95ec4c703525de90d331f40143904b5e4493c
 MD5 4490a69a17c0c7beafaf3b7ddec58e39 nxserver-freenx-0.6.0.ebuild 3251
 RMD160 212a438197bc40eecdb953d410e5f3ae64e023c9 nxserver-freenx-0.6.0.ebuild 3251
 SHA256 c2f1d560943949d34e44050b6fc95ec4c703525de90d331f40143904b5e4493c nxserver-freenx-0.6.0.ebuild 3251
-MISC ChangeLog 6758 RMD160 3190cafec83393fd59be001e3a1ba6dede075f96 SHA1 31d981850e87723e178990caccb72e626237eef3 SHA256 f4cb980ed6fd716caeb5469d5cc3a426ad2b7902139d1a4e3828b85a18fc1d53
-MD5 95604d29edad5371445c3890736c64bf ChangeLog 6758
-RMD160 3190cafec83393fd59be001e3a1ba6dede075f96 ChangeLog 6758
-SHA256 f4cb980ed6fd716caeb5469d5cc3a426ad2b7902139d1a4e3828b85a18fc1d53 ChangeLog 6758
+EBUILD nxserver-freenx-0.7.0.ebuild 3284 RMD160 04e88b0067c3f9cd272c1f82be70584cbdc03a38 SHA1 b707d262e9bfccf9b5e3dee7fb7a281c58740044 SHA256 78d8a9c9bb307918d22439453775401b94682728a368eb19c2b158dcbb6cb1a1
+MD5 416ee053c1da3f4f19d7973cc6906309 nxserver-freenx-0.7.0.ebuild 3284
+RMD160 04e88b0067c3f9cd272c1f82be70584cbdc03a38 nxserver-freenx-0.7.0.ebuild 3284
+SHA256 78d8a9c9bb307918d22439453775401b94682728a368eb19c2b158dcbb6cb1a1 nxserver-freenx-0.7.0.ebuild 3284
+MISC ChangeLog 7044 RMD160 f284245512c7724249d65185f443b90b2392e3df SHA1 0baa9fa240cdfcaf2b54c7e257d81d77b7b234ab SHA256 71b4d351de135406f892494f17dbbbae625b5f6559a3a88ac3b8e7aa753e0b5a
+MD5 51d917d54d0678b5d493e0316c64b503 ChangeLog 7044
+RMD160 f284245512c7724249d65185f443b90b2392e3df ChangeLog 7044
+SHA256 71b4d351de135406f892494f17dbbbae625b5f6559a3a88ac3b8e7aa753e0b5a ChangeLog 7044
 MISC metadata.xml 350 RMD160 53819424da8eb045d991b7d02b8a6d9e6d54369d SHA1 591b43c9210782070d5d9b30317b1cef3975ab7e SHA256 5cf73679195a2c8a5a960d30614cfd340b7aadabb2e4c684928f44527278500e
 MD5 433fa8974d44bd11845f96eb0be88ae7 metadata.xml 350
 RMD160 53819424da8eb045d991b7d02b8a6d9e6d54369d metadata.xml 350
@@ -26,3 +39,6 @@ SHA256 5cf73679195a2c8a5a960d30614cfd340b7aadabb2e4c684928f44527278500e metadata
 MD5 4ea9feb54f34954f8d43c80f44a2cd9a files/digest-nxserver-freenx-0.6.0 238
 RMD160 4d8159168dc51338e9ab715840a060628a0234b2 files/digest-nxserver-freenx-0.6.0 238
 SHA256 1d10b1f32814e055aa8289983618c869f3b5a7cc1718c5b943fe32e2e8bfd509 files/digest-nxserver-freenx-0.6.0 238
+MD5 6fa79d6a782ced51048ad11dd422abf0 files/digest-nxserver-freenx-0.7.0 235
+RMD160 4fffb376d8359b2f7aedce2802d784fa7c06521d files/digest-nxserver-freenx-0.7.0 235
+SHA256 9d184ea648e7ffe72fb0394f2887fad339e972a4857607c41415b9116018ae56 files/digest-nxserver-freenx-0.7.0 235
diff --git a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.7.0 b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.7.0
new file mode 100644
index 000000000000..4c88fd9819e4
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.7.0
@@ -0,0 +1,3 @@
+MD5 9c21eb45b4193ad7184109f3274c9e33 freenx-0.7.0.tar.gz 57614
+RMD160 a051d4fcb96fd80b167c5fdc526cb5a789732057 freenx-0.7.0.tar.gz 57614
+SHA256 61aedd3f8d3fae02b0e13de5f4ee1cb7bc1397dd7a379a67752a188d1f0119c9 freenx-0.7.0.tar.gz 57614
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-kdecups.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-kdecups.patch
new file mode 100644
index 000000000000..c00a6eb8384f
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-kdecups.patch
@@ -0,0 +1,32 @@
+diff -Naur freenx-0.7.0.orig/node.conf freenx-0.7.0/node.conf
+--- freenx-0.7.0.orig/node.conf	2007-08-10 17:42:19.000000000 +0200
++++ freenx-0.7.0/node.conf	2007-08-10 17:42:41.000000000 +0200
+@@ -289,7 +289,7 @@
+ # CUPS_BACKEND and CUPS_ETC are the corresponding paths of your CUPS 
+ # installation.
+ 
+-#CUPS_BACKEND="/usr/lib/cups/backend"
++#CUPS_BACKEND="/usr/libexec/cups/backend"
+ #CUPS_IPP_BACKEND="$CUPS_BACKEND/nxipp"
+ #CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock"
+ #CUPS_ETC="/etc/cups"
+diff -Naur freenx-0.7.0.orig/nxloadconfig freenx-0.7.0/nxloadconfig
+--- freenx-0.7.0.orig/nxloadconfig	2007-08-10 17:42:19.000000000 +0200
++++ freenx-0.7.0/nxloadconfig	2007-08-10 17:42:55.000000000 +0200
+@@ -152,7 +152,7 @@
+ ENABLE_FOOMATIC="1"
+ COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile"
+ 
+-CUPS_BACKEND="/usr/lib/cups/backend"
++CUPS_BACKEND="/usr/libexec/cups/backend"
+ CUPS_IPP_BACKEND="$CUPS_BACKEND/nxipp"
+ CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock"
+ CUPS_ETC="/etc/cups/"
+@@ -282,7 +282,6 @@
+ fi 
+ 
+ [ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
+-[ -z "$KDE_PRINTRC" ] && KDE_PRINTRC=$(kde-config --localprefix)"/share/config/kdeprintrc"
+ [ -z "$KDE_PRINTRC" -o ! -r "$KDE_PRINTRC" ] && KDE_PRINTRC="$HOME/.kde/share/config/kdeprintrc"
+ 
+ #########################################################################
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-xfsfonts.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-xfsfonts.patch
new file mode 100644
index 000000000000..4fe189ab37df
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-xfsfonts.patch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_fix_xfs_fonts.dpatch by  <diamond@google.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad freenx-0.6.0+svn334~/nxnode freenx-0.6.0+svn334/nxnode
+--- freenx-0.6.0+svn334~/nxnode	2007-05-31 16:47:23.000000000 +0100
++++ freenx-0.6.0+svn334/nxnode	2007-05-31 16:47:50.000000000 +0100
+@@ -304,6 +304,8 @@
+ 		NODE_WM_PID=$!
+ 	fi
+ 
++	echo "Xft.dpi: 96" | DISPLAY=:$display xrdb -merge >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1
++
+ 	#
+ 	# Startup the application
+ 	#
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.0.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.0.ebuild
new file mode 100644
index 000000000000..943ea1f36dc2
--- /dev/null
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.0.ebuild
@@ -0,0 +1,124 @@
+# 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.ebuild,v 1.1 2007/08/10 18:33:35 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}/${PN}-0.6.0-nxloadconfig.patch
+	epatch ${FILESDIR}/${P}-kdecups.patch
+	epatch ${FILESDIR}/${P}-xfsfonts.patch
+
+	# Fix DISPLAY for XCB-enabled systems
+	sed -i "s/unix:/:/g" nxnode || die
+
+	# on amd64, get the correct path to NX 32bit libsA
+	if 	has_multilib_profile; then
+		sed -i "/PATH_LIB=/s/lib/$(get_abi_LIBDIR x86)/g" nxloadconfig || die
+		sed -i "/REAL_PATH_BIN=/s/lib/$(get_abi_LIBDIR x86)/g" nxloadconfig || die
+	fi
+
+	# 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
+	use nxclient || dobin nxprint
+	use nxclient || dobin nxclient
+
+	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"
+}