10 files changed, 270 insertions, 70 deletions
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index e7de9ecf0e8f..7ab925c4f9bd 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -1,2 +1,5 @@
-DIST tcsh-6.22.02.tar.gz 1006405 BLAKE2B f18b2c48958b4d38a0f55b0df8563564b2a3b34becf02eda8802d7f5e2194082bf96c46323d606c2e6bd2a26aaed303bae3132d03515274407c63b713583dde7 SHA512 32d271b568c63265ea4c98494f5e60b37c3a3fc2594e8763b8f6f0b09018ab9db7ef6f951120b37f7880ccf04ba3a2559e30dc08d24f4ba9dc36853238d55980
+DIST tcsh-6.24.00.tar.gz 949411 BLAKE2B 0751707e233fedc2b8a9360f27e8f4a3e030956e97809b0a52ffe0541b6d15b4f7ff2cbd0832743f702757129366a979ecab745342823d9bbb1863c1d024646d SHA512 0a50332aadd4309a8b1506a4771ac77c5368c4e1952dd719bd01eca15711743983ff13ec7098dbaf565b4293ac0355ff565344991e0d0c0c9ef75237220e7730
+DIST tcsh-6.24.01.tar.gz 949438 BLAKE2B 4f3005e98d02aa12cea41405ab7e56cd840ba207d36a657699041b045f537bfbf1c992a20435ee97ea21b4bb25f0d7af532ccd2ef50de8542ca94f914e3f3ca5 SHA512 47425f9bc5ae3df163fe1c9f8a1b1a6c3893b186843d561fb7020c75561587286036cc679212f17fd0f760735d9e01da414e60a69db0ffcb74276f053ea80479
+DIST tcsh-6.24.10.tar.gz 956578 BLAKE2B bf6e5815390ecffa9dbdc31ac08630ebc3e95394092285cc2f5c5cf0bb48c16ccdd195888feb9e3f5cc689c228eed7a99a2edb566be696bf95851c8176ce3c7b SHA512 74bd17f4d8bb1fb60a2a6904d87e26b7490f0ec571866e62d6e1d35e9da435c888ab14bfa842d7282e8993d366580439b4cc884b08a22e45dc98a36f813094be
+DIST tcsh-gentoo-patches-r1.10.tar.xz 2344 BLAKE2B 82131a926b99734173c2524cddfad69cdfc4653370699da8ebc135bd198a32b0bb290ff93b7a478dcf02c7353a82a2cc4efb0a2e39539d1a74ea9fea1b3f7e2a SHA512 d9e01c9b162529501b5eaafe031dfe880818129f4d197a07012e698293841269568a19c595453259d784129271c7f7230b6ce326880b06c4c82bb89b8645a3f4
 DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B 58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d
diff --git a/app-shells/tcsh/files/tcsh-6.18.01-aix.patch b/app-shells/tcsh/files/tcsh-6.18.01-aix.patch
deleted file mode 100644
index 669d20634731..000000000000
--- a/app-shells/tcsh/files/tcsh-6.18.01-aix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream report, without better patch yet:
-http://bugs.gw.com/view.php?id=366
-
---- tc.who.c.orig	2014-06-26 11:21:43 +0200
-+++ tc.who.c	2014-06-26 11:21:58 +0200
-@@ -60,6 +60,8 @@
- #  define TCSH_PATH_UTMP _PATH_UTMPX
- # elif defined(UTMPX_FILE)
- #  define TCSH_PATH_UTMP UTMPX_FILE
-+# elif defined(UTMP_FILE)
-+#  define TCSH_PATH_UTMP UTMP_FILE
- # elif __FreeBSD_version >= 900000
- #  /* Why isn't this defined somewhere? */
- #  define TCSH_PATH_UTMP "/var/run/utx.active"
diff --git a/app-shells/tcsh/files/tcsh-6.20.00-debian-dircolors.patch b/app-shells/tcsh/files/tcsh-6.20.00-debian-dircolors.patch
deleted file mode 100644
index 3b18f1c45d77..000000000000
--- a/app-shells/tcsh/files/tcsh-6.20.00-debian-dircolors.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-forward-ported 6.14 to 6.20 patch from Debian
-
---- tcsh-6.20.00/tw.color.c
-+++ tcsh-6.20.00/tw.color.c
-@@ -382,13 +382,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/files/tcsh-6.21.00-fno-common.patch b/app-shells/tcsh/files/tcsh-6.21.00-fno-common.patch
deleted file mode 100644
index b5a0cf0600a0..000000000000
--- a/app-shells/tcsh/files/tcsh-6.21.00-fno-common.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 6974bc35a5cda6eab748e364bd76a860ca66968b Mon Sep 17 00:00:00 2001
-From: zoulasc <christos@zoulas.com>
-Date: Sat, 11 Jan 2020 11:16:51 -0500
-Subject: [PATCH] Remove extra variable definition that cause -fno-common build
- to fail (Werner Fink)
-
----
- tc.sig.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tc.sig.c b/tc.sig.c
-index 77659ca..576605a 100644
---- a/tc.sig.c
-+++ b/tc.sig.c
-@@ -56,7 +56,6 @@ int alrmcatch_disabled; /* = 0; */
- int phup_disabled; /* = 0; */
- int pchild_disabled; /* = 0; */
- int pintr_disabled; /* = 0; */
--int handle_interrupt; /* = 0; */
- 
- int
- handle_pending_signals(void)
diff --git a/app-shells/tcsh/files/tcsh-6.21.00-no-nls.patch b/app-shells/tcsh/files/tcsh-6.21.04-no-nls.patch
index a01ebfb57fdb..7f465d8a75ef 100644
--- a/app-shells/tcsh/files/tcsh-6.21.00-no-nls.patch
+++ b/app-shells/tcsh/files/tcsh-6.21.04-no-nls.patch
@@ -4,9 +4,10 @@ Bug: https://bugs.gentoo.org/689904
 
 --- a/ed.inputl.c
 +++ b/ed.inputl.c
-@@ -669,8 +669,8 @@
+@@ -668,9 +668,9 @@
+ GetCmdChar(Char ch)
  {
- #ifndef WINNT_NATIVE // We use more than 256 for various extended keys 
+ #ifndef WINNT_NATIVE // We use more than 256 for various extended keys
 -    wint_t c = ch & CHAR;
 +    eChar c = ch & CHAR;
  #else
diff --git a/app-shells/tcsh/files/tcsh-6.23.02-dircolors.patch b/app-shells/tcsh/files/tcsh-6.23.02-dircolors.patch
new file mode 100644
index 000000000000..2fb21476fd29
--- /dev/null
+++ b/app-shells/tcsh/files/tcsh-6.23.02-dircolors.patch
@@ -0,0 +1,27 @@
+Based on original Debian patch, updated from 6.14 to 6.20 and 6.23
+
+silently ignore bad colour variables, for defaults have unsupported ones
+
+https://bugs.gentoo.org/120792
+
+--- a/tw.color.c
++++ b/tw.color.c
+@@ -381,16 +381,14 @@
+ 			if ((Char)variables[i].variable[0] == (v[0] & CHAR) &&
+ 			    (Char)variables[i].variable[1] == (v[1] & CHAR))
+ 			    break;
++		    v += 3;
+ 		    if (i < nvariables) {
+-			v += 3;
+ 			getstring(&c, &v, &variables[i].color, ':');
+ 			if (i == VSym)
+ 			    color_as_referent = strcasecmp(
+ 				variables[VSym].color.s, "target") == 0;
+-			continue;
+ 		    }
+-		    else
+-			stderror(ERR_BADCOLORVAR, v[0], v[1]);
++		    continue;
+ 		}
+ 		break;
+ 	    }
diff --git a/app-shells/tcsh/metadata.xml b/app-shells/tcsh/metadata.xml
index 1e378f90c6ca..48435c513817 100644
--- a/app-shells/tcsh/metadata.xml
+++ b/app-shells/tcsh/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>grobian@gentoo.org</email>
diff --git a/app-shells/tcsh/tcsh-6.22.02.ebuild b/app-shells/tcsh/tcsh-6.24.00.ebuild
index b5d2662737f5..81194fb4ebd2 100644
--- a/app-shells/tcsh/tcsh-6.22.02.ebuild
+++ b/app-shells/tcsh/tcsh-6.24.00.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit epatch flag-o-matic autotools prefix
+inherit flag-o-matic autotools prefix
 
 CONFVER="1.9"
 
@@ -11,17 +11,19 @@ DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
 HOMEPAGE="https://www.tcsh.org/"
 SRC_URI="
 	ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz
+	ftp://ftp.astron.com/pub/tcsh/old/${P}.tar.gz
 	https://dev.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="nls doc"
 RESTRICT="test"
 
 # we need gettext because we run autoconf (AM_ICONV)
 RDEPEND="
 	>=sys-libs/ncurses-5.1:0=
+	virtual/libcrypt:=
 	virtual/libiconv"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
@@ -30,15 +32,13 @@ DEPEND="${RDEPEND}
 CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER}
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-6.20.00-debian-dircolors.patch # bug #120792
-	"${FILESDIR}"/${PN}-6.18.01-aix.patch
-	"${FILESDIR}"/${PN}-6.21.00-no-nls.patch
+	"${FILESDIR}"/${PN}-6.23.02-dircolors.patch # bug #120792
+	"${FILESDIR}"/${PN}-6.21.04-no-nls.patch
 	"${FILESDIR}"/${PN}-6.21.00-use-ncurses.patch
-	"${FILESDIR}"/${PN}-6.21.00-fno-common.patch # upstream
 )
 
 src_prepare() {
-	epatch "${PATCHES[@]}"
+	default
 
 	eautoreconf
 
@@ -79,6 +79,12 @@ src_configure() {
 	append-cppflags -D_PATH_USRBIN="'"'"${EPREFIX}/usr/bin"'"'"
 	append-cppflags -D_PATH_BIN="'"'"${EPREFIX}/bin"'"'"
 
+	# musl's utmp is non-functional
+	if use elibc_musl ; then
+		export ac_cv_header_utmp_h=no
+		export ac_cv_header_utmpx_h=no
+	fi
+
 	econf \
 		--prefix="${EPREFIX:-}" \
 		--datarootdir='${prefix}/usr/share' \
diff --git a/app-shells/tcsh/tcsh-6.24.01-r1.ebuild b/app-shells/tcsh/tcsh-6.24.01-r1.ebuild
new file mode 100644
index 000000000000..e50e0201ae7f
--- /dev/null
+++ b/app-shells/tcsh/tcsh-6.24.01-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic autotools prefix
+
+CONFVER="1.10"
+
+DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
+HOMEPAGE="https://www.tcsh.org/"
+SRC_URI="
+	ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz
+	ftp://ftp.astron.com/pub/tcsh/old/${P}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="nls doc"
+RESTRICT="test"
+
+# we need gettext because we run autoconf (AM_ICONV)
+RDEPEND="
+	>=sys-libs/ncurses-5.1:0=
+	virtual/libcrypt:=
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? ( dev-lang/perl )"
+
+CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.23.02-dircolors.patch # bug #120792
+	"${FILESDIR}"/${PN}-6.21.04-no-nls.patch
+	"${FILESDIR}"/${PN}-6.21.00-use-ncurses.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# fix gencat usage
+	sed \
+		-e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $> $^/' \
+		-i nls/Makefile.in || die
+
+	# always use sysmalloc, the builtin malloc fails on Darwin, musl,
+	# etc. it's already used for glibc-linux, so this doesn't change
+	# anything for the majority of users
+	sed -i -e 's/undef SYSMALLOC/define SYSMALLOC/' config_f.h || die
+
+	# unify ECHO behaviour
+	echo "#undef ECHO_STYLE" >> config_f.h
+	echo "#define ECHO_STYLE      BOTH_ECHO" >> config_f.h
+
+	eprefixify "${CONFDIR}"/*
+	# activate the right default PATH
+	if [[ -z ${EPREFIX} ]] ; then
+		sed -i \
+			-e 's/^#MAIN//' -e '/^#PREFIX/d' \
+			"${CONFDIR}"/csh.login || die
+	else
+		sed -i \
+			-e 's/^#PREFIX//' -e '/^#MAIN/d' \
+			"${CONFDIR}"/csh.login || die
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# make tcsh look and live along the lines of the prefix
+	append-cppflags -D_PATH_DOTCSHRC="'"'"${EPREFIX}/etc/csh.cshrc"'"'"
+	append-cppflags -D_PATH_DOTLOGIN="'"'"${EPREFIX}/etc/csh.login"'"'"
+	append-cppflags -D_PATH_DOTLOGOUT="'"'"${EPREFIX}/etc/csh.logout"'"'"
+	append-cppflags -D_PATH_USRBIN="'"'"${EPREFIX}/usr/bin"'"'"
+	append-cppflags -D_PATH_BIN="'"'"${EPREFIX}/bin"'"'"
+
+	# musl's utmp is non-functional
+	if use elibc_musl ; then
+		export ac_cv_header_utmp_h=no
+		export ac_cv_header_utmpx_h=no
+	fi
+
+	econf \
+		--prefix="${EPREFIX:-}" \
+		--datarootdir='${prefix}/usr/share' \
+		$(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.man
+
+	DOCS=( FAQ Fixes NewThings Ported README.md WishList Y2K )
+	if use doc ; then
+		perl tcsh.man2html tcsh.man || die
+		HTML_DOCS=( tcsh.html/*.html )
+	fi
+	einstalldocs
+
+	insinto /etc
+	doins \
+		"${CONFDIR}"/csh.cshrc \
+		"${CONFDIR}"/csh.login
+
+	# bug #119703: add csh -> tcsh symlink
+	dosym tcsh /bin/csh
+}
diff --git a/app-shells/tcsh/tcsh-6.24.10.ebuild b/app-shells/tcsh/tcsh-6.24.10.ebuild
new file mode 100644
index 000000000000..32e21c05882c
--- /dev/null
+++ b/app-shells/tcsh/tcsh-6.24.10.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic autotools prefix
+
+CONFVER="1.10"
+
+DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
+HOMEPAGE="https://www.tcsh.org/"
+SRC_URI="
+	ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz
+	ftp://ftp.astron.com/pub/tcsh/old/${P}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="nls man"
+RESTRICT="test"
+
+# we need gettext because we run autoconf (AM_ICONV)
+RDEPEND="
+	>=sys-libs/ncurses-5.1:0=
+	virtual/libcrypt:=
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.21.00-use-ncurses.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# fix gencat usage
+	sed \
+		-e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $> $^/' \
+		-i nls/Makefile.in || die
+
+	# always use sysmalloc, the builtin malloc fails on Darwin, musl,
+	# etc. it's already used for glibc-linux, so this doesn't change
+	# anything for the majority of users
+	sed -i -e 's/undef SYSMALLOC/define SYSMALLOC/' config_f.h || die
+
+	# unify ECHO behaviour
+	echo "#undef ECHO_STYLE" >> config_f.h
+	echo "#define ECHO_STYLE      BOTH_ECHO" >> config_f.h
+
+	eprefixify "${CONFDIR}"/*
+	# activate the right default PATH
+	if [[ -z ${EPREFIX} ]] ; then
+		sed -i \
+			-e 's/^#MAIN//' -e '/^#PREFIX/d' \
+			"${CONFDIR}"/csh.login || die
+	else
+		sed -i \
+			-e 's/^#PREFIX//' -e '/^#MAIN/d' \
+			"${CONFDIR}"/csh.login || die
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# make tcsh look and live along the lines of the prefix
+	append-cppflags -D_PATH_DOTCSHRC="'"'"${EPREFIX}/etc/csh.cshrc"'"'"
+	append-cppflags -D_PATH_DOTLOGIN="'"'"${EPREFIX}/etc/csh.login"'"'"
+	append-cppflags -D_PATH_DOTLOGOUT="'"'"${EPREFIX}/etc/csh.logout"'"'"
+	append-cppflags -D_PATH_USRBIN="'"'"${EPREFIX}/usr/bin"'"'"
+	append-cppflags -D_PATH_BIN="'"'"${EPREFIX}/bin"'"'"
+
+	# musl's utmp is non-functional
+	if use elibc_musl ; then
+		export ac_cv_header_utmp_h=no
+		export ac_cv_header_utmpx_h=no
+	fi
+
+	econf \
+		--prefix="${EPREFIX:-}" \
+		--datarootdir='${prefix}/usr/share' \
+		$(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.man
+
+	DOCS=( FAQ Fixes Ported README.md WishList Y2K )
+	einstalldocs
+
+	if use man ; then
+		mv tcsh.man{,1}
+		doman tcsh.man1
+	fi
+
+	insinto /etc
+	doins \
+		"${CONFDIR}"/csh.cshrc \
+		"${CONFDIR}"/csh.login
+
+	# bug #119703: add csh -> tcsh symlink
+	dosym tcsh /bin/csh
+}