4 files changed, 6 insertions, 117 deletions
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 777f9295b0d7..17f0ef307569 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -6,12 +6,10 @@ AUX tcsh-6.21.00-use-ncurses.patch 388 BLAKE2B 5938d6ceee5cafa254d3bedb36705a7d1
 AUX tcsh-6.21.04-no-nls.patch 406 BLAKE2B f4e9baa31c4f54c657d18bdb026bfee85f1bfb98115ff6a57bfc517f9fe4e8469df91a67b89ffc78b1ccd960e4ab77d8981aeb22d432b5237d026dfb92b68e1a SHA512 7e07f73504f44e5179e53da9e1779da7b6592b361ba6d23d3bb0277bf616bd5f326caa67d9ea4ef485ad03991ad017296d0171552617ad5d6189e5b7de13a826
 AUX tcsh-6.23.02-dircolors.patch 689 BLAKE2B ded3fb77389e672f4f5b23475bf26fb579934c502e3cb9c4d13b6cb592cbc87e0b9d216f559e4cfa1113ebadc7e2a6a470e50495b7ecc9a46cfec6465ae3100e SHA512 5ca43538592990886fd5b02de7bf9801d83d5d3473c992785ff4b0bd6d6b9d030f34cd7e381f29ba7c342148be92e30453e9ea93815c30221bb7dcef4cc22058
 DIST tcsh-6.22.02.tar.gz 1006405 BLAKE2B f18b2c48958b4d38a0f55b0df8563564b2a3b34becf02eda8802d7f5e2194082bf96c46323d606c2e6bd2a26aaed303bae3132d03515274407c63b713583dde7 SHA512 32d271b568c63265ea4c98494f5e60b37c3a3fc2594e8763b8f6f0b09018ab9db7ef6f951120b37f7880ccf04ba3a2559e30dc08d24f4ba9dc36853238d55980
-DIST tcsh-6.22.04.tar.gz 1012977 BLAKE2B 5702e17e25603a244e4481294cbe2dc2272d4f3ac8362be9e1dd65f3857e0e54520a245d321dda5ef747345776c22068dcb130705daddf71cb650b154ed96ba4 SHA512 3956df52124d496dc0e67e4e3e801787f31690f96a60399953e401648d5b4cfb06baa9833c32cb771177b3e89b7a27e5765534db073206568fe773598a55e873
-DIST tcsh-6.23.02.tar.gz 947265 BLAKE2B f1f6e1b98458a847e55802cdad14cbecb1ed222e18d8fd2547da7765e0658b645685f0baebcf5f08f237a94c7b56ba400d1e51f1743798b8acd375726772825c SHA512 bf83987e4667e3e514b99b6ee0a7f04c8eafad2bdb20f480e2a3614fc2112e01a75d3fcbf43ce54a4ef6d12a03693c3446ae6e14daa91f0ae7556019de1bce2a
 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-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B 58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d
 EBUILD tcsh-6.22.02-r1.ebuild 2872 BLAKE2B 48fae91fcd3e0af98f819c087d392492ddf13d2bc039da13ca20153277843d2b10d507cf341b48724068c88cafab62006acfc779c37ee9be85e4df49b4b14481 SHA512 0a9bff60df36fde3f96a7ac607bc25669558956a2bbb820c329e8d20d5f015aaed5ab843161b43780875a6ae2791e2833151fbfa7f361758ab2a9918b56a3af2
-EBUILD tcsh-6.22.04-r1.ebuild 2891 BLAKE2B e3770b7d919162b2990360aa6a2dadb48b646588de92a5b74c33f7020e8d1f6971f952884a4ac6f6418a76b6a5e39e3b3666ce6aa27b0a6a48dfab18e579bbee SHA512 399dd7a0e6e72e92ee33f685cb228d3c30d7da3f051480f78e6288baf466d865b6f0fcb46f965ff3535de10589c017dd02661cbe6300b8303e7dedf1062a0f6d
-EBUILD tcsh-6.23.02.ebuild 2884 BLAKE2B 338e6ecf0b675cdc3009d51347289ce472c6dac4e6f2dde5a70c06bed71dd0922b6bfa540ade8c04a029f6b0f7955e3e2b6107adb4b76fd8f533d5ffa79d0217 SHA512 eb9ce7e335c20a3974c484ee7ded9df2325d2f0d728e47ff51bb557683c40a8e1929eb6ba831c76198463509258e093b1b98b2cca55a50641e5590a0e5ff5a5f
-EBUILD tcsh-6.24.00.ebuild 2934 BLAKE2B 7f07a4a7c5f2a904e2efa634c2933c420c19a0e9623404bc42aac291f1e435ae57e48700ab7635eb6c4f0b1318feed56ebb387d60e7bbef9cf06afaaeefaa504 SHA512 43c4a3b32def08a7f416627aa8a9455bed406519b934522a13aae7cdd222b27260c9ff21ecdf93aef7ab5f1cf37afbb604f362cf9ce4edbc8f5254df7589bc3d
+EBUILD tcsh-6.24.00.ebuild 2926 BLAKE2B 4f7fb027196534939a3ce4c1197681d34f1612be7cb7de7b415899e789086be477a6c672c59b7ccdcff8b9fec1db192b81c6c31b3d52c193eb28d01893589ee1 SHA512 c5f75461dac0c4d66e2c201a6f91b3c3801c0249b0505069dd6426a3215ae3933caec753e87983391ac5318cdd9e635cabb68a84f022e360d5e6c71148153400
+EBUILD tcsh-6.24.01.ebuild 2934 BLAKE2B 7f07a4a7c5f2a904e2efa634c2933c420c19a0e9623404bc42aac291f1e435ae57e48700ab7635eb6c4f0b1318feed56ebb387d60e7bbef9cf06afaaeefaa504 SHA512 43c4a3b32def08a7f416627aa8a9455bed406519b934522a13aae7cdd222b27260c9ff21ecdf93aef7ab5f1cf37afbb604f362cf9ce4edbc8f5254df7589bc3d
 MISC metadata.xml 646 BLAKE2B f385f17c96351f51f3af740f46d37ac3321ea24c47db71a96f3fa840d9bd62dc39c3d22a0a0373ad004b5ab28cde8b641c519c3e095e90488454e5e2d50bedcc SHA512 841bb759cdaccbef3723f80747aaf5a1d5dca5517edfd0807d38c36dbbdc09190431ce62ed521dbad674c05866fbbfb616cd607ad29204c3ab243b90038e5c64
diff --git a/app-shells/tcsh/tcsh-6.22.04-r1.ebuild b/app-shells/tcsh/tcsh-6.22.04-r1.ebuild
deleted file mode 100644
index 6bad4903d99c..000000000000
--- a/app-shells/tcsh/tcsh-6.22.04-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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.9"
-
-DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
-HOMEPAGE="https://www.tcsh.org/"
-SRC_URI="
-	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"
-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.20.00-debian-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.00.ebuild b/app-shells/tcsh/tcsh-6.24.00.ebuild
index 5e5a97fcea75..c97fe7fe2c8b 100644
--- a/app-shells/tcsh/tcsh-6.24.00.ebuild
+++ b/app-shells/tcsh/tcsh-6.24.00.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls doc"
 RESTRICT="test"
 
diff --git a/app-shells/tcsh/tcsh-6.23.02.ebuild b/app-shells/tcsh/tcsh-6.24.01.ebuild
index 4dde5bb6b458..5e5a97fcea75 100644
--- a/app-shells/tcsh/tcsh-6.23.02.ebuild
+++ b/app-shells/tcsh/tcsh-6.24.01.ebuild
@@ -10,12 +10,13 @@ CONFVER="1.9"
 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls doc"
 RESTRICT="test"