New server 3.0.0-1

New x2goclient 3.00-1 and now it installs icons and a menu entry


svn path=/testing/; revision=228

7 files changed, 193 insertions, 1 deletions

diff --git a/net-misc/x2goclient/ChangeLog b/net-misc/x2goclient/ChangeLog
new file mode 100644
index 0000000..792c9a7
--- /dev/null
+++ b/net-misc/x2goclient/ChangeLog
@@ -0,0 +1,15 @@
+# ChangeLog for net-misc/x2goclient
+# Copyright 1999-2009 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 $
+
+  16 Apr 2009; Bernard Cafarelli <voyageur@gentoo.org> Manifest:
+  Upstream modified source tarball, bug #266141
+
+*x2goclient-2.99.3 (13 Mar 2009)
+*x2goclient-2.0.1.24 (13 Mar 2009)
+
+  13 Mar 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/x2goclient-2.0.1-noldap.patch, +metadata.xml,
+  +x2goclient-2.0.1.24.ebuild, +x2goclient-2.99.3.ebuild:
+  Initial portage commit, from the NX overlay
+
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
new file mode 100644
index 0000000..5b4386a
--- /dev/null
+++ b/net-misc/x2goclient/Manifest
@@ -0,0 +1,5 @@
+AUX x2goclient-2.0.1-noldap.patch 1318 RMD160 92b102ffda472c618a923ca9d1c70ac8102b68a8 SHA1 5cf7c3b8ff20bf99b1f8953a2806b188556e6f69 SHA256 5a1aff6bc674a32d96fc72b9a6f0d2282e7ff1e42e6a4b1649a544ccc6c2b437
+DIST x2goclient_3.00-1.tar.gz 664378 RMD160 89e4fd4838cd14299032bbee4d6fb0878c4ae513 SHA1 8cdb5fcc9d8c8384189dd6ed82eb0207c80d366b SHA256 95e8625e5b613082220d98c0b406b029f8420da92f83303b0040ed2f43498b45
+EBUILD x2goclient-3.00.1.ebuild 1485 RMD160 e1c7a57497b0e1b3cdc64059ff72e0a19ed17f10 SHA1 d8e8ee23eccb54587888f7da493890c89384a2b1 SHA256 076c698012ba5ac46ac5610c1f92d87f02e8d68c01df91e717115271434950bc
+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
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/metadata.xml b/net-misc/x2goclient/metadata.xml
new file mode 100644
index 0000000..f009de1
--- /dev/null
+++ b/net-misc/x2goclient/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>nx</herd>
+	<longdescription>The X2Go Qt client</longdescription>
+</pkgmetadata>
diff --git a/net-misc/x2goclient/x2goclient-3.00.1.ebuild b/net-misc/x2goclient/x2goclient-3.00.1.ebuild
new file mode 100644
index 0000000..f2bc658
--- /dev/null
+++ b/net-misc/x2goclient/x2goclient-3.00.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2009 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 )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}-${MAJOR_PV}
+
+src_prepare() {
+	use ldap ||	epatch "${FILESDIR}"/${PN}-2.0.1-noldap.patch
+}
+
+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"
+}
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 2b8baa7..e4d58a6 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -1,5 +1,7 @@
-AUX x2goserver.init 493 RMD160 439888c465f19433dc4ca42193eaefc5bd2d793c SHA1 3fc7dd4252b500895cd7b56efa29849014bf3741 SHA256 981ca3e263c5a4db6776d44f6caccf3a1f0d976459d610a1ca851990c9e27747
+AUX x2goserver.init 493 RMD160 5633609c39c43c7d810712cecb89cf947329862d SHA1 a6096f59d62f9be79250accddbc912d62b6226cd SHA256 b03cffd2c4eb539cc1904c42058d18f8b389cf7ed26ea4175ee0a136249c3feb
 DIST x2goserver_2.0.1-19_all.deb 14536 RMD160 9052af7fe76051d13dbda6b8ca4dd0192e88218a SHA1 5610b16b5529ea65bd19bfee7a7a9dfc8079b716 SHA256 513173c738dfa6a4e379ccb1a99eaff46803ad08a325073fbca8b76b6be76d56
+DIST x2goserver_3.0.0-1_all.deb 15000 RMD160 ce8d06fefa8426cedaf9ac64bc60af17de8cc905 SHA1 90b6377d8e02f66bc396a4279c32f3d25266088f SHA256 99b5bd556f2cdb9bb399b9c35efa4b8406f23a8ea766d84a060a0e1671c468ba
 EBUILD x2goserver-2.0.1.19.ebuild 1723 RMD160 b8bce1018b13defa02c67ecb66ce22a3cdcd9fee SHA1 26ce63cf85bd8dbfb3c02dd18534e86e8a75d58f SHA256 d10ddef4322cf7894abb98ec8b314e31c56b3ea03fb03bf3e842f1050d813e23
+EBUILD x2goserver-3.0.0.1.ebuild 1907 RMD160 c9af82dee9fcaafdd2cb4dfd9d2b0da8dbac500a SHA1 6ba6ba32c83f5dd91b690b23358a1fda420f29e2 SHA256 56d0f6abe3e26f3b1b1e8aeff94ade69109a348f893d4cf803a0db236b5d45a9
 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-3.0.0.1.ebuild b/net-misc/x2goserver/x2goserver-3.0.0.1.ebuild
new file mode 100644
index 0000000..777d4bd
--- /dev/null
+++ b/net-misc/x2goserver/x2goserver-3.0.0.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=1
+inherit versionator
+
+MAJOR_PV="$(get_version_component_range 1-3)"
+FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)"
+DESCRIPTION="The X2Go server"
+HOMEPAGE="http://x2go.berlios.de"
+SRC_URI="http://x2go.obviously-nice.de/deb/pool-lenny/${PN}/${PN}_${FULL_PV}_all.deb"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+fuse kde ldap"
+
+DEPEND=""
+RDEPEND="app-admin/sudo
+	net-misc/nx
+	virtual/postgresql-server
+	virtual/ssh
+	fuse? ( sys-fs/sshfs-fuse )
+	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}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	tar xozf data.tar.gz || die "failure unpacking data.tar.gz"
+
+	# Needs testing, is it fully compatible with nxagent?
+	sed -i -e "s/x2goagent/nxagent/" usr/bin/x2gostartagent || die "sed failed"
+}
+
+src_install() {
+	dobin usr/bin/*
+	dosbin usr/sbin/*
+
+	exeinto /usr/share/x2go/script
+	doexe usr/lib/x2go/script/x2gocreatebase.sh
+
+	insinto /etc/x2go
+	doins etc/x2go/sql
+
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+}
+
+pkg_postinst() {
+	elog "To work, x2goserver needs a configured postgreSQL database"
+	elog "To use a database on localhost:"
+	elog "	echo -n local > /etc/x2go/sql"
+	elog "Sample script to create the database can be found here:"
+	elog "    /usr/share/x2go/script/x2gocreatebase.sh"
+	einfo ""
+	elog "You also need to give sudo rights on x2gopgwrapper to your users"
+	elog "A sudoers example for all members of the group users:"
+	elog "    %users ALL=(ALL) NOPASSWD: /usr/bin/x2gopgwrapper"
+	elog "To give only a special group access to the x2goserver, "
+	elog "change %users to any other group"
+}