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/files/, net-misc/x2goserver/
Date: Fri, 03 Aug 2018 14:11:39
Message-Id: 1533305476.a135bfb96bcb1ab9af82631ef5052ab4f4fa0571.voyageur@gentoo
1 commit: a135bfb96bcb1ab9af82631ef5052ab4f4fa0571
2 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 3 14:11:09 2018 +0000
4 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 3 14:11:16 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a135bfb9
7
8 net-misc/x2goserver: drop some versions
9
10 Package-Manager: Portage-2.3.44, Repoman-2.3.10
11
12 .../files/x2goserver-4.1.0.0-provided_by_nx.patch | 27 ------
13 net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild | 100 ---------------------
14 net-misc/x2goserver/x2goserver-4.1.0.0.ebuild | 98 --------------------
15 3 files changed, 225 deletions(-)
16
17 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
18 deleted file mode 100644
19 index e189b918dbd..00000000000
20 --- a/net-misc/x2goserver/files/x2goserver-4.1.0.0-provided_by_nx.patch
21 +++ /dev/null
22 @@ -1,27 +0,0 @@
23 -diff -Naur x2goserver-4.1.0.0.orig/x2goserver-x2goagent/Makefile x2goserver-4.1.0.0/x2goserver-x2goagent/Makefile
24 ---- x2goserver-4.1.0.0.orig/x2goserver-x2goagent/Makefile 2018-02-15 23:08:27.000000000 +0100
25 -+++ x2goserver-4.1.0.0/x2goserver-x2goagent/Makefile 2018-02-23 14:42:03.106562501 +0100
26 -@@ -49,7 +49,7 @@
27 - clean_man2html:
28 - rm -rf `dirname $(MAN2HTML_DEST)`
29 -
30 --install: install_scripts install_config install_data install_man install_version
31 -+install: install_scripts install_config install_data install_man
32 -
33 - install_scripts:
34 - $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
35 -@@ -57,14 +57,11 @@
36 - $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
37 - $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d
38 - $(INSTALL_PROGRAM) share/x2go/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
39 -- $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin/
40 -- $(INSTALL_SYMLINK) nxagent $(DESTDIR)$(NXLIBDIR)/bin/x2goagent
41 -
42 - install_data:
43 - $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/
44 - $(INSTALL_FILE) etc/rgb $(DESTDIR)$(SHAREDIR)/
45 - $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/../pixmaps/
46 -- $(INSTALL_FILE) share/pixmaps/x2go.xpm $(DESTDIR)$(SHAREDIR)/../pixmaps/
47 - $(INSTALL_SYMLINK) $(ETCDIR)/rgb $(DESTDIR)$(SHAREDIR)/
48 -
49 - install_config:
50
51 diff --git a/net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild
52 deleted file mode 100644
53 index 3aeb90b0e70..00000000000
54 --- a/net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild
55 +++ /dev/null
56 @@ -1,100 +0,0 @@
57 -# Copyright 1999-2018 Gentoo Foundation
58 -# Distributed under the terms of the GNU General Public License v2
59 -
60 -EAPI=6
61 -inherit multilib systemd toolchain-funcs user xdg-utils
62 -
63 -DESCRIPTION="The X2Go server"
64 -HOMEPAGE="http://www.x2go.org"
65 -SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
66 -
67 -LICENSE="GPL-2"
68 -SLOT="0"
69 -KEYWORDS="~amd64 ~x86"
70 -IUSE="+fuse postgres +sqlite"
71 -
72 -REQUIRED_USE="|| ( postgres sqlite )"
73 -
74 -DEPEND="virtual/perl-ExtUtils-MakeMaker"
75 -RDEPEND="dev-perl/Capture-Tiny
76 - dev-perl/Config-Simple
77 - dev-perl/File-BaseDir
78 - dev-perl/File-ReadBackwards
79 - dev-perl/File-Which
80 - dev-perl/Try-Tiny
81 - media-fonts/font-cursor-misc
82 - media-fonts/font-misc-misc[nls]
83 - >=net-misc/nx-3.5.0.25
84 - net-misc/openssh
85 - >=sys-apps/iproute2-4.3.0
86 - x11-apps/xauth
87 - x11-apps/xhost
88 - x11-apps/xwininfo
89 - fuse? ( net-fs/sshfs )
90 - postgres? ( dev-perl/DBD-Pg )
91 - sqlite? ( dev-perl/DBD-SQLite )"
92 -
93 -PATCHES=(
94 - )
95 -
96 -pkg_setup() {
97 - # Force the group creation, #479650
98 - enewgroup x2gouser
99 - enewgroup x2goprint
100 - enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
101 - enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
102 -}
103 -
104 -src_prepare() {
105 - # Do not install Xresources symlink (#521126)
106 - sed -e '\#$(INSTALL_SYMLINK) /etc/X11/Xresources# s/^/#/' -i x2goserver-xsession/Makefile || die
107 - # Multilib clean
108 - sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die
109 - sed -e "s#/lib/#/$(get_libdir)/#" -i x2goserver/bin/x2gopath || die
110 - # Skip man2html build
111 - sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die
112 - # Use nxagent directly
113 - sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die
114 -
115 - default
116 -}
117 -
118 -src_compile() {
119 - emake CC="$(tc-getCC)" PREFIX=/usr
120 -}
121 -
122 -src_install() {
123 - emake DESTDIR="${D}" PREFIX=/usr install
124 -
125 - fowners root:x2goprint /usr/bin/x2goprint
126 - fperms 2755 /usr/bin/x2goprint
127 - fperms 0750 /etc/sudoers.d
128 - fperms 0440 /etc/sudoers.d/x2goserver
129 - dosym ../../usr/share/applications /etc/x2go/applications
130 -
131 - newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
132 - systemd_dounit "${FILESDIR}"/x2gocleansessions.service
133 -}
134 -
135 -pkg_postinst() {
136 - if use sqlite ; then
137 - elog "To use sqlite and create the initial database, run:"
138 - elog " # x2godbadmin --createdb"
139 - fi
140 - if use postgres ; then
141 - elog "To use a PostgreSQL database, more information is availabe here:"
142 - elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
143 - fi
144 -
145 - elog "For password authentication, you need to enable PasswordAuthentication"
146 - elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
147 - elog "An init script was installed for x2gocleansessions"
148 -
149 - xdg_mimeinfo_database_update
150 - xdg_desktop_database_update
151 -}
152 -
153 -pkg_postrm() {
154 - xdg_mimeinfo_database_update
155 - xdg_desktop_database_update
156 -}
157
158 diff --git a/net-misc/x2goserver/x2goserver-4.1.0.0.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.0.ebuild
159 deleted file mode 100644
160 index c281ef09ff5..00000000000
161 --- a/net-misc/x2goserver/x2goserver-4.1.0.0.ebuild
162 +++ /dev/null
163 @@ -1,98 +0,0 @@
164 -# Copyright 1999-2018 Gentoo Foundation
165 -# Distributed under the terms of the GNU General Public License v2
166 -
167 -EAPI=6
168 -inherit multilib systemd toolchain-funcs user xdg-utils
169 -
170 -DESCRIPTION="The X2Go server"
171 -HOMEPAGE="http://www.x2go.org"
172 -SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
173 -
174 -LICENSE="GPL-2"
175 -SLOT="0"
176 -KEYWORDS="~amd64 ~x86"
177 -IUSE="+fuse postgres +sqlite"
178 -
179 -REQUIRED_USE="|| ( postgres sqlite )"
180 -
181 -DEPEND="virtual/perl-ExtUtils-MakeMaker"
182 -RDEPEND="dev-perl/Capture-Tiny
183 - dev-perl/Config-Simple
184 - dev-perl/File-BaseDir
185 - dev-perl/File-ReadBackwards
186 - dev-perl/File-Which
187 - dev-perl/Switch
188 - dev-perl/Try-Tiny
189 - media-fonts/font-cursor-misc
190 - media-fonts/font-misc-misc[nls]
191 - >=net-misc/nx-3.5.0.25
192 - net-misc/openssh
193 - >=sys-apps/iproute2-4.3.0
194 - x11-apps/xauth
195 - x11-apps/xhost
196 - x11-apps/xwininfo
197 - fuse? ( net-fs/sshfs )
198 - postgres? ( dev-perl/DBD-Pg )
199 - sqlite? ( dev-perl/DBD-SQLite )"
200 -
201 -PATCHES=(
202 - "${FILESDIR}"/${PN}-4.1.0.0-Xresources.patch
203 - "${FILESDIR}"/${PN}-4.1.0.0-provided_by_nx.patch
204 - "${FILESDIR}"/${PN}-4.1.0.0-skip_man2html.patch
205 - )
206 -
207 -pkg_setup() {
208 - # Force the group creation, #479650
209 - enewgroup x2gouser
210 - enewgroup x2goprint
211 - enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
212 - enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
213 -}
214 -
215 -src_prepare() {
216 - # Multilib clean
217 - sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die
218 - sed -e "s#/lib/#/$(get_libdir)/#" -i x2goserver/bin/x2gopath || die
219 -
220 - default
221 -}
222 -
223 -src_compile() {
224 - emake CC="$(tc-getCC)" PREFIX=/usr
225 -}
226 -
227 -src_install() {
228 - emake DESTDIR="${D}" PREFIX=/usr install
229 -
230 - fowners root:x2goprint /usr/bin/x2goprint
231 - fperms 2755 /usr/bin/x2goprint
232 - fperms 0750 /etc/sudoers.d
233 - fperms 0440 /etc/sudoers.d/x2goserver
234 - dosym ../../usr/share/applications /etc/x2go/applications
235 -
236 - newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
237 - systemd_dounit "${FILESDIR}"/x2gocleansessions.service
238 -}
239 -
240 -pkg_postinst() {
241 - if use sqlite ; then
242 - elog "To use sqlite and create the initial database, run:"
243 - elog " # x2godbadmin --createdb"
244 - fi
245 - if use postgres ; then
246 - elog "To use a PostgreSQL database, more information is availabe here:"
247 - elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
248 - fi
249 -
250 - elog "For password authentication, you need to enable PasswordAuthentication"
251 - elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
252 - elog "An init script was installed for x2gocleansessions"
253 -
254 - xdg_mimeinfo_database_update
255 - xdg_desktop_database_update
256 -}
257 -
258 -pkg_postrm() {
259 - xdg_mimeinfo_database_update
260 - xdg_desktop_database_update
261 -}