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 3081C138334 for ; Wed, 21 Nov 2018 19:05:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24FEBE087E; Wed, 21 Nov 2018 19:05:23 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D86D4E087E for ; Wed, 21 Nov 2018 19:05:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 03BF3335CB7 for ; Wed, 21 Nov 2018 19:05:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A0D3746C for ; Wed, 21 Nov 2018 19:05:17 +0000 (UTC) From: "Sven Wegener" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Wegener" Message-ID: <1542827079.876e1e476410b387673bcc9024d8b9d47c891704.swegener@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/screen/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/screen/screen-9999.ebuild X-VCS-Directories: app-misc/screen/ X-VCS-Committer: swegener X-VCS-Committer-Name: Sven Wegener X-VCS-Revision: 876e1e476410b387673bcc9024d8b9d47c891704 X-VCS-Branch: master Date: Wed, 21 Nov 2018 19:05:17 +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: 0753d9eb-2e3e-4aa5-8672-e7c50075bbca X-Archives-Hash: 914456c3687392d5a0b38df36b98457e commit: 876e1e476410b387673bcc9024d8b9d47c891704 Author: Sven Wegener gentoo org> AuthorDate: Wed Nov 21 18:50:15 2018 +0000 Commit: Sven Wegener gentoo org> CommitDate: Wed Nov 21 19:04:39 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=876e1e47 app-misc/screen: Update live ebuild Signed-off-by: Sven Wegener gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 app-misc/screen/screen-9999.ebuild | 45 ++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild index c7c5f563852..552f2f82961 100644 --- a/app-misc/screen/screen-9999.ebuild +++ b/app-misc/screen/screen-9999.ebuild @@ -1,18 +1,25 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils flag-o-matic toolchain-funcs pam autotools user git-r3 +inherit autotools eutils flag-o-matic pam toolchain-funcs user DESCRIPTION="screen manager with VT100/ANSI terminal emulation" HOMEPAGE="https://www.gnu.org/software/screen/" -EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git" -EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on + +if [[ "${PV}" != 9999 ]] ; then + SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +else + inherit git-r3 + EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git" + EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on + S="${WORKDIR}"/${P}/src +fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="" IUSE="debug nethack pam selinux multiuser utmp" CDEPEND=" @@ -29,7 +36,6 @@ DEPEND="${CDEPEND} sys-apps/texinfo" RESTRICT="test" -S="${WORKDIR}"/${P}/src pkg_setup() { # Make sure utmp group exists, as it's used later on. @@ -87,18 +93,23 @@ src_compile() { } src_install() { - local tmpfiles_perms tmpfiles_group + local DOCS=( + README ChangeLog INSTALL TODO NEWS* + doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps} + ) + + emake DESTDIR="${D}" SCREEN=screen-${PV} install - dobin screen + local tmpfiles_perms tmpfiles_group if use multiuser || use prefix then - fperms 4755 /usr/bin/screen + fperms 4755 /usr/bin/screen-${PV} tmpfiles_perms="0755" tmpfiles_group="root" else - fowners root:utmp /usr/bin/screen - fperms 2755 /usr/bin/screen + fowners root:utmp /usr/bin/screen-${PV} + fperms 2755 /usr/bin/screen-${PV} tmpfiles_perms="0775" tmpfiles_group="utmp" fi @@ -109,19 +120,11 @@ src_install() { insinto /usr/share/screen doins terminfo/{screencap,screeninfo.src} - insinto /usr/share/screen/utf8encodings - doins utf8encodings/?? + insinto /etc doins "${FILESDIR}"/screenrc pamd_mimic_system screen auth - - dodoc \ - README ChangeLog INSTALL TODO NEWS* \ - doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps} - - doman doc/screen.1 - doinfo doc/screen.info } pkg_postinst() { @@ -145,5 +148,5 @@ pkg_postinst() { chgrp ${tmpfiles_group} "${rundir}" fi - ewarn "This revision changes the screen socket location to /run/screen." + ewarn "This revision changes the screen socket location to ${rundir}" }