gentoo resync : 17.12.2017

3 files changed, 2 insertions, 88 deletions

diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 25a5ec2e558b..2d614254659d 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -1,11 +1,9 @@
 AUX x2gocleansessions.service 198 BLAKE2B 2660b62182aecd274786220abe4616f3862934b84308369e6791bb14ac1a919e5ed08b02c70f9ca135613a7b10abf9ed67f0ae2d5166e6b5fc83f81192a43587 SHA512 45f29bdaa70a91ccdd129158511f78f85b01aeb1ef874b087e3eb96000fbfc104b1c427a5ad5dab65e66624151988bb2fd75c63d4f5033b76bd19849b0986bd5
 AUX x2goserver.init 442 BLAKE2B 11e29bed398d23cae9fccc29d2ccce6ef59422a3d258139f91dd100562bb3029202a0bb0174fcb71dd776b075a708558eeaf8b1d9914c671bd8e59799772be44 SHA512 4e5add80aedbfb732552158b8c2b97b711e333f45740b8e3dd37089e7a512bd145d64812ec651cd7b022065129cced5730e1b28ab3758fcd81bea5b84b46d93c
-DIST x2goserver-4.0.1.19.tar.gz 89434 BLAKE2B 178da5ec4584b7f5065b565b3306e933aa1944c9bf655d280bcd30ebd1e118f0ff51b8fb402048fbbb405ac6456d8a25761e27d378fa11faf53bc7a700eba22a SHA512 dbd054a6bf781d843a48fcea3449037b991aaa38a52705d48dd5fa8d7fe85c56d4ff31b9a10189a9043a3e5cc0c69475947aea5a5fb78e3c076c0e56079b747d
 DIST x2goserver-4.0.1.20.tar.gz 96412 BLAKE2B 292aadd38fc91436e034b1dff52d2188670598958b325782bda747a8f4f73412e9edd51d57b362d8fcc33a8c2ddbb962ddba2c678dd195181c986ddc259160d5 SHA512 21f3a415c50bf78e4c044c5b77f8478a307e4b3cef990edd415d9e7479f48fbc1c051e9f7c16a5d1f30726f4f2a812fb367eecb0a073bfba1ea2c6173c71fe54
 DIST x2goserver-4.0.1.21.tar.gz 101441 BLAKE2B 52b9488ad9471c351c66d49624898b4b19c18fb30b1dac0f24c3645bb49c1e562568515b838f323f92612caea4debadc5ebd21a697eee86c3122fd7758bf94c7 SHA512 641421b309baab0941416ccd60dd8b66b0a968a4031252c2d8066fb570c1985787848ad368d731fbdb4737c00ea722a26682fb8cd2820ea19da271c4ecffafa4
 DIST x2goserver-4.0.1.22.tar.gz 101286 BLAKE2B 238da88d333b6bcb31b37b7d5e44d223ad975388fdee0cfb1ba21c58d5ab9a42961c7fcd55e474affd29197bc92fcbddf8c679eab8052387996b983a9e0244ba SHA512 ba726663f4fdedaa13cd1496a693cc9b0d7c1a815563ef8abdfe9e53b69c83379d0ed6c5569e6e7d77ac792a18a4dfed8c9b12c0a356664a66fe3be917fb7a67
-EBUILD x2goserver-4.0.1.19.ebuild 2499 BLAKE2B 4c164cfeff69d05c05fc741ff0e56f7d8a8f7ca6857bee68afc36039437ae16c7629107f0a4a87b826c71549e534107d10553c558cb97cc489ed5ac717369764 SHA512 f6883747893843fd472344c1bbd578982e878866f60e3fb5fdd4a313a9009bca2498d7ac286dfe96fc16c5002240d4fae3c2972393c248f3d6d034d59b2d3b65
-EBUILD x2goserver-4.0.1.20.ebuild 2544 BLAKE2B 5ba1096fcf59458937c70f3b0c06c3eaa6f2d5ce575fedb4baacb961ff3ae12207c5a15d043e01f707122e0fe683bafe6b9bad9073c214ac00bfc88c5f989ef3 SHA512 e67ed7fe6fe116bb9d29912ed71b0be31229662add077d3aef350299303849088e77dbabb5a7a53c511f9f5384e435ab03a4be35fbc3745b84bd47f5bfc39884
+EBUILD x2goserver-4.0.1.20.ebuild 2543 BLAKE2B bd9e005bdfa1e0249ad7b1f81ee70380b0b04066e6e00cce2a1d404640fb23f5d6d37d7e1f7e4cd12741f64e75a877433f2c6740e0f2a23f160aa033d116d9b4 SHA512 2141523537811df40bd2c995f11e69b42c84b4cf38f9d6df708743215ee5a2a0dc4f3328f2be9f76f3ab48fe375282f1895754ee0cf1ba59005ba0add7f55c85
 EBUILD x2goserver-4.0.1.21.ebuild 2697 BLAKE2B 92f82889dd714e5de2eabf23c1ec7487e465ce410048d6104e1bf9e1c11d45e0a65440c44ab6be2d98b43fcc7daaa08d1af68e91acc39257342d6b94a7ec710e SHA512 eaf3f000a8f4f5a442ae5d9d7bacb470942fcae54a34a75e3a88b939405d0e9b765160821d27ea1239ee2254dfb57cf0502873822cf54dac75dac8ad0526b1bd
 EBUILD x2goserver-4.0.1.22.ebuild 2697 BLAKE2B 92f82889dd714e5de2eabf23c1ec7487e465ce410048d6104e1bf9e1c11d45e0a65440c44ab6be2d98b43fcc7daaa08d1af68e91acc39257342d6b94a7ec710e SHA512 eaf3f000a8f4f5a442ae5d9d7bacb470942fcae54a34a75e3a88b939405d0e9b765160821d27ea1239ee2254dfb57cf0502873822cf54dac75dac8ad0526b1bd
 MISC metadata.xml 398 BLAKE2B 4e3f8a55917796a30045a54805c7d7d8d4457ec14aa2354987868e02805192f208f1dd624414e1b04633ccd4d2fccd0d05b91deabc3073aefdb019578acdc42d SHA512 f0c209499689338c77517afd3c49153e822ba45d29bf575dd6d3e8266bcbe4cb87d9a0a1744178a0392a7358b7164c765157831710ff85cb38dea5b76fd7b65f
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.19.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.19.ebuild
deleted file mode 100644
index 7e553376e433..000000000000
--- a/net-misc/x2goserver/x2goserver-4.0.1.19.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="+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
-	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"
-}
-
-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.20.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.20.ebuild
index 8ec714bca8f1..ec52317ce100 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.20.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.20.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+fuse postgres +sqlite"
 
 REQUIRED_USE="|| ( postgres sqlite )"