Add ldap depends to x2goserver, some cleanups

svn path=/testing/; revision=219

6 files changed, 18 insertions, 9 deletions

diff --git a/net-misc/nxweb/Manifest b/net-misc/nxweb/Manifest
index a6ed744..8b41654 100644
--- a/net-misc/nxweb/Manifest
+++ b/net-misc/nxweb/Manifest
@@ -1,2 +1,2 @@
 DIST nxplugin-3.0.0-5.i386.tar.gz 13875502 RMD160 f2faa7dbab4e869a04ee059cc1bd25299b6cc7de SHA1 ea2fa4ee84ef8227a6f125343568b679296be116 SHA256 6e0801cf80084450d22a3558a22879179aeed215c7dad827f32f750d10d914e5
-EBUILD nxweb-3.0.0.ebuild 1004 RMD160 652f2c1ed4661cc0e5a79252fdd3926e094493a5 SHA1 46e7f2917da67a3ebc53fccc648f7c51e13d3298 SHA256 cbf5fe1c32d9936d0bb3dd3810e6c3f3369334c68c8558f89433ad4212a44430
+EBUILD nxweb-3.0.0.ebuild 1006 RMD160 c89b67dca4c570d1e1628075de1520d0fc779393 SHA1 8941cfa3ab65affecee36d9a74a644e969aa7624 SHA256 6949624f8f061c387ce42732da5c36b849be5a9692d347b5ebfdcaadd87eb618
diff --git a/net-misc/nxweb/nxweb-3.0.0.ebuild b/net-misc/nxweb/nxweb-3.0.0.ebuild
index 009d506..3447560 100644
--- a/net-misc/nxweb/nxweb-3.0.0.ebuild
+++ b/net-misc/nxweb/nxweb-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -23,7 +23,7 @@ src_install() {
 	sed -i -e "s|http://webserver|http://${VHOST_HOSTNAME}/${PN}|" usr/NX/share/plugin/nxapplet.html
 	[ "$VHOST_HOSTNAME" = localhost ] && ewarn "Server hostname is localhost, the plugin will not be usable from remote hosts"
 
-	cp -R usr/NX/share/* ${D}/${MY_HTDOCSDIR}
+	cp -R usr/NX/share/* "${D}"/${MY_HTDOCSDIR}
 
 	#TODO: webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
 	# Note to the user that she can access the client at http://localhost/nxweb/plugin/nxapplet.html
diff --git a/net-misc/x2goldaptools/Manifest b/net-misc/x2goldaptools/Manifest
index 0dfcaf3..2767978 100644
--- a/net-misc/x2goldaptools/Manifest
+++ b/net-misc/x2goldaptools/Manifest
@@ -1,2 +1,2 @@
 DIST x2goldaptools_2.0.1-8_all.deb 17658 RMD160 79d1b7cd0925ec55ab9e6e5734a3dc8bf0fcb26e SHA1 1612f09c8ebcb71263c5b9f0ee344d971ef02401 SHA256 d4b2c11779e761692dd040f641d57edcc15be60f40b73507f684f138f86f8240
-EBUILD x2goldaptools-2.0.1.8.ebuild 1346 RMD160 2fbf711e28308873c50b54fc86eb6c92db99b730 SHA1 cbba37625518985ef2984b9286bec111d0291cb1 SHA256 f5677739c9ab74d35b5b31a3970de7f7e149e2a7ff0e46a4b8810109065e413b
+EBUILD x2goldaptools-2.0.1.8.ebuild 1392 RMD160 4461e7aaec4f77ff85567cc7515b884a589d249e SHA1 dc5c6ad942d6667c982fdd3cebb71a94d51c4282 SHA256 937d392cd7bdb34b73fd753eda6ece11c66008d1b555e34445b0418cd82f7037
diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog
index d66620f..e07e513 100644
--- a/net-misc/x2goserver/ChangeLog
+++ b/net-misc/x2goserver/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Dec 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  x2goserver-2.0.1.16.ebuild:
+  Depend on ldap ebuilds
+
   15 Dec 2008; Bernard Cafarelli <voyageur@gentoo.org>
   x2goserver-2.0.1.16.ebuild:
   Add dependency on KDE tools (bindings and sessionadministration)
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 7e568c8..7f9393a 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -1,5 +1,5 @@
 AUX x2goserver.init 493 RMD160 439888c465f19433dc4ca42193eaefc5bd2d793c SHA1 3fc7dd4252b500895cd7b56efa29849014bf3741 SHA256 981ca3e263c5a4db6776d44f6caccf3a1f0d976459d610a1ca851990c9e27747
 DIST x2goserver_2.0.1-16_all.deb 13282 RMD160 534edd191763b8ac06ee10f83beb84198cc6b597 SHA1 a853ebb6251297e8585d53ea0a4fdfec27050312 SHA256 29bf3698f1a9663e7935d11d51960488f368b466dce47f0c7fa74f6a859270f9
-EBUILD x2goserver-2.0.1.16.ebuild 1534 RMD160 b5b53cca95cdf52a36b2313ce433c27010d685ac SHA1 4781de66a15e992b70a65a4a45f79b769feb5a9c SHA256 5137b98791929c1a9e7e2c36e6353950188262c530fef89ec4169fedf1530bcc
-MISC ChangeLog 418 RMD160 d7fb5db6b93f5707f0402df3c3f3589289308c28 SHA1 8c256a0ed443fd66453b9783fdbaef051bccb203 SHA256 f661747fdb7cf55b84f0c9d44dfada17380e7240f2bffa957bdebb98138c508f
+EBUILD x2goserver-2.0.1.16.ebuild 1723 RMD160 b8bce1018b13defa02c67ecb66ce22a3cdcd9fee SHA1 26ce63cf85bd8dbfb3c02dd18534e86e8a75d58f SHA256 d10ddef4322cf7894abb98ec8b314e31c56b3ea03fb03bf3e842f1050d813e23
+MISC ChangeLog 684 RMD160 0863db42b5601dad9309026596c8351a309bd42b SHA1 ddaef3fa042f5c58e96ed27215b0455bffe2d44e SHA256 ec7c27a24e2a69ee4e492a62de3578f76ec7521286804c420cbc2aecceade238
 MISC metadata.xml 307 RMD160 0172cd4fc792a41fde528ec788ab0dd98f3d21bc SHA1 953412d99904e25f4845fdfda587298e7cbc7f2a SHA256 b19b0330b6614bc27421032b94f6ade24661e38c818140c598d50cb91e82bce6
diff --git a/net-misc/x2goserver/x2goserver-2.0.1.16.ebuild b/net-misc/x2goserver/x2goserver-2.0.1.16.ebuild
index d51d67e..9cd6286 100644
--- a/net-misc/x2goserver/x2goserver-2.0.1.16.ebuild
+++ b/net-misc/x2goserver/x2goserver-2.0.1.16.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://x2go.obviously-nice.de/deb/pool-lenny/${PN}/${PN}_${FULL_PV}_all
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+fuse kde"
+IUSE="+fuse kde ldap"
 
 DEPEND=""
 RDEPEND="app-admin/sudo
@@ -22,8 +22,13 @@ RDEPEND="app-admin/sudo
 	virtual/postgresql-server
 	virtual/ssh
 	fuse? ( sys-fs/sshfs-fuse )
-	kde? ( net-misc/x2gokdebindings 
-		net-misc/x2gosessionadministration )"
+	kde? ( net-misc/x2gokdebindings
+		net-misc/x2gosessionadministration )
+	ldap? ( net-misc/x2goldaptools
+		kde? ( net-misc/x2gogroupadministration
+			net-misc/x2gohostadministration
+			net-misc/x2gosystemadministration
+			net-misc/x2gouseradministration ) )"
 
 S=${WORKDIR}