| 1 |
commit: ff7d35548a42a29e7377730751aaac7977a21ae8 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 27 08:30:25 2020 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 27 08:59:35 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff7d3554 |
| 7 |
|
| 8 |
app-misc/screen: Minor ebuild improvements |
| 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/screen-4.8.0.ebuild | 38 ++++++++++++++++++------------------- |
| 14 |
1 file changed, 19 insertions(+), 19 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-misc/screen/screen-4.8.0.ebuild b/app-misc/screen/screen-4.8.0.ebuild |
| 17 |
index fcb1f1674b9..84d601a1f28 100644 |
| 18 |
--- a/app-misc/screen/screen-4.8.0.ebuild |
| 19 |
+++ b/app-misc/screen/screen-4.8.0.ebuild |
| 20 |
@@ -26,9 +26,9 @@ CDEPEND=" |
| 21 |
>=sys-libs/ncurses-5.2:0= |
| 22 |
pam? ( sys-libs/pam )" |
| 23 |
RDEPEND="${CDEPEND} |
| 24 |
+ acct-group/utmp |
| 25 |
selinux? ( sec-policy/selinux-screen )" |
| 26 |
DEPEND="${CDEPEND} |
| 27 |
- acct-group/utmp |
| 28 |
sys-apps/texinfo" |
| 29 |
|
| 30 |
PATCHES=( |
| 31 |
@@ -51,8 +51,7 @@ src_prepare() { |
| 32 |
-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \ |
| 33 |
-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \ |
| 34 |
-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \ |
| 35 |
- doc/screen.1 \ |
| 36 |
- || die |
| 37 |
+ doc/screen.1 || die |
| 38 |
|
| 39 |
if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then |
| 40 |
sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die |
| 41 |
@@ -77,15 +76,17 @@ src_configure() { |
| 42 |
use nethack || append-cppflags "-DNONETHACK" |
| 43 |
use debug && append-cppflags "-DDEBUG" |
| 44 |
|
| 45 |
- econf \ |
| 46 |
- --with-socket-dir="${EPREFIX}/tmp/screen" \ |
| 47 |
- --with-sys-screenrc="${EPREFIX}/etc/screenrc" \ |
| 48 |
- --with-pty-mode=0620 \ |
| 49 |
- --with-pty-group=5 \ |
| 50 |
- --enable-rxvt_osc \ |
| 51 |
- --enable-telnet \ |
| 52 |
- --enable-colors256 \ |
| 53 |
+ local myeconfargs=( |
| 54 |
+ --with-socket-dir="${EPREFIX}/tmp/${PN}" |
| 55 |
+ --with-sys-screenrc="${EPREFIX}/etc/screenrc" |
| 56 |
+ --with-pty-mode=0620 |
| 57 |
+ --with-pty-group=5 |
| 58 |
+ --enable-rxvt_osc |
| 59 |
+ --enable-telnet |
| 60 |
+ --enable-colors256 |
| 61 |
$(use_enable pam) |
| 62 |
+ ) |
| 63 |
+ econf "${myeconfargs[@]}" |
| 64 |
} |
| 65 |
|
| 66 |
src_compile() { |
| 67 |
@@ -102,25 +103,24 @@ src_install() { |
| 68 |
doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps} |
| 69 |
) |
| 70 |
|
| 71 |
- emake DESTDIR="${D}" SCREEN=screen-${PV} install |
| 72 |
+ emake DESTDIR="${D}" SCREEN="${P}" install |
| 73 |
|
| 74 |
local tmpfiles_perms tmpfiles_group |
| 75 |
|
| 76 |
- if use multiuser || use prefix |
| 77 |
- then |
| 78 |
- fperms 4755 /usr/bin/screen-${PV} |
| 79 |
+ if use multiuser || use prefix ; then |
| 80 |
+ fperms 4755 /usr/bin/${P} |
| 81 |
tmpfiles_perms="0755" |
| 82 |
tmpfiles_group="root" |
| 83 |
else |
| 84 |
- fowners root:utmp /usr/bin/screen-${PV} |
| 85 |
- fperms 2755 /usr/bin/screen-${PV} |
| 86 |
+ fowners root:utmp /usr/bin/${P} |
| 87 |
+ fperms 2755 /usr/bin/${P} |
| 88 |
tmpfiles_perms="0775" |
| 89 |
tmpfiles_group="utmp" |
| 90 |
fi |
| 91 |
|
| 92 |
newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" |
| 93 |
|
| 94 |
- insinto /usr/share/screen |
| 95 |
+ insinto /usr/share/${PN} |
| 96 |
doins terminfo/{screencap,screeninfo.src} |
| 97 |
|
| 98 |
insinto /etc |
| 99 |
@@ -141,7 +141,7 @@ pkg_postinst() { |
| 100 |
|
| 101 |
# Add /tmp/screen in case it doesn't exist yet. This should solve |
| 102 |
# problems like bug #508634 where tmpfiles.d isn't in effect. |
| 103 |
- local rundir="${EROOT}/tmp/screen" |
| 104 |
+ local rundir="${EROOT}/tmp/${PN}" |
| 105 |
if [[ ! -d ${rundir} ]] ; then |
| 106 |
if use multiuser || use prefix ; then |
| 107 |
tmpfiles_group="root" |
Archives