Version bump

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

3 files changed, 95 insertions, 5 deletions

diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog
index 4f4361952ae4..f2ccd6858e8e 100644
--- a/net-misc/x2goserver/ChangeLog
+++ b/net-misc/x2goserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/x2goserver
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.48 2014/10/04 15:55:30 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.49 2014/10/07 07:17:15 voyageur Exp $
+
+*x2goserver-4.0.1.18 (07 Oct 2014)
+
+  07 Oct 2014; Bernard Cafarelli <voyageur@gentoo.org>
+  +x2goserver-4.0.1.18.ebuild:
+  Version bump
 
 *x2goserver-4.0.1.17 (04 Oct 2014)
 
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 877aeaa2980a..5a50361c2f21 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -7,16 +7,18 @@ DIST x2goserver-4.0.1.12.tar.gz 78958 SHA256 447c5e7b47e6b2bc087731ed26c82702013
 DIST x2goserver-4.0.1.15.tar.gz 76128 SHA256 46c0fc2303014db99b138a352a7f3df89c4f7cfabc11dc0aeea4cdc76253bdfb SHA512 ca806c39d2536e7962540733e85199fefea54e80695c6f1ca736cc1998b411524afa8d9cf29c26855fc3373105277daa4ddd69cbcd05c2bbecb01ca5172ba05c WHIRLPOOL b06ace09acf14a0b82b0b5b8f795823d7997c99a4a78bd120ecadedf3bbb8c0b6ad371e8bacf1c080e5d6b45d9760cef8c04f69b9a86a1b2dceb3ebaa450bde0
 DIST x2goserver-4.0.1.16.tar.gz 81836 SHA256 c13dde4f6755f6c42fdc32a5a6167a5e2765eb5077a43e74ffdb50a36be7f8f8 SHA512 f66da1e4b1b29021951f3ebdd93ff7be08b20b6322b7cbae66f5792336b54f23d39273fb9e4956dc6b01620488d7b869269a0fe1e7491147650f6232330236ea WHIRLPOOL c79db32e632a6db876529eed0cd1dc0bf13d0ec82c2f2939e595f9e0b9828a0cdf8553eedec483da413ca0cc041627093addb18682f6aa197e84d61001bced6a
 DIST x2goserver-4.0.1.17.tar.gz 82298 SHA256 364d4f3152a4b4a4b04742a125f5b1c6fd0c82ad9e17a8363d56d926998b213b SHA512 3ffcc8678a5ed380b7820042fa0f8c19d017777cd13e6eed84689636ae49aa0733b4ed4e496e37a64939bbc1fafead19671c919f713f86db5e47ce02e1a73cc1 WHIRLPOOL fddffe5e86f355f46cacd9158387b9859c0c8dfe6f32bf02a7e1bac3a1ea643127e0355d9813a1592bd4b19764861eee3f1d522653bdba11187442f039d9261d
+DIST x2goserver-4.0.1.18.tar.gz 82452 SHA256 4a1e7eb9cf309c126fdab1f97bd55cd036b0a02a04cda1d317b193d8ab9b0612 SHA512 e0f439301cbb2acc09e14a101bebbbac3e436383de51b7ae029117eaa95c6181045335c83125615e0f0ed191ae39d5abb120c1f6b20fa5b78fe94288248d6fd8 WHIRLPOOL fe0ad6b5a0a1a124d62ebcee152a84dd7b34ebe83f04440ff5dac471b1f5e19339dfa340631cd2df10398d38c4ed34c875a52337a394281b2976d9059d6f1bbd
 EBUILD x2goserver-4.0.1.12.ebuild 2457 SHA256 53a66ac9d11d7daa963d68fb79780cf71a09acd0659cbe3710be64858086ba52 SHA512 45aa05ff4ce06a6b8029719814ea54d6f323bfd73249e354d902bed1817b8ed5ac531d27771e38ea6744256700234b8d8d6f6417d79de5ec3453b6de593c1bdb WHIRLPOOL 1ff40b74e404b7fd680c3460c7313904bc54b64cb37e045a1348fd13543f74bb989e6d520badbcdbcd575e5fcce6338b750687dfe08625d70554f68993b24bad
 EBUILD x2goserver-4.0.1.15.ebuild 2414 SHA256 a49bcda8fa31b8903803bf92414c036f61c81d12cb3600da6553da1fa2603549 SHA512 7702c5b40d32fac4dd2db5f8652d2ff543b87185f8d4da9b483e5d61e2261973344e4542976fd1d5503efcc2d7e40f072b326f9f6e69d9d97f5b09861e1abf12 WHIRLPOOL a4db93754cc0d224d8a2c76d58fb6a078f0165ff0d7c7f8f578b7fe5981b5630413ecfadaa80075aebd4fb18d215f965e42e4309293ac96ad52cdf80cf1f1a49
 EBUILD x2goserver-4.0.1.16.ebuild 2425 SHA256 a70c1bd3a4544f2dd6f3985468b589573d3c2e53669c57973ff675c5feba298b SHA512 489c407d2e684772fb9ce36b2c99dd673c2a53003a557b6cafced0721e8e7b8ffbe52f9226125ab4ddad1b49101bc642e4f190231b3f0cd2c4a62709a190f936 WHIRLPOOL bc6ffd918775447ab0e29c4e082d621c6ced96ae3a9e72e43b978ba79bcd45ad9d4a6cf51c014f6fe082fb63494050cdf5e376a26f03f69325398fbfd0225962
 EBUILD x2goserver-4.0.1.17.ebuild 2425 SHA256 4db3265a2c3a9f994731249444894b535ed72575d9aaeef0476aeed3527a60d9 SHA512 04648cf0d9563c80aa71f44a6047c490c70a8bc1eb9abc1452235f5343b764561cc423bcf39f230ef1d29624b6d800fd5e00726eecd8a766c5d700a91d9e17b8 WHIRLPOOL 4a44714972cca3c61c0de0cbf937ad7308979d468b8afadabe1c34b2d40c0aa859c4331bcf482d764cdc887b0ec8ecc324a71e327971029a32dfbe2e5202a07b
-MISC ChangeLog 9468 SHA256 93accb524e6a9a417d8e22dcbd03828cef4994f035e932584e7cacff41df7023 SHA512 08619ac39ccfb23a45c825e299e73d2a2ce517935b2900f7ecf875297614607d2c1595d858d23d7bfe6dbefd3b2f5eca851fcfb29a5e5e08cc68f3cd4c5f596b WHIRLPOOL 27df5d218b4ae93de51084d5685d47f952db7833f90431d00b442ea0902c74f02c248127c3a13f8d4c3ec3e1c3389c68df97a7098fd7f5b1ca0ce74432380349
+EBUILD x2goserver-4.0.1.18.ebuild 2425 SHA256 ef419bf6e15c479cdaa142832e88d90a4a7401c545a428f377cd49b83ae1608d SHA512 b55ff126b1de33c5b6acbf6a827884d589adf4f023a7cb718506e39912e3087be65c6f238a0d2a80c55f834ed50f75c066d40fc64796d6c3a345cadfb626b6ea WHIRLPOOL 96881eae44f70c407fb50563773e1787d8f89ae7dab43ba8e21af34ab4392b6c55f072d862fda311f89225e18e44b5a2fe7c25af1e9afa7c37ce749236e2a630
+MISC ChangeLog 9606 SHA256 c628bb5a3a99e499f3696c66f314635cc215a107b79b0b56c1f00ca0ff167a99 SHA512 ac424ae2b9ca0103233eaad7f5ee0bb784f4fe8cac2c54079c94d4116167110d5a141428a1c3226722e30057ebf99329716a5671a64fc920e8644b07c93c6941 WHIRLPOOL 5401c831deb7f79602226777434a9694c0d025a131b6b02f0f56cf9401bd38e1ad359e40af18219992a8d09a4264448e5c04907ed007e66e42298c415f07c78b
 MISC metadata.xml 307 SHA256 b19b0330b6614bc27421032b94f6ade24661e38c818140c598d50cb91e82bce6 SHA512 05ebd620c55763866f5be95eeef6c46ceb2f424023df9f0f46a4d675bf06efe95120ecc5bd3f752c6f762c11b5c4152005458cac3dd5797a4b52def34729024a WHIRLPOOL 5441c1a1e9879a9aac8481ebc51821a5ec2f4bf896eb8a7a8d77db4534edd310e314852f234311b6f4c05f6b5947eac7f7a3677f195c056252fed5c4c411f6b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlQwGHkACgkQFYEBGcdFJfLTwgD+PBeJnyDf1HeiCx+id7luT+SS
-jSro7kfuIQ+V8evy7lsA/1RBhUDPXHq5IyDB09lj4cJ50SZtkf5ENlEL2nZEkWlq
-=lHXz
+iF4EAREIAAYFAlQzk4IACgkQFYEBGcdFJfIIlgEAnqQ76nRUc+A2lrKhfbOEfmFT
+2V9Kn6hseAX+UMrOBS4A/2vKY+IKz7Z63eqGZVN4R/D0ZctoSz5XzLJUQz45TEcA
+=7YZ3
 -----END PGP SIGNATURE-----
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.18.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.18.ebuild
new file mode 100644
index 000000000000..97abc5bc87e7
--- /dev/null
+++ b/net-misc/x2goserver/x2goserver-4.0.1.18.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2014 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.18.ebuild,v 1.1 2014/10/07 07:17:15 voyageur Exp $
+
+EAPI=4
+inherit eutils multilib systemd 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=""
+RDEPEND="dev-perl/Capture-Tiny
+	dev-perl/Config-Simple
+	dev-perl/File-BaseDir
+	dev-perl/File-ReadBackwards
+	media-fonts/font-cursor-misc
+	media-fonts/font-misc-misc
+	>=net-misc/nx-3.5.0.25
+	net-misc/openssh
+	x11-apps/xauth
+	x11-apps/xhost
+	x11-apps/xwininfo
+	fuse? ( sys-fs/sshfs-fuse )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
+
+pkg_setup() {
+	# Force the group creation, #479650
+	enewgroup x2gouser
+	enewgroup x2goprint
+	enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
+	enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
+}
+
+src_prepare() {
+	# Multilib clean
+	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
+	# Skip man2html build
+	sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html 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
+	fperms 0750 /etc/sudoers.d
+	fperms 0440 /etc/sudoers.d/x2goserver
+	dosym /usr/share/applications /etc/x2go/applications
+
+	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
+	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
+}
+
+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"
+}