From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 602E11382AC for ; Mon, 20 Jun 2016 13:43:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B128BE0A9B; Mon, 20 Jun 2016 13:42:58 +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 3DC9DE0A9B for ; Mon, 20 Jun 2016 13:42:58 +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 8F7A63406F2 for ; Mon, 20 Jun 2016 13:42:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 593A11AE8 for ; Mon, 20 Jun 2016 13:42:38 +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: <1466430156.a221b96e97a34260a10cfe9c41a8ea5fd01c2f14.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/screen/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/screen/Manifest app-misc/screen/screen-4.4.0.ebuild 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: a221b96e97a34260a10cfe9c41a8ea5fd01c2f14 X-VCS-Branch: master Date: Mon, 20 Jun 2016 13:42:38 +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: 30cbe1fc-2bb7-4089-97b5-ca4854f7565a X-Archives-Hash: 6024fff84772664564a8da983d544127 commit: a221b96e97a34260a10cfe9c41a8ea5fd01c2f14 Author: Jeroen Roovers gentoo org> AuthorDate: Mon Jun 20 13:41:14 2016 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Mon Jun 20 13:42:36 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a221b96e app-misc/screen: Version bump. Package-Manager: portage-2.3.0_rc1 app-misc/screen/Manifest | 1 + .../{screen-9999.ebuild => screen-4.4.0.ebuild} | 45 ++++++++++++++-------- app-misc/screen/screen-9999.ebuild | 4 +- 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest index 9153fdb..6a3d8d6 100644 --- a/app-misc/screen/Manifest +++ b/app-misc/screen/Manifest @@ -1 +1,2 @@ DIST screen-4.3.1.tar.gz 845958 SHA256 fa4049f8aee283de62e283d427f2cfd35d6c369b40f7f45f947dbfd915699d63 SHA512 8e8a25b23330a7d8e00fc9e6cc430f0eb3937ccf4183efbd6fd24e4dc04cc09b3acae45bfc24892faee433b18fa79b1cfe0211fd75c0d74ecf908f916bf774aa WHIRLPOOL b47f7538351028cc3a2ec7f69a9373e152fa7655c6ae9feb75ba46db3cdc9b7d58ce78043993b7f134da3a04754c5e52d1a77da4c30a8decda21c79cf5c50f51 +DIST screen-4.4.0.tar.gz 846010 SHA256 ef722a54759a3bf23aad272bbf33c414c1078cad6bcd982fada93c0d7917218b SHA512 6e43f85c419f778822ec85e4340c95769e981a3d51abdeb5f26c6ebb840da9ab11b351ecc7f380ceea39bcfaa87f1124cfebd6af4ecb62b886eb189e7b79981b WHIRLPOOL a0d68d2d50f9f50537bf73a6dbb1ecbfe8c6af5c5322003a717431734bdc86a940fc55cd8c3a28b3e5ec572aaa0ceba376d97cbb8c5090a92d499cba2889b322 diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-4.4.0.ebuild similarity index 68% copy from app-misc/screen/screen-9999.ebuild copy to app-misc/screen/screen-4.4.0.ebuild index 3038ad6..4bf636e 100644 --- a/app-misc/screen/screen-9999.ebuild +++ b/app-misc/screen/screen-4.4.0.ebuild @@ -1,20 +1,18 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git" -EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on +inherit autotools eutils flag-o-matic pam toolchain-funcs user -inherit eutils flag-o-matic toolchain-funcs pam autotools user git-r3 - -DESCRIPTION="Full-screen window manager that multiplexes physical terminals between several processes" +DESCRIPTION="screen manager with VT100/ANSI terminal emulation" HOMEPAGE="https://www.gnu.org/software/screen/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" +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=" @@ -25,7 +23,11 @@ RDEPEND="${CDEPEND} DEPEND="${CDEPEND} sys-apps/texinfo" -S="${WORKDIR}"/${P}/src +# Patches: +# - Don't use utempter even if it is found on the system. +PATCHES=( + "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch +) pkg_setup() { # Make sure utmp group exists, as it's used later on. @@ -33,8 +35,8 @@ pkg_setup() { } src_prepare() { - # Don't use utempter even if it is found on the system - epatch "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch + # Apply patches. + epatch "${PATCHES[@]}" # sched.h is a system header and causes problems with some C libraries mv sched.h _sched.h || die @@ -46,10 +48,14 @@ src_prepare() { -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \ -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \ -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \ - -e "s:/local/screens/S-:${EPREFIX}/tmp/screen/S-:g" \ + -e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \ doc/screen.1 \ || die + if [[ ${CHOST} == *-darwin* ]] ; then + sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die + fi + # reconfigure eautoreconf } @@ -57,7 +63,13 @@ src_prepare() { src_configure() { append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}" - [[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl + if [[ ${CHOST} == *-solaris* ]] ; then + # https://lists.gnu.org/archive/html/screen-devel/2014-04/msg00095.html + append-cppflags -D_XOPEN_SOURCE \ + -D_XOPEN_SOURCE_EXTENDED=1 \ + -D__EXTENSIONS__ + append-libs -lsocket -lnsl + fi use nethack || append-cppflags "-DNONETHACK" use debug && append-cppflags "-DDEBUG" @@ -67,12 +79,15 @@ src_configure() { --with-sys-screenrc="${EPREFIX}/etc/screenrc" \ --with-pty-mode=0620 \ --with-pty-group=5 \ + --enable-rxvt_osc \ --enable-telnet \ + --enable-colors256 \ $(use_enable pam) } src_compile() { LC_ALL=POSIX emake comm.h term.h + emake osdef.h emake -C doc screen.info default @@ -97,7 +112,7 @@ src_install() { dodir /etc/tmpfiles.d echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \ - >"${ED}"/etc/tmpfiles.d/screen.conf + > "${ED}"/etc/tmpfiles.d/screen.conf insinto /usr/share/screen doins terminfo/{screencap,screeninfo.src} @@ -109,7 +124,7 @@ src_install() { pamd_mimic_system screen auth dodoc \ - README ChangeLog INSTALL TODO NEWS* \ + README ChangeLog INSTALL TODO NEWS* patchlevel.h \ doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps} doman doc/screen.1 @@ -137,5 +152,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}" } diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild index 3038ad6..867af71 100644 --- a/app-misc/screen/screen-9999.ebuild +++ b/app-misc/screen/screen-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -9,7 +9,7 @@ EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on inherit eutils flag-o-matic toolchain-funcs pam autotools user git-r3 -DESCRIPTION="Full-screen window manager that multiplexes physical terminals between several processes" +DESCRIPTION="screen manager with VT100/ANSI terminal emulation" HOMEPAGE="https://www.gnu.org/software/screen/" LICENSE="GPL-2"