Version bump, mostly sessions handling and termination enhancements

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

3 files changed, 83 insertions, 5 deletions

diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog
index 1299d9f34e84..07b279ba87f5 100644
--- a/net-misc/x2goserver/ChangeLog
+++ b/net-misc/x2goserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/x2goserver
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.24 2013/06/12 09:40:13 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.25 2013/06/13 08:12:45 voyageur Exp $
+
+*x2goserver-4.0.1.0 (13 Jun 2013)
+
+  13 Jun 2013; Bernard Cafarelli <voyageur@gentoo.org>
+  +x2goserver-4.0.1.0.ebuild:
+  Version bump, mostly sessions handling and termination enhancements
 
   12 Jun 2013; Bernard Cafarelli <voyageur@gentoo.org>
   -x2goserver-3.1.1.4-r1.ebuild, -x2goserver-3.1.1.9.ebuild,
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 1880764be36c..94982c712293 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -3,13 +3,15 @@ Hash: SHA256
 
 AUX x2goserver.init 563 SHA256 c051f263ad2ad9b6064ce12098ad0c3d48b2a83a2c02ccd79020e0ce4be3331c SHA512 cac89ad0032b56188dc30f09bd461762934d5fadf53ccf361125dbefed3c09000b9b00684f7823424340d290c759e112e618f4d4e9d7e739c79702b70a6b3b3c WHIRLPOOL 0f134b9aed4e60f48e7089f97ca6d183387049d6f3ff44c9e8fe476acf3aa5cade1f205ac1d8c1905cacb1c58ea13e1c14545dc993f4dd59cf5a4d36c3e0a511
 DIST x2goserver-4.0.0.2.tar.gz 68101 SHA256 e175a908f7a78ad797584a332aefcfce185d714a5f0d50245f8e77c8f0b85e1b SHA512 95d3148dd4a122f6d60ae7477130fae644a7c88c7555bc6dda20fe95479384e24344c7d87b6618cf6fe79b31ba05c21eb883b0390f78f6202fff8ead937dfaf1 WHIRLPOOL b0422cab05061751f24763393d9c7a320a61000531249383272216afcc1c05d8cd0c31f586453f25fd8c337ab935e8b47e54184db61cf701c91fe7000ff2df5f
+DIST x2goserver-4.0.1.0.tar.gz 68898 SHA256 0b958fab536bbd3e286447c73d86517e6e77c76c01378ac8adee76be87983e19 SHA512 fe89d8c2fe9ea234b9ae16c2fb5bba2095000cbb59a574b091c3e7d2f68eee662f3852de1ea34d0017aa9d25f9efa449fa299b49c588966f22aff758c19e905d WHIRLPOOL 6216f1e4fd1002ed84c566f431d62bdcc506f69b41b152ff072cb7f9889eefa36503d749a413e0c5386ba72a00744b80096a13e9ad7ccad3ab344666bec307b9
 EBUILD x2goserver-4.0.0.2.ebuild 1997 SHA256 0b2482537a4a982ffb8363f7491d260679076f1c71e74cc6db8119d1832e94ef SHA512 81320820f6776b0d525daa974138c47ec7935b1714262f7af6eba98bcea8089122d6b7c22895656c3228b268347283181a6c9f5761d51da34956b1c67e7166d8 WHIRLPOOL d2063523c572117c4f9da4bc907ac4550852de163b39e0c5cdb9874b4fd44491bd927c31aa546ca1a73f3a54040b7156b0e6c83f23e71c30fe4d514efe59b9a3
-MISC ChangeLog 5039 SHA256 cbc7cef83fe375537f4495f6d035448f35fa9a879568b41c54bee7a9f0af06fb SHA512 cf75c77507ca9eb2f21071fabdf612497ad74a48307562981444261012548f777c897cec7bb01edb152c808610cf66b390e82f87cc0072ff0deaf2f0d528982d WHIRLPOOL 10ce01ce5ad714960d85323bb09e33f4a21a1105bea58469647b11d77397085dbe7b769ba0ece22b966332c5473d2b3d7e3b5812ecfcd199ae50276ab2e62b7b
+EBUILD x2goserver-4.0.1.0.ebuild 2004 SHA256 98e4931cd782c4105931450a4d4a0bf38f4aeccc6c9655a91763bcbcc8f14fb4 SHA512 767b0677aa9392ff24a15e3dd81a2b2afd31c26ecd73674a2d2fb9dc6004a2c2f65dd29b052549f87f2134add7d6b92fd77641bb0cc32bcbb21e2553586a0b66 WHIRLPOOL cabe034fe6b3dcd3dfc5d47fd00a8681640c0f3db08455007cc82d47b31253a4f1c03ef58a6d408daf95856b8e6b863fa15480efe74628022e5418a7dd95c762
+MISC ChangeLog 5230 SHA256 47d162be2b66b783676812b1870e83477130441d4e6efc6b5d24b7458ddd183f SHA512 70c15586020900439069eb61fc443a7c6fa8efef52a2b7047dde4c664e4a7de8f1e7b33099de6f62d484f325b7e510a1064941c443b56a369ed1c860d7f34e53 WHIRLPOOL 76f8e8b9faedb26af13ffa36d2636ffebf9541286d2c789c0c17e8054621151802ff296db7e94c12648fa380b66009fa3a2b172fd5da7ca9c78b613d94604aa8
 MISC metadata.xml 307 SHA256 b19b0330b6614bc27421032b94f6ade24661e38c818140c598d50cb91e82bce6 SHA512 05ebd620c55763866f5be95eeef6c46ceb2f424023df9f0f46a4d675bf06efe95120ecc5bd3f752c6f762c11b5c4152005458cac3dd5797a4b52def34729024a WHIRLPOOL 5441c1a1e9879a9aac8481ebc51821a5ec2f4bf896eb8a7a8d77db4534edd310e314852f234311b6f4c05f6b5947eac7f7a3677f195c056252fed5c4c411f6b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlG4Qg8ACgkQFYEBGcdFJfIuEwEAmisRmvixTowdxyTFYMIUGLrb
-zPGCacpC+GJm0XKfLIkA/2k4fRoe5178LGB0sFT5YGHGQhxM/ME9HCU2S6ieV1sk
-=whyd
+iF4EAREIAAYFAlG5f1QACgkQFYEBGcdFJfJxiAD7BBRi5Xmc5eKYersDi7ZfdBhH
+raA1/yKXnmW7JjCsKVQBAKj2H5ut5BGxFsVD3V6vD1mTqs5NAt2rbfaAYj8oV7r2
+=t1HW
 -----END PGP SIGNATURE-----
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.0.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.0.ebuild
new file mode 100644
index 000000000000..9067c5cb90ac
--- /dev/null
+++ b/net-misc/x2goserver/x2goserver-4.0.1.0.ebuild
@@ -0,0 +1,70 @@
+# 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-4.0.1.0.ebuild,v 1.1 2013/06/13 08:12:45 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 )"
+
+# Requires man2html, only provided by sys-apps/man
+DEPEND="sys-apps/man"
+RDEPEND="dev-perl/Config-Simple
+	media-fonts/font-cursor-misc
+	media-fonts/font-misc-misc
+	net-misc/nx
+	virtual/ssh
+	x11-apps/xauth
+	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() {
+	# Multilib clean
+	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
+	# Use nxagent directly
+	sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" PREFIX=/usr
+}
+
+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"
+}