Update app-misc/screen-4.4.0, app-misc/screen-9999

3 files changed, 25 insertions, 16 deletions

diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 76f1ddd0..9ecb8271 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -24,5 +24,5 @@ EBUILD screen-4.2.1-r2.ebuild 4325 SHA256 c9795d6daf9921e42bad070da5cd638377ad71
 EBUILD screen-4.3.0.ebuild 4390 SHA256 8ce0a5f0ecd2fe141bcc6b3bfb0000edc15f7d357c15d10e268a610f62cecfb6 SHA512 1e10f1c9590eee3c1c1d8a1467aad3410590318815f91d23de4cac6fe59c46c60c50e05126247a16ee2e3582c9a2d991dd24c75561829a543af43878d716522c WHIRLPOOL 7c70cda25fe0ff5d11740179dab0ce27062cde58b594899a465ccee6e1c8ad283db0b72d0189b1c7eb50579ea0dbe46fd85c34e507a3d72e32a7a86568cb89ad
 EBUILD screen-4.3.1-r1.ebuild 5396 SHA256 a2471898c8125e84b7372688c5b82a3fbc10f495fec9b227421bb4a091385b31 SHA512 8c0cb9bf74adcb84149a79ba8b31a6c264e383c8179ebabc363aa21d8100c79818c473a2a3c1a377689618322f5f848e6d4031f317065a1c12807ff7614ca0e6 WHIRLPOOL 2d57eeed772b42c76370c8e3687f28e8aaf26a4df5940940d09c5cbe8ba5be9fdcda77c620138d6436df18d52eca72d87a2da5d82562284306ff011f86cc8a09
 EBUILD screen-4.3.1.ebuild 5181 SHA256 5a7d6c1c6a29634f568a83d5be45d3ceedcf1f67f5e21f27c240ed82c60bc59d SHA512 c0a8bce4172524af6a0cf7b0bd26ff2def151ebcd61f8f33cd3ae73c2272a790f013c24d81b0b4a531b9241651ac4c431ef361f537b4cbca6cc3cc2a5c88bc92 WHIRLPOOL bff0e254f4a0a9536e5324cf3743d2d6d1d6197091b1b202317fb0240c3a69e2f6e96dccfa063769274d06f30412282369ee5a29d637df0952a365ffcaef7d43
-EBUILD screen-4.4.0.ebuild 5769 SHA256 05c33f79bef17074e5d912829e523e47c46067e2b702eb9c4ed06769b8dfabc2 SHA512 3d7a2c6e72efb1818dc62cc51df10b1f2aca7a3ce71af0f672e707d03fc040abf738faa088ac095fec8dbfb4ea5e86e15f717f76d51b9a2defb066988c491e27 WHIRLPOOL b81349f58232149c364dbce024ba0d61fe5c5f67ac8ec15889ed92c0ec6905132b6068bcf2779fce244ae004aabe8efe07bc388ee5dc83c848b6c19610af9a1b
-EBUILD screen-9999.ebuild 3680 SHA256 eb34ea22b5f360743b6448698c6a07968fdef41b79c576036e3ba6df4ef21cf3 SHA512 f89b73a87440a56d3b9c49f3535622a2e69bd1b6389189cc327d5dcd3def6e4c238f4686bf3ab8d448149d2588d7e7b887b21feda0691689981ed2e02c434547 WHIRLPOOL 037d3c9b86797a277aca599c8a60928ed973a841683da8bdb2709fba948fc5f41a66848fef35d35b0057614ba4ce0db88f1785f0c31e03e4720c755ab29c40d5
+EBUILD screen-4.4.0.ebuild 5768 SHA256 46bad25254330527251a51dc8bda8e5b225a55c5f670bcf1a16259beae4ecd78 SHA512 5f19ff89c4316f5d828a106785b027f5d635088d213fd07993fbe224caf089f9dec28ba8818bbc13a0e8bb50be4837f0ba2e7fef336e808d190ea02897e0205a WHIRLPOOL 6b0de2b4bbe4ddf0879ff53c24e75705b9bdb3edf42c92ec05a2279fd9f661f9d9bafafed2977dde0c1e04afd716362938cf51fd7791d110c20fcba802167bec
+EBUILD screen-9999.ebuild 3854 SHA256 c4fe7158975925365a8dc46706c1bcac4627f89544270088bad7f79cdfd019ff SHA512 c817785896b845faa197fb772620474d849908372917f87a59a94e466a5b7f59ec6b233b1f122da7bfb89e4e5435095f293e1e0c3675655bcd27f0539e2e4de2 WHIRLPOOL 0b7a541f22d7119346d08a3fa0c90df4c2e25f261c61d20dc532a36295b7a35d56915d0bac4ae2dcecc571dd77f3d85b9120efa95c3b5c0b1cdd7808c6b25893
diff --git a/app-misc/screen/screen-4.4.0.ebuild b/app-misc/screen/screen-4.4.0.ebuild
index 3781da67..e35ed4c3 100644
--- a/app-misc/screen/screen-4.4.0.ebuild
+++ b/app-misc/screen/screen-4.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: 4bf636e9cc20e51053b0302d2b686f77e1c6acb2 $
+# $Id: d6f3cff7e34659c93bafae4f107f37fa7a1d6b1a $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 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"
+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 multiuser nethack pam selinux +tmpfiles"
 
 CDEPEND="
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index c0ada082..0531e610 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: 867af7142589526eb6425080b66a39f31fc80478 $
+# $Id: c9bd0eef19a2ef07f53cf52685a3c0d10e0dd09f $
 
-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,16 +15,22 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug multiuser nethack pam selinux +tmpfiles"
+IUSE="debug multiuser nethack pam selinux +tmpfiles 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
 
 pkg_setup() {
@@ -33,12 +39,14 @@ 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
+	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 +71,13 @@ src_configure() {
 	use debug && append-cppflags "-DDEBUG"
 
 	econf \
-		--with-socket-dir="${EPREFIX}/var/run/screen" \
-		--with-sys-screenrc="${EPREFIX}/etc/screenrc" \
+		--enable-socket-dir="${EPREFIX}/var/run/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() {