[gentoo-commits] repo/gentoo:master commit in: net-misc/x2goserver/files/, net-misc/x2goserver/

[Bernard Cafarelli]

commit:     49acb5110699cc508f203ed5be28b2776f9261b8
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 23 13:45:49 2018 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 13:49:10 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49acb511

net-misc/x2goserver: 4.1.0.0 bump

Upstream major release, changes a few things including a x2goagent
wrapper script
Update ebuild accordingly
Replace some sed calls with patches in ebuild

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-misc/x2goserver/Manifest                       |  1 +
 .../files/x2goserver-4.1.0.0-Xresources.patch      | 11 +++
 .../files/x2goserver-4.1.0.0-provided_by_nx.patch  | 27 ++++++
 .../files/x2goserver-4.1.0.0-skip_man2html.patch   | 84 +++++++++++++++++++
 net-misc/x2goserver/x2goserver-4.1.0.0.ebuild      | 97 ++++++++++++++++++++++
 5 files changed, 220 insertions(+)

diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 3a8ffc061e5..d3abe003cfd 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -1 +1,2 @@
 DIST x2goserver-4.0.1.22.tar.gz 101286 BLAKE2B 238da88d333b6bcb31b37b7d5e44d223ad975388fdee0cfb1ba21c58d5ab9a42961c7fcd55e474affd29197bc92fcbddf8c679eab8052387996b983a9e0244ba SHA512 ba726663f4fdedaa13cd1496a693cc9b0d7c1a815563ef8abdfe9e53b69c83379d0ed6c5569e6e7d77ac792a18a4dfed8c9b12c0a356664a66fe3be917fb7a67
+DIST x2goserver-4.1.0.0.tar.gz 132386 BLAKE2B b24b29f2eebaec04061690b51cf00f65de256ce2f68b57909909fe88a08466a1f802ead00ad9cf62a5327c2b7bc6690feb7c26b8b5b711757e88a553586fbe1a SHA512 3f48dced332729d726bffa991a7a203035fc6580dd2e094561f52b327e7c2e48b807daf68219132fbec29b5abcb865021361a35654792e58da1f2e4715ea95d0

diff --git a/net-misc/x2goserver/files/x2goserver-4.1.0.0-Xresources.patch b/net-misc/x2goserver/files/x2goserver-4.1.0.0-Xresources.patch
new file mode 100644
index 00000000000..e75355c835d
--- /dev/null
+++ b/net-misc/x2goserver/files/x2goserver-4.1.0.0-Xresources.patch
@@ -0,0 +1,11 @@
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-xsession/Makefile x2goserver-4.1.0.0/x2goserver-xsession/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-xsession/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-xsession/Makefile	2018-02-23 14:36:33.539717610 +0100
+@@ -53,7 +53,6 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
+ #       provide target dirs for X11 related symlinks
+ 	$(INSTALL_PROGRAM) etc/Xsession                 $(DESTDIR)$(ETCDIR)/
+-	$(INSTALL_SYMLINK) /etc/X11/Xresources          $(DESTDIR)$(ETCDIR)/
+ 	if [ -e /etc/debian_version ]; then if [ -e $(XSESSIONOPTIONFILE) ]; then $(INSTALL_SYMLINK) $(XSESSIONOPTIONFILE) $(DESTDIR)$(ETCDIR)/Xsession.options; else touch $(DESTDIR)$(ETCDIR)/Xsession.options; fi; fi
+ 	if [ -e /etc/debian_version ]; then if [ -d $(XSESSIONDIR) ]; then $(INSTALL_SYMLINK) $(XSESSIONDIR) $(DESTDIR)$(ETCDIR)/Xsession.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.d; fi; fi
+ 	if [ -e /etc/redhat-release ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi

diff --git a/net-misc/x2goserver/files/x2goserver-4.1.0.0-provided_by_nx.patch b/net-misc/x2goserver/files/x2goserver-4.1.0.0-provided_by_nx.patch
new file mode 100644
index 00000000000..e189b918dbd
--- /dev/null
+++ b/net-misc/x2goserver/files/x2goserver-4.1.0.0-provided_by_nx.patch
@@ -0,0 +1,27 @@
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-x2goagent/Makefile x2goserver-4.1.0.0/x2goserver-x2goagent/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-x2goagent/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-x2goagent/Makefile	2018-02-23 14:42:03.106562501 +0100
+@@ -49,7 +49,7 @@
+ clean_man2html:
+ 	rm -rf `dirname $(MAN2HTML_DEST)`
+ 
+-install: install_scripts install_config install_data install_man install_version
++install: install_scripts install_config install_data install_man
+ 
+ install_scripts:
+ 	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+@@ -57,14 +57,11 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d
+ 	$(INSTALL_PROGRAM) share/x2go/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
+-	$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin/
+-	$(INSTALL_SYMLINK) nxagent $(DESTDIR)$(NXLIBDIR)/bin/x2goagent
+ 
+ install_data:
+ 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/
+ 	$(INSTALL_FILE) etc/rgb $(DESTDIR)$(SHAREDIR)/
+ 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/../pixmaps/
+-	$(INSTALL_FILE) share/pixmaps/x2go.xpm $(DESTDIR)$(SHAREDIR)/../pixmaps/
+ 	$(INSTALL_SYMLINK) $(ETCDIR)/rgb $(DESTDIR)$(SHAREDIR)/
+ 
+ install_config:

diff --git a/net-misc/x2goserver/files/x2goserver-4.1.0.0-skip_man2html.patch b/net-misc/x2goserver/files/x2goserver-4.1.0.0-skip_man2html.patch
new file mode 100644
index 00000000000..5e51101f528
--- /dev/null
+++ b/net-misc/x2goserver/files/x2goserver-4.1.0.0-skip_man2html.patch
@@ -0,0 +1,84 @@
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver/Makefile x2goserver-4.1.0.0/x2goserver/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver/Makefile	2018-02-23 14:37:56.512675411 +0100
+@@ -36,7 +36,7 @@
+ 
+ build-arch:
+ 
+-build-indep: build_man2html
++build-indep:
+ 
+ build_man2html:
+ 	if [ -n "$(MAN2HTML_BIN)" ]; then \
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-common/Makefile x2goserver-4.1.0.0/x2goserver-common/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-common/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-common/Makefile	2018-02-23 14:37:56.510675412 +0100
+@@ -36,7 +36,7 @@
+ 
+ build-arch:
+ 
+-build-indep: build_man2html
++build-indep:
+ 
+ build_man2html:
+ 	if [ -n "$(MAN2HTML_BIN)" ]; then \
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-extensions/Makefile x2goserver-4.1.0.0/x2goserver-extensions/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-extensions/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-extensions/Makefile	2018-02-23 14:37:56.511675412 +0100
+@@ -33,7 +33,7 @@
+ 
+ build-arch:
+ 
+-build-indep: build_man2html
++build-indep:
+ 
+ build_man2html:
+ 	if [ -n "$(MAN2HTML_BIN)" ]; then \
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-fmbindings/Makefile x2goserver-4.1.0.0/x2goserver-fmbindings/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-fmbindings/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-fmbindings/Makefile	2018-02-23 14:37:56.511675412 +0100
+@@ -33,7 +33,7 @@
+ 
+ build-arch:
+ 
+-build-indep: build_man2html
++build-indep:
+ 
+ build_man2html:
+ 	if [ -n "$(MAN2HTML_BIN)" ]; then \
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-printing/Makefile x2goserver-4.1.0.0/x2goserver-printing/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-printing/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-printing/Makefile	2018-02-23 14:37:56.512675411 +0100
+@@ -34,7 +34,7 @@
+ 
+ build-arch:
+ 
+-build-indep: build_man2html
++build-indep:
+ 
+ build_man2html:
+ 	if [ -n "$(MAN2HTML_BIN)" ]; then \
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-x2goagent/Makefile x2goserver-4.1.0.0/x2goserver-x2goagent/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-x2goagent/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-x2goagent/Makefile	2018-02-23 14:37:56.512675411 +0100
+@@ -35,7 +35,7 @@
+ 
+ build-arch:
+ 
+-build-indep: build_man2html
++build-indep:
+ 
+ build_man2html:
+ 	if [ -n "$(MAN2HTML_BIN)" ]; then \
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-xsession/Makefile x2goserver-4.1.0.0/x2goserver-xsession/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-xsession/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-xsession/Makefile	2018-02-23 14:37:56.513675411 +0100
+@@ -34,7 +34,7 @@
+ 
+ build-arch:
+ 
+-build-indep: build_man2html
++build-indep:
+ 
+ build_man2html:
+ 

diff --git a/net-misc/x2goserver/x2goserver-4.1.0.0.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.0.ebuild
new file mode 100644
index 00000000000..5f3be402895
--- /dev/null
+++ b/net-misc/x2goserver/x2goserver-4.1.0.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib systemd toolchain-funcs user xdg-utils
+
+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
+	dev-perl/Switch
+	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 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1.0.0-Xresources.patch
+	"${FILESDIR}"/${PN}-4.1.0.0-provided_by_nx.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() {
+	# Multilib clean
+	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die
+	sed -e "s#/lib/#/$(get_libdir)/#" -i x2goserver/bin/x2gopath || die
+
+	default
+}
+
+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"
+
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}