Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/screen/files/, app-misc/screen/
Date: Thu, 27 Feb 2020 08:59:51
Message-Id: 1582793976.538c65e61e6e59fde584412ace81081955e84427.polynomial-c@gentoo
1 commit: 538c65e61e6e59fde584412ace81081955e84427
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 27 08:34:33 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 27 08:59:36 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=538c65e6
7
8 app-misc/screen: Removed old
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 app-misc/screen/Manifest | 3 -
14 app-misc/screen/files/screen-4.4.0-utmp-musl.patch | 62 --------
15 app-misc/screen/files/screen-4.5.1-texinfo.patch | 13 --
16 app-misc/screen/screen-4.4.0.ebuild | 154 --------------------
17 app-misc/screen/screen-4.5.1.ebuild | 160 --------------------
18 app-misc/screen/screen-4.6.0.ebuild | 158 --------------------
19 app-misc/screen/screen-4.6.2.ebuild | 162 ---------------------
20 7 files changed, 712 deletions(-)
21
22 diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
23 index f850d85971b..0d1264dcf42 100644
24 --- a/app-misc/screen/Manifest
25 +++ b/app-misc/screen/Manifest
26 @@ -1,6 +1,3 @@
27 -DIST screen-4.4.0.tar.gz 846010 BLAKE2B 7c7d37b22c1993420dbd8d4083bee0a748f28ace434963b822607747879bda60c1f2f435814e9d07ea88e4bbc1b43b6f600fce204fda7fde4a52a6314a27494a SHA512 6e43f85c419f778822ec85e4340c95769e981a3d51abdeb5f26c6ebb840da9ab11b351ecc7f380ceea39bcfaa87f1124cfebd6af4ecb62b886eb189e7b79981b
28 -DIST screen-4.5.1.tar.gz 963153 BLAKE2B 8f7e20a0a3dde58435fc500714b49af97b4f2f225d34394170572e79ab9a8b49beac6c054021db367a01b6da91deaa726284a25c86eb57e11dcd09ad5dc44cb4 SHA512 ca53477ad38264be38efb1d10a1337b647dd061127162c77533b17a30d046cd0caabe38e4a9e5389aac30d5dc62eb53e7877411e69adae36d0ca869bd0a82804
29 -DIST screen-4.6.0.tar.gz 849062 BLAKE2B e08915bb34d4e356eb33c479f1b2dc7a8f4a855e9d1c27490ff31cfc88b4bd9dfb11101dd0e4508f3b37b023b9f9b987dfaff4c6cc930e994d22fcb024cf341d SHA512 2ee7cc51c62a478e72eda0647f3f347e63f40384e19bc11b074158bd94cdb628c6425b1dd7a472496d56bff11a30a9dc58859c2e7e539fae2a8718ed9b0f96d7
30 DIST screen-4.6.1.tar.gz 848979 BLAKE2B e78874b6d8723c52f827ab5e6b665102d7fd831f03a0006f9d31e000535ccce95ce08e2d302e34ba2d567167a917c8bd3b875843828d1951bcb38ab6ae4e0acf SHA512 e5d029400ed5b509ebddc1f55812c33536d6f5ce91119537c7d06e1fa7dee84939c43337df4638f61c818ce0412f4d08fe212202162a4483a9e84bbc4b3e4336
31 DIST screen-4.6.2.tar.gz 845210 BLAKE2B feea244e2e0c8f638442a524cd7cac93c6c5e576541bf1321fb32bc9424abf53415d00ebcb4a13a9613788c1baad6e132f209bd0a017b100e0687b3658603aea SHA512 224bd16ad5ae501d1b8bb7d2ba9cc19e6a0743de5a5b320109c2f6bf3b1ca564cc7094ed9211be13733d9d769cde77d13fe236341d448cad0518038ab1e85c99
32 DIST screen-4.7.0.tar.gz 854192 BLAKE2B f22ee3f3ad7591ee2641ba9667b131298f3cb9b7712b0f0db28516c60d0a0768893eda2f4ce35d9c641871247a638a03c2550328f1af1f85ab5ce8ffa9b77d54 SHA512 44c7a33e2ed772ce91998cdc07556ef7b972e5b100335e14702b273a234e437fe6415de459e7b6d34c6086282a432778629047424ef9159ac6fcf26d22b45745
33
34 diff --git a/app-misc/screen/files/screen-4.4.0-utmp-musl.patch b/app-misc/screen/files/screen-4.4.0-utmp-musl.patch
35 deleted file mode 100644
36 index 990c73042cd..00000000000
37 --- a/app-misc/screen/files/screen-4.4.0-utmp-musl.patch
38 +++ /dev/null
39 @@ -1,62 +0,0 @@
40 -From 74fdc8988b55633cd05f8625390cd3f6a8102003 Mon Sep 17 00:00:00 2001
41 -From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@××××××.net>
42 -Date: Sat, 13 Jun 2015 17:52:46 +0200
43 -Subject: [PATCH] change checks for utmp/utmpx in header
44 -
45 -linuxes should've working utmpx, so this check was bit weird
46 -commit 2b1bdf96 mentions some "linux workaround", but nothing specific
47 -
48 -fixes build with musl libc
49 ----
50 - os.h | 7 ++++---
51 - utmp.c | 4 ++--
52 - 2 files changed, 6 insertions(+), 5 deletions(-)
53 -
54 -diff --git a/os.h b/os.h
55 -index 55de249..e827ac9 100644
56 ---- a/os.h
57 -+++ b/os.h
58 -@@ -250,9 +250,11 @@ extern int errno;
59 - #endif
60 -
61 - #if defined(UTMPOK) || defined(BUGGYGETLOGIN)
62 --# if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux)
63 -+# if defined(SVR4) && !defined(DGUX) && !defined(__hpux)
64 - # include <utmpx.h>
65 --# define UTMPFILE UTMPX_FILE
66 -+# ifdef UTMPX_FILE /* GNU extension */
67 -+# define UTMPFILE UTMPX_FILE
68 -+# endif
69 - # define utmp utmpx
70 - # define getutent getutxent
71 - # define getutid getutxid
72 -@@ -260,7 +262,6 @@ extern int errno;
73 - # define pututline pututxline
74 - # define setutent setutxent
75 - # define endutent endutxent
76 --# define ut_time ut_xtime
77 - # else /* SVR4 */
78 - # include <utmp.h>
79 - # endif /* SVR4 */
80 -diff --git a/utmp.c b/utmp.c
81 -index fa8b87b..f5d7db8 100644
82 ---- a/utmp.c
83 -+++ b/utmp.c
84 -@@ -631,7 +631,7 @@ int pid;
85 - /* must use temp variable because of NetBSD/sparc64, where
86 - * ut_xtime is long(64) but time_t is int(32) */
87 - (void)time(&now);
88 -- u->ut_time = now;
89 -+ u->ut_tv.tv_sec = now;
90 - }
91 -
92 - static slot_t
93 -@@ -743,7 +743,7 @@ int pid;
94 - strncpy(u->ut_line, line, sizeof(u->ut_line));
95 - strncpy(u->ut_name, user, sizeof(u->ut_name));
96 - (void)time(&now);
97 -- u->ut_time = now;
98 -+ u->ut_tv.tv_sec = now;
99 - }
100 -
101 - static slot_t
102
103 diff --git a/app-misc/screen/files/screen-4.5.1-texinfo.patch b/app-misc/screen/files/screen-4.5.1-texinfo.patch
104 deleted file mode 100644
105 index 8d7a5e52717..00000000000
106 --- a/app-misc/screen/files/screen-4.5.1-texinfo.patch
107 +++ /dev/null
108 @@ -1,13 +0,0 @@
109 ---- a/doc/screen.texinfo
110 -+++ b/doc/screen.texinfo
111 -@@ -5796,8 +5796,8 @@
112 - ============
113 -
114 - @example
115 -- Thomas Renninger <treen@××××.com>,
116 -- Axel Beckert <abe@×××××××××××.org>,
117 -+ Thomas Renninger <treen@@suse.com>,
118 -+ Axel Beckert <abe@@deuxchevaux.org>,
119 - Ken Beal <kbeal@@amber.ssd.csd.harris.com>,
120 - Rudolf Koenig <rfkoenig@@informatik.uni-erlangen.de>,
121 - Toerless Eckert <eckert@@informatik.uni-erlangen.de>,
122
123 diff --git a/app-misc/screen/screen-4.4.0.ebuild b/app-misc/screen/screen-4.4.0.ebuild
124 deleted file mode 100644
125 index 4dd24d59cee..00000000000
126 --- a/app-misc/screen/screen-4.4.0.ebuild
127 +++ /dev/null
128 @@ -1,154 +0,0 @@
129 -# Copyright 1999-2020 Gentoo Authors
130 -# Distributed under the terms of the GNU General Public License v2
131 -
132 -EAPI=5
133 -
134 -inherit autotools eutils flag-o-matic pam toolchain-funcs user
135 -
136 -DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
137 -HOMEPAGE="https://www.gnu.org/software/screen/"
138 -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
139 -
140 -LICENSE="GPL-2"
141 -SLOT="0"
142 -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
143 -IUSE="debug nethack pam selinux multiuser"
144 -
145 -CDEPEND="
146 - >=sys-libs/ncurses-5.2:0=
147 - pam? ( sys-libs/pam )"
148 -RDEPEND="${CDEPEND}
149 - selinux? ( sec-policy/selinux-screen )"
150 -DEPEND="${CDEPEND}
151 - sys-apps/texinfo"
152 -
153 -# Patches:
154 -# - Don't use utempter even if it is found on the system.
155 -PATCHES=(
156 - "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
157 - "${FILESDIR}"/${P}-utmp-musl.patch
158 -)
159 -
160 -pkg_setup() {
161 - # Make sure utmp group exists, as it's used later on.
162 - enewgroup utmp 406
163 -}
164 -
165 -src_prepare() {
166 - # Apply patches.
167 - epatch "${PATCHES[@]}"
168 -
169 - # sched.h is a system header and causes problems with some C libraries
170 - mv sched.h _sched.h || die
171 - sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
172 -
173 - # Fix manpage.
174 - sed -i \
175 - -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
176 - -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
177 - -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
178 - -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
179 - -e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
180 - doc/screen.1 \
181 - || die
182 -
183 - if [[ ${CHOST} == *-darwin* ]] ; then
184 - sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
185 - fi
186 -
187 - # reconfigure
188 - eautoreconf
189 -}
190 -
191 -src_configure() {
192 - append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
193 -
194 - if [[ ${CHOST} == *-solaris* ]] ; then
195 - # enable msg_header by upping the feature standard compatible
196 - # with c99 mode
197 - append-cppflags -D_XOPEN_SOURCE=600
198 - fi
199 -
200 - use nethack || append-cppflags "-DNONETHACK"
201 - use debug && append-cppflags "-DDEBUG"
202 -
203 - econf \
204 - --with-socket-dir="${EPREFIX}/tmp/screen" \
205 - --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
206 - --with-pty-mode=0620 \
207 - --with-pty-group=5 \
208 - --enable-rxvt_osc \
209 - --enable-telnet \
210 - --enable-colors256 \
211 - $(use_enable pam)
212 -}
213 -
214 -src_compile() {
215 - LC_ALL=POSIX emake comm.h term.h
216 - emake osdef.h
217 -
218 - emake -C doc screen.info
219 - default
220 -}
221 -
222 -src_install() {
223 - local tmpfiles_perms tmpfiles_group
224 -
225 - dobin screen
226 -
227 - if use multiuser || use prefix
228 - then
229 - fperms 4755 /usr/bin/screen
230 - tmpfiles_perms="0755"
231 - tmpfiles_group="root"
232 - else
233 - fowners root:utmp /usr/bin/screen
234 - fperms 2755 /usr/bin/screen
235 - tmpfiles_perms="0775"
236 - tmpfiles_group="utmp"
237 - fi
238 -
239 - dodir /etc/tmpfiles.d
240 - echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
241 - > "${ED}"/etc/tmpfiles.d/screen.conf
242 -
243 - insinto /usr/share/screen
244 - doins terminfo/{screencap,screeninfo.src}
245 - insinto /usr/share/screen/utf8encodings
246 - doins utf8encodings/??
247 - insinto /etc
248 - doins "${FILESDIR}"/screenrc
249 -
250 - pamd_mimic_system screen auth
251 -
252 - dodoc \
253 - README ChangeLog INSTALL TODO NEWS* patchlevel.h \
254 - doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
255 -
256 - doman doc/screen.1
257 - doinfo doc/screen.info
258 -}
259 -
260 -pkg_postinst() {
261 - if [[ -z ${REPLACING_VERSIONS} ]]
262 - then
263 - elog "Some dangerous key bindings have been removed or changed to more safe values."
264 - elog "We enable some xterm hacks in our default screenrc, which might break some"
265 - elog "applications. Please check /etc/screenrc for information on these changes."
266 - fi
267 -
268 - # Add /tmp/screen in case it doesn't exist yet. This should solve
269 - # problems like bug #508634 where tmpfiles.d isn't in effect.
270 - local rundir="${EROOT%/}/tmp/screen"
271 - if [[ ! -d ${rundir} ]] ; then
272 - if use multiuser || use prefix ; then
273 - tmpfiles_group="root"
274 - else
275 - tmpfiles_group="utmp"
276 - fi
277 - mkdir -m 0775 "${rundir}"
278 - chgrp ${tmpfiles_group} "${rundir}"
279 - fi
280 -
281 - ewarn "This revision changes the screen socket location to ${rundir}"
282 -}
283
284 diff --git a/app-misc/screen/screen-4.5.1.ebuild b/app-misc/screen/screen-4.5.1.ebuild
285 deleted file mode 100644
286 index f5c5c519dea..00000000000
287 --- a/app-misc/screen/screen-4.5.1.ebuild
288 +++ /dev/null
289 @@ -1,160 +0,0 @@
290 -# Copyright 1999-2019 Gentoo Authors
291 -# Distributed under the terms of the GNU General Public License v2
292 -
293 -EAPI=6
294 -
295 -SCM=""
296 -[[ "${PV}" = 9999 ]] && SCM="git-r3"
297 -inherit autotools eutils flag-o-matic pam toolchain-funcs user ${SCM}
298 -unset SCM
299 -
300 -DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
301 -HOMEPAGE="https://www.gnu.org/software/screen/"
302 -
303 -if [[ "${PV}" != 9999 ]] ; then
304 - SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
305 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
306 -else
307 - EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
308 - EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
309 - S="${WORKDIR}"/${P}/src
310 -fi
311 -
312 -LICENSE="GPL-2"
313 -SLOT="0"
314 -IUSE="debug nethack pam selinux multiuser"
315 -
316 -CDEPEND="
317 - >=sys-libs/ncurses-5.2:0=
318 - pam? ( sys-libs/pam )"
319 -RDEPEND="${CDEPEND}
320 - selinux? ( sec-policy/selinux-screen )"
321 -DEPEND="${CDEPEND}
322 - sys-apps/texinfo"
323 -
324 -PATCHES=(
325 - # Don't use utempter even if it is found on the system.
326 - "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
327 - # @ => @@
328 - "${FILESDIR}"/${PN}-4.5.1-texinfo.patch
329 -)
330 -
331 -pkg_setup() {
332 - # Make sure utmp group exists, as it's used later on.
333 - enewgroup utmp 406
334 -}
335 -
336 -src_prepare() {
337 - default
338 -
339 - # sched.h is a system header and causes problems with some C libraries
340 - mv sched.h _sched.h || die
341 - sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
342 -
343 - # Fix manpage.
344 - sed -i \
345 - -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
346 - -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
347 - -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
348 - -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
349 - -e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
350 - doc/screen.1 \
351 - || die
352 -
353 - if [[ ${CHOST} == *-darwin* ]] ; then
354 - sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
355 - fi
356 -
357 - # reconfigure
358 - eautoreconf
359 -}
360 -
361 -src_configure() {
362 - append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
363 -
364 - if [[ ${CHOST} == *-solaris* ]] ; then
365 - # enable msg_header by upping the feature standard compatible
366 - # with c99 mode
367 - append-cppflags -D_XOPEN_SOURCE=600
368 - fi
369 -
370 - use nethack || append-cppflags "-DNONETHACK"
371 - use debug && append-cppflags "-DDEBUG"
372 -
373 - econf \
374 - --with-socket-dir="${EPREFIX}/tmp/screen" \
375 - --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
376 - --with-pty-mode=0620 \
377 - --with-pty-group=5 \
378 - --enable-rxvt_osc \
379 - --enable-telnet \
380 - --enable-colors256 \
381 - $(use_enable pam)
382 -}
383 -
384 -src_compile() {
385 - LC_ALL=POSIX emake comm.h term.h
386 - emake osdef.h
387 -
388 - emake -C doc screen.info
389 - default
390 -}
391 -
392 -src_install() {
393 - local DOCS=(
394 - README ChangeLog INSTALL TODO NEWS* patchlevel.h
395 - doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
396 - )
397 -
398 - default
399 -
400 - local tmpfiles_perms tmpfiles_group
401 -
402 - if use multiuser || use prefix
403 - then
404 - fperms 4755 /usr/bin/screen-${PV}
405 - tmpfiles_perms="0755"
406 - tmpfiles_group="root"
407 - else
408 - fowners root:utmp /usr/bin/screen-${PV}
409 - fperms 2755 /usr/bin/screen-${PV}
410 - tmpfiles_perms="0775"
411 - tmpfiles_group="utmp"
412 - fi
413 -
414 - dodir /etc/tmpfiles.d
415 - echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
416 - > "${ED}"/etc/tmpfiles.d/screen.conf
417 -
418 - insinto /usr/share/screen
419 - doins terminfo/{screencap,screeninfo.src}
420 -
421 - insinto /etc
422 - doins "${FILESDIR}"/screenrc
423 -
424 - pamd_mimic_system screen auth
425 -}
426 -
427 -pkg_postinst() {
428 - if [[ -z ${REPLACING_VERSIONS} ]]
429 - then
430 - elog "Some dangerous key bindings have been removed or changed to more safe values."
431 - elog "We enable some xterm hacks in our default screenrc, which might break some"
432 - elog "applications. Please check /etc/screenrc for information on these changes."
433 - fi
434 -
435 - # Add /tmp/screen in case it doesn't exist yet. This should solve
436 - # problems like bug #508634 where tmpfiles.d isn't in effect.
437 - local rundir="${EROOT%/}/tmp/screen"
438 - if [[ ! -d ${rundir} ]] ; then
439 - if use multiuser || use prefix ; then
440 - tmpfiles_group="root"
441 - else
442 - tmpfiles_group="utmp"
443 - fi
444 - mkdir -m 0775 "${rundir}"
445 - chgrp ${tmpfiles_group} "${rundir}"
446 - fi
447 -
448 - ewarn "This revision changes the screen socket location to ${rundir}"
449 -}
450
451 diff --git a/app-misc/screen/screen-4.6.0.ebuild b/app-misc/screen/screen-4.6.0.ebuild
452 deleted file mode 100644
453 index 3e1c3a55ab8..00000000000
454 --- a/app-misc/screen/screen-4.6.0.ebuild
455 +++ /dev/null
456 @@ -1,158 +0,0 @@
457 -# Copyright 1999-2019 Gentoo Authors
458 -# Distributed under the terms of the GNU General Public License v2
459 -
460 -EAPI=6
461 -
462 -SCM=""
463 -[[ "${PV}" = 9999 ]] && SCM="git-r3"
464 -inherit autotools eutils flag-o-matic pam toolchain-funcs user ${SCM}
465 -unset SCM
466 -
467 -DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
468 -HOMEPAGE="https://www.gnu.org/software/screen/"
469 -
470 -if [[ "${PV}" != 9999 ]] ; then
471 - SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
472 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
473 -else
474 - EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
475 - EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
476 - S="${WORKDIR}"/${P}/src
477 -fi
478 -
479 -LICENSE="GPL-2"
480 -SLOT="0"
481 -IUSE="debug nethack pam selinux multiuser"
482 -
483 -CDEPEND="
484 - >=sys-libs/ncurses-5.2:0=
485 - pam? ( sys-libs/pam )"
486 -RDEPEND="${CDEPEND}
487 - selinux? ( sec-policy/selinux-screen )"
488 -DEPEND="${CDEPEND}
489 - sys-apps/texinfo"
490 -
491 -PATCHES=(
492 - # Don't use utempter even if it is found on the system.
493 - "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
494 -)
495 -
496 -pkg_setup() {
497 - # Make sure utmp group exists, as it's used later on.
498 - enewgroup utmp 406
499 -}
500 -
501 -src_prepare() {
502 - default
503 -
504 - # sched.h is a system header and causes problems with some C libraries
505 - mv sched.h _sched.h || die
506 - sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
507 -
508 - # Fix manpage.
509 - sed -i \
510 - -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
511 - -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
512 - -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
513 - -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
514 - -e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
515 - doc/screen.1 \
516 - || die
517 -
518 - if [[ ${CHOST} == *-darwin* ]] ; then
519 - sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
520 - fi
521 -
522 - # reconfigure
523 - eautoreconf
524 -}
525 -
526 -src_configure() {
527 - append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
528 -
529 - if [[ ${CHOST} == *-solaris* ]] ; then
530 - # enable msg_header by upping the feature standard compatible
531 - # with c99 mode
532 - append-cppflags -D_XOPEN_SOURCE=600
533 - fi
534 -
535 - use nethack || append-cppflags "-DNONETHACK"
536 - use debug && append-cppflags "-DDEBUG"
537 -
538 - econf \
539 - --with-socket-dir="${EPREFIX}/tmp/screen" \
540 - --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
541 - --with-pty-mode=0620 \
542 - --with-pty-group=5 \
543 - --enable-rxvt_osc \
544 - --enable-telnet \
545 - --enable-colors256 \
546 - $(use_enable pam)
547 -}
548 -
549 -src_compile() {
550 - LC_ALL=POSIX emake comm.h term.h
551 - emake osdef.h
552 -
553 - emake -C doc screen.info
554 - default
555 -}
556 -
557 -src_install() {
558 - local DOCS=(
559 - README ChangeLog INSTALL TODO NEWS* patchlevel.h
560 - doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
561 - )
562 -
563 - default
564 -
565 - local tmpfiles_perms tmpfiles_group
566 -
567 - if use multiuser || use prefix
568 - then
569 - fperms 4755 /usr/bin/screen-${PV}
570 - tmpfiles_perms="0755"
571 - tmpfiles_group="root"
572 - else
573 - fowners root:utmp /usr/bin/screen-${PV}
574 - fperms 2755 /usr/bin/screen-${PV}
575 - tmpfiles_perms="0775"
576 - tmpfiles_group="utmp"
577 - fi
578 -
579 - dodir /etc/tmpfiles.d
580 - echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
581 - > "${ED}"/etc/tmpfiles.d/screen.conf
582 -
583 - insinto /usr/share/screen
584 - doins terminfo/{screencap,screeninfo.src}
585 -
586 - insinto /etc
587 - doins "${FILESDIR}"/screenrc
588 -
589 - pamd_mimic_system screen auth
590 -}
591 -
592 -pkg_postinst() {
593 - if [[ -z ${REPLACING_VERSIONS} ]]
594 - then
595 - elog "Some dangerous key bindings have been removed or changed to more safe values."
596 - elog "We enable some xterm hacks in our default screenrc, which might break some"
597 - elog "applications. Please check /etc/screenrc for information on these changes."
598 - fi
599 -
600 - # Add /tmp/screen in case it doesn't exist yet. This should solve
601 - # problems like bug #508634 where tmpfiles.d isn't in effect.
602 - local rundir="${EROOT%/}/tmp/screen"
603 - if [[ ! -d ${rundir} ]] ; then
604 - if use multiuser || use prefix ; then
605 - tmpfiles_group="root"
606 - else
607 - tmpfiles_group="utmp"
608 - fi
609 - mkdir -m 0775 "${rundir}"
610 - chgrp ${tmpfiles_group} "${rundir}"
611 - fi
612 -
613 - ewarn "This revision changes the screen socket location to ${rundir}"
614 -}
615
616 diff --git a/app-misc/screen/screen-4.6.2.ebuild b/app-misc/screen/screen-4.6.2.ebuild
617 deleted file mode 100644
618 index 245a4135f54..00000000000
619 --- a/app-misc/screen/screen-4.6.2.ebuild
620 +++ /dev/null
621 @@ -1,162 +0,0 @@
622 -# Copyright 1999-2019 Gentoo Authors
623 -# Distributed under the terms of the GNU General Public License v2
624 -
625 -EAPI=6
626 -
627 -SCM=""
628 -[[ "${PV}" = 9999 ]] && SCM="git-r3"
629 -inherit autotools eutils flag-o-matic pam toolchain-funcs user ${SCM}
630 -unset SCM
631 -
632 -DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
633 -HOMEPAGE="https://www.gnu.org/software/screen/"
634 -
635 -if [[ "${PV}" != 9999 ]] ; then
636 - SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
637 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
638 -else
639 - EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
640 - EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
641 - S="${WORKDIR}"/${P}/src
642 -fi
643 -
644 -LICENSE="GPL-2"
645 -SLOT="0"
646 -IUSE="debug nethack pam selinux multiuser"
647 -
648 -CDEPEND="
649 - >=sys-libs/ncurses-5.2:0=
650 - pam? ( sys-libs/pam )"
651 -RDEPEND="${CDEPEND}
652 - selinux? ( sec-policy/selinux-screen )"
653 -DEPEND="${CDEPEND}
654 - sys-apps/texinfo"
655 -
656 -PATCHES=(
657 - # Don't use utempter even if it is found on the system.
658 - "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
659 - "${FILESDIR}"/${P}-utmp-exit.patch
660 -)
661 -
662 -pkg_setup() {
663 - # Make sure utmp group exists, as it's used later on.
664 - enewgroup utmp 406
665 -}
666 -
667 -src_prepare() {
668 - default
669 -
670 - # sched.h is a system header and causes problems with some C libraries
671 - mv sched.h _sched.h || die
672 - sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
673 -
674 - # Fix manpage.
675 - sed -i \
676 - -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
677 - -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
678 - -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
679 - -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
680 - -e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
681 - doc/screen.1 \
682 - || die
683 -
684 - if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
685 - sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
686 - fi
687 -
688 - # disable musl dummy headers for utmp[x]
689 - use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
690 -
691 - # reconfigure
692 - eautoreconf
693 -}
694 -
695 -src_configure() {
696 - append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
697 -
698 - if [[ ${CHOST} == *-solaris* ]] ; then
699 - # enable msg_header by upping the feature standard compatible
700 - # with c99 mode
701 - append-cppflags -D_XOPEN_SOURCE=600
702 - fi
703 -
704 - use nethack || append-cppflags "-DNONETHACK"
705 - use debug && append-cppflags "-DDEBUG"
706 -
707 - econf \
708 - --with-socket-dir="${EPREFIX}/tmp/screen" \
709 - --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
710 - --with-pty-mode=0620 \
711 - --with-pty-group=5 \
712 - --enable-rxvt_osc \
713 - --enable-telnet \
714 - --enable-colors256 \
715 - $(use_enable pam)
716 -}
717 -
718 -src_compile() {
719 - LC_ALL=POSIX emake comm.h term.h
720 - emake osdef.h
721 -
722 - emake -C doc screen.info
723 - default
724 -}
725 -
726 -src_install() {
727 - local DOCS=(
728 - README ChangeLog INSTALL TODO NEWS* patchlevel.h
729 - doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
730 - )
731 -
732 - default
733 -
734 - local tmpfiles_perms tmpfiles_group
735 -
736 - if use multiuser || use prefix
737 - then
738 - fperms 4755 /usr/bin/screen-${PV}
739 - tmpfiles_perms="0755"
740 - tmpfiles_group="root"
741 - else
742 - fowners root:utmp /usr/bin/screen-${PV}
743 - fperms 2755 /usr/bin/screen-${PV}
744 - tmpfiles_perms="0775"
745 - tmpfiles_group="utmp"
746 - fi
747 -
748 - dodir /etc/tmpfiles.d
749 - echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
750 - > "${ED}"/etc/tmpfiles.d/screen.conf
751 -
752 - insinto /usr/share/screen
753 - doins terminfo/{screencap,screeninfo.src}
754 -
755 - insinto /etc
756 - doins "${FILESDIR}"/screenrc
757 -
758 - pamd_mimic_system screen auth
759 -}
760 -
761 -pkg_postinst() {
762 - if [[ -z ${REPLACING_VERSIONS} ]]
763 - then
764 - elog "Some dangerous key bindings have been removed or changed to more safe values."
765 - elog "We enable some xterm hacks in our default screenrc, which might break some"
766 - elog "applications. Please check /etc/screenrc for information on these changes."
767 - fi
768 -
769 - # Add /tmp/screen in case it doesn't exist yet. This should solve
770 - # problems like bug #508634 where tmpfiles.d isn't in effect.
771 - local rundir="${EROOT%/}/tmp/screen"
772 - if [[ ! -d ${rundir} ]] ; then
773 - if use multiuser || use prefix ; then
774 - tmpfiles_group="root"
775 - else
776 - tmpfiles_group="utmp"
777 - fi
778 - mkdir -m 0775 "${rundir}"
779 - chgrp ${tmpfiles_group} "${rundir}"
780 - fi
781 -
782 - ewarn "This revision changes the screen socket location to ${rundir}"
783 -}