6.12 no longer on SRC_URI. version bumped to 6.13. Old version cleanout. Added myself to maintainer for some silly reason. Removed big patch before spanky found out. Added another useless sentence cause the commit message wasn't long enough.

14 files changed, 41 insertions, 1091 deletions

diff --git a/app-shells/tcsh/ChangeLog b/app-shells/tcsh/ChangeLog
index 68eb3ca95b39..b3fc73fbc233 100644
--- a/app-shells/tcsh/ChangeLog
+++ b/app-shells/tcsh/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-shells/tcsh
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.26 2004/09/25 06:14:58 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.27 2004/11/22 11:48:16 dragonheart Exp $
+
+*tcsh-6.13 (22 Nov 2004)
+
+  22 Nov 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
+  -files/csh.cshrc, -files/csh.login, -files/tcsh-6.10-tc.os.h-gentoo.diff,
+  -files/tcsh-6.11-tc.os.h-gentoo.diff, -files/tcsh-complete,
+  -tcsh-6.11.ebuild, -tcsh-6.12-r2.ebuild, tcsh-6.12-r3.ebuild,
+  +tcsh-6.13.ebuild:
+  6.12 no longer on SRC_URI. version bumped to 6.13. Verfied patches are
+  included. Bug #71968 by Michael Labhard <m.labhard@comcast.net> refers. Old
+  file cleanout too.
 
   25 Sep 2004; Joshua Kinard <kumba@gentoo.org> tcsh-6.12-r3.ebuild:
   Marked stable on mips.
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 17c97f29b4ec..899f1327bde4 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -1,7 +1,9 @@
 MD5 430240fa91b274820a5a855553e5a02f ChangeLog 3198
 MD5 945bf1a277f1bae9a599ed817e2a02fc tcsh-6.11.ebuild 1059
-MD5 70715d03ed2ffe11f4e693b81b09100d tcsh-6.12-r2.ebuild 1348
-MD5 79da08780bdd074c31676fbf5f0694a9 tcsh-6.12-r3.ebuild 1363
+MD5 54d41bccc4270bc826eb74c91377f953 tcsh-6.12-r2.ebuild 1334
+MD5 19e32f8d10531fb0f23b4a495e9b760a tcsh-6.12-r3.ebuild 1349
+MD5 79da08780bdd074c31676fbf5f0694a9 tcsh-6.13.ebuild 1363
+MD5 e059ec7e9bbe70354b6ee766516cee35 files/digest-tcsh-6.13 64
 MD5 548264e16c7c848079c42fe008b0f7e4 files/csh.cshrc 311
 MD5 299cd79eb3cbc2a3caeac1c3a0309556 files/csh.cshrc_new 2810
 MD5 98ca83148bd1d9bc6774c52d212ee71f files/csh.login 190
diff --git a/app-shells/tcsh/files/csh.cshrc b/app-shells/tcsh/files/csh.cshrc
deleted file mode 100644
index e45a3b02f243..000000000000
--- a/app-shells/tcsh/files/csh.cshrc
+++ /dev/null
@@ -1,16 +0,0 @@
-# system-wide csh.cshrc
-
-if (-e /etc/csh.env) then
-	source /etc/csh.env
-endif
-
-if ($USER == "root") then
-	setenv PATH "/bin:/sbin:/usr/bin:/usr/sbin:$ROOTPATH"
-	#077 would be more secure, but 022 is generally quite realistic
-	umask 022
-else
-	set path = (/bin /usr/bin $path)
-	umask 022
-endif
-
-unsetenv ROOTPATH
diff --git a/app-shells/tcsh/files/csh.login b/app-shells/tcsh/files/csh.login
deleted file mode 100644
index 8b4b17750138..000000000000
--- a/app-shells/tcsh/files/csh.login
+++ /dev/null
@@ -1,11 +0,0 @@
-alias d 'ls --color'
-alias ls 'ls --color=auto'
-alias ll 'ls --color -l'
-
-if ($USER == "root") then
-	set prompt = "%m %c # "
-else
-	set prompt = "%m %c $ "
-endif
-
-setenv EDITOR /usr/bin/nano
diff --git a/app-shells/tcsh/files/digest-tcsh-6.11 b/app-shells/tcsh/files/digest-tcsh-6.11
deleted file mode 100644
index ef659cfc4cec..000000000000
--- a/app-shells/tcsh/files/digest-tcsh-6.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8c04d53162a896b53d751bfa041cdeb6 tcsh-6.11.tar.gz 716863
diff --git a/app-shells/tcsh/files/digest-tcsh-6.12-r2 b/app-shells/tcsh/files/digest-tcsh-6.12-r2
deleted file mode 100644
index 7733a6633626..000000000000
--- a/app-shells/tcsh/files/digest-tcsh-6.12-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dccf1e673103594546fe74c313932428 tcsh-6.12.00.tar.gz 824297
diff --git a/app-shells/tcsh/files/digest-tcsh-6.13 b/app-shells/tcsh/files/digest-tcsh-6.13
new file mode 100644
index 000000000000..89521a6a9821
--- /dev/null
+++ b/app-shells/tcsh/files/digest-tcsh-6.13
@@ -0,0 +1 @@
+MD5 11c0c9c9148652dc01270c4880d1cc6e tcsh-6.13.00.tar.gz 844755
diff --git a/app-shells/tcsh/files/tcsh-6.10-tc.os.h-gentoo.diff b/app-shells/tcsh/files/tcsh-6.10-tc.os.h-gentoo.diff
deleted file mode 100644
index b7faeaf7424a..000000000000
--- a/app-shells/tcsh/files/tcsh-6.10-tc.os.h-gentoo.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- tc.os.h~	Sat Nov 11 23:03:39 2000
-+++ tc.os.h	Fri Apr 13 15:32:16 2001
-@@ -88,6 +88,7 @@
- 
- #if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) || SYSVREL >= 4  || defined(_MINIX_VMD)
- # undef NEEDstrerror
-+# include <time.h>
- #endif /* linux || __NetBSD__ || __FreeBSD__ || SYSVREL >= 4 || _MINIX_VMD */
- 
- #if !defined(pyr) && !defined(sinix)
diff --git a/app-shells/tcsh/files/tcsh-6.11-tc.os.h-gentoo.diff b/app-shells/tcsh/files/tcsh-6.11-tc.os.h-gentoo.diff
deleted file mode 100644
index b7faeaf7424a..000000000000
--- a/app-shells/tcsh/files/tcsh-6.11-tc.os.h-gentoo.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- tc.os.h~	Sat Nov 11 23:03:39 2000
-+++ tc.os.h	Fri Apr 13 15:32:16 2001
-@@ -88,6 +88,7 @@
- 
- #if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) || SYSVREL >= 4  || defined(_MINIX_VMD)
- # undef NEEDstrerror
-+# include <time.h>
- #endif /* linux || __NetBSD__ || __FreeBSD__ || SYSVREL >= 4 || _MINIX_VMD */
- 
- #if !defined(pyr) && !defined(sinix)
diff --git a/app-shells/tcsh/files/tcsh-complete b/app-shells/tcsh/files/tcsh-complete
deleted file mode 100644
index 9efc63ff9c23..000000000000
--- a/app-shells/tcsh/files/tcsh-complete
+++ /dev/null
@@ -1,978 +0,0 @@
-#############################################################################
-##
-## Gentoo system tcsh scripts
-##
-## $Id: tcsh-complete,v 1.4 2003/12/22 15:31:12 gmsoft Exp $
-##
-## Based on the TCSH complete.tcsh script, with changed from the TCSHRC
-## package (http://tcshrc.sourceforge.net)
-##
-## Please do not change this file!  Place your personal customizations in
-## ~/.tcshrc and system-wide customizations in /etc/profiles.d/local.csh
-##
-## 2003-01-13  --  Alain Penders (alain@gentoo.org)
-##     Renamed to /etc/profile.d/tcsh-complete
-##
-
-if (! $?prompt) goto end
-
-if ($?tcsh) then
-    set _rev=${tcsh:r}
-    set _rev=${_rev:r}
-    if ($_rev < 6) goto end
-    unset _rev
-endif
-
-    set noglob
-    if ( ! $?hosts ) set hosts
-    foreach f ($HOME/.hosts $HOME/.tcshrc.hosts /etc/profile.d/complete.hosts $HOME/.rhosts /etc/hosts.equiv)
-        if ( -r $f ) then
-	    set hosts = ($hosts `grep -v "+" $f | grep -E -v "^#" | tr -s " " "	" | cut -f 1`)
-	endif
-    end
-    if ( -r $HOME/.netrc ) then
-	set f=`awk '/machine/ { print $2 }' < $HOME/.netrc` >& /dev/null
-	set hosts=($hosts $f)
-    endif
-    if ( -r $HOME/.ssh/known_hosts ) then
-	set f=`cat $HOME/.ssh/known_hosts | cut -f 1 -d \ ` >& /dev/null
-	set hosts=($hosts $f)
-    endif
-    unset f
-    if ( ! $?hosts ) then
-	set hosts=(hyperion.ee.cornell.edu phaeton.ee.cornell.edu \
-		   guillemin.ee.cornell.edu vangogh.cs.berkeley.edu \
-		   ftp.uu.net prep.ai.mit.edu export.lcs.mit.edu \
-		   labrea.stanford.edu sumex-aim.stanford.edu \
-		   tut.cis.ohio-state.edu)
-    endif
-
-    complete ywho  	n/*/\$hosts/	# argument from list in $hosts
-    complete rsh	p/1/\$hosts/ c/-/"(l n)"/   n/-l/u/ N/-l/c/ n/-/c/ p/2/c/ p/*/f/
-    complete ssh	p/1/\$hosts/ c/-/"(l n)"/   n/-l/u/ N/-l/c/ n/-/c/ p/2/c/ p/*/f/
-    complete xrsh	p/1/\$hosts/ c/-/"(l 8 e)"/ n/-l/u/ N/-l/c/ n/-/c/ p/2/c/ p/*/f/
-    complete rlogin 	p/1/\$hosts/ c/-/"(l 8 e)"/ n/-l/u/
-    complete telnet 	p/1/\$hosts/ p/2/x:'<port>'/ n/*/n/
-
-    complete cd  	p/1/d/		# Directories only
-    complete chdir 	p/1/d/
-    complete pushd 	p/1/d/
-    complete popd 	p/1/d/
-    complete pu 	p/1/d/
-    complete po 	p/1/d/
-    complete complete 	p/1/X/		# Completions only
-    complete uncomplete	n/*/X/
-    complete exec 	p/1/c/		# Commands only
-    complete trace 	p/1/c/
-    complete strace 	p/1/c/
-    complete which	n/*/c/
-    complete where	n/*/c/
-    complete skill 	p/1/c/
-    complete dde	p/1/c/ 
-    complete adb	c/-I/d/ n/-/c/ N/-/"(core)"/ p/1/c/ p/2/"(core)"/
-    complete sdb	p/1/c/
-    complete dbx	c/-I/d/ n/-/c/ N/-/"(core)"/ p/1/c/ p/2/"(core)"/
-    complete xdb	p/1/c/
-    complete gdb	n/-d/d/ n/*/c/
-    complete ups	p/1/c/
-    complete set	'c/*=/f/' 'p/1/s/=' 'n/=/f/'
-    complete unset	n/*/s/
-    complete alias 	p/1/a/		# only aliases are valid
-    complete unalias	n/*/a/
-    complete xdvi 	n/*/f:*.dvi/	# Only files that match *.dvi
-    complete dvips 	n/*/f:*.dvi/
-    complete tex 	n/*/f:*.tex/	# Only files that match *.tex
-    complete latex 	n/*/f:*.{tex,ltx}/
-    complete su		c/--/"(login fast preserve-environment command shell \
-			help version)"/	c/-/"(f l m p c s -)"/ \
-			n/{-c,--command}/c/ \
-			n@{-s,--shell}@'`cat /etc/shells`'@ n/*/u/
-    complete cc 	c/-[IL]/d/ \
-              c@-l@'`\ls -1 /usr/lib/lib*.a | sed s%^.\*/lib%%\;s%\\.a\$%%`'@ \
-			c/-/"(o l c g L I D U)"/ n/*/f:*.[coasi]/
-    complete acc 	c/-[IL]/d/ \
-       c@-l@'`\ls -1 /usr/lang/SC1.0/lib*.a | sed s%^.\*/lib%%\;s%\\.a\$%%`'@ \
-			c/-/"(o l c g L I D U)"/ n/*/f:*.[coasi]/
-    complete gcc 	c/-[IL]/d/ \
-		 	c/-f/"(caller-saves cse-follow-jumps delayed-branch \
-		               elide-constructors expensive-optimizations \
-			       float-store force-addr force-mem inline \
-			       inline-functions keep-inline-functions \
-			       memoize-lookups no-default-inline \
-			       no-defer-pop no-function-cse omit-frame-pointer \
-			       rerun-cse-after-loop schedule-insns \
-			       schedule-insns2 strength-reduce \
-			       thread-jumps unroll-all-loops \
-			       unroll-loops syntax-only all-virtual \
-			       cond-mismatch dollars-in-identifiers \
-			       enum-int-equiv no-asm no-builtin \
-			       no-strict-prototype signed-bitfields \
-			       signed-char this-is-variable unsigned-bitfields \
-			       unsigned-char writable-strings call-saved-reg \
-			       call-used-reg fixed-reg no-common \
-			       no-gnu-binutils nonnull-objects \
-			       pcc-struct-return pic PIC shared-data \
-			       short-enums short-double volatile)"/ \
-		 	c/-W/"(all aggregate-return cast-align cast-qual \
-		      	       comment conversion enum-clash error format \
-		      	       id-clash-len implicit missing-prototypes \
-		      	       no-parentheses pointer-arith return-type shadow \
-		      	       strict-prototypes switch uninitialized unused \
-		      	       write-strings)"/ \
-		 	c/-m/"(68000 68020 68881 bitfield fpa nobitfield rtd \
-			       short c68000 c68020 soft-float g gnu unix fpu \
-			       no-epilogue)"/ \
-		 	c/-d/"(D M N)"/ \
-		 	c/-/"(f W vspec v vpath ansi traditional \
-			      traditional-cpp trigraphs pedantic x o l c g L \
-			      I D U O O2 C E H B b V M MD MM i dynamic \
-			      nodtdlib static nostdinc undef)"/ \
-		 	c/-l/f:*.a/ \
-		 	n/*/f:*.{c,C,cc,o,a,s,i}/
-    complete g++ 	n/*/f:*.{C,cc,o,s,i}/
-    complete CC 	n/*/f:*.{C,cc,cpp,o,s,i}/
-    complete rm 	c/--/"(directory force interactive verbose \
-			recursive help version)"/ c/-/"(d f i v r R -)"/ \
-			n/*/f:^*.{c,cc,C,h,in}/	# Protect precious files
-    complete vi 	n/*/f:^*.[oa]/
-    complete bindkey    N/-a/b/ N/-c/c/ n/-[ascr]/'x:<key-sequence>'/ \
-			n/-[svedlr]/n/ c/-[vedl]/n/ c/-/"(a s k c v e d l r)"/\
-			n/-k/"(left right up down)"/ p/2-/b/ \
-			p/1/'x:<key-sequence or option>'/
-
-    complete find 	n/-fstype/"(nfs 4.2)"/ n/-name/f/ \
-		  	n/-type/"(c b d f p l s)"/ n/-user/u/ n/-group/g/ \
-			n/-exec/c/ n/-ok/c/ n/-cpio/f/ n/-ncpio/f/ n/-newer/f/ \
-		  	c/-/"(fstype name perm prune type user nouser \
-		  	     group nogroup size inum atime mtime ctime exec \
-			     ok print ls cpio ncpio newer xdev depth \
-			     daystart follow maxdepth mindepth noleaf version \
-			     anewer cnewer amin cmin mmin true false uid gid \
-			     ilname iname ipath iregex links lname empty path \
-			     regex used xtype fprint fprint0 fprintf \
-			     print0 printf not a and o or)"/ \
-			     n/*/d/
-
-    complete -%*	c/%/j/			# fill in the jobs builtin
-    complete {fg,bg,stop}	c/%/j/ p/1/"(%)"//
-
-    complete limit	c/-/"(h)"/ n/*/l/
-    complete unlimit	c/-/"(h)"/ n/*/l/
-
-    complete -co*	p/0/"(compress)"/	# make compress completion
-						# not ambiguous
-## Added .gz extention.
-    complete zcat	n/*/f:*.{Z,gz}/
-
-    complete finger	c/*@/\$hosts/ n/*/u/@ 
-    complete ping	p/1/\$hosts/
-    complete traceroute	p/1/\$hosts/
-
-    complete {talk,ntalk,phone}	p/1/'`users | tr " " "\012" | uniq`'/ \
-		n/*/\`who\ \|\ grep\ \$:1\ \|\ awk\ \'\{\ print\ \$2\ \}\'\`/
-
-    complete ftp	c/-/"(d i g n v)"/ n/-/\$hosts/ p/1/\$hosts/ n/*/n/
-
-    # this one is simple...
-    #complete rcp c/*:/f/ C@[./\$~]*@f@ n/*/\$hosts/:
-    # From Michael Schroeder <mlschroe@immd4.informatik.uni-erlangen.de> 
-    # This one will rsh to the file to fetch the list of files!
-    complete rcp 'c%*@*:%`set q=$:-0;set q="$q:s/@/ /";set q="$q:s/:/ /";set q=($q " ");rsh $q[2] -l $q[1] ls -dp $q[3]\*`%' 'c%*:%`set q=$:-0;set q="$q:s/:/ /";set q=($q " ");rsh $q[1] ls -dp $q[2]\*`%' 'c%*@%$hosts%:' 'C@[./$~]*@f@'  'n/*/$hosts/:'
-
-    complete dd c/--/"(help version)"/ c/[io]f=/f/ \
-		c/conv=*,/"(ascii ebcdic ibm block unblock \
-			    lcase notrunc ucase swab noerror sync)"/,\
-		c/conv=/"(ascii ebcdic ibm block unblock \
-			  lcase notrunc ucase swab noerror sync)"/,\
-	        c/*=/x:'<number>'/ \
-		n/*/"(if of conv ibs obs bs cbs files skip file seek count)"/=
-
-    complete nslookup   p/1/x:'<host>'/ p/2/\$hosts/
-
-    complete ar c/[dmpqrtx]/"(c l o u v a b i)"/ p/1/"(d m p q r t x)"// \
-		p/2/f:*.a/ p/*/f:*.o/
-
-    # these should be merged with the MH completion hacks below - jgotts
-    complete {sprev,snext} \
-		c@+@F:$HOME/Mail/@
-
-    # these and interrupt handling from Jaap Vermeulen <jaap@sequent.com>
-    complete {rexec,rxexec,rxterm,rmterm} \
-			'p/1/$hosts/' 'c/-/(l L E)/' 'n/-l/u/' 'n/-L/f/' \
-			'n/-E/e/' 'n/*/c/'
-    complete kill	'c/-/S/' 'c/%/j/' \
-			'n/*/`ps -u $LOGNAME | awk '"'"'{print $1}'"'"'`/'
-
-    # these from Marc Horowitz <marc@cam.ov.com>
-    complete attach 'n/-mountpoint/d/' 'n/-m/d/' 'n/-type/(afs nfs rvd ufs)/' \
-		    'n/-t/(afs nfs rvd ufs)/' 'n/-user/u/' 'n/-U/u/' \
-		    'c/-/(verbose quiet force printpath lookup debug map \
-			  nomap remap zephyr nozephyr readonly write \
-			  mountpoint noexplicit explicit type mountoptions \
-			  nosetuid setuid override skipfsck lock user host)/' \
-		    'n/-e/f/' 'n/*/()/'
-    complete hesinfo	'p/1/u/' \
-			'p/2/(passwd group uid grplist pcap pobox cluster \
-			      filsys sloc service)/'
-
-    # these from E. Jay Berkenbilt <ejb@ERA.COM>
-    # = isn't always followed by a filename or a path anymore - jgotts
-    complete ./configure 'c/--*=/f/' 'c/--{cache-file,prefix,exec-prefix,\
-    				bindir,sbindir,libexecdir,datadir,\
-				sysconfdir,sharedstatedir,localstatedir,\
-				libdir,includedir,oldincludedir,infodir,\
-				mandir,srcdir}/(=)//' \
-			 'c/--/(cache-file verbose prefix exec-prefix bindir \
-			 	sbindir libexecdir datadir sysconfdir \
-				sharedstatedir localstatedir libdir \
-				includedir oldincludedir infodir mandir \
-				srcdir)//'
-    complete gs 'c/-sDEVICE=/(x11 cdjmono cdj550 epson eps9high epsonc \
-			      dfaxhigh dfaxlow laserjet ljet4 sparc pbm \
-			      pbmraw pgm pgmraw ppm ppmraw bit)/' \
-		'c/-sOutputFile=/f/' 'c/-s/(DEVICE OutputFile)/=' \
-		'c/-d/(NODISPLAY NOPLATFONTS NOPAUSE)/' 'n/*/f/'
-    complete perl	'n/-S/c/'
-    complete printenv	'n/*/e/'
-    complete sccs	p/1/"(admin cdc check clean comb deledit delget \
-			delta diffs edit enter fix get help info \
-			print prs prt rmdel sccsdiff tell unedit \
-			unget val what)"/
-    complete setenv	'p/1/e/' 'c/*:/f/'
-
-    # these and method of setting hosts from Kimmo Suominen <kim@tac.nyc.ny.us>
-    if ( -f $HOME/.mh_profile && -x "`which folders`" ) then 
-
-    if ( ! $?FOLDERS ) setenv FOLDERS "`folders -fast -recurse`"
-    if ( ! $?MHA )     setenv MHA     "`ali | sed -e '/^ /d' -e 's/:.*//'`"
-
-    set folders = ( $FOLDERS )
-    set mha = ( $MHA )
-
-    complete ali \
-        'c/-/(alias nolist list nonormalize normalize nouser user help)/' \
-        'n,-alias,f,'
-
-    complete anno \
-        'c/-/(component noinplace inplace nodate date text help)/' \
-        'c,+,$folders,'  \
-        'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,'
-
-    complete burst \
-        'c/-/(noinplace inplace noquiet quiet noverbose verbose help)/' \
-        'c,+,$folders,'  \
-        'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,'
-
-    complete comp \
-        'c/-/(draftfolder draftmessage nodraftfolder editor noedit file form nouse use whatnowproc nowhatnowproc help)/' \
-        'c,+,$folders,'  \
-        'n,-whatnowproc,c,'  \
-        'n,-file,f,'\
-        'n,-form,f,'\
-        'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,'
-
-    complete dist \
-        'c/-/(noannotate annotate draftfolder draftmessage nodraftfolder editor noedit form noinplace inplace whatnowproc nowhatnowproc help)/' \
-        'c,+,$folders,'  \
-        'n,-whatnowproc,c,'  \
-        'n,-form,f,'\
-        'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,'
-
-    complete folder \
-        'c/-/(all nofast fast noheader header nopack pack noverbose verbose norecurse recurse nototal total noprint print nolist list push pop help)/' \
-        'c,+,$folders,'  \
-        'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,'
-
-    complete folders \
-        'c/-/(all nofast fast noheader header nopack pack noverbose verbose norecurse recurse nototal total noprint print nolist list push pop help)/' \
-        'c,+,$folders,'  \
-        'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,'
-
-    complete forw \
-        'c/-/(noannotate annotate draftfolder draftmessage nodraftfolder editor noedit filter form noformat format noinplace inplace digest issue volume whatnowproc nowhatnowproc help)/' \
-        'c,+,$folders,'  \
-        'n,-whatnowproc,c,'  \
-        'n,-filter,f,'\
-        'n,-form,f,'\
-        'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,'
-
-    complete inc \
-        'c/-/(audit file noaudit nochangecur changecur file form format nosilent silent notruncate truncate width help)/' \
-        'c,+,$folders,'  \
-        'n,-audit,f,'\
-        'n,-form,f,'
-
-    complete mark \
-        'c/-/(add delete list sequence nopublic public nozero zero help)/' \
-        'c,+,$folders,'  \
-        'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,'
-
-    complete mhmail \
-        'c/-/(body cc from subject help)/' \
-        'n,-cc,$mha,'  \
-        'n,-from,$mha,'  \
-        'n/*/$mha/'
-
-    complete mhpath \
-        'c/-/(help)/' \
-        'c,+,$folders,'  \
-        'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,'
-
-    complete msgchk \
-        'c/-/(nodate date nonotify notify help)/' 
-
-    complete msh \
-        'c/-/(prompt noscan scan notopcur topcur help)/' 
-
-    complete next \
-        'c/-/(draft form moreproc nomoreproc length width showproc noshowproc header noheader help)/' \
-        'c,+,$folders,'  \
-        'n,-moreproc,c,'  \
-        'n,-showproc,c,'  \
-        'n,-form,f,'
-
-    complete packf \
-        'c/-/(file help)/' \
-        'c,+,$folders,'  \
-        'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,'
-
-    complete pick \
-        'c/-/(and or not lbrace rbrace cc date from search subject to othercomponent after before datefield sequence nopublic public nozero zero nolist list help)/' \
-        'c,+,$folders,'  \
-        'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,'
-
-    complete prev \
-        'c/-/(draft form moreproc nomoreproc length width showproc noshowproc header noheader help)/' \
-        'c,+,$folders,'  \
-        'n,-moreproc,c,'  \
-        'n,-showproc,c,'  \
-        'n,-form,f,'
-
-    complete prompter \
-        'c/-/(erase kill noprepend prepend norapid rapid nodoteof doteof help)/' 
-
-    complete refile \
-        'c/-/(draft nolink link nopreserve preserve src file help)/' \
-        'c,+,$folders,'  \
-        'n,-file,f,'\
-        'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,'
-
-    complete rmf \
-        'c/-/(nointeractive interactive help)/' \
-        'c,+,$folders,'  
-
-    complete rmm \
-        'c/-/(help)/' \
-        'c,+,$folders,'  \
-        'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,'
-
-    complete scan \
-        'c/-/(noclear clear form format noheader header width noreverse reverse file help)/' \
-        'c,+,$folders,'  \
-        'n,-form,f,'\
-        'n,-file,f,'\
-        'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,'
-
-    complete send \
-        'c/-/(alias draft draftfolder draftmessage nodraftfolder filter nofilter noformat format noforward forward nomsgid msgid nopush push noverbose verbose nowatch watch width help)/' \
-        'n,-alias,f,'\
-        'n,-filter,f,'
-
-    complete show \
-        'c/-/(draft form moreproc nomoreproc length width showproc noshowproc header noheader help)/' \
-        'c,+,$folders,'  \
-        'n,-moreproc,c,'  \
-        'n,-showproc,c,'  \
-        'n,-form,f,'\
-        'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,'
-
-    complete sortm \
-        'c/-/(datefield textfield notextfield limit nolimit noverbose verbose help)/' \
-        'c,+,$folders,'  \
-        'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,'
-
-    complete vmh \
-        'c/-/(prompt vmhproc novmhproc help)/' \
-        'n,-vmhproc,c,'  
-
-    complete whatnow \
-        'c/-/(draftfolder draftmessage nodraftfolder editor noedit prompt help)/' 
-
-    complete whom \
-        'c/-/(alias nocheck check draft draftfolder draftmessage nodraftfolder help)/' \
-        'n,-alias,f,'
-
-    complete plum \
-        'c/-/()/' \
-        'c,+,$folders,'  \
-        'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,'
-
-    complete mail \
-        'c/-/()/' \
-        'n/*/$mha/'
-
-    endif
-
-    #from Dan Nicolaescu <dann@ics.uci.edu>
-    if ( $?MODULESHOME ) then
-	alias Compl_module 'find ${MODULEPATH:as/:/ /} -name .version -o -name .modulea\* -prune -o -print  | sed `echo "-e s@${MODULEPATH:as%:%/\*@@g -e s@%}/\*@@g"`'
-	complete module 'p%1%(add load unload switch display avail use unuse update purge list clear help initadd initrm initswitch initlist initclear)%' \
-	'n%{unl*,sw*,inits*}%`echo "$LOADEDMODULES:as/:/ /"`%' \
-	'n%{lo*,di*,he*,inita*,initr*}%`eval Compl_module`%' \
-	'N%{sw*,initsw*}%`eval Compl_module`%' 'C%-%(-append)%' 'n%{use,unu*,av*}%d%' 'n%-append%d%' \
-	'C%[^-]*%`eval Compl_module`%'
-    endif
-
-    # from George Cox
-    complete acroread	'p/*/f:*.{pdf,PDF}/'
-    complete apachectl  'c/*/(start stop restart fullstatus status graceful \
-			configtest help)/'
-    complete appletviewer	'p/*/f:*.class/'
-    complete bison	'c/--/(debug defines file-prefix= fixed-output-files \
-			help name-prefix= no-lines no-parser output= \
-			token-table verbose version yacc)/' \
-			'c/-/(b d h k l n o p t v y V)/' 'n/-b/f/' 'n/-o/f/' \
-			'n/-p/f/'
-    complete bunzip2	'p/*/f:*.bz2/' 
-    complete bzip2	'n/-9/f:^*.bz2/' 'n/-d/f:*.bz2/'
-    complete c++	'p/*/f:*.{c++,cxx,c,cc,C,cpp}/'
-    complete co		'p@1@`\ls -1a RCS | sed -e "s/\(.*\),v/\1/"`@'
-    complete crontab	'n/-u/u/'
-    complete camcontrol	'p/1/(cmd debug defects devlist eject inquiry \
-			modepage negotiate periphlist rescan reset start \
-			stop tags tur)/'
-    complete ctlinnd	'p/1/(addhist allow begin cancel changegroup \
-			checkfile drop feedinfo flush flushlogs go hangup \
-			logmode mode name newgroup param pause readers refile \
-			reject reload renumber reserve rmgroup send shutdown \
-			kill throttle trace xabort xexec)/'
-    complete cvs	'c/--/(help help-commands help-synonyms)/' \
-			'p/1/(add admin annotate checkout commit diff \
-			edit editors export history import init log login \
-			logout rdiff release remove rtag status tag unedit \
-			update watch watchers)/' 'n/-a/(edit unedit commit \
-			all none)/' 'n/watch/(on off add remove)/'
-    complete cxx	'p/*/f:*.{c++,cxx,c,cc,C,cpp}/'
-    complete detex	'p/*/f:*.tex/'
-    complete edquota    'n/*/u/'
-    complete exec	'p/1/c/'
-    complete ghostview	'p/*/f:*.ps/'
-    complete gv		'p/*/f:*.ps/'
-    complete ifconfig	'p@1@`ifconfig -l`@' 'n/*/(range phase link netmask \
-			mtu vlandev vlan metric mediaopt down delete \
-			broadcast arp debug)/'
-    complete imake	'c/-I/d/'
-    complete ipfw 	'p/1/(flush add delete list show zero)/' \
-			'n/add/(allow permit accept pass deny drop reject \
-			reset count skipto num divert port tee port)/'
-    complete javac	'p/*/f:*.java/'
-    complete ldif2ldbm	'n/-i/f:*.ldif/'
-    complete libtool	'c/--mode=/(compile execute finish install link \
-			uninstall)/' 'c/--/(config debug dry-run features \
-			finish help quiet silent version mode=)/'
-    complete libtoolize	'c/--/(automake copy debug dry-run force help ltdl \
-			ltdl-tar version)/'
-    complete links	'c/-/(assume-codepage async-dns download-dir \
-			format-cache-size ftp-proxy help http-proxy \
-			max-connections max-connections-to-host \
-			memory-cache-size receive-timeout retries \
-			unrestartable-receive-timeout version)/'
-    complete natd	c/-/'(alias_address config deny_incoming dynamic \
-			inport interface log log_denied log_facility \
-			outport outport port pptpalias proxy_only \
-			proxy_rule redirect_address redirect_port \
-			reverse same_ports unregistered_only use_sockets \
-			verbose)'/ 'n@-interface@`ifconfig -l`@'
-    complete netstat	'n@-I@`ifconfig -l`@'
-    complete objdump	'c/--/(adjust-vma= all-headers architecture= \
-			archive-headers debugging demangle disassemble \
-			disassemble-all disassemble-zeroes dynamic-reloc \
-			dynamic-syms endian= file-headers full-contents \
-			headers help info line-numbers no-show-raw-insn \
-			prefix-addresses private-headers reloc section-headers \
-			section=source stabs start-address= stop-address= \
-			syms target= version wide)/' \
-			'c/-/(a h i f C d D p r R t T x s S l w)/'
-    complete xmodmap	'c/-/(display help grammar verbose quiet n e pm pk \
-			pke pp)/'
-    complete lynx	'c/-/(accept_all_cookies anonymous assume_charset= \
-			assume_local_charset= assume_unrec_charset= auth= base \
-			book buried_news cache= case cfg= child cookie_file= \
-			cookies core crawl debug_partial display= dump editor= \
-			emacskeys enable_scrollback error_file= force_html \
-			force_secure forms_options from ftp get_data head help \
-			hiddenlinks= historical homepage= image_links index= \
-			ismap link= localhost mime_header minimal \
-			newschunksize= newsmaxchunk= nobrowse nocc nocolor \
-			nofilereferer nolist nolog nopause noprint noredir \
-			noreferer nostatus number_links partial partial_thres \
-			pauth= popup post_data preparsed print pseudo_inlines \
-			raw realm reload restrictions= resubmit_posts rlogin \
-			selective show_cursor soft_dquotes source stack_dump \
-			startfile_ok tagsoup telnet term= tlog trace traversal \
-			underscore useragent= validate verbose version vikeys \
-			width=)/' 'c/(http|ftp)/$URLS/' 'p/*/f:*.{html,htm,shtml}/'
-    complete gmake	'c/{--directory=,--include-dir=}/d/' \
-			'c/{--assume-new,--assume-old,--makefile,--new-file,--what-if,--file}/f/' \
-			'c/--/(assume-new= assume-old= debug directory= \
-			dry-run environment-overrides file= help \
-			ignore-errors include-dir= jobs[=N] just-print \
-			keep-going load-average[=N] makefile= max-load[=N] \
-			new-file= no-builtin-rules no-keep-going \
-			no-print-directory old-file= print-data-base \
-			print-directory question quiet recon silent stop \
-			touch version warn-undefined-variables what-if=)/' \
-			'n@*@`cat -s GNUMakefile Makefile makefile |& sed -n -e "/No such file/d" -e "s/^\([A-Za-z0-9-]*\):.*/\1/p"`@' \
-			'n/=/f/' 'n/-f/f/'
-    complete mixer	p/1/'(vol bass treble synth pcm speaker mic cd mix \
-			pcm2 rec igain ogain line1 line2 line3)'/ \
-			p@2@'`mixer $:-1 | awk \{\ print\ \$7\ \}`'@
-
-    complete mpg123	'c/--/(2to1 4to1 8bit aggressive au audiodevice \
-    			auth buffer cdr check doublespeed equalizer frames \
-			gain halfspeed headphones left lineout list mix mono \
-			proxy quiet random rate reopen resync right scale \
-			shuffle single0 single1 skip speaker stdout stereo \
-			test verbose wav)/' 'p/*/f:*.{mp2,mp3}/'
-    complete mysqladmin	'n/*/(create drop extended-status flush-hosts \
-			flush-logs flush-status flush-tables flush-privileges \
-			kill password ping processlist reload refresh \
-			shutdown status variables version)/'
-    complete mutt	c@-f=@F:${HOME}/Mail/@ \
-			n/-a/f/ \
-			n/-F/f/ n/-H/f/ \
-			n/-s/x:'<subject line>'/ \
-			n/-e/x:'<command>'/ \
-			n@-b@'`cat ${HOME}/.muttrc-alias | awk '"'"'{print $2 }'"'"\`@ \
-			n@-c@'`cat ${HOME}/.muttrc-alias | awk '"'"'{print $2 }'"'"\`@ \
-			n@*@'`cat ${HOME}/.muttrc-alias | awk '"'"'{print $2 }'"'"\`@
-    complete ndc	'n/*/(status dumpdb reload stats trace notrace \
-			querylog start stop restart )/'
-    complete nm		'c/--/(debug-syms defined-only demangle dynamic \
-			extern-only format= help line-numbers no-demangle \
-			no-sort numeric-sort portability print-armap \
-			print-file-name reverse-sort size-sort undefined-only \
-			version)/' 'p/*/f:^*.{h,C,c,cc}/'
-    complete nmap	'n@-e@`ifconfig -l`@' 'p/*/$hostnames/'
-    complete perldoc 	'n@*@`\ls -1 /usr/libdata/perl/5.*/pod | sed s%\\.pod.\*\$%%`@'
-    complete postfix    'n/*/(start stop reload abort flush check)/'
-    complete postmap	'n/1/(hash: regexp:)' 'c/hash:/f/' 'c/regexp:/f/'
-    complete rcsdiff	'p@1@`\ls -1a RCS | sed -e "s/\(.*\),v/\1/"`@'
-    complete X		'c/-/(I a ac allowMouseOpenFail allowNonLocalModInDev \
-			allowNonLocalXvidtune ar1 ar2 audit auth bestRefresh \
-			bgamma bpp broadcast bs c cc class co core deferglyphs \
-			disableModInDev disableVidMode displayID dpi dpms f fc \
-			flipPixels fn fp gamma ggamma help indirect kb keeptty \
-			ld lf logo ls nolisten string noloadxkb nolock nopn \
-			once p pn port probeonly query quiet r rgamma s \
-			showconfig sp su t terminate to tst v verbose version \
-			weight wm x xkbdb xkbmap)/'
-    complete users      'c/--/(help version)/' 'p/1/x:"<accounting_file>"/'
-    complete vidcontrol	'p/1/(132x25 132x30 132x43 132x50 132x60 40x25 80x25 \
-			80x30 80x43 80x50 80x60 EGA_80x25 EGA_80x43 \
-			VESA_132x25 VESA_132x30 VESA_132x43 VESA_132x50 \
-			VESA_132x60 VESA_800x600 VGA_320x200 VGA_40x25 \
-			VGA_80x25 VGA_80x30 VGA_80x50 VGA_80x60)/'
-    complete vim	'n/*/f:^*.[oa]/'
-    complete where	'n/*/c/'
-    complete which	'n/*/c/'
-    complete wmsetbg	'c/-/(display D S a b c d e m p s t u w)/' \
-			'c/--/(back-color center colors dither help match \
-			maxscale parse scale smooth tile update-domain \
-			update-wmaker version workspace)/'
-    complete xdb	'p/1/c/'
-    complete xdvi	'c/-/(allowshell debug display expert gamma hushchars \
-			hushchecksums hushspecials install interpreter keep \
-			margins nogrey noinstall nomakepk noscan paper safer \
-			shrinkbuttonn thorough topmargin underlink version)/' \
-			'n/-paper/(a4 a4r a5 a5r)/' 'p/*/f:*.dvi/'
-    complete xlock	'c/-/(allowaccess allowroot debug description \
-			echokeys enablesaver grabmouse grabserver hide inroot \
-			install inwindow mono mousemotion nolock remote \
-			resetsaver sound timeelapsed use3d usefirst verbose \
-			wireframe background batchcount bg bitmap both3d \
-			count cycles delay delta3d display dpmsoff \
-			dpmsstandby dpmssuspend endCmd erasedelay erasemode \
-			erasetime fg font foreground geometry help \
-			icongeometry info invalid left3d lockdelay logoutCmd \
-			mailCmd mailIcon message messagefile messagefont \
-			messagesfile mode name ncolors nice nomailIcon none3d \
-			parent password planfont program resources right3d \
-			saturation size startCmd timeout username validate \
-			version visual)/' 'n/-mode/(ant atlantis ball bat \
-			blot bouboule bounce braid bubble bubble3d bug cage \
-			cartoon clock coral crystal daisy dclock decay deco \
-			demon dilemma discrete drift eyes fadeplot flag flame \
-			flow forest galaxy gears goop grav helix hop hyper \
-			ico ifs image invert julia kaleid kumppa lament laser \
-			life life1d life3d lightning lisa lissie loop lyapunov \
-			mandelbrot marquee matrix maze moebius morph3d \
-			mountain munch nose pacman penrose petal pipes puzzle \
-			pyro qix roll rotor rubik shape sierpinski slip sphere \
-			spiral spline sproingies stairs star starfish strange \
-			superquadrics swarm swirl tetris thornbird triangle \
-			tube turtle vines voters wator wire world worm xjack \
-			blank bomb random)/' 
-    complete xfig	'c/-/(display)/' 'p/*/f:*.fig/'
-    complete wget 	c/--/"(accept= append-output= background cache= \
-			continue convert-links cut-dirs= debug \
-			delete-after directory-prefix= domains= \
-			dont-remove-listing dot-style= exclude-directories= \
-			exclude-domains= execute= follow-ftp \
-			force-directories force-html glob= header= help \
-			http-passwd= http-user= ignore-length \
-			include-directories= input-file= level= mirror \
-			no-clobber no-directories no-host-directories \
-			no-host-lookup no-parent non-verbose \
-			output-document= output-file= passive-ftp \
-			proxy-passwd= proxy-user= proxy= quiet quota= \
-			recursive reject= relative retr-symlinks save-headers \
-			server-response span-hosts spider timeout= \
-			timestamping tries= user-agent= verbose version wait=)"/
-
-    # these from Tom Warzeka <tom@waz.cc>
-
-    ## ALAIN: These need to be removed from here!
-    # you may need to set the following variables for your host
-    set _elispdir = /usr/local/share/emacs/20.7/lisp # GNU Emacs lisp directory
-    set _maildir = /var/spool/mail  # Post Office: /var/spool/mail or /usr/mail
-    set _ypdir  = /var/yp	# directory where NIS (YP) maps are kept
-
-    # this one works but is slow and doesn't descend into subdirectories
-    # complete	cd	C@[./\$~]*@d@ \
-    #			p@1@'`\ls -1F . $cdpath | grep /\$ | sort -u`'@ n@*@n@
-
-    if ( -r /etc/shells ) then
-        complete setenv	p@1@e@ n@DISPLAY@\$hosts@: n@SHELL@'`cat /etc/shells`'@
-    else
-	complete setenv	p@1@e@ n@DISPLAY@\$hosts@:
-    endif
-    complete unsetenv	n/*/e/
-
-    if (-r $HOME/.mailrc) then
-        complete mail	c/-/"(e i f n s u v)"/ c/*@/\$hosts/ \
-			c@+@F:$HOME/Mail@ C@[./\$~]@f@ n/-s/x:'<subject>'/ \
-			n@-u@T:$_maildir@ n/-f/f/ \
-			n@*@'`sed -n s/alias//p $HOME/.mailrc | tr -s " " "	" | cut -f 2`'@
-    else
-        complete mail	c/-/"(e i f n s u v)"/ c/*@/\$hosts/ \
-			c@+@F:$HOME/Mail@ C@[./\$~]@f@ n/-s/x:'<subject>'/ \
-			n@-u@T:$_maildir@ n/-f/f/ n/*/u/
-    endif
-
-    if (! $?MANPATH) then
-	if (-r /usr/share/man) then
-	    setenv MANPATH /usr/share/man:/usr/local/share/man
-	else
-	    setenv MANPATH /usr/man:/usr/local/man
-	endif
-    endif
-
-    # use of $MANPATH from Dan Nicolaescu <dann@ics.uci.edu>
-    # use of 'find' adapted from Lubomir Host <host8@kepler.fmph.uniba.sk>
-    complete man \
-	    'n@1@`set q = "$MANPATH:as%:%/man1 %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.1.\*\$%%`@'\
-	    'n@2@`set q = "$MANPATH:as%:%/man2 %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.2.\*\$%%`@'\
-	    'n@3@`set q = "$MANPATH:as%:%/man3 %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.3.\*\$%%`@'\
-	    'n@4@`set q = "$MANPATH:as%:%/man4 %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.4.\*\$%%`@'\
-	    'n@5@`set q = "$MANPATH:as%:%/man5 %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.5.\*\$%%`@'\
-	    'n@6@`set q = "$MANPATH:as%:%/man6 %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.6.\*\$%%`@'\
-	    'n@7@`set q = "$MANPATH:as%:%/man7 %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.7.\*\$%%`@'\
-	    'n@8@`set q = "$MANPATH:as%:%/man8 %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.8.\*\$%%`@'\
-	    'n@9@`set q = "$MANPATH:as%:%/man9 %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.9.\*\$%%`@'\
-	    'n@0@`set q = "$MANPATH:as%:%/man0 %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.0.\*\$%%`@'\
-	    'n@n@`set q = "$MANPATH:as%:%/mann %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.n.\*\$%%`@'\
-	    'n@o@`set q = "$MANPATH:as%:%/mano %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.o.\*\$%%`@'\
-	    'n@l@`set q = "$MANPATH:as%:%/manl %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.l.\*\$%%`@'\
-	    'n@p@`set q = "$MANPATH:as%:%/manp %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.p.\*\$%%`@'\
-	    c@-@"(- f k M P s S t)"@ n@-f@c@ n@-k@x:'<keyword>'@ n@-[MP]@d@   \
-	    'N@-[MP]@`\ls -1 $:-1/man? |& sed -n s%\\..\\+\$%%p`@'            \
-	    'n@-[sS]@`\ls -1 $MANPATH:as%:% % |& sed -n s%^man%%p | sort -u`@'\
-	    'n@*@`find $MANPATH:as%:% % \( -type f -o -type l \) -printf "%f " |& sed -e "s%find: .*: No such file or directory%%" -e "s%\([^\.]\+\)\.\([^ ]*\) %\1 %g"`@'
-	    #n@*@c@ # old way -- commands only
-
-    complete ps	        c/-t/x:'<tty>'/ c/-/"(a c C e g k l S t u v w x)"/ \
-			n/-k/x:'<kernel>'/ N/-k/x:'<core_file>'/ n/*/x:'<PID>'/
-    complete compress	c/-/"(c f v b)"/ n/-b/x:'<max_bits>'/ n/*/f:^*.Z/
-    complete uncompress	c/-/"(c f v)"/                        n/*/f:*.Z/
-
-    complete uuencode	p/1/f/ p/2/x:'<decode_pathname>'/ n/*/n/
-    complete uudecode	c/-/"(f)"/ n/-f/f:*.{uu,UU}/ p/1/f:*.{uu,UU}/ n/*/n/
-
-    complete xhost	c/[+-]/\$hosts/ n/*/\$hosts/
-    complete xpdf	c/-/"(z g remote raise quit cmap rgb papercolor       \
-			      eucjp t1lib freetype ps paperw paperh level1    \
-			      upw fullscreen cmd q v h help)"/                \
-			n/-z/x:'<zoom (-5 .. +5) or "page" or "width">'/      \
-			n/-g/x:'<geometry>'/ n/-remote/x:'<name>'/            \
-			n/-rgb/x:'<number>'/ n/-papercolor/x:'<color>'/       \
-			n/-{t1lib,freetype}/x:'<font_type>'/                  \
-			n/-ps/x:'<PS_file>'/ n/-paperw/x:'<width>'/           \
-			n/-paperh/x:'<height>'/ n/-upw/x:'<password>'/        \
-			n/-/f:*.{pdf,PDF}/                                    \
-			N/-{z,g,remote,rgb,papercolor,t1lib,freetype,ps,paperw,paperh,upw}/f:*.{pdf,PDF}/ \
-			N/-/x:'<page>'/ p/1/f:*.{pdf,PDF}/ p/2/x:'<page>'/
-
-    # these conform to the latest GNU versions available at press time ...
-    # updates by John Gotts <jgotts@engin.umich.edu>
-
-    if (-X emacs) then
-      # TW note:  if your version of GNU Emacs supports the "--version" option,
-      #           uncomment this line and comment the next to automatically
-      #           detect the version, else replace "21.2" with your version.
-      #set _emacs_ver=`emacs --version | sed -e 's%GNU Emacs %%' -e q | cut -d . -f1-2`
-      set _emacs_ver=21.2
-      set _emacs_dir=`which emacs | sed s%/bin/emacs%%` 
-      complete emacs	c/--/"(batch terminal display no-windows no-init-file \
-                               user debug-init unibyte multibyte version help \
-                               no-site-file funcall load eval insert kill)"/ \
-                        c/-/"(t d nw q u f l -)"/ c/+/x:'<line_number>'/ \
-			n/{-t,--terminal}/x:'<terminal>'/ n/{-d,--display}/x:'<display>'/ \
-	                n/{-u,--user}/u/ n/{-f,--funcall}/x:'<lisp_function>'/ \
-			n@{-l,--load}@F:$_emacs_dir/share/emacs/$_emacs_ver/lisp@ \
-			n/--eval/x:'<expression>'/ n/--insert/f/ n/*/f:^*[\#~]/
-      unset _emacs_ver _emacs_dir
-    endif
-
-    # if your "zcat" is the GNU version, change "gzcat" below to just "zcat"
-    complete zcat	c/--/"(force help license quiet version)"/ \
-			c/-/"(f h L q V -)"/ n/*/f:*.{gz,Z,z,zip}/
-    complete gzip	c/--/"(stdout to-stdout decompress uncompress \
-			force help list license no-name quiet recurse \
-			suffix test verbose version fast best)"/ \
-			c/-/"(c d f h l L n q r S t v V 1 2 3 4 5 6 7 8 9 -)"/\
-			n/{-S,--suffix}/x:'<file_name_suffix>'/ \
-			n/{-d,--{de,un}compress}/f:*.{gz,Z,z,zip,taz,tgz}/ \
-			N/{-d,--{de,un}compress}/f:*.{gz,Z,z,zip,taz,tgz}/ \
-			n/*/f:^*.{gz,Z,z,zip,taz,tgz}/
-    complete {gunzip,ungzip} c/--/"(stdout to-stdout force help list license \
-			no-name quiet recurse suffix test verbose version)"/ \
-			c/-/"(c f h l L n q r S t v V -)"/ \
-			n/{-S,--suffix}/x:'<file_name_suffix>'/ \
-			n/*/f:*.{gz,Z,z,zip,taz,tgz}/
-    complete zgrep	c/-*A/x:'<#_lines_after>'/ c/-*B/x:'<#_lines_before>'/\
-			c/-/"(A b B c C e f h i l n s v V w x)"/ \
-			p/1/x:'<limited_regular_expression>'/ N/-*e/f/ \
-			n/-*e/x:'<limited_regular_expression>'/ n/-*f/f/ n/*/f/
-    complete zegrep	c/-*A/x:'<#_lines_after>'/ c/-*B/x:'<#_lines_before>'/\
-			c/-/"(A b B c C e f h i l n s v V w x)"/ \
-			p/1/x:'<full_regular_expression>'/ N/-*e/f/ \
-			n/-*e/x:'<full_regular_expression>'/ n/-*f/f/ n/*/f/
-    complete zfgrep	c/-*A/x:'<#_lines_after>'/ c/-*B/x:'<#_lines_before>'/\
-			c/-/"(A b B c C e f h i l n s v V w x)"/ \
-			p/1/x:'<fixed_string>'/ N/-*e/f/ \
-			n/-*e/x:'<fixed_string>'/ n/-*f/f/ n/*/f/
-    complete znew	c/-/"(f t v 9 P K)"/ n/*/f:*.Z/
-    complete zmore	n/*/f:*.{gz,Z,z,zip}/
-    complete zfile	n/*/f:*.{gz,Z,z,zip,taz,tgz}/
-    complete ztouch	n/*/f:*.{gz,Z,z,zip,taz,tgz}/
-    complete zforce	n/*/f:^*.{gz,tgz}/
-
-    complete grep	c/-*A/x:'<#_lines_after>'/ c/-*B/x:'<#_lines_before>'/\
-			c/--/"(extended-regexp fixed-regexp basic-regexp \
-			regexp file ignore-case word-regexp line-regexp \
-			no-messages revert-match version help byte-offset \
-			line-number with-filename no-filename quiet silent \
-			text directories recursive files-without-match \
-			files-with-matches count before-context after-context \
-			context binary unix-byte-offsets)"/ \
-			c/-/"(A a B b C c d E e F f G H h i L l n q r s U u V \
-				v w x)"/ \
-			p/1/x:'<limited_regular_expression>'/ N/-*e/f/ \
-			n/-*e/x:'<limited_regular_expression>'/ n/-*f/f/ n/*/f/
-    complete egrep	c/-*A/x:'<#_lines_after>'/ c/-*B/x:'<#_lines_before>'/\
-			c/--/"(extended-regexp fixed-regexp basic-regexp \
-			regexp file ignore-case word-regexp line-regexp \
-			no-messages revert-match version help byte-offset \
-			line-number with-filename no-filename quiet silent \
-			text directories recursive files-without-match \
-			files-with-matches count before-context after-context \
-			context binary unix-byte-offsets)"/ \
-			c/-/"(A a B b C c d E e F f G H h i L l n q r s U u V \
-				v w x)"/ \
-			p/1/x:'<full_regular_expression>'/ N/-*e/f/ \
-			n/-*e/x:'<full_regular_expression>'/ n/-*f/f/ n/*/f/
-    complete fgrep	c/-*A/x:'<#_lines_after>'/ c/-*B/x:'<#_lines_before>'/\
-			c/--/"(extended-regexp fixed-regexp basic-regexp \
-			regexp file ignore-case word-regexp line-regexp \
-			no-messages revert-match version help byte-offset \
-			line-number with-filename no-filename quiet silent \
-			text directories recursive files-without-match \
-			files-with-matches count before-context after-context \
-			context binary unix-byte-offsets)"/ \
-			c/-/"(A a B b C c d E e F f G H h i L l n q r s U u V \
-				v w x)"/ \
-			p/1/x:'<fixed_string>'/ N/-*e/f/ \
-			n/-*e/x:'<fixed_string>'/ n/-*f/f/ n/*/f/
-
-    complete sed	c/--/"(quiet silent version help expression file)"/   \
-			c/-/"(n V e f -)"/ n/{-e,--expression}/x:'<script>'/  \
-			n/{-f,--file}/f:*.sed/ N/-{e,f,-{file,expression}}/f/ \
-			n/-/x:'<script>'/ N/-/f/ p/1/x:'<script>'/ p/2/f/
-
-    complete users	c/--/"(help version)"/ p/1/x:'<accounting_file>'/
-    complete who	c/--/"(heading idle count mesg message writable help \
-    			version)"/ c/-/"(H i m q s T w u -)"/ \
-			p/1/x:'<accounting_file>'/ n/am/"(i)"/ n/are/"(you)"/
-
-    complete chown	c/--/"(changes dereference no-dereference silent \
-    			quiet reference recursive verbose help version)"/ \
-			c/-/"(c f h R v -)"/ C@[./\$~]@f@ c/*[.:]/g/ \
-			n/-/u/: p/1/u/: n/*/f/
-    complete chgrp	c/--/"(changes no-dereference silent quiet reference \
-    			recursive verbose help version)"/ \
-			c/-/"(c f h R v -)"/ n/-/g/ p/1/g/ n/*/f/
-    complete chmod	c/--/"(changes silent quiet verbose reference \
-    			recursive help version)"/ c/-/"(c f R v)"/
-    complete df		c/--/"(all block-size human-readable si inodes \
-			kilobytes local megabytes no-sync portability sync \
-			type print-type exclude-type help version)"/ \
-			c/-/"(a H h i k l m P T t v x)"/
-    complete du		c/--/"(all block-size bytes total dereference-args \
-    			human-readable si kilobytes count-links dereference \
-			megabytes separate-dirs summarize one-file-system \
-			exclude-from exclude max-depth help version"/ \
-			c/-/"(a b c D H h k L l m S s X x)"/
-
-    complete cat	c/--/"(number-nonblank number squeeze-blank show-all \
-			show-nonprinting show-ends show-tabs help version)"/ \
-			c/-/"(A b E e n s T t u v -)"/ n/*/f/
-    complete mv		c/--/"(backup force interactive update verbose suffix \
-			version-control help version)"/ \
-			c/-/"(b f i S u V v -)"/ \
-			n/{-S,--suffix}/x:'<suffix>'/ \
-			n/{-V,--version-control}/"(t numbered nil existing \
-			never simple)"/ n/-/f/ N/-/d/ p/1/f/ p/2/d/ n/*/f/
-    complete cp		c/--/"(archive backup no-dereference force \
-    			interactive link preserve parents sparse recursive \
-			symbolic-link suffix update verbose version-control \
-			one-file-system help version)"/ \
-			c/-/"(a b d f i l P p R r S s u V v x -)"/ \
-			n/-*r/d/ n/{-S,--suffix}/x:'<suffix>'/ \
-			n/{-V,--version-control}/"(t numbered nil existing \
-			never simple)"/ n/-/f/ N/-/d/ p/1/f/ p/2/d/ n/*/f/
-    complete ln		c/--/"(backup directory force no-dereference \
-    			interactive symbolic suffix verbose version-control \
-			help version)"/ \
-			c/-/"(b d F f i n S s V v -)"/ \
-			n/{-S,--suffix}/x:'<suffix>'/ \
-			n/{-V,--version-control}/"(t numbered nil existing \
-			never simple)"/ n/-/f/ N/-/x:'<link_name>'/ \
-			p/1/f/ p/2/x:'<link_name>'/
-    complete touch	c/--/"(date reference time help version)"/ \
-			c/-/"(a c d f m r t -)"/ \
-			n/{-d,--date}/x:'<date_string>'/ \
-			c/--time/"(access atime mtime modify use)"/ \
-			n/{-r,--file}/f/ n/-t/x:'<time_stamp>'/ n/*/f/
-    complete mkdir	c/--/"(mode parents verbose help version)"/ \
-    			c/-/"(p m -)"/ \
-			n/{-m,--mode}/x:'<mode>'/ n/*/d/
-    complete rmdir	c/--/"(ignore-fail-on-non-empty parents verbose help \
-    			version)"/ c/-/"(p -)"/ n/*/d/
-
-    complete tar	c/-[Acru]*/"(b B C f F g G h i l L M N o P \
-			R S T v V w W X z Z)"/ \
-			c/-[dtx]*/"( B C f F g G i k K m M O p P \
-			R s S T v w x X z Z)"/ \
-			p/1/"(A c d r t u x -A -c -d -r -t -u -x \
-			--catenate --concatenate --create --diff --compare \
-			--delete --append --list --update --extract --get \
-			--help --version)"/ \
-			c/--/"(catenate concatenate create diff compare \
-			delete append list update extract get atime-preserve \
-			block-size read-full-blocks directory checkpoint file \
-			force-local info-script new-volume-script incremental \
-			listed-incremental dereference ignore-zeros \
-			ignore-failed-read keep-old-files starting-file \
-			one-file-system tape-length modification-time \
-			multi-volume after-date newer old-archive portability \
-			to-stdout same-permissions preserve-permissions \
-			absolute-paths preserve record-number remove-files \
-			same-order preserve-order same-owner sparse \
-			files-from null totals verbose label version \
-			interactive confirmation verify exclude exclude-from \
-			compress uncompress gzip ungzip use-compress-program \
-			block-compress help version)"/ \
-			c/-/"(b B C f F g G h i k K l L m M N o O p P R s S \
-			T v V w W X z Z 0 1 2 3 4 5 6 7 -)"/ \
-			C@[/dev]@f@ \
-			n/-c*f/x:'<new_tar_file, device_file, or "-">'/ \
-			n/{-[Adrtux]*f,--file}/f:*.{tar,taz,tgz}/ \
-			N/{-x*f,--file}/'`tar -tf $:-1`'/ \
-			n/--use-compress-program/c/ \
-			n/{-b,--block-size}/x:'<block_size>'/ \
-			n/{-V,--label}/x:'<volume_label>'/ \
-			n/{-N,--{after-date,newer}}/x:'<date>'/ \
-			n/{-L,--tape-length}/x:'<tape_length_in_kB>'/ \
-			n/{-C,--directory}/d/ \
-			N/{-C,--directory}/'`\ls $:-1`'/ \
-			n/-[0-7]/"(l m h)"/
-
-    # SVR4 filesystems
-    #complete  mount	c/-/"(a F m o O p r v V)"/ n/-p/n/ n/-v/n/ \
-    #			n/-o/x:'<FSType_options>'/ \
-    #			n@-F@'`\ls -1 /usr/lib/fs`'@ \
-    #			n@*@'`grep -v "^#" /etc/vfstab | tr -s " " "	 " | cut -f 3`'@
-    #complete umount	c/-/"(a o V)"/ n/-o/x:'<FSType_options>'/ \
-    #			n/*/'`mount | cut -d " " -f 1`'/
-    #complete  mountall	c/-/"(F l r)"/ n@-F@'`\ls -1 /usr/lib/fs`'@
-    #complete umountall	c/-/"(F h k l r s)"/ n@-F@'`\ls -1 /usr/lib/fs`'@ \
-    #			n/-h/'`df -k | cut -s -d ":" -f 1 | sort -u`'/
-    # BSD 4.3 filesystems
-    complete  mount	c/-/"(a r t v)"/ n/-t/"(4.2 nfs)"/ \
-    			n@*@'`grep -v "^#" /etc/fstab | tr -s " " "	" | cut -f 2`'@
-    complete umount	c/-/"(a h t v)"/ n/-t/"(4.2 nfs)"/ \
-    			n/-h/'`df | cut -s -d ":" -f 1 | sort -u`'/ \
-    			n/*/'`mount | cut -d " " -f 3`'/
-    # BSD 4.2 filesystems
-    #complete  mount	c/-/"(a r t v)"/ n/-t/"(ufs nfs)"/ \
-    #			n@*@'`cut -d ":" -f 2 /etc/fstab`'@
-    #complete umount	c/-/"(a h t v)"/ n/-t/"(ufs nfs)"/ \
-    #			n/-h/'`df | cut -s -d ":" -f 1 | sort -u`'/ \
-    #			n/*/'`mount | cut -d " " -f 3`'/
-
-    # these deal with NIS (formerly YP); if it's not running you don't need 'em
-    if (-X domainname) then
-      set _domain = "`domainname`"
-      if ("$_domain" != "" && "$_domain" != "noname") then
-        complete domainname p@1@D:$_ypdir@" " n@*@n@
-        complete ypcat	    c@-@"(d k t x)"@ n@-x@n@ n@-d@D:$_ypdir@" " \
-	                    N@-d@\`\\ls\ -1\ $_ypdir/\$:-1\ \|\ sed\ -n\ s%\\\\.pag\\\$%%p\`@ \
-	                    n@*@\`\\ls\ -1\ $_ypdir/$_domain\ \|\ sed\ -n\ s%\\\\.pag\\\$%%p\`@
-        complete ypmatch    c@-@"(d k t x)"@ n@-x@n@ n@-d@D:$_ypdir@" " \
-	                    N@-d@x:'<key ...>'@ n@-@x:'<key ...>'@ p@1@x:'<key ...>'@ \
-	                    n@*@\`\\ls\ -1\ $_ypdir/$_domain\ \|\ sed\ -n\ s%\\\\.pag\\\$%%p\`@
-        complete ypwhich    c@-@"(d m t x V1 V2)"@ n@-x@n@ n@-d@D:$_ypdir@" " \
-	                    n@-m@\`\\ls\ -1\ $_ypdir/$_domain\ \|\ sed\ -n\ s%\\\\.pag\\\$%%p\`@ \
-			    N@-m@n@ n@*@\$hosts@
-      endif
-      unset _domain
-    endif
-
-    # there's no need to clutter the user's shell with these
-    unset _elispdir _maildir _ypdir
-
-    complete make \
-	'n/-f/f/' \
-      	'c/*=/f/' \
-	'n@*@`cat -s GNUmakefile Makefile makefile |& sed -n -e "/No such file/d" -e "/^[^     #].*:/s/:.*//p"`@'
-
-    if ( -f /etc/printcap ) then
-	set printers=(`sed -n -e "/^[^     #].*:/s/:.*//p" /etc/printcap`)
-
-	complete lpr    'c/-P/$printers/'
-	complete lpq    'c/-P/$printers/'
-	complete lprm   'c/-P/$printers/'
-	complete lpquota        'p/1/(-Qprlogger)/' 'c/-P/$printers/'
-	complete dvips  'c/-P/$printers/' 'n/-o/f:*.{ps,PS}/' 'n/*/f:*.dvi/'
-	complete dvilj	'p/*/f:*.dvi/'
-    endif
-
-## BEGIN tcshrc additions
-    complete ggv 	n/*/f:*.{ps,eps}/
-    complete unzip 	p/1/f:*.{zip}/
-## END tcshrc completions
-
-    unset noglob
-
-end:
diff --git a/app-shells/tcsh/metadata.xml b/app-shells/tcsh/metadata.xml
new file mode 100644
index 000000000000..b9fc2b9c6f11
--- /dev/null
+++ b/app-shells/tcsh/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>dragonheart@gentoo.org</email>
+    <name>Daniel Black</name>
+    <description>A user ebuild that I felt obliged to include. Please take over if you want 
+it</description>
+</maintainer>
+<longdescription></longdescription>
+</pkgmetadata>
diff --git a/app-shells/tcsh/tcsh-6.11.ebuild b/app-shells/tcsh/tcsh-6.11.ebuild
deleted file mode 100644
index c9b9dee289f7..000000000000
--- a/app-shells/tcsh/tcsh-6.11.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.11.ebuild,v 1.14 2004/06/29 04:00:06 vapier Exp $
-
-inherit eutils
-
-S=${WORKDIR}/${P}.00
-DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
-HOMEPAGE="http://www.tcsh.org/"
-SRC_URI="ftp://ftp.gw.com/pub/unix/tcsh/${P}.tar.gz
-	ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz
-	ftp://ftp.funet.fi/pub/unix/shells/tcsh/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE="perl"
-
-DEPEND="virtual/libc
-	>=sys-libs/ncurses-5.1
-	perl? ( dev-lang/perl )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-tc.os.h-gentoo.diff
-}
-
-src_compile() {
-	econf --prefix=/ || die
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install install.man || die
-
-	use perl && ( \
-		perl tcsh.man2html || die
-		dohtml tcsh.html/*.html
-	)
-
-	dosym /bin/tcsh /bin/csh
-	dodoc FAQ Fixes NewThings Ported README WishList Y2K
-
-	insinto /etc
-	doins ${FILESDIR}/csh.cshrc ${FILESDIR}/csh.login
-}
diff --git a/app-shells/tcsh/tcsh-6.12-r3.ebuild b/app-shells/tcsh/tcsh-6.12-r3.ebuild
index a29075846ffa..46453da29777 100644
--- a/app-shells/tcsh/tcsh-6.12-r3.ebuild
+++ b/app-shells/tcsh/tcsh-6.12-r3.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.12-r3.ebuild,v 1.11 2004/10/04 23:37:11 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.12-r3.ebuild,v 1.12 2004/11/22 11:48:16 dragonheart Exp $
 
 inherit eutils
 
 MY_P="${PN}-${PV}.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"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz
+	mirror://gentoo/tcsh-complete"
 
 LICENSE="BSD"
 SLOT="0"
@@ -21,7 +22,7 @@ RDEPEND="virtual/libc
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
-	unpack ${A}
+	unpack ${MY_P}.tar.gz
 	cd ${S}
 	epatch ${FILESDIR}/${P}-tc.os.h-gentoo.diff
 	use cjk && epatch ${FILESDIR}/tcsh_enable_kanji.diff
@@ -51,5 +52,5 @@ src_install() {
 	newins ${FILESDIR}/tcsh.config .tcsh.config
 
 	insinto /etc/profile.d
-	doins ${FILESDIR}/tcsh-settings ${FILESDIR}/tcsh-aliases ${FILESDIR}/tcsh-bindkey ${FILESDIR}/tcsh-complete
+	doins ${FILESDIR}/tcsh-settings ${FILESDIR}/tcsh-aliases ${FILESDIR}/tcsh-bindkey ${DISTDIR}/tcsh-complete
 }
diff --git a/app-shells/tcsh/tcsh-6.12-r2.ebuild b/app-shells/tcsh/tcsh-6.13.ebuild
index f5cd410afe3e..79870e44ac38 100644
--- a/app-shells/tcsh/tcsh-6.12-r2.ebuild
+++ b/app-shells/tcsh/tcsh-6.13.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.12-r2.ebuild,v 1.13 2004/10/04 23:37:11 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.13.ebuild,v 1.1 2004/11/22 11:48:16 dragonheart Exp $
 
 inherit eutils
 
 MY_P="${PN}-${PV}.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"
+SRC_URI="ftp://ftp.astron.com/pub/tcsh/${MY_P}.tar.gz
+	mirror://gentoo/tcsh-complete"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
-IUSE="cjk perl"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~mips"
+IUSE="perl"
 
 RDEPEND="virtual/libc
 	>=sys-libs/ncurses-5.1
@@ -21,10 +22,7 @@ RDEPEND="virtual/libc
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-tc.os.h-gentoo.diff
-	use cjk && epatch ${FILESDIR}/tcsh_enable_kanji.diff
+	unpack ${MY_P}.tar.gz
 }
 
 src_compile() {
@@ -51,5 +49,5 @@ src_install() {
 	newins ${FILESDIR}/tcsh.config .tcsh.config
 
 	insinto /etc/profile.d
-	doins ${FILESDIR}/tcsh-settings ${FILESDIR}/tcsh-aliases ${FILESDIR}/tcsh-bindkey ${FILESDIR}/tcsh-complete
+	doins ${FILESDIR}/tcsh-settings ${FILESDIR}/tcsh-aliases ${FILESDIR}/tcsh-bindkey ${DISTDIR}/tcsh-complete
 }