Only add csh symlink if csh is not yet there for bug #26196

Package-Manager: portage-2.0.51.22-r3

diff --git a/app-shells/tcsh/ChangeLog b/app-shells/tcsh/ChangeLog
index 0049dfa621f516fa9d991c8515db6fd5f0a54434..0611ae109abfa905d556d53ed0063f608d9cf584 100644 (file)
--- a/app-shells/tcsh/ChangeLog
+++ b/app-shells/tcsh/ChangeLog
@@ -1,6 +1,9 @@
 # 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.41 2005/09/30 19:42:05 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.42 2005/11/02 21:17:41 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
 
 *tcsh-6.14-r1 (30 Sep 2005)
 

diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 78ae7d7c10ed711002c20ec2e2d8236ec4e0c2f7..d46c6d2d7c0324787bcf22b0252ad398c9de47f0 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 efacfc119398b8f59b9ee3f65ca80c58 tcsh-6.14-r1.ebuild 2454
-MD5 17b2dbd92367c80ba3d034ac758d4267 ChangeLog 6074
+MD5 bd9aebb1bee8f08a875abde4917f6388 tcsh-6.14-r1.ebuild 2475
+MD5 675885e4fcc821386658153dbc7c78bc ChangeLog 6209
 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 7a759f65a508b3cf468397249571d9c66f487fff..afe1670e0c3d492975128c4a7e2dda83c87650c9 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.1 2005/09/30 19:42:05 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.14-r1.ebuild,v 1.2 2005/11/02 21:17:41 grobian Exp $
 
 MY_P="${P}.00"
 DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
@@ -35,7 +35,7 @@ src_install() {
                dohtml tcsh.html/*.html
        fi
 
-       dosym /bin/tcsh /bin/csh
+       [ ! -e /bin/csh ] && dosym /bin/tcsh /bin/csh
        dodoc FAQ Fixes NewThings Ported README WishList Y2K
 
        insinto /etc