From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 18B6C139085 for ; Wed, 18 Jan 2017 13:25:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59CF12340B4; Wed, 18 Jan 2017 13:25:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 281F92340B4 for ; Wed, 18 Jan 2017 13:25:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1A4B3340DC7 for ; Wed, 18 Jan 2017 13:25:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 78A972799 for ; Wed, 18 Jan 2017 13:25:08 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1484745890.a6c47831c736872a73fb0b5dd26f411b2876ac3e.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/screen/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/screen/metadata.xml app-misc/screen/screen-9999.ebuild X-VCS-Directories: app-misc/screen/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: a6c47831c736872a73fb0b5dd26f411b2876ac3e X-VCS-Branch: master Date: Wed, 18 Jan 2017 13:25:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7c3b5010-a1bd-46c9-a125-a2fbd5bc05f2 X-Archives-Hash: a429aa1e11af4c224f19a00070cb6b7c commit: a6c47831c736872a73fb0b5dd26f411b2876ac3e Author: Jeroen Roovers gentoo org> AuthorDate: Wed Jan 18 13:24:50 2017 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Wed Jan 18 13:24:50 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6c47831 app-misc/screen: Update live ebuild. Package-Manager: Portage-2.3.3, Repoman-2.3.1 app-misc/screen/metadata.xml | 1 + app-misc/screen/screen-9999.ebuild | 33 +++++++++++++++++++++++---------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/app-misc/screen/metadata.xml b/app-misc/screen/metadata.xml index fd200de..ac31438 100644 --- a/app-misc/screen/metadata.xml +++ b/app-misc/screen/metadata.xml @@ -31,5 +31,6 @@ session is detached from the users terminal. Enable multiuser support (by setting correct permissions) Express error messages in nethack style + Include utmp support diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild index 867af71..57c1943 100644 --- a/app-misc/screen/screen-9999.ebuild +++ b/app-misc/screen/screen-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git" EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on @@ -15,30 +15,42 @@ HOMEPAGE="https://www.gnu.org/software/screen/" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="debug nethack pam selinux multiuser" +IUSE="debug nethack pam selinux multiuser utmp" CDEPEND=" >=sys-libs/ncurses-5.2:0= pam? ( virtual/pam )" RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-screen )" + selinux? ( sec-policy/selinux-screen ) + utmp? ( + kernel_linux? ( sys-libs/libutempter ) + kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) + ) +" DEPEND="${CDEPEND} sys-apps/texinfo" +RESTRICT="test" S="${WORKDIR}"/${P}/src +PATCHES=( + "${FILESDIR}"/${PN}-9999-alloca.patch +) + pkg_setup() { # Make sure utmp group exists, as it's used later on. enewgroup utmp 406 } src_prepare() { - # Don't use utempter even if it is found on the system - epatch "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch + default # 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 \ + -e '/include/ s:sched.h:_sched.h:' \ + screen.h winmsg.c canvas.h sched.c || die + sed -i -e 's:sched.h:_sched.h:g' Makefile.in || die # Fix manpage. sed -i \ @@ -63,12 +75,13 @@ src_configure() { use debug && append-cppflags "-DDEBUG" econf \ - --with-socket-dir="${EPREFIX}/tmp/screen" \ - --with-sys-screenrc="${EPREFIX}/etc/screenrc" \ + --enable-socket-dir="${EPREFIX}/tmp/screen" \ + --with-system_screenrc="${EPREFIX}/etc/screenrc" \ --with-pty-mode=0620 \ --with-pty-group=5 \ --enable-telnet \ - $(use_enable pam) + $(use_enable pam) \ + $(use_enable utmp) } src_compile() {