summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2008-12-11 19:08:34 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2008-12-11 19:08:34 +0000
commit1da8e1b0ab256f7a6b2ced0ce7838e2f97a539be (patch)
tree75f46f8feef9d3c519551b77737cb8d179c2ea9d /net-misc
parentAdd warning on needed sudoers line (diff)
downloadnx-1da8e1b0ab256f7a6b2ced0ce7838e2f97a539be.tar.gz
nx-1da8e1b0ab256f7a6b2ced0ce7838e2f97a539be.tar.bz2
nx-1da8e1b0ab256f7a6b2ced0ce7838e2f97a539be.zip
Make ldap optional
svn path=/testing/; revision=209
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/x2goclient/Manifest3
-rw-r--r--net-misc/x2goclient/files/x2goclient-2.0.1-noldap.patch39
-rw-r--r--net-misc/x2goclient/x2goclient-2.0.1.21.ebuild12
3 files changed, 49 insertions, 5 deletions
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index 77b668e..3f00c62 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -1,4 +1,5 @@
+AUX x2goclient-2.0.1-noldap.patch 1318 RMD160 92b102ffda472c618a923ca9d1c70ac8102b68a8 SHA1 5cf7c3b8ff20bf99b1f8953a2806b188556e6f69 SHA256 5a1aff6bc674a32d96fc72b9a6f0d2282e7ff1e42e6a4b1649a544ccc6c2b437
DIST x2goclient_2.0.1-21.tar.gz 579425 RMD160 831bcd4e80db540097da108d2a8fa7a76908316f SHA1 cdc0bf6b52dcba4934c4993658a97f15eaafbcb7 SHA256 1353285142c898e9e8b03a3f7c46b8f838dd6d36190a3c07d5afb24def0dd126
-EBUILD x2goclient-2.0.1.21.ebuild 723 RMD160 dbfb9730b9c8661adf1de1958381986018aba505 SHA1 2452032b0a22406b85df67ae4a6f9fa37bea6f62 SHA256 3310a4bc1c3391a13092c5f5b8f4e8632f3fc4f9a6aef1826301e1e3e1b9a4dd
+EBUILD x2goclient-2.0.1.21.ebuild 821 RMD160 0f2a64c6364050db3413b396906d1f6f0526526e SHA1 829bab4d74cb197b344b0e7dbf4cd4d0ee8d98c5 SHA256 3f9411bfda4102ca2cb370c8c7e5722ce0a0dc22be4f857bae0b943d11641276
MISC ChangeLog 303 RMD160 778fcd009f28c457645caf90a804e3713e025594 SHA1 c4a0b6de4491fff1de63e7194a0af95e4a2b383e SHA256 85638676eda7ecedcd6ccf8a4a81362e4cc8890d82083f1ce6cb1afe533c71da
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
new file mode 100644
index 0000000..fb87922
--- /dev/null
+++ b/net-misc/x2goclient/files/x2goclient-2.0.1-noldap.patch
@@ -0,0 +1,39 @@
+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/x2goclient-2.0.1.21.ebuild b/net-misc/x2goclient/x2goclient-2.0.1.21.ebuild
index 1236e18..0da2c55 100644
--- a/net-misc/x2goclient/x2goclient-2.0.1.21.ebuild
+++ b/net-misc/x2goclient/x2goclient-2.0.1.21.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="1"
+EAPI="2"
inherit qt4 versionator
MAJOR_PV="$(get_version_component_range 1-3)"
@@ -14,15 +14,19 @@ SRC_URI="http://x2go.obviously-nice.de/deb/pool/${PN}/${PN}_${FULL_PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="ldap"
DEPEND="net-misc/nx
- net-nds/openldap
|| ( ( x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-svg:4 )
- >=x11-libs/qt-4.3:4 )"
+ >=x11-libs/qt-4.3:4 )
+ ldap? ( net-nds/openldap )"
S=${WORKDIR}/${PN}-${MAJOR_PV}
+src_prepare() {
+ use ldap || epatch "${FILESDIR}"/${PN}-${MAJOR_PV}-noldap.patch
+}
+
src_compile() {
eqmake4
emake || die "emake failed"