Gentoo Archives: gentoo-commits

From: Bernard Cafarelli <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/x2goserver/
Date: Thu, 22 Feb 2018 10:13:00
Message-Id: 1519294327.e0951aefa73536abc4b088a00a6b1cd7470c7263.voyageur@gentoo
1 commit: e0951aefa73536abc4b088a00a6b1cd7470c7263
2 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 22 10:12:07 2018 +0000
4 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 22 10:12:07 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0951aef
7
8 net-misc/x2goserver: fix hardcoded "lib" directory
9
10 /usr/bin/x2gopath unconditionally set libdir to "lib", this breaks on
11 no-symlink-lib profiles
12
13 Thanks Guillaume Castagnino <casta <AT> xwing.info> for the fix
14
15 Closes: https://bugs.gentoo.org/646958
16 Package-Manager: Portage-2.3.24, Repoman-2.3.6
17
18 net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild | 99 +++++++++++++++++++++++
19 1 file changed, 99 insertions(+)
20
21 diff --git a/net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild
22 new file mode 100644
23 index 00000000000..6f481fc8cff
24 --- /dev/null
25 +++ b/net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild
26 @@ -0,0 +1,99 @@
27 +# Copyright 1999-2018 Gentoo Foundation
28 +# Distributed under the terms of the GNU General Public License v2
29 +
30 +EAPI=6
31 +inherit multilib systemd toolchain-funcs user xdg-utils
32 +
33 +DESCRIPTION="The X2Go server"
34 +HOMEPAGE="http://www.x2go.org"
35 +SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
36 +
37 +LICENSE="GPL-2"
38 +SLOT="0"
39 +KEYWORDS="~amd64 ~x86"
40 +IUSE="+fuse postgres +sqlite"
41 +
42 +REQUIRED_USE="|| ( postgres sqlite )"
43 +
44 +DEPEND=""
45 +RDEPEND="dev-perl/Capture-Tiny
46 + dev-perl/Config-Simple
47 + dev-perl/File-BaseDir
48 + dev-perl/File-ReadBackwards
49 + dev-perl/File-Which
50 + media-fonts/font-cursor-misc
51 + media-fonts/font-misc-misc[nls]
52 + >=net-misc/nx-3.5.0.25
53 + net-misc/openssh
54 + >=sys-apps/iproute2-4.3.0
55 + x11-apps/xauth
56 + x11-apps/xhost
57 + x11-apps/xwininfo
58 + fuse? ( net-fs/sshfs )
59 + postgres? ( dev-perl/DBD-Pg )
60 + sqlite? ( dev-perl/DBD-SQLite )"
61 +
62 +PATCHES=(
63 + )
64 +
65 +pkg_setup() {
66 + # Force the group creation, #479650
67 + enewgroup x2gouser
68 + enewgroup x2goprint
69 + enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
70 + enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
71 +}
72 +
73 +src_prepare() {
74 + # Do not install Xresources symlink (#521126)
75 + sed -e '\#$(INSTALL_SYMLINK) /etc/X11/Xresources# s/^/#/' -i x2goserver-xsession/Makefile || die
76 + # Multilib clean
77 + sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die
78 + sed -e "s#/lib/#/$(get_libdir)/#" -i x2goserver/bin/x2gopath || die
79 + # Skip man2html build
80 + sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die
81 + # Use nxagent directly
82 + sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die
83 +
84 + default
85 +}
86 +
87 +src_compile() {
88 + emake CC="$(tc-getCC)" PREFIX=/usr
89 +}
90 +
91 +src_install() {
92 + emake DESTDIR="${D}" PREFIX=/usr install
93 +
94 + fowners root:x2goprint /usr/bin/x2goprint
95 + fperms 2755 /usr/bin/x2goprint
96 + fperms 0750 /etc/sudoers.d
97 + fperms 0440 /etc/sudoers.d/x2goserver
98 + dosym ../../usr/share/applications /etc/x2go/applications
99 +
100 + newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
101 + systemd_dounit "${FILESDIR}"/x2gocleansessions.service
102 +}
103 +
104 +pkg_postinst() {
105 + if use sqlite ; then
106 + elog "To use sqlite and create the initial database, run:"
107 + elog " # x2godbadmin --createdb"
108 + fi
109 + if use postgres ; then
110 + elog "To use a PostgreSQL database, more information is availabe here:"
111 + elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
112 + fi
113 +
114 + elog "For password authentication, you need to enable PasswordAuthentication"
115 + elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
116 + elog "An init script was installed for x2gocleansessions"
117 +
118 + xdg_mimeinfo_database_update
119 + xdg_desktop_database_update
120 +}
121 +
122 +pkg_postrm() {
123 + xdg_mimeinfo_database_update
124 + xdg_desktop_database_update
125 +}