diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2020-02-27 09:30:25 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2020-02-27 09:59:35 +0100 |
| commit | ff7d35548a42a29e7377730751aaac7977a21ae8 (patch) | |
| tree | 3d51c8d5d6efcaa76007ceb696b2841519d7499b /app-misc/screen | |
| parent | app-misc/screen: version bump (security fix); GLEP 81 (diff) | |
| download | gentoo-ff7d35548a42a29e7377730751aaac7977a21ae8.tar.gz gentoo-ff7d35548a42a29e7377730751aaac7977a21ae8.tar.bz2 gentoo-ff7d35548a42a29e7377730751aaac7977a21ae8.zip | |
app-misc/screen: Minor ebuild improvements
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'app-misc/screen')
| -rw-r--r-- | app-misc/screen/screen-4.8.0.ebuild | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/app-misc/screen/screen-4.8.0.ebuild b/app-misc/screen/screen-4.8.0.ebuild index fcb1f1674b9e..84d601a1f28e 100644 --- a/app-misc/screen/screen-4.8.0.ebuild +++ b/app-misc/screen/screen-4.8.0.ebuild @@ -26,9 +26,9 @@ CDEPEND=" >=sys-libs/ncurses-5.2:0= pam? ( sys-libs/pam )" RDEPEND="${CDEPEND} + acct-group/utmp selinux? ( sec-policy/selinux-screen )" DEPEND="${CDEPEND} - acct-group/utmp sys-apps/texinfo" PATCHES=( @@ -51,8 +51,7 @@ src_prepare() { -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \ -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \ -e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \ - doc/screen.1 \ - || die + doc/screen.1 || die if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die @@ -77,15 +76,17 @@ src_configure() { use nethack || append-cppflags "-DNONETHACK" use debug && append-cppflags "-DDEBUG" - econf \ - --with-socket-dir="${EPREFIX}/tmp/screen" \ - --with-sys-screenrc="${EPREFIX}/etc/screenrc" \ - --with-pty-mode=0620 \ - --with-pty-group=5 \ - --enable-rxvt_osc \ - --enable-telnet \ - --enable-colors256 \ + local myeconfargs=( + --with-socket-dir="${EPREFIX}/tmp/${PN}" + --with-sys-screenrc="${EPREFIX}/etc/screenrc" + --with-pty-mode=0620 + --with-pty-group=5 + --enable-rxvt_osc + --enable-telnet + --enable-colors256 $(use_enable pam) + ) + econf "${myeconfargs[@]}" } src_compile() { @@ -102,25 +103,24 @@ src_install() { doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps} ) - emake DESTDIR="${D}" SCREEN=screen-${PV} install + emake DESTDIR="${D}" SCREEN="${P}" install local tmpfiles_perms tmpfiles_group - if use multiuser || use prefix - then - fperms 4755 /usr/bin/screen-${PV} + if use multiuser || use prefix ; then + fperms 4755 /usr/bin/${P} tmpfiles_perms="0755" tmpfiles_group="root" else - fowners root:utmp /usr/bin/screen-${PV} - fperms 2755 /usr/bin/screen-${PV} + fowners root:utmp /usr/bin/${P} + fperms 2755 /usr/bin/${P} tmpfiles_perms="0775" tmpfiles_group="utmp" fi newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" - insinto /usr/share/screen + insinto /usr/share/${PN} doins terminfo/{screencap,screeninfo.src} insinto /etc @@ -141,7 +141,7 @@ pkg_postinst() { # Add /tmp/screen in case it doesn't exist yet. This should solve # problems like bug #508634 where tmpfiles.d isn't in effect. - local rundir="${EROOT}/tmp/screen" + local rundir="${EROOT}/tmp/${PN}" if [[ ! -d ${rundir} ]] ; then if use multiuser || use prefix ; then tmpfiles_group="root" |