Version bump from NX overlay, drop 2.x version

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

3 files changed, 159 insertions, 10 deletions

diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog
index 7fdbdc4ff289..b8914fade3a5 100644
--- a/net-misc/x2goserver/ChangeLog
+++ b/net-misc/x2goserver/ChangeLog
@@ -1,14 +1,11 @@
 # ChangeLog for net-misc/x2goserver
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.2 2009/12/05 09:11:32 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.3 2010/04/29 12:48:01 voyageur Exp $
 
-  05 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
-  x2goserver-2.0.1.19.ebuild:
-  Remove kde-base/kdelibs:3.5 support.
+*x2goserver-3.0.1.5 (29 Apr 2010)
 
-*x2goserver-2.0.1.19 (13 Mar 2009)
-
-  13 Mar 2009; Bernard Cafarelli <voyageur@gentoo.org>
-  +files/x2goserver.init, +metadata.xml, +x2goserver-2.0.1.19.ebuild:
-  Initial portage commit, from the NX overlay
+  29 Apr 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/x2goserver-mountdirs_no_desktop_icon.patch,
+  +x2goserver-3.0.1.5.ebuild:
+  Version bump from NX overlay, drop 2.x version
 
diff --git a/net-misc/x2goserver/files/x2goserver-mountdirs_no_desktop_icon.patch b/net-misc/x2goserver/files/x2goserver-mountdirs_no_desktop_icon.patch
new file mode 100644
index 000000000000..0fb7e0ae784c
--- /dev/null
+++ b/net-misc/x2goserver/files/x2goserver-mountdirs_no_desktop_icon.patch
@@ -0,0 +1,65 @@
+--- usr/bin/x2gomountdirs.org	2010-01-18 22:18:16.000000000 +0100
++++ usr/bin/x2gomountdirs	2010-01-18 22:16:33.000000000 +0100
+@@ -144,34 +144,34 @@
+             if(system("sshfs  -o Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident $user\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 2>>~/mounts.log")==0)
+             {   
+         	print "mount @dirs[$i] ok\n";
+-		if(! $printspool)
+-		{
+-        	    my $fname="$ENV{'HOME'}/Desktop";
+-		    my $p=@dirs[$i];
+-        	    $p=~s/\/cygdrive\///g;
+-            	    $p=~s/\//_/g;
+-		    $fname="$fname/$p";
+-		    if($type eq "dir")
+-		    {
+-	    		$fname="$fname(sshfs-disk)";
+-		    }
+-		    else
+-		    {
+-			if($fname =~ m/CDROM/)
+-			{
+-	    	    	    $fname="$fname(sshfs-cdrom)";
+-			}
+-			else
+-			{
+-	    	    	    $fname="$fname(sshfs-removable)";
+-			}
+-			$fname=~s/_ramdrive_mnt_//;
+-		    }
+-		    print "fname: $fname\n";
+-		    open(F,">$fname");
+-		    print F "$mntpath\n$session\n\n\0";
+-		    close(F);
+-		}
++#		if(! $printspool)
++#		{
++#        	    my $fname="$ENV{'HOME'}/Desktop";
++#		    my $p=@dirs[$i];
++#        	    $p=~s/\/cygdrive\///g;
++#            	    $p=~s/\//_/g;
++#		    $fname="$fname/$p";
++#		    if($type eq "dir")
++#		    {
++#	    		$fname="$fname(sshfs-disk)";
++#		    }
++#		    else
++#		    {
++#			if($fname =~ m/CDROM/)
++#			{
++#	    	    	    $fname="$fname(sshfs-cdrom)";
++#			}
++#			else
++#			{
++#	    	    	    $fname="$fname(sshfs-removable)";
++#			}
++#			$fname=~s/_ramdrive_mnt_//;
++#		    }
++#		    print "fname: $fname\n";
++#		    open(F,">$fname");
++#		    print F "$mntpath\n$session\n\n\0";
++#		    close(F);
++#		}
+     	    }
+     	    else
+     	    {
diff --git a/net-misc/x2goserver/x2goserver-3.0.1.5.ebuild b/net-misc/x2goserver/x2goserver-3.0.1.5.ebuild
new file mode 100644
index 000000000000..7f9fe02b794b
--- /dev/null
+++ b/net-misc/x2goserver/x2goserver-3.0.1.5.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-3.0.1.5.ebuild,v 1.1 2010/04/29 12:48:01 voyageur Exp $
+
+EAPI=1
+inherit eutils 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 ldap postgres sqlite"
+
+DEPEND=""
+RDEPEND="app-admin/sudo
+	net-misc/nx
+	virtual/ssh
+	fuse? ( sys-fs/sshfs-fuse )
+	postgres? ( virtual/postgresql-server )
+	sqlite? ( dev-db/sqlite )"
+# Still in the NX overlay for now
+#	ldap? ( net-misc/x2goldaptools )"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	tar xozf data.tar.gz || die "failure unpacking data.tar.gz"
+
+	# Use nxagent directly
+	sed -i -e "s/x2goagent/nxagent/" usr/bin/x2gostartagent || die "sed failed"
+
+	if use sqlite ; then
+		echo sqlite > etc/x2go/sql
+	fi
+
+	epatch "${FILESDIR}"/${PN}-mountdirs_no_desktop_icon.patch
+}
+
+src_install() {
+	dobin usr/bin/*
+	dosbin usr/sbin/*
+
+	exeinto /usr/share/x2go/script
+	doexe usr/lib/x2go/script/x2gocreatebase.sh
+	doexe usr/lib/x2go/script/x2gosqlite.sh
+
+	insinto /etc/x2go
+	doins etc/x2go/sql
+	doins etc/x2go/x2goserver.conf
+
+	if use sqlite ; then
+		einfo "creating x2go sqlite database directory /var/db/x2go"
+		dodir /var/db/x2go
+	fi
+
+	if use postgres ; then
+		newinitd "${FILESDIR}"/${PN}.init ${PN}
+	fi
+}
+
+pkg_postinst() {
+	if use postgres ; then
+		elog "To work, x2goserver needs a configured postgreSQL database"
+		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"
+	fi
+	if use sqlite ; then
+		elog "To work, x2goserver needs a configured sqlite database"
+		elog "Sample script to create the database can be found here:"
+		elog "    /usr/share/x2go/script/x2gosqlite.sh"
+	fi
+	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"
+}