Add app-misc/screen-4.2.1-r2, update app-misc/screen-4.0.3-r8

3 files changed, 143 insertions, 2 deletions

diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index acb1747d..eb10506b 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -13,5 +13,7 @@ AUX screen-4.0.3-crosscompile.patch 18900 SHA256 7e4109cd3f6d58ea799fe069472a58f
 AUX screen-4.0.3-setenv_autoconf.patch 2485 SHA256 091eb224a097bbc1b5f1b3dd8048dbb04b8c7476818a9444eae5bdb8b52bce75 SHA512 72dcfd9180d05edf85ce9f459e69ccd709a6c0a4593802d0f4e88ffe2daf56215ce8049a641701693dafeab3cc8a0df796338d92338ee0d39c51d46ed718af7b WHIRLPOOL fa7645c3488f75c8acdb2305864459e3eada89e7a29e39a6048cdda7459c707b090c68ce93023a53c57a7beabb3c66f9f9f26237126e68d00cc888a7581b867c
 AUX screenrc 10412 SHA256 191d91f9fd1e676525a9e1a3bdc5ac73283f948caf74b4bb6e0cfcecbe4798bb SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7 WHIRLPOOL e05785d9810a709ccd189bbf1557022bd91f653ddb2f138e54286fbbc11ddbbedf2276d2b8bc975a8ff1ac024ab24d955a6b3055cf5cd2dfb445c35484e90f09
 DIST screen-4.0.3.tar.gz 840602 SHA256 78f0d5b1496084a5902586304d4a73954b2bfe33ea13edceecf21615c39e6c77 SHA512 24c1f598972f3dc9ed49cd2c05852190a0190d22fa01401eee8484627c8dd2815f0a422d9b2697faa8aaa0b3efc6730a94e2d5aa787dbe5e9ec719143176c338 WHIRLPOOL 6774786126eb05749d432593bc2c1febdc57896959220a609feb138bdc16b8da278aea63af1ccfd5c7d38ccaa9e7d28980e9e14d0009d36a54cdbd9e4cb0fca7
-EBUILD screen-4.0.3-r8.ebuild 5163 SHA256 b7ba088c79509d0f0f5d3b867b21aedcfeafc5dc4d81f8126f53eb6c7d86d3b7 SHA512 142660edcbbba84220a67951199787f19a9734e1b0771e87e4863cbe5374d85e4d775e84ba16b2ea4be222fc4a84a0717cbe8f38697a71ce101c462f258fe66e WHIRLPOOL a449691df7873f2dbc28fa2eedf86eae827d07c2979a45eda994888a640d61a0f07ce074b1ee1a762033eaec03f2bb6fde356373700e5031b94988c555505906
+DIST screen-4.2.1.tar.gz 1062485 SHA256 5468545047e301d2b3579f9d9ce00466d14a7eec95ce806e3834a3d6b0b9b080 SHA512 30826b2a2fc436483276b90cc4c6679470f7ccb7098c9bb8457d0e534998cd12da02882cf80678465f6540cade170c3fdc6bdfa31b07359ff0d3ffe2d6063710 WHIRLPOOL 7d4209651a016a9ab91aec385532c6ebd7a6d96a60342721f3a53752924c3fb72aa3d648ad665b67fab0a78d6019396abe13e04f556c7e5e9f71bf3238e64cc5
+EBUILD screen-4.0.3-r8.ebuild 5176 SHA256 83deaf9ae5eb8aeaf18b26753773fc23dae1596bbb03c2118b7f7800b0556dee SHA512 738bd26e4b6adb904d4caa1f1ece1ba1aaf746a75219e91cd1c394d3590fea77b8eef07b00636fe96f71671813f0872698c8880f188100d936e3285c31659d05 WHIRLPOOL 58c781eddb1f73e215acb3ff95814fc3b97598a84aaf780aecf9aa663ae1d5fbd42ee34103d1a627c72a5b11dadffcb3c64c62e645299d12bacafd093b4c8878
+EBUILD screen-4.2.1-r2.ebuild 3869 SHA256 50caf50331cde72769e0ad04e88f9fc1c50539c0e1d27fcbb88a08b8cdbc8a1d SHA512 00dfe6a7f60c12fe7b5545bcf34401c1cbb617e30325d5745c0caf56075ef13fa2c57a364f4d2a19e6e6d49ab689180cc1f632cc0a1a48338af9aca2b73c6e4d WHIRLPOOL c370928dc33d928c0e1ccc70bc9c19674d6d8cad946b1a80a4c745bb1f4ae42d123645e180902ec323a0a24fc57588845baceb31a66bbfbea9e73b37ff55dc7c
 EBUILD screen-9999.ebuild 3382 SHA256 0de79b60d87e5a2b7416694b1538abaa5e32d955d4d3fa8b09f95bf97a23edfe SHA512 7840a9b212fbfee02c51013d8fe6d4791d231cd7344e9ab241cbd566f52cbc1636fbce3ba64d307916f3d90571a39438da05f0991f6eaaca72f1439b609a42e7 WHIRLPOOL c38653fb935699b7176b2ddf54d88d84d9cce463955957b7b437ae02951cc81e3eed578882158db2cd3f59b32a7b7d2ba55a21c4d01039296e877dfe87666cd5
diff --git a/app-misc/screen/screen-4.0.3-r8.ebuild b/app-misc/screen/screen-4.0.3-r8.ebuild
index 0a9eb9a8..70f4ed67 100644
--- a/app-misc/screen/screen-4.0.3-r8.ebuild
+++ b/app-misc/screen/screen-4.0.3-r8.ebuild
@@ -22,7 +22,7 @@ RDEPEND=">=sys-libs/ncurses-5.2
 	selinux? ( sec-policy/selinux-screen )"
 DEPEND="${RDEPEND}"
 RDEPEND="${RDEPEND}
-	>=sys-apps/openrc-0.11.6"
+	!prefix? ( >=sys-apps/openrc-0.11.6 )"
 
 pkg_setup() {
 	# Make sure utmp group exists, as it's used later on.
diff --git a/app-misc/screen/screen-4.2.1-r2.ebuild b/app-misc/screen/screen-4.2.1-r2.ebuild
new file mode 100644
index 00000000..3713c3d2
--- /dev/null
+++ b/app-misc/screen/screen-4.2.1-r2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.2.1-r2.ebuild,v 1.3 2014/08/26 16:07:14 jer Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic pam toolchain-funcs user
+
+DESCRIPTION="Full-screen window manager that multiplexes physical terminals between several processes"
+HOMEPAGE="http://www.gnu.org/software/screen/"
+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"
+IUSE="debug multiuser nethack pam selinux +tmpfiles"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	pam? ( virtual/pam )
+	selinux? ( sec-policy/selinux-screen )"
+DEPEND="${RDEPEND}
+	sys-apps/texinfo"
+RDEPEND="${RDEPEND}
+	!prefix? ( >=sys-apps/openrc-0.11.6 )"
+
+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}"/4.0.2-no-utempter.patch
+
+	# 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
+
+	# Fix manpage.
+	sed -i \
+		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+		-e "s:/usr/local/screens:${EPREFIX}/var/run/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}/var/run/screen/S-:g" \
+		doc/screen.1 \
+		|| die
+
+	# reconfigure
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+
+	[[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
+
+	use nethack || append-cppflags "-DNONETHACK"
+	use debug && append-cppflags "-DDEBUG"
+
+	econf \
+		--with-socket-dir="${EPREFIX}/var/run/screen" \
+		--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
+}
+
+src_install() {
+	local tmpfiles_perms tmpfiles_group
+
+	dobin screen
+
+	if use multiuser ; then
+		use prefix || fperms 4755 /usr/bin/screen
+		tmpfiles_perms="0755"
+		tmpfiles_group="root"
+	else
+		fowners root:utmp /usr/bin/screen
+		fperms 2755 /usr/bin/screen
+		tmpfiles_perms="0775"
+		tmpfiles_group="utmp"
+	fi
+
+	if use tmpfiles; then
+		dodir /etc/tmpfiles.d
+		echo "d /var/run/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
+			> "${ED}"/etc/tmpfiles.d/screen.conf
+	fi
+
+	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() {
+	if [[ -z ${REPLACING_VERSIONS} ]]
+	then
+		elog "Some dangerous key bindings have been removed or changed to more safe values."
+		elog "We enable some xterm hacks in our default screenrc, which might break some"
+		elog "applications. Please check /etc/screenrc for information on these changes."
+	fi
+
+	# add /var/run/screen in case it doesn't exist yet. This should solve
+	# problems like bug #508634 where tmpfiles.d isn't in effect.
+	local rundir="${EROOT%/}/var/run/screen"
+	if [[ ! -d ${rundir} ]] ; then
+		if use multiuser || use prefix ; then
+			tmpfiles_group="root"
+		else
+			tmpfiles_group="utmp"
+		fi
+		mkdir -m 0775 "${rundir}"
+		chgrp ${tmpfiles_group} "${rundir}"
+	fi
+}