diff options
author | Sven Wegener <swegener@gentoo.org> | 2011-03-19 14:36:43 +0000 |
---|---|---|
committer | Sven Wegener <swegener@gentoo.org> | 2011-03-19 14:36:43 +0000 |
commit | fe4e56bd90f6bec1118fbf7425517c89e913506c (patch) | |
tree | 3a0145dff180f8deb55f7bf78530ae8ef8096f37 /app-misc | |
parent | Mark unused eclasses as dead. To be removed completely on 2011-04-30. (diff) | |
download | gentoo-2-fe4e56bd90f6bec1118fbf7425517c89e913506c.tar.gz gentoo-2-fe4e56bd90f6bec1118fbf7425517c89e913506c.tar.bz2 gentoo-2-fe4e56bd90f6bec1118fbf7425517c89e913506c.zip |
Touchup postinst logic to be easier to read.
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
Diffstat (limited to 'app-misc')
-rw-r--r-- | app-misc/screen/ChangeLog | 6 | ||||
-rw-r--r-- | app-misc/screen/screen-4.0.3-r1.ebuild | 17 | ||||
-rw-r--r-- | app-misc/screen/screen-4.0.3-r3.ebuild | 17 | ||||
-rw-r--r-- | app-misc/screen/screen-4.0.3-r4.ebuild | 17 |
4 files changed, 26 insertions, 31 deletions
diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog index 65b87801d669..192960134b95 100644 --- a/app-misc/screen/ChangeLog +++ b/app-misc/screen/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/screen # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.154 2011/01/23 20:14:43 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.155 2011/03/19 14:36:43 swegener Exp $ + + 19 Mar 2011; Sven Wegener <swegener@gentoo.org> screen-4.0.3-r1.ebuild, + screen-4.0.3-r3.ebuild, screen-4.0.3-r4.ebuild: + Touchup postinst logic to be easier to read. 23 Jan 2011; Sven Wegener <swegener@gentoo.org> files/screenrc: Change suggested key binding for emacs users, bug #352063. diff --git a/app-misc/screen/screen-4.0.3-r1.ebuild b/app-misc/screen/screen-4.0.3-r1.ebuild index 0929c13d2fa5..966ce484c6d5 100644 --- a/app-misc/screen/screen-4.0.3-r1.ebuild +++ b/app-misc/screen/screen-4.0.3-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r1.ebuild,v 1.1 2010/06/15 11:47:35 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r1.ebuild,v 1.2 2011/03/19 14:36:43 swegener Exp $ EAPI="3" @@ -146,14 +146,11 @@ src_install() { } pkg_postinst() { - if use multiuser || use prefix - then - use prefix || chown root:0 "${EROOT}"/var/run/screen - if use prefix; then - chmod 0777 "${EROOT}"/var/run/screen - else - chmod 0755 "${EROOT}"/var/run/screen - fi + if use prefix; then + chmod 0777 "${EROOT}"/var/run/screen + elif use multiuser; then + chown root:0 "${EROOT}"/var/run/screen + chmod 0755 "${EROOT}"/var/run/screen else chown root:utmp "${EROOT}"/var/run/screen chmod 0775 "${EROOT}"/var/run/screen diff --git a/app-misc/screen/screen-4.0.3-r3.ebuild b/app-misc/screen/screen-4.0.3-r3.ebuild index 5d47e115cd9d..3745d94ea228 100644 --- a/app-misc/screen/screen-4.0.3-r3.ebuild +++ b/app-misc/screen/screen-4.0.3-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r3.ebuild,v 1.1 2010/11/17 16:42:00 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r3.ebuild,v 1.2 2011/03/19 14:36:43 swegener Exp $ EAPI="3" @@ -149,14 +149,11 @@ src_install() { } pkg_postinst() { - if use multiuser || use prefix - then - use prefix || chown root:0 "${EROOT}"/var/run/screen - if use prefix; then - chmod 0777 "${EROOT}"/var/run/screen - else - chmod 0755 "${EROOT}"/var/run/screen - fi + if use prefix; then + chmod 0777 "${EROOT}"/var/run/screen + elif use multiuser; then + chown root:0 "${EROOT}"/var/run/screen + chmod 0755 "${EROOT}"/var/run/screen else chown root:utmp "${EROOT}"/var/run/screen chmod 0775 "${EROOT}"/var/run/screen diff --git a/app-misc/screen/screen-4.0.3-r4.ebuild b/app-misc/screen/screen-4.0.3-r4.ebuild index 34fd6b6d0559..26be0a41a063 100644 --- a/app-misc/screen/screen-4.0.3-r4.ebuild +++ b/app-misc/screen/screen-4.0.3-r4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r4.ebuild,v 1.1 2010/12/08 19:11:04 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r4.ebuild,v 1.2 2011/03/19 14:36:43 swegener Exp $ EAPI="3" @@ -150,14 +150,11 @@ src_install() { } pkg_postinst() { - if use multiuser || use prefix - then - use prefix || chown root:0 "${EROOT}"/var/run/screen - if use prefix; then - chmod 0777 "${EROOT}"/var/run/screen - else - chmod 0755 "${EROOT}"/var/run/screen - fi + if use prefix; then + chmod 0777 "${EROOT}"/var/run/screen + elif use multiuser; then + chown root:0 "${EROOT}"/var/run/screen + chmod 0755 "${EROOT}"/var/run/screen else chown root:utmp "${EROOT}"/var/run/screen chmod 0775 "${EROOT}"/var/run/screen |