Version bump, cleaned ebuild and adapted to new server system. Fixes bug #408105

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

6 files changed, 71 insertions, 264 deletions

diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog
index e1d0ca3d998f..a0d476fc7efc 100644
--- a/net-misc/x2goserver/ChangeLog
+++ b/net-misc/x2goserver/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/x2goserver
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.7 2010/07/01 13:22:10 voyageur Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.8 2012/03/14 22:30:45 voyageur Exp $
+
+*x2goserver-3.1.0.1 (14 Mar 2012)
+
+  14 Mar 2012; Bernard Cafarelli <voyageur@gentoo.org> files/x2goserver.init,
+  -x2goserver-3.0.1.5.ebuild, -x2goserver-3.0.1.5-r1.ebuild,
+  +x2goserver-3.1.0.1.ebuild,
+  -files/x2goserver-mountdirs_no_desktop_icon.patch:
+  Version bump, cleaned ebuild and adapted to new server system. Fixes bug
+  #408105
 
 *x2goserver-3.0.1.5-r1 (01 Jul 2010)
 
diff --git a/net-misc/x2goserver/files/x2goserver-mountdirs_no_desktop_icon.patch b/net-misc/x2goserver/files/x2goserver-mountdirs_no_desktop_icon.patch
deleted file mode 100644
index 0fb7e0ae784c..000000000000
--- a/net-misc/x2goserver/files/x2goserver-mountdirs_no_desktop_icon.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- 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/files/x2goserver.init b/net-misc/x2goserver/files/x2goserver.init
index c4a0927f07a4..6834582136d0 100644
--- a/net-misc/x2goserver/files/x2goserver.init
+++ b/net-misc/x2goserver/files/x2goserver.init
@@ -1,15 +1,10 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/files/x2goserver.init,v 1.1 2009/03/13 12:44:48 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/files/x2goserver.init,v 1.2 2012/03/14 22:30:45 voyageur Exp $
 
 DAEMON=/usr/sbin/x2gocleansessions
 
-depend() {
-	need postgresql
-	use sshd
-}
-
 start() {
 	ebegin "Starting ${SVCNAME}"
 	start-stop-daemon --start --quiet --pidfile /var/run/${SVCNAME}.pid \
diff --git a/net-misc/x2goserver/x2goserver-3.0.1.5-r1.ebuild b/net-misc/x2goserver/x2goserver-3.0.1.5-r1.ebuild
deleted file mode 100644
index 8cb978cb994f..000000000000
--- a/net-misc/x2goserver/x2goserver-3.0.1.5-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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-r1.ebuild,v 1.1 2010/07/01 13:22:10 voyageur Exp $
-
-EAPI=3
-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 postgres sqlite"
-
-DEPEND=""
-RDEPEND="app-admin/sudo
-	dev-perl/Config-Simple
-	net-misc/nx
-	virtual/ssh
-	fuse? ( sys-fs/sshfs-fuse )
-	postgres? ( dev-db/postgresql-server )
-	sqlite? ( dev-db/sqlite )"
-# Still in the NX overlay for now
-#	ldap? ( net-misc/x2goldaptools )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	if ! use postgres && ! use sqlite; then
-		echo
-		eerror "Either the 'postgres' or the 'sqlite' USE flag is required."
-		eerror "Please add it to '/etc/make.conf' or '/etc/portage/package.use'."
-		eerror "Use 'man 5 portage' for more info on '/etc/portage/package.use'."
-		echo
-		die "Required USE flag missing."
-	fi
-}
-
-src_prepare() {
-	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 && use sqlite;  then
-		elog "You have enabled both postgreSQL and sqlite (enabled by default) database support"
-		elog "To use a postgreSQL database, run:"
-		elog "	echo -n local > /etc/x2go/sql"
-		elog "To switch back to sqlite, run:"
-		elog "	echo -n sqlite > /etc/x2go/sql"
-	fi
-	if use postgres ; then
-		elog "To work with postgreSQL, x2goserver needs a configured database"
-		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 with sqlite, x2goserver needs a configured 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"
-}
diff --git a/net-misc/x2goserver/x2goserver-3.0.1.5.ebuild b/net-misc/x2goserver/x2goserver-3.0.1.5.ebuild
deleted file mode 100644
index b579e6f8ad40..000000000000
--- a/net-misc/x2goserver/x2goserver-3.0.1.5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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.3 2010/06/17 21:57:27 patrick 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
-	dev-perl/Config-Simple
-	net-misc/nx
-	virtual/ssh
-	fuse? ( sys-fs/sshfs-fuse )
-	postgres? ( dev-db/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"
-}
diff --git a/net-misc/x2goserver/x2goserver-3.1.0.1.ebuild b/net-misc/x2goserver/x2goserver-3.1.0.1.ebuild
new file mode 100644
index 000000000000..c6b01866fc77
--- /dev/null
+++ b/net-misc/x2goserver/x2goserver-3.1.0.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-3.1.0.1.ebuild,v 1.1 2012/03/14 22:30:45 voyageur Exp $
+
+EAPI=4
+inherit eutils multilib
+
+DESCRIPTION="The X2Go server"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+fuse postgres +sqlite"
+
+REQUIRED_USE="|| ( postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-perl/Config-Simple
+	net-misc/nx
+	virtual/ssh
+	fuse? ( sys-fs/sshfs-fuse )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
+
+S=${WORKDIR}/${P/-/_}
+
+pkg_setup() {
+	enewuser x2gouser -1 -1 /var/lib/x2go
+	enewuser x2goprint -1 -1 /var/spool/x2goprint
+}
+
+src_prepare() {
+	# Multilib clean
+	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i */Makefile || die "multilib sed failed"
+	# Use nxagent directly
+	sed -i -e "s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	fowners root:x2goprint /usr/bin/x2goprint
+	fperms 2755 /usr/bin/x2goprint
+
+	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
+}
+
+pkg_postinst() {
+	if use sqlite ; then
+		elog "To create the initial database, run:"
+		elog " # x2godbadmin --createdb"
+	fi
+	elog "For password authentication, you need to enable PasswordAuthentication"
+	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
+	elog "An init script was installed for x2gocleansessions"
+}