Touchup postinst logic to be easier to read.

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

5 files changed, 30 insertions, 45 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/Manifest b/app-misc/screen/Manifest
index 13d2c2e9d5d2..a8ae46e2855f 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 4.0.2-64bit-time.patch 298 RMD160 3278d227f1f5c5bce8b7369e9c44fd7e35ac804c SHA1 ab4f298c3c46fe9dad550009def0db8c44b13d22 SHA256 d974e14a1d8e32a0a05b211cd76d9335a066c6b85538505f1d95f25209c99057
 AUX 4.0.2-no-libelf.patch 555 RMD160 4af1c158b0a4e0124fec8347090bf5d25634fdf5 SHA1 fe33038030600e60369374b994c47e68e2bb6bd3 SHA256 56cc1f7b2d02ba230501c7c87da170fa791639cb1f36b2b0b87d8644e5372059
 AUX 4.0.2-no-pty.patch 392 RMD160 d29aec55c6b76f66a8340096f627afe2e4dca3e8 SHA1 bd1328e0dbb321397692846b5c2ac62df1885a9c SHA256 edc29bc7b7bea89c2f937ca9c95f2ce51b437e4ea042741d9f4ac6d7954178d5
@@ -17,16 +14,9 @@ AUX screen-4.0.3-crosscompile.patch 18900 RMD160 ba2eab1269713980abe56e86dee38ab
 AUX screen-4.0.3-setenv_autoconf.patch 2485 RMD160 232a7c531f2382ac4a0c618948b13610a1affe8f SHA1 a9724f7b631b2f480c93b86d8c31df94fa0ebf1c SHA256 091eb224a097bbc1b5f1b3dd8048dbb04b8c7476818a9444eae5bdb8b52bce75
 AUX screenrc 10409 RMD160 198c26126bce3f51352166d83d124606a922b396 SHA1 f0f34eb17abffb0bc0435cd33f17c2ea91b8d04f SHA256 f2fbb2de649df9d6b0afbb913d002eb7fdabec5525930515452c286dffcde072
 DIST screen-4.0.3.tar.gz 840602 RMD160 8c3903c1642ae30fd9d5706298919428552f7754 SHA1 7bc6e2f0959ffaae6f52d698c26c774e7dec3545 SHA256 78f0d5b1496084a5902586304d4a73954b2bfe33ea13edceecf21615c39e6c77
-EBUILD screen-4.0.3-r1.ebuild 5152 RMD160 2181c15ee53460967b5ec51a6424dd69ce9dbc7a SHA1 c55036daf2327a35f3304189c0d63755a7a64c53 SHA256 6d58b09ee4588f4685038c41521ce4a1329f52f614ff41b9fd87bbc51d795bbd
-EBUILD screen-4.0.3-r3.ebuild 5265 RMD160 f69073315cf1531b6fee7a2a92cc48c74b6480c7 SHA1 872bcfd4a761ce61ce94380e34e43a08cb39326f SHA256 eac58b1b09ed2152c2ff0abc166ad813c1e0b9c1693ce158efb62001cb860f8b
-EBUILD screen-4.0.3-r4.ebuild 5300 RMD160 8efb21a611ab85baad59415a6c5e103af05fc1b7 SHA1 696752aa142f014d4e4d5b342f243b8163043a31 SHA256 d014ab82a798a7ea033eae494a8f27188292eda250b7192390a9d7c1a37918c0
+EBUILD screen-4.0.3-r1.ebuild 5115 RMD160 798da7c01618201388187e3f9e90eb1001e56460 SHA1 2ddcef10fcaed5720ee5d4e40ffe7010f06a0ae2 SHA256 b08a74a92170b224dfe4a8943f640b38493ceb98312cc647327a12ff4caca13f
+EBUILD screen-4.0.3-r3.ebuild 5228 RMD160 a4f6b84448b01b77d3163a0a4ccb53b9b58316cf SHA1 c3896c1b9baf478c5076039cb4b8bad617d9fbc6 SHA256 609ef5e5461822f65a9d8a13610e5f691ed2e53b96383324fd99991dc53d2cea
+EBUILD screen-4.0.3-r4.ebuild 5263 RMD160 aa94acf514bcd81947ded0254062782c104ef306 SHA1 748832239c81096ce4f38126125485cc9e27ef9d SHA256 3e50926c34c1a3920def2f257c24a49e379067de76010ecb784a93f145c5b80d
 EBUILD screen-4.0.3.ebuild 4661 RMD160 62e154b2f975bf270e49f3d560dbe10df345babf SHA1 1e013d4ddf049a3ad06dada24e44140aad453189 SHA256 300d4bfa0a72b80f0f26b5e845cd6057d081ebedf5ebb69d1a3653a07bad37b5
-MISC ChangeLog 21892 RMD160 ce80b6bf2b047c13e370c4a754116f39b870e806 SHA1 1e7d85f61d5ad7a7e27741eee2bc57236dddd3b8 SHA256 d127fa576052e79c45a14da13fba4cdde92f642c4f799f8f9a175a8f7b0b1dea
+MISC ChangeLog 22064 RMD160 9b63242b3d068128183a92941f14d1615d6baca9 SHA1 553ab1005a2686bdfe09d72ea1a4b4995f502a0a SHA256 a9366689046aa2342a112ad77bbe093441b9e57ce48ce76e47defa597c088449
 MISC metadata.xml 1697 RMD160 e3f187509d13f8e939814733c9876407006ca0ab SHA1 53a6d55362e68c62329b6a644b5b3f74c436f272 SHA256 58279e41070c88041df5acd625067c947b9df46ca68fb3ae3cd72c268ae30c81
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk08jD4ACgkQI1lqEGTUzySouwCg3HeW4APeFV/ZEBSF/DPX+Zjw
-8B8AnRoE5nCAIm2y2k26R83J3UlDbt5m
-=P5i9
------END PGP SIGNATURE-----
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