Add some more missing dependencies, thanks again Stefan Radermacher <gentoo@zaister.de> in bug #516234. Drop doc USE-flag, it has been useless for some times, thanks Ian Abbott <ian@abbott.org> in bug #519424

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

5 files changed, 24 insertions, 99 deletions

diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog
index 7164557e5592..ceff8404131f 100644
--- a/net-misc/x2goserver/ChangeLog
+++ b/net-misc/x2goserver/ChangeLog
@@ -1,6 +1,13 @@
 # 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.44 2014/06/26 14:49:16 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.45 2014/08/22 09:26:25 voyageur Exp $
+
+  22 Aug 2014; Bernard Cafarelli <voyageur@gentoo.org>
+  x2goserver-4.0.1.12.ebuild, -x2goserver-4.0.1.13.ebuild,
+  x2goserver-4.0.1.15.ebuild:
+  Add some more missing dependencies, thanks again Stefan Radermacher
+  <gentoo@zaister.de> in bug #516234. Drop doc USE-flag, it has been useless
+  for some times, thanks Ian Abbott <ian@abbott.org> in bug #519424
 
   26 Jun 2014; Bernard Cafarelli <voyageur@gentoo.org>
   x2goserver-4.0.1.12.ebuild, x2goserver-4.0.1.13.ebuild,
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 74931a750177..514d1af708c7 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -4,17 +4,15 @@ Hash: SHA256
 AUX x2gocleansessions.service 198 SHA256 e06420fa5fe526c9ff616af1976840136ef174b94e8876fa6a2d32ee1d111ab8 SHA512 45f29bdaa70a91ccdd129158511f78f85b01aeb1ef874b087e3eb96000fbfc104b1c427a5ad5dab65e66624151988bb2fd75c63d4f5033b76bd19849b0986bd5 WHIRLPOOL c9485457a052188ef83aa7b15d4df69c2584ddc023248b7b7557b2d61a310f23cbae60a265e1e74c8be4a6d3a3cb54212452ff6c3905bb07e9e93389057cda71
 AUX x2goserver.init 563 SHA256 c051f263ad2ad9b6064ce12098ad0c3d48b2a83a2c02ccd79020e0ce4be3331c SHA512 cac89ad0032b56188dc30f09bd461762934d5fadf53ccf361125dbefed3c09000b9b00684f7823424340d290c759e112e618f4d4e9d7e739c79702b70a6b3b3c WHIRLPOOL 0f134b9aed4e60f48e7089f97ca6d183387049d6f3ff44c9e8fe476acf3aa5cade1f205ac1d8c1905cacb1c58ea13e1c14545dc993f4dd59cf5a4d36c3e0a511
 DIST x2goserver-4.0.1.12.tar.gz 78958 SHA256 447c5e7b47e6b2bc087731ed26c827020130cc8530ca020a03f7f3ecadc308cc SHA512 30ce6c20cf0bf67ee162cda5d0cbbfd994ac47aa140e3c4cd6118b594ed8fbf83dbc961f2323694206c705f647f32dba8a7fc7bde4ef22be2d4936642865a3d3 WHIRLPOOL 9d4887a1dd701d361311850a8e936d7f22ecf76e1b4ee78b11feca6ec25d02419221b0fb2e72c440394f81e63ffa73762b33bd58123e7bd441e32446ce40814e
-DIST x2goserver-4.0.1.13.tar.gz 79103 SHA256 c3e78206d564a16d67ffb7702e4d59fbcd1dff36a6daa37978eacc5bfe345656 SHA512 322c4158e62ba02eb67e79ae3e56962f7b15c5905555a0efccbdec1b6d7b3b84fa3ec8f6fad9056a02180dd2355c51a579d38e44216f282110b3cf8d73ef621d WHIRLPOOL 11248906d89f818a4672e5e924834e9b075a20ef1c551ce11b430417de283dcdd5da55b5e05366738b425fee17b972d6c02588981cff737e404cc78e9734beea
 DIST x2goserver-4.0.1.15.tar.gz 76128 SHA256 46c0fc2303014db99b138a352a7f3df89c4f7cfabc11dc0aeea4cdc76253bdfb SHA512 ca806c39d2536e7962540733e85199fefea54e80695c6f1ca736cc1998b411524afa8d9cf29c26855fc3373105277daa4ddd69cbcd05c2bbecb01ca5172ba05c WHIRLPOOL b06ace09acf14a0b82b0b5b8f795823d7997c99a4a78bd120ecadedf3bbb8c0b6ad371e8bacf1c080e5d6b45d9760cef8c04f69b9a86a1b2dceb3ebaa450bde0
-EBUILD x2goserver-4.0.1.12.ebuild 2415 SHA256 d5462971afdba08a3f17d42868f2850d758f858d329b54c1586c39f9572d9321 SHA512 4d169dae7874207d2f4a542a4bec5e460f2abb6324342649d12814d777ae3a7c24ffeb943e08479db53a0dc3469f7f7387d5e33fc801c3ff82bfdc46c3454822 WHIRLPOOL 2015f98f368f77d660d321ae8d44c3f1238b0e492b9ad09787fe3056974b688bfe3c9dceec1198ad071cb43e03e124c59c62b82c9b143962cc366208a6263d8f
-EBUILD x2goserver-4.0.1.13.ebuild 2417 SHA256 3835cb7553fa7bd6043cfa3b349242ad9ae15bc271183ca7ad65dd554019fce3 SHA512 b67a8e67c50588a8b719a8c000934713dda2c572579bb03c39585e4740492ebc3baeefdcc52eae10da728591c64f0c12a113c27f5e88dcd624154683cd17ef6f WHIRLPOOL 8a98788bd7d77dab1c1382d6ee532374ca55c30c60d27adaa77e09e7c2da517871529f9d5bfa14eee5615d6f18caa525c4c6dcedaf9c3335645f424d2487664d
-EBUILD x2goserver-4.0.1.15.ebuild 2484 SHA256 d829d68e2f7beee0ad3f41303bfba6e1c760291dbcc5d8aad6bfbb94dcdab0cc SHA512 f36b6df1e069984ebe87dd7c207050694d775722b83d5b1812d10b05faa6de39b7120a50110589a7422f2385e2ee0c5c66332b3d709d2658fe2f8c9b791fa442 WHIRLPOOL 9bf1b141a8098be961f0e2b8c6472604c38e3a8d8deab30626ab84a175a0dc7c66909768cb40e5d0fdb94a1aedd70a1d0a808ee6b2a6943ca2c0ccea1c130caf
-MISC ChangeLog 8649 SHA256 9f108ef872d1d46d9e15cc509497822f0e2577fad6d6e93bfd3a70bb68a638c5 SHA512 6d74f8453e9d727bca6325db0cf03b8fb0ebf8c70b41744456a0d78ed1c7dd6250d3fa3e7120f48213e5915a9869fa2ecbe759db3ffa69da9d9de0b9810921c5 WHIRLPOOL 3fb5e38671d1d09cfd27a96ca02f43801dd5c3c8e992d07be3070aa5c2bf0204341e6879a73b514d3c854a74cf3dbe238718713ae1f023e4cae38975d6f88daf
+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
+MISC ChangeLog 9009 SHA256 f371a2373950410aba026d98075825573278f89a5e629398d1536ff2b8e56106 SHA512 74be67a5b161a4b15505cb967ae9b76cba775131c902a16307c0f3035a8382263c65b3032ec7b99d4f0c94484f59ca0d02336a47d3ab067a70511a6da25d2376 WHIRLPOOL be3df7432189087279b52ec917b6debb125fdd6d319312e7b3c7d7df5da38e13124f9b9005015fe044493b7fa6f38d2a7ce64213b5286156ce972353626ef026
 MISC metadata.xml 307 SHA256 b19b0330b6614bc27421032b94f6ade24661e38c818140c598d50cb91e82bce6 SHA512 05ebd620c55763866f5be95eeef6c46ceb2f424023df9f0f46a4d675bf06efe95120ecc5bd3f752c6f762c11b5c4152005458cac3dd5797a4b52def34729024a WHIRLPOOL 5441c1a1e9879a9aac8481ebc51821a5ec2f4bf896eb8a7a8d77db4534edd310e314852f234311b6f4c05f6b5947eac7f7a3677f195c056252fed5c4c411f6b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlOsMvEACgkQFYEBGcdFJfKK8QEAq7ZV1zebl4tzkzNKPjWZ91O8
-TbRniCX/mndhlD0qZTUA/0tuNr2aw4nMpHyKVZ64yyntha4CeL0HDUAokuvyQ8+9
-=pkLl
+iF4EAREIAAYFAlP3DMcACgkQFYEBGcdFJfI/1AD/cE5JdvAg4gh/L4hkPLtCoQza
++X4oHCZMXUDO6CXkaBQA/RrvJecqsJW0Wz1cr1GXaDLyJWsT3tXbmZVeBL7TbTd1
+=WTbb
 -----END PGP SIGNATURE-----
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.12.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.12.ebuild
index bbe105d77fd1..c2d580287e81 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.12.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.12.ebuild
@@ -1,6 +1,6 @@
 # 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.12.ebuild,v 1.4 2014/06/26 14:49:16 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-4.0.1.12.ebuild,v 1.5 2014/08/22 09:26:25 voyageur Exp $
 
 EAPI=4
 inherit eutils multilib systemd toolchain-funcs user
@@ -20,6 +20,7 @@ REQUIRED_USE="|| ( postgres sqlite )"
 DEPEND="doc? ( sys-apps/man )"
 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
@@ -27,6 +28,7 @@ RDEPEND="dev-perl/Capture-Tiny
 	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 )"
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.13.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.13.ebuild
deleted file mode 100644
index f183a6670879..000000000000
--- a/net-misc/x2goserver/x2goserver-4.0.1.13.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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.13.ebuild,v 1.2 2014/06/26 14:49:16 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="+doc +fuse postgres +sqlite"
-
-REQUIRED_USE="|| ( postgres sqlite )"
-
-# Requires man2html, only provided by sys-apps/man
-DEPEND="doc? ( sys-apps/man )"
-RDEPEND="dev-perl/Capture-Tiny
-	dev-perl/Config-Simple
-	dev-perl/File-ReadBackwards
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc
-	net-misc/nx
-	net-misc/openssh
-	x11-apps/xauth
-	x11-apps/xhost
-	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 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"
-}
-
-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
-	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"
-}
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.15.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.15.ebuild
index eff30d8eea07..8cee8f3e6b9e 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.15.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.15.ebuild
@@ -1,6 +1,6 @@
 # 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.15.ebuild,v 1.3 2014/06/26 14:49:16 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-4.0.1.15.ebuild,v 1.4 2014/08/22 09:26:25 voyageur Exp $
 
 EAPI=4
 inherit eutils multilib systemd toolchain-funcs user
@@ -12,14 +12,14 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+doc +fuse postgres +sqlite"
+IUSE="+fuse postgres +sqlite"
 
 REQUIRED_USE="|| ( postgres sqlite )"
 
-# Requires man2html, only provided by sys-apps/man
-DEPEND="doc? ( sys-apps/man )"
+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
@@ -27,6 +27,7 @@ RDEPEND="dev-perl/Capture-Tiny
 	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 )"
@@ -42,10 +43,8 @@ pkg_setup() {
 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
+	# 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"
 }