gentoo resync : 29.10.2017

2 files changed, 160 insertions, 0 deletions

diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 9e3a2ab9cc37..da150f67e576 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -5,10 +5,12 @@ DIST screen-4.4.0.tar.gz 846010 SHA256 ef722a54759a3bf23aad272bbf33c414c1078cad6
 DIST screen-4.5.1.tar.gz 963153 SHA256 97db2114dd963b016cd4ded34831955dcbe3251e5eee45ac2606e67e9f097b2d SHA512 ca53477ad38264be38efb1d10a1337b647dd061127162c77533b17a30d046cd0caabe38e4a9e5389aac30d5dc62eb53e7877411e69adae36d0ca869bd0a82804 WHIRLPOOL db60013141e3f426107d3f1e518b48fc0bbf89fbf51b26b5ac7208b9940448397ec0009d389365289a1d06421b403982093c8b7ee8d891eea20c704d7ad376b1
 DIST screen-4.6.0.tar.gz 849062 SHA256 9433706b653e941cc4c745f28e252e57be2a141eded923e61cc2c4a09768fed4 SHA512 2ee7cc51c62a478e72eda0647f3f347e63f40384e19bc11b074158bd94cdb628c6425b1dd7a472496d56bff11a30a9dc58859c2e7e539fae2a8718ed9b0f96d7 WHIRLPOOL 62593811fed8dc2e92acefb80751a60ad7170429047f9acf0ec21718ab303add365ae469d11d3371524095a53c750216ae07e572a640439db26e1526c7ed12ee
 DIST screen-4.6.1.tar.gz 848979 SHA256 aba9af66cb626155d6abce4703f45cce0e30a5114a368bd6387c966cbbbb7c64 SHA512 e5d029400ed5b509ebddc1f55812c33536d6f5ce91119537c7d06e1fa7dee84939c43337df4638f61c818ce0412f4d08fe212202162a4483a9e84bbc4b3e4336 WHIRLPOOL aad842c61961d01712017da64a3d9fbc5bcb74ecb0310b5d371ea8aa5eacf694826a66dea00c0b1c24de9918aafe6bf5b770342ec2ac840fa68cfa1fb52785fe
+DIST screen-4.6.2.tar.gz 845210 SHA256 1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a SHA512 224bd16ad5ae501d1b8bb7d2ba9cc19e6a0743de5a5b320109c2f6bf3b1ca564cc7094ed9211be13733d9d769cde77d13fe236341d448cad0518038ab1e85c99 WHIRLPOOL e918461451b49d7c291911763ee617586d93088f777c41b378ea00d0192c7ab9787e7137baedf3cc8f4169ee0fd6aa65348bca543bbc0d10d00d31dbeb7826f7
 EBUILD screen-4.4.0.ebuild 3956 SHA256 d522def5c9aee5fa33e443e10f2d7bd1928c936fd3f2117aeaff670e33a75644 SHA512 e143bf0d0f01d1f505ec84b4c55f36ba70391b117cf78694373fdd7b892d5df4b208b27a3d711daac0a3edbf05debfd9aed03eaff961083bca791df504c07185 WHIRLPOOL a27b51d080154604fc072652e13caf86bf10d23dc5c49abac4cd94fb38cfadee4da5d529f8ab969e51877993ac1dd58871e2d1db86b84d6746f3375c266cc881
 EBUILD screen-4.5.1.ebuild 4139 SHA256 756e30ee1819c554bff6089ba5588d4f73a69733592bf84bbfc09b9c5f7cb7fe SHA512 11e9a7ad1a85dfa67dc6fb6a1e738529c74cb0b82ea96d6fa023b4e6b71cfa14046b318e42d742595e9bda33af1d7514d1a6b0efc48696975b5d939db177471e WHIRLPOOL 1e77bb5a8e36402b7d15df01d89f97c3e8b50e4f386616a63d64ed143e105f6b8de06d8736ed649e4953d82d70cd0a8c02d316a1f50710bc0176aba375964474
 EBUILD screen-4.6.0.ebuild 4087 SHA256 bea936ccf54b555f23e9c56a49d591ec27529a9046574eead4f42caa0832f4dd SHA512 6c9b164723d23fffff0cf5a4fc346e2da8edf53fb877755c36c6106ab59b60b191ce17996597458df11b2a423a4a26db14b78e6e13d1c247ff2fbe4db2742968 WHIRLPOOL 660b1e137ed3d73d03d0a5fc91cfd41ce0854309fab036a2ec740e8b10b22ede626300ab898a91343b9530aa1aaac8b899209cde07aa4c7d90b81fcf28a01a7f
 EBUILD screen-4.6.1.ebuild 4087 SHA256 bea936ccf54b555f23e9c56a49d591ec27529a9046574eead4f42caa0832f4dd SHA512 6c9b164723d23fffff0cf5a4fc346e2da8edf53fb877755c36c6106ab59b60b191ce17996597458df11b2a423a4a26db14b78e6e13d1c247ff2fbe4db2742968 WHIRLPOOL 660b1e137ed3d73d03d0a5fc91cfd41ce0854309fab036a2ec740e8b10b22ede626300ab898a91343b9530aa1aaac8b899209cde07aa4c7d90b81fcf28a01a7f
+EBUILD screen-4.6.2.ebuild 4087 SHA256 bea936ccf54b555f23e9c56a49d591ec27529a9046574eead4f42caa0832f4dd SHA512 6c9b164723d23fffff0cf5a4fc346e2da8edf53fb877755c36c6106ab59b60b191ce17996597458df11b2a423a4a26db14b78e6e13d1c247ff2fbe4db2742968 WHIRLPOOL 660b1e137ed3d73d03d0a5fc91cfd41ce0854309fab036a2ec740e8b10b22ede626300ab898a91343b9530aa1aaac8b899209cde07aa4c7d90b81fcf28a01a7f
 EBUILD screen-9999.ebuild 3680 SHA256 b4c700884e7deeb35b1ce18bbf602c3a10328492f28cec8b56b637eaa4e227ab SHA512 f27332b033f31450f6cd66ea8e9a39866470633e17eac7d6ea26bc093aaa62f85dc5001875478592c417889e298c2eb87f16954735e015405f4d4ba712cf09e5 WHIRLPOOL 3d0df4796c469378a550732fa23319c8101f60f2fe7a05e49cc470a134ee1f4781117e4a1518b44855f03bbfb5e54ce25eef6906931a12bc111f28ebcdc9741e
 MISC ChangeLog 8688 SHA256 5fb8c35b0b43b5d0c575c17e1d01089a3b0e153687e249e0b98bf9546077c3c5 SHA512 c0a284f5f073cb356fe05b62bd7c938aea0e1cf99139815568c934f3853e77420b081d2f2f606df37e9a11c8c461a7992f516b4fae470f4955e71277173f7f6f WHIRLPOOL 2f283c0cd3cb874ba334abe711f3ca2633c7ce895c1f240a0e03cd9d369b559e428094290fdd29dc265a2e82336666dd848a9d767c55513e7c66bf18c302991e
 MISC ChangeLog-2015 29858 SHA256 481ee48a0440100320f3ebf9d717d6aebb6f95ac4eff5ea793711b9e24f5324b SHA512 d3015d0c2ab3e7f019c414fc95542ff3408ee1ddccf1e805e5885646307141aa9c6d0a4aaf1bbe733b930da929e6eb1896c632cfcc2658ee4508a1c9fa830eac WHIRLPOOL 17a24afb34b439e9eff882ad54410af5117f41e92540854981e56671d5746b9caa15d6196d572a5d0421948763dea9a2f0953d0440792e1bafa593f00424e237
diff --git a/app-misc/screen/screen-4.6.2.ebuild b/app-misc/screen/screen-4.6.2.ebuild
new file mode 100644
index 000000000000..01169b42901c
--- /dev/null
+++ b/app-misc/screen/screen-4.6.2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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/"
+
+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 ~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"
+IUSE="debug nethack pam selinux multiuser"
+
+CDEPEND="
+	>=sys-libs/ncurses-5.2:0=
+	pam? ( virtual/pam )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-screen )"
+DEPEND="${CDEPEND}
+	sys-apps/texinfo"
+
+PATCHES=(
+	# Don't use utempter even if it is found on the system.
+	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
+)
+
+pkg_setup() {
+	# Make sure utmp group exists, as it's used later on.
+	enewgroup utmp 406
+}
+
+src_prepare() {
+	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
+
+	# Fix manpage.
+	sed -i \
+		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+		-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" \
+		doc/screen.1 \
+		|| die
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
+	fi
+
+	# reconfigure
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# enable msg_header by upping the feature standard compatible
+		# with c99 mode
+		append-cppflags -D_XOPEN_SOURCE=600
+	fi
+
+	use nethack || append-cppflags "-DNONETHACK"
+	use debug && append-cppflags "-DDEBUG"
+
+	econf \
+		--with-socket-dir="${EPREFIX}/tmp/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 DOCS=(
+		README ChangeLog INSTALL TODO NEWS* patchlevel.h
+		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+	)
+
+	default
+
+	local tmpfiles_perms tmpfiles_group
+
+	if use multiuser || use prefix
+	then
+		fperms 4755 /usr/bin/screen-${PV}
+		tmpfiles_perms="0755"
+		tmpfiles_group="root"
+	else
+		fowners root:utmp /usr/bin/screen-${PV}
+		fperms 2755 /usr/bin/screen-${PV}
+		tmpfiles_perms="0775"
+		tmpfiles_group="utmp"
+	fi
+
+	dodir /etc/tmpfiles.d
+	echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
+		> "${ED}"/etc/tmpfiles.d/screen.conf
+
+	insinto /usr/share/screen
+	doins terminfo/{screencap,screeninfo.src}
+
+	insinto /etc
+	doins "${FILESDIR}"/screenrc
+
+	pamd_mimic_system screen auth
+}
+
+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 /tmp/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%/}/tmp/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
+
+	ewarn "This revision changes the screen socket location to ${rundir}"
+}