commit: 827eac55b0f7f264782a507790fb18dfeba45328 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Mar 31 23:07:50 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Mar 31 23:08:24 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=827eac55
app-misc/screen: sync live Signed-off-by: Sam James <sam <AT> gentoo.org> app-misc/screen/screen-9999.ebuild | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild index 7ad57bdfa000..0b436bb9d018 100644 --- a/app-misc/screen/screen-9999.ebuild +++ b/app-misc/screen/screen-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools flag-o-matic pam tmpfiles @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"; if [[ ${PV} != 9999 ]] ; then SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"; @@ -20,19 +20,19 @@ fi LICENSE="GPL-3+" SLOT="0" -IUSE="debug pam selinux multiuser" +IUSE="debug nethack pam selinux utempter multiuser" DEPEND=">=sys-libs/ncurses-5.2:= virtual/libcrypt:= pam? ( sys-libs/pam )" RDEPEND="${DEPEND} acct-group/utmp - selinux? ( sec-policy/selinux-screen )" + selinux? ( sec-policy/selinux-screen ) + utempter? ( sys-libs/libutempter:= )" BDEPEND="sys-apps/texinfo" PATCHES=( - # Don't use utempter even if it is found on the system. - "${FILESDIR}"/${P}-no-utempter.patch + "${FILESDIR}"/${PN}-5.0.0-utmp-musl.patch ) src_prepare() { @@ -40,9 +40,8 @@ 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 winmsg.c window.h sched.c canvas.h || die - sed -i 's@[[:space:]]sched\.h@ _sched.h@' Makefile.in || die + sed -i '/include/ s:sched.h:_sched.h:' canvas.h sched.c screen.h window.h winmsg.c || die + sed -i 's:sched.h:_sched.h:' Makefile.in || die # Fix manpage sed -i \ @@ -53,13 +52,6 @@ src_prepare() { -e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \ doc/screen.1 || die - if [[ ${CHOST} == *-darwin* ]] || use elibc_musl; then - sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die - fi - - # disable musl dummy headers for utmp[x] - use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H" - # reconfigure eautoreconf } @@ -74,17 +66,21 @@ src_configure() { append-cppflags -D_XOPEN_SOURCE=600 fi + use nethack || append-cppflags "-DNONETHACK" use debug && append-cppflags "-DDEBUG" local myeconfargs=( - --enable-socket-dir="${EPREFIX}/tmp/${PN}" - --with-system_screenrc="${EPREFIX}/etc/screenrc" + --with-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-utmp + --enable-colors256 $(use_enable pam) + $(use_enable utempter utmp) ) + econf "${myeconfargs[@]}" }
