Build requires man2html so depend on sys-apps/man, thanks Hans-Peter Deifel <hpdeifel@gmx.de> in bug #435652. Server will not work at runtime without font-misc-misc and font-cursor-misc, spotted by rich0 in bug #436156. Respect CFLAGS in sqlitewrapper compilation, bug #426830

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key C74525F2)

3 files changed, 103 insertions, 1 deletions

diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog
index 27bda511d9b1..cc777a838e2b 100644
--- a/net-misc/x2goserver/ChangeLog
+++ b/net-misc/x2goserver/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/x2goserver
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.12 2012/09/28 12:56:27 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.13 2012/10/31 14:23:28 voyageur Exp $
+
+*x2goserver-3.1.1.4-r1 (31 Oct 2012)
+
+  31 Oct 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  +x2goserver-3.1.1.4-r1.ebuild, +files/x2goserver-3.1.1.4-cflags.patch:
+  Build requires man2html so depend on sys-apps/man, thanks Hans-Peter Deifel
+  <hpdeifel@gmx.de> in bug #435652. Server will not work at runtime without
+  font-misc-misc and font-cursor-misc, spotted by rich0 in bug #436156. Respect
+  CFLAGS in sqlitewrapper compilation, bug #426830
 
 *x2goserver-3.1.1.4 (28 Sep 2012)
 
diff --git a/net-misc/x2goserver/files/x2goserver-3.1.1.4-cflags.patch b/net-misc/x2goserver/files/x2goserver-3.1.1.4-cflags.patch
new file mode 100644
index 000000000000..b87bef39bc98
--- /dev/null
+++ b/net-misc/x2goserver/files/x2goserver-3.1.1.4-cflags.patch
@@ -0,0 +1,22 @@
+--- x2goserver/Makefile.orig	2012-10-31 15:03:35.734483627 +0100
++++ x2goserver/Makefile	2012-10-31 15:05:55.505918654 +0100
+@@ -3,6 +3,10 @@
+ SRC_DIR=$(CURDIR)
+ SHELL=/bin/bash
+ 
++CC?=gcc
++CFLAGS+=-fPIE -pie
++LDFLAGS+=
++
+ INSTALL_DIR=install -d -o root -g root -m 755
+ INSTALL_FILE=install -o root -g root -m 644
+ INSTALL_PROGRAM=install -o root -g root -m 755
+@@ -37,7 +41,7 @@
+ build-arch: build_setgidwrappers
+ 
+ build_setgidwrappers:
+-	gcc -fPIE -pie -o x2gosqlitewrapper x2gosqlitewrapper.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c
+ 
+ build-indep: build_man2html
+ 
diff --git a/net-misc/x2goserver/x2goserver-3.1.1.4-r1.ebuild b/net-misc/x2goserver/x2goserver-3.1.1.4-r1.ebuild
new file mode 100644
index 000000000000..dd191813f288
--- /dev/null
+++ b/net-misc/x2goserver/x2goserver-3.1.1.4-r1.ebuild
@@ -0,0 +1,71 @@
+# 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.1.4-r1.ebuild,v 1.1 2012/10/31 14:23:28 voyageur Exp $
+
+EAPI=4
+inherit eutils multilib toolchain-funcs user
+
+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="sys-apps/man"
+RDEPEND="dev-perl/Config-Simple
+	media-fonts/font-cursor-misc
+	media-fonts/font-misc-misc
+	net-misc/nx
+	virtual/ssh
+	fuse? ( sys-fs/sshfs-fuse )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
+
+pkg_setup() {
+	enewuser x2gouser -1 -1 /var/lib/x2go
+	enewuser x2goprint -1 -1 /var/spool/x2goprint
+}
+
+src_prepare() {
+	# Respect CC/CFLAGS
+	epatch "${FILESDIR}"/${P}-cflags.patch
+
+	# 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_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	fowners root:x2goprint /usr/bin/x2goprint
+	fperms 2755 /usr/bin/x2goprint
+	dosym /usr/share/applications /etc/x2go/applications
+
+	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
+}
+
+pkg_postinst() {
+	if use sqlite ; then
+		elog "To use sqlite and create the initial database, run:"
+		elog " # x2godbadmin --createdb"
+	fi
+	if use postgres ; then
+		elog "To use a PostgreSQL databse, more information is availabe here:"
+		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
+	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"
+}