Version bump. Only build man pages with USE=doc, thanks Theofilos Intzoglou in bug #490960. Force groups creation, thanks Maciej Szmigiero in bug #479650

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key C74525F2)

2 files changed, 22 insertions, 7 deletions

diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog
index 9533f31432d0..25a6a22e6456 100644
--- a/net-misc/x2goserver/ChangeLog
+++ b/net-misc/x2goserver/ChangeLog
@@ -1,6 +1,13 @@
 # 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.31 2013/11/17 12:13:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.32 2013/11/27 12:53:19 voyageur Exp $
+
+*x2goserver-4.0.1.8 (27 Nov 2013)
+
+  27 Nov 2013; Bernard Cafarelli <voyageur@gentoo.org>
+  -x2goserver-4.0.1.6.ebuild, +x2goserver-4.0.1.8.ebuild:
+  Version bump. Only build man pages with USE=doc, thanks Theofilos Intzoglou
+  in bug #490960. Force groups creation, thanks Maciej Szmigiero in bug #479650
 
 *x2goserver-4.0.1.6-r1 (17 Nov 2013)
 
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.6.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.8.ebuild
index b12b043eedd3..1cb674256a38 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.6.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.8.ebuild
@@ -1,9 +1,9 @@
 # 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.6.ebuild,v 1.3 2013/10/21 09:03:06 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-4.0.1.8.ebuild,v 1.1 2013/11/27 12:53:19 voyageur Exp $
 
 EAPI=4
-inherit eutils multilib toolchain-funcs user
+inherit eutils multilib systemd toolchain-funcs user
 
 DESCRIPTION="The X2Go server"
 HOMEPAGE="http://www.x2go.org"
@@ -12,12 +12,12 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+fuse postgres +sqlite"
+IUSE="+doc +fuse postgres +sqlite"
 
 REQUIRED_USE="|| ( postgres sqlite )"
 
 # Requires man2html, only provided by sys-apps/man
-DEPEND="sys-apps/man"
+DEPEND="doc? ( sys-apps/man )"
 RDEPEND="dev-perl/Config-Simple
 	media-fonts/font-cursor-misc
 	media-fonts/font-misc-misc
@@ -29,13 +29,20 @@ RDEPEND="dev-perl/Config-Simple
 	sqlite? ( dev-perl/DBD-SQLite )"
 
 pkg_setup() {
-	enewuser x2gouser -1 -1 /var/lib/x2go
-	enewuser x2goprint -1 -1 /var/spool/x2goprint
+	# 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 if needed
+	if ! use doc; then
+		sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
+	fi
 	# Use nxagent directly
 	sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
 }
@@ -52,6 +59,7 @@ src_install() {
 	dosym /usr/share/applications /etc/x2go/applications
 
 	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
+	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
 }
 
 pkg_postinst() {