summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2007-08-10 18:34:34 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2007-08-10 18:34:34 +0000
commit95f4117cc4296298951cf36ac32888d28919e137 (patch)
tree6e0e1d3816485ca5e74d58c1179f47d353f85dff
parentClean bogus header (diff)
downloadnx-95f4117cc4296298951cf36ac32888d28919e137.tar.gz
nx-95f4117cc4296298951cf36ac32888d28919e137.tar.bz2
nx-95f4117cc4296298951cf36ac32888d28919e137.zip
Moved in portage
svn path=/testing/; revision=189
-rw-r--r--net-misc/nxserver-freenx/Manifest5
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-nxloadconfig.patch53
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-kdecups.patch32
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-xfsfonts.patch19
-rw-r--r--net-misc/nxserver-freenx/nxserver-freenx-0.7.0.ebuild124
5 files changed, 0 insertions, 233 deletions
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
deleted file mode 100644
index 3c68821..0000000
--- a/net-misc/nxserver-freenx/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX nxserver-freenx-0.6.0-nxloadconfig.patch 2823 RMD160 e3f4a7f32e3962690ba2704c612220f8dc99cb44 SHA1 58ea968770e729a029e05ce6934eb16339d0955c SHA256 660f3bf731114f9ea9cf0129649d95a3b1ac0dd219541ddf6866ed2ede725179
-AUX nxserver-freenx-0.7.0-kdecups.patch 1373 RMD160 34227f429683b4d718321fb696faf5e05ed665dc SHA1 181797315f96fc9b2af32f975d6401deaa169023 SHA256 ad010a7b5d4f1874d9f4e60f18de370eb4a0b1e4ca78aff225918302b00d1ad2
-AUX nxserver-freenx-0.7.0-xfsfonts.patch 583 RMD160 74b3fb482b3fd1d689a24df19281ec9ff8223d13 SHA1 8d33b566cc23e52f25b356c4ce9a8675661fc440 SHA256 d5bc41d43d46728d770be26680970e8f1608b1aa97e1e0bb2f0cf34bd6c591df
-DIST freenx-0.7.0.tar.gz 57614 RMD160 a051d4fcb96fd80b167c5fdc526cb5a789732057 SHA1 243f0c98f02b1c84c59e5b324a5a7e6d3d3d8db3 SHA256 61aedd3f8d3fae02b0e13de5f4ee1cb7bc1397dd7a379a67752a188d1f0119c9
-EBUILD nxserver-freenx-0.7.0.ebuild 3151 RMD160 de33ce6aa6ab63c9cee3dd906954110ea169f429 SHA1 8732dff906d1247779aea129f5951a6e53d099d2 SHA256 0e03a9107a6a0930b8382d81669deca8420a63c497ed0b4961f04cd14b5c8881
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-nxloadconfig.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-nxloadconfig.patch
deleted file mode 100644
index d0deb20..0000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-nxloadconfig.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- nxloadconfig.orig 2007-01-23 04:22:50.000000000 +0100
-+++ nxloadconfig 2007-01-29 17:29:38.000000000 +0100
-@@ -58,7 +58,8 @@
- # Where can different nx components be found
- NX_DIR=/usr
- PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys
--PATH_LIB=$NX_DIR/lib
-+REAL_PATH_BIN=$NX_DIR/lib/NX/bin
-+PATH_LIB=$NX_DIR/lib/NX/lib
- NX_ETC_DIR=/etc/nxserver
- NX_SESS_DIR=/var/lib/nxserver/db
- NX_HOME_DIR=/var/lib/nxserver/home
-@@ -154,7 +155,7 @@
- DEFAULT_X_WM=""
- KILL_DEFAULT_X_WM="1"
- USER_X_STARTUP_SCRIPT=.Xclients
--DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
-+DEFAULT_X_SESSION=/etc/X11/Sessions/Xsession
- COMMAND_START_KDE=startkde
- COMMAND_START_GNOME=gnome-session
- COMMAND_START_CDE=cdwm
-@@ -263,11 +264,11 @@
- [ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB
- [ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB
- [ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB
--[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so.1:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2"
-+[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so:$APPLICATION_LIBRARY_PATH/libXext.so:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so"
- if [ -z "$ENABLE_2_0_0_BACKEND" ]
- then
- ENABLE_2_0_0_BACKEND="1"
-- [ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
-+ [ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
- fi
-
- [ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
-@@ -288,7 +289,7 @@
- ERROR="yes" && echo "Error: Invalid value \"PATH_BIN=$PATH_BIN\""
- # Check for NX agents ...
-
-- [ ! -f "$PATH_BIN/nxagent" ] && \
-+ [ ! -f "$REAL_PATH_BIN/nxagent" ] && \
- ERROR="yes" && echo "Error: Could not find nxagent in $PATH_BIN. Please install some OSS components."
-
- [ ! -f "$PATH_BIN/nxdesktop" ] && \
-@@ -509,7 +510,7 @@
- [ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \
- ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\""
-
-- [ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0')" ] && \
-+ [ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0')" ] && \
- ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 version string in nxagent. NX 1.5.0 or 2.[01].0 backend is needed for this version of FreeNX."
-
- [ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \
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
deleted file mode 100644
index c00a6eb..0000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-kdecups.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
deleted file mode 100644
index 4fe189a..0000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-xfsfonts.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /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
deleted file mode 100644
index 1cb38bd..0000000
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.0.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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
- 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"
-}