Change socket location to /run/screen.

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key 0x64D4CF24)

1 files changed, 18 insertions, 6 deletions

diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index 62d9027a1308..d8310afa501b 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-9999.ebuild,v 1.1 2012/12/02 22:48:41 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-9999.ebuild,v 1.2 2012/12/21 21:02:27 swegener Exp $
 
 EAPI=4
 
@@ -25,6 +25,8 @@ RDEPEND=">=sys-libs/ncurses-5.2
 	selinux? ( sec-policy/selinux-screen )"
 DEPEND="${RDEPEND}
 	sys-apps/texinfo"
+RDEPEND="${RDEPEND}
+	>=sys-apps/openrc-0.11.6"
 
 S="${WORKDIR}"/${P}/src
 
@@ -44,10 +46,10 @@ src_prepare() {
 	# 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:/usr/local/screens:${EPREFIX}/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" \
+		-e "s:/local/screens/S-:${EPREFIX}/run/screen/S-:g" \
 		doc/screen.1 \
 		|| die "sed doc/screen.1 failed"
 
@@ -64,15 +66,14 @@ src_configure() {
 	use debug && append-cppflags "-DDEBUG"
 
 	econf \
-		--with-socket-dir="${EPREFIX}/var/run/screen" \
+		--with-socket-dir="${EPREFIX}/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) \
-		$(use multiuser || echo --disable-socket-dir)
+		$(use_enable pam)
 
 	LC_ALL=POSIX emake term.h
 	emake osdef.h
@@ -81,16 +82,25 @@ src_configure() {
 }
 
 src_install() {
+	local tmpfiles_perms tmpfiles_group
+
 	dobin screen
 
 	if use multiuser || use prefix
 	then
 		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
 
+	dodir /etc/tmpfiles.d
+	echo "d /run/screen ${tmpfiles_perms} root ${tmpfiles_group}" >"${ED}"/etc/tmpfiles.d/screen.conf
+
 	insinto /usr/share/screen
 	doins terminfo/{screencap,screeninfo.src}
 	insinto /usr/share/screen/utf8encodings
@@ -112,4 +122,6 @@ pkg_postinst() {
 	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."
+
+	ewarn "This revision changes the screen socket location to /run/screen."
 }