Making fixes for bug #119703: providing a csh -> tcsh symlink, and bug #120792 to stop tcsh complaining on newest coreutils' LS_COLORS var.

Package-Manager: portage-2.0.51.22-r3

5 files changed, 143 insertions, 27 deletions

diff --git a/app-shells/tcsh/ChangeLog b/app-shells/tcsh/ChangeLog
index d137578f8e35..f96af1393986 100644
--- a/app-shells/tcsh/ChangeLog
+++ b/app-shells/tcsh/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-shells/tcsh
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.52 2006/01/02 17:35:00 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.53 2006/01/29 11:19:23 grobian Exp $
+
+*tcsh-6.14-r3 (29 Jan 2006)
+
+  29 Jan 2006; Fabian Groffen <grobian@gentoo.org>
+  +files/tcsh-6.14.00-debian-dircolors.patch, +tcsh-6.14-r3.ebuild:
+  Making fixes for bug #119703: providing a csh -> tcsh symlink, and bug #120792
+  to stop tcsh complaining on newest coreutils' LS_COLORS var.
 
   02 Jan 2006; Michael Hanselmann <hansmi@gentoo.org> tcsh-6.14-r2.ebuild:
   Stable on ppc.
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 775a3718811e..b8f4f6b8f3b5 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -1,36 +1,39 @@
-MD5 f2d9e849e038e1e079268dd287483880 ChangeLog 7580
-MD5 299cd79eb3cbc2a3caeac1c3a0309556 files/csh.cshrc_new 2810
+MD5 1b865e9c0349146f352678370c667127 tcsh-6.13-r1.ebuild 1889
+MD5 c250d0af9e636acf93f75180f66ed639 tcsh-6.14.ebuild 1234
+MD5 67a8b24a03b89fc874812fbfa5b5ff50 tcsh-6.14-r2.ebuild 2312
+MD5 89674d2fb5c06a3b4b5310a3212c81a2 tcsh-6.12-r3.ebuild 1382
+MD5 40885229543eeb01a6a91b426c29e29d tcsh-6.13.ebuild 1249
+MD5 2076c4be609061fe61b9e961b3abc6f1 tcsh-6.14-r1.ebuild 2542
+MD5 f2a558a2ce24b9c125ba6bac6a9e77dc ChangeLog 7874
+MD5 57ae68ef95b893d172203de06faf380d metadata.xml 655
+MD5 c95ff30676abf1f0143e527a4122bc48 tcsh-6.14-r3.ebuild 2246
 MD5 4869b9da87c79854e2cc97241f125853 files/csh.login_new 1482
-MD5 968abc8b96dbc3821d09bc3ee58c41a7 files/digest-tcsh-6.12-r3 121
+MD5 c6384002cda1bc11c1e31ca9513b9ad6 files/tcsh-6.12.00-setpgrp.patch 545
+MD5 16713fff7d0ccc21e1c32b250cdc44ff files/tcsh-aliases 2399
+MD5 18a0fc2cb5f14ddf82a1947cdd43ca43 files/tcsh-6.11.00-termcap.patch 406
+MD5 1b31eca34600baccddcfdf5d8bca139d files/tcsh-6.13.00-charset.patch 616
+MD5 8c5915d05b8b0c2db109c754a2bee20f files/tcsh-bindkey 3597
+MD5 a51fb6146ec2bcb7a603e5af41f6c7a2 files/tcsh_enable_kanji.diff 466
+MD5 d612d75d8d811c7932e5c214946cb7ba files/tcsh-6.13.00-dspmbyte.patch 2312
 MD5 36f0897401e2ff873f97e8eac302169d files/digest-tcsh-6.13 121
-MD5 36f0897401e2ff873f97e8eac302169d files/digest-tcsh-6.13-r1 121
 MD5 8adf2e3c68136062a1023af2832b3c7a files/digest-tcsh-6.14 121
+MD5 c2ca2472d2e81e30f23492c306c03ada files/tcsh-6.13.00-iconv.patch 11230
+MD5 dc3f6395569049b5f3a1547364be0260 files/tcsh-6.14-r2.patch 2057
+MD5 fb2384289b070107607f18091513ec74 files/tcsh-6.13.00-cstr.patch 396
+MD5 968abc8b96dbc3821d09bc3ee58c41a7 files/digest-tcsh-6.12-r3 121
+MD5 36f0897401e2ff873f97e8eac302169d files/digest-tcsh-6.13-r1 121
 MD5 64585b7284837bece8d5ba281d3bda0c files/digest-tcsh-6.14-r1 135
 MD5 1bfdccdc07585790a1a9b1ac52fd71ef files/digest-tcsh-6.14-r2 135
-MD5 18a0fc2cb5f14ddf82a1947cdd43ca43 files/tcsh-6.11.00-termcap.patch 406
+MD5 64585b7284837bece8d5ba281d3bda0c files/digest-tcsh-6.14-r3 135
+MD5 6bd69d3c815412ada4579ac8f8cc9c45 files/tcsh.config 1466
 MD5 0c7590ddc33afe8fa448f51871ad677c files/tcsh-6.12-tc.os.h-gentoo.diff 363
-MD5 c6384002cda1bc11c1e31ca9513b9ad6 files/tcsh-6.12.00-setpgrp.patch 545
+MD5 299cd79eb3cbc2a3caeac1c3a0309556 files/csh.cshrc_new 2810
 MD5 f47afb634d66cb19feac4ab83997a576 files/tcsh-6.13.00-arch.patch 1055
-MD5 1b31eca34600baccddcfdf5d8bca139d files/tcsh-6.13.00-charset.patch 616
-MD5 08dda7e3da3d8f4bc8e41d5ac7a4fbdd files/tcsh-6.13.00-closem.patch 433
-MD5 01e7c42d58599a89564127e92f85caac files/tcsh-6.13.00-codeset.patch 2448
-MD5 fb2384289b070107607f18091513ec74 files/tcsh-6.13.00-cstr.patch 396
-MD5 d612d75d8d811c7932e5c214946cb7ba files/tcsh-6.13.00-dspmbyte.patch 2312
+MD5 e717dd2122d1ae7ab9ee8ebf2c33636a files/tcsh-settings 3271
 MD5 87462113a0339dfc85377c3fbef14828 files/tcsh-6.13.00-fcntl.patch 726
+MD5 18211cacb14d3b0d1253b35bb9683d21 files/tcsh-6.14.00-debian-dircolors.patch 444
+MD5 01e7c42d58599a89564127e92f85caac files/tcsh-6.13.00-codeset.patch 2448
 MD5 4ed6009ff61cfdc1f29287d8a0e0835c files/tcsh-6.13.00-glob.patch 305
-MD5 c2ca2472d2e81e30f23492c306c03ada files/tcsh-6.13.00-iconv.patch 11230
-MD5 88ecd43a2f94275ddecaae78650745f8 files/tcsh-6.13.00-utmp.patch 1578
 MD5 8a48eb2d6512d50375df4e87e060feed files/tcsh-6.13.00-winchg.patch 1731
-MD5 dc3f6395569049b5f3a1547364be0260 files/tcsh-6.14-r2.patch 2057
-MD5 16713fff7d0ccc21e1c32b250cdc44ff files/tcsh-aliases 2399
-MD5 8c5915d05b8b0c2db109c754a2bee20f files/tcsh-bindkey 3597
-MD5 e717dd2122d1ae7ab9ee8ebf2c33636a files/tcsh-settings 3271
-MD5 6bd69d3c815412ada4579ac8f8cc9c45 files/tcsh.config 1466
-MD5 a51fb6146ec2bcb7a603e5af41f6c7a2 files/tcsh_enable_kanji.diff 466
-MD5 57ae68ef95b893d172203de06faf380d metadata.xml 655
-MD5 89674d2fb5c06a3b4b5310a3212c81a2 tcsh-6.12-r3.ebuild 1382
-MD5 1b865e9c0349146f352678370c667127 tcsh-6.13-r1.ebuild 1889
-MD5 40885229543eeb01a6a91b426c29e29d tcsh-6.13.ebuild 1249
-MD5 2076c4be609061fe61b9e961b3abc6f1 tcsh-6.14-r1.ebuild 2542
-MD5 67a8b24a03b89fc874812fbfa5b5ff50 tcsh-6.14-r2.ebuild 2312
-MD5 c250d0af9e636acf93f75180f66ed639 tcsh-6.14.ebuild 1234
+MD5 08dda7e3da3d8f4bc8e41d5ac7a4fbdd files/tcsh-6.13.00-closem.patch 433
+MD5 88ecd43a2f94275ddecaae78650745f8 files/tcsh-6.13.00-utmp.patch 1578
diff --git a/app-shells/tcsh/files/digest-tcsh-6.14-r3 b/app-shells/tcsh/files/digest-tcsh-6.14-r3
new file mode 100644
index 000000000000..077052c4f630
--- /dev/null
+++ b/app-shells/tcsh/files/digest-tcsh-6.14-r3
@@ -0,0 +1,2 @@
+MD5 353d1bb7d2741bf8de602c7b6f0efd79 tcsh-6.14.00.tar.gz 859780
+MD5 06d9a00fa7e034394bf1152f0fc3e950 tcsh-6.14-conffiles.tar.bz2 20200
diff --git a/app-shells/tcsh/files/tcsh-6.14.00-debian-dircolors.patch b/app-shells/tcsh/files/tcsh-6.14.00-debian-dircolors.patch
new file mode 100644
index 000000000000..194d478c403f
--- /dev/null
+++ b/app-shells/tcsh/files/tcsh-6.14.00-debian-dircolors.patch
@@ -0,0 +1,19 @@
+--- tcsh-6.14.00/tw.color.c
++++ tcsh-6.14.00/tw.color.c
+@@ -235,13 +235,10 @@
+ 		    if ((Char)variables[i].variable[0] == (v[0] & CHAR) &&
+ 			(Char)variables[i].variable[1] == (v[1] & CHAR))
+ 			break;
+-		if (i < nvariables) {
+-		    v += 3;
++		v += 3;
++		if (i < nvariables)
+ 		    getstring(&c, &v, &variables[i].color, ':');
+-		    continue;
+-		}
+-		else
+-		    stderror(ERR_BADCOLORVAR, v[0], v[1]);
++		continue;
+ 	    }
+ 	    break;
+ 	}
diff --git a/app-shells/tcsh/tcsh-6.14-r3.ebuild b/app-shells/tcsh/tcsh-6.14-r3.ebuild
new file mode 100644
index 000000000000..85dde9368e47
--- /dev/null
+++ b/app-shells/tcsh/tcsh-6.14-r3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.14-r3.ebuild,v 1.1 2006/01/29 11:19:23 grobian Exp $
+
+inherit eutils
+
+MY_P="${P}.00"
+DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
+HOMEPAGE="http://www.tcsh.org/"
+SRC_URI="ftp://ftp.astron.com/pub/tcsh/${MY_P}.tar.gz
+	mirror://gentoo/${P}-conffiles.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
+~sparc ~x86"
+IUSE="perl"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	perl? ( dev-lang/perl )
+	!app-shells/csh" # bug #119703
+
+S=${WORKDIR}/${MY_P}
+
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${MY_P}"-debian-dircolors.patch # bug #120792
+	epatch "${FILESDIR}/${P}"-r2.patch
+}
+
+src_compile() {
+	econf --prefix=/ || die "econf failed"
+	emake || die "compile problem"
+}
+
+src_install() {
+	make DESTDIR="${D}" install install.man || die
+
+	if use perl ; then
+		perl tcsh.man2html || die
+		dohtml tcsh.html/*.html
+	fi
+
+	insinto /etc
+	doins \
+		"${WORKDIR}"/gentoo/csh.cshrc \
+		"${WORKDIR}"/gentoo/csh.login
+
+	insinto /etc/skel
+
+	insinto /etc/profile.d
+	doins \
+		"${WORKDIR}"/gentoo/tcsh-bindkey.csh \
+		"${WORKDIR}"/gentoo/tcsh-settings.csh
+
+	dodoc FAQ Fixes NewThings Ported README WishList Y2K
+
+	docinto examples
+	dodoc \
+		"${WORKDIR}"/gentoo/tcsh-aliases \
+		"${WORKDIR}"/gentoo/tcsh-complete \
+		"${WORKDIR}"/gentoo/tcsh-gentoo_legacy \
+		"${WORKDIR}"/gentoo/tcsh.config
+
+	# bug #119703: add csh -> tcsh symlink
+	dosym /bin/tcsh /bin/csh
+}
+
+pkg_postinst() {
+
+	while read line; do einfo "${line}"; done <<EOF
+The default behaviour of tcsh has significantly changed starting from
+version 6.14-r1.  In contrast to previous ebuilds, the amount of
+customisation to the default shell's behaviour has been reduced to a
+bare minimum (a customised prompt).
+If you rely on the customisations provided by previous ebuilds, you will
+have to copy over the relevant (now commented out) parts to your own
+~/.tcshrc.  Please check all tcsh-* files in
+/usr/share/tcsh-6.14-r2/example and include their behaviour in your own
+configuration files.
+The tcsh-complete file is not any longer sourced by the default system
+scripts.
+EOF
+}