Fix patch for no-ldap, changed some spaces in tabs

svn path=/testing/; revision=230

4 files changed, 50 insertions, 49 deletions

diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index f7806ba..533c7f7 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -1,6 +1,6 @@
-AUX x2goclient-2.0.1-noldap.patch 1318 RMD160 92b102ffda472c618a923ca9d1c70ac8102b68a8 SHA1 5cf7c3b8ff20bf99b1f8953a2806b188556e6f69 SHA256 5a1aff6bc674a32d96fc72b9a6f0d2282e7ff1e42e6a4b1649a544ccc6c2b437
 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
-EBUILD x2goclient-3.00.1.ebuild 1886 RMD160 c2232edd96e960abab09bbcfbbd6dcf565735f16 SHA1 7dd7ada7ea41c564a59c3f845f305481a83c98fc SHA256 07e0308bbdf0181641f45023b417641d7ebe1b3f6dbd549dd8919a4b56539dba
+EBUILD x2goclient-3.00.1.ebuild 1785 RMD160 944a1bfb5849b0d793cf4272b8ab4437cca9d0e0 SHA1 247640460f8acfe8b634bbb8e09da7a57697b5ea SHA256 b5665eada8c4701fba99c3821281928a2f9f206721d87fffffba8e6d8ccf776a
 MISC ChangeLog 611 RMD160 71e03804a047a5d4b10d0c3537f00f1c1517a755 SHA1 83462cdff8652547ee01f8398d16705a5ced517e SHA256 c25b6652f6e3bedf7772d124b2615b3d2b118abfb60688bab8d131e4425530b6
 MISC metadata.xml 211 RMD160 7569a339443bfffd41ebdb1db3683d6bbcd2fe5b SHA1 84050eff2270b3218cf8eb00363fe12ecdadfe2e SHA256 a6b5a5387c7e7f441d794c61edf1718caa3c58ffbf9b595ec536ff9617a7471f
diff --git a/net-misc/x2goclient/files/x2goclient-2.0.1-noldap.patch b/net-misc/x2goclient/files/x2goclient-2.0.1-noldap.patch
deleted file mode 100644
index fb87922..0000000
--- a/net-misc/x2goclient/files/x2goclient-2.0.1-noldap.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naur x2goclient-2.0.1.orig/x2goclientconfig.h x2goclient-2.0.1/x2goclientconfig.h
---- x2goclient-2.0.1.orig/x2goclientconfig.h	2008-12-11 19:56:03.000000000 +0100
-+++ x2goclient-2.0.1/x2goclientconfig.h	2008-12-11 19:56:40.000000000 +0100
-@@ -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-2.0.1.orig/x2goclient.pro x2goclient-2.0.1/x2goclient.pro
---- x2goclient-2.0.1.orig/x2goclient.pro	2008-12-11 19:56:03.000000000 +0100
-+++ x2goclient-2.0.1/x2goclient.pro	2008-12-11 19:56:23.000000000 +0100
-@@ -37,7 +37,6 @@
- INCLUDEPATH += .
- RESOURCES += resources.rcc
- RC_FILE = x2goclient.rc
--LIBS += -lldap
- QT += svg network
- ICON =icons/x2go-mac.icns
- QMAKE_MAC_SDK =/Developer/SDKs/MacOSX10.5.sdk
-diff -Naur x2goclient-2.0.1.orig/x2goclient.pro.default x2goclient-2.0.1/x2goclient.pro.default
---- x2goclient-2.0.1.orig/x2goclient.pro.default	2008-12-11 19:56:03.000000000 +0100
-+++ x2goclient-2.0.1/x2goclient.pro.default	2008-12-11 19:56:23.000000000 +0100
-@@ -37,7 +37,6 @@
- INCLUDEPATH += .
- RESOURCES += resources.rcc
- RC_FILE = x2goclient.rc
--LIBS += -lldap
- 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.00.1-noldap.patch b/net-misc/x2goclient/files/x2goclient-3.00.1-noldap.patch
new file mode 100644
index 0000000..6c50a83
--- /dev/null
+++ b/net-misc/x2goclient/files/x2goclient-3.00.1-noldap.patch
@@ -0,0 +1,41 @@
+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/x2goclient-3.00.1.ebuild b/net-misc/x2goclient/x2goclient-3.00.1.ebuild
index 6d594ae..4f9878d 100644
--- a/net-misc/x2goclient/x2goclient-3.00.1.ebuild
+++ b/net-misc/x2goclient/x2goclient-3.00.1.ebuild
@@ -29,9 +29,8 @@ src_prepare() {
 	if use ldap ; then
 		epatch "${FILESDIR}"/${PN}-3.00.1-ldap.patch
 	else
-		epatch "${FILESDIR}"/${PN}-2.0.1-noldap.patch
+		epatch "${FILESDIR}"/${PN}-3.00.1-noldap.patch
 	fi
-#	use ldap || epatch "${FILESDIR}"/${PN}-2.0.1-noldap.patch
 }
 
 src_compile() {
@@ -45,17 +44,17 @@ src_install() {
 	
 	# copying the icons
 	insinto /usr/share/pixmaps/x2goclient
-        doins icons/*
+	doins icons/*
 	insinto /usr/share/pixmaps/x2goclient/16x16
-        doins icons/16x16/*
+	doins icons/16x16/*
 	insinto /usr/share/pixmaps/x2goclient/32x32
-        doins icons/32x32/*
+	doins icons/32x32/*
 	insinto /usr/share/pixmaps/x2goclient/64x64
-        doins icons/64x64/*
+	doins icons/64x64/*
 	insinto /usr/share/pixmaps/x2goclient/128x128
-        doins icons/128x128/*
+	doins icons/128x128/*
 	insinto /usr/share/pixmaps/x2goclient/hildon
-        doins icons/hildon/*
+	doins icons/hildon/*
 
 	make_desktop_entry /usr/bin/${PN} ${PN} x2goclient/128x128/${PN}.png "Network"
 }