gentoo resync : 20.03.2022

6 files changed, 259 insertions, 6 deletions

diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 21cabd5f86a7..f04f6cb5c02f 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -4,9 +4,14 @@ AUX tcsh-6.21.00-fno-common.patch 613 BLAKE2B bd9d68b9f4a7655d519a49c8937d150e8d
 AUX tcsh-6.21.00-no-nls.patch 386 BLAKE2B 5df1b205d76e29b68530f50b661329e851ce46206306662e150452ffc340e82d2347a0d1407c3a4aed6ee5f1b93257d0dece87b37ebc51f4240ac83a110f471e SHA512 9ece39f524b0d377dd907772c37e9412cb4a700db5d828aa404a0b231b758638cdf1215d026ba574486c2a00b49f20888e7f5683ac4f712845fa484118a8109f
 AUX tcsh-6.21.00-use-ncurses.patch 388 BLAKE2B 5938d6ceee5cafa254d3bedb36705a7d1d6f3c41cb30d8eb22181cf053bbe39302c9dcb14191383e755f47c08fa1a0dd3fc20cc7f813cf9737e60850327a7e71 SHA512 eef51644cde4bf27a614a1f099b5f21e46600ca396e4baafa6ece005f3fb4901ab1862176ee715b7294216894f6a2d84c1a5b1c38c1086cf95914f6f44358595
 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-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B 58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d
-EBUILD tcsh-6.22.02-r1.ebuild 2868 BLAKE2B 9663690588a73517fd13c1aeaaabdb8e62246586ef21758471922642806f2c37ffd03b813d6429cb410b344f3632130fb174d0174498e85ffe8840aba225128a SHA512 89c409b0c1bb9a9fe4b13476bbd8549551b45778ec275c5b522fce9a8b2242152789921533062d16d4e59d20622834ea35dba59d65a75e1d5ef08a785ddbbc63
-EBUILD tcsh-6.22.04-r1.ebuild 2887 BLAKE2B 0a7f43d9fbc778cfe1b6c7df7a60e5e635a9836adebde71822a6bec180f2659d4c36b8c747ae9d4d191860ae72d03dccb99254ae761a8eb1a34faa92dcd7bb3b SHA512 7f53c57bc01114914defc7912c2555c122d0bb321f431e9c00014c5f9825281bbd0b947edb70d9a7b06e035ce9f04f761c03005ed470f60a22f8cdd3e0b2b82a
+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 2927 BLAKE2B 165000a8294c876de5a02866d70eead71fa6174e13b2c03efd73e96baf966cff871522ddf43c868d4420f4adab0216135a12d8e8b6ffc8533f5a06fca01245f9 SHA512 af5d56a513b647cd540434001bcf1dab846d41a515a357e6f8317886620f0d337fa9aef5bfe26f66edbde7b91212029da5c173764aef6a64b641926c63014ec3
 MISC metadata.xml 646 BLAKE2B f385f17c96351f51f3af740f46d37ac3321ea24c47db71a96f3fa840d9bd62dc39c3d22a0a0373ad004b5ab28cde8b641c519c3e095e90488454e5e2d50bedcc SHA512 841bb759cdaccbef3723f80747aaf5a1d5dca5517edfd0807d38c36dbbdc09190431ce62ed521dbad674c05866fbbfb616cd607ad29204c3ab243b90038e5c64
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/tcsh-6.22.02-r1.ebuild b/app-shells/tcsh/tcsh-6.22.02-r1.ebuild
index 962d72644d4b..5ce918e71b82 100644
--- a/app-shells/tcsh/tcsh-6.22.02-r1.ebuild
+++ b/app-shells/tcsh/tcsh-6.22.02-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ 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"
diff --git a/app-shells/tcsh/tcsh-6.22.04-r1.ebuild b/app-shells/tcsh/tcsh-6.22.04-r1.ebuild
index da1bb0b9c52b..6bad4903d99c 100644
--- a/app-shells/tcsh/tcsh-6.22.04-r1.ebuild
+++ b/app-shells/tcsh/tcsh-6.22.04-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ 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"
diff --git a/app-shells/tcsh/tcsh-6.23.02.ebuild b/app-shells/tcsh/tcsh-6.23.02.ebuild
new file mode 100644
index 000000000000..4dde5bb6b458
--- /dev/null
+++ b/app-shells/tcsh/tcsh-6.23.02.ebuild
@@ -0,0 +1,110 @@
+# 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.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.00.ebuild b/app-shells/tcsh/tcsh-6.24.00.ebuild
new file mode 100644
index 000000000000..2401dc67449c
--- /dev/null
+++ b/app-shells/tcsh/tcsh-6.24.00.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.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"
+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
+}