summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2007-09-18 16:00:52 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2007-09-18 16:00:52 +0000
commit2fbf25bf2baf33a9ca86da2f5894300734c6e6c7 (patch)
tree0cad5a954765ee02c135f0d97ec43affc6bb7d7e
parentAdding back nx 2.1 (under p.mask) (diff)
downloadnx-2fbf25bf2baf33a9ca86da2f5894300734c6e6c7.tar.gz
nx-2fbf25bf2baf33a9ca86da2f5894300734c6e6c7.tar.bz2
nx-2fbf25bf2baf33a9ca86da2f5894300734c6e6c7.zip
Moved in portage
svn path=/testing/; revision=198
-rw-r--r--net-misc/nx/Manifest8
-rw-r--r--net-misc/nx/nx-3.0.0.ebuild107
-rw-r--r--net-misc/nxserver-freenx/Manifest6
-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-nx3support.patch147
-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-r1.ebuild122
8 files changed, 0 insertions, 494 deletions
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index e0de579..82b3a25 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -3,20 +3,12 @@ AUX 1.5.0/nxcomp-1.5.0-pic.patch 522 RMD160 2016856cb86605ca7ccb6b2c17a1c096c8e8
AUX nx-2.1.0-deprecated-headers.patch 3095 RMD160 1814ed18966606dcdb962c024cc9bc02ca3dd09a SHA1 fc41d3539af12dd3d5a1dafc63b0ca40893fbf1b SHA256 bf00914ec72786701ae5d8e56e18388cbe62eb7280ab11799f840680082cb973
AUX nx-2.1.0-invalid-options.patch 978 RMD160 34e8c167b60e20032363ac57e4019a77accd8cb1 SHA1 453dbdaa4682d2051f67a17d586983b659ebb628 SHA256 d466e4abb4a1acdadcb9eddfc5651a7914d6b721e0d59e9df20ea4e19e78bd01
DIST nx-X11-2.1.0-3.tar.gz 32532518 RMD160 69c4b24f8279d9c92bb3ef22a4399806b5fb8050 SHA1 3cb5bfa0bed63b71077d9c38b8e0fdf54f2f00e1 SHA256 dabec82696c23d0c9da0d1a66fee12fd6ffe232e7aecf10f0929e968fe0703f4
-DIST nx-X11-3.0.0-37.tar.gz 20183918 RMD160 2d8ba625a698d4bd1d8f262a012dcaa9f92d5f20 SHA1 8e875243758722cae03bc8697fd678c08e5e3eb9 SHA256 8f0de96431d17987e1926b800f7aa409efbd02898756fe55b978e1304c32e5df
DIST nxagent-2.1.0-20.tar.gz 951225 RMD160 77139161c078d2ce3fa752e39df6a09f2be452f8 SHA1 2a11691aecd4662f926071439f1cce7ca7e941aa SHA256 e0378c4e497ce68446a1a8f7616d8b917c7d23e8d13c62486aca9945f8787aa1
-DIST nxagent-3.0.0-85.tar.gz 1537674 RMD160 5c80dbf2c016fafe9e20816c3e7b0fd5291f368c SHA1 f8a18851346454b4c05491db1fe067c812fed717 SHA256 3d5b223e7bd0ae3ba4348fe5afee62d22cf457412f254c33fd11ae5898a716d9
DIST nxauth-2.1.0-2.tar.gz 30296 RMD160 e20dbac668d98e59d42359d71a1be4947a64d492 SHA1 5027488e7c7252d74971934600cbf9eaf90fec7b SHA256 a3231b42daf1e5add3aaa876f5f99dae0dcf196c2122ad0db11c317851e75799
-DIST nxauth-3.0.0-6.tar.gz 30474 RMD160 e71ae1b83b78f47f9bacf6d85cca529bfda8b2d0 SHA1 4813adbfb99908da73979456fa381a40fea7489e SHA256 09868f985ab71f9cefa61ddd0e809cb41583b31af5098a0b4cdc7a0f4d7fdd62
DIST nxcomp-2.1.0-8.tar.gz 556291 RMD160 b8960b616eb48521404e9ee39cf7e6f64e060394 SHA1 a5465b9062aab9e0db5dcab7dbc86c81b40cae37 SHA256 74ad4bf63602c3e50622d74420c3840f2e7f0d690b2176c0331ad2011756e776
-DIST nxcomp-3.0.0-43.tar.gz 530677 RMD160 8d0d04333b1a90d10da0d4653e196c1754dcab28 SHA1 af6554c2748691f6d5206d23215b6acc45141f9b SHA256 cff0ae97284b8a6d32f57cf20617e6aa021565fe3595545e888eeaaaf5aef48e
DIST nxcompext-2.1.0-5.tar.gz 102588 RMD160 f9c7ea4ca0013063406d18b2e3e928ebfa600169 SHA1 788690ac52eebd2613e6d774679ab133270ff172 SHA256 acd81ab9f0ab74317a9d34902d77f5978432d3488664c501a42378577b81f06c
-DIST nxcompext-3.0.0-18.tar.gz 89984 RMD160 8b4e483e0226041d758920957b4a20626342b797 SHA1 ef7021673fbbe11ed5635c1f58052127c0d7466a SHA256 a6c2bb400d6a970e94db453491d345cbeebd4be0a1b3969b38281a658f6fa554
-DIST nxcompshad-3.0.0-19.tar.gz 71747 RMD160 0a0d1142024544956eece74d0ea5929ebdb67ec8 SHA1 37519203e0a12762607f64c3978f01383dab81df SHA256 0011b7cff616001e7e9f846ed4f128b39ed6a4a0a40aa62138afc13fbb0c6cec
DIST nxdesktop-2.1.0-10.tar.gz 570224 RMD160 7e40aa6807d4565322c9f784341a3521d3feabf5 SHA1 e3c2bc13dc31df4888caff32cb69c8fb216d7855 SHA256 320b5eda1df461228ba6a45a4edf31dd1a10ac1e44abe14ff7fef207b346bc0c
DIST nxproxy-2.1.0-3.tar.gz 82753 RMD160 71c9a069cb9b8ede2505753656cd5b83fff80f8e SHA1 2ec0bafb9546bbde155baeb844454da704aabcc9 SHA256 3c2db68cb0fa931db1b2ef74c76c848357d332ada8397c511719215bd8eeabac
-DIST nxproxy-3.0.0-4.tar.gz 82730 RMD160 b96e8752fce7015da88e2e304c8647abc6591892 SHA1 b4e22c541f3ae6f08f16c0239494475519de4045 SHA256 e2a838697d79b8621851e1fbe12dd699699f6ab62fa2caa92c53a0fefe901954
DIST nxviewer-2.1.0-12.tar.gz 228158 RMD160 0462706c5ea0f49700e4ccdfc2adba1278b0e3ec SHA1 af1f6dc337cd13739037c45d9284c7596e87c732 SHA256 dc41c4f3cc6f6e4e7985a37d5b3cddf9c9571b8e9752fbb056a4d6e4c9b59178
EBUILD nx-2.1.0-r1.ebuild 3059 RMD160 61da28df62a27565fe378bf7e6a1762665bcf4ce SHA1 adc4dd076f0b4269fc6a0f26eb198a5624d5b7f0 SHA256 c7ef5d61c916809bf8ed2be33786b97cd56df00f0b9f9f99236fa85f8d70b195
-EBUILD nx-3.0.0.ebuild 2703 RMD160 e2dc0de13a428f04967694faa93fa905d44ba4aa SHA1 967eaf032227ef121be46bf173f83551553613d7 SHA256 e5a56cdfd58bb7c69b6249748dab36df7fb6d9d91d0c0fc41756b80ae2fdaf53
MISC metadata.xml 312 RMD160 245dc74ea927b730125f0581c38d728319a37824 SHA1 e586c8dc5fbbcdddacf4bdf7fc739bfc9fb716df SHA256 9d3698e1818b09e36ecd3350cf578e2561794828453110d2645c6cceca1cf7dc
diff --git a/net-misc/nx/nx-3.0.0.ebuild b/net-misc/nx/nx-3.0.0.ebuild
deleted file mode 100644
index 79234fc..0000000
--- a/net-misc/nx/nx-3.0.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit autotools eutils multilib
-
-DESCRIPTION="NX compression technology core libraries"
-HOMEPAGE="http://www.nomachine.com/developers.php"
-
-URI_BASE="http://web04.nomachine.com/download/${PV}/sources"
-SRC_NX_X11="nx-X11-$PV-37.tar.gz"
-SRC_NXAGENT="nxagent-$PV-85.tar.gz"
-SRC_NXAUTH="nxauth-$PV-6.tar.gz"
-SRC_NXCOMP="nxcomp-$PV-43.tar.gz"
-SRC_NXCOMPEXT="nxcompext-$PV-18.tar.gz"
-SRC_NXCOMPSHAD="nxcompshad-$PV-19.tar.gz"
-SRC_NXPROXY="nxproxy-$PV-4.tar.gz"
-
-SRC_URI="$URI_BASE/$SRC_NX_X11 $URI_BASE/$SRC_NXAGENT $URI_BASE/$SRC_NXPROXY $URI_BASE/$SRC_NXAUTH $URI_BASE/$SRC_NXCOMPEXT $URI_BASE/$SRC_NXCOMPSHAD $URI_BASE/$SRC_NXCOMP"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="rdesktop vnc"
-
-RDEPEND="x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libXpm
- >=media-libs/jpeg-6b-r4
- >=media-libs/libpng-1.2.8
- >=sys-libs/zlib-1.2.3
- rdesktop? ( net-misc/rdesktop )
- vnc? ( || (net-misc/vnc net-misc/tightvnc ) )"
-
-DEPEND="${RDEPEND}
- x11-misc/gccmakedep
- x11-misc/imake"
-
-S=${WORKDIR}/${PN}-X11
-
-pkg_setup() {
- if use vnc; then
- if has_version net-misc/vnc && ! built_with_use net-misc/vnc server;
- then
- die "net-misc/vnc needs to be built with USE=\"server\" for VNC support"
- fi
-
- if has_version net-misc/tightvnc && ! built_with_use net-misc/tightvnc server;
- then
- die "net-misc/tightvnc needs to be built with USE=\"server\" for VNC support"
- fi
- fi
-}
-
-src_unpack() {
- unpack ${A}
-
- cd ${WORKDIR}
- epatch ${FILESDIR}/1.5.0/nx-x11-1.5.0-tmp-exec.patch
- epatch ${FILESDIR}/1.5.0/nxcomp-1.5.0-pic.patch
-
- cd ${WORKDIR}/nxcomp
- epatch ${FILESDIR}/${PN}-2.1.0-deprecated-headers.patch
- epatch ${FILESDIR}/${PN}-2.1.0-invalid-options.patch
- eautoreconf
-}
-
-src_compile() {
- cd ${WORKDIR}/nxcomp || die
- econf || die
- emake || die
-
- cd ${WORKDIR}/nxcompshad || die
- econf || die
- emake || die
-
- cd ${WORKDIR}/nxproxy || die
- econf || die
- emake || die
-
- cd ${WORKDIR}/nx-X11 || die
- emake World || die
-
- cd ${WORKDIR}/nxcompext || die
- econf || die
- emake || die
-}
-
-src_install() {
- NX_ROOT=/usr/$(get_libdir)/NX
-
- for x in nxagent nxauth nxproxy; do
- make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||die
- done
-
- into ${NX_ROOT}
- dobin ${WORKDIR}/nx-X11/programs/Xserver/nxagent
- dobin ${WORKDIR}/nx-X11/programs/nxauth/nxauth
- dobin ${WORKDIR}/nxproxy/nxproxy
-
- dolib.so ${WORKDIR}/nx-X11/lib/X11/libX11.so*
- dolib.so ${WORKDIR}/nx-X11/lib/Xext/libXext.so*
- dolib.so ${WORKDIR}/nx-X11/lib/Xrender/libXrender.so*
- dolib.so ${WORKDIR}/nxcomp/libXcomp.so*
- dolib.so ${WORKDIR}/nxcompext/libXcompext.so*
- dolib.so ${WORKDIR}/nxcompshad/libXcompshad.so*
-}
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
deleted file mode 100644
index 48ab7c2..0000000
--- a/net-misc/nxserver-freenx/Manifest
+++ /dev/null
@@ -1,6 +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-nx3support.patch 6969 RMD160 c866cc6641ff560179a178b97fc9f1f9676a8d94 SHA1 191d8b0dc2d4e5b808de3d07537bf9b9f4824170 SHA256 d66f249c6aa6e759c667314f6e770e7074ceff3e318237a7d2de547ed485d601
-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-r1.ebuild 3221 RMD160 852b96fbf43aa5ddc2c14270d1d0d2983e64bceb SHA1 fefcaf33055214f6569831e7f80d7e876e44016d SHA256 e800d9caf2edacda8cc43cd3ec6c3f9a096eae89760bbe1ff2bcec86afdea2f3
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-nx3support.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch
deleted file mode 100644
index 720b922..0000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch
+++ /dev/null
@@ -1,147 +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-09-17 15:53:24.000000000 +0200
-+++ freenx-0.7.0/node.conf 2007-09-17 15:53:08.000000000 +0200
-@@ -378,6 +378,9 @@
- # When you installed a 2.0.0 NX Backend, set this to 1.
- #ENABLE_2_0_0_BACKEND="0"
-
-+# When you installed a 3.0.0 NX Backend, set this to 1.
-+#ENABLE_3_0_0_BACKEND="0"
-+
- # When set to 1 this will automatically resume started sessions
- #ENABLE_AUTORECONNECT="0"
-
-diff -Naur freenx-0.7.0.orig/nxloadconfig freenx-0.7.0/nxloadconfig
---- freenx-0.7.0.orig/nxloadconfig 2007-09-17 15:53:24.000000000 +0200
-+++ freenx-0.7.0/nxloadconfig 2007-09-17 15:53:07.000000000 +0200
-@@ -184,6 +184,7 @@
- # Misc directives
-
- ENABLE_2_0_0_BACKEND=""
-+ENABLE_3_0_0_BACKEND=""
- ENABLE_AUTORECONNECT="0"
- ENABLE_AUTORECONNECT_BEFORE_140="1"
- EXPORT_USERIP="0"
-@@ -275,13 +276,19 @@
- [ -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:$APPLICATION_LIBRARY_PATH/libXext.so:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so"
-+[ -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/libXcompshad.so:$APPLICATION_LIBRARY_PATH/libXrender.so"
- if [ -z "$ENABLE_2_0_0_BACKEND" ]
- then
- ENABLE_2_0_0_BACKEND="1"
- [ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
- fi
-
-+if [ -z "$ENABLE_3_0_0_BACKEND" ]
-+then
-+ ENABLE_3_0_0_BACKEND="1"
-+ [ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 3.[01].0')" ] && ENABLE_3_0_0_BACKEND="0"
-+fi
-+
- [ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
- [ -z "$KDE_PRINTRC" -o ! -r "$KDE_PRINTRC" ] && KDE_PRINTRC="$HOME/.kde/share/config/kdeprintrc"
-
-@@ -303,11 +310,11 @@
- [ ! -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" ] && \
-- WARNING="yes" && echo "Warning: Could not find nxdesktop in $PATH_BIN. RDP sessions won't work."
-+ [ ! -f "$PATH_BIN/rdesktop" ] && \
-+ WARNING="yes" && echo "Warning: Could not find rdesktop in $PATH_BIN. RDP sessions won't work."
-
-- [ ! -f "$PATH_BIN/nxviewer" ] && \
-- WARNING="yes" && echo "Warning: Could not find nxviewer in $PATH_BIN. VNC sessions won't work."
-+ [ ! -f "$PATH_BIN/vncviewer" ] && \
-+ WARNING="yes" && echo "Warning: Could not find vncviewer in $PATH_BIN. VNC sessions won't work."
-
- # Check for paths
-
-@@ -535,8 +542,8 @@
- [ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \
- ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\""
-
-- [ -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 "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.0.0')" ] && \
-+ ERROR="yes" && echo "Error: Could not find 1.5.0, 2.[01].0 or 3.0.0 version string in nxagent. NX 1.5.0 to 3.0.0 backend is needed for this version of FreeNX."
-
- [ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \
- ERROR="yes" && echo "Error: Invalid value \"ENABLE_USESSION=$ENABLE_USESSION\""
-diff -Naur freenx-0.7.0.orig/nxnode freenx-0.7.0/nxnode
---- freenx-0.7.0.orig/nxnode 2007-09-17 15:53:24.000000000 +0200
-+++ freenx-0.7.0/nxnode 2007-09-17 15:55:03.000000000 +0200
-@@ -414,7 +414,7 @@
- # backingstore
-
- B=""
-- if [ -n "$backingstore" -a "$ENABLE_2_0_0_BACKEND" != "1" ]
-+ if [ -n "$backingstore" -a "$ENABLE_2_0_0_BACKEND" != "1" -a "$ENABLE_3_0_0_BACKEND" != "1" ]
- then
- [ "$backingstore" != 1 ] && B="-bs $backingstore"
- [ "$backingstore" = 1 ] && B="+bs"
-@@ -424,6 +424,7 @@
-
- G=""
- [ -n "$geometry" ] && G="-geometry $geometry"
-+ [ -n "$geometry" -a "$type" = "windows" ] && G="-g $geometry"
-
- # type of session
-
-@@ -435,7 +436,7 @@
- vncfullscreen=""
- [ "$geometry" = "fullscreen" -a "$type" = "vnc" ] && vncfullscreen="-fullscreen" && G=""
-
-- [ "$geometry" = "fullscreen" -a "$type" = "windows" ] && G="-geometry `echo $screeninfo | cut -d"x" -f1,2`"
-+ [ "$geometry" = "fullscreen" -a "$type" = "windows" ] && G="-g`echo $screeninfo | cut -d"x" -f1,2`"
-
- #
- # Start the wanted nxagent
-@@ -443,7 +444,7 @@
-
- if [ "$type" = "windows" ]
- then
-- # nxdesktop session (Windows RDP)
-+ # rdesktop session (Windows RDP)
-
- [ "$SET_LD_LIBRARY_PATH" = "1" ] && export LD_LIBRARY_PATH="$AGENT_LIBRARY_PATH:$LD_LIBRARY_PATH"
- # Setup optional parameters
-@@ -457,21 +458,21 @@
-
- # Start the agent
-
-- echo "$agent_password" | $PATH_BIN/nxdesktop -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $U $P $D $agent_server $AGENT_EXTRA_OPTIONS_RDP 2>&3 &
-+ echo "$agent_password" | $PATH_BIN/rdesktop $G $U $P $D $agent_server $AGENT_EXTRA_OPTIONS_RDP 2>&3 &
-
- elif [ "$type" = "vnc" ]
- then
-- # nxviewer session (VNC RFP)
-+ # vncviewer session (VNC RFP)
-
- [ "$SET_LD_LIBRARY_PATH" = "1" ] && export LD_LIBRARY_PATH="$AGENT_LIBRARY_PATH:$LD_LIBRARY_PATH"
- # Setup password
-
- mkdir -p "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/"
-- echo "$agent_password" | $PATH_BIN/nxpasswd "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/.passwd" doit
-+ echo "$agent_password" | $PATH_BIN/vncpasswd -f > "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/.passwd"
-
- # Start the agent
-
-- $PATH_BIN/nxviewer -encodings tight hextile copyrect raw -passwd $USER_FAKE_HOME/.nx/C-$sess_id/scripts/.passwd -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $vncfullscreen $G $K $agent_server $AGENT_EXTRA_OPTIONS_RFB 2>&3 &
-+ $PATH_BIN/vncviewer -encodings "tight hextile copyrect raw" -passwd $USER_FAKE_HOME/.nx/C-$sess_id/scripts/.passwd $vncfullscreen $G $agent_server $AGENT_EXTRA_OPTIONS_RFB 2>&3 &
-
- elif [ "$R" = "-R" -a "$rootless" != "1" ]
- then
-@@ -942,8 +943,8 @@
-
- node_start_monitor()
- {
-- [ "$ENABLE_2_0_0_BACKEND" = "1" ] && node_start_monitor_2_0_0 "$@"
-- [ "$ENABLE_2_0_0_BACKEND" = "1" ] || node_start_monitor_1_5_0 "$@"
-+ [ "$ENABLE_2_0_0_BACKEND" = "1" || "$ENABLE_3_0_0_BACKEND" = "1" ] && node_start_monitor_2_0_0 "$@"
-+ [ "$ENABLE_2_0_0_BACKEND" = "1" || "$ENABLE_3_0_0_BACKEND" = "1" ] || node_start_monitor_1_5_0 "$@"
- }
-
- #
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-r1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.0-r1.ebuild
deleted file mode 100644
index 17974c4..0000000
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# 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
- epatch ${FILESDIR}/${P}-nx3support.patch
-
- # Fix DISPLAY for XCB-enabled systems
- sed -i "s/unix:/:/g" nxnode || die
-
- 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
- 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"
-}