Added some more error checking. Some cosmetical rearrangements.

diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index 03ec297dc2f27d87c522e0763f54d78c3404b125..db007c8f2cba32c36814430df030bb8a0ad896d6 100644 (file)
--- a/app-misc/screen/ChangeLog
+++ b/app-misc/screen/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-misc/screen
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.77 2004/11/13 19:18:21 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.78 2004/12/05 00:55:24 swegener Exp $
+
+  05 Dec 2004; Sven Wegener <swegener@gentoo.org> screen-4.0.2.ebuild:
+  Added some more error checking. Some cosmetical rearrangements.
 
   13 Nov 2004; Sven Wegener <swegener@gentoo.org> screen-4.0.2.ebuild:
   Removed large comment section from ebuild.

diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 4502118552faca7e3255d0aeb658854de5197685..fec81e7ca4db19e17ce4131437d4d173a5e9c25d 100644 (file)
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f17ba7f031ce26b3db00b6a7a3d06682 ChangeLog 11164
+MD5 3e339dd858477685cb6b1b3622f85883 screen-4.0.2.ebuild 3432
+MD5 5245edba604db7d4d40f833654acaff0 ChangeLog 11302
 MD5 537c3754e8f6422e4f7025358173ef2b metadata.xml 1525
-MD5 d23522509f74d5825e43216421ba7550 screen-4.0.2.ebuild 3378
-MD5 bebe7dbe3fee13c1251a9bd30535b245 files/4.0.2-no-pty.patch 392
-MD5 35961ab00c29256e3f6d7a374387e327 files/digest-screen-4.0.2 64
-MD5 23cfd7dd1968780724e7b9a3cb406cc8 files/screen-4.0.1-int-overflow-fix.patch 930
-MD5 304be93a4c3b72f2f761f45194059287 files/screen-4.0.1-vsprintf.patch 480
 MD5 839ac3a5c896513a3e3c6353a6242f53 files/screen.pam.system-auth 113
+MD5 35961ab00c29256e3f6d7a374387e327 files/digest-screen-4.0.2 64
 MD5 7490aa4121a8fb1e2f900c68a8c5f65d files/screenrc 10303
+MD5 304be93a4c3b72f2f761f45194059287 files/screen-4.0.1-vsprintf.patch 480
+MD5 23cfd7dd1968780724e7b9a3cb406cc8 files/screen-4.0.1-int-overflow-fix.patch 930
+MD5 bebe7dbe3fee13c1251a9bd30535b245 files/4.0.2-no-pty.patch 392
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBll4FI1lqEGTUzyQRAiiAAKCHxOivnd+qUNRwh+7JeuUCHdP6JgCgs9Rl
-oUl/AtdKsMdLnym+NtRzfig=
-=BbAH
+iD8DBQFBslyCI1lqEGTUzyQRAvTGAJ9w2Udi2zL0eVMFLxOYOd6JJ+c2mQCdHJbm
+lQR8e8u4z/Ri3iCi7Up1LyM=
+=UUP1
 -----END PGP SIGNATURE-----

diff --git a/app-misc/screen/screen-4.0.2.ebuild b/app-misc/screen/screen-4.0.2.ebuild
index 9192434014b321c4e4dcd1e87bd60149a9df7a08..11110e464790818d4806171f18381b4deaf76166 100644 (file)
--- a/app-misc/screen/screen-4.0.2.ebuild
+++ b/app-misc/screen/screen-4.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.2.ebuild,v 1.21 2004/11/13 19:18:21 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.2.ebuild,v 1.22 2004/12/05 00:55:24 swegener Exp $
 
 inherit eutils flag-o-matic
 
@@ -35,20 +35,19 @@ src_unpack() {
 
        # Fix manpage.
        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" doc/screen.1 || \
-                       die "sed doc/screen.1 failed"
+               -e "s:/usr/local/etc/screenrc:/etc/screenrc:g" \
+               -e "s:/usr/local/screens:/var/run/screen:g" \
+               -e "s:/local/etc/screenrc:/etc/screenrc:g" \
+               -e "s:/etc/utmp:/var/run/utmp:g" \
+               -e "s:/local/screens/S-:/var/run/screen/S-:g" \
+               doc/screen.1 \
+               || die "sed doc/screen.1 failed"
 
        # configure as delivered with screen is made with autoconf-2.5
-       WANT_AUTOCONF=2.5 autoconf
+       WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
 }
 
 src_compile() {
-       local myconf
-
        addpredict "`tty`"
        addpredict "${SSH_TTY}"
 
@@ -64,7 +63,8 @@ src_compile() {
                $(use_enable pam) \
                --with-socket-dir=/var/run/screen \
                --with-sys-screenrc=/etc/screenrc \
-               --enable-rxvt_osc ${myconf} || die "econf failed"
+               --enable-rxvt_osc \
+               || die "econf failed"
 
        # Second try to fix bug 12683, this time without changing term.h
        # The last try seemed to break screen at run-time.
@@ -76,7 +76,7 @@ src_compile() {
 
 src_install() {
        dobin screen || die "dobin failed"
-       keepdir /var/run/screen
+       keepdir /var/run/screen || die "keepdir failed"
        fowners root:utmp /{usr/bin,var/run}/screen || die "fowners failed"
        fperms 2755 /usr/bin/screen || die "fperms failed"
 
@@ -89,11 +89,11 @@ src_install() {
 
        use pam && {
                insinto /etc/pam.d
-               newins ${FILESDIR}/screen.pam.system-auth screen \
-                       || die "newins failed"
+               newins ${FILESDIR}/screen.pam.system-auth screen || die "newins failed"
        }
 
-       dodoc README ChangeLog INSTALL TODO NEWS* patchlevel.h \
+       dodoc \
+               README ChangeLog INSTALL TODO NEWS* patchlevel.h \
                doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps} \
                || die "dodoc failed"
 

diff --git a/app-misc/vcp/Manifest b/app-misc/vcp/Manifest
index 67c56f55472c74584f7a6e382d735e07f3890c79..3ffb888b2057c6c488a05278a1bf3aac25ba2e1b 100644 (file)
--- a/app-misc/vcp/Manifest
+++ b/app-misc/vcp/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3c91f090a4209b886b0d056c163aac03 vcp-1.7.2.ebuild 688
-MD5 00b51ad40954e61976035aac34bdc8ff ChangeLog 779
+MD5 9a4affba315ad1693ec04c08d9b4a907 vcp-2.2.ebuild 801
+MD5 1e62993eb7a2da1387ab6a731496d6d3 vcp-1.7.2.ebuild 748
+MD5 d85efbb24d0bda0db021873f997ef7e0 ChangeLog 1080
 MD5 0c131a7201c4670302767f93643876fa metadata.xml 165
 MD5 a3303d0fa9b3bdbe6a68d08be57bdbb7 files/digest-vcp-1.7.2 60
+MD5 5f2c424b8efb0175aaa9880aadd2d69a files/digest-vcp-2.2 58
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBd83pEZCkKN40op4RAp28AKCIdKktsHlxp275cLKBVmvd/sIiuQCglGwT
-6cxT+bqAsWGsEeju08V2SmE=
-=6Z44
+iD8DBQFBsl0jEZCkKN40op4RAqt1AKCAWKM+h9JEII+x0Q1EM4qaNf6TOQCglwvb
+2GxMk11P+TfThwG1yHfG8Mg=
+=+0f5
 -----END PGP SIGNATURE-----