gentoo resync : 10.11.2017

5 files changed, 13 insertions, 144 deletions

diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index df1f8650b884..11ddb5aa58a0 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -1,13 +1,11 @@
 AUX x2gocleansessions.service 198 SHA256 e06420fa5fe526c9ff616af1976840136ef174b94e8876fa6a2d32ee1d111ab8 SHA512 45f29bdaa70a91ccdd129158511f78f85b01aeb1ef874b087e3eb96000fbfc104b1c427a5ad5dab65e66624151988bb2fd75c63d4f5033b76bd19849b0986bd5 WHIRLPOOL c9485457a052188ef83aa7b15d4df69c2584ddc023248b7b7557b2d61a310f23cbae60a265e1e74c8be4a6d3a3cb54212452ff6c3905bb07e9e93389057cda71
-AUX x2goserver-4.0.1.19-remove_sshfs_cipher.patch 1896 SHA256 e6ed47ac8b2c495a7b131e83d24c0ae0bdb0a848c44e38d5c4e250b9a9e26cc9 SHA512 db40255cd804ce7c0331af278319c75e2cb116492cccd55e9999c0318248a15a2fead00af967790ce9ffab53bb7eb555fc9860fed68e11b7d1660cf8bef6cc9f WHIRLPOOL 028467fce59ac910efbdeb0ff4bbbb71a87d9a3feebdc166f26be06a53030070b8100fc7683f760c34d925abac49fe7403fa5d48c5f3afc91c44f32cdf3c21df
-AUX x2goserver-4.0.1.19-use_bash_in_Xsession.patch 1470 SHA256 3ca94c74645c3032b1ecf0fd870ddee6f50820dcfe4292b3cbb27c2f21431b67 SHA512 d8d57fa3064d8bc1d52ff1327e14155efa9baa9f430b8e11c084972c3c5402429a737aeb07ed5f3f9fee30d03d27dc7bed9fd37ce43d7d6f700a94099592d75a WHIRLPOOL 973c22d53d8670bb29feefe9cd7528c37435cf520f58b5b1a814ef4a004bae0ee5735f8f24b2c7b112549f65cff8ec78cffd10f6b7955ab50a633e47e2fad9be
 AUX x2goserver.init 442 SHA256 d85e7ed5e548a23c2e808279eabad976bab4da1bf32ae755ad799781c5a78e10 SHA512 4e5add80aedbfb732552158b8c2b97b711e333f45740b8e3dd37089e7a512bd145d64812ec651cd7b022065129cced5730e1b28ab3758fcd81bea5b84b46d93c WHIRLPOOL b5e2812fad2220e05c941457dd0357c54456bb49ece6db7ac6efa8a2938f085dfb910c6b2f5e11163b75f9832bdee26db39c9abd7d9158aa7d66916e3cc559e1
 DIST x2goserver-4.0.1.19.tar.gz 89434 SHA256 3dd5c1464a7992a38760fd6b08f5f8d37646f939f4f7834a7cd96bf4950623cc SHA512 dbd054a6bf781d843a48fcea3449037b991aaa38a52705d48dd5fa8d7fe85c56d4ff31b9a10189a9043a3e5cc0c69475947aea5a5fb78e3c076c0e56079b747d WHIRLPOOL f44fadfda6e1ff165ff989f0c10116c8318f5915764b9bfc663e4658190934eb5155e17e072f131842a98cc02908366b0f91c7b0b9b9e73d4e2a729f00ba0d31
 DIST x2goserver-4.0.1.20.tar.gz 96412 SHA256 f8bf48e1c8995bd5a7cde6de1c006fdb77f2bae6c4b82e6b7b985a8f00a3dad9 SHA512 21f3a415c50bf78e4c044c5b77f8478a307e4b3cef990edd415d9e7479f48fbc1c051e9f7c16a5d1f30726f4f2a812fb367eecb0a073bfba1ea2c6173c71fe54 WHIRLPOOL f3ed9160cfbde7ccfa1e367d8ca19afef2e0673103e183e517fb845cf8bf93b487e40ad34a16b85d127446b38bcb10cf9a5a2d467f6fa38b937cb0d30545905d
-EBUILD x2goserver-4.0.1.19-r2.ebuild 2589 SHA256 a39bbbf33fe3476890ad3f0aa631202b587455e7b8f54a3ea63a802514022bd1 SHA512 48b8e813b688ae3195bb16bcbacc7f025ca6fb83574300854be69e443c98663835b8854534d4f5295dc8dacfb60727aea78409d362617c4ded76204e77c4affe WHIRLPOOL 001e9d6ea95f3cb167e049c5dee1068dad77114247e0e9bce751100d30c03aaa385e482807c42b5eefccf2dee555a7a9e1a0ccc8185e47917266bc86c85fad9d
-EBUILD x2goserver-4.0.1.19-r3.ebuild 2638 SHA256 721107c845f2f5177ae2348a9fbe4a6c7037267e5a2fc0e611b93398be1918e3 SHA512 f911bb6de40573af208611ef5fada2b29b6e3e92120e228500a27144f6c8309a104cbaf0a972f53b9d5421c55f8a4f8c97458d7fe9802eb11cf9b0b25f7bca58 WHIRLPOOL 407251c7774ca0bd81ee3bda3b1fec4e636c6b0762eafd9979abf79a6442f972b974ad505f724f11202d8e111dde6ecb9b13a8ed76be57eea5f9a8b0056e4a71
+DIST x2goserver-4.0.1.21.tar.gz 101441 SHA256 a3ebba69a4b640541d811453457454f324ab6deeac7da13ec0c159e8f060b7af SHA512 641421b309baab0941416ccd60dd8b66b0a968a4031252c2d8066fb570c1985787848ad368d731fbdb4737c00ea722a26682fb8cd2820ea19da271c4ecffafa4 WHIRLPOOL b9b4be822e0d155bf3318fa346a2dd2973cc47168845f99beba7935d0c1453f75aeb948bed17c01f54c931cf4f80aba6c89186b88959a296f433e83f48cd730d
 EBUILD x2goserver-4.0.1.19.ebuild 2499 SHA256 82523c984842bc75e1c012083299d49e2adb4eb98b14f6990456d6dec076fb53 SHA512 f6883747893843fd472344c1bbd578982e878866f60e3fb5fdd4a313a9009bca2498d7ac286dfe96fc16c5002240d4fae3c2972393c248f3d6d034d59b2d3b65 WHIRLPOOL 4e6eea122b607a8b09838eff5d21e8d640fdad341c8394773d0dac919c030bd3b8df7c0aae92cd47614744cf5a6bb28d0a88a8761bf51131a07b5c59bd7e1336
 EBUILD x2goserver-4.0.1.20.ebuild 2544 SHA256 76fed816c4230129c427be207eae126c229be67ce306c6d69ed3e881ebffbfc3 SHA512 e67ed7fe6fe116bb9d29912ed71b0be31229662add077d3aef350299303849088e77dbabb5a7a53c511f9f5384e435ab03a4be35fbc3745b84bd47f5bfc39884 WHIRLPOOL 742c74d7942bdf98100645fe8d9f0237052b3abe0f3a02a25e2064f78cfddbc8d6a11073f602a45fe9e98990d8d3190495bbb2c571284ff566c6e73678e88759
+EBUILD x2goserver-4.0.1.21.ebuild 2697 SHA256 52ca2ae068406670f6fc48e98509616b759bfa4ab23fd2996658e2aecd66c476 SHA512 eaf3f000a8f4f5a442ae5d9d7bacb470942fcae54a34a75e3a88b939405d0e9b765160821d27ea1239ee2254dfb57cf0502873822cf54dac75dac8ad0526b1bd WHIRLPOOL 727e320bcffc8ed70bfd855de8c9f9448cee343d1b731ebdfec57285d9342edd3f8b26c1791086aa0b63bb0efd75b881cde87fb16275bec67c22875d8c833d91
 MISC ChangeLog 6358 SHA256 7198ac7c75a68c2db074471238263afed1f53cfceb1e3807a524ec685cd2d228 SHA512 cea547af5c82dc689ea3b820fc1177d4ea66a5f3fe31d125a5968409e905fa6507b0dfb27b0bef7d6472937ba961c625b87eb74903c65cc2d136232961b5d2d8 WHIRLPOOL c90284259476f7e92da3f318ee8c34eef6108522d5a234f6d144f1cae2d381e4e7f0cb5f53bf2ec6bc67240f51fd26d11fe712836ac706b3f1bfb8fa4d723a9a
 MISC ChangeLog-2015 10694 SHA256 280d067f8ea15916b3cdc56ab84c2661fd563272720a933bc10c0250c5378479 SHA512 2588cebd5262b439ab73f00ed6dbaa34d025766b89d47e6e8129401dc56016fb90a100ed1893b185c77a0f197c7e1445ff484c1d617084b7564b02aa8e7a0ec9 WHIRLPOOL de650169bdee0fc545d93e0462ef94e163cde7d4c47f0b4170360b68d3d5452b7e8912acd5be11a73ef1419b10f99b8416db834566311daed5c713963f5d9f9b
 MISC metadata.xml 398 SHA256 232f483c766fd0dac22180147361f9fcbbd69b6ba3d3e2ea4b660ad99787266f SHA512 f0c209499689338c77517afd3c49153e822ba45d29bf575dd6d3e8266bcbe4cb87d9a0a1744178a0392a7358b7164c765157831710ff85cb38dea5b76fd7b65f WHIRLPOOL 6db594132a762989765659193a778362327e9b467d8a9973dbb3e3fe77810798e306901ba5a603bef4c71ee2e90458d500174879fe295c44278caa45d66afbdd
diff --git a/net-misc/x2goserver/files/x2goserver-4.0.1.19-remove_sshfs_cipher.patch b/net-misc/x2goserver/files/x2goserver-4.0.1.19-remove_sshfs_cipher.patch
deleted file mode 100644
index b29336349f09..000000000000
--- a/net-misc/x2goserver/files/x2goserver-4.0.1.19-remove_sshfs_cipher.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-X-Git-Url: http://code.x2go.org/gitweb?p=x2goserver.git;a=blobdiff_plain;f=x2goserver%2Fbin%2Fx2gomountdirs;h=f39d19975c6806ea115921aa0e1949e3dfa44c7d;hp=f0b497edd252481792ebc6e5e73d79158bc4a14c;hb=86a0e421c3da850045459af855a33f646828dd68;hpb=7ae2669b596d3b84f0ba09552d5a8c0e653ce86d
-
-diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
-index f0b497e..f39d199 100755
---- a/x2goserver/bin/x2gomountdirs
-+++ b/x2goserver/bin/x2gomountdirs
-@@ -304,12 +304,12 @@ for (my $i=0;$i<@dirs;$i++)
- 		{
- 			syslog('debug', "SSH host key has arrived: $key.ident");
- 		}
--		$msg = "timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port";
-+		$msg = "timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port";
- 		syslog('debug', "executing: $msg");
- 		print "inserted, $msg\n";
- 
- 		# FIXME: this system call should be converted to a multi-argument system call while pertaining the redirect of stderr to the mounts.log file
--		if (system("timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 1>>$sessiondir/sshfs-mounts.log 2>&1")==0)
-+		if (system("timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 1>>$sessiondir/sshfs-mounts.log 2>&1")==0)
- 		{
- 			print "mount @dirs[$i] ok\n";
- 			syslog('notice', "successfully mounted $user\@$host:$port@dirs[$i] to $mntpath");
diff --git a/net-misc/x2goserver/files/x2goserver-4.0.1.19-use_bash_in_Xsession.patch b/net-misc/x2goserver/files/x2goserver-4.0.1.19-use_bash_in_Xsession.patch
deleted file mode 100644
index 0eab0d391b69..000000000000
--- a/net-misc/x2goserver/files/x2goserver-4.0.1.19-use_bash_in_Xsession.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-X-Git-Url: http://code.x2go.org/gitweb?p=x2goserver.git;a=blobdiff_plain;f=x2goserver-xsession%2Fetc%2FXsession;h=7ad477ffc439ef0f7f0ccbbee40f55504a8f2dd6;hp=ab32a1062cdbec6b3ccbea29682d240f06046394;hb=7ae2669b596d3b84f0ba09552d5a8c0e653ce86d;hpb=1cc93d59f6bb2559b1c42daba26cf3b9b50f3e69
-
-diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession
-index ab32a10..7ad477f 100755
---- a/x2goserver-xsession/etc/Xsession
-+++ b/x2goserver-xsession/etc/Xsession
-@@ -208,16 +208,16 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-
- 
- 	# XCLIENTS_D=/etc/x2go/Xclients.d
- 	#if [ -d "$XCLIENTS_D" -a -x "$XCLIENTS_D/Xclients.${XSESSION_EXEC}.sh" ]; then
--	#	exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT $XCLIENTS_D/Xclients.$1.sh"
-+	#	exec /bin/bash -c "exec -l \"$SHELL\" -c \"$CK_XINIT_SESSION $SSH_AGENT $XCLIENTS_D/Xclients.$1.sh\""
- 	#fi
- 
- 	# switchdesk support is also totally deprecated in RHEL, but we leave it here
- 	# as a reminder, as well, in case we need it in the future for special setups...
- 	#if [ -x "$SWITCHDESKPATH/Xclients.${XSESSION_EXEC}" ]; then
--	#	exec -l "$SHELL" -c "$SWITCHDESKPATH/Xclients.${XSESSION_EXEC}";
-+	#	exec /bin/bash -c "exec -l \"$SHELL\" -c \"$SWITCHDESKPATH/Xclients.${XSESSION_EXEC}\""
- 	#fi
- 
--	exec $CK_XINIT_SESSION $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$STARTUP\""
-+	exec $CK_XINIT_SESSION $SSH_AGENT /bin/bash -c "exec -l \"$SHELL\" -c \"$STARTUP\""
- fi
- 
- exit 0
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.19-r2.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.19-r2.ebuild
deleted file mode 100644
index df3cd66109cd..000000000000
--- a/net-misc/x2goserver/x2goserver-4.0.1.19-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit 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
-	dev-perl/File-Which
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc[nls]
-	>=net-misc/nx-3.5.0.25
-	net-misc/openssh
-	>=sys-apps/iproute2-4.3.0
-	x11-apps/xauth
-	x11-apps/xhost
-	x11-apps/xwininfo
-	fuse? ( net-fs/sshfs )
-	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() {
-	# Do not install Xresources symlink (#521126)
-	sed -e '\#$(INSTALL_SYMLINK) /etc/X11/Xresources# s/^/#/' -i x2goserver-xsession/Makefile || die "Xresources symlink sed failed"
-	# 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"
-
-	eapply "${FILESDIR}"/${P}-use_bash_in_Xsession.patch
-	eapply_user
-}
-
-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 database, 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.19-r3.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.21.ebuild
index c948c742fc63..d64c4f2f058c 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.19-r3.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.21.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit multilib systemd toolchain-funcs user
+inherit multilib systemd toolchain-funcs user xdg-utils
 
 DESCRIPTION="The X2Go server"
 HOMEPAGE="http://www.x2go.org"
@@ -34,8 +34,6 @@ RDEPEND="dev-perl/Capture-Tiny
 	sqlite? ( dev-perl/DBD-SQLite )"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-use_bash_in_Xsession.patch
-	"${FILESDIR}"/${P}-remove_sshfs_cipher.patch
 	)
 
 pkg_setup() {
@@ -70,7 +68,7 @@ src_install() {
 	fperms 2755 /usr/bin/x2goprint
 	fperms 0750 /etc/sudoers.d
 	fperms 0440 /etc/sudoers.d/x2goserver
-	dosym /usr/share/applications /etc/x2go/applications
+	dosym ../../usr/share/applications /etc/x2go/applications
 
 	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
 	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
@@ -89,4 +87,12 @@ pkg_postinst() {
 	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"
+
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
 }