Further fixes, don't create /var/run/screen, bump to EAPI4, cleanup

Package-Manager: portage-2.1.10.62/cvs/Linux x86_64

3 files changed, 19 insertions, 29 deletions

diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index 57c54e5071e8..2c3c7c2b63ca 100644
--- a/app-misc/screen/ChangeLog
+++ b/app-misc/screen/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-misc/screen
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.164 2012/05/24 04:13:41 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.165 2012/05/24 04:25:27 darkside Exp $
+
+  24 May 2012; Jeremy Olexa <darkside@gentoo.org> screen-4.0.3-r5.ebuild:
+  Further fixes, don't create /var/run/screen, bump to EAPI4, cleanup
 
 *screen-4.0.3-r5 (24 May 2012)
 
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 908db77a6aeb..772b1d50149c 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -13,6 +13,6 @@ AUX screen-4.0.3-setenv_autoconf.patch 2485 RMD160 232a7c531f2382ac4a0c618948b13
 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-r4.ebuild 5253 RMD160 6fdc9f46cf7cb88cd38244fda03fe7d10492b19c SHA1 019f81a7ed4240a15e73e4edfa7521329e572aef SHA256 18dcaa3f241a96a3347f41db7e27ce97c5321f29e0c483910b323d19c594cab5
-EBUILD screen-4.0.3-r5.ebuild 5287 RMD160 c562721357908cdb658769d9dd31a82238e76a91 SHA1 51b95ddf43b1a6eca5d8d0695fe6929796d8085f SHA256 12b19555f8785f7a6b2230515707aaac23cb4f15103b4419ec313cb63fbeace9
-MISC ChangeLog 23298 RMD160 3e811d5dea87fa787a9cd0955753321309dfa530 SHA1 a7f8d768a071be5ba8f05d12fcd0bc1891b25626 SHA256 449ae0deab7ef8314e5a901e62aba050431f49538ec338b8823878a7fce92021
+EBUILD screen-4.0.3-r5.ebuild 4666 RMD160 76f827c682ccd9fc285d3c2c910e9ee0a53a7cc1 SHA1 9f0928ee17e7b2252f791fdf2e5b4ec1387767de SHA256 2c31dd0ca0d2b3477a6dac8cf01a04f656a81b56cb7caa7c3462280c09a94644
+MISC ChangeLog 23443 RMD160 9d6c1b180a45b6dc888513504d00b8a5b16da607 SHA1 992ad837cb48e080666c8160f0a07c95e1bd80aa SHA256 b5fd3b0965710531f773ff72bb0675d47f9baba736c00165d1e1375e21d9097f
 MISC metadata.xml 1697 RMD160 e3f187509d13f8e939814733c9876407006ca0ab SHA1 53a6d55362e68c62329b6a644b5b3f74c436f272 SHA256 58279e41070c88041df5acd625067c947b9df46ca68fb3ae3cd72c268ae30c81
diff --git a/app-misc/screen/screen-4.0.3-r5.ebuild b/app-misc/screen/screen-4.0.3-r5.ebuild
index 1ae34912cb7d..f31206e08465 100644
--- a/app-misc/screen/screen-4.0.3-r5.ebuild
+++ b/app-misc/screen/screen-4.0.3-r5.ebuild
@@ -1,8 +1,8 @@
 # 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-4.0.3-r5.ebuild,v 1.1 2012/05/24 04:13:41 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r5.ebuild,v 1.2 2012/05/24 04:25:27 darkside Exp $
 
-EAPI="3"
+EAPI=4
 
 WANT_AUTOCONF="2.5"
 
@@ -119,47 +119,34 @@ src_configure() {
 }
 
 src_install() {
-	dobin screen || die "dobin failed"
-	keepdir /var/run/screen || die "keepdir failed"
+	dobin screen
 
 	if use multiuser || use prefix
 	then
-		fperms 4755 /usr/bin/screen || die "fperms failed"
+		fperms 4755 /usr/bin/screen
 	else
-		fowners root:utmp /{usr/bin,var/run}/screen \
-			|| die "fowners failed, use multiuser USE-flag instead"
-		fperms 2755 /usr/bin/screen || die "fperms failed"
+		fowners root:utmp /usr/bin/screen
+		fperms 2755 /usr/bin/screen
 	fi
 
 	insinto /usr/share/screen
-	doins terminfo/{screencap,screeninfo.src} || die "doins failed"
+	doins terminfo/{screencap,screeninfo.src}
 	insinto /usr/share/screen/utf8encodings
-	doins utf8encodings/?? || die "doins failed"
+	doins utf8encodings/??
 	insinto /etc
-	doins "${FILESDIR}"/screenrc || die "doins failed"
+	doins "${FILESDIR}"/screenrc
 
-	pamd_mimic_system screen auth || die "pamd_mimic_system failed"
+	pamd_mimic_system screen auth
 
 	dodoc \
 		README ChangeLog INSTALL TODO NEWS* patchlevel.h \
-		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps} \
-		|| die "dodoc failed"
+		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
 
-	doman doc/screen.1 || die "doman failed"
-	doinfo doc/screen.info* || die "doinfo failed"
+	doman doc/screen.1
+	doinfo doc/screen.info*
 }
 
 pkg_postinst() {
-	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
-	fi
-
 	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."