gentoo resync : 08.01.2021

4 files changed, 3 insertions, 211 deletions

diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 0e202d3fdebf..a5f20cef926d 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -4,11 +4,7 @@ AUX tcsh-6.20.00-use-ncurses-tinfo.patch 382 BLAKE2B 99d794389e3f65607887eae8df4
 AUX tcsh-6.21.00-fno-common.patch 613 BLAKE2B bd9d68b9f4a7655d519a49c8937d150e8d4521fea2f1be26b3827369905d865e2115ff2a51a1d491b3ce2c80352d0845cdbc127d808f58556842fa5555dde41b SHA512 d67b82c6dcb7042c8d6e33d97c30b6937244af0667ac9b5928f4316b4bb69e4080f7d609271f2e1beed03b5d896bbc70c171e9f9a58684ab29409918ad77f40d
 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
-DIST tcsh-6.20.00.tar.gz 1001696 BLAKE2B dfebde21c70f236e1070a93621a331ce1a53efab4496c44f25b51e98e843a8d0e3ca503da46a4fc0177b57b682e3ecc07f8120cde25ecf466c8ff094df5f9463 SHA512 c5635393c22341e62fb9a0b953ddf8871a876ab09deb08c98237f93afa9257b4a3381d1db65eefe769e22ef845db29ab7bc78773f1f609d73c8205689a6683e9
-DIST tcsh-6.21.00.tar.gz 1001909 BLAKE2B 7f2be382a3a344d55e0785eace79377e20dd2cd2eb9e9533168fbb6286631cdcd35bdc06cd42d9439a29a7cd1a911416bfe6b0245065535aebdf5adb58d2c301 SHA512 d7f46588a35b9cd01cfa33d0f9bbae09e9692605b5c045c2b58e66dba958ab904ddfe45aa7361767034e6cc03a34ad9ba4d14fa836df723bade29f3f6a18a46c
 DIST tcsh-6.22.02.tar.gz 1006405 BLAKE2B f18b2c48958b4d38a0f55b0df8563564b2a3b34becf02eda8802d7f5e2194082bf96c46323d606c2e6bd2a26aaed303bae3132d03515274407c63b713583dde7 SHA512 32d271b568c63265ea4c98494f5e60b37c3a3fc2594e8763b8f6f0b09018ab9db7ef6f951120b37f7880ccf04ba3a2559e30dc08d24f4ba9dc36853238d55980
 DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B 58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d
-EBUILD tcsh-6.20.00.ebuild 2635 BLAKE2B e5912507458fe645d08688970dc5392985c1e9457d26d2c6a52b51d9c663d727dea254eeff9a0413ba2e9a5c49e9c0e29dfb9d6d52e9876f885a3b4443750c5c SHA512 1e8f7dd4a541b7ae094d3bcc5ed51ccb03a189b4c22421551deb06102fb9c0c259c731fb37b7455ed3f924d352dbe7d40e33eb524a3313547b78ce236dce640a
-EBUILD tcsh-6.21.00-r1.ebuild 2740 BLAKE2B fd28d6fc3cee173ae0059f58815094385f88691f65e1011bd36ecf95e0d427b0bd577c61a349a1227b5a5d4e5dbe6fe8eff4de5cf6f17c2286d245b4bd7eda75 SHA512 9be7b6bb8a3188ad43d603614c2c94d472c3a4674c2ebdf20b43bdf5cb0656221883c58a37146b0fcb60486a177486bbc8f33bad75b66c5ff7f58bc4543d40d3
-EBUILD tcsh-6.22.02.ebuild 2858 BLAKE2B 15ee9f87b54a394d9147575719c83bc87ac6bb8ad67e15efd17bd04c44f5ee894bd93da5356439f2134fcc1a3179907b1aa5e000d73515d83750cc43dd965bd6 SHA512 cab85925ef94dd5f20b1fcebbafe85d4f37c8f2356dd6f742a5a6ad5132cee06d0004996e4a1f944ec4a3f7a8d3b0372163caf630e46970348ab8fe60ef253e3
+EBUILD tcsh-6.22.02.ebuild 2847 BLAKE2B 24cc441ec48f6e2004c681b0695c4c46376e1232b0b7708d84aab36705a5c007313360080716adab2853a9f7cf703eec121f7134f8179eb5373a7f5f3322eef6 SHA512 cc65db6bd80685b28e5bab9032ebfc195bdc1011c5210509582d5dddcd859b7f9db4350b6d4d57d51916541bb90d1b8351469185f66fffb79ae42927ef45b34d
 MISC metadata.xml 645 BLAKE2B 6a9d41c4ca043c899c0bfd8c5140958799c4eaf988f301551e8b8302995c81b0968981a2fda9247189965fc28887841eb30e1f3433262a58c843c0f890f857e5 SHA512 0f36e708c427083603b31df4bd4d808147333ff2711addff30936178e72b10f1020534046cb15ef1fecafee656c37d357ad3b5922320980ee15fddda11912f22
diff --git a/app-shells/tcsh/tcsh-6.20.00.ebuild b/app-shells/tcsh/tcsh-6.20.00.ebuild
deleted file mode 100644
index dcafd9fc770f..000000000000
--- a/app-shells/tcsh/tcsh-6.20.00.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils 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
-	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 ~x86-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/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.20.00-use-ncurses-tinfo.patch
-	"${FILESDIR}"/${PN}-6.18.01-aix.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	eautoreconf
-
-	# fix gencat usage
-	sed \
-		-e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $> $^/' \
-		-i nls/Makefile.in || die
-
-	# use sysmalloc (for larger alloc sets) on Darwin also
-	sed -i -e 's/__MACHTEN__/__MACH__/' 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"'"'"
-
-	econf \
-		--prefix="${EPREFIX:-}" \
-		--datarootdir='${prefix}/usr/share' \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install.man
-
-	DOCS=( FAQ Fixes NewThings Ported README 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.21.00-r1.ebuild b/app-shells/tcsh/tcsh-6.21.00-r1.ebuild
deleted file mode 100644
index 5008f7b80c21..000000000000
--- a/app-shells/tcsh/tcsh-6.21.00-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils 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
-	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 ~x86-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/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.18.01-aix.patch
-	"${FILESDIR}"/${PN}-6.21.00-no-nls.patch
-	"${FILESDIR}"/${PN}-6.21.00-use-ncurses.patch
-	"${FILESDIR}"/${PN}-6.21.00-fno-common.patch # upstream
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	eautoreconf
-
-	# fix gencat usage
-	sed \
-		-e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $> $^/' \
-		-i nls/Makefile.in || die
-
-	# use sysmalloc (for larger alloc sets) on Darwin also
-	sed -i -e 's/__MACHTEN__/__MACH__/' 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"'"'"
-
-	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.22.02.ebuild b/app-shells/tcsh/tcsh-6.22.02.ebuild
index 760848932cdb..5170f861ce10 100644
--- a/app-shells/tcsh/tcsh-6.22.02.ebuild
+++ b/app-shells/tcsh/tcsh-6.22.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="
 
 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"