install patchlevel.h as doc for bug 33852; more error checking/messages; use sed -i; use more portage functions

3 files changed, 32 insertions, 27 deletions

diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index 3e72be8d9c64..b79be03bb88a 100644
--- a/app-misc/screen/ChangeLog
+++ b/app-misc/screen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/screen
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.41 2003/11/18 22:05:47 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.42 2003/11/20 21:48:29 mr_bones_ Exp $
+
+  20 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> screen-4.0.1.ebuild:
+  install patchlevel.h as doc for bug 33852; more error checking/messages; use
+  sed -i; use more portage functions
 
   18 Nov 2003; Peter Johanson <latexer@gentoo.org> screen-4.0.1.ebuild:
   Fixed chmod line to be 0775 (bug # 33672)
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 5bd59bb52143..1780f9f0ffd6 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -1,12 +1,12 @@
-MD5 50bd7c8e57cd69679ec10599627905fc screen-4.0.1.ebuild 3242
-MD5 98e27cdee175021303ef1abb3a8a9177 screen-3.9.15-r1.ebuild 3273
+MD5 677743f37550ed9c176391b1e6b099d1 ChangeLog 6549
 MD5 7d0e47c1deb94a160681be749e95bc91 screen-3.9.13-r4.ebuild 3243
-MD5 f6076dcc4936194f32634a120a643761 ChangeLog 6354
+MD5 98e27cdee175021303ef1abb3a8a9177 screen-3.9.15-r1.ebuild 3273
 MD5 96757868314ca29cc1879160c7e03ad4 screen-3.9.15.ebuild 3258
-MD5 839ac3a5c896513a3e3c6353a6242f53 files/screen.pam.system-auth 113
-MD5 dba3664c47bb3500be08c4255e57d7f5 files/digest-screen-4.0.1 64
-MD5 b374ee01709225d49842f69e02880080 files/screenrc 10311
+MD5 e885e877b3a21cd1ba13729342b7e880 screen-4.0.1.ebuild 3203
 MD5 eb8650e1be3ea32836771743d3755cb6 files/digest-screen-3.9.13-r4 64
-MD5 7a189de63cbd2403ae7b53c66e381e63 files/digest-screen-3.9.15-r1 65
 MD5 7a189de63cbd2403ae7b53c66e381e63 files/digest-screen-3.9.15 65
+MD5 7a189de63cbd2403ae7b53c66e381e63 files/digest-screen-3.9.15-r1 65
 MD5 92309a741320be95be4aeaed2f66310f files/screen.pam 91
+MD5 839ac3a5c896513a3e3c6353a6242f53 files/screen.pam.system-auth 113
+MD5 b374ee01709225d49842f69e02880080 files/screenrc 10311
+MD5 dba3664c47bb3500be08c4255e57d7f5 files/digest-screen-4.0.1 64
diff --git a/app-misc/screen/screen-4.0.1.ebuild b/app-misc/screen/screen-4.0.1.ebuild
index 52478105e0b8..8ca44548027d 100644
--- a/app-misc/screen/screen-4.0.1.ebuild
+++ b/app-misc/screen/screen-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.1.ebuild,v 1.7 2003/11/18 22:05:47 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.1.ebuild,v 1.8 2003/11/20 21:48:29 mr_bones_ Exp $
 
 inherit flag-o-matic
 
@@ -14,19 +14,20 @@ LICENSE="GPL-2"
 KEYWORDS="x86 sparc ~ppc"
 
 DEPEND=">=sys-libs/ncurses-5.2
+	>=sys-apps/sed-4
 	pam? ( >=sys-libs/pam-0.75 )"
 
 src_unpack() {
 	unpack ${A} && cd ${S}
 
 	# Fix manpage.
-	mv doc/screen.1 doc/screen.1.orig
-	sed <doc/screen.1.orig >doc/screen.1 \
+	sed -i \
 		-e "s:/usr/local/etc/screenrc:/etc/screenrc:g;
 		s:/usr/local/screens:/var/run/screen:g;
 		s:/local/etc/screenrc:/etc/screenrc:g;
 		s:/etc/utmp:/var/run/utmp:g;
-		s:/local/screens/S-:/var/run/screen/S-:g"
+		s:/local/screens/S-:/var/run/screen/S-:g" doc/screen.1 || \
+			die "sed doc/screen.1 failed"
 }
 
 src_compile() {
@@ -40,7 +41,8 @@ src_compile() {
 	append-flags "-DPTYMODE=0620 -DPTYGROUP=5"
 	use pam && myconf="--enable-pam" && append-flags "-DUSE_PAM"
 
-	econf 	--with-socket-dir=/var/run/screen \
+	econf \
+		--with-socket-dir=/var/run/screen \
 		--with-sys-screenrc=/etc/screenrc \
 		--enable-rxvt_osc ${myconf}
 
@@ -63,31 +65,30 @@ src_compile() {
 	# (16 Jan 2003 agriffis)
 	LC_ALL=POSIX make term.h || die "Failed making term.h"
 
-	emake || die "Failed to compile"
+	emake || die "emake failed"
 }
 
 src_install () {
-	dobin screen
+	dobin screen || die "dobin failed"
+	keepdir /var/run/screen
 	fperms 2755 /usr/bin/screen
-
-	dodir /var/run/screen
-	touch ${D}/var/run/screen/.keep
-
-	# can't use this cause fowners do not support multiple args.
-	# fowners root.utmp /{usr/bin,var/run}/screen
-	chown root:utmp ${D}/{usr/bin,var/run}/screen
+	fowners root:utmp /{usr/bin,var/run}/screen
 
 	insinto /usr/share/terminfo ; doins terminfo/screencap
 	insinto /usr/share/screen/utf8encodings ; doins utf8encodings/??
 	insopts -m 644 ; insinto /etc ; doins ${FILESDIR}/screenrc
 
-	use pam && { insinto /etc/pam.d ; newins ${FILESDIR}/screen.pam.system-auth screen ; }
+	use pam && {
+		insinto /etc/pam.d
+		newins ${FILESDIR}/screen.pam.system-auth screen
+	}
 
-	dodoc README ChangeLog INSTALL COPYING TODO NEWS* \
-	doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+	dodoc README ChangeLog INSTALL TODO NEWS* patchlevel.h \
+		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps} || \
+			die "dodoc failed"
 
-	doman doc/screen.1
-	doinfo doc/screen.info*
+	doman doc/screen.1 || die "doman failed"
+	doinfo doc/screen.info* || die "doinfo failed"
 }
 
 pkg_postinst() {