Version bump, update patch to honour CC/LDFLAGS

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

4 files changed, 67 insertions, 14 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/Manifest b/net-misc/x2goserver/Manifest
index 7eaf53ef20c0..30ce6eb13213 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX x2goserver-3.1.1.4-cflags.patch 600 SHA256 5d65df4fb976121f2311205ae519a8cee400a60ccf8e5d848c4da1cee25d32cf SHA512 6c9e35c25efcc90719231a10b7e23691c2db82ef802895cec00740e8dc7bcfcb4d7ec4cd7880a068244548eb8154e778c5d56b60f8df1a5428dd362b34c21087 WHIRLPOOL 88cb07e0875d05f8e663813c7b65bca3f64e37e8398486431bb33af9acfd01ac08ddca11d939ea729542bcaf9f2f8d61ec34dc0785f61552df5eefa52c3e90ff
+AUX x2goserver-4.0.0.0-cc_ldflags.patch 610 SHA256 a0fde1cb35022031aed8e32a9122f7437ec19667ec40ca52c058a135eb5f6aea SHA512 e854500f59d77616e09d3c5b218bb5b208d83cd1f2df1f734f0a8b90852a7b9b122f62dcc050e9e16767d676c59a614adc4ca1a5e9f9eab7bf5561f33b9806b6 WHIRLPOOL beb88984509023d03d7c427d25d29719598fcfbd19034df8269f47e41cc07dab35b8379f76263ad0bd509f594ac84e8b23cfcd0e13b18226c5fdf55643e742e4
 AUX x2goserver.init 563 SHA256 c051f263ad2ad9b6064ce12098ad0c3d48b2a83a2c02ccd79020e0ce4be3331c SHA512 cac89ad0032b56188dc30f09bd461762934d5fadf53ccf361125dbefed3c09000b9b00684f7823424340d290c759e112e618f4d4e9d7e739c79702b70a6b3b3c WHIRLPOOL 0f134b9aed4e60f48e7089f97ca6d183387049d6f3ff44c9e8fe476acf3aa5cade1f205ac1d8c1905cacb1c58ea13e1c14545dc993f4dd59cf5a4d36c3e0a511
 DIST x2goserver-3.1.1.4.tar.gz 64858 SHA256 17139f5c9b9d649ced0c9c6723cfaa1afdbfeb4001748ced9d05fa88848dceae SHA512 fd55a0a415fd9d0633f788783ba70ae8d5544283ab9f454e16c05249ea75eb141a4d40e7875048cd87610cb14654e04a986b22b460c6a3974bc0c491bcdf8b76 WHIRLPOOL 4040513461e6bd90c454791ba7c6c291e93ca7e0dd179eda1cb507174784c8746d8806416ad19c368271c31cda20fafabcac0f14c0e755db445da5e9f6ffda61
 DIST x2goserver-3.1.1.9.tar.gz 66239 SHA256 6903648c1cf7609a43dd56c216b8577d663f10286bb5573dfdee6a879bbe5524 SHA512 3eedd7f7bc5307e8f51f7bd30e6b2d573731c528d513fe45ddf58e09e603fa96dd062ea62c17dfc34bb787fa40639ff29321b2a9eef638032e6e6dd0f79fe5c9 WHIRLPOOL c2b33e8ed9b73ae2e1d75c5e4b7805e046ba752a982e657b2629d799aabdde0d2d501fdcec7c6fb19776c4e02d3b1cbc6bb80d905493b0eb9694ba9733374e80
-DIST x2goserver_3.1.0.1.tar.gz 57696 SHA256 5a8c5576be25ffcf147171c009962ceef3d23fe5c43b7d1f2b08d5953b8b677d SHA512 32b56416c9fd77efbc6da0655435f0f4d5f02a3a53df544a97dc546db02ee548c29fe9fe63a6cf8744bcdd33be0c457360dd8ca1d435592b5f1961211de20594 WHIRLPOOL 2eebbdfb940c8db36558baa3f5afaca562ae5e49265f8abd6cf8064f991eb64e91969a39932f9d33716a30c4724ac5be48d172b7ef2ff95eb340ed0e8a523f4f
-EBUILD x2goserver-3.1.0.1.ebuild 1553 SHA256 aec026e3ce44a12dc5dc30afb0b6a920120253c5819cfef11ad5568be3204032 SHA512 fea9798c960c70778bfda924016c5a62b533378aa6c301beb55e8bab0930de6f5af20267083643ecd9e645c36e224bc105892aece6f7db5fa058e10f5caacc53 WHIRLPOOL f1af4e477f58a4a399274e512ca79aab55cb3c3d506c82ccae51783b19cb75c6d0501ce4872c7f16d49a478a164e3de697820abdfc82e04f17b29cbe30206766
+DIST x2goserver-4.0.0.0.tar.gz 67941 SHA256 32c7926edeecd8d9362711ba34f9795821e140bb8d10d056c4f4c2c98fb1778f SHA512 f951bfffb398a7ff9e2d59714a742d0c02180b8264a83292a88b10c7d08816c20f0d6ab2f3147717d0f6784153606814257cf5be7850bebb811340aafeaeb7db WHIRLPOOL 297e4d9c16551672d19393ec9f1fc6ba0416809337654e4bdc8b2387943e5aef742f54bb9e16ff6ee772dc347b1330eb5b6c702e4e55b28d2a9fcd82ee471383
 EBUILD x2goserver-3.1.1.4-r1.ebuild 1964 SHA256 eadf41e2daac755599cd36af364e468fcd1ed7e2dc646a0ec400a1e1eefd7989 SHA512 771c67b7e0fad0658615f440c4f5334ab29bd40e29afb4dc50a79dbddadec542760a684e09aca405eb9a8250c809feb2e3fc1f1676292462f4691aec47482c87 WHIRLPOOL 9788ab679ef1e8ca4712193cdab6f0e96888d8cfb0985b7fdd1742aeec9d4ec9f4b18cae6609261151937f5da95d6f1691bbbbefa851ab8669e7a032f645b283
 EBUILD x2goserver-3.1.1.9.ebuild 1977 SHA256 ba0e61af583bb00b4d8db1afdfe95d02d660ecb20c62ade1f9e590d598232047 SHA512 14588995ed5afaff215ac3d1a4c9b10b9edb0b66a65dee2147390daf545419b6da939860ddf03edf0af20b28b4c707575e9bbe966da3f192f1c06dabc19473ea WHIRLPOOL 460654d24883ee70e682b7409b01e99dd5da691b23d6cd8e6919be028bfd38fe2a06d01d6d21fe645f42ddef8fc32ee47b63be72426eeb0d5683c292c2001ed6
-MISC ChangeLog 3472 SHA256 26ee89d239d780c947bbbc7b3a922ed2a801e85f58f27a2a1fa32cdff9c75980 SHA512 9d2f483e8c1836eae237d34d22f387cd6cbab7a2fe5b906ab72e8e61468c6badd8f4e3e07c50aaaf6d9680612d00671839dd7ea1dbc8e8ace282e424964ede45 WHIRLPOOL 9d00d90f75a89583562772379952b3cf7e09de41cc55165737c8764df10eeb5e24334211b112704e89227f90e502b9fc8aaf864cfe68f0f61f3edc96e8daa9d7
+EBUILD x2goserver-4.0.0.0.ebuild 1983 SHA256 5db009b266d78f68c1650de193f60fb324a0fcafb0756d6b3ee5b07bb6d85552 SHA512 2977af98f25f51b2f1eaf2d7955a96a79bb1e0d5158d088ccd38d513fca7d5bcfa6d4a2ac911c198f7619d7e85d33ca6237c2c024b9e3f7a766236f2aa2c51e2 WHIRLPOOL 5600b1c5e48f8fd055021a49f3dd92fb12c79f8786ec121164db23e4e910318d1165332e81c38a5f4419008d287e571147745f780883ed5eb6068499f055bfab
+MISC ChangeLog 3722 SHA256 f9f13c1c63b87d31eeb438037bba5836d1ba0a968ab658763100484e4b1d9187 SHA512 08a8c3787346392c714449c2fbcb33aea86e7fe3504ed925f4e7a15316f8a8001473aa736a2f573bbc2c722842caacd561e2f598fb48e6c4ac22b1ddffc13117 WHIRLPOOL e7746745c66e70da1cae5d289b01c39b10dea7869ef03ed042e4fb168f6d270642a6dcf44aaa03eb07bd149d4829f49d9b8d7350315274862718d836a4421989
 MISC metadata.xml 307 SHA256 b19b0330b6614bc27421032b94f6ade24661e38c818140c598d50cb91e82bce6 SHA512 05ebd620c55763866f5be95eeef6c46ceb2f424023df9f0f46a4d675bf06efe95120ecc5bd3f752c6f762c11b5c4152005458cac3dd5797a4b52def34729024a WHIRLPOOL 5441c1a1e9879a9aac8481ebc51821a5ec2f4bf896eb8a7a8d77db4534edd310e314852f234311b6f4c05f6b5947eac7f7a3677f195c056252fed5c4c411f6b9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlDr+oYACgkQFYEBGcdFJfLr/gD/fEQ3W39McMzBoGTHeEnxjpD1
+Ks1J8/L8Gw3j7CWzDM4A/2JMvFrpMMFKREoQ+SFqoWcnPLoIQ7zRCLioWIPfg717
+=XsPW
+-----END PGP SIGNATURE-----
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"