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 85FBD139085 for ; Wed, 18 Jan 2017 13:15:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DD527E0D3A; Wed, 18 Jan 2017 13:15:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 AF804E0D3A for ; Wed, 18 Jan 2017 13:15:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 4B8023412B7 for ; Wed, 18 Jan 2017 13:14:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 50CE82776 for ; Wed, 18 Jan 2017 13:14:57 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1484745289.7c0f0bbc2f1c19e3624722b4609f156bc560c7f0.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/screen/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/screen/screen-4.5.0.ebuild X-VCS-Directories: app-misc/screen/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 7c0f0bbc2f1c19e3624722b4609f156bc560c7f0 X-VCS-Branch: master Date: Wed, 18 Jan 2017 13:14:57 +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: 232b659e-a868-4001-bf72-691014a5ea03 X-Archives-Hash: 0199cd333e0423e46d5ffdc9472446c4 commit: 7c0f0bbc2f1c19e3624722b4609f156bc560c7f0 Author: Lars Wendler gentoo org> AuthorDate: Wed Jan 18 13:14:49 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Jan 18 13:14:49 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c0f0bbc app-misc/screen: Some ebuild overhaul. Package-Manager: Portage-2.3.3, Repoman-2.3.1 app-misc/screen/screen-4.5.0.ebuild | 44 +++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/app-misc/screen/screen-4.5.0.ebuild b/app-misc/screen/screen-4.5.0.ebuild index 51f9be6..7ba384d 100644 --- a/app-misc/screen/screen-4.5.0.ebuild +++ b/app-misc/screen/screen-4.5.0.ebuild @@ -4,15 +4,25 @@ EAPI=6 -inherit autotools eutils flag-o-matic pam toolchain-funcs user +SCM="" +[[ "${PV}" = 9999 ]] && SCM="git-r3" +inherit autotools eutils flag-o-matic pam toolchain-funcs user ${SCM} +unset SCM DESCRIPTION="screen manager with VT100/ANSI terminal emulation" HOMEPAGE="https://www.gnu.org/software/screen/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +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 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +else + EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git" + EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on + S="${WORKDIR}"/${P}/src +fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug nethack pam selinux multiuser" CDEPEND=" @@ -23,9 +33,8 @@ RDEPEND="${CDEPEND} DEPEND="${CDEPEND} sys-apps/texinfo" -# Patches: -# - Don't use utempter even if it is found on the system. PATCHES=( + # Don't use utempter even if it is found on the system. "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch ) @@ -93,18 +102,23 @@ src_compile() { } src_install() { - local tmpfiles_perms tmpfiles_group + local DOCS=( + README ChangeLog INSTALL TODO NEWS* patchlevel.h + doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps} + ) + + default - 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 @@ -115,19 +129,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* patchlevel.h \ - doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps} - - doman doc/screen.1 - doinfo doc/screen.info } pkg_postinst() {