diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2022-02-19 07:23:32 +0100 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2022-02-19 07:31:41 +0100 |
| commit | 7b99f401634d79ffe8cd4f0d1f49afa6cc136801 (patch) | |
| tree | 73fb90d985fd1e315474ffe2b9adab8a59711194 /app-misc | |
| parent | sys-process/atop: Stabilize 2.7.1-r1 arm64, #833656 (diff) | |
| download | gentoo-7b99f401634d79ffe8cd4f0d1f49afa6cc136801.tar.gz gentoo-7b99f401634d79ffe8cd4f0d1f49afa6cc136801.tar.bz2 gentoo-7b99f401634d79ffe8cd4f0d1f49afa6cc136801.zip | |
app-misc/screen: Revert changes to live ebuild
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Sven Wegener <swegener@gentoo.org>
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/screen/files/screen-9999-no-utempter.patch | 15 | ||||
| -rw-r--r-- | app-misc/screen/screen-9999.ebuild | 17 |
2 files changed, 23 insertions, 9 deletions
diff --git a/app-misc/screen/files/screen-9999-no-utempter.patch b/app-misc/screen/files/screen-9999-no-utempter.patch new file mode 100644 index 000000000000..7eccc30c04c5 --- /dev/null +++ b/app-misc/screen/files/screen-9999-no-utempter.patch @@ -0,0 +1,15 @@ +--- i/configure.ac ++++ w/configure.ac +@@ -151,12 +151,6 @@ AS_IF([test "x$enable_utmp" = "xyes"], [ + AS_IF([test "x$have_utmpx" != "xyes"], + AC_ERROR(Missing utmpx.h)) + +- AC_CHECK_HEADER(utempter.h, have_utempter=yes, have_utempter=no) +- AS_IF([test "x$have_utempter" = "xyes"], [ +- AC_DEFINE(HAVE_UTEMPTER) +- LIBS="$LIBS -lutempter" +- ]) +- + AC_MSG_CHECKING(if utmpx struct has ut_host field) + AC_TRY_COMPILE([#include <utmpx.h>], [ + struct utmpx u; diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild index 18779966236e..abdf2c2458a2 100644 --- a/app-misc/screen/screen-9999.ebuild +++ b/app-misc/screen/screen-9999.ebuild @@ -32,8 +32,7 @@ BDEPEND="sys-apps/texinfo" PATCHES=( # Don't use utempter even if it is found on the system. - "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch - "${FILESDIR}"/${PN}-4.6.2-utmp-exit.patch + "${FILESDIR}"/${P}-no-utempter.patch ) src_prepare() { @@ -41,7 +40,9 @@ src_prepare() { # sched.h is a system header and causes problems with some C libraries mv sched.h _sched.h || die - sed -i '/include/ s:sched.h:_sched.h:' screen.h || die + sed -i '/include/ s:sched\.h:_sched.h:' \ + screen.h winmsg.c window.h sched.c canvas.h || die + sed -i 's@[[:space:]]sched\.h@ _sched.h@' Makefile.in || die # Fix manpage sed -i \ @@ -76,13 +77,12 @@ src_configure() { use debug && append-cppflags "-DDEBUG" local myeconfargs=( - --with-socket-dir="${EPREFIX}/tmp/${PN}" - --with-sys-screenrc="${EPREFIX}/etc/screenrc" + --enable-socket-dir="${EPREFIX}/tmp/${PN}" + --with-system_screenrc="${EPREFIX}/etc/screenrc" --with-pty-mode=0620 --with-pty-group=5 - --enable-rxvt_osc --enable-telnet - --enable-colors256 + --enable-utmp $(use_enable pam) ) econf "${myeconfargs[@]}" @@ -90,7 +90,6 @@ src_configure() { src_compile() { LC_ALL=POSIX emake comm.h term.h - emake osdef.h emake -C doc screen.info default @@ -98,7 +97,7 @@ src_compile() { src_install() { local DOCS=( - README ChangeLog INSTALL TODO NEWS* patchlevel.h + README ChangeLog INSTALL TODO NEWS* doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps} ) |