Update no-ldap patch, bug #315533. Also fix desktop entry and drop old versions

(Portage version: 2.2_rc67/svn/Linux x86_64)

svn path=/testing/; revision=245

8 files changed, 43 insertions, 319 deletions

diff --git a/net-misc/x2goclient/ChangeLog b/net-misc/x2goclient/ChangeLog
index 028953e..164e8cf 100644
--- a/net-misc/x2goclient/ChangeLog
+++ b/net-misc/x2goclient/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for net-misc/x2goclient
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/ChangeLog,v 1.2 2009/04/16 14:00:21 voyageur Exp $
 
+  19 Apr 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  -x2goclient-3.00.1.ebuild, -files/x2goclient-3.00.1-ldap.patch,
+  -files/x2goclient-3.00.1-noldap.patch, -x2goclient-3.01.3.ebuild,
+  x2goclient-3.01.5.ebuild, +files/x2goclient-3.01.5-noldap.patch:
+  Update no-ldap patch, bug #315533. Also fix desktop entry and drop old
+  versions
 
 *x2goclient-3.01.5 (15 Apr 2010)
 
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index 1cc13fa..698ab87 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -1,10 +1,5 @@
-AUX x2goclient-3.00.1-ldap.patch 5046 RMD160 90aa4e09c391fed6d7770ba73d2733c3cac3cdcf SHA1 0dc0e98d9d6d4af723799e6049d5afacedbacfbe SHA256 f381a333083d400d838515d6444322497c843039e852b96315bad7f56e8b02e7
-AUX x2goclient-3.00.1-noldap.patch 1352 RMD160 ea7066d0eba1d0b1bb2909dc5e7b6477ce21c5a2 SHA1 f99023279d09decb148857381b75d1f1c2d5a10f SHA256 2d89e7f57b8bfdf8a6caf89eddb7afc390ebbbda24cf59c839387998c2934283
-DIST x2goclient_3.00-1.tar.gz 664378 RMD160 89e4fd4838cd14299032bbee4d6fb0878c4ae513 SHA1 8cdb5fcc9d8c8384189dd6ed82eb0207c80d366b SHA256 95e8625e5b613082220d98c0b406b029f8420da92f83303b0040ed2f43498b45
-DIST x2goclient_3.01-3.tar.gz 764833 RMD160 e997dd19c3894cf48dbd15e205b7aefa65813596 SHA1 03d979b0ac7c4f24e409bd69f33f855784fe83cf SHA256 e600a2f0d1cb8cc9a0df3155d0130f90338d7466ade20e80a4ac372381c6422f
+AUX x2goclient-3.01.5-noldap.patch 829 RMD160 3cd3e19685ed3d4336c064f629adee9dfb858f68 SHA1 c6a0628ca1550be88e1fa6fe3993118df646d55f SHA256 a9e7e17768d07f26554e810615f1f98e416212f81e90daa638b9c721a46b6d81
 DIST x2goclient_3.01-5.tar.gz 10274153 RMD160 d0cd000d6d235e29dbd17da292b6784ada000f64 SHA1 916a02a78febbfd6fe3d74e101e1eb46597e7bde SHA256 ce671a628b17614bdcf443bd5ff22f644ceca1dad634c8823fcad8438a3751e3
-EBUILD x2goclient-3.00.1.ebuild 1784 RMD160 06b7b09bd81a2ea1dd8ef4e2c18a41242fb5f8fd SHA1 3f7ec6ef96ad4e55ffd7b72e35dde8b5f0dd6be3 SHA256 4883bd637ca925549eda9c120a0ae579b2365fe394db514fddb7d306d5453afb
-EBUILD x2goclient-3.01.3.ebuild 1784 RMD160 06b7b09bd81a2ea1dd8ef4e2c18a41242fb5f8fd SHA1 3f7ec6ef96ad4e55ffd7b72e35dde8b5f0dd6be3 SHA256 4883bd637ca925549eda9c120a0ae579b2365fe394db514fddb7d306d5453afb
-EBUILD x2goclient-3.01.5.ebuild 1866 RMD160 f51dc5c8f0ed767ff3eeea0e897fd75222150179 SHA1 5e2852b7b556f253986d60d8ff62466b50ae46fb SHA256 a47c03b1cf5c6d0bdaee21c91f865145eaafba64674ab42b96a7ea999c61b486
-MISC ChangeLog 814 RMD160 dd2cc5bcb6e84702e420d36f699570338d8b3709 SHA1 8ded7062bbd0982e3d0e4f1b435f8e46b03b0448 SHA256 0dbfac746a8630b6c8b880932d449b7d9324eb7e737cc9464cf0ddb641033db1
+EBUILD x2goclient-3.01.5.ebuild 1701 RMD160 14e5075eabf0258f05c5d40fc4f5e82f23254fea SHA1 926362cad63245f94dfca948aff2d236416358b4 SHA256 22970b79aa19d9b673631fa281fa1eb60d95352889928ea52d862dd364410541
+MISC ChangeLog 1154 RMD160 19b3a3312f34b23950a0f4a34096466141c75231 SHA1 c607b9f2fe3c25b13e5197ec111e7c1b7481cd1b SHA256 cbf987c160ba561de0809476adda84c8352d48034d76f761362aafb4813f39cb
 MISC metadata.xml 211 RMD160 7569a339443bfffd41ebdb1db3683d6bbcd2fe5b SHA1 84050eff2270b3218cf8eb00363fe12ecdadfe2e SHA256 a6b5a5387c7e7f441d794c61edf1718caa3c58ffbf9b595ec536ff9617a7471f
diff --git a/net-misc/x2goclient/files/x2goclient-3.00.1-ldap.patch b/net-misc/x2goclient/files/x2goclient-3.00.1-ldap.patch
deleted file mode 100644
index a5a0374..0000000
--- a/net-misc/x2goclient/files/x2goclient-3.00.1-ldap.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -u -x '*.kde*' -r x2goclient-3.00/configdialog.cpp x2goclient-3.00-mod/configdialog.cpp
---- x2goclient-3.00/configdialog.cpp	2009-03-04 10:44:09.000000000 +0100
-+++ x2goclient-3.00-mod/configdialog.cpp	2009-05-12 16:32:10.000000000 +0200
-@@ -61,7 +61,10 @@
- 	ldapServer=new QLineEdit ( gb );
- 	port=new QSpinBox ( gb );
- 	ldapBase=new QLineEdit ( gb );
-+        ldapBindDN=new QLineEdit ( gb );
-+        ldapBindDNPw=new QLineEdit ( gb );
- 	port->setMaximum ( 1000000 );
-+        ldapBindDNPw->setEchoMode (QLineEdit::Password);
- 
- 	QHBoxLayout *grLay=new QHBoxLayout ( gb );
- 
-@@ -77,6 +80,8 @@
- 
- 	laiLay->addWidget ( new QLabel ( tr ( "Server URL:" ),gb ) );
- 	laiLay->addWidget ( new QLabel ( tr ( "BaseDN:" ),gb ) );
-+        laiLay->addWidget ( new QLabel ( tr ("BindDN:" ),gb ) );
-+        laiLay->addWidget ( new QLabel ( tr ("BindDN Password:" ),gb ) );
- 	laiLay->addWidget ( new QLabel ( tr ( "Failover server 1 URL:" ),gb ) );
- 	laiLay->addWidget ( new QLabel ( tr ( "Failover server 2 URL:" ),gb ) );
- 
-@@ -112,6 +117,8 @@
- 
- 	setLay->addLayout ( aLay );
- 	setLay->addWidget ( ldapBase );
-+        setLay->addWidget ( ldapBindDN );
-+        setLay->addWidget ( ldapBindDNPw );
- 	setLay->addLayout ( aLay1 );
- 	setLay->addLayout ( aLay2 );
- 
-@@ -140,6 +147,12 @@
- 	ldapBase->setText ( st.value ( "LDAP/basedn",
- 	                               ( QVariant ) par->retLdapDn()
- 	                             ).toString() );
-+        ldapBindDN->setText ( st.value ( "LDAP/BindDN",
-+                                         ( QVariant ) par->retLdapBindDN()
-+                                       ).toString() );
-+        ldapBindDNPw->setText ( st.value ( "LDAP/BindDNPw",
-+                                         ( QVariant ) par->retLdapBindDNPw()
-+                                       ).toString() );
- 	gb->setEnabled ( useldap->isChecked() );
- 	frLay->addWidget ( gb );
- 	connect ( useldap,SIGNAL ( toggled ( bool ) ),gb,
-@@ -412,7 +425,14 @@
- 		st.setValue ( "LDAP/server2", ( QVariant )
- 		              ldapServer2->text() );
- 	if ( ldapBase->text().length() )
--		st.setValue ( "LDAP/basedn", ( QVariant ) ldapBase->text() );
-+		st.setValue ( "LDAP/basedn", ( QVariant )
-+                              ldapBase->text() );
-+        if ( ldapBindDN->text().length() )
-+                st.setValue ( "LDAP/BindDN", ( QVariant )
-+                              ldapBindDN->text() );
-+        if ( ldapBindDNPw->text().length() )
-+                st.setValue ( "LDAP/BindDNPw",
-+                              ldapBindDNPw->text() );
- #endif //USELDAP
- #ifdef WINDOWS
- 
-diff -u -x '*.kde*' -r x2goclient-3.00/configdialog.h x2goclient-3.00-mod/configdialog.h
---- x2goclient-3.00/configdialog.h	2009-03-04 10:34:51.000000000 +0100
-+++ x2goclient-3.00-mod/configdialog.h	2009-05-12 15:11:36.000000000 +0200
-@@ -56,6 +56,8 @@
- 		QLineEdit* ldapBase;
- 		QLineEdit* ldapServer;
- 		QSpinBox*  port;
-+                QLineEdit* ldapBindDN;
-+                QLineEdit* ldapBindDNPw;
- 		QLineEdit* ldapServer1;
- 		QSpinBox*  port1;
- 		PrintWidget* pwid;
-diff -u -x '*.kde*' -r x2goclient-3.00/onmainwindow.cpp x2goclient-3.00-mod/onmainwindow.cpp
---- x2goclient-3.00/onmainwindow.cpp	2009-03-10 16:07:50.000000000 +0100
-+++ x2goclient-3.00-mod/onmainwindow.cpp	2009-05-12 15:59:22.000000000 +0200
-@@ -715,6 +715,10 @@
- 		ldapPort=st1.value ( "LDAP/port", ( QVariant ) 389 ).toInt();
- 		ldapDn=st1.value ( "LDAP/basedn",
- 		                   ( QVariant ) QString::null ).toString();
-+                ldapBindDN=st1.value ( "LDAP/BindDN",
-+                                       ( QVariant ) QString::null ).toString();
-+                ldapBindDNPw=st1.value ( "LDAP/BindDNPw",
-+                                         ( QVariant ) QString::null ).toString();
- 		ldapServer1=st1.value ( "LDAP/server1",
- 		                        ( QVariant ) QString::null ).toString();
- 		ldapPort1=st1.value ( "LDAP/port1",
-@@ -1489,7 +1493,7 @@
- 	try
- 	{
- 		ld=new LDAPSession ( ldapServer.toStdString(),
--		                     ldapPort,"","",true,false );
-+		                     ldapPort,ldapBindDN.toStdString(),ldapBindDNPw.toStdString(),true,false );
- 	}
- 	catch ( LDAPExeption e )
- 	{
-diff -u -x '*.kde*' -r x2goclient-3.00/onmainwindow.h x2goclient-3.00-mod/onmainwindow.h
---- x2goclient-3.00/onmainwindow.h	2009-03-04 12:08:50.000000000 +0100
-+++ x2goclient-3.00-mod/onmainwindow.h	2009-05-12 15:56:07.000000000 +0200
-@@ -151,6 +151,8 @@
- 		QString retLdapServer() {return ldapServer;}
- 		int retLdapPort() {return ldapPort;}
- 		QString retLdapDn() {return ldapDn;}
-+                QString retLdapBindDN() {return ldapBindDN; }
-+                QString retLdapBindDNPw() {return ldapBindDNPw; }
- 		QString retLdapServer1() {return ldapServer1;}
- 		int retLdapPort1() {return ldapPort1;}
- 		QString retLdapServer2() {return ldapServer2;}
-@@ -350,6 +352,8 @@
- 
- 		QString ldapServer;
- 		int ldapPort;
-+                QString ldapBindDN;
-+                QString ldapBindDNPw;
- 		QString ldapServer1;
- 		int ldapPort1;
- 		QString ldapServer2;
\ No newline at end of file
diff --git a/net-misc/x2goclient/files/x2goclient-3.00.1-noldap.patch b/net-misc/x2goclient/files/x2goclient-3.00.1-noldap.patch
deleted file mode 100644
index 6c50a83..0000000
--- a/net-misc/x2goclient/files/x2goclient-3.00.1-noldap.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Naur x2goclient-3.00.orig/x2goclientconfig.h x2goclient-3.00/x2goclientconfig.h
---- x2goclient-3.00.orig/x2goclientconfig.h	2009-05-14 17:28:13.000000000 +0200
-+++ x2goclient-3.00/x2goclientconfig.h	2009-05-14 17:28:59.000000000 +0200
-@@ -10,13 +10,4 @@
- 
- //#define LOGFILE QDir::homePath()+"/x2goclient.log"
- 
--#if !defined WINDOWS
--#define USELDAP
--#endif
--
--
--#if defined Q_WS_HILDON
--#undef USELDAP
--#endif
--
- #endif
-diff -Naur x2goclient-3.00.orig/x2goclient.pro x2goclient-3.00/x2goclient.pro
---- x2goclient-3.00.orig/x2goclient.pro	2009-05-14 17:28:13.000000000 +0200
-+++ x2goclient-3.00/x2goclient.pro	2009-05-14 17:29:05.000000000 +0200
-@@ -51,7 +51,7 @@
- INCLUDEPATH += .
- RESOURCES += resources.rcc
- RC_FILE = x2goclient.rc
--LIBS += -lldap -lcups
-+LIBS += -lcups
- QT += svg network
- ICON =icons/x2go-mac.icns
- QMAKE_MAC_SDK =/Developer/SDKs/MacOSX10.5.sdk
-diff -Naur x2goclient-3.00.orig/x2goclient.pro.default x2goclient-3.00/x2goclient.pro.default
---- x2goclient-3.00.orig/x2goclient.pro.default	2009-05-14 17:28:13.000000000 +0200
-+++ x2goclient-3.00/x2goclient.pro.default	2009-05-14 17:29:05.000000000 +0200
-@@ -51,7 +51,7 @@
- INCLUDEPATH += .
- RESOURCES += resources.rcc
- RC_FILE = x2goclient.rc
--LIBS += -lldap -lcups
-+LIBS += -lcups
- QT += svg network
- ICON =icons/x2go-mac.icns
- QMAKE_MAC_SDK =/Developer/SDKs/MacOSX10.5.sdk
diff --git a/net-misc/x2goclient/files/x2goclient-3.01.5-noldap.patch b/net-misc/x2goclient/files/x2goclient-3.01.5-noldap.patch
new file mode 100644
index 0000000..ccb27e6
--- /dev/null
+++ b/net-misc/x2goclient/files/x2goclient-3.01.5-noldap.patch
@@ -0,0 +1,26 @@
+diff -Naur x2goclient-3.01.orig/x2goclientconfig.h x2goclient-3.01/x2goclientconfig.h
+--- x2goclient-3.01.orig/x2goclientconfig.h	2010-04-19 20:19:56.000000000 +0200
++++ x2goclient-3.01/x2goclientconfig.h	2010-04-19 20:21:05.000000000 +0200
+@@ -8,10 +8,6 @@
+ 
+ //#define LOGFILE QDir::homePath()+"/x2goclient.log"
+ 
+-#if !defined Q_OS_WIN
+-#define USELDAP
+-#endif
+-
+ #ifdef Q_OS_WIN
+ #undef USELDAP
+ #endif
+diff -Naur x2goclient-3.01.orig/x2goclient.pro x2goclient-3.01/x2goclient.pro
+--- x2goclient-3.01.orig/x2goclient.pro	2010-04-19 20:19:57.000000000 +0200
++++ x2goclient-3.01/x2goclient.pro	2010-04-19 20:21:30.000000000 +0200
+@@ -70,7 +70,7 @@
+ 
+ linux-g++ {
+     message(building x2goclient with ldap and cups)
+-    LIBS += -lldap -lcups
++    LIBS += -lcups
+ }
+ macx {
+     message(building x2goclient with ldap and cups)
diff --git a/net-misc/x2goclient/x2goclient-3.00.1.ebuild b/net-misc/x2goclient/x2goclient-3.00.1.ebuild
deleted file mode 100644
index d03fce5..0000000
--- a/net-misc/x2goclient/x2goclient-3.00.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/x2goclient-2.99.3.ebuild,v 1.1 2009/03/13 12:36:03 voyageur Exp $
-
-EAPI="2"
-inherit qt4 versionator
-
-MAJOR_PV="$(get_version_component_range 1-2)"
-FULL_PV="${MAJOR_PV}-$(get_version_component_range 3)"
-DESCRIPTION="The X2Go Qt client"
-HOMEPAGE="http://x2go.berlios.de"
-SRC_URI="http://x2go.obviously-nice.de/deb/pool-lenny/${PN}/${PN}_${FULL_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap"
-
-DEPEND="net-misc/nx
-	|| ( ( x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-svg:4 )
-		>=x11-libs/qt-4.3:4 )
-	ldap? ( net-nds/openldap )
-	net-print/cups"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}-${MAJOR_PV}
-
-src_prepare() {
-	if use ldap ; then
-		epatch "${FILESDIR}"/${PN}-3.00.1-ldap.patch
-	else
-		epatch "${FILESDIR}"/${PN}-3.00.1-noldap.patch
-	fi
-}
-
-src_compile() {
-	eqmake4
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README
-
-	# copying the icons
-	insinto /usr/share/pixmaps/x2goclient
-	doins icons/*
-	insinto /usr/share/pixmaps/x2goclient/16x16
-	doins icons/16x16/*
-	insinto /usr/share/pixmaps/x2goclient/32x32
-	doins icons/32x32/*
-	insinto /usr/share/pixmaps/x2goclient/64x64
-	doins icons/64x64/*
-	insinto /usr/share/pixmaps/x2goclient/128x128
-	doins icons/128x128/*
-	insinto /usr/share/pixmaps/x2goclient/hildon
-	doins icons/hildon/*
-
-	make_desktop_entry /usr/bin/${PN} ${PN} x2goclient/128x128/${PN}.png "Network"
-}
-
-pkg_postinst(){
-	if use ldap; then
-		elog "You can now specify an binddn and a"
-		elog "password which is used to login at the ldap server."
-		elog "But the password is stored in plaintext at the config file"
-		elog "at your homedirectory!!"
-		elog ""
-	fi
-}
diff --git a/net-misc/x2goclient/x2goclient-3.01.3.ebuild b/net-misc/x2goclient/x2goclient-3.01.3.ebuild
deleted file mode 100644
index d03fce5..0000000
--- a/net-misc/x2goclient/x2goclient-3.01.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/x2goclient-2.99.3.ebuild,v 1.1 2009/03/13 12:36:03 voyageur Exp $
-
-EAPI="2"
-inherit qt4 versionator
-
-MAJOR_PV="$(get_version_component_range 1-2)"
-FULL_PV="${MAJOR_PV}-$(get_version_component_range 3)"
-DESCRIPTION="The X2Go Qt client"
-HOMEPAGE="http://x2go.berlios.de"
-SRC_URI="http://x2go.obviously-nice.de/deb/pool-lenny/${PN}/${PN}_${FULL_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap"
-
-DEPEND="net-misc/nx
-	|| ( ( x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-svg:4 )
-		>=x11-libs/qt-4.3:4 )
-	ldap? ( net-nds/openldap )
-	net-print/cups"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}-${MAJOR_PV}
-
-src_prepare() {
-	if use ldap ; then
-		epatch "${FILESDIR}"/${PN}-3.00.1-ldap.patch
-	else
-		epatch "${FILESDIR}"/${PN}-3.00.1-noldap.patch
-	fi
-}
-
-src_compile() {
-	eqmake4
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README
-
-	# copying the icons
-	insinto /usr/share/pixmaps/x2goclient
-	doins icons/*
-	insinto /usr/share/pixmaps/x2goclient/16x16
-	doins icons/16x16/*
-	insinto /usr/share/pixmaps/x2goclient/32x32
-	doins icons/32x32/*
-	insinto /usr/share/pixmaps/x2goclient/64x64
-	doins icons/64x64/*
-	insinto /usr/share/pixmaps/x2goclient/128x128
-	doins icons/128x128/*
-	insinto /usr/share/pixmaps/x2goclient/hildon
-	doins icons/hildon/*
-
-	make_desktop_entry /usr/bin/${PN} ${PN} x2goclient/128x128/${PN}.png "Network"
-}
-
-pkg_postinst(){
-	if use ldap; then
-		elog "You can now specify an binddn and a"
-		elog "password which is used to login at the ldap server."
-		elog "But the password is stored in plaintext at the config file"
-		elog "at your homedirectory!!"
-		elog ""
-	fi
-}
diff --git a/net-misc/x2goclient/x2goclient-3.01.5.ebuild b/net-misc/x2goclient/x2goclient-3.01.5.ebuild
index 755377c..1ba0f5a 100644
--- a/net-misc/x2goclient/x2goclient-3.01.5.ebuild
+++ b/net-misc/x2goclient/x2goclient-3.01.5.ebuild
@@ -26,13 +26,8 @@ RDEPEND="${DEPEND}"
 S=${WORKDIR}/${PN}-${MAJOR_PV}
 
 src_prepare() {
-#	if use ldap ; then
-#		epatch "${FILESDIR}"/${PN}-3.00.1-ldap.patch
-#	else
-#		epatch "${FILESDIR}"/${PN}-3.00.1-noldap.patch
-#	fi
-	if not use ldap ; then
-		epatch "${FILESDIR}"/${PN}-3.00.1-noldap.patch
+	if ! use ldap ; then
+		epatch "${FILESDIR}"/${P}-noldap.patch
 	fi
 }
 
@@ -59,15 +54,15 @@ src_install() {
 	insinto /usr/share/pixmaps/x2goclient/hildon
 	doins icons/hildon/*
 
-	make_desktop_entry /usr/bin/${PN} ${PN} x2goclient/128x128/${PN}.png "Network"
+	make_desktop_entry ${PN} "X2go client" ${PN} "Network"
 }
 
 pkg_postinst(){
 	if use ldap; then
-		elog "You can now specify an binddn and a"
-		elog "password which is used to login at the ldap server."
-		elog "But the password is stored in plaintext at the config file"
-		elog "at your homedirectory!!"
+		elog "You can now specify a binddn and a password"
+		elog "which is used to login at the ldap server."
+		elog "But the password is stored in plaintext in the config file"
+		elog "in your home directory!!"
 		elog ""
 	fi
 }