Version bump, mostly bugfixes

Package-Manager: portage-2.2.0_alpha133/cvs/Linux x86_64

3 files changed, 75 insertions, 5 deletions

diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog
index 3164a1e3613d..27bda511d9b1 100644
--- a/net-misc/x2goserver/ChangeLog
+++ b/net-misc/x2goserver/ChangeLog
@@ -1,6 +1,12 @@
 # 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.11 2012/07/13 09:36:58 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.12 2012/09/28 12:56:27 voyageur Exp $
+
+*x2goserver-3.1.1.4 (28 Sep 2012)
+
+  28 Sep 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  +x2goserver-3.1.1.4.ebuild:
+  Version bump, mostly bugfixes
 
   13 Jul 2012; Bernard Cafarelli <voyageur@gentoo.org> files/x2goserver.init:
   x2gocleansessions uses x2goserver.pid for PID file, update init script
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index b0d834914ae2..bfda8777565e 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -3,15 +3,17 @@ Hash: SHA256
 
 AUX x2goserver.init 563 SHA256 c051f263ad2ad9b6064ce12098ad0c3d48b2a83a2c02ccd79020e0ce4be3331c SHA512 cac89ad0032b56188dc30f09bd461762934d5fadf53ccf361125dbefed3c09000b9b00684f7823424340d290c759e112e618f4d4e9d7e739c79702b70a6b3b3c WHIRLPOOL 0f134b9aed4e60f48e7089f97ca6d183387049d6f3ff44c9e8fe476acf3aa5cade1f205ac1d8c1905cacb1c58ea13e1c14545dc993f4dd59cf5a4d36c3e0a511
 DIST x2goserver-3.1.1.3.tar.gz 64250 SHA256 1326cacc23da835ba4739cefcc7024dd12818a1b8159c38233601e48e4c10827 SHA512 679ebf833c7c98463d838cf44ebb10df40758c5d0b1d5820f298a09e2d7de59da62049da5cdef69c83dbba70442ca80563ec8eeb44de95402e6ff93fe90bd5d6 WHIRLPOOL 987f85225c131fec8c8a354e4f335a98400feba231cfc86adec735c42e3f691ab45cbfd0d5425835c671add11de19f556c89c4031bb353199b6fbf59ea61182b
+DIST x2goserver-3.1.1.4.tar.gz 64858 SHA256 17139f5c9b9d649ced0c9c6723cfaa1afdbfeb4001748ced9d05fa88848dceae SHA512 fd55a0a415fd9d0633f788783ba70ae8d5544283ab9f454e16c05249ea75eb141a4d40e7875048cd87610cb14654e04a986b22b460c6a3974bc0c491bcdf8b76 WHIRLPOOL 4040513461e6bd90c454791ba7c6c291e93ca7e0dd179eda1cb507174784c8746d8806416ad19c368271c31cda20fafabcac0f14c0e755db445da5e9f6ffda61
 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
 EBUILD x2goserver-3.1.1.3.ebuild 1777 SHA256 9338b4b7241c384cb8346cb7838a9125947a910db9c6cf0784af88562688135e SHA512 d718dc4af88a819224f08223ba8ae995f55710ab1dc5d568e3fbe9bfed1e4e230b93ced0e18b4f575d01fb13f028c9314b8f2501aea6557bd58c65c88bcb5aad WHIRLPOOL 94c20d9962d31492c887f71f33356ce359efd9d328e8fbf5631b2f48a99ffd32474a844c87f6cf32ab6f4c4ce14e5c50984d99f92dfc9417aace4383ee416ad6
-MISC ChangeLog 2259 SHA256 1daf5d2c1194aa14f99af86fad11f915231322c61e0d4f88af4522b9092f958b SHA512 23055676dbb92de29ec2d6ad4fd7c14a33066fded54b286fe78649fca4375488b87d101d812c393444dc89a1d969f31fb06e7fbf16955896539957c267c00f8c WHIRLPOOL c18c4f0a51ff3830a652873d19994d2a5920bd8df46f65cf6f975b8c7670dfdcc660c76bfa0b95e38dc50029c8d836b04a6f44ba23d9458b8d06b30b93b2fa67
+EBUILD x2goserver-3.1.1.4.ebuild 1777 SHA256 491246f1ad365209292de2d3ff4ac659dcb29b55e1b1afaccf5f8708912fde8b SHA512 d832af1d7b9f70fc25aefc2d55cd833644597c735c39172853d826dfb271630d5fa16ea7c3caa0ef19058cc53d27be5bda5705019fc6bb4fb1107fbeddf95c75 WHIRLPOOL ac47a6268a071adfbf7856e5138bee6914fb69e699991250f0a7c7bced0c3650234d4383defc14bacc07995b6de2c1a757bcfb391581191faaff24f368f68e60
+MISC ChangeLog 2412 SHA256 a10c7f216c122851b882011acb7eee4e9312c71eff1d7869ea1dbba987e643ab SHA512 9d12da21755a3eaec9dc2968624bc5a110259caed81bfafab2ac8c0a99a8b4c965f2a9234d2c439707efd7928dff3801f9b35ee9bcc22cd9e3b00c6c54c272f6 WHIRLPOOL 6c53daed2ddbd510cff880858167a446c3f61343e2b8a777baa8aa03efd02b824c91ef321796702208745c41610600d48211c26c45c5a1beb28d538be2a8ba1f
 MISC metadata.xml 307 SHA256 b19b0330b6614bc27421032b94f6ade24661e38c818140c598d50cb91e82bce6 SHA512 05ebd620c55763866f5be95eeef6c46ceb2f424023df9f0f46a4d675bf06efe95120ecc5bd3f752c6f762c11b5c4152005458cac3dd5797a4b52def34729024a WHIRLPOOL 5441c1a1e9879a9aac8481ebc51821a5ec2f4bf896eb8a7a8d77db4534edd310e314852f234311b6f4c05f6b5947eac7f7a3677f195c056252fed5c4c411f6b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk//7EQACgkQFYEBGcdFJfILVwD/Z/MphVQDEjQTARmNnQifXkE7
-Ba8CPVWSWi4B2oGbMSIBAIT3BUsUAENDEv1FYwVMPT1lXtqbtZQ1g2H7N2Dy8Shp
-=Mxle
+iF4EAREIAAYFAlBlnoYACgkQFYEBGcdFJfIFlwD/U8/ZxHcpy3ImVkHv/25HYdQ6
+g6kBBtZVvezgc+svj7EA/0Y9dOBh3js8HkbX9aHnir0dNCJdcWbkUMATzvdWpYCE
+=kvZ/
 -----END PGP SIGNATURE-----
diff --git a/net-misc/x2goserver/x2goserver-3.1.1.4.ebuild b/net-misc/x2goserver/x2goserver-3.1.1.4.ebuild
new file mode 100644
index 000000000000..baf7ded03031
--- /dev/null
+++ b/net-misc/x2goserver/x2goserver-3.1.1.4.ebuild
@@ -0,0 +1,62 @@
+# 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.ebuild,v 1.1 2012/09/28 12:56:27 voyageur Exp $
+
+EAPI=4
+inherit eutils multilib 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/Config-Simple
+	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() {
+	# 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_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"
+}