Cleanup/correctness action suggested by Mr_Bones_

Package-Manager: portage-2.0.51.22-r3

diff --git a/app-shells/tcsh/ChangeLog b/app-shells/tcsh/ChangeLog
index 0611ae109abfa905d556d53ed0063f608d9cf584..a8d1678fad45654fabbfe9e4bf7fb1ef149f704d 100644 (file)
--- a/app-shells/tcsh/ChangeLog
+++ b/app-shells/tcsh/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for app-shells/tcsh
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.42 2005/11/02 21:17:41 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.43 2005/11/02 21:48:01 grobian Exp $
 
   02 Nov 2005; Fabian Groffen <grobian@gentoo.org> tcsh-6.14-r1.ebuild:
   Only add csh symlink if csh is not yet there for bug #26196
+  Cleanup/correctness action suggested by Mr_Bones_:
+  - check for/add symlink to csh in pkg_postinst
+  - make RDEPEND DEPEND as the dependencies are required during compilation
+  - feed doins a set of files instead of one at a time
 
 *tcsh-6.14-r1 (30 Sep 2005)
 

diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index d46c6d2d7c0324787bcf22b0252ad398c9de47f0..7ec3cbb472b2a080407698e92b33b60859510cdd 100644 (file)
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -2,8 +2,8 @@ MD5 1b865e9c0349146f352678370c667127 tcsh-6.13-r1.ebuild 1889
 MD5 c250d0af9e636acf93f75180f66ed639 tcsh-6.14.ebuild 1234
 MD5 89674d2fb5c06a3b4b5310a3212c81a2 tcsh-6.12-r3.ebuild 1382
 MD5 40885229543eeb01a6a91b426c29e29d tcsh-6.13.ebuild 1249
-MD5 bd9aebb1bee8f08a875abde4917f6388 tcsh-6.14-r1.ebuild 2475
-MD5 675885e4fcc821386658153dbc7c78bc ChangeLog 6209
+MD5 b41e531ab230f3b1df03208221c8c3ae tcsh-6.14-r1.ebuild 2524
+MD5 d59d6555fb565176d2dadcb32a8e5d78 ChangeLog 6442
 MD5 57ae68ef95b893d172203de06faf380d metadata.xml 655
 MD5 4869b9da87c79854e2cc97241f125853 files/csh.login_new 1482
 MD5 c6384002cda1bc11c1e31ca9513b9ad6 files/tcsh-6.12.00-setpgrp.patch 545

diff --git a/app-shells/tcsh/tcsh-6.14-r1.ebuild b/app-shells/tcsh/tcsh-6.14-r1.ebuild
index afe1670e0c3d492975128c4a7e2dda83c87650c9..6552256c3d86248dc70aa06099026daa416fd12e 100644 (file)
--- a/app-shells/tcsh/tcsh-6.14-r1.ebuild
+++ b/app-shells/tcsh/tcsh-6.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.14-r1.ebuild,v 1.2 2005/11/02 21:17:41 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.14-r1.ebuild,v 1.3 2005/11/02 21:48:01 grobian Exp $
 
 MY_P="${P}.00"
 DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~mips"
 IUSE="perl"
 
-RDEPEND="virtual/libc
+DEPEND="virtual/libc
        >=sys-libs/ncurses-5.1
        perl? ( dev-lang/perl )"
 
@@ -35,25 +35,29 @@ src_install() {
                dohtml tcsh.html/*.html
        fi
 
-       [ ! -e /bin/csh ] && dosym /bin/tcsh /bin/csh
        dodoc FAQ Fixes NewThings Ported README WishList Y2K
 
        insinto /etc
-       doins ${WORKDIR}/gentoo/csh.cshrc
-       doins ${WORKDIR}/gentoo/csh.login
+       doins \
+               ${WORKDIR}/gentoo/csh.cshrc \
+               ${WORKDIR}/gentoo/csh.login
 
        insinto /etc/skel
        newins ${WORKDIR}/gentoo/tcsh.config .tcsh.config
 
        insinto /etc/profile.d
-       doins ${WORKDIR}/gentoo/tcsh-bindkey.csh
-       doins ${WORKDIR}/gentoo/tcsh-settings.csh
-       doins ${WORKDIR}/gentoo/tcsh-aliases
-       doins ${WORKDIR}/gentoo/tcsh-complete
-       doins ${WORKDIR}/gentoo/tcsh-gentoo_legacy
+       doins \
+               ${WORKDIR}/gentoo/tcsh-bindkey.csh \
+               ${WORKDIR}/gentoo/tcsh-settings.csh \
+               ${WORKDIR}/gentoo/tcsh-aliases \
+               ${WORKDIR}/gentoo/tcsh-complete \
+               ${WORKDIR}/gentoo/tcsh-gentoo_legacy
 }
 
 pkg_postinst() {
+       # add csh -> tcsh symlink only if csh is not yet there
+       [ ! -e /bin/csh ] && dosym /bin/tcsh /bin/csh
+
        while read line; do einfo "${line}"; done <<EOF
 The default behaviour of tcsh has significantly changed starting from
 this ebuild.  In contrast to previous ebuilds, the amount of