gentoo resync : 17.07.2021

4 files changed, 2 insertions, 214 deletions

diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index fa998e9f2d15..94d52e65317a 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -2,9 +2,6 @@ AUX x2gocleansessions.service 198 BLAKE2B 2660b62182aecd274786220abe4616f3862934
 AUX x2goserver-4.1.0.0-Xresources.patch 1139 BLAKE2B f48f329836a86958866836949a44ccd6c37dc56b3da85366d8ab9a5ec003bc50a10f262211c9de3f2512aa497746d4ad43d1043fe6a36caf3905981f3d551e3c SHA512 42dba64bb8a0c278ca81f4e41236c17ea01c8294914f0051d4781c701b4356ccc05ee6835b0688b79205e0cd7a4c9ebbe418aac685a982db00fa293d48a61300
 AUX x2goserver-4.1.0.0-skip_man2html.patch 2936 BLAKE2B 6b18439c5dc994c5a8ec073e2767047dcd94ebb61b0418ba5d55d55d2860530ab818b87192bdc85124be6a9d52d5c19872063555b7bdcd721429ccfa8593cabb SHA512 7b56c725c42f0813ecb88ed7f34feb0cecd1eaedd157c19068f3e6607bd8510fbba177079744f9e93fc83a4bcc65e7df40f8b1bb6acf4124fda847bc4fb86986
 AUX x2goserver.init 442 BLAKE2B 11e29bed398d23cae9fccc29d2ccce6ef59422a3d258139f91dd100562bb3029202a0bb0174fcb71dd776b075a708558eeaf8b1d9914c671bd8e59799772be44 SHA512 4e5add80aedbfb732552158b8c2b97b711e333f45740b8e3dd37089e7a512bd145d64812ec651cd7b022065129cced5730e1b28ab3758fcd81bea5b84b46d93c
-DIST x2goserver-4.1.0.2.tar.gz 138053 BLAKE2B 5281f05d8531ace6e9228faf5c73590b17e4f743ab6a01779bcf0252c2c34d4525919ae71deef190bf835713be2f43d25fa41fd5c82e99280f0dc77927af7006 SHA512 32f9f38889b79a836bba12bf8df61d0a1530959b1e0da52935a330472a3933288edc611a4843ae145261e954a61e5b61a00a7cb0563b276bcad0587e00c09672
 DIST x2goserver-4.1.0.3.tar.gz 141581 BLAKE2B 79401a146e8a18451d6521f4b9556b2f22746bd752f39dc45764bacca085f2bb66a92327aaeb292979ce43ffbde24541e492cec814f1f8a535614cbdc2dc3ebd SHA512 9d7257dd454bfedca9e3ef1b07bc38b540cb833fae4535f2225a1f0bfea93c0f04c638d411b57c50e7170106a5ae1d7f41c19f043832129a7a9460dcfd34c56a
-EBUILD x2goserver-4.1.0.2.ebuild 2593 BLAKE2B 4a996297ca35b0306bd1057565099a511f78fc47095b780718327785349d241fdbae42ba02da49f1643251a1bbe20d7a8f9c8ce5a6c39ce2d0a1748790872969 SHA512 11e50cf4858d7363b27b6000f92111fc70be01d986b2452d600dfe2f71c435764ceee9de3d4050ce65924ec1c03f6d97d576bd8058ec5cb9d216318156267bca
-EBUILD x2goserver-4.1.0.3-r1.ebuild 2526 BLAKE2B bcf8660139ec8f5a3f0b890201d2b8a0547a683fd7538700759f120f686d73a79a9a78bf7d69e10c97769a207693eca1ff74af014225277e869ecf2ac17574bc SHA512 b4f5094d66f77d2424f2f7913ed65b582f15ab6752941dbdf0938d2233bcfcff97acd6b20496dc9173a6e710cc9ac3528195f19a2f7932c495f4760bfe693c54
-EBUILD x2goserver-4.1.0.3.ebuild 2690 BLAKE2B 50641b4a750a3026657805e966292d4ec4122450e4702cd4ba661e6b33a2a265423e1a5830f03db6fc3d87c5e44023ff972b0b9406952ced3c6e8e61215b33cb SHA512 b271f0d8bede6fa5d39697f20ff0970964aef86fd8a2a16b7580536d0555be2a0a8bdace517380c4f3dbbdacef297451d640ad064f898724b705d725eeea76ce
+EBUILD x2goserver-4.1.0.3-r1.ebuild 2524 BLAKE2B 5e788c529470b0e79259e6f6250f4bfaf6a552054276d06267c0a5baeefd42e9d903ae96c224aac7afae531dadf85299a0d1e483f39bc7b69ccecede5d16bd0f SHA512 7cfe8711457cbf38e6061b95e10395399b53112ca271a30636036249dacb74c1b0b5eb4bc73d5830c27722738419438f5e854a9ad853b635a50251c8b963fc6f
 MISC metadata.xml 346 BLAKE2B 0b995b0163615cb9c993c9ebdfd75d144052fcb65fed6d5f2e3cdaceaedaf8d4c7b6dfdf32e98a1f0c1cfae022617f216f73845177f5e9f904a77f043b78e851 SHA512 860975e20db2fefc93338ee5c21a2491f56c4f96924788098c94c9dcd0faebec15fdc7f06c04c571bae291a47ac6be4980799057d56ef33afefec3d878260c2e
diff --git a/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild
deleted file mode 100644
index ca896382fcee..000000000000
--- a/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit systemd toolchain-funcs user xdg
-
-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="virtual/perl-ExtUtils-MakeMaker"
-RDEPEND="dev-lang/perl:=
-	dev-perl/Capture-Tiny
-	dev-perl/Config-Simple
-	dev-perl/File-BaseDir
-	dev-perl/File-ReadBackwards
-	dev-perl/File-Which
-	dev-perl/Switch
-	dev-perl/Try-Tiny
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc[nls]
-	>=net-misc/nx-3.5.99.14
-	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 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.0.0-Xresources.patch
-	"${FILESDIR}"/${PN}-4.1.0.0-skip_man2html.patch
-)
-
-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() {
-	default
-	# Multilib clean
-	sed -e "s#/lib/#/$(get_libdir)/#" -i x2goserver/bin/x2gopath || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDIR="/usr/$(get_libdir)/x2go" \
-		PREFIX=/usr
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		LIBDIR="/usr/$(get_libdir)/x2go" \
-		NXLIBDIR="/usr/$(get_libdir)/nx" \
-		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() {
-	xdg_pkg_postinst
-	if use sqlite ; then
-		if [[ -f "${EROOT}"/var/lib/x2go/x2go_sessions ]] ; then
-			elog "To use sqlite and update your existing database, run:"
-			elog " # x2godbadmin --updatedb"
-		else
-			elog "To use sqlite and create the initial database, run:"
-			elog " # x2godbadmin --createdb"
-		fi
-
-	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.1.0.3-r1.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild
index 7e6f6226496a..c702e328a829 100644
--- a/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.1.0.3-r1.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 )"
diff --git a/net-misc/x2goserver/x2goserver-4.1.0.3.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.3.ebuild
deleted file mode 100644
index 84cebf81ce7e..000000000000
--- a/net-misc/x2goserver/x2goserver-4.1.0.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd toolchain-funcs user xdg
-
-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="virtual/perl-ExtUtils-MakeMaker"
-RDEPEND="dev-lang/perl:=
-	dev-perl/Capture-Tiny
-	dev-perl/Config-Simple
-	dev-perl/File-BaseDir
-	dev-perl/File-ReadBackwards
-	dev-perl/File-Which
-	dev-perl/Switch
-	dev-perl/Try-Tiny
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc[nls]
-	>=net-misc/nx-3.5.99.14
-	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 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.0.0-Xresources.patch
-	"${FILESDIR}"/${PN}-4.1.0.0-skip_man2html.patch
-)
-
-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() {
-	default
-	# Multilib clean
-	sed -e "s#/lib/#/$(get_libdir)/#" -i x2goserver/bin/x2gopath || die
-
-	# Do not compress man pages by default
-	sed '/^[[:space:]]*gzip.*man/d' -i */Makefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDIR="/usr/$(get_libdir)/x2go" \
-		PREFIX=/usr
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		LIBDIR="/usr/$(get_libdir)/x2go" \
-		NXLIBDIR="/usr/$(get_libdir)/nx" \
-		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() {
-	xdg_pkg_postinst
-	if use sqlite ; then
-		if [[ -f "${EROOT}"/var/lib/x2go/x2go_sessions ]] ; then
-			elog "To use sqlite and update your existing database, run:"
-			elog " # x2godbadmin --updatedb"
-		else
-			elog "To use sqlite and create the initial database, run:"
-			elog " # x2godbadmin --createdb"
-		fi
-
-	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"
-}