summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2007-08-10 18:23:03 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2007-08-10 18:23:03 +0000
commit51dd316cea9177d41f039f633e6f56fd0f45bc76 (patch)
treef5eb1b43b0395a92b810c60ca5e89540f6e99be9 /net-misc
parentRemoving old NX 1.5 version (diff)
downloadhistorical-51dd316cea9177d41f039f633e6f56fd0f45bc76.tar.gz
historical-51dd316cea9177d41f039f633e6f56fd0f45bc76.tar.bz2
historical-51dd316cea9177d41f039f633e6f56fd0f45bc76.zip
Remove old version
Package-Manager: portage-2.1.3.3
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/nxserver-freenx/ChangeLog8
-rw-r--r--net-misc/nxserver-freenx/Manifest42
-rw-r--r--net-misc/nxserver-freenx/files/50nxserver3
-rw-r--r--net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0-r23
-rw-r--r--net-misc/nxserver-freenx/files/freenx-0.5.0-backingstore.patch37
-rw-r--r--net-misc/nxserver-freenx/files/freenx-0.5.0-fullscreen.patch23
-rw-r--r--net-misc/nxserver-freenx/files/freenx-0.5.0-startup.patch13
-rw-r--r--net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r2.ebuild113
8 files changed, 11 insertions, 231 deletions
diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index d71ec2ea6a61..902fe7f24764 100644
--- a/net-misc/nxserver-freenx/ChangeLog
+++ b/net-misc/nxserver-freenx/ChangeLog
@@ -1,6 +1,12 @@
# 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.27 2007/07/03 11:14:53 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.28 2007/08/10 18:23:03 voyageur Exp $
+
+ 10 Aug 2007; Bernard Cafarelli <voyageur@gentoo.org>
+ -files/freenx-0.5.0-backingstore.patch, -files/freenx-0.5.0-startup.patch,
+ -files/50nxserver, -files/freenx-0.5.0-fullscreen.patch,
+ -nxserver-freenx-0.5.0-r2.ebuild:
+ Remove old version
03 Jul 2007; Christian Faulhammer <opfer@gentoo.org>
nxserver-freenx-0.6.0.ebuild:
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index 5ded17b8d1ef..c0a57fce8ad7 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -1,22 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 50nxserver 80 RMD160 204c4cffc4832609451e69a78a75d0572b74b0f1 SHA1 02c98a293297819e1f28dab13c49f0aa30d27d4b SHA256 7572b8195b5b1ba83f429ddc11be44b3496810e05adbc1c233788085bcf8e365
-MD5 41f95f92c9e230d7cd356504a8e56269 files/50nxserver 80
-RMD160 204c4cffc4832609451e69a78a75d0572b74b0f1 files/50nxserver 80
-SHA256 7572b8195b5b1ba83f429ddc11be44b3496810e05adbc1c233788085bcf8e365 files/50nxserver 80
-AUX freenx-0.5.0-backingstore.patch 1505 RMD160 bb046ea3641a3d3f4479b2a705a042142214cef2 SHA1 cf946f07cdbce3c3e150647c5761e64e1f37cd12 SHA256 8165b0acaec15da98e90aaf630dfdef654e0f2271e1a19a2dbc67fc4f717ba88
-MD5 7dd1722a45fa03e0b64d02aa5abba53c files/freenx-0.5.0-backingstore.patch 1505
-RMD160 bb046ea3641a3d3f4479b2a705a042142214cef2 files/freenx-0.5.0-backingstore.patch 1505
-SHA256 8165b0acaec15da98e90aaf630dfdef654e0f2271e1a19a2dbc67fc4f717ba88 files/freenx-0.5.0-backingstore.patch 1505
-AUX freenx-0.5.0-fullscreen.patch 742 RMD160 051282cd14faa40a8dffed131aaaee7b9a786dde SHA1 982c4494dab50270c52ecb37ee82703dcf70e6d0 SHA256 5b207a3282fb5dee52f271668af306df82cd2f14593f48497a895fec397e0e45
-MD5 46aacff8b2ed5e40ae9545fc51f7c72c files/freenx-0.5.0-fullscreen.patch 742
-RMD160 051282cd14faa40a8dffed131aaaee7b9a786dde files/freenx-0.5.0-fullscreen.patch 742
-SHA256 5b207a3282fb5dee52f271668af306df82cd2f14593f48497a895fec397e0e45 files/freenx-0.5.0-fullscreen.patch 742
-AUX freenx-0.5.0-startup.patch 614 RMD160 77a71ec51e6cb781f927363dd21014b900a3247b SHA1 38fb745a86772c05654e8a12739ab242636a058a SHA256 31f4bc50e63fd03eb48b6e90fc17062c0f45073b9578c0514ae7c209a1714042
-MD5 24ec695b0851ee0a329a0a3af5b3849f files/freenx-0.5.0-startup.patch 614
-RMD160 77a71ec51e6cb781f927363dd21014b900a3247b files/freenx-0.5.0-startup.patch 614
-SHA256 31f4bc50e63fd03eb48b6e90fc17062c0f45073b9578c0514ae7c209a1714042 files/freenx-0.5.0-startup.patch 614
AUX nxserver-freenx-0.6.0-nxloadconfig.patch 2823 RMD160 e3f4a7f32e3962690ba2704c612220f8dc99cb44 SHA1 58ea968770e729a029e05ce6934eb16339d0955c SHA256 660f3bf731114f9ea9cf0129649d95a3b1ac0dd219541ddf6866ed2ede725179
MD5 8f0661a55bfdfef0c29c4b9df82e9857 files/nxserver-freenx-0.6.0-nxloadconfig.patch 2823
RMD160 e3f4a7f32e3962690ba2704c612220f8dc99cb44 files/nxserver-freenx-0.6.0-nxloadconfig.patch 2823
@@ -29,34 +10,19 @@ 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
-DIST freenx-0.5.0-5.fc5.i386.rpm 62859 RMD160 1c7bef90d5610ab265d9a66253d2bda1663e6e1a SHA1 b8845b592ee3818f028b3201b17912ce1820d45b SHA256 8d5224e825191d330e85996815f1b2ecb8b733853c24e7704cf0ea7b52237016
DIST freenx-0.6.0.tar.gz 110758 RMD160 6000d5fed4d11dbb4c750b43c81626991460ccbb SHA1 c43ce0462fa6c7fe84d5c7db8e5c14dc8ab2feed SHA256 928a4be2ecdfb560abc93737d049fa5b2459e64c431d4aa43e46c6c4df52b3ca
-EBUILD nxserver-freenx-0.5.0-r2.ebuild 3356 RMD160 722a6cc9180adcaadf62c243c53ef9a9e1544baa SHA1 211fbbc06d045804ccf265ac312c5e3fd3d78897 SHA256 d4fd90845f4a7588db7a22faf66d311dbab84897f541207e26ba4919ecf54d85
-MD5 1856414b3bc98dc082bbe98d47db955b nxserver-freenx-0.5.0-r2.ebuild 3356
-RMD160 722a6cc9180adcaadf62c243c53ef9a9e1544baa nxserver-freenx-0.5.0-r2.ebuild 3356
-SHA256 d4fd90845f4a7588db7a22faf66d311dbab84897f541207e26ba4919ecf54d85 nxserver-freenx-0.5.0-r2.ebuild 3356
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 6506 RMD160 0c3dba3dc78269bbed097c88650541cf91693c71 SHA1 e2a6c26c4a97dedeb10e36c4552707139d87d31d SHA256 de900cf9ae73bcf049811f761450590836b9e843dec83b35ab02aa5189cc485f
-MD5 fd810a4760b7040c705920dae3b38229 ChangeLog 6506
-RMD160 0c3dba3dc78269bbed097c88650541cf91693c71 ChangeLog 6506
-SHA256 de900cf9ae73bcf049811f761450590836b9e843dec83b35ab02aa5189cc485f ChangeLog 6506
+MISC ChangeLog 6758 RMD160 3190cafec83393fd59be001e3a1ba6dede075f96 SHA1 31d981850e87723e178990caccb72e626237eef3 SHA256 f4cb980ed6fd716caeb5469d5cc3a426ad2b7902139d1a4e3828b85a18fc1d53
+MD5 95604d29edad5371445c3890736c64bf ChangeLog 6758
+RMD160 3190cafec83393fd59be001e3a1ba6dede075f96 ChangeLog 6758
+SHA256 f4cb980ed6fd716caeb5469d5cc3a426ad2b7902139d1a4e3828b85a18fc1d53 ChangeLog 6758
MISC metadata.xml 350 RMD160 53819424da8eb045d991b7d02b8a6d9e6d54369d SHA1 591b43c9210782070d5d9b30317b1cef3975ab7e SHA256 5cf73679195a2c8a5a960d30614cfd340b7aadabb2e4c684928f44527278500e
MD5 433fa8974d44bd11845f96eb0be88ae7 metadata.xml 350
RMD160 53819424da8eb045d991b7d02b8a6d9e6d54369d metadata.xml 350
SHA256 5cf73679195a2c8a5a960d30614cfd340b7aadabb2e4c684928f44527278500e metadata.xml 350
-MD5 6c95395d73159a977cb252ca79283e16 files/digest-nxserver-freenx-0.5.0-r2 259
-RMD160 e40911d7dbe507a6946045b0edf6adae50b6aea7 files/digest-nxserver-freenx-0.5.0-r2 259
-SHA256 32a053208d0c362191602daff58fecb0fae0fa297ff75ad39686e42de35b18d5 files/digest-nxserver-freenx-0.5.0-r2 259
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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGii+zNQqtfCuFneMRAolwAJ9SDZ+J/wmuFjgjehJu1WoYY7tdXgCcD1QP
-BV7+GnrnTsNbTZO7WT5CAUE=
-=ZPkG
------END PGP SIGNATURE-----
diff --git a/net-misc/nxserver-freenx/files/50nxserver b/net-misc/nxserver-freenx/files/50nxserver
deleted file mode 100644
index a791ca25adce..000000000000
--- a/net-misc/nxserver-freenx/files/50nxserver
+++ /dev/null
@@ -1,3 +0,0 @@
-PATH=/usr/NX/bin
-ROOTPATH=/usr/NX/bin
-CONFIG_PROTECT="/usr/NX/etc /usr/NX/home"
diff --git a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0-r2 b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0-r2
deleted file mode 100644
index 183d59abfc16..000000000000
--- a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eb90747bb64cbdb5079dd28c8086b511 freenx-0.5.0-5.fc5.i386.rpm 62859
-RMD160 1c7bef90d5610ab265d9a66253d2bda1663e6e1a freenx-0.5.0-5.fc5.i386.rpm 62859
-SHA256 8d5224e825191d330e85996815f1b2ecb8b733853c24e7704cf0ea7b52237016 freenx-0.5.0-5.fc5.i386.rpm 62859
diff --git a/net-misc/nxserver-freenx/files/freenx-0.5.0-backingstore.patch b/net-misc/nxserver-freenx/files/freenx-0.5.0-backingstore.patch
deleted file mode 100644
index 2abef89877c7..000000000000
--- a/net-misc/nxserver-freenx/files/freenx-0.5.0-backingstore.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ruN freenx~/etc/nxserver/node.conf.sample freenx/etc/nxserver/node.conf.sample
---- freenx~/etc/nxserver/node.conf.sample 2006-09-29 17:46:03.000000000 +0200
-+++ freenx/etc/nxserver/node.conf.sample 2006-11-21 12:12:03.254604158 +0100
-@@ -346,7 +346,7 @@
- #########################################################################
-
- # When you installed a 2.0.0 NX Backend, set this to 1.
--#ENABLE_2_0_0_BACKEND="1"
-+#ENABLE_2_0_0_BACKEND="0"
-
- # When set to 1 this will automatically resume started sessions
- #ENABLE_AUTORECONNECT="0"
-diff -ruN freenx~/usr/bin/nxloadconfig freenx/usr/bin/nxloadconfig
---- freenx~/usr/bin/nxloadconfig 2006-09-29 17:46:03.000000000 +0200
-+++ freenx/usr/bin/nxloadconfig 2006-11-21 12:11:48.400187438 +0100
-@@ -173,7 +173,7 @@
-
- # Misc directives
-
--ENABLE_2_0_0_BACKEND="1"
-+ENABLE_2_0_0_BACKEND="0"
- ENABLE_AUTORECONNECT="0"
- ENABLE_AUTORECONNECT_BEFORE_140="1"
- EXPORT_USERIP="0"
-diff -ruN freenx~/usr/bin/nxnode freenx/usr/bin/nxnode
---- freenx~/usr/bin/nxnode 2006-09-29 17:46:03.000000000 +0200
-+++ freenx/usr/bin/nxnode 2006-11-21 12:11:01.696589165 +0100
-@@ -252,7 +252,8 @@
- [ -n "$keyboard" ] && K="-keyboard $keyboard"
- [ -n "$kbtype" ] && K="-kbtype $kbtype"
- B=""
-- [ -n "$backingstore" -a "$ENABLE_2_0_0_BACKEND" != "1" ] && B="-bs $backingstore"
-+ [ -n "$backingstore" -a "$backingstore" = "1" ] && B="+bs"
-+ [ -n "$backingstore" -a "$backingstore" != "1" ] && B="-bs $backingstore"
- G=""
- [ -n "$geometry" ] && G="-geometry $geometry"
- R="-D"
diff --git a/net-misc/nxserver-freenx/files/freenx-0.5.0-fullscreen.patch b/net-misc/nxserver-freenx/files/freenx-0.5.0-fullscreen.patch
deleted file mode 100644
index c3ad210a2169..000000000000
--- a/net-misc/nxserver-freenx/files/freenx-0.5.0-fullscreen.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- usr/bin/nxnode 2006-10-05 21:24:20.000000000 +0200
-+++ usr/bin/nxnode 2006-10-05 21:21:11.000000000 +0200
-@@ -629,6 +629,10 @@
- imagecompressionmethod=$(getparam imagecompressionmethod)
- imagecompressionlevel=$(getparam imagecompressionlevel)
- geometry=$(getparam geometry)
-+
-+ # fullscreen variable added to fix fullscreen on client login
-+ fullscreen=$(getparam fullscreen)
-+
- keyboard=$(getparam keyboard)
- kbtype=$(getparam kbtype)
- media=$(getparam media)
-@@ -664,7 +668,8 @@
- status=$(getparam status)
- host=$(getparam host)
-
-- fullscreen=""
-+# commented out to fix fullscreen on client login
-+# fullscreen=""
- [ "$geometry" = "fullscreen" ] && fullscreen="1"
-
- [ "$EXPORT_USERIP" = "1" ] && export NXUSERIP="$userip"
diff --git a/net-misc/nxserver-freenx/files/freenx-0.5.0-startup.patch b/net-misc/nxserver-freenx/files/freenx-0.5.0-startup.patch
deleted file mode 100644
index 3cad86620d59..000000000000
--- a/net-misc/nxserver-freenx/files/freenx-0.5.0-startup.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- usr/bin/nxloadconfig.orig 2006-11-02 08:08:36.000000000 +0000
-+++ usr/bin/nxloadconfig 2006-11-05 01:18:16.000000000 +0000
-@@ -157,8 +157,8 @@
- KILL_DEFAULT_X_WM="1"
- USER_X_STARTUP_SCRIPT=.Xclients
- DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
--COMMAND_START_KDE="/usr/bin/ssh-agent /usr/bin/dbus-launch --exit-with-session /usr/bin/startkde"
--COMMAND_START_GNOME="/usr/bin/ssh-agent /usr/bin/dbus-launch --exit-with-session /usr/bin/gnome-session"
-+COMMAND_START_KDE="startkde"
-+COMMAND_START_GNOME="/etc/X11/Sessions/Gnome"
- COMMAND_START_CDE=cdwm
- COMMAND_XTERM=xterm
- COMMAND_XAUTH=/usr/X11R6/bin/xauth
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r2.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r2.ebuild
deleted file mode 100644
index 8f3960e02b5d..000000000000
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r2.ebuild
+++ /dev/null
@@ -1,113 +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.5.0-r2.ebuild,v 1.3 2007/04/26 09:54:10 voyageur Exp $
-
-inherit multilib eutils rpm
-
-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="ftp://ftp.pbone.net/mirror/download.fedora.redhat.com/pub/fedora/linux/extras/5/i386/freenx-0.5.0-5.fc5.i386.rpm"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-RESTRICT="strip"
-IUSE="arts cups esd nxclient"
-DEPEND="virtual/ssh
- dev-tcltk/expect
- sys-apps/gawk
- net-analyzer/gnu-netcat
- x86? ( nxclient? ( =net-misc/nxclient-1.5* )
- !nxclient? ( !net-misc/nxclient ) )
- amd64? ( nxclient? ( =net-misc/nxclient-1.5* )
- !nxclient? ( !net-misc/nxclient ) )
- !x86? ( !amd64? ( !net-misc/nxclient ) )
- =net-misc/nx-1.5*
- arts? ( kde-base/arts )
- cups? ( net-print/cups )
- esd? ( media-sound/esound )
- !net-misc/nxserver-freeedition
- !net-misc/nxserver-2xterminalserver"
-
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}
-
-export NX_HOME_DIR=/var/lib/nxserver/home
-
-pkg_setup () {
- enewuser nx -1 -1 ${NX_HOME_DIR}
-}
-
-src_unpack() {
- rpm_unpack ${DISTDIR}/${A}
- cd ${S}
-
- # fix the start commands
- epatch ${FILESDIR}/freenx-0.5.0-startup.patch
- # fix fullscreen support; see bug 150200
- epatch ${FILESDIR}/freenx-0.5.0-fullscreen.patch
- # fix newer clients support; bug 155063
- epatch ${FILESDIR}/freenx-0.5.0-backingstore.patch
-
- mv etc/nxserver/node.conf.sample etc/nxserver/node.conf || die
-
- sed -e 's|^PATH_LIB=.*$|PATH_LIB=$NX_DIR/lib/NX/lib|;' -i usr/bin/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"/' usr/bin/nxloadconfig || die
- sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' etc/nxserver/node.conf || die
- fi
- if use esd ; then
- einfo "Enabling esd support."
- sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' usr/bin/nxloadconfig || die
- sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' etc/nxserver/node.conf || die
- fi
- if use cups ; then
- einfo "Enabling cups support."
- sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' usr/bin/nxloadconfig || die
- sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' etc/nxserver/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 usr/bin/nxserver
- dobin usr/bin/nxnode
- dobin usr/bin/nxnode-login
- dobin usr/bin/nxkeygen
- dobin usr/bin/nxloadconfig
- dobin usr/bin/nxsetup
- ( ( use x86 || use amd64 ) && use nxclient ) || dobin usr/bin/nxprint
- ( ( use x86 || use amd64 ) && use nxclient ) || dobin usr/bin/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 etc/nxserver/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 "Run nxsetup --override --install to complete the installation"
-}