Fix issue that was mentioned post-fix in bug #156422: don't use tset as it is an interactive tool, which is evil.

(Portage version: 2.1.1-r2)
 (Unsigned Manifest commit)

3 files changed, 15 insertions, 95 deletions

diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index f70984ec6742..7ab7306a3616 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -6,10 +6,10 @@ AUX tcsh-6.14-r2.patch 2057 RMD160 8fba8a743944e04e8f03525ee0f8763576d251ec SHA1
 MD5 dc3f6395569049b5f3a1547364be0260 files/tcsh-6.14-r2.patch 2057
 RMD160 8fba8a743944e04e8f03525ee0f8763576d251ec files/tcsh-6.14-r2.patch 2057
 SHA256 cdc6f499a9eef1876604a0072562aad4b594e12c6073a98ea7a2f33d88aa21c5 files/tcsh-6.14-r2.patch 2057
-AUX tcsh-6.14-r4.patch 1015 RMD160 8eac7bf5afbe02bd1b88333c408f883497788c51 SHA1 2d31d93c424032a459273e83e7533f8f70e9e314 SHA256 bf6c7ef9f699db88f54550fb7c2b45e0045542eba057724052e12c6a805f3aa9
-MD5 8a5b99cada661f3759a22e9b38857cb7 files/tcsh-6.14-r4.patch 1015
-RMD160 8eac7bf5afbe02bd1b88333c408f883497788c51 files/tcsh-6.14-r4.patch 1015
-SHA256 bf6c7ef9f699db88f54550fb7c2b45e0045542eba057724052e12c6a805f3aa9 files/tcsh-6.14-r4.patch 1015
+AUX tcsh-6.14-r4.patch 1030 RMD160 58af5c8fafcaa7ef8bb96bb2687422b93a4b61ea SHA1 c3db204db1d075ff83134428b0cfd62f99792b56 SHA256 909df93052f8af0a3d2d83125894db774509d3c22cc495fe266484529eb1f6d9
+MD5 53fbf5190e95b8b74cbd50e0980aff8b files/tcsh-6.14-r4.patch 1030
+RMD160 58af5c8fafcaa7ef8bb96bb2687422b93a4b61ea files/tcsh-6.14-r4.patch 1030
+SHA256 909df93052f8af0a3d2d83125894db774509d3c22cc495fe266484529eb1f6d9 files/tcsh-6.14-r4.patch 1030
 AUX tcsh-6.14.00-debian-dircolors.patch 444 RMD160 8ab4e49fbfd979aed6cfdd5bd45c5e37fa810394 SHA1 a7ccadc40cb4d6e9dcfc9672c5bf7f547ed0bd83 SHA256 a9568a2a474ef662a665c87c52983fea7999e5cf2bc4920d45baa2558c9dc32a
 MD5 18211cacb14d3b0d1253b35bb9683d21 files/tcsh-6.14.00-debian-dircolors.patch 444
 RMD160 8ab4e49fbfd979aed6cfdd5bd45c5e37fa810394 files/tcsh-6.14.00-debian-dircolors.patch 444
@@ -20,14 +20,14 @@ EBUILD tcsh-6.14-r3.ebuild 2460 RMD160 08f9567534c1ffe744647dead6094fbf1fce49b8
 MD5 04e2a3e36e7da5580e38051ce957ad3d tcsh-6.14-r3.ebuild 2460
 RMD160 08f9567534c1ffe744647dead6094fbf1fce49b8 tcsh-6.14-r3.ebuild 2460
 SHA256 552218329160f8caee971af1f17fb13cdfdc98cdba0011fa7078878cbf809693 tcsh-6.14-r3.ebuild 2460
-EBUILD tcsh-6.14-r4.ebuild 1836 RMD160 41e1c9a23779c8d9c1a86c594a1e8df0b06b76cb SHA1 cc32763be5793d3f2e9fa028d389540864847756 SHA256 ea35448e2cdd4f35370b7cb0bdae4a8504b5a1f7d48067b5eef3dfc530dc68e6
-MD5 534bff1cf385a4d129303766f5542402 tcsh-6.14-r4.ebuild 1836
-RMD160 41e1c9a23779c8d9c1a86c594a1e8df0b06b76cb tcsh-6.14-r4.ebuild 1836
-SHA256 ea35448e2cdd4f35370b7cb0bdae4a8504b5a1f7d48067b5eef3dfc530dc68e6 tcsh-6.14-r4.ebuild 1836
-MISC ChangeLog 9312 RMD160 a0c503a0ebb58dd924ca88c8765915aff9b57ee6 SHA1 4a5555d2b876d66ce217ad4834ccb955e631c556 SHA256 ebc28a6ac42fe0a382fe5f0c69e683b528aac65c6931001bc19cbdd227d82721
-MD5 52d49826890d5f1100022df6489d8eae ChangeLog 9312
-RMD160 a0c503a0ebb58dd924ca88c8765915aff9b57ee6 ChangeLog 9312
-SHA256 ebc28a6ac42fe0a382fe5f0c69e683b528aac65c6931001bc19cbdd227d82721 ChangeLog 9312
+EBUILD tcsh-6.14-r5.ebuild 1836 RMD160 4e666fb883c35f7fb51ad76e44597bd703a51ab1 SHA1 09cb6187bd7a6df76d56f4ee566f72d08e9ef914 SHA256 fbdb47850e18cc2aea27d9638e6a374a692aa99a3a76fedd394b91b6c4131652
+MD5 16740fd588136ceb16ae1f235287509e tcsh-6.14-r5.ebuild 1836
+RMD160 4e666fb883c35f7fb51ad76e44597bd703a51ab1 tcsh-6.14-r5.ebuild 1836
+SHA256 fbdb47850e18cc2aea27d9638e6a374a692aa99a3a76fedd394b91b6c4131652 tcsh-6.14-r5.ebuild 1836
+MISC ChangeLog 9583 RMD160 ff0bb088ba3bd75f644604f1f577147f1109ca38 SHA1 eb2bce36d1c0529e1837513fdd098ac9a357d142 SHA256 91631eb97b87de94cd551dcac1a57175f9f532a4d9430c776409e8203c3a1fbf
+MD5 5927ddb5c1c552d5f53375e2e1df4ba8 ChangeLog 9583
+RMD160 ff0bb088ba3bd75f644604f1f577147f1109ca38 ChangeLog 9583
+SHA256 91631eb97b87de94cd551dcac1a57175f9f532a4d9430c776409e8203c3a1fbf ChangeLog 9583
 MISC metadata.xml 655 RMD160 10cac0d0a38ab114ec6f34be1fed837f38a77f40 SHA1 8e04b7ca425f5469ce8515c2ab8fce6cf166b3ca SHA256 bde0b24fe9a295482f3394de9b3d658bbcc2e58504136785fd4a6210b1d2e28b
 MD5 57ae68ef95b893d172203de06faf380d metadata.xml 655
 RMD160 10cac0d0a38ab114ec6f34be1fed837f38a77f40 metadata.xml 655
@@ -35,6 +35,6 @@ SHA256 bde0b24fe9a295482f3394de9b3d658bbcc2e58504136785fd4a6210b1d2e28b metadata
 MD5 6a74574703dca366bcf1a246f9bf6e32 files/digest-tcsh-6.14-r3 497
 RMD160 28da1915a51453b91b97fe54a3866e7bc589b8c0 files/digest-tcsh-6.14-r3 497
 SHA256 92be31902b0ded77904c82ced086d52942e9a5fc4a99a90983091fc22c61b4f5 files/digest-tcsh-6.14-r3 497
-MD5 6a74574703dca366bcf1a246f9bf6e32 files/digest-tcsh-6.14-r4 497
-RMD160 28da1915a51453b91b97fe54a3866e7bc589b8c0 files/digest-tcsh-6.14-r4 497
-SHA256 92be31902b0ded77904c82ced086d52942e9a5fc4a99a90983091fc22c61b4f5 files/digest-tcsh-6.14-r4 497
+MD5 6a74574703dca366bcf1a246f9bf6e32 files/digest-tcsh-6.14-r5 497
+RMD160 28da1915a51453b91b97fe54a3866e7bc589b8c0 files/digest-tcsh-6.14-r5 497
+SHA256 92be31902b0ded77904c82ced086d52942e9a5fc4a99a90983091fc22c61b4f5 files/digest-tcsh-6.14-r5 497
diff --git a/app-shells/tcsh/files/digest-tcsh-6.14-r4 b/app-shells/tcsh/files/digest-tcsh-6.14-r4
deleted file mode 100644
index c15c253dc055..000000000000
--- a/app-shells/tcsh/files/digest-tcsh-6.14-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 06d9a00fa7e034394bf1152f0fc3e950 tcsh-6.14-conffiles.tar.bz2 20200
-RMD160 96e5e43985fe1b6e53b4a2a53f1b7bed3c2ae103 tcsh-6.14-conffiles.tar.bz2 20200
-SHA256 1bae5000c84593187974580c48b0edcec88e2f6363e3c1ec1e43da45c9a63049 tcsh-6.14-conffiles.tar.bz2 20200
-MD5 353d1bb7d2741bf8de602c7b6f0efd79 tcsh-6.14.00.tar.gz 859780
-RMD160 fa7635225ceb0225aedcfad5dd9d8e17d8d70849 tcsh-6.14.00.tar.gz 859780
-SHA256 fd738ac0c003d283a214d15d46c1bc3fb80afad697110994dccb8d101f0d6f0e tcsh-6.14.00.tar.gz 859780
diff --git a/app-shells/tcsh/tcsh-6.14-r4.ebuild b/app-shells/tcsh/tcsh-6.14-r4.ebuild
deleted file mode 100644
index 4067ed155ff0..000000000000
--- a/app-shells/tcsh/tcsh-6.14-r4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.14-r4.ebuild,v 1.2 2006/12/04 09:42:36 grobian Exp $
-
-inherit eutils
-
-MY_P="${P}.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
-	mirror://gentoo/${P}-conffiles.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="perl catalogs"
-
-DEPEND=">=sys-libs/ncurses-5.1
-	perl? ( dev-lang/perl )
-	!app-shells/csh" # bug #119703
-
-S=${WORKDIR}/${MY_P}
-
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${MY_P}"-debian-dircolors.patch # bug #120792
-	epatch "${FILESDIR}/${P}"-r2.patch
-	epatch "${FILESDIR}/${P}"-makefile.patch # bug #151951
-	epatch "${FILESDIR}/${P}"-r4.patch
-
-	if use catalogs ; then
-		einfo "enabling NLS catalogs support..."
-		sed -i -e "s/#undef NLS_CATALOGS/#define NLS_CATALOGS/" \
-			${WORKDIR}/${MY_P}/config_f.h || die
-		eend $?
-	fi
-}
-
-src_compile() {
-	econf --prefix=/ || die "econf failed"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install.man || die
-
-	if use perl ; then
-		perl tcsh.man2html || die
-		dohtml tcsh.html/*.html
-	fi
-
-	insinto /etc
-	doins \
-		"${WORKDIR}"/gentoo/csh.cshrc \
-		"${WORKDIR}"/gentoo/csh.login
-
-	insinto /etc/profile.d
-	doins \
-		"${WORKDIR}"/gentoo/tcsh-bindkey.csh \
-		"${WORKDIR}"/gentoo/tcsh-settings.csh
-
-	dodoc FAQ Fixes NewThings Ported README WishList Y2K
-
-	docinto examples
-	dodoc \
-		"${WORKDIR}"/gentoo/tcsh-aliases \
-		"${WORKDIR}"/gentoo/tcsh-complete \
-		"${WORKDIR}"/gentoo/tcsh-gentoo_legacy \
-		"${WORKDIR}"/gentoo/tcsh.config
-
-	# bug #119703: add csh -> tcsh symlink
-	dosym /bin/tcsh /bin/csh
-}