Version bump, add some details on database creation in postinst. Import user eclass

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

4 files changed, 82 insertions, 12 deletions

diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog
index a0d476fc7efc..15fe32da17d8 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.8 2012/03/14 22:30:45 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.9 2012/07/10 13:56:11 voyageur Exp $
+
+*x2goserver-3.1.1.3 (10 Jul 2012)
+
+  10 Jul 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  x2goserver-3.1.0.1.ebuild, +x2goserver-3.1.1.3.ebuild:
+  Version bump, add some details on database creation in postinst. Import user
+  eclass
 
 *x2goserver-3.1.0.1 (14 Mar 2012)
 
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 23694a5743be..4d99db4f60a0 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX x2goserver.init 557 RMD160 10ef29543a560b43e4a0a6ad5f1e5992c81ec392 SHA1 8d9de94a46e36a96d47afe55d77b939fca90a00f SHA256 121f02b72abe528046adb60870ed1643f1de121ec09961679466ecde757ca723
-DIST x2goserver_3.1.0.1.tar.gz 57696 RMD160 17e5dee97ec114125807bfc97f6c6aebdc8e0028 SHA1 b1ea4a0be88531f390f37d4e1c3f4e452f73f881 SHA256 5a8c5576be25ffcf147171c009962ceef3d23fe5c43b7d1f2b08d5953b8b677d
-EBUILD x2goserver-3.1.0.1.ebuild 1548 RMD160 ce575e0dfb72c9c76bc670ab43594f104d45eb31 SHA1 465850eecf5c5e16c65f96b94753168e1135d7ef SHA256 9e6974bac393eb66ae87b5713e4a118d588dba4a31a4b03787bf9aa710fb8774
-MISC ChangeLog 1680 RMD160 86a5833f9e3fe84092dc10f1402031f4501fe0e7 SHA1 ab28f533f728e7db48de6479cd971f0ea365fccc SHA256 de0b62dc524318344e6b14d2343810530a68d7b14f4163d0b2bb83a77169c04e
-MISC metadata.xml 307 RMD160 0172cd4fc792a41fde528ec788ab0dd98f3d21bc SHA1 953412d99904e25f4845fdfda587298e7cbc7f2a SHA256 b19b0330b6614bc27421032b94f6ade24661e38c818140c598d50cb91e82bce6
+AUX x2goserver.init 557 SHA256 121f02b72abe528046adb60870ed1643f1de121ec09961679466ecde757ca723 SHA512 a3b4243ec6803f48a29dce8df2a8351cd07e2abd68d7ebca4e7cda860c13430b60b41cfd8af472561dd39c021abe677492f136b0b6b8f304c41427d781001c20 WHIRLPOOL 7c9538bf3fe1264842ca2410280642d49a0968e62c6936e27cfe58ecf6bd7e1004e09a71586cf694cbe2cf6326efee1b69acc35111473aa535cd16f6b70edb28
+DIST x2goserver-3.1.1.3.tar.gz 64250 SHA256 1326cacc23da835ba4739cefcc7024dd12818a1b8159c38233601e48e4c10827 SHA512 679ebf833c7c98463d838cf44ebb10df40758c5d0b1d5820f298a09e2d7de59da62049da5cdef69c83dbba70442ca80563ec8eeb44de95402e6ff93fe90bd5d6 WHIRLPOOL 987f85225c131fec8c8a354e4f335a98400feba231cfc86adec735c42e3f691ab45cbfd0d5425835c671add11de19f556c89c4031bb353199b6fbf59ea61182b
+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 1723 SHA256 c8d28caef137ec628772093dde0ab9460c6aa6652780eaf008f7ea9500f140a3 SHA512 93a8256c11378c8725872640bdf96016132c47feee61d8a8e5335cb8b51f98b12c1c023f775b7ed8755e37f318984c9ce7bb5667a2b02e337242e1648c7ff7ef WHIRLPOOL 9020806889782c5d66e51489a19be23f5483b7a5404d470d94bb4d7c4a0c1f37e04f09f340d97e833d950f394d483791df066cba82cc3fe1e3768b94ad5dd0cd
+MISC ChangeLog 1916 SHA256 74159a009f8c2952fb7f652dd5a97ff029c7dce08665ff8e5c5341d9e29cd43f SHA512 91b05a537c6e721bf5def4e1415aa724e0c8777ce61957c1df205213baafe0ab80249805e259108f0f582b221f1e35d0e1ecc4f332142559ce0226768d5f1317 WHIRLPOOL e0c7d5a8dac6bb261537302b65735071ae352fe148872464bab92447db0964655ff8bb1e45047f865ca2efb8ecb049d12e30f9196283bc7c15f9350457ef689e
+MISC metadata.xml 307 SHA256 b19b0330b6614bc27421032b94f6ade24661e38c818140c598d50cb91e82bce6 SHA512 05ebd620c55763866f5be95eeef6c46ceb2f424023df9f0f46a4d675bf06efe95120ecc5bd3f752c6f762c11b5c4152005458cac3dd5797a4b52def34729024a WHIRLPOOL 5441c1a1e9879a9aac8481ebc51821a5ec2f4bf896eb8a7a8d77db4534edd310e314852f234311b6f4c05f6b5947eac7f7a3677f195c056252fed5c4c411f6b9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk9hHCMACgkQFYEBGcdFJfK40gD/UG6Ru2R2C1nZU1PFLiEotb23
-cwQ29mJjBH1l6koDA7oA/RsHFHLeL4sMn4D0aLZmdVc9jHJZcQseW+yzSz9lzbTK
-=SN8r
+iF4EAREIAAYFAk/8NIYACgkQFYEBGcdFJfID4gD9FrtinnNa0QZMo87OMXeL3ULA
+VF3JHIc2BG8l1FAqWb8A/03CF18hFDpbEUUXmo0ChXCnDrDpJZFLfw+acT37Pkkw
+=LdPo
 -----END PGP SIGNATURE-----
diff --git a/net-misc/x2goserver/x2goserver-3.1.0.1.ebuild b/net-misc/x2goserver/x2goserver-3.1.0.1.ebuild
index c6b01866fc77..0d3af2d59dfa 100644
--- a/net-misc/x2goserver/x2goserver-3.1.0.1.ebuild
+++ b/net-misc/x2goserver/x2goserver-3.1.0.1.ebuild
@@ -1,9 +1,9 @@
 # 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.0.1.ebuild,v 1.1 2012/03/14 22:30:45 voyageur Exp $
+# $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 $
 
 EAPI=4
-inherit eutils multilib
+inherit eutils multilib user
 
 DESCRIPTION="The X2Go server"
 HOMEPAGE="http://www.x2go.org"
diff --git a/net-misc/x2goserver/x2goserver-3.1.1.3.ebuild b/net-misc/x2goserver/x2goserver-3.1.1.3.ebuild
new file mode 100644
index 000000000000..bd7e0215f6dc
--- /dev/null
+++ b/net-misc/x2goserver/x2goserver-3.1.1.3.ebuild
@@ -0,0 +1,61 @@
+# 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.3.ebuild,v 1.1 2012/07/10 13:56:11 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
+
+	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"
+}