Version bump, update patch to honour CC/LDFLAGS

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

3 files changed, 53 insertions, 11 deletions

diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog
index 03fa6484ca32..5cf85330122d 100644
--- a/net-misc/x2goserver/ChangeLog
+++ b/net-misc/x2goserver/ChangeLog
@@ -1,6 +1,13 @@
 # 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.17 2012/12/16 16:29:21 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.18 2013/01/08 10:52:49 voyageur Exp $
+
+*x2goserver-4.0.0.0 (08 Jan 2013)
+
+  08 Jan 2013; Bernard Cafarelli <voyageur@gentoo.org>
+  -x2goserver-3.1.0.1.ebuild, +x2goserver-4.0.0.0.ebuild,
+  +files/x2goserver-4.0.0.0-cc_ldflags.patch:
+  Version bump, update patch to honour CC/LDFLAGS
 
   16 Dec 2012; Agostino Sarubbo <ago@gentoo.org> x2goserver-3.1.1.4-r1.ebuild:
   Stable for x86, wrt bug #445766
diff --git a/net-misc/x2goserver/files/x2goserver-4.0.0.0-cc_ldflags.patch b/net-misc/x2goserver/files/x2goserver-4.0.0.0-cc_ldflags.patch
new file mode 100644
index 000000000000..87bf38cf2a4a
--- /dev/null
+++ b/net-misc/x2goserver/files/x2goserver-4.0.0.0-cc_ldflags.patch
@@ -0,0 +1,22 @@
+--- x2goserver/Makefile.orig	2013-01-08 10:44:54.134787510 +0100
++++ x2goserver/Makefile	2013-01-08 10:46:06.721676563 +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 $(CFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c
+ 
+ build-indep: build_man2html
+ 
diff --git a/net-misc/x2goserver/x2goserver-3.1.0.1.ebuild b/net-misc/x2goserver/x2goserver-4.0.0.0.ebuild
index 0d3af2d59dfa..f9a4178840ca 100644
--- a/net-misc/x2goserver/x2goserver-3.1.0.1.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.0.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.2 2012/07/10 13:56:11 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-4.0.0.0.ebuild,v 1.1 2013/01/08 10:52:49 voyageur Exp $
 
 EAPI=4
-inherit eutils multilib user
+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"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,26 +16,33 @@ IUSE="+fuse postgres +sqlite"
 
 REQUIRED_USE="|| ( postgres sqlite )"
 
-DEPEND=""
+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 )"
 
-S=${WORKDIR}/${P/-/_}
-
 pkg_setup() {
 	enewuser x2gouser -1 -1 /var/lib/x2go
 	enewuser x2goprint -1 -1 /var/spool/x2goprint
 }
 
 src_prepare() {
+	# Respect CC/LDFLAGS
+	epatch "${FILESDIR}"/${P}-cc_ldflags.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"
+	sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
@@ -43,15 +50,21 @@ src_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 create the initial database, run:"
+		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"